From 9db0c85cda18df806c5aea39b784fd6c130fd48f Mon Sep 17 00:00:00 2001
From: Daniel Gultsch <daniel@gultsch.de>
Date: Wed, 2 Sep 2020 10:13:10 +0200
Subject: [PATCH] rename 'add to favorites' to 'pin to top'

---
 src/main/res/values-de/strings.xml     |  8 ++++++--
 src/main/res/values-es/strings.xml     |  2 --
 src/main/res/values-fr/strings.xml     |  2 --
 src/main/res/values-gl/strings.xml     |  9 +++++++--
 src/main/res/values-hu/strings.xml     |  2 --
 src/main/res/values-it/strings.xml     |  2 --
 src/main/res/values-pl/strings.xml     |  2 --
 src/main/res/values-pt-rBR/strings.xml |  2 --
 src/main/res/values-ro-rRO/strings.xml | 16 ++++++++++++++--
 src/main/res/values-ru/strings.xml     |  2 --
 src/main/res/values-uk/strings.xml     |  2 --
 src/main/res/values-zh-rCN/strings.xml |  2 --
 src/main/res/values/strings.xml        |  4 ++--
 13 files changed, 29 insertions(+), 26 deletions(-)

diff --git a/src/main/res/values-de/strings.xml b/src/main/res/values-de/strings.xml
index a992fa2ec..3a8fb0551 100644
--- a/src/main/res/values-de/strings.xml
+++ b/src/main/res/values-de/strings.xml
@@ -753,6 +753,7 @@
   <string name="ongoing_calls_channel_name">Laufende Anrufe</string>
   <string name="silent_messages_channel_name">Lautlose Nachrichten</string>
   <string name="silent_messages_channel_description">Diese Benachrichtigungsart wird verwendet, um Benachrichtigungen anzuzeigen, die keinen Ton auslösen sollen. Zum Beispiel, wenn du auf einem anderen Gerät aktiv bist (Schonfrist).</string>
+  <string name="delivery_failed_channel_name">Fehlgeschlagene Zustellungen</string>
   <string name="pref_message_notification_settings">Benachrichtigungseinstellungen</string>
   <string name="pref_incoming_call_notification_settings">Anrufeinstellungen</string>
   <string name="pref_more_notification_settings_summary">Wichtigkeit, Klang, Vibrationen</string>
@@ -920,8 +921,6 @@
   <string name="only_one_call_at_a_time">Du kannst immer nur einen Anruf zur gleichen Zeit machen.</string>
   <string name="return_to_ongoing_call">Zurück zum laufenden Aufruf</string>
   <string name="could_not_switch_camera">Kamera konnte nicht gewechselt werden</string>
-  <string name="add_to_favorites">Zu Favoriten hinzufügen</string>
-  <string name="remove_from_favorites">Von Favoriten entfernen</string>
   <string name="gpx_track">GPX-Strecke</string>
   <string name="could_not_correct_message">Nachricht konnte nicht korrigiert werden</string>
   <string name="search_all_conversations">Alle Unterhaltungen</string>
@@ -940,4 +939,9 @@
     <item quantity="one">%1$d Teilnehmer anzeigen</item>
     <item quantity="other">%1$d Teilnehmer anzeigen</item>
   </plurals>
+  <plurals name="some_messages_could_not_be_delivered">
+    <item quantity="one">Eine Nachricht konnte nicht zugestellt werden</item>
+    <item quantity="other">Einige Nachrichten konnten nicht zugestellt werden</item>
+  </plurals>
+  <string name="failed_deliveries">Fehlgeschlagene Zustellungen</string>
 </resources>
diff --git a/src/main/res/values-es/strings.xml b/src/main/res/values-es/strings.xml
index ac7021db3..31301b574 100644
--- a/src/main/res/values-es/strings.xml
+++ b/src/main/res/values-es/strings.xml
@@ -920,8 +920,6 @@
   <string name="only_one_call_at_a_time">Solo puedes hacer una llamada a la vez</string>
   <string name="return_to_ongoing_call">Volver a la llamada en curso</string>
   <string name="could_not_switch_camera">No se ha podido cambiar de cámara</string>
-  <string name="add_to_favorites">Añadir a los favoritos</string>
-  <string name="remove_from_favorites">Eliminar de favoritos</string>
   <string name="gpx_track">Recorrido GPX</string>
   <string name="could_not_correct_message">No se pudo corregir el mensaje</string>
   <string name="search_all_conversations">Todas las conversaciones</string>
