Merge remote-tracking branch 'upstream/main'

jni/dc_wrapper.c

@@ -231,12 +231,6 @@ JNIEXPORT jboolean Java_com_b44t_messenger_DcAccounts_backgroundFetch(JNIEnv *en
 }
 
 
-JNIEXPORT jint Java_com_b44t_messenger_DcAccounts_addAccount(JNIEnv *env, jobject obj)
-{
-    return dc_accounts_add_account(get_dc_accounts(env, obj));
-}
-
-
 JNIEXPORT jint Java_com_b44t_messenger_DcAccounts_migrateAccount(JNIEnv *env, jobject obj, jstring dbfile)
 {
     CHAR_REF(dbfile);
@@ -1649,16 +1643,6 @@ JNIEXPORT void Java_com_b44t_messenger_DcMsg_setHtml(JNIEnv *env, jobject obj, j
 }
 
 
-JNIEXPORT void Java_com_b44t_messenger_DcMsg_setFile(JNIEnv *env, jobject obj, jstring file, jstring filemime)
-{
-    CHAR_REF(file);
-    CHAR_REF(filemime);
-        dc_msg_set_file(get_dc_msg(env, obj), filePtr, filemimePtr);
-    CHAR_UNREF(filemime);
-    CHAR_UNREF(file);
-}
-
-
 JNIEXPORT void Java_com_b44t_messenger_DcMsg_forceSticker(JNIEnv *env, jobject obj)
 {
     dc_msg_force_sticker(get_dc_msg(env, obj));

src/main/java/com/b44t/messenger/DcAccounts.java

@@ -35,7 +35,6 @@ public class DcAccounts {
     public native void            setPushDeviceToken   (String token);
     public native boolean         backgroundFetch      (int timeoutSeconds);
 
-    public native int             addAccount           ();
     public native int             migrateAccount       (String dbfile);
     public native boolean         removeAccount        (int accountId);
     public native int[]           getAll               ();

src/main/java/com/b44t/messenger/DcContext.java

@@ -88,7 +88,7 @@ public class DcContext {
     private static final String CONFIG_ACCOUNT_ENABLED = "ui.enabled";
     private static final String CONFIG_MUTE_MENTIONS_IF_MUTED = "ui.mute_mentions_if_muted";
 
-    // when using DcAccounts, use DcAccounts.addAccount() instead
+    // when using DcAccounts, use Rpc.addAccount() instead
     public DcContext(String osName, String dbfile) {
         contextCPtr = createContextCPtr(osName, dbfile);
     }

src/main/java/com/b44t/messenger/DcMsg.java

@@ -159,7 +159,6 @@ public class DcMsg {
     public native void    setText            (String text);
     public native void    setSubject         (String text);
     public native void    setHtml            (String text);
-    public native void    setFile            (String file, String filemime);
     public native void    forceSticker       ();
     public native void    setFileAndDeduplicate(String file, String name, String filemime);
     public native void    setDimension       (int width, int height);

src/main/java/com/b44t/messenger/rpc/Rpc.java

@@ -125,6 +125,10 @@ public class Rpc {
         return getResult("get_account_file_size", accountId).getAsInt();
     }
 
+    public int addAccount() throws RpcException {
+        return getResult("add_account").getAsInt();
+    }
+
     private static class Request {
         private final String jsonrpc = "2.0";
         public final String method;

src/main/java/org/thoughtcrime/securesms/ApplicationContext.java

@@ -26,6 +26,7 @@ import com.b44t.messenger.DcContext;
 import com.b44t.messenger.DcEvent;
 import com.b44t.messenger.DcEventEmitter;
 import com.b44t.messenger.rpc.Rpc;
+import com.b44t.messenger.rpc.RpcException;
 
 import org.thoughtcrime.securesms.connect.AccountManager;
 import org.thoughtcrime.securesms.connect.DcEventCenter;
@@ -126,7 +127,11 @@ public class ApplicationContext extends MultiDexApplication {
       }
     }
     if (allAccounts.length == 0) {
-      dcAccounts.addAccount();
+      try {
+        rpc.addAccount();
+      } catch (RpcException e) {
+        e.printStackTrace();
+      }
     }
     dcContext = dcAccounts.getSelectedAccount();
     notificationCenter = new NotificationCenter(this);

src/main/java/org/thoughtcrime/securesms/MediaPreviewActivity.java

@@ -341,12 +341,7 @@ public class MediaPreviewActivity extends PassphraseRequiredActionBarActivity
       return;
     }
 
-    DcMsg dcMsg = dcContext.getMsg(mediaItem.msgId);
-    DcChat dcChat = dcContext.getChat(dcMsg.getChatId());
-
-    String text = getResources().getQuantityString(
-      dcChat.isDeviceTalk()? R.plurals.ask_delete_messages_simple : R.plurals.ask_delete_messages,
-      1, 1);
+    String text = getResources().getQuantityString(R.plurals.ask_delete_messages_simple, 1, 1);
 
     AlertDialog.Builder builder = new AlertDialog.Builder(this);
     builder.setMessage(text);

src/main/java/org/thoughtcrime/securesms/MessageSelectorFragment.java

@@ -63,9 +63,7 @@ public abstract class MessageSelectorFragment
   protected void handleDeleteMessages(int chatId, final int[] messageIds) {
     DcChat dcChat = DcHelper.getContext(getActivity()).getChat(chatId);
 
-    String text = getActivity().getResources().getQuantityString(
-      dcChat.isDeviceTalk()? R.plurals.ask_delete_messages_simple : R.plurals.ask_delete_messages,
-      messageIds.length, messageIds.length);
+    String text = getActivity().getResources().getQuantityString(R.plurals.ask_delete_messages_simple, messageIds.length, messageIds.length);
 
     AlertDialog dialog = new AlertDialog.Builder(getActivity())
             .setMessage(text)

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

@@ -14,6 +14,8 @@ import androidx.fragment.app.FragmentActivity;
 
 import com.b44t.messenger.DcAccounts;
 import com.b44t.messenger.DcContext;
+import com.b44t.messenger.rpc.Rpc;
+import com.b44t.messenger.rpc.RpcException;
 
 import org.thoughtcrime.securesms.ApplicationContext;
 import org.thoughtcrime.securesms.ConversationListActivity;
@@ -88,15 +90,21 @@ public class AccountManager {
     // add accounts
 
     public int beginAccountCreation(Context context) {
+        Rpc rpc = DcHelper.getRpc(context);
         DcAccounts accounts = DcHelper.getAccounts(context);
         DcContext selectedAccount = accounts.getSelectedAccount();
         if (selectedAccount.isOk()) {
           PreferenceManager.getDefaultSharedPreferences(context).edit().putInt(LAST_ACCOUNT_ID, selectedAccount.getAccountId()).apply();
         }
 
-        int id = accounts.addAccount();
-        resetDcContext(context);
-        return id;
+      int id = 0;
+      try {
+        id = rpc.addAccount();
+      } catch (RpcException e) {
+        e.printStackTrace();
+      }
+      resetDcContext(context);
+      return id;
     }
 
     public boolean canRollbackAccountCreation(Context context) {

src/main/res/drawable/ic_forward_white_24dp.xml

@@ -0,0 +1,3 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android" android:autoMirrored="true" android:height="24dp" android:tint="#FFFFFF" android:viewportHeight="960" android:viewportWidth="960" android:width="24dp">
+    <path android:fillColor="@android:color/white" android:pathData="M640,680L583,624L767,440L583,256L640,200L880,440L640,680ZM80,760L80,600Q80,517 138.5,458.5Q197,400 280,400L527,400L383,256L440,200L680,440L440,680L383,624L527,480L280,480Q230,480 195,515Q160,550 160,600L160,760L80,760Z"/>
+</vector>

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

@@ -175,6 +175,7 @@
         <item quantity="one">%d çat silmək? Artıq chat siyahısında göstərilməyəcək, mesajlar serverdə qalacaq.</item>
         <item quantity="other">%d çat silmək? Artıq chat siyahısında göstərilməyəcək, mesajlar serverdə qalacaq.</item>
     </plurals>
+    <!-- deprecated, use ask_delete_messages_simple -->
     <plurals name="ask_delete_messages">
         <item quantity="one">%dmesaj burada və serverdə silin?</item>
         <item quantity="other">%dmesaj burada və serverdə silin?</item>

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

@@ -334,6 +334,7 @@
     </plurals>
     <string name="ask_delete_named_chat">Сигурни ли сте, че искате да изтриете %1$s?</string>
     <string name="ask_delete_message">Сигурни ли сте, че искате да изтриете това съобщение?</string>
+    <!-- deprecated, use ask_delete_messages_simple -->
     <plurals name="ask_delete_messages">
         <item quantity="one">Да бъде ли изтрито%dсъобщение тук и на сървъра?</item>
         <item quantity="other">Да бъдат ли изтрити %d съобщения тук и на сървъра?</item>
@@ -670,10 +671,6 @@
     <string name="pref_manage_keys">Управление на ключове</string>
     <string name="pref_use_system_emoji">Да се използва Emoji на системата</string>
     <string name="pref_use_system_emoji_explain">Изключване на вградената поддръжка за Emoji на Delta Chat</string>
-    <!-- deprecated -->
-    <string name="pref_use_inapp_camera">Да се използва камерата вътре в приложението</string>
-    <!-- deprecated -->
-    <string name="pref_use_inapp_camera_explain">Камерата в приложението обикновено има по-малко възможности от системната камера</string>
     <string name="pref_show_system_contacts">Прочитане на системната адресна книга</string>
     <string name="pref_show_system_contacts_explain">Да се предлага създаване на чатове с контакти от адресната книга. За някои доставчици е необходимо първо да се настрои криптиране от край до край.</string>
     <string name="pref_app_access">Достъп до приложението</string>

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

@@ -41,6 +41,8 @@
     <string name="later">Després</string>
     <!-- "Resend" means "Sending the selected message(s) again to the same chat". The string is used in a menu and should be as short as possible. Resending may be needed after failures or to repost old messages to new members. -->
     <string name="resend">Torna-ho a enviar</string>
+    <string name="edited">Editat</string>
+    <string name="edit_message">Edita el missatge</string>
     <!-- Verb "to archive", as in "put a chat in the archive", not a noun "The Archive". -->
     <string name="archive">Arxiva</string>
     <!-- Verb "to unarchive", as in "remove a chat from the archive", opposite of the previous string -->
@@ -253,7 +255,7 @@
     <string name="share_invite_link_explain">Qualsevol amb aquest enllaç pot veure el vostre perfil i començar un xat amb vós. Compartiu-lo només amb qui tingueu confiança.</string>
     <string name="invite_friends">Convida amics</string>
     <!-- %1$s is replaced by the user's invitation link ("https://i.delta.chat/...") -->
-    <string name="invite_friends_text">Contacta amb mi a Delta Chat:\n %1$s</string>
+    <string name="invite_friends_text">Contacta amb mi a Delta Chat:\n%1$s</string>
     <string name="menu_copy_selection_to_clipboard">Copia la selecció</string>
     <string name="menu_copy_link_to_clipboard">Copia l\'enllaç</string>
     <string name="menu_copy_text_to_clipboard">Copia el text</string>
@@ -308,6 +310,7 @@
     <string name="device_talk">Missatges del dispositiu</string>
     <string name="device_talk_subtitle">Missatges generats localment</string>
     <string name="device_talk_explain">Els missatges d\'aquest xat són generats en el vostre dispositiu per a informar-vos sobre actualitzacions de l\'aplicació o de problemes durant el seu ús.</string>
+    <string name="device_talk_welcome_message2">Esteu en contacte!\n\n🙌 Toqueu «Codi QR» en la finestra principal d\'ambdós dispositius. Trieu «Escaneja codi QR» en un dispositiu, i apunteu cap a l\'altre\n\n🌍 Si no esteu en la mateixa sala, podeu escanejar o compartir un enllaç d\'invitació des de «Escaneja codi QR»\n\nDesprés: gaudiu de l\'experiència de missatgeria sobre la xarxa descentralitzada més gran que ha existit mai: el correu electrònic. I, en contrast amb altres aplicacions populars, sense control central, seguiment ni comercialització de vós, amics, col·legues o familiars amb grans organitzacions.</string>
     <string name="edit_contact">Edita el contacte</string>
     <!-- Verb "to pin", making something sticky, not a noun or abbreviation for "pin number". -->
     <string name="pin_chat">Fixa el xat</string>
@@ -321,8 +324,8 @@
     <string name="reply_privately">Respon en privat</string>
     <string name="source_code">Codi font</string>
     <!-- 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">Afegeix a la finestra d\'inici</string>
-    <string name="donate">Fes un donatiu</string>
+    <string name="add_to_home_screen">Afegeix a la pantalla d\'inici</string>
+    <string name="donate">Feu un donatiu</string>
 
     <string name="mute_for_one_hour">Silencia 1 hora</string>
     <string name="mute_for_two_hours">Silencia 2 hores</string>
@@ -330,11 +333,11 @@
     <string name="mute_for_seven_days">Silencia 7 dies</string>
     <string name="mute_forever">Sempre silenciat</string>
 
-    <string name="share_location_for_5_minutes">durant 5 minuts</string>
-    <string name="share_location_for_30_minutes">durant 30 minuts</string>
-    <string name="share_location_for_one_hour">durant 1 hora</string>
-    <string name="share_location_for_two_hours">durant 2 hores</string>
-    <string name="share_location_for_six_hours">durant 6 hores</string>
+    <string name="share_location_for_5_minutes">Durant 5 minuts</string>
+    <string name="share_location_for_30_minutes">Durant 30 minuts</string>
+    <string name="share_location_for_one_hour">Durant 1 hora</string>
+    <string name="share_location_for_two_hours">Durant 2 hores</string>
+    <string name="share_location_for_six_hours">Durant 6 hores</string>
 
     <plurals name="ask_send_following_n_files_to">
         <item quantity="one">Voleu enviar el següent fitxer a %s?</item>
@@ -342,29 +345,31 @@
     </plurals>
     <string name="file_saved_to">El fitxer s\'ha desat a «%1$s».</string>
 
-    <string name="videochat">Vídeo xat</string>
-    <string name="videochat_invite_user_to_videochat">Voleu convidar %1$s a un vídeo xat?</string>
+    <string name="videochat">Xat de vídeo</string>
+    <string name="videochat_invite_user_to_videochat">Voleu convidar %1$s a un xat de vídeo?</string>
     <string name="videochat_invite_user_hint">Això requereix una aplicació o navegador compatible en ambdós extrems.</string>
-    <string name="videochat_contact_invited_hint">%1$s ha estat convidat a un vídeo xat.</string>
-    <string name="videochat_you_invited_hint">Heu enviat una invitació de videoxat.</string>
+    <string name="videochat_contact_invited_hint">%1$s ha estat convidat a un xat de vídeo.</string>
+    <string name="videochat_you_invited_hint">Heu enviat una invitació de xat de video.</string>
     <string name="videochat_tap_to_join">Toca per a afegir-t\'hi</string>
     <string name="videochat_tap_to_open">Toca per a obrir-ho</string>
-    <string name="videochat_instance">Instància de vídeo xat</string>
-    <string name="videochat_instance_placeholder">La vostra instància de vídeoxat</string>
+    <string name="videochat_instance">Instància de xat de vídeo</string>
+    <string name="videochat_instance_placeholder">La vostra instància de xat de vídeo</string>
     <!-- Do not translate "$ROOM", since it is a fixed token Delta Chat will replace with a generated room ID like "aOclju5eCky" -->
     <string name="videochat_instance_example">Exemple: https://el-vostre-servidor.org/$SALA</string>
-    <string name="videochat_instance_explain_2">Si està activada, podeu iniciar un videoxat des de cada xat. Necessita una aplicació o navegador compatible en ambdós extrems.</string>
-    <string name="videochat_invitation">Invitació a un vídeo xat</string>
-    <string name="videochat_invitation_body">Heu sigut convidats a un vídeo xat, cliqueu %1$s per unir-vos-hi.</string>
+    <string name="videochat_instance_explain_2">Si està activada, podeu iniciar un xat de video des de cada xat. Necessita una aplicació o navegador compatible en ambdós extrems.</string>
+    <string name="videochat_instance_from_qr">Voleu usar «%1$s» per a convidar altres participants a xats de video?\n\nUna vegada definit, podeu iniciar un xat de vídeo des de cada xat. Això substitueix la configuració anterior per a xats de video.</string>
+    <string name="videochat_invitation">Invitació a un xat de vídeo</string>
+    <string name="videochat_invitation_body">Us han convidat a un xat de vídeo, feu clic a %1$s per unir-vos-hi.</string>
 
     <!-- get confirmations -->
     <string name="ask_leave_group">Segur que voleu deixar aquest grup?</string>
     <plurals name="ask_delete_chat">
         <item quantity="one">Esborra %d xat? Ja no es mostrarà al llistat de xats, i els seus missatges no romandran al servidor.</item>
-        <item quantity="other">Voleu esborrar %d xats? Ja no es mostraran al llistat de xats i els missatges no quedaran al servidor.</item>
+        <item quantity="other">Voleu esborrar %d xats? Ja no es mostraran al llistat de xats però els missatges es conservaran al servidor.</item>
     </plurals>
-    <string name="ask_delete_named_chat">Voleu esborrar el xat «%1$s»? Ja no es mostrà més en el llistat de xats i els missatges romandran al servidor.</string>
+    <string name="ask_delete_named_chat">Voleu esborrar el xat «%1$s»? Ja no es mostrarà més en el llistat de xats i els missatges romandran al servidor.</string>
     <string name="ask_delete_message">Esteu segur de voler esborrar aquest missatge?</string>
+    <!-- deprecated, use ask_delete_messages_simple -->
     <plurals name="ask_delete_messages">
         <item quantity="one">Esborra %d missatge aquí i al servidor?</item>
         <item quantity="other">Esborra %d missatges aquí i al servidor?</item>
@@ -376,9 +381,10 @@
     <string name="ask_forward">Reenvia missatges a %1$s?</string>
     <string name="ask_forward_multiple">Voleu reenviar els missatges a %1$d xats?</string>
     <string name="ask_export_attachment">En exportar els adjunts permetreu que altres aplicacions del dispositiu hi puguin accedir.\n\nVoleu continuar?</string>
-    <string name="ask_block_contact">Voleu blocar aquest contacte? En aquest cas ja no en rebreu més missatges.</string>
-    <string name="ask_unblock_contact">Voleu desblocar aquest contacte? Llavors podreu tornar a rebre\'n missatges.</string>
-    <string name="ask_delete_contacts">Voleu esborrar els contactes? Això eliminarà definitivament els contactes seleccionats.\n\nEls contactes amb xats oberts i els que estiguin al vostre directori d\'adreces no es poden eliminar definitivament. </string>
+    <string name="ask_block_contact">Voleu blocar aquest contacte?\n\nNo podreu veure els missatges directes o grups creats pels contactes blocats.\n\nAltres grups amb contactes blocats els continuareu veient.</string>
+    <string name="ask_unblock_contact">Voleu desblocar aquest contacte?</string>
+    <string name="ask_delete_contacts">Voleu esborrar els contactes?\n\nEls contactes amb xats actius i els que estiguin al vostre directori d\'adreces no es poden eliminar definitivament. </string>
+    <string name="ask_delete_contact">Voleu esborrar el contacte %1$s?\n\nEls contactes dels xats actius o de la llibreta d\'adreces del sistema no es poden esborrar permanentment.</string>
     <string name="cannot_delete_contacts_in_use">No es poden esborrar els contactes amb xats actius.</string>
     <string name="ask_start_chat_with">Voleu xatejar amb %1$s?</string>
     <string name="ask_delete_value">Voleu esborrar %s?</string>
@@ -407,14 +413,14 @@
     </plurals>
     <string name="chat_archived_chats_title">Xats arxivats</string>
     <string name="chat_please_enter_message">Si us plau, escriviu un missatge</string>
-    <string name="chat_camera_unavailable">Càmera no disponible.</string>
+    <string name="chat_camera_unavailable">La càmera no és disponible.</string>
     <string name="chat_unable_to_record_audio">No es pot gravar so.</string>
     <plurals name="chat_n_new_messages">
         <item quantity="one">%d nou missatge</item>
         <item quantity="other">%d missatges nous</item>
     </plurals>
     <!-- The placeholder will be replaced by the name of the recipient in a one-to-one chat. -->
-    <string name="chat_new_one_to_one_hint">Envieu un missatge. No hi fa pas res si %1$s no fa servir Delta Chat.</string>
+    <string name="chat_new_one_to_one_hint">Envia un missatge a %1$s.</string>
     <string name="chat_new_broadcast_hint">En una llista de difusió, els destinataris rebran missatges en mode de només lectura en un xat amb tu.</string>
     <string name="chat_new_group_hint">Els altres membres només veuran aquest grup després que hi envieu el primer missatge.</string>
     <string name="chat_record_slide_to_cancel">Llisca per cancel·lar</string>
@@ -518,15 +524,25 @@
     <string name="all_files_empty_hint">Els documents i altres fitxers compartits en qualsevol xat apareixeran aquí.</string>
     <string name="all_apps_empty_hint">Les aplicacions compartides en qualsevol xat apareixeran aquí.</string>
     <string name="media_preview">Previsualització multimèdia</string>
+    <!-- option to show images in the gallery with the correct width/height aspect (instead of square); other gallery apps may be a source of inspiration for translation :) -->
+    <string name="aspect_ratio_grid">Graella d\'aspecte proporcinal</string>
+    <!-- option to show images in the gallery as square (instead of using correct width/height) -->
+    <string name="square_grid">Graella quadrada</string>
     <string name="send_message">Envia el missatge</string>
     <!-- Placeholder %1$s will be replaced by the name of the contact changing their address. Placeholders %2$s and %3$s will be replaced by old/new email addresses. -->
     <string name="aeap_addr_changed">%1$s ha canviat la seva adreça de %2$s a %3$s</string>
+    <!-- the explanation is shown (1) as a modal dialog with the buttons "Cancel" and "Continue" as well as (2) as a device message -->
+    <string name="aeap_explanation">Heu canviat la vostra adreça de correu electrònic de %1$s a %2$s.\n\nSi ara envieu un missatge a un grup verificat, els contactes del grup canviaran de forma automàtica l\'adreça antiga per la nova.\n\nUs recomanem que configureu el compte antic a fi que us reenvïi els missatges a l\'adreça nova. Si no ho feu, podríeu perdre missatges de contactes que encara no hagin actualitzat la vostra adreça.</string>
+
+
     <!-- Multi Device -->
     <!-- "Second Device" can also be translated as "Another Device", if that is catchier in the destination language. However, make sure to use the term consistently. -->
     <string name="multidevice_title">Afegeix un segon dispositiu</string>
     <string name="multidevice_same_network_hint">Assegureu-vos que els dos dispositius estan a la mateixa Wi-Fi o xarxa</string>
     <string name="multidevice_this_creates_a_qr_code">Això crea codi QR que es pot escanejar en el segon dispositiu per a copiar el perfil.</string>
     <string name="multidevice_install_dc_on_other_device">Instal·leu Delta Chat en el vostre altre dispositiu (https://get.delta.chat)</string>
+    <!-- "I Already Have a Profile / Add as Second Device” should be the same text as defined by the keys onboarding_alternative_logins and multidevice_receiver_title -->
+    <string name="multidevice_tap_scan_on_other_device">Inicieu Delta Chat, toqueu  «Ja tinc un perfil / Afegeix un segon dispositiu» i escanegeu el codi que es mostra aquí.</string>
     <!-- Shown inside a "QR code card" with very limited space; please formulate the text as short as possible therefore. The placeholder will be replaced by name and/or address eg. "Scan to set up second device for Alice (alice@example.org)" -->
     <string name="multidevice_qr_subtitle">Escanegeu-lo per configurar un segon dispositiu per a %1$s</string>
     <string name="multidevice_receiver_title">Afegeix com a segon dispositiu</string>
@@ -534,6 +550,7 @@
     <string name="multidevice_receiver_scanning_ask">Voleu copiar el perfil de l\'altre dispositiu en aquest?</string>
     <string name="multidevice_abort">Voleu cancel·lar la configuració d\'un segon dispositiu?</string>
     <string name="multidevice_abort_will_invalidate_copied_qr">Això invalidarà el codi QR copiat al porta-retalls.</string>
+    <string name="multidevice_experimental_hint">(experimental, es requereix la versió 1.36)</string>
     <string name="multidevice_transfer_done_devicemsg">ℹ️ El perfil s\'ha transferit al segon dispositiu.</string>
     <!-- Shown beside progress bar, stay short -->
     <string name="preparing_account">S\'està preparant el perfil...</string>
@@ -546,6 +563,8 @@
     <string name="incoming_messages">Missatges entrants</string>
     <!-- Headline for the "Outbox" eg. in the "Connectivity" view -->
     <string name="outgoing_messages">Missatges sortints</string>
+    <!-- Headline in the "Connectivity" view. Placeholder will be replaced by the domain of the configured email-address. -->
+    <string name="storage_on_domain">Emmagatzematge a %1$s.</string>
     <string name="connectivity">Connectivitat</string>
     <!-- Shown in the title bar if the app is "Not connected"; prefer short strings. -->
     <string name="connectivity_not_connected">Desconnectat</string>
@@ -569,19 +588,35 @@
     <string name="onboarding_create_instant_account">Crea un perfil nou</string>
     <!-- Secondary button on the welcome screen, allows to "Add as Second Device", "Restore from Backup"  -->
     <string name="onboarding_alternative_logins">Ja tinc un perfil</string>
+    <!-- Button, allows to log in to existing email accounts, setting ports, passwords and so on -->
+    <string name="manual_account_setup_option">Inici de sessió correu-e clàssic</string>
     <!-- Instant onboarding title (there is not more to do than to set name and avatar) -->
     <string name="instant_onboarding_title">El vostre perfil</string>
+    <!-- The placeholder will be replaced by the default onboarding server -->
+    <string name="instant_onboarding_agree_default2">Política de privadesa de %1$s</string>
     <!-- The placeholder will be replaced by instance name, the whole text will link to the instance page -->
     <string name="instant_onboarding_agree_instance">Quant als perfils en %1$s</string>
+    <!-- Confirmation button on the instant onboarding screen -->
+    <string name="instant_onboarding_create">D\'acord i crea el perfil</string>
     <!-- Secondary, link-like button to open a page with other possible instances -->
     <string name="instant_onboarding_show_more_instances">Usa un altre servidor</string>
     <string name="instant_onboarding_other_server">Llista els servidors chatmail</string>
     <!-- Hint about what happens when "Create Profile" button in pressed; the placeholder will be replaced by the group name -->
     <string name="instant_onboarding_group_info">Creeu un perfil per unir-vos al grup \"%1$s\".</string>
+    <!-- Hint about what happens when "Create Profile" button in pressed; the placeholder will be replaced by contact name and/or address -->
+    <string name="instant_onboarding_contact_info">Crea un perfil per a xatejar amb %1$s</string>
+    <!-- Question shown when another user's QR code is scanned from onboarding screen -->
+    <string name="instant_onboarding_confirm_contact">Voleu crear un perfil nou i començar a xatejar amb %1$s?</string>
+    <!-- Question shown when group's QR code is scanned from onboarding screen -->
+    <string name="instant_onboarding_confirm_group">Voleu crear un perfil nou i unir-vos al grup de xat «%1$s»?</string>
+
+    <string name="welcome_chat_over_email">Xat segur i descentralitzat</string>
     <string name="scan_invitation_code">Escaneja el Codi d\'Invitació</string>
     <string name="login_title">Identifiqueu-vos</string>
     <!-- for classic email, we use the classical term "Account" -->
     <string name="login_header">Identifiqueu-vos al vostre servidor</string>
+    <!-- for classic email, we use the classical term "Account" -->
+    <string name="login_explain">Inicia sessió amb un compte de correu electrònic existent</string>
     <string name="login_subheader">Als proveïdors de mail coneguts els paràmetres es configuren automàticament. De vegades l\'IMAP s\'ha d\'activar a la interfície web. Consulta el teu proveïdor de correu electrònic o a un amic perquè t\'ajudi. </string>
     <string name="login_no_servers_hint">No hi ha servidors de Delta Chat: les vostres dades es queden al vostre dispositiu!</string>
     <string name="login_inbox">Safata d\'entrada</string>
@@ -628,10 +663,12 @@
     <string name="add_account">Afegeix un compte</string>
     <string name="profile_tag">Etiqueta privada</string>
     <string name="profile_tag_hint">p.ex. treball, família</string>
+    <string name="profile_tag_explain">Etiqueteu allò que és visible només per a vós. Això us ajuda a diferenciar els vostres perfils.</string>
     <!-- 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">Desplaçat a l\'inici</string>
     <string name="delete_account">Esborra el perfil</string>
     <string name="delete_account_ask">Esteu segur de voler esborrar les dades del vostre perfil?</string>
+    <string name="delete_account_explain_with_name">S\'esborraran totes les dades del perfil «%s» en aquest dispositiu, incloent-hi la configuració de xifratge d\'extrem a extrem, contactes, xats, missatges i contingut multimèdia. Aquesta acció no es pot desfer.</string>
     <string name="unconfigured_account">Perfil sense configurar</string>
     <string name="unconfigured_account_hint">Obriu el per perfil per a configurar-lo.</string>
     <string name="try_connect_now">Prova de connectar-hi ara</string>
@@ -645,6 +682,7 @@
     <!-- first placeholder is replaced by the number of files (always 2 or more); second placeholder is replaced by a chat name -->
     <string name="ask_send_files_to_chat">Voleu enviar %1$d fitxers a \"%2$s\"?</string>
     <string name="ask_send_files_to_selected_chats">Voleu enviar %1$d fitxer(s) a %2$d xats?</string>
+    <string name="videos_sent_without_recoding">(Els vídeos s\'envien en el format original, fitxers grans. Per a enviar vídeos en fitxers més petits, adjunteu-los per separat)</string>
     <string name="share_text_multiple_chats">Voleu enviar aquest text a %1$d xats?\n\n«%2$s»</string>
     <string name="share_abort">S\'ha avortat la compartició per falta de permisos.</string>
 
@@ -662,8 +700,9 @@
     <string name="pref_your_name">El vostre nom</string>
     <!-- Translators: Visible only to recipients who DO NOT use Delta Chat, so it's the last line in an E-mail and not a "Status". -->
     <string name="pref_default_status_label">Signatura</string>
-    <string name="pref_enter_sends">La tecla \"Intro\" envia</string>
-    <string name="pref_enter_sends_explain">Els missatges s\'enviaran prement la tecla \"Intro\"</string>
+    <string name="pref_enter_sends">La tecla «Retorn» envia</string>
+    <string name="pref_enter_sends_explain">Els missatges s\'enviaran prement la tecla «Retorn»</string>
+    <string name="pref_outgoing_media_quality">Qualitat del contingut multimèdia sortint</string>
     <string name="pref_outgoing_balanced">Balancejat</string>
     <string name="pref_outgoing_worse">Pitjor qualitat, mida petita</string>
     <string name="pref_vibrate">Vibració</string>
@@ -699,12 +738,11 @@
     <string name="pref_read_receipts_explain">Si desactiveu la confirmació de lectura dels vostres missatges, tampoc no rebreu la dels altres usuaris.</string>
     <string name="pref_server">Servidor</string>
     <string name="pref_encryption">Xifratge</string>
-    <string name="pref_manage_keys">Gestioneu les claus</string>
+    <string name="pref_manage_keys">Gestió de les claus</string>
     <string name="pref_use_system_emoji">Usa els emojis del sistema</string>
     <string name="pref_use_system_emoji_explain">Desactiva el suport de sèrie per emojis a Delta Chat</string>
-    <!-- deprecated -->
-    <string name="pref_use_inapp_camera">Usa la càmera en l\'aplicació</string>
     <string name="pref_show_system_contacts">Llegeix la llibreta d\'adreces del sistema</string>
+    <string name="pref_show_system_contacts_explain">Ofereix de crear xats amb els contactes de la llibreta d\'adreces. Alguns proveïdors necessiten de configurar abans el xifratge d\'extrem a extrem.</string>
     <string name="pref_app_access">Accés a l\'aplicació</string>
     <string name="pref_chats">Xats</string>
     <string name="pref_in_chat_sounds">Sons d\'entrada</string>
@@ -741,6 +779,8 @@
     <string name="pref_send_copy_to_self_explain">Imprescindible quan s\'utilitza aquest compte en diversos dispositius.</string>
     <string name="pref_auto_folder_moves">Moure automàticament a la carpeta de Delta Chat</string>
     <string name="pref_auto_folder_moves_explain">Les converses de xat s\'han mogut per no atapeir la safata d’entrada</string>
+    <string name="pref_only_fetch_mvbox_title">Agafa només de la carpeta de DeltaChat</string>
+    <string name="pref_only_fetch_mvbox_explain">Ignora les altres carpetes. Requereix que el vostre servidor mogui els missatges de xat a la carpeta DeltaChat.</string>
     <string name="pref_show_emails">Mostra els correus clàssics</string>
     <string name="pref_show_emails_no">No, només xats</string>
     <string name="pref_show_emails_accepted_contacts">Per a contactes acceptats</string>
@@ -748,6 +788,7 @@
     <string name="pref_experimental_features">Funcionalitats experimentals</string>
     <string name="pref_on_demand_location_streaming">Difusió de la ubicació sota demanda</string>
     <string name="pref_developer_mode">Mode de desenvolupador</string>
+    <string name="pref_developer_mode_explain">Activa les opcions de depuració i pot fer que l\'aplicació sigui menys estable. Només per a desenvolupadors.</string>
     <string name="pref_background_default">Imatge per defecte</string>
     <string name="pref_background_default_color">Color per defecte</string>
     <string name="pref_background_custom_image">Imatge personalitzada</string>
@@ -756,15 +797,20 @@
     <string name="auto_download_messages">Baixa els missatges automàticament</string>
     <!-- %1$s will be replaced by a human-readable number of bytes, eg. 32 KiB, 1 MiB -->
     <string name="up_to_x">Fins a %1$s</string>
+    <string name="up_to_x_most_worse_quality_images">Fins a %1$s, les imatges de pitjor qualitat</string>
+    <string name="up_to_x_most_balanced_quality_images">Fins a %1$s, imatges de qualitat la majoria de vegades.</string>
     <string name="download_failed">La baixada ha fallat</string>
     <!-- %1$s will be replaced by a human-readable number of bytes, eg. 32 KiB, 1 MiB. Resulting string eg. "1 MiB message" -->
     <string name="n_bytes_message">%1$s missatge</string>
+    <!-- %1$s will be replaced by human-readable date and time -->
+    <string name="download_max_available_until">Baixa el màxim disponible fins a %1$s</string>
     <string name="profile_image_select">Trieu la imatge de perfil</string>
     <string name="select_your_new_profile_image">Trieu la imatge nova de perfil</string>
     <string name="profile_image_delete">Esborra la imatge del perfil</string>
     <string name="pref_show_tray_icon">Mostra la icona de la safata</string>
     <string name="pref_edit_profile">Edita el perfil</string>
     <string name="disable_imap_idle">Desactiva IMAP IDLE</string>
+    <string name="disable_imap_idle_explain">No usis l\'extensió IMAP IDLE encara que el servidor la permeti. Activar aquesta opció endarreria l\'obtenció de missatges, activeu-ho només per a proves.</string>
     <string name="send_stats_to_devs">Envia estadístiques als desenvolupadors del Delta Chat</string>
 
 
@@ -787,10 +833,17 @@
     <string name="react">Reacciona</string>
     <!-- %1$s will be replaced by an emoji. %2$s will be replaced by message summary (the summary is often long and whole string gets truncated; words after %2$s will often not being visible). Eg. 'You reacted 👍 to "Found my suitcase"'. Use less than 20 characters, otherwise the string will be truncated too soon and too few information are shown. Do not try to translate "reacted to" too strict. Depending on the language, "added 👍 to" or "gave 👍 to" or just "👍 to" may be shorter and/or clearer and work as well. -->
     <string name="reaction_by_you">Heu reaccionat amb %1$s a «%2$s»</string>
+    <!-- %1$s will be replaced a name. %2$s will be replaced by an emoji. %3$s will be replaced by message summary (the summary is often long and whole string gets truncated; words after %3$s will often not being visible). Eg. 'Alice reacted 👍 to "Nice photos"'. Use less than 20 characters, otherwise the string will be truncated too soon and too few information are shown. Do not try to translate "reacted to" too strict. Depending on the language, "added 👍 to" or "gave 👍 to" or just "👍 to" may be shorter and/or clearer work as well. -->
+    <string name="reaction_by_other">%1$sha reaccionat %2$s a «%3$s»</string>
+
     <!-- automatically delete message -->
     <string name="delete_old_messages">Esborra els missatges antics</string>
     <string name="autodel_device_title">Esborra els missatges del dispositiu</string>
     <string name="autodel_server_title">Esborra els missatges del servidor</string>
+    <!-- %1$d will be replaced by the number of messages, you can assume plural/lots here. %2$s will be replaced by a timespan option. -->
+    <string name="autodel_device_ask">Voleu esborrar ara %1$d missatges i tots els missatges \"%2$s\" futurs?\n\n• Això inclou tot el contingut multimèdia\n\n• S\'esborraran els missatges fins i tot si no s\'han llegit\n\n• Els \"Missatges desats\" no s\'esborraran de l\'emmagatzematge local</string>
+    <!-- %1$d will be replaced by the number of messages, you can assume plural/lots here. %2$s will be replaced by a timespan option. -->
+    <string name="autodel_server_ask">Voleu esborrar ara %1$d missatges i tots els missatges nous \"%2$s\" futurs?\n\n⚠️ Això inclou els correus, contingut multimèdia i \"Missatges desats\" a totes les carpetes del servidor\n\n⚠️ No utilitzeu aquesta funció si voleu conservar les dades al servidor\n\n⚠️ No utilitzeu aquesta funció si feu servir un client de correu diferent del Delta Chat</string>
     <!-- shown below enabled autodel_server-option, should be a summary of autodel_server_ask and remind about the impact -->
     <string name="autodel_server_enabled_hint">Això inclou els correus electrònics, contingut multimèdia i «Missatges desats» en totes les carpetes del servidor. No useu aquesta funció si voleu conservar dades al servidor o si useu altres clients de correu més enllà de Delta Chat.</string>
     <string name="autodel_server_warn_multi_device_title">Activa l\'esborrament immediat</string>
@@ -824,6 +877,8 @@
     <string name="autocrypt_bad_setup_code">Codi de configuració incorrecte. Siusplau torneu-ho a provar.\n\nSi no recordeu el codi de configuració Autocrypt, envieu-ne un de nou des de l’altre dispositiu.</string>
 
 
+    <!-- system messages -->
+    <string name="systemmsg_cannot_decrypt">Aquest missatge no es pot desxifrar.\n\n• Potser pot ajudar de respondre el missatge i demanar a l\'emissor que torni a enviar-lo,\n\n• Si acabeu de reinstal·lar Delta Chat, aleshores és millor de reconfigurar Delta Chat ara i triar «Afegeix un segon dispositiu» o importar una còpia de seguretat.</string>
     <string name="systemmsg_unknown_sender_for_chat">Remitent desconegut per a aquest xat. Vegeu «informació» per a més detalls.</string>
     <string name="systemmsg_subject_for_new_contact">Missatge de %1$s</string>
     <string name="systemmsg_failed_sending_to">No s\'ha pogut enviar el missatge a %1$s.</string>
@@ -891,19 +946,42 @@
     <string name="ephemeral_timer_weeks_by_other">%2$s ha definit el temporitzador dels missatges efímers a %1$s setmanes.</string>
     <!-- this may be shown instead of the chat's input field, with buttons "More Info" and "OK" -->
     <string name="chat_protection_broken">%1$s ha enviat un missatge des d\'un altre dispositiu.</string>
+    <string name="chat_protection_enabled_tap_to_learn_more">Us garantim que a partir d\'ara els missatges són xifrats d\'extrem a extrem. Toqueu per a obtenir més informació.</string>
+    <string name="chat_protection_enabled_explanation">Ara es garanteix que tots els missatges d\'aquest xat són xifrats d\'extrem a extrem.\n\nEl xifratge d\'extrem a extrem manté privats els missatges entre vós i els companys de xat. Ni tan sols el vostre proveïdor de correu electrònic pot llegir-los.</string>
     <string name="chat_protection_broken_tap_to_learn_more">%1$s ha enviat un missatge des d\'un altre dispositiu. Toqueu per a obtenir més informació.</string>
+    <string name="chat_protection_broken_explanation">No es pot garantir el xifrat d\'extrem a extrem, probablement perquè %1$s ha reinstal·lat Delta Chat o ha enviat un missatge des d\'un altre dispositiu.\n\n Podeu trobar-vos físicament amb la persona i tornar a escanejar el seu codi QR per tomar-hi a tenir xifrat d\'extrem a extrem.</string>
+    <string name="invalid_unencrypted_tap_to_learn_more">%1$srequereix xifratge d\'extrem a extrem, que encara no s\'ha configurat per a aquest xat. Toqueu per a obtenir més informació.</string>
+    <string name="invalid_unencrypted_explanation">Per a establir xifratge d\'extrem a extrem, heu de trobar-vos amb els contactes en persona i escanejar el seu codi QR per a poder afegir-los.</string>
+    <string name="learn_more">Més informació</string>
+
     <string name="devicemsg_self_deleted">Heu esborrat el xat «Missatges desats».\n\nℹ️ Per a usar altre cop la funcionalitat de «Missatges desats», creeu un xat nou amb vós mateix.</string>
+    <!-- %1$s will be replaced by the amount of storage already used, sth. as '500 MB'. If you want to use a percentage sign, type in two of them, eg. %1$s %% -->
+    <string name="devicemsg_storage_exceeding">⚠️ Esteu a punt de quedar-vos sense espai d\'emmagatzematge al vostre proveïdor: ja esteu utilitzant %1$s%% .\n\nPodríeu deixar de rebre missatges si s\'emplena.\n\n👉 Reviseu a la interfície web del proveïdor si podeu esborrar dades antigues i considereu habilitar \"Preferències / Xats i multimèdia / Esborra els missatges antics\". Podeu veure sempre el nivell d\'ocupació a \"Preferències / Connectivitat\".</string>
+    <!-- %1%s will be replaced by date and time in some human-readable format -->
+    <string name="devicemsg_bad_time">⚠️ La data o l\'hora del vostre dispositiu no semblen correctes (%1$s).\n\nAdjusteu el rellotge ⏰🔧 per a assegurar que els missatges es reben correctament.</string>
+    <string name="devicemsg_update_reminder">⚠️ Delta Chat podría no estar actualitzat.\n\n Això us podria causar problemes perquè els vostres companys de xat utilitzen versions més noves i no teniu les últimes funcionalitats 😳\nComproveu a https://get.delta.chat o a la vostra botiga d\'aplicacions si hi ha actualitzacions.</string>
+
+    <!-- Some options as "Add Second Device" or "Backup" may require the system PIN/Fingerprint/Gesture/Etc. to be entered in a system dialog. This hint is added to the system dialog, below a title as "Add Second Device" or "Backup". -->
+    <string name="enter_system_secret_to_continue">Desbloca per a continuar</string>
+
     <!-- qr code stuff -->
     <string name="qr_code">Codi QR</string>
     <string name="load_qr_code_as_image">Carrega el codi QR com a imatge</string>
     <string name="qrscan_title">Escaneja codi QR</string>
     <string name="qrscan_hint">Poseu la càmera davant del codi QR</string>
+    <string name="qrscan_hint_desktop">Mou el codi QR a la càmera</string>
+    <string name="qrscan_failed">No s\'ha pogut descodificar el codi QR</string>
     <string name="qrscan_ask_join_group">Voleu unir-vos al grup «%1$s»?</string>
     <string name="qrscan_fingerprint_mismatch">L\'empremta escanejada no coincideix amb l\'última empremta de %1$s</string>
     <string name="qrscan_no_addr_found">Aquest codi QR conté una empremta digital, però no hi ha cap adreça de correu electrònic.\n\nPer a una verificació fora de banda, establiu primer una connexió xifrada amb el destinatari.</string>
     <string name="qrscan_contains_text">Text del codi QR escanejat:\n\n%1$s</string>
     <string name="qrscan_contains_url">URL del codi QR escanejat:\n\n%1$s</string>
     <string name="qrscan_fingerprint_label">Empremta</string>
+    <string name="withdraw_verifycontact_explain">Altres persones que vulguin contactar amb vós poden escanejar aquest codi QR.\n\nPodeu reinicialitzar-lo, de manera que el codi QR o enllaç actual existent ja no servirà.</string>
+    <string name="withdraw_verifygroup_explain">Altres poden escanejar aquest codi QR per a unir-se al grup «%1$s».\n\nPodeu reinicialitzar-lo, de manera que el codi QR existent, o l\'enllaç d\'invitació, deixarà de funcionar.</string>
+    <string name="withdraw_qr_code">Reinicialitza el codi QR</string>
+    <string name="revive_verifycontact_explain">Aquest codi QR s\'ha reinicialitzat i ja no és actiu.</string>
+    <string name="revive_verifygroup_explain">Aquest codi QR per a unir-se al grup «%1$s» s\'ha reinicialitzat i ja no és actiu.</string>
     <string name="revive_qr_code">Activa el codi QR</string>
     <string name="qrshow_title">Codi QR d\'invitació</string>
     <string name="qrshow_x_joining">%1$s s\'uneix.</string>
@@ -916,12 +994,35 @@
     <!-- This text is shown inside the "QR code card" with very limited space; please formulate the text as short as possible therefore. The placeholder will be replaced by name and address eg. "Scan to chat with Alice (alice@example.org)" -->
     <string name="qrshow_join_contact_hint">Escanegeu això per establir contacte amb %1$s</string>
     <string name="qrshow_join_contact_no_connection_toast">No hi ha connexió a internet, no es pot fer la configuració amb codi QR.</string>
+    <string name="qraccount_ask_create_and_login">Voleu crear un perfil nou a «%1$s» i iniciar sessió allà?</string>
+    <string name="qraccount_ask_create_and_login_another">Voleu crear un perfil nou a «%1$s» i iniciar-hi sessió?\n\nEl vostre perfil existent no s\'esborrarà. Useu l\'element «Canvia el perfil» per a canviar entre els vostres perfils.</string>
     <string name="set_name_and_avatar_explain">Indiqueu un nom que els vostres contactes puguin reconèixer. També podeu establir una imatge de perfil.</string>
+    <string name="please_enter_name">Introduïu un nom</string>
+    <string name="qraccount_qr_code_cannot_be_used">El codi QR escanejat no es pot usar per a configurar un perfil nou.</string>
+    <!-- the placeholder will be replaced by the e-mail address of the profile -->
+    <string name="qrlogin_ask_login">Voleu iniciar sessió a «%1$s»?</string>
+    <!-- the placeholder will be replaced by the e-mail address of the profile -->
+    <string name="qrlogin_ask_login_another">Voleu iniciar «%1$s»?\n\nNo s\'esborrarà el perfil existent. Useu l\'element «Canvia el perfil» per a canviar entre els vostres perfils.</string>
+    <!-- first placeholder will be replaced by name and address of the inviter, second placeholder will be replaced by the name of the inviter. -->
+    <string name="secure_join_started">%1$s us ha convidat a unir-vos a aquest grup.\n\nS\'està esperant el dispositiu de %2$s per a respondre...</string>
+    <!-- placeholder will be replaced by the name of the inviter. -->
+    <string name="secure_join_replies">%1$s ha respost, espereu per a ser afegit al grup...</string>
+    <string name="secure_join_wait">S\'està establint el xifratge d\'extrem a extrem garantit, espereu...</string>
+    <string name="secure_join_wait_timeout">Encara no es pot garantir el xifrat punt-a-punt, però ja podeu enviar un missatge.</string>
     <string name="contact_verified">%1$s verificat.</string>
     <string name="contact_not_verified">No es pot verificar%1$s</string>
+    <!-- Shown in contact profile. The placeholder will be replaced by the name of the contact that introduced the contact. -->
+    <string name="verified_by">Afegit per %1$s</string>
+    <string name="verified_by_you">Afegit per mi</string>
     <!-- translators: "setup" is the "encryption setup" here, as in "Autocrypt Setup Message" -->
     <string name="contact_setup_changed">Configuració canviada per %1$s</string>
+    <string name="verified_contact_required_explain">Per a garantir el xifrat extrem a extrem, només podeu afegir a aquest grup contactes que tinguin la marca verda.\n\nPodeu trobar-vos en persona amb els contactes per a escanejar els seus codis QR i poder-los afegir. </string>
+    <string name="copy_qr_data_success">S\'ha copiat l\'URL del codi QR al porta-retalls</string>
     <string name="mailto_dialog_header_select_chat">Trieu el xat on enviar el missatge</string>
+    <!-- first placeholder is the name of the chat -->
+    <string name="confirm_replace_draft">%1$s ja té un missatge d\'esborrany, voleu substituir-lo?</string>
+    <string name="mailto_link_could_not_be_decoded">No s\'ha pogut desxifrar l\'enllaç mailto: %1$s</string>
+
     <!-- notifications  -->
     <string name="notify_reply_button">Respondre</string>
     <string name="notify_new_message">Missatge nou</string>
@@ -931,9 +1032,13 @@
     <string name="notify_name_and_message">Nom i missatge</string>
     <string name="notify_name_only">Només nom</string>
     <string name="notify_no_name_or_message">Ni nom ni missatge</string>
+    <string name="notifications_disabled">Notificacions desactivades</string>
     <string name="new_messages">Missatges nous</string>
     <!-- Body text for a generic "New messages" notification. Shown if we do not have more information about a new messages. Note, that the string is also referenced at https://github.com/deltachat/notifiers -->
     <string name="new_messages_body">Teniu missatges nous</string>
+    <string name="n_messages_in_m_chats">%1$d missatges en %2$d xats</string>
+
+
     <!-- permissions -->
     <string name="perm_required_title">Es requereix permís</string>
     <string name="perm_continue">Continua</string>
@@ -943,7 +1048,14 @@
     <string name="perm_explain_access_to_location_denied">Per a adjuntar la ubicació, aneu a la configuració de l\'aplicació, trieu «Permisos» i activeu la «Ubicació».</string>
     <string name="perm_explain_access_to_notifications_denied">Per a rebre les notificacions, aneu a «Configuració del sistema / Aplicacions / Delta Chat» i activeu «Notificacions»</string>
 
+    <!-- ImageEditorHud -->
+    <string name="ImageEditorHud_draw_anywhere_to_blur">Dibuixeu a qualsevol lloc per a difuminar-lo</string>
     <string name="ImageEditorHud_add_text">Afegeix text</string>
+    <string name="ImageEditorHud_blur">Difumina</string>
+    <string name="ImageEditorHud_brush_marker">Pinzell de marcatge</string>
+    <string name="ImageEditorHud_brush_highlight">Pinzell de ressaltat</string>
+    <string name="ImageEditorHud_crop">Retalla</string>
+    <string name="ImageEditorHud_flip">Capgira</string>
     <string name="ImageEditorHud_rotate">Gira</string>
 
     <!-- dc_str_* resources -->
@@ -951,6 +1063,7 @@
 
     <!-- strings introduced on desktop. we want to share strings between the os, in general, please do not add generic strings here -->
     <string name="about_offical_app_desktop">Aquesta és l\'aplicació d\'escriptori oficial de Delta Chat.</string>
+    <string name="about_licensed_under_desktop">Aquest programari és llicenciat amb la llicència GNU GPL versió 3 i el codi font és disponible a GitHub</string>
     <string name="welcome_desktop">Us donem la benvinguda al Delta Chat</string>
     <string name="global_menu_preferences_language_desktop">Trieu l\'idioma...</string>
     <string name="global_menu_file_desktop">Arxiva</string>
@@ -991,23 +1104,38 @@
     <string name="message_detail_received_desktop">rebut</string>
     <string name="menu.view.developer.open.log.folder">Obre la carpeta de registre</string>
     <string name="menu.view.developer.open.current.log.file">Obre el fitxer de registre actual</string>
+    <string name="explain_desktop_minimized_disabled_tray_pref" tools:ignore="TypographyDashes">La icona de la safata no es pot desactivar perquè Delta Chat s\'ha iniciat amb l\'opció --minimized</string>
     <string name="no_spellcheck_suggestions_found">No s\'ha trobat cap suggeriment ortogràfic.</string>
     <string name="show_window">Mostra la finestra</string>
+    <string name="login_socks5_experimental_warning">El suport de SOCKS5 és experimental. Utilitzeu-lo sota la vostra responsabilitat. Si poseu una adreça de correu electrònic en el camp de correu, es produirà una cerca de DNS que no passarà pel túnel SOCKS5.</string>
+
+    <!-- title of the "keybindings" dialog (for the keybindings names as such, where possible the normal command strings are used) -->
+    <string name="keybindings">Dreceres de teclat</string>
+    <string name="switch_between_chats">Canvia entre xats</string>
+    <string name="scroll_messages">Desplaça els missatges</string>
+    <!-- command to put the cursor to the search input field -->
+    <string name="focus_search_input">Focus al camp de cerca</string>
+    <!-- command to put the cursor to the message input field -->
+    <string name="focus_message_input">Focus a l\'entrada de text del missatge</string>
     <string name="force_refresh_network">Força l\'actualització de la xarxa</string>
     <string name="insert_newline">Insereix un salt de línia</string>
 
     <!-- accessibility, the general idea is to use the normal strings for accessibility hints wherever possible -->
     <string name="a11y_delivery_status_error">Estat d\'entrega: error</string>
+    <string name="a11y_encryption_padlock">Cadenat de xifratge</string>
     <string name="a11y_delivery_status_sending">Estat d\'entrega: enviant-se</string>
     <string name="a11y_delivery_status_draft">Estat d\'entrega: esborrany</string>
     <string name="a11y_delivery_status_delivered">Estat d\'entrega: entregat</string>
     <string name="a11y_delivery_status_read">Estat d\'entrega: llegit</string>
     <string name="a11y_delivery_status_invalid">Estat d\'entrega no vàlid</string>
     <string name="a11y_message_context_menu_btn_label">Accions de missatge</string>
+    <string name="a11y_background_preview_label">Previsualització del fons de pantalla</string>
     <string name="a11y_disappearing_messages_activated">S\'han activat els missatges efímers</string>
 
     <!-- iOS specific strings, developers: please take care to remove strings that are no longer used! -->
     <string name="stop_sharing_location">Deixa de compartir la ubicació</string>
+    <string name="a11y_voice_message_hint_ios">Després d\'enregistrar, feu doble toc per a enviar-lo. Per a descartar l\'enregistrament, fregueu amb dos dits.</string>
+    <string name="a11y_connectivity_hint">Feu doble toc per a veure els detalls de connectivitat.</string>
     <string name="login_error_no_internet_connection">No hi ha connexió a internet, l\'inici de sessió ha fallat.</string>
     <string name="share_account_not_configured">No s\'ha configurat el perfil.</string>
     <string name="cannot_play_audio_file">No es pot reproduir l\'`audio.</string>
@@ -1017,10 +1145,18 @@
     <!-- iOS device contact alert -->
     <string name="import_device_contacts">Importa els contactes del dispositiu</string>
     <string name="import_device_contacts_hint">Per a xatejar amb contactes des del vostre dispositiu, obriu Configuració i activeu «Contactes».</string>
+    <!-- iOS notification settings -->
+    <string name="disabled_in_dc">Desactivat a Delta Chat</string>
+    <string name="disabled_in_system_settings">Desactivat a la configuració del sistema</string>
+    <string name="bg_app_refresh_disabled">El \"Refresc en segon pla d\'aplicacions\" està deshabilitat als paràmetres del sistema</string>
+    <!-- iOS connectivity view, Adjective, used eg. as "Notifications: Delayed" -->
+    <string name="delayed">Ajornat</string>
     <string name="notifications_avg_minutes">De mitjana, cada %1$d minuts</string>
     <string name="notifications_avg_hours">De mitjana, cada %1$d hores</string>
     <string name="last_check_at">Comprovat a les %1$s</string>
     <string name="system_settings">Paràmetres del sistema</string>
+    <!-- shown below the button "System Settings" on the notification screen. this is a hint about what can be edited on System Settings' Notification page - eg. the notification type (banner, lock screen, notification centre), sound, badges and so on. no need to be exhaustive here, it is only to give the user an idea. -->
+    <string name="system_settings_notify_explain_ios">Edita\'n el tipus, les insígnies, la previsualització i més</string>
     <!-- iOS shortcut widget -->
     <!-- use the same translation for "Shortcuts" as the system is using, often the term "Shortcut" stays untranslated; check eg. how the "Shortcuts" system app is called in your locale -->
     <string name="shortcuts_widget_title">Dreceres</string>
@@ -1044,11 +1180,16 @@
     <!-- android specific strings, developers: please take care to remove strings that are no longer used! -->
     <string name="pref_instant_delivery">Entrega immediata</string>
     <string name="pref_background_notifications">Usa la connexió en segon pla</string>
+    <string name="pref_background_notifications_explain">Requereix optimitzacions de bateria que s\'han ignorat. Utilitzeu-les si les notificacions arriben tard</string>
     <string name="pref_reliable_service">Força la connexió en segon pla</string>
     <string name="pref_reliable_service_explain">Causa una notificació permanent</string>
 
+    <string name="pref_background_notifications_rationale">Per a mantenir la connexió amb el vostre servidor de correu i rebre missatges en segon pla, ignoreu les optimitzacions de bateria del següent pas.\n\nDelta Chat utilitza pocs recursos i té cura de no buidar-vos la bateria.</string>
     <!-- disabling "Reliable service" will hide a the maybe annoying permanent-notification with the drawback that new-message-notifications get potentially unreliable -->
     <string name="perm_enable_bg_reminder_title">Prem aquí per rebre missatges mentre Delta Chat és en segon pla.</string>
+    <string name="perm_enable_bg_already_done">Ja heu autoritzat Delta Chat a rebre missatges en segon pla.\n\nSi encara no us arriben els missatge, reviseu els paràmetres de sistema.</string>
+
     <!-- device messages for updates -->
     <string name="update_1_50_android">Què hi ha de nou?\n\n❤️‍🔥 Un selector d\'emojis nou amb més emojis\n\n🎮 Aplicacions al xat millorades: rebeu notificacions i obriu les aplicacions suportades segons el context. P. ex. obriu una entrada afegida al calendari directament.\n\n👍 Rebeu notificacions de les reaccions dels vostres missatges\n\n... 🛠️ Correccions i moltes coses més a %1$s</string>
-    </resources>
+    <string name="update_switch_profile_placement">ℹ️ S\'ha mogut l\'opció «Canvia el perfil»: toqueu en la vostra imatge de perfil en la cantonada superior de la finestra principal per a afegir o canviar perfils 💡</string>
+</resources>

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

@@ -241,6 +241,7 @@
         <item quantity="other">%d وتووێژ دەسڕیتەوە؟ ئیدی لە نێو لیستەی وتووێژەکاندا دیار نامێنن، بەڵام پەیامەکانیان لەسەر سێرڤەر دەمێنێتەوە.</item>
     </plurals>
     <string name="ask_delete_named_chat">دڵنیای دەتەوێت \"%1$s\" بسڕیتەوە؟</string>
+    <!-- deprecated, use ask_delete_messages_simple -->
     <plurals name="ask_delete_messages">
         <item quantity="one">دەتەوێت ئەم %d پەیامە لێرە و لەسەر سێرڤەر بسڕیتەوە؟</item>
         <item quantity="other">دەتەوێت ئەم %d پەیامە لێرە و لەسەر سێرڤەر بسڕیتەوە؟</item>

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

@@ -328,6 +328,7 @@
         <item quantity="other">Vymazat %d hovorů? Pak už je neuvidíte v seznamu hovorů, ale jejich zprávy zůstanou na serveru.</item>
     </plurals>
     <string name="ask_delete_named_chat">Skutečně úplně vymazat \"%1$s\"?</string>
+    <!-- deprecated, use ask_delete_messages_simple -->
     <plurals name="ask_delete_messages">
         <item quantity="one">Vymaž %d zprávu zde i ze serveru?</item>
         <item quantity="few">Vymaž %d zprávy zde i ze serveru?</item>

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

@@ -261,6 +261,7 @@
     </plurals>
     <string name="ask_delete_named_chat">Er du sikker på at du vil slette \"%1$s\"?</string>
     <string name="ask_delete_message">Er du sikker på at du vil slette denne besked?</string>
+    <!-- deprecated, use ask_delete_messages_simple -->
     <plurals name="ask_delete_messages">
         <item quantity="one">Slette %d besked her og på serveren?</item>
         <item quantity="other">Slet %d beskeder her og på serveren?</item>

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

@@ -41,6 +41,8 @@
     <string name="later">Später</string>
     <!-- "Resend" means "Sending the selected message(s) again to the same chat". The string is used in a menu and should be as short as possible. Resending may be needed after failures or to repost old messages to new members. -->
     <string name="resend">Erneut senden</string>
+    <string name="edited">Bearbeitet</string>
+    <string name="edit_message">Nachricht bearbeiten</string>
     <!-- Verb "to archive", as in "put a chat in the archive", not a noun "The Archive". -->
     <string name="archive">Archivieren</string>
     <!-- Verb "to unarchive", as in "remove a chat from the archive", opposite of the previous string -->
@@ -364,10 +366,11 @@
     <string name="ask_leave_group">Diese Gruppe verlassen?</string>
     <plurals name="ask_delete_chat">
         <item quantity="one">%d Chat löschen? Gelöschte Chats werden nicht länger in der Chat-Liste angezeigt, die Nachrichten verbleiben auf dem Server.</item>
-        <item quantity="other">%d Chats löschen? Gelöschte Chats werden nicht länger in der Chat-Liste angezeigt, die Nachrichten verbleiben auf dem Server.</item>
+        <item quantity="other">%d Chats löschen?</item>
     </plurals>
-    <string name="ask_delete_named_chat">Chat \"%1$s\" löschen? Gelöschte Chats werden nicht länger in der Chat-Liste angezeigt, die Nachrichten verbleiben auf dem Server.</string>
+    <string name="ask_delete_named_chat">Chat \"%1$s\" löschen?</string>
     <string name="ask_delete_message">Möchten Sie diese Nachricht wirklich löschen?</string>
+    <!-- deprecated, use ask_delete_messages_simple -->
     <plurals name="ask_delete_messages">
         <item quantity="one">%d Nachricht lokal und vom Server löschen?</item>
         <item quantity="other">%d Nachrichten lokal und vom Server löschen?</item>
@@ -504,6 +507,8 @@
     <string name="profile_encryption">Verschlüsselung</string>
     <string name="profile_shared_chats">Gemeinsame Chats</string>
     <string name="related_chats">Ähnliche Chats</string>
+    <!-- Separator between the list of actual members and past members -->
+    <string name="past_members">Ehemalige Mitglieder</string>
     <string name="tab_contact">Kontakt</string>
     <string name="tab_group">Gruppe</string>
     <string name="tab_gallery">Galerie</string>
@@ -737,10 +742,6 @@
     <string name="pref_manage_keys">Schlüssel verwalten</string>
     <string name="pref_use_system_emoji">System-Emoji benutzen</string>
     <string name="pref_use_system_emoji_explain">Eingebaute Emoji-Unterstützung von Delta Chat deaktivieren</string>
-    <!-- deprecated -->
-    <string name="pref_use_inapp_camera">In-App Kamera verwenden</string>
-    <!-- deprecated -->
-    <string name="pref_use_inapp_camera_explain">Die In-App-Kamera hat in der Regel weniger Funktionen als die Systemkamera</string>
     <string name="pref_show_system_contacts">System-Adressbuch lesen</string>
     <string name="pref_show_system_contacts_explain">Anbieten, Chats mit Kontakten aus dem Adressbuch zu erstellen. Bei einigen E-Mail-Anbieter muss zunächst eine Ende-zu-Ende-Verschlüsselung eingerichtet werden.</string>
     <string name="pref_app_access">App-Zugriff</string>

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

@@ -304,6 +304,7 @@
     </plurals>
     <string name="ask_delete_named_chat">Είστε σίγουρος ότι θέλετε να διαγράψετε \"%1$s\";</string>
     <string name="ask_delete_message">Είστε σίγουρος/-η ότι θέλετε να διαγράψετε αυτό το μήνυμα;</string>
+    <!-- deprecated, use ask_delete_messages_simple -->
     <plurals name="ask_delete_messages">
         <item quantity="one">Διαγραφή %d μηνύματος εδώ και στον διακομιστη;</item>
         <item quantity="other">Διαγραφή %d μηνυμάτων εδώ και στον διακομιστη;</item>

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

@@ -286,6 +286,7 @@
         <item quantity="other">Ĉu forigi %d babilojn? Ili ne plu troveblos en la babilaro, tamen iliaj mesaĝoj plurestos en la servilo.</item>
     </plurals>
     <string name="ask_delete_named_chat">Ĉu vi certas, ke vi deziras forigi \"%1$s\"?</string>
+    <!-- deprecated, use ask_delete_messages_simple -->
     <plurals name="ask_delete_messages">
         <item quantity="one">Ĉu forigi %d mesaĝon kaj ĉi tie kaj en la servilo?</item>
         <item quantity="other">Ĉu forigi %d mesaĝojn kaj ĉi tie kaj en la servilo?</item>

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

@@ -385,6 +385,7 @@
     </plurals>
     <string name="ask_delete_named_chat">¿Estás seguro de que deseas eliminar \"%1$s\"?</string>
     <string name="ask_delete_message">¿Seguro que quieres eliminar este mensaje?</string>
+    <!-- deprecated, use ask_delete_messages_simple -->
     <plurals name="ask_delete_messages">
         <item quantity="one">¿Eliminar %d mensaje aquí y en el servidor?</item>
         <item quantity="many">¿Eliminar %d mensajes aquí y en el servidor?</item>
@@ -765,10 +766,6 @@
     <string name="pref_manage_keys">Administrar claves</string>
     <string name="pref_use_system_emoji">Usar emoji del sistema</string>
     <string name="pref_use_system_emoji_explain">Deshabilitar el soporte de emoji integrado de Delta Chat</string>
-    <!-- deprecated -->
-    <string name="pref_use_inapp_camera">Usar cámara interna</string>
-    <!-- deprecated -->
-    <string name="pref_use_inapp_camera_explain">La cámara interna suele tener menos funcionalidades que la cámara del sistema</string>
     <string name="pref_show_system_contacts">Leer la libreta de direcciones del sistema</string>
     <string name="pref_show_system_contacts_explain">Ofrecer crear chats con contactos de la libreta de direcciones. Algunos proveedores necesitan primero una configuración de cifrado de extremo a extremo.</string>
     <string name="pref_app_access">Acceso a la aplicación</string>

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

@@ -195,6 +195,7 @@
         <item quantity="one">Ezabatu txat %d? Ez da gehiago agertuko txaten zerrendan, mezuak zerbitzarian mantenduko dira.</item>
         <item quantity="other">Ezabatu %d txat? Ez dira gehiago agertuko txaten zerrendan, mezuak zerbitzarian mantenduko dira.</item>
     </plurals>
+    <!-- deprecated, use ask_delete_messages_simple -->
     <plurals name="ask_delete_messages">
         <item quantity="one">Ezabatu mezu  %d hemen eta zerbitzarian?</item>
         <item quantity="other">Ezabatu  %dmezu hemen eta zerbitzarian?</item>

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

@@ -359,6 +359,7 @@ https://meet.jit.si/$ROOM
     </plurals>
     <string name="ask_delete_named_chat">اطمینان دارید می‌خواهید «%1$s» را پاک کنید؟</string>
     <string name="ask_delete_message">مطمئن هستید می‌خواهید این پیام را پاک کنید؟</string>
+    <!-- deprecated, use ask_delete_messages_simple -->
     <plurals name="ask_delete_messages">
         <item quantity="one">پاک کردن %d گپ از اینجا و سرور؟</item>
         <item quantity="other">پاک کردن %d گپ از این‌جا و از روی کارساز؟</item>
@@ -723,10 +724,6 @@ https://meet.jit.si/$ROOM
     <string name="pref_manage_keys">مدیریت کلیدها</string>
     <string name="pref_use_system_emoji">استفاده از شکلک‌های سیستم</string>
     <string name="pref_use_system_emoji_explain">غیرفعال کردن شکلک‌های داخلی دلتاچت</string>
-    <!-- deprecated -->
-    <string name="pref_use_inapp_camera">استفاده از دوربین درون‌برنامه</string>
-    <!-- deprecated -->
-    <string name="pref_use_inapp_camera_explain">دوربین درون‌برنامه معمولا امکانات کمتری نسبت به دوربین سیستم دارد</string>
     <string name="pref_show_system_contacts">خواندن دفترچه آدرس دستگاه</string>
     <string name="pref_app_access">دسترسی نرم‌افزار</string>
     <string name="pref_chats">گپ‌ها</string>

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

@@ -334,6 +334,7 @@
     </plurals>
     <string name="ask_delete_named_chat">Haluatko varmasti poistaa \"%1$s\"?</string>
     <string name="ask_delete_message">Haluatko varmasti poistaa tämän viestin?</string>
+    <!-- deprecated, use ask_delete_messages_simple -->
     <plurals name="ask_delete_messages">
         <item quantity="one">Poista %d viesti täältä ja palvelimelta?</item>
         <item quantity="other">Poista %d viestiä täältä ja palvelimelta?</item>
@@ -670,10 +671,6 @@
     <string name="pref_manage_keys">Hallinnoi avaimia</string>
     <string name="pref_use_system_emoji">Käytä järjestelmän emojeja</string>
     <string name="pref_use_system_emoji_explain">Poista Delta Chatin sisäänrakennettu emoji -tuki käytöstä</string>
-    <!-- deprecated -->
-    <string name="pref_use_inapp_camera">Käytä sovelluksen sisäistä kameraa</string>
-    <!-- deprecated -->
-    <string name="pref_use_inapp_camera_explain">Sovelluksen sisäisessä kamerassa on usein vähemmän toiminnallisuutta kuin järjestelmän kamerassa</string>
     <string name="pref_show_system_contacts">Lue laitteen osoitekirja</string>
     <string name="pref_show_system_contacts_explain">Tarjoa keskustelujen avaamista yhteystietojen perusteella. Jotkin palveluntarjoajat vaativat ensin päästä-päähän salauksen käyttöönottoa. </string>
     <string name="pref_app_access">Sovelluksen pääsy</string>

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

@@ -5,6 +5,8 @@
     <string name="ok">OK</string>
     <string name="cancel">Annuler</string>
     <string name="clear_search">Effacer la recherche</string>
+    <!-- a noun, used on a button, short for "show link" -->
+    <string name="link">Lien</string>
     <string name="yes">Oui</string>
     <string name="no">Non</string>
     <string name="select">Sélectionner</string>
@@ -41,6 +43,7 @@
     <!-- Verb "to unarchive", as in "remove a chat from the archive", opposite of the previous string -->
     <string name="unarchive">Désarchiver</string>
     <string name="mute">Sourdine</string>
+    <string name="muted">Muet</string>
     <string name="ephemeral_messages">Messages éphémères</string>
     <string name="ephemeral_messages_hint">Ces paramètres s\'appliquent à tous les participants utilisant Delta Chat; ils peuvent copier, enregistrer et faire suivre des messages ou utiliser un autre client de e-mail.</string>
     <string name="save">Sauvegarder</string>
@@ -128,6 +131,11 @@
         <item quantity="many">%d messages</item>
         <item quantity="other">%d messages</item>
     </plurals>
+    <plurals name="n_reactions">
+        <item quantity="one">%d réaction</item>
+        <item quantity="many">%d réactions</item>
+        <item quantity="other">%d réactions</item>
+    </plurals>
     <plurals name="n_members">
         <item quantity="one">%d membre</item>
         <item quantity="many">%d membres</item>
@@ -181,6 +189,13 @@
     <string name="webxdc_app">Appli</string>
     <!-- plural of "App"; used to present "Webxdc App" (https://webxdc.org) in a user friendly way. Please stay close to the original term and keep it short (it is used in menus with few screen space). -->
     <string name="webxdc_apps">Applis</string>
+    <string name="home">Accueil</string>
+    <string name="games">Jeux</string>
+    <string name="tools">Outils</string>
+    <string name="app_size">Taille</string>
+    <string name="add_to_chat">Ajouter à la discussion</string>
+    <!-- short for "Browse through the App Picker/Store/Catalogue"; could also be translated as "Discover" or "Search" -->
+    <string name="browse">Explorer</string>
     <string name="unknown">Inconnu</string>
 
     <string name="green">Vert</string>
@@ -208,6 +223,8 @@
     <string name="new_classic_contact_explain">Les contacts ajoutés à la main peuvent être contactés par e-mail classique. Le chiffrement de bout en bout n\'est pas garanti.</string>
     <string name="menu_new_chat">Nouvelle discussion</string>
     <string name="menu_new_group">Nouveau groupe</string>
+    <!-- "Chat" is a verb here, "Message to" would also fit. the string might be used in the "New Chat" screen above the contact list -->
+    <string name="chat_with">Discuter avec...</string>
     <string name="clone_chat">Cloner la discussion</string>
     <!-- consider keeping the term "broadcast" as in WhatsApp or Telegram -->
     <string name="broadcast_list">Liste de diffusion</string>
@@ -234,6 +251,11 @@
     <string name="menu_delete_location">Supprimer cette position ?</string>
     <string name="menu_message_details">Détails du message</string>
     <string name="menu_copy_to_clipboard">Copier vers presse-papiers</string>
+    <string name="share_invite_link">Partager un lien d\'invitation</string>
+    <string name="share_invite_link_explain">Tous les utilisateurs disposant du lien peuvent voir votre profil et démarrer une discussion avec vous. Ne le partagez qu\'à des personnes en qui vous avez confiance.</string>
+    <string name="invite_friends">Inviter des amis</string>
+    <!-- %1$s is replaced by the user's invitation link ("https://i.delta.chat/...") -->
+    <string name="invite_friends_text">Contactez-moi sur Delta Chat:\n%1$s</string>
     <string name="menu_copy_selection_to_clipboard">Copier la sélection</string>
     <string name="menu_copy_link_to_clipboard">Copier le lien</string>
     <string name="menu_copy_text_to_clipboard">Copier le texte</string>
@@ -268,6 +290,8 @@
     <string name="select_chat">Sélectionnez une discussion</string>
     <string name="select_more">Sélectionner plus</string>
     <string name="menu_edit_name">Modifier le nom</string>
+    <!-- The placeholder will be replaced by the name the contact gave themself (if any) or by an e-mail address. -->
+    <string name="edit_name_placeholder">Surnom de \"%1$s\"</string>
     <string name="menu_settings">Paramètres</string>
     <string name="menu_advanced">Avancé</string>
     <string name="menu_view_profile">Voir le profil</string>
@@ -345,6 +369,7 @@
     </plurals>
     <string name="ask_delete_named_chat">Voulez-vous vraiment supprimer « %1$s » ?</string>
     <string name="ask_delete_message">Voulez-vous vraiment supprimer ce message ?</string>
+    <!-- deprecated, use ask_delete_messages_simple -->
     <plurals name="ask_delete_messages">
         <item quantity="one">Supprimer %d message ici et sur le serveur ?</item>
         <item quantity="many">Supprimer %dmessages ici et sur le serveur ?</item>
@@ -467,6 +492,10 @@
     <string name="search_files">Chercher dans les fichiers</string>
     <string name="search_explain">Rechercher des discussions, des contacts ou des messages</string>
     <string name="search_no_result_for_x">Aucun résultat trouvé pour \"%s\"</string>
+    <!-- Adjective, as in "Show Unread Messages" -->
+    <string name="search_unread">Non-lus</string>
+
+
     <!-- create/edit groups, contact/group profile -->
     <string name="group_name">Nom du groupe</string>
     <string name="group_avatar">Image du groupe</string>
@@ -479,6 +508,8 @@
     <string name="profile_encryption">Chiffrement</string>
     <string name="profile_shared_chats">Discussions partagées</string>
     <string name="related_chats">Discussions connexes</string>
+    <!-- Separator between the list of actual members and past members -->
+    <string name="past_members">Anciens membres</string>
     <string name="tab_contact">Contact</string>
     <string name="tab_group">Groupe</string>
     <string name="tab_gallery">Gallerie</string>
@@ -492,6 +523,7 @@
     <string name="tab_audio_empty_hint">Les fichiers audio et messages vocaux partagés dans cette discussion seront affichés ici.</string>
     <string name="tab_webxdc_empty_hint">Les applis partagées dans cette discussion seront affichées ici.</string>
     <string name="tab_all_media_empty_hint">Les fichiers multimédias partagés dans une discussion apparaissent ici.</string>
+    <string name="all_files_empty_hint">Les documents et autres partagés dans les discussions vont être affichés ici.</string>
     <string name="all_apps_empty_hint">Les applications envoyées ou reçues dans une discussion apparaissent ici.</string>
     <string name="media_preview">Prévisualiser le fichier multimédia</string>
     <!-- option to show images in the gallery with the correct width/height aspect (instead of square); other gallery apps may be a source of inspiration for translation :) -->
@@ -558,13 +590,29 @@
     <string name="onboarding_create_instant_account">Créer un nouveau compte</string>
     <!-- Secondary button on the welcome screen, allows to "Add as Second Device", "Restore from Backup"  -->
     <string name="onboarding_alternative_logins">Je possède déjà un compte</string>
+    <!-- Button, allows to log in to existing email accounts, setting ports, passwords and so on -->
+    <string name="manual_account_setup_option">Authentification par email classique</string>
     <!-- Instant onboarding title (there is not more to do than to set name and avatar) -->
     <string name="instant_onboarding_title">Votre compte</string>
+    <!-- The placeholder will be replaced by the default onboarding server -->
+    <string name="instant_onboarding_agree_default2">Politique de confidentialité pour %1$s</string>
+    <!-- The placeholder will be replaced by instance name, the whole text will link to the instance page -->
+    <string name="instant_onboarding_agree_instance">À propos des profils sur %1$s</string>
     <!-- Confirmation button on the instant onboarding screen -->
     <string name="instant_onboarding_create">Accepter et créer le compte</string>
     <!-- Secondary, link-like button to open a page with other possible instances -->
     <string name="instant_onboarding_show_more_instances">Utiliser un autre serveur</string>
     <string name="instant_onboarding_other_server">Lister les serveurs de discussions</string>
+    <!-- Hint about what happens when "Create Profile" button in pressed; the placeholder will be replaced by the group name -->
+    <string name="instant_onboarding_group_info">Crée un profil pour rejoindre le groupe \"%1$s\".</string>
+    <!-- Hint about what happens when "Create Profile" button in pressed; the placeholder will be replaced by contact name and/or address -->
+    <string name="instant_onboarding_contact_info">Crée un profil pour discuter avec %1$s.</string>
+    <!-- Question shown when another user's QR code is scanned from onboarding screen -->
+    <string name="instant_onboarding_confirm_contact">Voulez-vous créer un profil et commencer à discuter avec %1$s ?</string>
+    <!-- Question shown when group's QR code is scanned from onboarding screen -->
+    <string name="instant_onboarding_confirm_group">Voulez-vous créer un profil et rejoindre le groupe de discussion \"%1$s\" ?</string>
+
+    <string name="welcome_chat_over_email">Chat décentralisé et sûr</string>
     <string name="scan_invitation_code">Scanner le code d\'invitation</string>
     <string name="login_title">Connexion</string>
     <!-- for classic email, we use the classical term "Account" -->
@@ -590,8 +638,13 @@
     <string name="proxy_use_proxy">Utiliser le proxy</string>
     <string name="proxy_add">Ajouter un proxy</string>
     <string name="proxy_add_explain">Types de proxy supportés: HTTP(S), SOCKS5 et Shadowsocks.</string>
+    <string name="proxy_add_url_hint">Entrer le lien du proxy ici</string>
+    <string name="proxy_invalid">Proxy invalide ou non supporté</string>
     <string name="proxy_list_header">Sauver les proxy</string>
     <string name="proxy_delete">Effacer le proxy</string>
+    <string name="proxy_share_explain">Vos amis peuvent ajouter ce proxy en scannant le code QR.</string>
+    <string name="proxy_share_link">Partager le lien</string>
+
     <string name="login_info_oauth2_title">Continuer avec une configuration simplifiée ?</string>
     <string name="login_info_oauth2_text">L\'adresse de courriel saisie prend en charge une configuration simplifiée (OAuth2.0). \n\nDans l\'étape suivante, autorisez Delta Chat à agir comme votre application de Chat avec courriel . Il n\'y a pas de serveur Delta Chat, vos données restent sur votre appareil !</string>
     <string name="login_certificate_checks">Vérification du certificat</string>
@@ -608,6 +661,9 @@
     <string name="accept_invalid_certificates">Accepter les certificats non valides</string>
     <string name="switch_account">Changer de compte</string>
     <string name="add_account">Ajouter un compte</string>
+    <string name="profile_tag">Tag privé</string>
+    <string name="profile_tag_hint">Travail ou famille par exemple</string>
+    <string name="profile_tag_explain">Tag seulement visible par vous pour vous aider à différencier les profils.</string>
     <string name="delete_account">Supprimer le compte</string>
     <string name="delete_account_ask">Voulez-vous vraiment supprimer les données de votre compte ?</string>
     <string name="delete_account_explain_with_name">Toutes les données de compte de « %s » sur cet appareil seront effacées, y compris votre configuration de chiffrement de bout en bout, vos contacts, discussions, messages et médias. Cette action est irrévocable.</string>
@@ -650,6 +706,7 @@
     <string name="pref_screen_security_explain">Demander de bloquer les captures d\'écran dans la liste des captures récentes et dans l\'application</string>
     <string name="pref_screen_security_please_restart_hint">Pour appliquer les paramètres de sécurité de l\'écran, veuillez redémarrer l\'application.</string>
     <string name="pref_notifications">Notifications</string>
+    <string name="pref_mention_notifications">Mentions</string>
     <string name="pref_notifications_show">Afficher</string>
     <string name="pref_notifications_priority">Priorité</string>
     <string name="pref_notifications_explain">Activer les notifications système pour les nouveaux messages</string>
@@ -677,10 +734,6 @@
     <string name="pref_manage_keys">Gérer les clés</string>
     <string name="pref_use_system_emoji">Utiliser les émojis système</string>
     <string name="pref_use_system_emoji_explain">Désactiver la prise en charge des émojis intégrés de Delta Chat</string>
-    <!-- deprecated -->
-    <string name="pref_use_inapp_camera">Utiliser l\'appareil photo de l\'appli</string>
-    <!-- deprecated -->
-    <string name="pref_use_inapp_camera_explain">L\'appareil photo de l\'appli possède généralement moins de fonctionnalités que celui du système</string>
     <string name="pref_app_access">Accès à l\'application</string>
     <string name="pref_chats">Discussions</string>
     <string name="pref_in_chat_sounds">Sons de messages entrants</string>
@@ -767,6 +820,8 @@
 
     <!-- Reactions -->
     <string name="reactions">Réactions</string>
+    <!-- Verb, the action of adding a "Reaction" to a message. Used eg. in context menus, similar to "Reply" or "Forward" -->
+    <string name="react">Réagir</string>
     <!-- automatically delete message -->
     <string name="delete_old_messages">Supprimer les anciens messages</string>
     <string name="autodel_device_title">Supprimer les messages de l\'appareil</string>
@@ -819,6 +874,8 @@
     <!-- %1$s will be replaced by name and address of the contact who did the action -->
     <string name="group_image_changed_by_other">Image de groupe modifiée par %1$s.</string>
     <!-- %1$s will be replaced by name and address of the contact added to the group -->
+    <string name="member_x_added">Membre %1$s ajouté.</string>
+    <!-- %1$s will be replaced by name and address of the contact added to the group -->
     <string name="add_member_by_you">Membre %1$s ajouté par vous.</string>
     <!-- %1$s will be replaced by name and address of the contact added to the group, %2$s will be replaced by name and address of the contact who did the action -->
     <string name="add_member_by_other">Membre %1$s ajouté par %2$s.</string>
@@ -893,7 +950,7 @@
     <!-- qr code stuff -->
     <string name="qr_code">Code QR</string>
     <string name="load_qr_code_as_image">Charger le code QR comme une image</string>
-    <string name="qrscan_title">Numériser le QR code</string>
+    <string name="qrscan_title">Scanner le code QR</string>
     <string name="qrscan_hint">Placez votre caméra au dessus du QR code</string>
     <string name="qrscan_hint_desktop">Placez le code QR devant la caméra</string>
     <string name="qrscan_failed">Le code QR n\'a pas pu être décodé</string>
@@ -905,7 +962,7 @@
     <string name="qrscan_fingerprint_label">Empreinte digitale</string>
     <string name="withdraw_verifycontact_explain">Ce code QR pourrait être scanné par d\'autre personnes pour vous contacter.\n\nVous pouvez désactiver le QR code ici et le réactiver en le scannant ici de nouveau.</string>
     <string name="withdraw_verifygroup_explain">Le code QR peut être scanné par d\'autres personnes pour rejoindre le groupe \"%1$s\".\n\nVous pouvez désactiver le QR code ici et le réactiver en le scannant ici de nouveau.</string>
-    <string name="withdraw_qr_code">Désactiver le QR Code</string>
+    <string name="withdraw_qr_code">Réinitialiser le code QR</string>
     <string name="revive_verifycontact_explain">Ce code QR pourrait être scanné par d\'autre personnes pour vous contacter.\n\nCe code QR n\'est pas actif sur cet appareil.</string>
     <string name="revive_verifygroup_explain">Ce code QR pourrait être scanné par d\'autre personnes pour rejoindre le groupe \"%1$s\".\n\nLe code QR n\'est pas actif sur cet appareil.</string>
     <string name="revive_qr_code">Activer le QR Code</string>
@@ -923,6 +980,7 @@
     <string name="qraccount_ask_create_and_login">Créer une nouvelle adresse de courriel sur « %1$s » et se connecter ici ?</string>
     <string name="qraccount_ask_create_and_login_another">Créer une nouvelle adresse de courriel sur « %1$s » et s\'y connecter ?\n\nVotre compte existant ne sera pas supprimé. Utilisez l\'élément de menu « Changer de compte » pour passer d\'un compte à l\'autre.</string>
     <string name="set_name_and_avatar_explain">Choisissez un nom que vos contacts reconnaîtrons. Vous pouvez également définir une image pour votre profile.</string>
+    <string name="please_enter_name">Veuillez saisir un nom.</string>
     <string name="qraccount_qr_code_cannot_be_used">Le code QR scanné ne peut pas être utilisé pour ouvrir un nouveau compte.</string>
     <!-- the placeholder will be replaced by the e-mail address of the profile -->
     <string name="qrlogin_ask_login">Se connecter au compte « %1$s » ?</string>
@@ -1004,6 +1062,8 @@
     <string name="global_menu_view_developer_desktop">Développeur</string>
     <string name="global_menu_view_developer_tools_desktop">Outils de développement</string>
     <string name="global_menu_help_desktop">Aide</string>
+    <string name="delta_chat_homepage">Page d\'accueil de Delta Chat</string>
+    <string name="contribute">Contribuer</string>
     <string name="global_menu_help_report_desktop">Signaler un problème</string>
     <string name="global_menu_help_about_desktop">À propos de Delta Chat</string>
     <string name="global_menu_file_open_desktop">Ouvrir Delta Chat</string>
@@ -1075,6 +1135,10 @@
     <string name="notifications_avg_minutes">Toutes les %1$d minutes en moyenne</string>
     <string name="notifications_avg_hours">Toutes les %1$d heures en moyenne</string>
     <string name="last_check_at">Dernièrement vu à %1$s</string>
+    <string name="system_settings">Paramètres du système</string>
+    <!-- iOS shortcut widget -->
+    <!-- use the same translation for "Shortcuts" as the system is using, often the term "Shortcut" stays untranslated; check eg. how the "Shortcuts" system app is called in your locale -->
+    <string name="shortcuts_widget_title">Raccourcis</string>
     <!-- iOS permissions, copy from "deltachat-ios/Info.plist", which is used on missing translations in "deltachat-ios/LANG.lproj/InfoPlist.strings" -->
     <string name="InfoPlist_NSCameraUsageDescription">Delta Chat utilise votre appareil photo pour prendre des photos et des vidéos et les envoyer, ainsi que pour scanner des QR codes.</string>
     <string name="InfoPlist_NSContactsUsageDescription">Delta Chat utilise vos contacts pour montrer une liste d\'adresses de courriel auxquels vous pouvez écrire. Delta Chat n\'a pas de serveur, vos contacts ne sont envoyés nulle part.</string>

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

@@ -310,6 +310,7 @@
     </plurals>
     <string name="ask_delete_named_chat">Tes a certeza de querer eliminar \"%1$s\"?</string>
     <string name="ask_delete_message">Tes a certeza de querer eliminar esta mensaxe?</string>
+    <!-- deprecated, use ask_delete_messages_simple -->
     <plurals name="ask_delete_messages">
         <item quantity="one">Eliminar %d mensaxe aquí e no servidor?</item>
         <item quantity="other">Eliminar %d mensaxes aquí e no servidor?</item>

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

@@ -41,6 +41,8 @@
     <string name="later">Később</string>
     <!-- "Resend" means "Sending the selected message(s) again to the same chat". The string is used in a menu and should be as short as possible. Resending may be needed after failures or to repost old messages to new members. -->
     <string name="resend">Újraküldés</string>
+    <string name="edited">Szerkesztve</string>
+    <string name="edit_message">Üzenet szerkesztése</string>
     <!-- Verb "to archive", as in "put a chat in the archive", not a noun "The Archive". -->
     <string name="archive">Archiválás</string>
     <!-- Verb "to unarchive", as in "remove a chat from the archive", opposite of the previous string -->
@@ -103,7 +105,7 @@
     <string name="last_week">Múlt héten</string>
     <string name="last_month">Múlt hónapban</string>
     <!-- Refers to the time a contact was last seen. Shown below contact name in the profile. The placeholder will be replaced by date or time, resulting in "Last seen at 12:13 AM" or "Last seen Nov 12" -->
-    <string name="last_seen_at">Utoljára látta ekkor: %1$s</string>
+    <string name="last_seen_at">Utolsó megtekintés ideje: %1$s</string>
     <!-- Refers to the time a contact was last seen. Shown below contact name in the profile. The placeholder will be replaced by a relative point in time as "3 minutes ago" (see https://momentjs.com for more examples and languages)-->
     <string name="last_seen_relative">Utoljára látta: %1$s</string>
     <string name="last_seen_unknown">Utoljára látta: - (ismeretlen)</string>
@@ -221,6 +223,8 @@
     <string name="new_classic_contact_explain">A kézzel hozzáadott névjegyek szöveges üzenetek küldésére használhatók a klasszikus e-mailekhez és nem garantált a végpontok közöttii titkosításuk.</string>
     <string name="menu_new_chat">Új csevegés</string>
     <string name="menu_new_group">Új csoport</string>
+    <!-- "Chat" is a verb here, "Message to" would also fit. the string might be used in the "New Chat" screen above the contact list -->
+    <string name="chat_with">Csevegés vele…</string>
     <string name="clone_chat">Csevegés klónozása</string>
     <!-- consider keeping the term "broadcast" as in WhatsApp or Telegram -->
     <string name="broadcast_list">Adáslista</string>
@@ -365,6 +369,7 @@
     </plurals>
     <string name="ask_delete_named_chat">Biztosan törli a következőt: „%1$s”? Többé nem fog megjelenni a csevegőlistában; üzenetei a kiszolgálón maradnak.</string>
     <string name="ask_delete_message">Biztosan törölni szeretné ezt az üzenetet?</string>
+    <!-- deprecated, use ask_delete_messages_simple -->
     <plurals name="ask_delete_messages">
         <item quantity="one">%d üzenet törlése innen is és a kiszolgálóról is?</item>
         <item quantity="other">%d üzenet törlése innen is és a kiszolgálóról is?</item>
@@ -501,6 +506,8 @@
     <string name="profile_encryption">Titkosítás</string>
     <string name="profile_shared_chats">Megosztott csevegések</string>
     <string name="related_chats">Kapcsolódó csevegések</string>
+    <!-- Separator between the list of actual members and past members -->
+    <string name="past_members">Volt tagok</string>
     <string name="tab_contact">Névjegy</string>
     <string name="tab_group">Csoport</string>
     <string name="tab_gallery">Galéria</string>
@@ -514,6 +521,7 @@
     <string name="tab_audio_empty_hint">Az ebben a csevegésben megosztott hangfájlok és hangüzenetek itt fognak megjelenni.</string>
     <string name="tab_webxdc_empty_hint">Az ebben a csevegésben megosztott alkalmazások itt fognak megjelenni.</string>
     <string name="tab_all_media_empty_hint">A bármelyik csevegésben megosztott média itt fog megjelenni.</string>
+    <string name="all_files_empty_hint">A csevegésekben megosztott dokumentumok és egyéb fájlok itt jelennek meg.</string>
     <string name="all_apps_empty_hint">A bármelyik csevegésben kapott vagy küldött alkalmazások itt fognak megjelenni.</string>
     <string name="media_preview">Média előnézete</string>
     <!-- option to show images in the gallery with the correct width/height aspect (instead of square); other gallery apps may be a source of inspiration for translation :) -->
@@ -733,10 +741,6 @@
     <string name="pref_manage_keys">Privát kulcsok kezelése</string>
     <string name="pref_use_system_emoji">Rendszeremodzsik használata</string>
     <string name="pref_use_system_emoji_explain">A Delta Chat beépített emodzsi-támogatásának letiltása</string>
-    <!-- deprecated -->
-    <string name="pref_use_inapp_camera">Alkalmazás kamerájának használata</string>
-    <!-- deprecated -->
-    <string name="pref_use_inapp_camera_explain">Az alkalmazáson belüli kamera általában kevesebb funkcióval rendelkezik, mint a rendszer kamerája.</string>
     <string name="pref_show_system_contacts">A rendszer névjegyzékének olvasása</string>
     <string name="pref_show_system_contacts_explain">Csevegések létrehozása a névjegyzékéből származó ismerőseivel. Egyes szolgáltatóknál először a végpontok közötti titkosítás beállítására van szükség.</string>
     <string name="pref_app_access">Alkalmazás-hozzáférés</string>
@@ -1149,7 +1153,7 @@
     <string name="delayed">Késleltetve</string>
     <string name="notifications_avg_minutes">Átlagosan %1$d percenként</string>
     <string name="notifications_avg_hours">Átlagosan %1$d óránként</string>
-    <string name="last_check_at">Ellenőrizve ekkor: %1$s</string>
+    <string name="last_check_at">Ellenőrizés ideje: %1$s</string>
     <string name="system_settings">Rendszer-beállítások</string>
     <!-- shown below the button "System Settings" on the notification screen. this is a hint about what can be edited on System Settings' Notification page - eg. the notification type (banner, lock screen, notification centre), sound, badges and so on. no need to be exhaustive here, it is only to give the user an idea. -->
     <string name="system_settings_notify_explain_ios">Típus-, kitűzők-, előnézet- és egyebek szerkesztése</string>

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

@@ -290,6 +290,7 @@
         <item quantity="other">Hapus %d obrolan? Obrolan ini akan menghilang dari daftar tetapi pesan-pesannya akan tetap tersimpan di server.</item>
     </plurals>
     <string name="ask_delete_named_chat">Apakah anda yakin ingin menghapus \"%1$s\"?</string>
+    <!-- deprecated, use ask_delete_messages_simple -->
     <plurals name="ask_delete_messages">
         <item quantity="other">Hapus %d pesan disini dan di server?</item>
     </plurals>

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

@@ -41,6 +41,8 @@
     <string name="later">Dopo</string>
     <!-- "Resend" means "Sending the selected message(s) again to the same chat". The string is used in a menu and should be as short as possible. Resending may be needed after failures or to repost old messages to new members. -->
     <string name="resend">Reinvia</string>
+    <string name="edited">Modificato</string>
+    <string name="edit_message">Modifica Messaggio</string>
     <!-- Verb "to archive", as in "put a chat in the archive", not a noun "The Archive". -->
     <string name="archive">Archivia</string>
     <!-- Verb "to unarchive", as in "remove a chat from the archive", opposite of the previous string -->
@@ -379,6 +381,7 @@
     </plurals>
     <string name="ask_delete_named_chat">Elimina chat \"%1$s\"? Essa non verrà più mostrata nell\'elenco delle chat; i suoi messaggi rimarranno sul server.</string>
     <string name="ask_delete_message">Sei sicuro di voler eliminare questo messaggio?</string>
+    <!-- deprecated, use ask_delete_messages_simple -->
     <plurals name="ask_delete_messages">
         <item quantity="one">Eliminare %d messaggio qui e sul sever?</item>
         <item quantity="many">Eliminare %d messaggi qui e sul sever?</item>
@@ -755,10 +758,6 @@
     <string name="pref_manage_keys">Gestisci Chiavi</string>
     <string name="pref_use_system_emoji">Usa Emoji di Sistema</string>
     <string name="pref_use_system_emoji_explain">Disattiva il supporto delle emoji integrato in Delta Chat</string>
-    <!-- deprecated -->
-    <string name="pref_use_inapp_camera">Usa Fotocamera App</string>
-    <!-- deprecated -->
-    <string name="pref_use_inapp_camera_explain">La fotocamera dell\'app di solito ha meno funzionalità della fotocamera di sistema</string>
     <string name="pref_show_system_contacts">Leggi Rubrica di Sistema</string>
     <string name="pref_show_system_contacts_explain">Offri la possibilità di creare chats con i contatti della rubrica. Alcuni provider necessitano prima della configurazione della crittografia end-to-end.</string>
     <string name="pref_app_access">Accesso App</string>

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

@@ -256,6 +256,7 @@
     </plurals>
     <string name="ask_delete_named_chat">%1$sを削除してよろしいですか？</string>
     <string name="ask_delete_message">メッセージを削除してもよろしいですか？</string>
+    <!-- deprecated, use ask_delete_messages_simple -->
     <plurals name="ask_delete_messages">
         <item quantity="other">こことサーバー上の%dつのメッセージを削除しますか？</item>
     </plurals>

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

@@ -273,6 +273,7 @@
     </plurals>
     <string name="ask_delete_named_chat">តើអ្នកប្រាកដហើយថាចង់លុប \"%1$s\"?</string>
     <string name="ask_delete_message">តើអ្នកប្រាកដថា ចង់លុបសារនេះ?</string>
+    <!-- deprecated, use ask_delete_messages_simple -->
     <plurals name="ask_delete_messages">
         <item quantity="other">លុបសារទាំង %d នេះ នៅទីនេះ និងនៅលើម៉ាសុីននេ</item>
     </plurals>

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

@@ -293,6 +293,7 @@
     </plurals>
     <string name="ask_delete_named_chat">메시지 \"%1$s\"을 지우려는 것이 확실한가요?</string>
     <string name="ask_delete_message">이 메시지를 삭제하시겠습니까?</string>
+    <!-- deprecated, use ask_delete_messages_simple -->
     <plurals name="ask_delete_messages">
         <item quantity="other">%d개의 메시지를 이 곳과 서버에서 삭제하시겠습니까?</item>
     </plurals>

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

@@ -315,6 +315,7 @@
     </plurals>
     <string name="ask_delete_named_chat">Ar tikrai norite ištrinti „%1$s“?</string>
     <string name="ask_delete_message">Ar tikrai norite ištrinti šią žinutę?</string>
+    <!-- deprecated, use ask_delete_messages_simple -->
     <plurals name="ask_delete_messages">
         <item quantity="one">Ištrinti %d žinutę čia ir serveryje?</item>
         <item quantity="few">Ištrinti %d žinutes čia ir serveryje?</item>

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

@@ -214,6 +214,7 @@
         <item quantity="one">Slett %d chat? Den vil ikke lenger vises</item>
         <item quantity="other">Slett %d chatter? De vil ikke lenger vises i chattelisten, meldingene vil fortsatt være lagret tjeneren.</item>
     </plurals>
+    <!-- deprecated, use ask_delete_messages_simple -->
     <plurals name="ask_delete_messages">
         <item quantity="one">Slett %d melding? Den vil også bli slettet fra tjeneren?</item>
         <item quantity="other">Slett %d meldinger? De vil også bli slettet fra tjeneren.</item>

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

@@ -41,6 +41,8 @@
     <string name="later">Later</string>
     <!-- "Resend" means "Sending the selected message(s) again to the same chat". The string is used in a menu and should be as short as possible. Resending may be needed after failures or to repost old messages to new members. -->
     <string name="resend">Opnieuw versturen</string>
+    <string name="edited">Bewerkt</string>
+    <string name="edit_message">Bericht bewerken</string>
     <!-- Verb "to archive", as in "put a chat in the archive", not a noun "The Archive". -->
     <string name="archive">Archiveren</string>
     <!-- Verb "to unarchive", as in "remove a chat from the archive", opposite of the previous string -->
@@ -367,6 +369,7 @@
     </plurals>
     <string name="ask_delete_named_chat">Weet je zeker dat je ‘%1$s’ wilt verwijderen?</string>
     <string name="ask_delete_message">Weet je zeker dat je dit bericht wilt verwijderen?</string>
+    <!-- deprecated, use ask_delete_messages_simple -->
     <plurals name="ask_delete_messages">
         <item quantity="one">Wil je %d bericht verwijderen, zowel hier als op de server?</item>
         <item quantity="other">Wil je %d berichten verwijderen, zowel hier als op de server?</item>
@@ -738,10 +741,6 @@
     <string name="pref_manage_keys">Sleutels beheren</string>
     <string name="pref_use_system_emoji">Systeememoji gebruiken</string>
     <string name="pref_use_system_emoji_explain">Schakel Delta Chats ingebouwde emojiondersteuning uit</string>
-    <!-- deprecated -->
-    <string name="pref_use_inapp_camera">Ingebouwde camera gebruiken</string>
-    <!-- deprecated -->
-    <string name="pref_use_inapp_camera_explain">Let op: de ingebouwde camera beschikt over minder functies dan de systeemcamera</string>
     <string name="pref_show_system_contacts">Adresboek uitlezen</string>
     <string name="pref_show_system_contacts_explain">Bied aan om gesprekken te beginnen met contactpersonen uit het adresboek. Let op: voor sommige providers is eind-tot-eindversleuteling benodigd.</string>
     <string name="pref_app_access">Apptoegang</string>

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

@@ -389,6 +389,7 @@
     </plurals>
     <string name="ask_delete_named_chat">Usunąć czat „%1$s”? Nie będzie on już wyświetlany na liście czatów. Jego wiadomości pozostaną na serwerze.</string>
     <string name="ask_delete_message">Czy na pewno chcesz usunąć tę wiadomość?</string>
+    <!-- deprecated, use ask_delete_messages_simple -->
     <plurals name="ask_delete_messages">
         <item quantity="one">Usunąć %d wiadomość tutaj i na serwerze?</item>
         <item quantity="few">Usunąć %d wiadomości tutaj i na serwerze?</item>
@@ -535,6 +536,8 @@
     <string name="profile_encryption">Szyfrowanie</string>
     <string name="profile_shared_chats">Wspólne czaty</string>
     <string name="related_chats">Powiązane czaty</string>
+    <!-- Separator between the list of actual members and past members -->
+    <string name="past_members">Byli członkowie</string>
     <string name="tab_contact">Kontakt</string>
     <string name="tab_group">Grupa</string>
     <string name="tab_gallery">Galeria</string>
@@ -768,10 +771,6 @@
     <string name="pref_manage_keys">Zarządzaj prywatnymi kluczami</string>
     <string name="pref_use_system_emoji">Użyj emoji systemowych</string>
     <string name="pref_use_system_emoji_explain">Wyłącza wbudowaną obsługę emoji Delta Chat</string>
-    <!-- deprecated -->
-    <string name="pref_use_inapp_camera">Użyj aparatu w aplikacji</string>
-    <!-- deprecated -->
-    <string name="pref_use_inapp_camera_explain">Aparat w aplikacji ma zwykle mniej funkcji niż aparat systemowy</string>
     <string name="pref_show_system_contacts">Odczytaj systemową książkę adresową</string>
     <string name="pref_show_system_contacts_explain">Zaproponuj tworzenie czatów z kontaktami z książki adresowej. Niektórzy dostawcy wymagają najpierw szyfrowania end-to-end.</string>
     <string name="pref_app_access">Dostęp do aplikacji</string>
@@ -1147,7 +1146,7 @@
     <!-- command to put the cursor to the search input field -->
     <string name="focus_search_input">Szukaj</string>
     <!-- command to put the cursor to the message input field -->
-    <string name="focus_message_input">Wpisz wiadomość</string>
+    <string name="focus_message_input">Napisz wiadomość</string>
     <string name="force_refresh_network">Wymuś odświeżenie sieci</string>
     <string name="insert_newline">Wstaw nową linię</string>
 

src/main/res/values-pt-rBR/strings.xml

@@ -332,6 +332,7 @@
     </plurals>
     <string name="ask_delete_named_chat">Você tem certeza que quer apagar \"%1$s\"?</string>
     <string name="ask_delete_message">Tem certeza que quer apagar esta mensagem?</string>
+    <!-- deprecated, use ask_delete_messages_simple -->
     <plurals name="ask_delete_messages">
         <item quantity="one">Delete %d message here and on the server?</item>
         <item quantity="many">Apagar %d mensagens aqui e no servidor?</item>

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

@@ -147,6 +147,7 @@
         <item quantity="many">Apagar %d conversas? Elas não serão mais mostrados na lista, mas permanecerão no servidor.</item>
         <item quantity="other">Apagar %d conversas? Elas não serão mais mostrados na lista, mas permanecerão no servidor.</item>
     </plurals>
+    <!-- deprecated, use ask_delete_messages_simple -->
     <plurals name="ask_delete_messages">
         <item quantity="one">Apagar %d mensagens aqui e no servidor?</item>
         <item quantity="many">Apagar %d mensagens aqui e no servidor?</item>

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

@@ -322,6 +322,7 @@
     </plurals>
     <string name="ask_delete_named_chat">Sunteți sigur că vreți să ștergeți \"%1$s\"?</string>
     <string name="ask_delete_message">Sunteți sigur că doriți să ștergeți acest mesaj?</string>
+    <!-- deprecated, use ask_delete_messages_simple -->
     <plurals name="ask_delete_messages">
         <item quantity="one">Ștergeți %d mesajul aici și pe server?</item>
         <item quantity="few">Ștergeți %d mesajele de aici și de pe server?</item>

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

@@ -41,6 +41,8 @@
     <string name="later">Позже</string>
     <!-- "Resend" means "Sending the selected message(s) again to the same chat". The string is used in a menu and should be as short as possible. Resending may be needed after failures or to repost old messages to new members. -->
     <string name="resend">Отправить повторно</string>
+    <string name="edited">Отредактировано</string>
+    <string name="edit_message">Редактировать сообщение</string>
     <!-- Verb "to archive", as in "put a chat in the archive", not a noun "The Archive". -->
     <string name="archive">Отправить в архив</string>
     <!-- Verb "to unarchive", as in "remove a chat from the archive", opposite of the previous string -->
@@ -389,6 +391,7 @@
     </plurals>
     <string name="ask_delete_named_chat">Удалить чат \"%1$s\"?? Он больше не будет виден в списке чатов, его сообщения останутся на сервере.</string>
     <string name="ask_delete_message">Вы уверены, что хотите удалить это сообщение?</string>
+    <!-- deprecated, use ask_delete_messages_simple -->
     <plurals name="ask_delete_messages">
         <item quantity="one">Удалить %d сообщение локально и на сервере?</item>
         <item quantity="few">Удалить %d сообщения локально и на сервере?</item>
@@ -770,10 +773,6 @@
     <string name="pref_manage_keys">Управление ключами</string>
     <string name="pref_use_system_emoji">Использовать системные эмодзи</string>
     <string name="pref_use_system_emoji_explain">Отключить поддержку встроенных эмодзи Delta Chat</string>
-    <!-- deprecated -->
-    <string name="pref_use_inapp_camera">Использовать камеру приложения</string>
-    <!-- deprecated -->
-    <string name="pref_use_inapp_camera_explain">Камера приложения обычно имеет меньше функций, чем системная</string>
     <string name="pref_show_system_contacts">Чтение системной адресной книги</string>
     <string name="pref_show_system_contacts_explain">Предлагать создать чаты с контактами из адресной книги. Некоторые провайдеры требуют предварительной настройки сквозного шифрования.</string>
     <string name="pref_app_access">Доступ приложения</string>

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

@@ -223,6 +223,7 @@
         <item quantity="other">Cheres iscantzellare %d tzarradas? No ant a èssere prus ammustradas in sa lista de sas tzarradas, ma sos messàgios ant a abarrare in su servidore.</item>
     </plurals>
     <string name="ask_delete_named_chat">Ses seguru de chèrrere iscantzellare \"%1$s\"?</string>
+    <!-- deprecated, use ask_delete_messages_simple -->
     <plurals name="ask_delete_messages">
         <item quantity="one">Iscantzellare %d messàgiu inoghe e in su servidore?</item>
         <item quantity="other">Iscantzellare %d messàgios inoghe e in su servidore?</item>

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

@@ -324,6 +324,7 @@
     </plurals>
     <string name="ask_delete_named_chat">Naozaj chcete položku odstrániť  \"%1$s\" ?</string>
     <string name="ask_delete_message">Naozaj chcete odstrániť túto správu?</string>
+    <!-- deprecated, use ask_delete_messages_simple -->
     <plurals name="ask_delete_messages">
         <item quantity="one">Odstrániť %d správu tu a na serveri?</item>
         <item quantity="few">Odstrániť %d správy tu a na serveri?</item>

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

@@ -40,11 +40,14 @@
     <string name="later">Më vonë</string>
     <!-- "Resend" means "Sending the selected message(s) again to the same chat". The string is used in a menu and should be as short as possible. Resending may be needed after failures or to repost old messages to new members. -->
     <string name="resend">Ridërgoje</string>
+    <string name="edited">Të përpunuar</string>
+    <string name="edit_message">Përpunoni Mesazh</string>
     <!-- Verb "to archive", as in "put a chat in the archive", not a noun "The Archive". -->
     <string name="archive">Arkivoje</string>
     <!-- Verb "to unarchive", as in "remove a chat from the archive", opposite of the previous string -->
     <string name="unarchive">Çarkivoje</string>
     <string name="mute">Heshtoje</string>
+    <string name="muted">Heshtuar</string>
     <string name="ephemeral_messages">Mesazhe Që Zhduken</string>
     <string name="ephemeral_messages_hint">Këto rregullime zbatohen mbi krejt pjesëmarrësit që përdorin Delta Chat-in. Sidoqoftë, ata mund të kopjojnë, ruajnë dhe përcjellin mesazhe ose të përdorin klientë të tjerë email-i.</string>
     <string name="save">Ruaje</string>
@@ -216,6 +219,8 @@
     <string name="new_classic_contact_explain">Kontaktet e shtuar dorazi mund të përdoren për të dërguar tekst te email klasik dhe për ta s’garantohet fshehtëzim skaj-më-skaj.</string>
     <string name="menu_new_chat">Fjalosje e Re</string>
     <string name="menu_new_group">Grup i Ri</string>
+    <!-- "Chat" is a verb here, "Message to" would also fit. the string might be used in the "New Chat" screen above the contact list -->
+    <string name="chat_with">Bisedoni me… </string>
     <string name="clone_chat">Klononi Fjalosjen</string>
     <!-- consider keeping the term "broadcast" as in WhatsApp or Telegram -->
     <string name="broadcast_list">Listë Transmetimi</string>
@@ -360,6 +365,7 @@
     </plurals>
     <string name="ask_delete_named_chat">Jeni i sigurt se doni të fshihet “%1$s”?</string>
     <string name="ask_delete_message">Jeni i sigurt se doni të fshihet ky mesazh?</string>
+    <!-- deprecated, use ask_delete_messages_simple -->
     <plurals name="ask_delete_messages">
         <item quantity="one">Të fshihet %d mesazh këtu dhe te shërbyesi?</item>
         <item quantity="other">Të fshihen %d mesazhe këtu dhe te shërbyesi?</item>
@@ -495,6 +501,8 @@
     <string name="profile_encryption">Fshehtëzim</string>
     <string name="profile_shared_chats">Fjalosje të Përbashkëta</string>
     <string name="related_chats">Fjalosje të Afërta</string>
+    <!-- Separator between the list of actual members and past members -->
+    <string name="past_members">Anëtarë të Dikurshëm</string>
     <string name="tab_contact">Kontakt</string>
     <string name="tab_group">Grup</string>
     <string name="tab_gallery">Galeri</string>
@@ -728,10 +736,6 @@
     <string name="pref_manage_keys">Administroni Kyçe</string>
     <string name="pref_use_system_emoji">Përdor Emoji Sistemi</string>
     <string name="pref_use_system_emoji_explain">Çaktivizo mbulimin e brendshëm Delta Chat për emoji-t</string>
-    <!-- deprecated -->
-    <string name="pref_use_inapp_camera">Përdor Kamerën e Vetë Aplikacionit</string>
-    <!-- deprecated -->
-    <string name="pref_use_inapp_camera_explain">Kamera e vetë aplikacionit, zakonisht, ka më pak veçori se kamera e sistemit</string>
     <string name="pref_show_system_contacts">Të Lexojë Libër Adresash Sistemi</string>
     <string name="pref_show_system_contacts_explain">Ofro krijim fjalosjesh me kontakte prej libri adresash. Disa shërbime lypin ujdisje fshehtëzimi skaj-më-skaj së pari.</string>
     <string name="pref_chats">Fjalosje</string>

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

@@ -325,6 +325,7 @@
     </plurals>
     <string name="ask_delete_named_chat">Јесте ли сигурни да желите да избришете „%1$s“?</string>
     <string name="ask_delete_message">Да ли желите да избришете ову поруку?</string>
+    <!-- deprecated, use ask_delete_messages_simple -->
     <plurals name="ask_delete_messages">
         <item quantity="one">Обриши %d поруку овде и са сервера.</item>
         <item quantity="few">Обриши %d поруке овде и са сервера.</item>

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

@@ -340,6 +340,7 @@
     </plurals>
     <string name="ask_delete_named_chat">Är du säker på att du vill ta bort \"%1$s\"?</string>
     <string name="ask_delete_message">Är du säker på att du vill radera detta meddelande?</string>
+    <!-- deprecated, use ask_delete_messages_simple -->
     <plurals name="ask_delete_messages">
         <item quantity="one">Radera %d meddelande här och på servern.</item>
         <item quantity="other">Radera %d meddelanden här och på servern?</item>
@@ -676,10 +677,6 @@
     <string name="pref_manage_keys">Hantera nycklar</string>
     <string name="pref_use_system_emoji">Använd systemets emojier</string>
     <string name="pref_use_system_emoji_explain">Inaktivera Delta Chat\'s inbyggda emojier</string>
-    <!-- deprecated -->
-    <string name="pref_use_inapp_camera">Använd kameran i appen</string>
-    <!-- deprecated -->
-    <string name="pref_use_inapp_camera_explain">Kameran i appen har vanligtvis färre funktioner än systemkameran</string>
     <string name="pref_show_system_contacts">Läs systemets adressbok</string>
     <string name="pref_show_system_contacts_explain">Erbjud att skapa chattar med kontakter från adressboken. Vissa leverantörer behöver först konfigureras för totalsträckskryptering.</string>
     <string name="pref_app_access">Programåtkomst</string>

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

@@ -41,6 +41,8 @@
     <string name="later">Daha Sonra</string>
     <!-- "Resend" means "Sending the selected message(s) again to the same chat". The string is used in a menu and should be as short as possible. Resending may be needed after failures or to repost old messages to new members. -->
     <string name="resend">Yeniden Gönder</string>
+    <string name="edited">Düzenlendi</string>
+    <string name="edit_message">İletiyi Düzenle</string>
     <!-- Verb "to archive", as in "put a chat in the archive", not a noun "The Archive". -->
     <string name="archive">Arşivle</string>
     <!-- Verb "to unarchive", as in "remove a chat from the archive", opposite of the previous string -->
@@ -367,6 +369,7 @@
     </plurals>
     <string name="ask_delete_named_chat">\"%1$s\" sohbeti silinsin mi? O artık sohbet listesinde gösterilmeyecek; iletileri sunucuda kalacak.</string>
     <string name="ask_delete_message">Bu iletiyi silmek istediğinizden emin misiniz?</string>
+    <!-- deprecated, use ask_delete_messages_simple -->
     <plurals name="ask_delete_messages">
         <item quantity="one">%d ileti buradan ve sunucudan silinsin mi?</item>
         <item quantity="other">%d ileti buradan ve sunucudan silinsin mi?</item>
@@ -738,10 +741,6 @@
     <string name="pref_manage_keys">Anahtarları Yönet</string>
     <string name="pref_use_system_emoji">Sistem Emojisini Kullan</string>
     <string name="pref_use_system_emoji_explain">Delta Chat\'in gömülü emoji desteğini kapat</string>
-    <!-- deprecated -->
-    <string name="pref_use_inapp_camera">Uygulama İçi Kamerayı Kullan</string>
-    <!-- deprecated -->
-    <string name="pref_use_inapp_camera_explain">Uygulama içi kameranın genellikle sistem kamerasından daha az özelliği vardır</string>
     <string name="pref_show_system_contacts">Sistem Adres Defterini Oku</string>
     <string name="pref_show_system_contacts_explain">Adres defterinden gelen kişilerle sohbet oluşturmayı teklif edin. Bazı sağlayıcılara önce uçtan uca şifreleme ayarlaması gerekir.</string>
     <string name="pref_app_access">Uygulama Erişimi</string>

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

@@ -389,6 +389,7 @@
     </plurals>
     <string name="ask_delete_named_chat">Видалити чат \"%1$s\"? Він більше не буде відображатися у списку чату, але його повідомлення залишаться на сервері.</string>
     <string name="ask_delete_message">Ви впевнені, що хочете видалити це повідомлення?</string>
+    <!-- deprecated, use ask_delete_messages_simple -->
     <plurals name="ask_delete_messages">
         <item quantity="one">Видалити %d повідомлення тут і на сервері?</item>
         <item quantity="few">Видалити %d повідомлення тут і на сервері?</item>
@@ -770,10 +771,6 @@
     <string name="pref_manage_keys">Управління ключами</string>
     <string name="pref_use_system_emoji">Використовувати системні емодзі</string>
     <string name="pref_use_system_emoji_explain">Вимкнути вбудовану підтримку емодзі</string>
-    <!-- deprecated -->
-    <string name="pref_use_inapp_camera">Використовувати вбудовану в додаток камеру</string>
-    <!-- deprecated -->
-    <string name="pref_use_inapp_camera_explain">Вбудована в додаток камера зазвичай має менше функцій ніж системна.</string>
     <string name="pref_show_system_contacts">Прочитати адресну книгу системи</string>
     <string name="pref_show_system_contacts_explain">Пропозиція створювати чати з контактами з адресної книги. Деякі провайдери потребують попереднього налаштування наскрізного шифрування.</string>
     <string name="pref_app_access">Доступ додатку</string>

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

@@ -321,6 +321,7 @@
     </plurals>
     <string name="ask_delete_named_chat">Bạn có chắc chắn muốn xóa \"%1$s\" không?</string>
     <string name="ask_delete_message">Bạn có chắc chắn muốn xóa tin nhắn này?</string>
+    <!-- deprecated, use ask_delete_messages_simple -->
     <plurals name="ask_delete_messages">
         <item quantity="other">Xóa %d tin nhắn ở đây và trên máy chủ?</item>
     </plurals>
@@ -622,10 +623,6 @@
     <string name="pref_manage_keys">Quản lý khóa</string>
     <string name="pref_use_system_emoji">Sử dụng Emoji hệ thống</string>
     <string name="pref_use_system_emoji_explain">Tắt tính năng hỗ trợ emoji tích hợp của Delta Chat</string>
-    <!-- deprecated -->
-    <string name="pref_use_inapp_camera">Sử dụng máy ảnh trong ứng dụng</string>
-    <!-- deprecated -->
-    <string name="pref_use_inapp_camera_explain">Camera trong ứng dụng thường có ít tính năng hơn camera hệ thống</string>
     <string name="pref_app_access">Quyền truy cập ứng dụng</string>
     <string name="pref_chats">Trò chuyện</string>
     <string name="pref_in_chat_sounds">Âm thanh trong cuộc trò chuyện</string>

src/main/res/values-zh-rCN/strings.xml

@@ -41,6 +41,8 @@
     <string name="later">稍后</string>
     <!-- "Resend" means "Sending the selected message(s) again to the same chat". The string is used in a menu and should be as short as possible. Resending may be needed after failures or to repost old messages to new members. -->
     <string name="resend">重新发送</string>
+    <string name="edited">已编辑</string>
+    <string name="edit_message">编辑消息</string>
     <!-- Verb "to archive", as in "put a chat in the archive", not a noun "The Archive". -->
     <string name="archive">存档</string>
     <!-- Verb "to unarchive", as in "remove a chat from the archive", opposite of the previous string -->
@@ -356,6 +358,7 @@
     </plurals>
     <string name="ask_delete_named_chat">删除聊天“%1$s”？它将不再显示在聊天列表中，其消息将保留在服务器上。</string>
     <string name="ask_delete_message">您确定要删除这条消息吗？</string>
+    <!-- deprecated, use ask_delete_messages_simple -->
     <plurals name="ask_delete_messages">
         <item quantity="other">在此处和服务器上删除 %d 条消息？</item>
     </plurals>
@@ -722,10 +725,6 @@
     <string name="pref_manage_keys">管理密钥</string>
     <string name="pref_use_system_emoji">使用系统 emoji</string>
     <string name="pref_use_system_emoji_explain">关闭 Delta Chat 内置 emoji 支持</string>
-    <!-- deprecated -->
-    <string name="pref_use_inapp_camera">使用应用内相机</string>
-    <!-- deprecated -->
-    <string name="pref_use_inapp_camera_explain">应用内相机功能通常比系统相机少</string>
     <string name="pref_show_system_contacts">读取系统通讯录</string>
     <string name="pref_show_system_contacts_explain">从通讯录建立和联系人的聊天。一些邮件服务商需要先行设置才能进行端到端加密的聊天。</string>
     <string name="pref_app_access">应用程序访问</string>
@@ -964,7 +963,7 @@
     <string name="qrscan_fingerprint_label">指纹</string>
     <string name="withdraw_verifycontact_explain">其他人可以扫描此二维码与您联系。\n\n您可以在此处停用二维码并通过再次扫描来重新激活它。</string>
     <string name="withdraw_verifygroup_explain">其他人可以扫描此二维码加入群组 “%1$s”。\n\n您可以在此处停用二维码并通过再次扫描来重新激活它。</string>
-    <string name="withdraw_qr_code">停用二维码</string>
+    <string name="withdraw_qr_code">重置二维码</string>
     <string name="revive_verifycontact_explain">其他人可扫描此二维码以与您联系。\n\n此设备上的二维码未激活。</string>
     <string name="revive_verifygroup_explain">其他人可扫描此二维码加入群组“%1$s”。\n\n此设备上的二维码未激活。</string>
     <string name="revive_qr_code">激活二维码</string>

src/main/res/values-zh-rTW/strings.xml

@@ -342,6 +342,7 @@
     </plurals>
     <string name="ask_delete_named_chat">你確定你要刪除「%1$s」？</string>
     <string name="ask_delete_message">你確定要刪除這則訊息？</string>
+    <!-- deprecated, use ask_delete_messages_simple -->
     <plurals name="ask_delete_messages">
         <item quantity="other">刪除本地及伺服器上的%d個訊息？</item>
     </plurals>
@@ -700,10 +701,6 @@
     <string name="pref_manage_keys">管理金鑰</string>
     <string name="pref_use_system_emoji">使用系統的表情符號</string>
     <string name="pref_use_system_emoji_explain">停用 Delta Chat 內建的表情符號</string>
-    <!-- deprecated -->
-    <string name="pref_use_inapp_camera">使用應用程式內的相機</string>
-    <!-- deprecated -->
-    <string name="pref_use_inapp_camera_explain">應用內相機的功能通常比系統相機少</string>
     <string name="pref_show_system_contacts">讀取系統通訊錄</string>
     <string name="pref_show_system_contacts_explain">建議與通訊錄中的聯絡人建立聊天。一些供應商需要先進行端到端加密設置。</string>
     <string name="pref_app_access">App 存取</string>

src/main/res/values/strings.xml

@@ -48,6 +48,8 @@
     <string name="later">Later</string>
     <!-- "Resend" means "Sending the selected message(s) again to the same chat". The string is used in a menu and should be as short as possible. Resending may be needed after failures or to repost old messages to new members. -->
     <string name="resend">Resend</string>
+    <string name="edited">Edited</string>
+    <string name="edit_message">Edit Message</string>
     <!-- Verb "to archive", as in "put a chat in the archive", not a noun "The Archive". -->
     <string name="archive">Archive</string>
     <!-- Verb "to unarchive", as in "remove a chat from the archive", opposite of the previous string -->
@@ -374,11 +376,12 @@
     <!-- get confirmations -->
     <string name="ask_leave_group">Are you sure you want to leave this group?</string>
     <plurals name="ask_delete_chat">
-        <item quantity="one">Delete %d chat? It will no longer be shown in the chat list; its messages will remain on the server.</item>
-        <item quantity="other">Delete %d chats? They will no longer be shown in the chat list; their messages will remain on the server.</item>
+        <item quantity="one">Delete %d chat?</item>
+        <item quantity="other">Delete %d chats?</item>
     </plurals>
-    <string name="ask_delete_named_chat">Delete chat \"%1$s\"? It will no longer be shown in the chat list; its messages will remain on the server.</string>
+    <string name="ask_delete_named_chat">Delete chat \"%1$s\"?</string>
     <string name="ask_delete_message">Are you sure you want to delete this message?</string>
+    <!-- deprecated, use ask_delete_messages_simple -->
     <plurals name="ask_delete_messages">
         <item quantity="one">Delete %d message here and on the server?</item>
         <item quantity="other">Delete %d messages here and on the server?</item>
@@ -759,10 +762,6 @@
     <string name="pref_manage_keys">Manage Keys</string>
     <string name="pref_use_system_emoji">Use System Emoji</string>
     <string name="pref_use_system_emoji_explain">Turn off Delta Chat\'s built-in emoji support</string>
-    <!-- deprecated -->
-    <string name="pref_use_inapp_camera">Use In-App Camera</string>
-    <!-- deprecated -->
-    <string name="pref_use_inapp_camera_explain">In-app camera usually has less features than the system camera</string>
     <string name="pref_show_system_contacts">Read System Address Book</string>
     <string name="pref_show_system_contacts_explain">Offer to create chats with contacts from the address book. Some providers need end-to-end encryption setup first.</string>
     <string name="pref_app_access">App Access</string>