From cc977eee9094b4c006fc56d87772a11c7ac11a08 Mon Sep 17 00:00:00 2001 From: Daniel Gultsch Date: Sun, 6 Apr 2014 15:23:40 +0200 Subject: [PATCH] renamed [Archive conversation|Leave conference] to End this conversation --- res/menu/conversations.xml | 2 +- res/values/strings.xml | 2 +- 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 977d47e51..5902e74f4 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"/> Settings New conversation Manage accounts - Archive conversation + End this conversation Contact details Conferenece details Secure conversation diff --git a/src/eu/siacs/conversations/ui/ConversationActivity.java b/src/eu/siacs/conversations/ui/ConversationActivity.java index ef1d051b9..f47e8a8cd 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);