diff --git a/src/main/res/values-fr/strings.xml b/src/main/res/values-fr/strings.xml
index 86485b20c..523ec019f 100644
--- a/src/main/res/values-fr/strings.xml
+++ b/src/main/res/values-fr/strings.xml
@@ -911,8 +911,6 @@
   <string name="only_one_call_at_a_time">Vous ne pouvez prendre qu\'un appel à la fois.</string>
   <string name="return_to_ongoing_call">Reprendre l\'appel en cours</string>
   <string name="could_not_switch_camera">Impossible de changer de caméra</string>
-  <string name="add_to_favorites">Ajouter aux favoris</string>
-  <string name="remove_from_favorites">Enlever des favoris</string>
   <plurals name="view_users">
     <item quantity="one">Voir %1$d participant</item>
     <item quantity="other">Voir %1$d participants</item>
diff --git a/src/main/res/values-gl/strings.xml b/src/main/res/values-gl/strings.xml
index 5e4795fa4..47edbbe2e 100644
--- a/src/main/res/values-gl/strings.xml
+++ b/src/main/res/values-gl/strings.xml
@@ -753,6 +753,7 @@
   <string name="ongoing_calls_channel_name">Chamadas realizadas</string>
   <string name="silent_messages_channel_name">Mensaxes acalados</string>
   <string name="silent_messages_channel_description">Este grupo de notificacións é utilizado para mostrar notificacións que non debería activar ningún son. Por exemplo, cando está activo en outro dispositivo (Período de Graza).</string>
+  <string name="delivery_failed_channel_name">Entregas fallidas</string>
   <string name="pref_message_notification_settings">Axustes de notificación das mensaxes</string>
   <string name="pref_incoming_call_notification_settings">Axustes da notificación de chamadas</string>
   <string name="pref_more_notification_settings_summary">Importancia, Son, Vibrar</string>
@@ -920,8 +921,6 @@
   <string name="only_one_call_at_a_time">Só podes manter unha chamada en cada momento.</string>
   <string name="return_to_ongoing_call">Voltar á chamada activa</string>
   <string name="could_not_switch_camera">Non se puido activar a cámara</string>
-  <string name="add_to_favorites">Engadir a favoritas</string>
-  <string name="remove_from_favorites">Eliminar das favoritas</string>
   <string name="gpx_track">Ruta GPX</string>
   <string name="could_not_correct_message">No se pode correxir a mensaxe</string>
   <string name="search_all_conversations">Todas as conversas</string>
@@ -940,4 +939,10 @@
     <item quantity="one">Ver %1$d Participante</item>
     <item quantity="other">Ver %1$d Participantes</item>
   </plurals>
+  <plurals name="some_messages_could_not_be_delivered">
+    <item quantity="one">Unha mensaxe non se entregou</item>
+    <item quantity="other">Algunhas mensaxes non se entregaron</item>
+  </plurals>
+  <string name="failed_deliveries">Entregas fallidas</string>
+  <string name="more_options">Máis opcións</string>
 </resources>
diff --git a/src/main/res/values-hu/strings.xml b/src/main/res/values-hu/strings.xml
index b75c587e2..2201a659f 100644
--- a/src/main/res/values-hu/strings.xml
+++ b/src/main/res/values-hu/strings.xml
@@ -881,8 +881,6 @@
   <string name="only_one_call_at_a_time">Egyszerre csak egy hívásban vehet részt.</string>
   <string name="return_to_ongoing_call">Visszatérés a kimenő híváshoz</string>
   <string name="could_not_switch_camera">Nem sikerült átváltani a kamerát</string>
-  <string name="add_to_favorites">Hozzáadás a kedvencekhez</string>
-  <string name="remove_from_favorites">Eltávolítás a kedvencekből</string>
   <plurals name="view_users">
     <item quantity="one">%1$d résztvevő megtekintése</item>
     <item quantity="other">%1$d résztvevő megtekintése</item>
diff --git a/src/main/res/values-it/strings.xml b/src/main/res/values-it/strings.xml
index a196becd2..b7b8e356a 100644
--- a/src/main/res/values-it/strings.xml
+++ b/src/main/res/values-it/strings.xml
@@ -919,8 +919,6 @@
   <string name="only_one_call_at_a_time">Puoi fare solo una chiamata alla volta.</string>
   <string name="return_to_ongoing_call">Torna alla chiamata in corso</string>
   <string name="could_not_switch_camera">Impossibile cambiare fotocamera</string>
