Cleaning up straggler strings

session-foundation · Jul 28, 2024 · 08b8a84 · 08b8a84
1 parent d0e87c6
commit 08b8a84
Show file tree

Hide file tree

Showing 106 changed files with 21 additions and 180 deletions.
diff --git a/.../thoughtcrime/securesms/conversation/disappearingmessages/DisappearingMessagesActivity.kt b/.../thoughtcrime/securesms/conversation/disappearingmessages/DisappearingMessagesActivity.kt
@@ -52,7 +52,7 @@ class DisappearingMessagesActivity: PassphraseRequiredActionBarActivity() {
                 viewModel.event.collect {
                     when (it) {
                         Event.SUCCESS -> finish()
-                        Event.FAIL -> showToast(getString(R.string.DisappearingMessagesActivity_settings_not_updated))
+                        Event.FAIL -> showToast(getString(R.string.communityErrorDescription))
                     }
                 }
             }

diff --git a/app/src/main/java/org/thoughtcrime/securesms/database/helpers/SQLCipherOpenHelper.java b/app/src/main/java/org/thoughtcrime/securesms/database/helpers/SQLCipherOpenHelper.java
@@ -1,5 +1,7 @@
 package org.thoughtcrime.securesms.database.helpers;
 
+import static org.session.libsession.utilities.StringSubstitutionConstants.APP_NAME_KEY;
+
 import android.app.NotificationChannel;
 import android.app.NotificationManager;
 import android.content.Context;
@@ -8,6 +10,8 @@
 import androidx.annotation.NonNull;
 import androidx.core.app.NotificationCompat;
 
+import com.squareup.phrase.Phrase;
+
 import net.zetetic.database.sqlcipher.SQLiteConnection;
 import net.zetetic.database.sqlcipher.SQLiteDatabase;
 import net.zetetic.database.sqlcipher.SQLiteDatabaseHook;
@@ -258,12 +262,16 @@ public static void migrateSqlCipher3To4IfNeeded(@NonNull Context context, @NonNu
         notificationManager.createNotificationChannel(channel);
       }
 
+      CharSequence errorTxt = Phrase.from(context, R.string.databaseErrorGeneric)
+              .put(APP_NAME_KEY, R.string.app_name)
+              .format();
+
       NotificationCompat.Builder builder = new NotificationCompat.Builder(context, channelId)
         .setSmallIcon(R.drawable.ic_notification)
         .setColor(context.getResources().getColor(R.color.textsecure_primary))
         .setCategory(NotificationCompat.CATEGORY_ERROR)
