sum7/Conversations
sum7
/
Conversations
1
1
Fork 0
Code Issues Pull Requests Releases Wiki Activity

renamed [Archive conversation|Leave conference] to End this conversation

This commit is contained in:
Daniel Gultsch 2014-04-06 15:23:40 +02:00
parent 3f872ddc9f
commit cc977eee90
3 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
res/menu/conversations.xml
View File

@ -35,7 +35,7 @@
android:id="@+id/action_archive" android:id="@+id/action_archive"
android:orderInCategory="50" android:orderInCategory="50"
android:showAsAction="never" android:showAsAction="never"
android:title="@string/action_archive"/> android:title="@string/action_end_conversation"/>
<item <item
android:id="@+id/action_accounts" android:id="@+id/action_accounts"

2
res/values/strings.xml
View File

@ -5,7 +5,7 @@
<string name="action_settings">Settings</string> <string name="action_settings">Settings</string>
<string name="action_add">New conversation</string> <string name="action_add">New conversation</string>
<string name="action_accounts">Manage accounts</string> <string name="action_accounts">Manage accounts</string>
<string name="action_archive">Archive conversation</string> <string name="action_end_conversation">End this conversation</string>
<string name="action_contact_details">Contact details</string> <string name="action_contact_details">Contact details</string>
<string name="action_muc_details">Conferenece details</string> <string name="action_muc_details">Conferenece details</string>
<string name="action_secure">Secure conversation</string> <string name="action_secure">Secure conversation</string>

1
src/eu/siacs/conversations/ui/ConversationActivity.java
View File

@ -248,7 +248,6 @@ public class ConversationActivity extends XmppActivity {
menuMucDetails.setVisible(true); menuMucDetails.setVisible(true);
menuContactDetails.setVisible(false); menuContactDetails.setVisible(false);
menuSecure.setVisible(false); menuSecure.setVisible(false);
menuArchive.setTitle("Leave conference");
menuInviteContacts.setVisible(true); menuInviteContacts.setVisible(true);
} else { } else {
menuContactDetails.setVisible(true); menuContactDetails.setVisible(true);