-  <string name="add_to_favorites">Aggiungi ai preferiti</string>
-  <string name="remove_from_favorites">Rimuovi dai preferiti</string>
   <string name="gpx_track">Traccia GPX</string>
   <string name="could_not_correct_message">Impossibile correggere il messaggio</string>
   <plurals name="view_users">
diff --git a/src/main/res/values-pl/strings.xml b/src/main/res/values-pl/strings.xml
index 618c0c9df..4353d1394 100644
--- a/src/main/res/values-pl/strings.xml
+++ b/src/main/res/values-pl/strings.xml
@@ -938,8 +938,6 @@ Administrator twojego serwera będzie mógł czytać twoje wiadomości, ale moż
   <string name="only_one_call_at_a_time">Możesz mieć tylko jedno połączenie na raz.</string>
   <string name="return_to_ongoing_call">Powróć do trwającego połączenia</string>
   <string name="could_not_switch_camera">Nie można zmienić aparatu</string>
-  <string name="add_to_favorites">Dodaj do ulubionych</string>
-  <string name="remove_from_favorites">Usuń z ulubionych</string>
   <string name="gpx_track">Ścieżka GPX</string>
   <string name="could_not_correct_message">Nie można poprawić wiadomości</string>
   <string name="search_all_conversations">Wszystkie rozmowy</string>
diff --git a/src/main/res/values-pt-rBR/strings.xml b/src/main/res/values-pt-rBR/strings.xml
index a93c3c92b..9e92acd65 100644
--- a/src/main/res/values-pt-rBR/strings.xml
+++ b/src/main/res/values-pt-rBR/strings.xml
@@ -919,8 +919,6 @@
   <string name="only_one_call_at_a_time">Você só pode ter uma chamada de cada vez</string>
   <string name="return_to_ongoing_call">Retornar para a chamada em andamento</string>
   <string name="could_not_switch_camera">Não foi possível trocar a câmera</string>
-  <string name="add_to_favorites">Adicionar aos favoritos</string>
-  <string name="remove_from_favorites">Remover dos favoritos</string>
   <string name="gpx_track">Trilha GPX</string>
   <string name="could_not_correct_message">Não foi possível corrigir a mensagem</string>
   <plurals name="view_users">
diff --git a/src/main/res/values-ro-rRO/strings.xml b/src/main/res/values-ro-rRO/strings.xml
index ef529b1af..8544e841e 100644
--- a/src/main/res/values-ro-rRO/strings.xml
+++ b/src/main/res/values-ro-rRO/strings.xml
@@ -4,6 +4,7 @@
   <string name="action_add">Conversație nouă</string>
   <string name="action_accounts">Configurează conturile</string>
   <string name="action_account">Configurează contul</string>
+  <string name="action_end_conversation">Închide conversația</string>
   <string name="action_contact_details">Detalii contact</string>
   <string name="action_muc_details">Detalii discuție de grup</string>
   <string name="channel_details">Detalii canal</string>
@@ -760,6 +761,7 @@
   <string name="ongoing_calls_channel_name">Apeluri în curs</string>
   <string name="silent_messages_channel_name">Mesaje silențioase</string>
   <string name="silent_messages_channel_description">Acest grup de notificări este folosit pentru a arăta notificări care nu emit sunete. De exemplu atunci când sunteți activi pe un alt dispozitiv (Perioada de grație).</string>
+  <string name="delivery_failed_channel_name">Trimiteri eșuate</string>
   <string name="pref_message_notification_settings">Setări de notificare ale mesajelor</string>
   <string name="pref_incoming_call_notification_settings">Setări de notificare ale apelurilor primite</string>
   <string name="pref_more_notification_settings_summary">Importanță, sunete, vibrații</string>
@@ -927,8 +929,6 @@
   <string name="only_one_call_at_a_time">Puteți avea un singur apel simultan.</string>
   <string name="return_to_ongoing_call">Reveniți la apelul în curs</string>
   <string name="could_not_switch_camera">Nu s-a putut face comutarea camerei foto</string>
-  <string name="add_to_favorites">Adaugă la favorite</string>
-  <string name="remove_from_favorites">Înlătură din favorite</string>
   <string name="gpx_track">Traseu GPX</string>
   <string name="could_not_correct_message">Nu s-a putut corecta mesajul</string>
   <string name="search_all_conversations">Toate conversațiile</string>
@@ -938,9 +938,21 @@
   <string name="encrypted_with_omemo">Criptare OMEMO</string>
   <string name="encrypted_with_openpgp">Criptare OpenPGP</string>
   <string name="not_encrypted">Fără criptare</string>