-        .setContentTitle(context.getString(R.string.ErrorNotifier_migration))
-        .setContentText(context.getString(R.string.ErrorNotifier_migration_downgrade))
+        .setContentTitle(context.getString(R.string.errorDatabase))
+        .setContentText(errorTxt)
         .setAutoCancel(true);
 
       if (!NotificationChannels.supported()) {

diff --git a/app/src/main/res/layout/activity_conversation_v2.xml b/app/src/main/res/layout/activity_conversation_v2.xml
@@ -145,7 +145,7 @@
 
     <TextView
         android:id="@+id/textSendAfterApproval"
-        android:text="@string/ConversationActivity_send_after_approval"
+        android:text="@string/messageRequestPendingDescription"
         android:visibility="gone"
         tools:visibility="visible"
         android:textAlignment="center"

diff --git a/content-descriptions/src/main/res/values/strings.xml b/content-descriptions/src/main/res/values/strings.xml
@@ -131,6 +131,8 @@
     <string name="AccessibilityId_select_camera_button">Select camera button</string>
     <string name="AccessibilityId_send_message_button">Send message button</string>
     <string name="AccessibilityId_untrusted_attachment_message">Untrusted attachment message</string>
+    <string name="KeyboardPagerfragment_back_to_emoji">Back to emoji</string>
+    <string name="KeyboardPagerfragment_clear_search_entry">Clear search entry</string>
     <!-- Conversation View-->
     <string name="AccessibilityId_delete_message">Delete message</string>
     <string name="AccessibilityId_deleted_message">Deleted message</string>

diff --git a/libsession/src/main/res/values-ar-rSA/strings.xml b/libsession/src/main/res/values-ar-rSA/strings.xml
@@ -18,7 +18,6 @@
     <!-- CommunicationActions -->
     <!-- ContactsCursorLoader -->
     <!-- ConversationItem -->
-    <string name="ConversationItem_error_not_delivered">فشل الإرسال , اضغط للحصول على معلومات</string>
     <!-- ConversationActivity -->
     <string name="attachmentsAdd">إضافة مرفقات</string>
     <string name="message">رسالة</string>
@@ -189,7 +188,6 @@
     <string name="conversationsDeleted">تم حذف المحادثة</string>
     <string name="activity_seed_title_2">هذه هي عبارة الاسترجاع</string>
     <string name="activity_seed_explanation">عبارة الاسترجاع هي مفتاح عنوان تعريفك - يمكنك استخدامها لاسترجاع عنوان تعريفك اذا فقدت الوصول لجهازك. قم بحفظها في مكان امن و لا تعطها الى اي أحد.</string>
-    <string name="activity_seed_reveal_button_title">انقر مطولاً للكشف</string>
     <string name="onionRoutingPath">مسار</string>
     <string name="onionRoutingPathEntryNode">عقدة الدخول</string>
     <string name="onionRoutingPathServiceNode">عقدة الخدمة</string>

diff --git a/libsession/src/main/res/values-ar/strings.xml b/libsession/src/main/res/values-ar/strings.xml
@@ -18,7 +18,6 @@
     <!-- CommunicationActions -->
     <!-- ContactsCursorLoader -->
     <!-- ConversationItem -->
-    <string name="ConversationItem_error_not_delivered">فشل الإرسال , اضغط للحصول على معلومات</string>
     <!-- ConversationActivity -->
     <string name="attachmentsAdd">إضافة مرفقات</string>
     <string name="message">رسالة</string>
@@ -189,7 +188,6 @@
     <string name="conversationsDeleted">تم حذف المحادثة</string>
     <string name="activity_seed_title_2">هذه هي عبارة الاسترجاع</string>
     <string name="activity_seed_explanation">عبارة الاسترجاع هي مفتاح عنوان تعريفك - يمكنك استخدامها لاسترجاع عنوان تعريفك اذا فقدت الوصول لجهازك. قم بحفظها في مكان امن و لا تعطها الى اي أحد.</string>
-    <string name="activity_seed_reveal_button_title">انقر مطولاً للكشف</string>
     <string name="onionRoutingPath">مسار</string>
     <string name="onionRoutingPathEntryNode">عقدة الدخول</string>
     <string name="onionRoutingPathServiceNode">عقدة الخدمة</string>

diff --git a/libsession/src/main/res/values-az-rAZ/strings.xml b/libsession/src/main/res/values-az-rAZ/strings.xml
@@ -18,7 +18,6 @@
     <!-- CommunicationActions -->
     <!-- ContactsCursorLoader -->
     <!-- ConversationItem -->
-    <string name="ConversationItem_error_not_delivered">Göndərilmədi, təfsilatlar üçün toxunun</string>
     <!-- ConversationActivity -->
     <string name="attachmentsAdd">Qoşma əlavə et</string>
     <string name="message">Mesaj</string>
@@ -185,7 +184,6 @@
     <string name="conversationsDeleted">Danışıq silindi</string>
     <string name="activity_seed_title_2">Bərpa parolunuzla tanış olun</string>
     <string name="activity_seed_explanation">Bərpa parolunuz, Session kimliyinizin ana açarıdır - cihazınıza müraciəti itirsəniz, Session kimliyinizi geri yükləmək üçün bunu istifadə edə bilərsiniz. Bərpa parolunuzu etibarlı bir yerdə saxlayın və heç kəsə verməyin.</string>
-    <string name="activity_seed_reveal_button_title">Aşkarlamaq üçün basılı saxlayın</string>
     <string name="onionRoutingPath">Yol</string>
     <string name="onionRoutingPathEntryNode">Giriş Düyünü</string>
     <string name="onionRoutingPathServiceNode">Xidmət Düyünü</string>

diff --git a/libsession/src/main/res/values-az/strings.xml b/libsession/src/main/res/values-az/strings.xml
@@ -18,7 +18,6 @@
     <!-- CommunicationActions -->
     <!-- ContactsCursorLoader -->
     <!-- ConversationItem -->
-    <string name="ConversationItem_error_not_delivered">Göndərilmədi, təfsilatlar üçün toxunun</string>
     <!-- ConversationActivity -->
     <string name="attachmentsAdd">Qoşma əlavə et</string>
     <string name="message">Mesaj</string>
@@ -185,7 +184,6 @@
     <string name="conversationsDeleted">Danışıq silindi</string>
     <string name="activity_seed_title_2">Bərpa parolunuzla tanış olun</string>
     <string name="activity_seed_explanation">Bərpa parolunuz, Session kimliyinizin ana açarıdır - cihazınıza müraciəti itirsəniz, Session kimliyinizi geri yükləmək üçün bunu istifadə edə bilərsiniz. Bərpa parolunuzu etibarlı bir yerdə saxlayın və heç kəsə verməyin.</string>
-    <string name="activity_seed_reveal_button_title">Aşkarlamaq üçün basılı saxlayın</string>
     <string name="onionRoutingPath">Yol</string>
     <string name="onionRoutingPathEntryNode">Giriş Düyünü</string>
     <string name="onionRoutingPathServiceNode">Xidmət Düyünü</string>

diff --git a/libsession/src/main/res/values-bal-rBA/strings.xml b/libsession/src/main/res/values-bal-rBA/strings.xml
@@ -17,7 +17,6 @@
     <!-- CommunicationActions -->
     <!-- ContactsCursorLoader -->
     <!-- ConversationItem -->
-    <string name="ConversationItem_error_not_delivered">Gagal mengirim, ketuk untuk detil</string>
     <!-- ConversationActivity -->
     <string name="attachmentsAdd">Tambahkan lampiran</string>
     <string name="blockUnblock">Buka blokir</string>
@@ -172,7 +171,6 @@
     <string name="conversationsDeleted">Percakapan terhapus</string>
     <string name="activity_seed_title_2">Inilah kata pemulihan anda</string>
     <string name="activity_seed_explanation">Kata pemulihan adalah kunci Session ID -- bisa digunakan untuk mengembalikan Session ID ketika anda kehilangan perangkat. Simpan kata pemulihan di tempat yang aman dan jangan berikan kepada siapapun</string>
-    <string name="activity_seed_reveal_button_title">Tekan untuk melihat</string>
     <string name="onionRoutingPathEntryNode">Simpul masuk</string>
     <string name="onionRoutingPathServiceNode">Simpul layanan</string>
     <string name="onionRoutingPathDestination">Tujuan</string>

diff --git a/libsession/src/main/res/values-bal/strings.xml b/libsession/src/main/res/values-bal/strings.xml
@@ -17,7 +17,6 @@
     <!-- CommunicationActions -->
     <!-- ContactsCursorLoader -->
     <!-- ConversationItem -->
-    <string name="ConversationItem_error_not_delivered">Gagal mengirim, ketuk untuk detil</string>
     <!-- ConversationActivity -->
     <string name="attachmentsAdd">Tambahkan lampiran</string>
     <string name="blockUnblock">Buka blokir</string>
@@ -172,7 +171,6 @@
     <string name="conversationsDeleted">Percakapan terhapus</string>
     <string name="activity_seed_title_2">Inilah kata pemulihan anda</string>
     <string name="activity_seed_explanation">Kata pemulihan adalah kunci Session ID -- bisa digunakan untuk mengembalikan Session ID ketika anda kehilangan perangkat. Simpan kata pemulihan di tempat yang aman dan jangan berikan kepada siapapun</string>
-    <string name="activity_seed_reveal_button_title">Tekan untuk melihat</string>
     <string name="onionRoutingPathEntryNode">Simpul masuk</string>
     <string name="onionRoutingPathServiceNode">Simpul layanan</string>
     <string name="onionRoutingPathDestination">Tujuan</string>

diff --git a/libsession/src/main/res/values-bg-rBG/strings.xml b/libsession/src/main/res/values-bg-rBG/strings.xml
@@ -18,7 +18,6 @@
     <!-- CommunicationActions -->
     <!-- ContactsCursorLoader -->
     <!-- ConversationItem -->
-    <string name="ConversationItem_error_not_delivered">Неуспешно изпращане, натиснете за повече информация</string>
     <!-- ConversationActivity -->
     <string name="attachmentsAdd">Прикачване на файл</string>
     <string name="message">Съобщение</string>

diff --git a/libsession/src/main/res/values-bg/strings.xml b/libsession/src/main/res/values-bg/strings.xml
@@ -18,7 +18,6 @@
     <!-- CommunicationActions -->
     <!-- ContactsCursorLoader -->
     <!-- ConversationItem -->
-    <string name="ConversationItem_error_not_delivered">Неуспешно изпращане, натиснете за повече информация</string>
     <!-- ConversationActivity -->
     <string name="attachmentsAdd">Прикачване на файл</string>
     <string name="message">Съобщение</string>

diff --git a/libsession/src/main/res/values-ca-rES/strings.xml b/libsession/src/main/res/values-ca-rES/strings.xml
@@ -18,7 +18,6 @@
     <!-- CommunicationActions -->
     <!-- ContactsCursorLoader -->
     <!-- ConversationItem -->
-    <string name="ConversationItem_error_not_delivered">Ha fallat l\'enviament. Toqueu per a saber-ne més</string>
     <!-- ConversationActivity -->
     <string name="attachmentsAdd">Afegeix un adjunt</string>
     <string name="message">Missatge</string>
@@ -184,7 +183,6 @@
     <string name="conversationsDeleted">S\'ha suprimit la conversa</string>
     <string name="activity_seed_title_2">Coneix la teva frase de recuperació</string>
     <string name="activity_seed_explanation">La teva frase de recuperació és la clau principal del teu ID de Session — pots fer-la servir per a restaurar la teva ID de Session si perds l\'accés al dispositiu. Emmagatzema la frase de recuperació en un lloc segur i no la donis a ningú.</string>
-    <string name="activity_seed_reveal_button_title">Mantingues premut per a revelar</string>
     <string name="onionRoutingPath">Ruta</string>
     <string name="onionRoutingPathEntryNode">Node d\'entrada</string>
     <string name="onionRoutingPathServiceNode">Node de servei</string>

diff --git a/libsession/src/main/res/values-ca/strings.xml b/libsession/src/main/res/values-ca/strings.xml
@@ -18,7 +18,6 @@
     <!-- CommunicationActions -->
     <!-- ContactsCursorLoader -->
     <!-- ConversationItem -->
-    <string name="ConversationItem_error_not_delivered">Ha fallat l\'enviament. Toqueu per a saber-ne més</string>
     <!-- ConversationActivity -->
     <string name="attachmentsAdd">Afegeix un adjunt</string>
     <string name="message">Missatge</string>
@@ -184,7 +183,6 @@
     <string name="conversationsDeleted">S\'ha suprimit la conversa</string>
     <string name="activity_seed_title_2">Coneix la teva frase de recuperació</string>
     <string name="activity_seed_explanation">La teva frase de recuperació és la clau principal del teu ID de Session — pots fer-la servir per a restaurar la teva ID de Session si perds l\'accés al dispositiu. Emmagatzema la frase de recuperació en un lloc segur i no la donis a ningú.</string>
-    <string name="activity_seed_reveal_button_title">Mantingues premut per a revelar</string>
     <string name="onionRoutingPath">Ruta</string>
     <string name="onionRoutingPathEntryNode">Node d\'entrada</string>
     <string name="onionRoutingPathServiceNode">Node de servei</string>

diff --git a/libsession/src/main/res/values-cs-rCZ/strings.xml b/libsession/src/main/res/values-cs-rCZ/strings.xml
@@ -18,7 +18,6 @@
     <!-- CommunicationActions -->
     <!-- ContactsCursorLoader -->
     <!-- ConversationItem -->
-    <string name="ConversationItem_error_not_delivered">Odeslání se nezdařilo, klikněte pro podrobnosti</string>
     <!-- ConversationActivity -->
     <string name="attachmentsAdd">Přidat přílohu</string>
     <string name="message">Zpráva</string>
@@ -187,7 +186,6 @@
     <string name="conversationsDeleted">Konverzace byla smazána</string>
     <string name="activity_seed_title_2">Zadejte frázi pro obnovení</string>
     <string name="activity_seed_explanation">Ahoj</string>
-    <string name="activity_seed_reveal_button_title">Podrž pro zobrazení</string>
     <string name="onionRoutingPath">Cesta</string>
     <string name="onionRoutingPathEntryNode">Vstupní uzel</string>
     <string name="onionRoutingPathServiceNode">Provozní uzel</string>

diff --git a/libsession/src/main/res/values-cs/strings.xml b/libsession/src/main/res/values-cs/strings.xml
@@ -18,7 +18,6 @@
     <!-- CommunicationActions -->
     <!-- ContactsCursorLoader -->
     <!-- ConversationItem -->
-    <string name="ConversationItem_error_not_delivered">Odeslání se nezdařilo, klikněte pro podrobnosti</string>
     <!-- ConversationActivity -->
     <string name="attachmentsAdd">Přidat přílohu</string>
     <string name="message">Zpráva</string>
@@ -187,7 +186,6 @@
     <string name="conversationsDeleted">Konverzace byla smazána</string>
     <string name="activity_seed_title_2">Zadejte frázi pro obnovení</string>
     <string name="activity_seed_explanation">Ahoj</string>
-    <string name="activity_seed_reveal_button_title">Podrž pro zobrazení</string>
     <string name="onionRoutingPath">Cesta</string>
     <string name="onionRoutingPathEntryNode">Vstupní uzel</string>
     <string name="onionRoutingPathServiceNode">Provozní uzel</string>

diff --git a/libsession/src/main/res/values-cy-rGB/strings.xml b/libsession/src/main/res/values-cy-rGB/strings.xml
@@ -17,7 +17,6 @@
     <!-- CommunicationActions -->
     <!-- ContactsCursorLoader -->
     <!-- ConversationItem -->
-    <string name="ConversationItem_error_not_delivered">Methodd yr anfon, tapiwch am fanylion</string>
     <!-- ConversationActivity -->
     <string name="attachmentsAdd">Ychwanegu atodiad</string>
     <string name="blockUnblock">Dadrwystro</string>

diff --git a/libsession/src/main/res/values-cy/strings.xml b/libsession/src/main/res/values-cy/strings.xml
@@ -17,7 +17,6 @@
     <!-- CommunicationActions -->
     <!-- ContactsCursorLoader -->
     <!-- ConversationItem -->
-    <string name="ConversationItem_error_not_delivered">Methodd yr anfon, tapiwch am fanylion</string>
     <!-- ConversationActivity -->
     <string name="attachmentsAdd">Ychwanegu atodiad</string>
     <string name="blockUnblock">Dadrwystro</string>

diff --git a/libsession/src/main/res/values-da-rDK/strings.xml b/libsession/src/main/res/values-da-rDK/strings.xml
@@ -18,7 +18,6 @@
     <!-- CommunicationActions -->
     <!-- ContactsCursorLoader -->
     <!-- ConversationItem -->
-    <string name="ConversationItem_error_not_delivered">Afsendelse mislykkedes, tryk for detaljer</string>
     <!-- ConversationActivity -->
     <string name="attachmentsAdd">Vedhæft fil</string>
     <string name="message">Besked</string>
@@ -184,7 +183,6 @@
     <string name="conversationsDeleted">Samtale slettet</string>
     <string name="activity_seed_title_2">Mød din gendannelsessætning</string>
     <string name="activity_seed_explanation">Din gendannelsessætning er hovednøglen til dit Session ID - du kan bruge den til at gendanne dit Session ID, hvis du mister adgang til din enhed. Gem din gendannelsessætning på et sikkert sted, og giv det ikke til nogen.</string>
-    <string name="activity_seed_reveal_button_title">Hold nede for at se</string>
     <string name="onionRoutingPath">Sti</string>
     <string name="onionRoutingPathDestination">Destination</string>
     <string name="learnMore">Læs mere</string>

diff --git a/libsession/src/main/res/values-da/strings.xml b/libsession/src/main/res/values-da/strings.xml
@@ -18,7 +18,6 @@
     <!-- CommunicationActions -->
     <!-- ContactsCursorLoader -->
     <!-- ConversationItem -->
-    <string name="ConversationItem_error_not_delivered">Afsendelse mislykkedes, tryk for detaljer</string>
     <!-- ConversationActivity -->
     <string name="attachmentsAdd">Vedhæft fil</string>
     <string name="message">Besked</string>
@@ -184,7 +183,6 @@
     <string name="conversationsDeleted">Samtale slettet</string>
     <string name="activity_seed_title_2">Mød din gendannelsessætning</string>
     <string name="activity_seed_explanation">Din gendannelsessætning er hovednøglen til dit Session ID - du kan bruge den til at gendanne dit Session ID, hvis du mister adgang til din enhed. Gem din gendannelsessætning på et sikkert sted, og giv det ikke til nogen.</string>
-    <string name="activity_seed_reveal_button_title">Hold nede for at se</string>
     <string name="onionRoutingPath">Sti</string>
     <string name="onionRoutingPathDestination">Destination</string>
     <string name="learnMore">Læs mere</string>

diff --git a/libsession/src/main/res/values-de-rDE/strings.xml b/libsession/src/main/res/values-de-rDE/strings.xml
@@ -18,7 +18,6 @@
     <!-- CommunicationActions -->
     <!-- ContactsCursorLoader -->
     <!-- ConversationItem -->
-    <string name="ConversationItem_error_not_delivered">Senden fehlgeschlagen, für Details tippen</string>
     <!-- ConversationActivity -->
     <string name="attachmentsAdd">Anhang hinzufügen</string>
     <string name="message">Nachricht</string>
@@ -185,7 +184,6 @@
     <string name="conversationsDeleted">Die Unterhaltung wurde gelöscht.</string>
     <string name="activity_seed_title_2">Das ist Ihr Wiederherstellungssatz.</string>
     <string name="activity_seed_explanation">Ihr Wiederherstellungssatz ist der Hauptschlüssel für Ihre Session ID. Mit diesem Satz können Sie Ihre Session ID wiederherstellen, wenn Sie den Zugriff auf Ihr Gerät verlieren. Bewahren Sie Ihren Wiederherstellungssatz an einem sicheren Ort auf und geben Sie ihn an niemandem weiter.</string>
-    <string name="activity_seed_reveal_button_title">Zur Anzeige gedrückt halten</string>
     <string name="onionRoutingPath">Pfad</string>
     <string name="onionRoutingPathEntryNode">Eingangsknoten</string>
     <string name="onionRoutingPathServiceNode">Dienstknoten</string>

diff --git a/libsession/src/main/res/values-de/strings.xml b/libsession/src/main/res/values-de/strings.xml
@@ -18,7 +18,6 @@
     <!-- CommunicationActions -->
     <!-- ContactsCursorLoader -->
     <!-- ConversationItem -->
-    <string name="ConversationItem_error_not_delivered">Senden fehlgeschlagen, für Details tippen</string>
     <!-- ConversationActivity -->
     <string name="attachmentsAdd">Anhang hinzufügen</string>
     <string name="message">Nachricht</string>
@@ -185,7 +184,6 @@
     <string name="conversationsDeleted">Die Unterhaltung wurde gelöscht.</string>
     <string name="activity_seed_title_2">Das ist Ihr Wiederherstellungssatz.</string>
     <string name="activity_seed_explanation">Ihr Wiederherstellungssatz ist der Hauptschlüssel für Ihre Session ID. Mit diesem Satz können Sie Ihre Session ID wiederherstellen, wenn Sie den Zugriff auf Ihr Gerät verlieren. Bewahren Sie Ihren Wiederherstellungssatz an einem sicheren Ort auf und geben Sie ihn an niemandem weiter.</string>
-    <string name="activity_seed_reveal_button_title">Zur Anzeige gedrückt halten</string>
     <string name="onionRoutingPath">Pfad</string>
     <string name="onionRoutingPathEntryNode">Eingangsknoten</string>
     <string name="onionRoutingPathServiceNode">Dienstknoten</string>