From 6f2c0c65df717edf049c140f51137785f4db5f35 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tim=20Kr=C3=BCger?= <t@timkrueger.me>
Date: Thu, 22 Jul 2021 11:36:44 +0200
Subject: [PATCH] Unify strings for clearing chat over all platforms
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

See: #1336

Signed-off-by: Tim Krüger <t@timkrueger.me>
---
 .../talk/controllers/ConversationInfoController.kt         | 2 +-
 app/src/main/res/values/strings.xml                        | 7 ++++---
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/app/src/main/java/com/nextcloud/talk/controllers/ConversationInfoController.kt b/app/src/main/java/com/nextcloud/talk/controllers/ConversationInfoController.kt
index e9167cdc9..e731785fe 100644
--- a/app/src/main/java/com/nextcloud/talk/controllers/ConversationInfoController.kt
+++ b/app/src/main/java/com/nextcloud/talk/controllers/ConversationInfoController.kt
@@ -504,7 +504,7 @@ class ConversationInfoController(args: Bundle) :
                 .setPositiveButtonColor(context!!.resources.getColor(R.color.nc_darkRed))
                 .setTitle(R.string.nc_clear_history)
                 .setMessage(R.string.nc_clear_history_warning)
-                .setPositiveButton(R.string.nc_delete) { clearHistory() }
+                .setPositiveButton(R.string.nc_delete_all) { clearHistory() }
                 .setNegativeButton(R.string.nc_cancel, null)
                 .setInstanceStateHandler(ID_CLEAR_CHAT_DIALOG, saveStateHandler!!)
                 .setSavedInstanceState(savedInstanceState)
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 58a8cd267..5cdb6f278 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -167,9 +167,9 @@
     <string name="nc_start_conversation">Start a conversation</string>
     <string name="nc_configure_room">Configure conversation</string>
     <string name="nc_leave">Leave conversation</string>
-    <string name="nc_clear_history">Clear history</string>
-    <string name="nc_clear_history_warning">The chat history will be deleted.</string>
-    <string name="nc_clear_history_success">Chat history was cleared</string>
+    <string name="nc_clear_history">Delete all messages</string>
+    <string name="nc_clear_history_warning">Do you really want to delete all messages in this conversation?</string>
+    <string name="nc_clear_history_success">All messages were deleted</string>
     <string name="nc_rename">Rename conversation</string>
     <string name="nc_set_password">Set a password</string>
     <string name="nc_change_password">Change password</string>
@@ -180,6 +180,7 @@
     <string name="nc_make_call_private">Make conversation private</string>
     <string name="nc_delete_call">Delete conversation</string>
     <string name="nc_delete">Delete</string>
+    <string name="nc_delete_all">Delete all</string>
     <string name="nc_delete_conversation_more">If you delete the conversation, it will also be deleted for all other participants.</string>
 
     <string name="nc_new_conversation">New conversation</string>