+  <string name="exit">Ieșire</string>
+  <string name="record_voice_mail">Înregistrare mesaj vocal</string>
+  <string name="play_audio">Redare audio</string>
+  <string name="pause_audio">Pauză audio</string>
+  <string name="add_contact_or_create_or_join_group_chat">Adaugă contact, creează sau alătură-te discuției de grup, sau descoperă canale</string>
   <plurals name="view_users">
     <item quantity="one">Arată %1$d participant</item>
     <item quantity="few">Arată %1$d participanți</item>
     <item quantity="other">Arată %1$d de participanți</item>
   </plurals>
+  <plurals name="some_messages_could_not_be_delivered">
+    <item quantity="one">Un mesaj nu a putut fi livrat</item>
+    <item quantity="few">Niște mesaje nu au putut fi livrate</item>
+    <item quantity="other">Niște mesaje nu au putut fi livrate</item>
+  </plurals>
+  <string name="failed_deliveries">Trimiteri eșuate</string>
+  <string name="more_options">Mai multe</string>
 </resources>
diff --git a/src/main/res/values-ru/strings.xml b/src/main/res/values-ru/strings.xml
index 77ff67711..0942bbae8 100644
--- a/src/main/res/values-ru/strings.xml
+++ b/src/main/res/values-ru/strings.xml
@@ -931,8 +931,6 @@
   <string name="only_one_call_at_a_time">Нельзя одновременно совершать больше одного звонка.</string>
   <string name="return_to_ongoing_call">Вернуться к текущему звонку</string>
   <string name="could_not_switch_camera">Не удалось переключить камеру</string>
-  <string name="add_to_favorites">Добавить в избранные</string>
-  <string name="remove_from_favorites">Убрать из избранных</string>
   <plurals name="view_users">
     <item quantity="one">Просмотр %1$d участника</item>
     <item quantity="few">Просмотр %1$d участников</item>
diff --git a/src/main/res/values-uk/strings.xml b/src/main/res/values-uk/strings.xml
index b7e7047bc..34361619d 100644
--- a/src/main/res/values-uk/strings.xml
+++ b/src/main/res/values-uk/strings.xml
@@ -931,8 +931,6 @@
   <string name="only_one_call_at_a_time">Водночас можливо здійснювати лише один виклик.</string>
   <string name="return_to_ongoing_call">Назад до активного виклику</string>
   <string name="could_not_switch_camera">Неможливо перемкнути камеру</string>
-  <string name="add_to_favorites">Додати до обраного</string>
-  <string name="remove_from_favorites">Вилучити з обраного</string>
   <plurals name="view_users">
     <item quantity="one">Перегляд %1$d учасника</item>
     <item quantity="few">Перегляд %1$d учасників</item>
diff --git a/src/main/res/values-zh-rCN/strings.xml b/src/main/res/values-zh-rCN/strings.xml
index 895e6333b..0e44707be 100644
--- a/src/main/res/values-zh-rCN/strings.xml
+++ b/src/main/res/values-zh-rCN/strings.xml
@@ -911,8 +911,6 @@
   <string name="only_one_call_at_a_time">只能同时打一通电话</string>
   <string name="return_to_ongoing_call">返回正在进行的通话</string>
   <string name="could_not_switch_camera">无法切换摄像头</string>
-  <string name="add_to_favorites">添加到收藏夹</string>
-  <string name="remove_from_favorites">从收藏夹删除</string>
   <string name="gpx_track">GPX轨迹</string>
   <string name="could_not_correct_message">无法更正消息</string>
   <plurals name="view_users">
diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml
index 996b7a85d..8362cc28c 100644
--- a/src/main/res/values/strings.xml
+++ b/src/main/res/values/strings.xml
@@ -923,8 +923,8 @@
     <string name="only_one_call_at_a_time">You can only have one call at a time.</string>
     <string name="return_to_ongoing_call">Return to ongoing call</string>
     <string name="could_not_switch_camera">Could not switch camera</string>
-    <string name="add_to_favorites">Add to favorites</string>
-    <string name="remove_from_favorites">Remove from favorites</string>
+    <string name="add_to_favorites">Pin to top</string>
+    <string name="remove_from_favorites">Unpin from top</string>
     <string name="gpx_track">GPX track</string>
     <string name="could_not_correct_message">Could not correct message</string>
     <string name="search_all_conversations">All conversations</string>