Merge branch 'main' into adb/account-move-to-top

CHANGELOG.md

@@ -15,6 +15,7 @@
 * Improved separation between unencryted chats/contacts and encrypted ones, avoiding mixing of encrypted and unencrypted messages in the same chat
 * Removed padlocks, as encrypted is the default "normal" state. Instead, unencrypted email is marked with a small email / letter  (✉️) icon
 * Classic email chats/threads get a big email / letter icon making it easy to recognize
+* After some time, add a device message asking to donate. Can't wait? Donate today at https://delta.chat/donate
 * Allow to sort profiles up in the profile switcher
 * Update to core 2.1.0
 

src/main/java/org/thoughtcrime/securesms/connect/DcHelper.java

@@ -252,6 +252,7 @@ public class DcHelper {
     dcContext.setStockTranslation(177, context.getString(R.string.reaction_by_other));
     dcContext.setStockTranslation(190, context.getString(R.string.secure_join_wait));
     dcContext.setStockTranslation(192, context.getString(R.string.secure_join_takes_longer));
+    dcContext.setStockTranslation(193, context.getString(R.string.donate_device_msg));
   }
 
   public static File getImexDir() {

src/main/res/values-de/strings.xml

@@ -261,6 +261,10 @@
     <string name="please_enter_broadcast_list_name">Bitten einen Namen für die Broadcast-Liste eingeben.</string>
     <!-- consider keeping the term "channel" as in WhatsApp or Telegram -->
     <string name="channel_name">Name des Kanals</string>
+    <!-- "New" as in "Create New E-Mail"; shown together with "New Group" and "New Channel" -->
+    <string name="new_email">Neue E-Mail</string>
+    <!-- the "Subject" of an e-mail, use the term common in classic e-mail apps -->
+    <string name="subject">Betreff</string>
     <string name="menu_send">Senden</string>
     <string name="menu_toggle_keyboard">Emojis einblenden</string>
     <string name="menu_edit_group">Gruppe bearbeiten</string>

src/main/res/values-es/strings.xml

@@ -255,6 +255,12 @@
     <string name="broadcast_lists">Difusiones</string>
     <!-- deprecated -->
     <string name="new_broadcast_list">Nueva difusión</string>
+    <!-- consider keeping the term "channel" as in WhatsApp or Telegram -->
+    <string name="channel">Canal</string>
+    <!-- consider keeping the term "channel" as in WhatsApp or Telegram -->
+    <string name="channels">Canales</string>
+    <!-- consider keeping the term "channel" as in WhatsApp or Telegram -->
+    <string name="new_channel">Nuevo canal</string>
     <string name="add_recipients">Agregar destinatarios</string>
     <!-- deprecated -->
     <string name="edit_broadcast_list">Editar difusión</string>
@@ -262,6 +268,8 @@
     <string name="broadcast_list_name">Nombre de difusión</string>
     <!-- deprecated -->
     <string name="please_enter_broadcast_list_name">Por favor, introduce un nombre para la difusión.</string>
+    <!-- consider keeping the term "channel" as in WhatsApp or Telegram -->
+    <string name="channel_name">Nombre del canal</string>
     <string name="menu_send">Enviar</string>
     <string name="menu_toggle_keyboard">Alternar teclado emoji</string>
     <string name="menu_edit_group">Editar grupo</string>
@@ -271,6 +279,7 @@
     <string name="menu_unarchive_chat">Des-archivar chat</string>
     <string name="menu_add_attachment">Añadir adjunto</string>
     <string name="menu_leave_group">Abandonar grupo</string>
+    <string name="menu_leave_channel">Salir del canal</string>
     <string name="menu_delete_chat">Eliminar chat</string>
     <!-- Command to delete all messages in a chat. The chat itself will not be deleted but will be empty afterwards, so make sure to be different from "Delete Chat" here. "Clear" is a verb here, "Empty Chat" would also be fine (eg. in German "Chat leeren") -->
     <string name="clear_chat">Vaciar chat</string>
@@ -391,6 +400,9 @@
     <string name="videochat_invitation">Invitación a videollamada</string>
     <string name="videochat_invitation_body">Fuiste invitado a una videollamada, click en %1$s para unirse.</string>
 
+    <!-- get confirmations -->
+    <!-- confirmation for leaving groups, channels, broadcasts or a mailinglists. If a subject is needed, "Are you sure you want to leave the chat?" would work as well -->
+    <string name="ask_leave_group">¿Seguro que quieres abandonar este canal?</string>
     <plurals name="ask_delete_chat">
         <item quantity="one">¿Eliminar %d chat de todos tus dispositivos?</item>
         <item quantity="many">¿Eliminar %d chats de todos tus dispositivos?</item>
@@ -421,6 +433,8 @@
     <string name="ask_remove_members">¿Eliminar a %1$s del grupo?</string>
     <!-- deprecated -->
     <string name="ask_remove_from_broadcast">¿Eliminar %1$s de la lista de difusión?</string>
+    <!-- %1$s is replaced by a comma-separated list of names -->
+    <string name="ask_remove_from_channel">¿Quita %1$s del canal?</string>
     <string name="open_url_confirmation">¿Quieres abrir este enlace?</string>
 
 
@@ -455,6 +469,8 @@
     <string name="chat_new_one_to_one_hint">Envíe un mensaje a %1$s.</string>
     <!-- deprecated -->
     <string name="chat_new_broadcast_hint">En una difusión, los destinatarios recibirán mensajes en un chat de solo lectura contigo.</string>
+    <!-- consider keeping the term "channel" as in WhatsApp or Telegram -->
+    <string name="chat_new_channel_hint">Canales son una herramienta para comunicación de uno a muchos para crear un transmisión de mensajes.</string>
     <string name="chat_new_group_hint">Los demás sólo verán este grupo después de que hayas enviado un primer mensaje.</string>
     <string name="chat_record_slide_to_cancel">Deslice para cancelar</string>
     <string name="chat_record_explain">Mantenga pulsado para grabar un mensaje de voz, suelte para enviar</string>
@@ -921,6 +937,8 @@
     <string name="remove_member_by_you">Eliminaste al miembro %1$s.</string>
     <!-- %1$s will be replaced by name and address of the contact removed from the group, %2$s will be replaced by name and address of the contact who did the action -->
     <string name="remove_member_by_other">Miembro %1$s eliminado por %2$s.</string>
+    <!-- "left" in the meaning of "exited". This string is added to a chat after groups, channels, broadcasts or mailinglists are left. If a subject is needed, "You left the chat." would work as well. -->
+    <string name="group_left_by_you">Abandonaste.</string>
     <!-- "left" in the meaning of "exited"; %1$s will be replaced by name and address of the contact leaving the group -->
     <string name="group_left_by_other">Grupo abandonado por %1$s.</string>
     <string name="group_image_deleted_by_you">Eliminaste la imagen del grupo.</string>

src/main/res/values-hu/strings.xml

@@ -97,7 +97,7 @@
     <string name="no_browser_installed">Nincs telepítve böngésző.</string>
     <string name="file_not_found">%1$s nem található.</string>
     <!-- the placeholder will be replaced by the name of a file -->
-    <string name="cannot_save_file">Nem lehet elmenteni a következőt: %1$s.</string>
+    <string name="cannot_save_file">Nem lehet menteni a következőt: %1$s.</string>
     <string name="copied_to_clipboard">Vágólapra másolva.</string>
     <string name="contacts_headline">Névjegyek</string>
     <string name="email_address">E-mail-cím</string>
@@ -246,6 +246,12 @@
     <string name="broadcast_lists">Adásliták</string>
     <!-- deprecated -->
     <string name="new_broadcast_list">Új adáslista</string>
+    <!-- consider keeping the term "channel" as in WhatsApp or Telegram -->
+    <string name="channel">Csatorna</string>
+    <!-- consider keeping the term "channel" as in WhatsApp or Telegram -->
+    <string name="channels">Csatornák</string>
+    <!-- consider keeping the term "channel" as in WhatsApp or Telegram -->
+    <string name="new_channel">Új csatorna</string>
     <string name="add_recipients">Címzettek hozzáadása</string>
     <!-- deprecated -->
     <string name="edit_broadcast_list">Adáslista szerkesztése</string>
@@ -253,6 +259,8 @@
     <string name="broadcast_list_name">Adáslista neve</string>
     <!-- deprecated -->
     <string name="please_enter_broadcast_list_name">Adjon meg egy nevet az adáslistának</string>
+    <!-- consider keeping the term "channel" as in WhatsApp or Telegram -->
+    <string name="channel_name">Csatorna neve</string>
     <string name="menu_send">Küldés</string>
     <string name="menu_toggle_keyboard">Váltás emodzsibillentyűzetre</string>
     <string name="menu_edit_group">Csoport szerkesztése</string>
@@ -262,6 +270,7 @@
     <string name="menu_unarchive_chat">Archiválás visszavonása</string>
     <string name="menu_add_attachment">Fájl mellékelése</string>
     <string name="menu_leave_group">Csoport elhagyása</string>
+    <string name="menu_leave_channel">Csatorna elhagyása</string>
     <string name="menu_delete_chat">Csevegés törlése</string>
     <!-- Command to delete all messages in a chat. The chat itself will not be deleted but will be empty afterwards, so make sure to be different from "Delete Chat" here. "Clear" is a verb here, "Empty Chat" would also be fine (eg. in German "Chat leeren") -->
     <string name="clear_chat">Csevegés kiürítése</string>
@@ -363,7 +372,7 @@
         <item quantity="one">A következő fájl elküldése neki: %s?</item>
         <item quantity="other">A következő %d fájl elküldése „%s” számára?</item>
     </plurals>
-    <string name="file_saved_to">A fájl elmentve ide: „%1$s”.</string>
+    <string name="file_saved_to">Fájl mentve ide: „%1$s”.</string>
 
     <string name="videochat">Videócsevegés</string>
     <string name="videochat_invite_user_to_videochat">Meghívja egy videócsevegésbe őt: %1$s?</string>
@@ -381,6 +390,9 @@
     <string name="videochat_invitation">Videócsevegési meghívó</string>
     <string name="videochat_invitation_body">Ön meg lett híva egy videócsevegésbe, kattintson ide: %1$s a csatlakozáshoz.</string>
 
+    <!-- get confirmations -->
+    <!-- confirmation for leaving groups, channels, broadcasts or a mailinglists. If a subject is needed, "Are you sure you want to leave the chat?" would work as well -->
+    <string name="ask_leave_group">Biztosan elhagyja a csatornát?</string>
     <plurals name="ask_delete_chat">
         <item quantity="one">Töröl %d csevegést az összes eszközén?</item>
         <item quantity="other">Töröl %d csevegést az összes eszközén?</item>
@@ -408,6 +420,8 @@
     <string name="ask_remove_members">Eltávolítja a csoportból őt: %1$s?</string>
     <!-- deprecated -->
     <string name="ask_remove_from_broadcast">Eltávolítja az adáslistából őt: %1$s?</string>
+    <!-- %1$s is replaced by a comma-separated list of names -->
+    <string name="ask_remove_from_channel">Eltávolítja a csatornából a következőt: %1$s?</string>
     <string name="open_url_confirmation">Biztosan megnyitja ezt a hivatkozást?</string>
 
 
@@ -439,6 +453,8 @@
     <string name="chat_new_one_to_one_hint">Üzenet küldése „%1$s” számára.</string>
     <!-- deprecated -->
     <string name="chat_new_broadcast_hint">Az adáslistán a címzettek csak olvasható módban kapják meg az üzeneteket öntől.</string>
+    <!-- consider keeping the term "channel" as in WhatsApp or Telegram -->
+    <string name="chat_new_channel_hint">A csatornák egy blogszerű eszköz az üzenetek megosztására a közönséggel.</string>
     <string name="chat_new_group_hint">Mások csak az első üzenet elküldése után fogják látni ezt a csoportot.</string>
     <string name="chat_record_slide_to_cancel">Visszavonás csúsztatással</string>
     <string name="chat_record_explain">Hangüzenet rögzítéséhez koppintson és tartsa lenyomva; Az elküldéshez engedje el.</string>
@@ -762,8 +778,8 @@
     <string name="pref_chats">Csevegések</string>
     <string name="pref_in_chat_sounds">Csevegésen belüli hangok</string>
     <string name="pref_view_log">Naplófájl megtekintése</string>
-    <string name="pref_saved_log">A naplófájl elmentve a „Letöltések” nevű mappába</string>
-    <string name="pref_save_log_failed">Nem sikerült elmenteni a naplófájlt</string>
+    <string name="pref_saved_log">A naplófájl mentve a „Letöltések” nevű mappába</string>
+    <string name="pref_save_log_failed">Nem sikerült menteni a naplófájlt</string>
     <string name="pref_log_header">Naplófájl</string>
     <string name="pref_other">Egyéb</string>
     <string name="pref_backup">Biztonsági mentés</string>
@@ -905,6 +921,8 @@
     <string name="remove_member_by_you">Ön eltávolította őt: %1$s.</string>
     <!-- %1$s will be replaced by name and address of the contact removed from the group, %2$s will be replaced by name and address of the contact who did the action -->
     <string name="remove_member_by_other">%2$s eltávolította őt: %1$s.</string>
+    <!-- "left" in the meaning of "exited". This string is added to a chat after groups, channels, broadcasts or mailinglists are left. If a subject is needed, "You left the chat." would work as well. -->
+    <string name="group_left_by_you">Ön elhagyta a csevegést.</string>
     <!-- "left" in the meaning of "exited"; %1$s will be replaced by name and address of the contact leaving the group -->
     <string name="group_left_by_other">%1$s elhagyta a csoportot.</string>
     <string name="group_image_deleted_by_you">Ön törölte a csoport profilképét.</string>

src/main/res/values-pl/strings.xml

@@ -264,6 +264,12 @@
     <string name="broadcast_lists">Lista rozgłoszeniowa</string>
     <!-- deprecated -->
     <string name="new_broadcast_list">Nowa lista rozgłoszeniowa</string>
+    <!-- consider keeping the term "channel" as in WhatsApp or Telegram -->
+    <string name="channel">Kanał</string>
+    <!-- consider keeping the term "channel" as in WhatsApp or Telegram -->
+    <string name="channels">Kanały</string>
+    <!-- consider keeping the term "channel" as in WhatsApp or Telegram -->
+    <string name="new_channel">Nowy kanał</string>
     <string name="add_recipients">Dodaj odbiorców</string>
     <!-- deprecated -->
     <string name="edit_broadcast_list">Edytuj listę rozgłoszeniową</string>
@@ -271,6 +277,8 @@
     <string name="broadcast_list_name">Nazwa listy rozgłoszeniowej</string>
     <!-- deprecated -->
     <string name="please_enter_broadcast_list_name">Wpisz nazwę listy rozgłoszeniowej</string>
+    <!-- consider keeping the term "channel" as in WhatsApp or Telegram -->
+    <string name="channel_name">Nazwa kanału</string>
     <string name="menu_send">Wyślij</string>
     <string name="menu_toggle_keyboard">Przełącz klawiaturę emoji</string>
     <string name="menu_edit_group">Edytuj grupę</string>
@@ -280,6 +288,7 @@
     <string name="menu_unarchive_chat">Przywróć czat z archiwum</string>
     <string name="menu_add_attachment">Dodaj załącznik</string>
     <string name="menu_leave_group">Opuść grupę</string>
+    <string name="menu_leave_channel">Opuść kanał</string>
     <string name="menu_delete_chat">Usuń czat</string>
     <!-- Command to delete all messages in a chat. The chat itself will not be deleted but will be empty afterwards, so make sure to be different from "Delete Chat" here. "Clear" is a verb here, "Empty Chat" would also be fine (eg. in German "Chat leeren") -->
     <string name="clear_chat">Wyczyść czat</string>
@@ -401,6 +410,9 @@
     <string name="videochat_invitation">Zaproszenie do czatu wideo</string>
     <string name="videochat_invitation_body">Masz zaproszenie do czatu wideo, naciśnij %1$s, aby dołączyć.</string>
 
+    <!-- get confirmations -->
+    <!-- confirmation for leaving groups, channels, broadcasts or a mailinglists. If a subject is needed, "Are you sure you want to leave the chat?" would work as well -->
+    <string name="ask_leave_group">Na pewno chcesz opuścić?</string>
     <plurals name="ask_delete_chat">
         <item quantity="one">Usunąć %d czat ze wszystkich urządzeń?</item>
         <item quantity="few">Usunąć %d czaty ze wszystkich urządzeń?</item>
@@ -434,6 +446,8 @@
     <string name="ask_remove_members">Usunąć %1$s z grupy?</string>
     <!-- deprecated -->
     <string name="ask_remove_from_broadcast">Usunąć odbiorcę %1$s z listy rozgłoszeniowej?</string>
+    <!-- %1$s is replaced by a comma-separated list of names -->
+    <string name="ask_remove_from_channel">Usunąć %1$s z kanału?</string>
     <string name="open_url_confirmation">Czy chcesz otworzyć ten link?</string>
 
 
@@ -471,6 +485,8 @@
     <string name="chat_new_one_to_one_hint">Wyślij wiadomość do %1$s.</string>
     <!-- deprecated -->
     <string name="chat_new_broadcast_hint">Na liście rozgłoszeniowej odbiorcy będą otrzymywać wiadomości w czacie tylko do odczytu.</string>
+    <!-- consider keeping the term "channel" as in WhatsApp or Telegram -->
+    <string name="chat_new_channel_hint">Kanały są narzędziem typu „jeden do wielu” do nadawania wiadomości.</string>
     <string name="chat_new_group_hint">Napisz pierwszą wiadomość, by inni mogli odpowiedzieć w tej grupie.\n\n• Nie ma problemu, jeśli nie wszyscy członkowie korzystają z Delta Chat.\n\n• Dostarczenie pierwszej wiadomości może chwilę potrwać.</string>
     <string name="chat_record_slide_to_cancel">PRZESUŃ, BY ANULOWAĆ</string>
     <string name="chat_record_explain">Dotknij i przytrzymaj, aby nagrać wiadomość głosową, zwolnij, aby wysłać</string>
@@ -529,7 +545,7 @@
     <string name="open_external_url_trust_domain">Nie pytaj ponownie dla %1$s</string>
     <string name="puny_code_warning_header">Wykryto podejrzany link</string>
     <!-- placeholder contains the hostname converted to ascii -->
-    <string name="puny_code_warning_question">Czy na pewno chcesz odwiedzić %1$s?</string>
+    <string name="puny_code_warning_question">Na pewno chcesz odwiedzić %1$s?</string>
     <!-- this message is shown whenever a link with non-latin characters is clicked. first placeholder is original hostname with special chars, second placeholder is hostname encoded in ascii -->
     <string name="puny_code_warning_description">Wybrano link, który może przekłamywać znaki poprzez użycie podobnie wyglądających znaków z różnych alfabetów. Podążanie za linkiem oznaczonym %1$s doprowadzi do %2$s, co jest normalne dla znaków niełacińskich. Jeśli nie spodziewałeś się takich znaków, ten link może być szkodliwy.</string>
 
@@ -716,7 +732,7 @@
     <!-- Menu entry to sort an item to the beginning of a list. Only "To Top" may do as well in some translations, if that helps to stay shorter. -->
     <string name="move_to_top">Przenieś na górę</string>
     <string name="delete_account">Usuń konto</string>
-    <string name="delete_account_ask">Czy na pewno chcesz usunąć dane swojego konta?</string>
+    <string name="delete_account_ask">Na pewno chcesz usunąć dane swojego konta?</string>
     <string name="delete_account_explain_with_name">Wszystkie dane konta „%s” na tym urządzeniu zostaną usunięte, w tym konfiguracja szyfrowania end-to-end, kontakty, czaty, wiadomości i multimedia. Tej operacji nie można cofnąć.</string>
     <string name="unconfigured_account">Nieskonfigurowane konto</string>
     <string name="unconfigured_account_hint">Otwórz konto, aby je skonfigurować</string>
@@ -937,6 +953,8 @@
     <string name="remove_member_by_you">Usunięto członka %1$s.</string>
     <!-- %1$s will be replaced by name and address of the contact removed from the group, %2$s will be replaced by name and address of the contact who did the action -->
     <string name="remove_member_by_other">Użytkownik %2$s usunął członka %1$s.</string>
+    <!-- "left" in the meaning of "exited". This string is added to a chat after groups, channels, broadcasts or mailinglists are left. If a subject is needed, "You left the chat." would work as well. -->
+    <string name="group_left_by_you">Opuszczono</string>
     <!-- "left" in the meaning of "exited"; %1$s will be replaced by name and address of the contact leaving the group -->
     <string name="group_left_by_other">Grupa opuszczona przez %1$s.</string>
     <string name="group_image_deleted_by_you">Usunięto obraz grupy.</string>

src/main/res/values/strings.xml

@@ -261,6 +261,10 @@
     <string name="please_enter_broadcast_list_name">Please enter a name for the broadcast list.</string>
     <!-- consider keeping the term "channel" as in WhatsApp or Telegram -->
     <string name="channel_name">Channel Name</string>
+    <!-- "New" as in "Create New E-Mail"; shown together with "New Group" and "New Channel" -->
+    <string name="new_email">New E-Mail</string>
+    <!-- the "Subject" of an e-mail, use the term common in classic e-mail apps -->
+    <string name="subject">Subject</string>
     <string name="menu_send">Send</string>
     <string name="menu_toggle_keyboard">Toggle Emoji Keyboard</string>
     <string name="menu_edit_group">Edit Group</string>
@@ -355,6 +359,7 @@
     <!-- Menu item beside an app/chat that adds an icon to the system's home screen. If the user taps that icon, the app/chat is opened directly. -->
     <string name="add_to_home_screen">Add to Home Screen</string>
     <string name="donate">Donate</string>
+    <string name="donate_device_msg">❤️ Seems you\'re enjoying Delta Chat!\n\nPlease consider donating to help ensure that Delta Chat stays free for everyone.\n\nWhile Delta Chat is free to use and open source, development costs money. Help us to keep Delta Chat independent and make it even more awesome in the future.\n\nhttps://delta.chat/donate</string>
 
     <string name="mute_for_one_hour">Mute for 1 hour</string>
     <string name="mute_for_eight_hours">Mute for 8 hours</string>