Commit fa217090 authored by Hussein's avatar Hussein

Merge branch 'bug/P4A-1017' into release/v1.1.000

parents 8749da50 5cfc24b3
......@@ -48,7 +48,6 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentStart="true"
android:layout_toLeftOf="@+id/call"
android:gravity="center_vertical"
android:padding="8dp"
android:textSize="14sp"
......
......@@ -174,8 +174,8 @@
\n 1. té la clau PGP pública adjunta i
\n 2. està xifrat i signat amb la clau p≡p que acabeu d’importar</string>
<string name="key_import_wizard_pep_not_initial_explanation">Si heu iniciat una importació de clau per al compte següent:% s, feu clic a Inicia.</string>
<string name="key_import_failure">No s\'ha pogut importar i utilitzar cap clau de% 1 $ s amb l\'identificador de clau:% 2 $ s</string>
<string name="key_import_success">% 1 $ s Clau importada amb èxit de% 2 $ s</string>
<string name="key_import_failure">No s\'ha pogut importar i utilitzar cap clau de %1$s amb l\'identificador de clau: %2$s</string>
<string name="key_import_success">%1$s Clau importada amb èxit de %2$s</string>
<string name="key_import_from_fs_input_fpr">Introduïu l\'ID de clau o l\'empremta digital de la clau.</string>
<string name="reset_all">Restableix-ho tot</string>
<string name="key_reset_for_identity_context_title">Restabliu totes les dades de p≡p d\'aquest soci de comunicació:</string>
......
......@@ -871,7 +871,7 @@
<item quantity="one"><xliff:g id="new_message_count">%d</xliff:g> nou missatge</item>
<item quantity="other"><xliff:g id="new_message_count">%d</xliff:g> nous missatges</item>
</plurals>
<string name="notification_additional_messages">+ <xliff:g id="additional_messages">%$d</xliff:g> més a <xliff:g id="account">%2$s</xliff:g></string>
<string name="notification_additional_messages">+ <xliff:g id="additional_messages">%1$d</xliff:g> més a <xliff:g id="account">%2$s</xliff:g></string>
<string name="notification_action_delete_all">Eliminar tots</string>
<string name="notification_action_archive_all">Arxivar tot</string>
<string name="notification_authentication_error_title">L\'autenticació ha fallat</string>
......@@ -903,7 +903,7 @@
<string name="compose_error_incomplete_recipient">El camp del destinatari conté una entrada incompleta.</string>
<string name="message_view_status_no_space">No s\'ha pogut desar el fitxer adjunt ja que no hi ha prou espai.</string>
<string name="message_view_toast_unable_to_display_message">No es pot mostrar el missatge</string>
<string name="message_view_sender_label">via% 1 $ s</string>
<string name="message_view_sender_label">via %1$s</string>
<string name="debug_delete_local_body">Depuració / elimina el cos del missatge</string>
<string name="global_settings_messageiew_after_delete_behavior_title">Comportament del missatge suprimit</string>
<string name="global_settings_confirm_menu_mark_all_read">Marca tots els missatges com a llegits</string>
......
......@@ -1058,7 +1058,7 @@ Bitte senden Sie Fehlerberichte, Ideen für neue Funktionen und stellen Sie Frag
<string name="global_settings_confirm_menu_mark_all_read">Alle Nachrichten als gelesen markieren</string>
<string name="global_settings_messageiew_after_delete_behavior_title">Verhalten nach dem Löschen der Nachricht</string>
<string name="debug_delete_local_body">Nachrichtentext debuggen / löschen</string>
<string name="message_view_sender_label">über% 1 $ s</string>
<string name="message_view_sender_label">über %1$s</string>
<string name="message_view_status_no_space">Der Anhang konnte nicht gespeichert werden, da nicht genügend Speicherplatz vorhanden ist.</string>
<string name="status_syncing">Nachrichten synchronisieren</string>
<string name="status_syncing_blocked">Synchronisierung blockiert</string>
......
......@@ -45,11 +45,11 @@
<string name="compose_title_reply_all">Répondre à tous</string>
<string name="compose_title_forward">Transférer</string>
<string name="choose_folder_title">Choisir un dossier</string>
<string name="status_loading_account_folder">Récup. <xliff:g id="account">%s</xliff:g>:<xliff:g id="folder">%s</xliff:g><xliff:g id="progress">%s</xliff:g></string>
<string name="status_loading_account_folder_headers">Récup. entêtes <xliff:g id="account">%s</xliff:g>:<xliff:g id="folder">%s</xliff:g><xliff:g id="progress">%s</xliff:g></string>
<string name="status_sending_account">Envoi <xliff:g id="account">%s</xliff:g><xliff:g id="progress">%s</xliff:g></string>
<string name="status_processing_account">Prép <xliff:g id="account">%s</xliff:g>:<xliff:g id="command">%s</xliff:g><xliff:g id="progress">%s</xliff:g></string>
<string name="folder_progress">\u0020<xliff:g id="completed">%d</xliff:g>/<xliff:g id="total">%d</xliff:g></string>
<string name="status_loading_account_folder">Récup. <xliff:g id="account">%1$s</xliff:g>:<xliff:g id="folder">%2$s</xliff:g><xliff:g id="progress">%3$s</xliff:g></string>
<string name="status_loading_account_folder_headers">Récup. entêtes <xliff:g id="account">%1$s</xliff:g>:<xliff:g id="folder">%2$s</xliff:g><xliff:g id="progress">%3$s</xliff:g></string>
<string name="status_sending_account">Envoi <xliff:g id="account">%1$s</xliff:g><xliff:g id="progress">%2$s</xliff:g></string>
<string name="status_processing_account">Prép <xliff:g id="account">%1$s</xliff:g>:<xliff:g id="command">%2$s</xliff:g><xliff:g id="progress">%3$s</xliff:g></string>
<string name="folder_progress">\u0020<xliff:g id="completed">%1$d</xliff:g>/<xliff:g id="total">%2$d</xliff:g></string>
<string name="status_next_poll">Prochaine récup. <xliff:g id="nexttime">%s</xliff:g></string>
<string name="status_syncing_off">Synchronisation désactivée</string>
<string name="actionbar_selected"><xliff:g id="selection_count">%d</xliff:g> sélectionné(s)</string>
......@@ -130,7 +130,7 @@ jusqu\'à <xliff:g id="messages_to_load">%d</xliff:g> de plus</string>
<string name="abbrev_megabytes">Mo</string>
<string name="abbrev_kilobytes">ko</string>
<string name="abbrev_bytes">o</string>
<string name="account_size_changed">Compte «\u00A0<xliff:g id="account">%s</xliff:g>\u00A0» rétréci de <xliff:g id="oldSize">%s</xliff:g> à <xliff:g id="newSize">%s</xliff:g></string>
<string name="account_size_changed">Compte «\u00A0<xliff:g id="account">%1$s</xliff:g>\u00A0» rétréci de <xliff:g id="oldSize">%2$s</xliff:g> à <xliff:g id="newSize">%3$s</xliff:g></string>
<string name="compacting_account">Compactage du compte «\u00A0<xliff:g id="account">%s</xliff:g>\u00A0»</string>
<string name="clearing_account">Effacement du compte «\u00A0<xliff:g id="account">%s</xliff:g>\u00A0»</string>
<string name="recreating_account">Recréation du compte «\u00A0<xliff:g id="account">%s</xliff:g>\u00A0»</string>
......@@ -139,7 +139,7 @@ jusqu\'à <xliff:g id="messages_to_load">%d</xliff:g> de plus</string>
<item quantity="one"><xliff:g id="new_message_count">%d</xliff:g> nouveau message</item>
<item quantity="other"><xliff:g id="new_message_count">%d</xliff:g> nouveaux messages</item>
</plurals>
<string name="notification_new_one_account_fmt"><xliff:g id="unread_message_count">%d</xliff:g> non lus (<xliff:g id="account">%s</xliff:g>)</string>
<string name="notification_new_one_account_fmt"><xliff:g id="unread_message_count">%1$d</xliff:g> non lus (<xliff:g id="account">%2$s</xliff:g>)</string>
<string name="notification_additional_messages">+ <xliff:g id="additional_messages">%1$d</xliff:g> de plus sur <xliff:g id="account">%2$s</xliff:g></string>
<string name="notification_action_reply">Répondre</string>
<string name="notification_action_mark_as_read">Marquer comme lu</string>
......@@ -153,7 +153,7 @@ jusqu\'à <xliff:g id="messages_to_load">%d</xliff:g> de plus</string>
<string name="notification_certificate_error_text">Vérifier vos paramètres de serveur</string>
<string name="notification_authentication_error_title">Échec d\'authentification</string>
<string name="notification_authentication_error_text">Échec d\'authentification pour <xliff:g id="account">%s</xliff:g>. Mettre à jour les paramètres du serveur.</string>
<string name="notification_bg_sync_ticker">Relève des courriels\u00A0: <xliff:g id="account">%s</xliff:g>:<xliff:g id="folder">%s</xliff:g></string>
<string name="notification_bg_sync_ticker">Relève des courriels\u00A0: <xliff:g id="account">%1$s</xliff:g>:<xliff:g id="folder">%2$s</xliff:g></string>
<string name="notification_bg_sync_title">Relève des courriels</string>
<string name="notification_bg_send_ticker">Envoi du courriel\u00A0: <xliff:g id="account">%s</xliff:g></string>
<string name="notification_bg_send_title">Envoi du courriel</string>
......@@ -196,7 +196,7 @@ jusqu\'à <xliff:g id="messages_to_load">%d</xliff:g> de plus</string>
<string name="message_compose_show_quoted_text_action">Citer le message</string>
<string name="message_compose_description_delete_quoted_text">Enlever le texte entre guillemets</string>
<string name="message_compose_description_edit_quoted_text">Modifier le texte entre guillemets</string>
<string name="message_view_from_format">De : <xliff:g id="name">%s</xliff:g> &lt;<xliff:g id="email">%s</xliff:g>&gt;</string>
<string name="message_view_from_format">De : <xliff:g id="name">%1$s</xliff:g> &lt;<xliff:g id="email">%2$s</xliff:g>&gt;</string>
<string name="message_to_label">À\u00A0:</string>
<string name="message_view_cc_label">Cc\u00A0:</string>
<string name="message_view_attachment_view_action">Ouvrir</string>
......@@ -671,7 +671,7 @@ jusqu\'à <xliff:g id="messages_to_load">%d</xliff:g> de plus</string>
<string name="count_search_summary">Désactiver pour un affichage plus rapide</string>
<string name="hide_special_accounts_title">Masquer les comptes spéciaux</string>
<string name="hide_special_accounts_summary">Masquer la boîte de réception unifiée et tous les comptes de messages</string>
<string name="search_title"><xliff:g id="search_name">%s</xliff:g> <xliff:g id="modifier">%s</xliff:g></string>
<string name="search_title"><xliff:g id="search_name">%1$s</xliff:g> <xliff:g id="modifier">%2$s</xliff:g></string>
<string name="flagged_modifier"> - Étoilés</string>
<string name="unread_modifier"> - Non lu</string>
<string name="search_all_messages_title">Tous les messages</string>
......@@ -762,7 +762,7 @@ jusqu\'à <xliff:g id="messages_to_load">%d</xliff:g> de plus</string>
<string name="settings_import_scanning_file">Analyse du fichier…</string>
<string name="settings_export_success">Paramètres exportés vers <xliff:g id="filename">%s</xliff:g></string>
<string name="settings_import_global_settings_success">Paramètres globaux importés depuis <xliff:g id="filename">%s</xliff:g></string>
<string name="settings_import_success">Importé <xliff:g id="accounts">%s</xliff:g> depuis <xliff:g id="filename">%s</xliff:g></string>
<string name="settings_import_success">Importé <xliff:g id="accounts">%1$s</xliff:g> depuis <xliff:g id="filename">%2$s</xliff:g></string>
<plurals name="settings_import_accounts">
<item quantity="one">1 compte</item>
<item quantity="other"><xliff:g id="numAccounts">%s</xliff:g> comptes</item>
......@@ -774,7 +774,7 @@ jusqu\'à <xliff:g id="messages_to_load">%d</xliff:g> de plus</string>
<string name="settings_import_success_header">Importation réussie</string>
<string name="settings_import_failed_header">Importation échouée</string>
<string name="settings_import_activate_account_header">Activer le compte</string>
<string name="settings_import_activate_account_intro">Afin de pouvoir utiliser le compte «\u00A0<xliff:g id="account">%s</xliff:g>\u00A0», vous devez fournir <xliff:g id="server_passwords">%s</xliff:g>.</string>
<string name="settings_import_activate_account_intro">Afin de pouvoir utiliser le compte «\u00A0<xliff:g id="account">%1$s</xliff:g>\u00A0», vous devez fournir <xliff:g id="server_passwords">%2$s</xliff:g>.</string>
<plurals name="settings_import_server_passwords">
<item quantity="one">le mot de passe du serveur</item>
<item quantity="other">les mots de passe du serveur</item>
......
......@@ -59,13 +59,13 @@
<string name="pep_wrong_fingerprint">Verkeerde vingerafdruk</string>
<string name="pep_ask_trustwords">Vraag uw partner persoonlijk of telefonisch: wat zijn uw vertrouwenswoorden\? Vergelijk dan met het juiste antwoord hieronder.</string>
<string name="pep_complete_partner_format">Partner
\n% 1 $ s &lt;% 2 $ s&gt;</string>
\n%1$s &lt;%2$s&gt;</string>
<string name="pep_partner_format">Partner
\n% 1 $ s</string>
\n%1$s</string>
<string name="pep_complete_myself_format">Mezelf
\n% 1 $ s &lt;% 2 $ s&gt;</string>
\n%1$s &lt;%2$s&gt;</string>
<string name="pep_myself_format">Mezelf
\n% 1 $ s</string>
\n%1$s</string>
<string name="pep_force_unprotected">Schakel beveiliging uit</string>
<string name="pep_force_protected">Beveiliging inschakelen</string>
<string name="pep_receivedSecretKey">Deze geheime sleutel ontvangen:</string>
......@@ -73,7 +73,7 @@
<string name="pep_userAddress">Gebruikersadres</string>
<string name="pep_secret_key_detected">Geheime sleutel gedetecteerd</string>
<string name="pep_received_this_secret_key" translatable="false">De volgende geheime sleutel is ontvangen. Weet je zeker dat je het wilt gebruiken\?</string>
<string name="pep_from_format">van afzender% 1 $ s</string>
<string name="pep_from_format">van afzender %1$s</string>
<string name="pep_trust_server_and_store_mails_unprotected">p≡p - Vertrouw server en bewaar e-mails onbeschermd</string>
<string name="pep_mistrust_server_and_store_mails_encrypted">Bewaar berichten veilig</string>
<string name="pep_enable_privacy_protection">p≡p privacybescherming</string>
......@@ -202,8 +202,8 @@
\n 1. heeft uw openbare PGP-sleutel bijgevoegd en
\n 2. is gecodeerd en ondertekend met de p≡p-sleutel die u zojuist hebt geïmporteerd</string>
<string name="key_import_wizard_pep_not_initial_explanation">Als u een sleutelimport hebt gestart voor het volgende account:% s, klikt u op Start.</string>
<string name="key_import_failure">Kan sleutel van% 1 $ s met sleutel-id:% 2 $ s niet importeren en gebruiken</string>
<string name="key_import_success">Sleutel% 1 $ s geïmporteerd uit% 2 $ s</string>
<string name="key_import_failure">Kan sleutel van %1$s met sleutel-id: %2$s niet importeren en gebruiken</string>
<string name="key_import_success">Sleutel %1$s geïmporteerd uit %2$s</string>
<string name="key_import_from_fs_input_fpr">Voer de sleutel-ID of de vingerafdruk van de sleutel in.</string>
<string name="reset">Reset</string>
<string name="reset_all">Alles resetten</string>
......
......@@ -202,7 +202,7 @@
\n 1. má pripojený váš verejný kľúč PGP a
\n 2. je šifrovaný a podpísaný pomocou kľúča p≡p, ktorý ste práve importovali</string>
<string name="key_import_wizard_pep_not_initial_explanation">Ak ste iniciovali import kľúčov pre nasledujúci účet:% s, kliknite na tlačidlo Štart.</string>
<string name="key_import_failure">Nepodarilo sa importovať a použiť žiadny kľúč z% 1 $ s s identifikátorom kľúča:% 2 $ s</string>
<string name="key_import_failure">Nepodarilo sa importovať a použiť žiadny kľúč z %1$s s identifikátorom kľúča: %2$s</string>
<string name="key_import_success">Kľúč %1$ s bol úspešne importovaný z %2$s</string>
<string name="key_import_from_fs_input_fpr">Zadajte ID kľúča alebo odtlačok kľúča.</string>
<string name="reset">Obnoviť</string>
......
......@@ -101,8 +101,8 @@
\n 1. genel PGP anahtarınız eklenmiş ve
\n 2. yeni içe aktardığınız p≡p anahtarı ile şifrelenir ve imzalanır</string>
<string name="key_import_wizard_pep_not_initial_explanation">Aşağıdaki hesap için bir anahtar içe aktarma başlattıysanız:% s, lütfen Başlat\'ı tıklayın.</string>
<string name="key_import_failure">% 1 $ s anahtar kimliğine sahip herhangi bir anahtar içe aktarılamadı ve kullanılamadı:% 2 $ s</string>
<string name="key_import_success">% 1 $ s% 2 $ s anahtarından başarıyla aktarıldı</string>
<string name="key_import_failure">%1$s anahtar kimliğine sahip herhangi bir anahtar içe aktarılamadı ve kullanılamadı: %2$s</string>
<string name="key_import_success">%1$s %2$s anahtarından başarıyla aktarıldı</string>
<string name="key_import_from_fs_input_fpr">Lütfen Anahtar Kimliğini veya anahtarın parmak izini girin.</string>
<string name="reset">Sıfırla</string>
<string name="reset_all">Hepsini sıfırla</string>
......
......@@ -918,7 +918,7 @@
<string name="status_syncing_blocked">Senkronizasyon engellendi</string>
<string name="status_syncing">Mesajları senkronize etme</string>
<string name="message_view_status_no_space">Yeterli alan olmadığı için ek kaydedilemedi.</string>
<string name="message_view_sender_label">% 1 $ s ile</string>
<string name="message_view_sender_label">%1$s ile</string>
<string name="debug_delete_local_body">Hata ayıklama / İleti gövdesini sil</string>
<string name="global_settings_messageiew_after_delete_behavior_title">Mesaj silindikten sonra davranış</string>
<string name="global_settings_confirm_menu_mark_all_read">Tüm mesajları okundu olarak işaretle</string>
......
This diff is collapsed.
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment