diff options
| author | Daniel Gultsch <daniel.gultsch@rwth-aachen.de> | 2014-04-06 15:23:40 +0200 |
|---|---|---|
| committer | Daniel Gultsch <daniel.gultsch@rwth-aachen.de> | 2014-04-06 15:23:40 +0200 |
| commit | cc977eee9094b4c006fc56d87772a11c7ac11a08 (patch) | |
| tree | 9910081edb11a77afae4328d7d9efae892830dde | |
| parent | 3f872ddc9f56255ac090260ec720b04a523cf695 (diff) | |
renamed [Archive conversation|Leave conference] to End this conversation
| -rw-r--r-- | res/menu/conversations.xml | 2 | ||||
| -rw-r--r-- | res/values/strings.xml | 2 | ||||
| -rw-r--r-- | src/eu/siacs/conversations/ui/ConversationActivity.java | 1 |
3 files changed, 2 insertions, 3 deletions
diff --git a/res/menu/conversations.xml b/res/menu/conversations.xml index 977d47e5..5902e74f 100644 --- a/res/menu/conversations.xml +++ b/res/menu/conversations.xml @@ -35,7 +35,7 @@ android:id="@+id/action_archive" android:orderInCategory="50" android:showAsAction="never" - android:title="@string/action_archive"/> + android:title="@string/action_end_conversation"/> <item android:id="@+id/action_accounts" diff --git a/res/values/strings.xml b/res/values/strings.xml index 3aae501b..9d1b42ac 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -5,7 +5,7 @@ <string name="action_settings">Settings</string> <string name="action_add">New conversation</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_muc_details">Conferenece details</string> <string name="action_secure">Secure conversation</string> diff --git a/src/eu/siacs/conversations/ui/ConversationActivity.java b/src/eu/siacs/conversations/ui/ConversationActivity.java index ef1d051b..f47e8a8c 100644 --- a/src/eu/siacs/conversations/ui/ConversationActivity.java +++ b/src/eu/siacs/conversations/ui/ConversationActivity.java @@ -248,7 +248,6 @@ public class ConversationActivity extends XmppActivity { menuMucDetails.setVisible(true); menuContactDetails.setVisible(false); menuSecure.setVisible(false); - menuArchive.setTitle("Leave conference"); menuInviteContacts.setVisible(true); } else { menuContactDetails.setVisible(true); |