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

Daniel Gultsch created

Change summary

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(-)

Detailed changes

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"

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>

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);