Merge pull request #107 from damor/master

French and German translation update

res/values-de/strings.xml

@@ -60,6 +60,7 @@
     <string name="forward_action">Weiterleiten</string>
     <string name="move_action">Verschieben</string>
     <string name="continue_action">Fortfahren</string>
+    <string name="back_action">Zurück</string>
     <string name="done_action">Fertig</string> <!--  Used to complete a multi-step process -->
     <string name="remove_action">Entfernen</string>
     <string name="discard_action">Verwerfen</string>
@@ -338,6 +339,7 @@ Willkommen zum \"K-9 Mail\"-Setup. K-9 ist eine quelloffene E-Mail-Anwendung fü
     <string name="global_settings_confirm_actions_summary">Verlange Bestätigung bei gewissen Aktionen</string>
     <string name="global_settings_confirm_action_archive">Archivieren</string>
     <string name="global_settings_confirm_action_delete">Löschen (nur in Nachrichtenansicht)</string>
+    <string name="global_settings_confirm_action_delete_starred">Sternmarkierte Löschen (nur in Nachrichtenansicht)</string>
     <string name="global_settings_confirm_action_spam">Spam</string>
     <string name="global_settings_confirm_action_mark_all_as_read">Alle als gelesen markieren</string>
     <string name="global_settings_confirm_action_send">Senden</string>
@@ -421,7 +423,7 @@ Willkommen zum \"K-9 Mail\"-Setup. K-9 ist eine quelloffene E-Mail-Anwendung fü
     <string name="account_setup_expunge_policy_on_poll">Bei jedem Abrufen</string>
     <string name="account_setup_expunge_policy_manual">Nur manuell</string>
 
-    <!-- NEW: <string name="account_setup_incoming_autodetect_namespace_label">Auto-detect IMAP namespace</string>-->
+    <string name="account_setup_incoming_autodetect_namespace_label">IMAP Namensraum automatisch ermitteln</string>
     <string name="account_setup_incoming_imap_path_prefix_label">IMAP-Verzeichnispräfix</string>
 
     <string name="drafts_folder_label">Ordner für Entwürfe</string>
@@ -561,11 +563,15 @@ Willkommen zum \"K-9 Mail\"-Setup. K-9 ist eine quelloffene E-Mail-Anwendung fü
 
     <string name="account_settings_reply_after_quote_label">Antwort unter Zitat</string>
     <string name="account_settings_reply_after_quote_summary">Die Antwort auf eine Nachricht unterhalb der Original-Nachricht platzieren.</string>
+	
+	<string name="account_settings_strip_signature_label">Unterschrift von zitierter Antwort entfernen</string>
+	<string name="account_settings_strip_signature_summary">Beim Antworten von Nachrichten wird die Unterschrift vom zitiertem Textabschnitt entfernt</string>
 
     <string name="account_settings_message_format_label">Formatierung</string>
     <string name="account_settings_message_format_text">Einfacher Text (Bilder und Formatierungen werden entfernt)</string>
     <string name="account_settings_message_format_html">HTML (Bilder und Formatierungen bleiben erhalten)</string>
-
+	<string name="account_settings_message_format_auto">Automatisch (Einfacher Text, es sei denn bei Antwort auf HTML)</string>
+	
     <string name="account_settings_message_read_receipt_label">Empfangsbestätigung</string>
     <string name="account_settings_message_read_receipt_summary">Immer eine Empfangsbestätigung anfordern</string>
 
@@ -587,9 +593,12 @@ Willkommen zum \"K-9 Mail\"-Setup. K-9 ist eine quelloffene E-Mail-Anwendung fü
     <string name="account_settings_crypto_auto_signature">Auto-sign</string>
     <string name="account_settings_crypto_auto_signature_summary">Email Adresse des Kontos verwenden um Signaturschlüssel zu schätzen.</string>
 
+    <string name="account_settings_crypto_auto_encrypt">Automatische verschlüsselung</string>
+	<string name="account_settings_crypto_auto_encrypt_summary">Verschlüsselung aktivieren falls für den Empfänger ein öffentlichen Schlüssel abgespeichert ist.</string>
+    
     <string name="account_settings_mail_check_frequency_label">Häufigkeit der E-Mail-Abfrage</string>
     <string name="account_settings_second_class_check_frequency_label">Häufigkeit der Abfrage für Nebenordner</string>
-
+    
     <string name="account_settings_storage_title">Speicher</string>
 
     <string name="account_settings_color_label">Farbe des Kontos</string>
@@ -1010,6 +1019,12 @@ Willkommen zum \"K-9 Mail\"-Setup. K-9 ist eine quelloffene E-Mail-Anwendung fü
 
     <string name="save_or_discard_draft_message_dlg_title">Entwurf speichern?</string>
     <string name="save_or_discard_draft_message_instructions_fmt">Entwurf speichern oder verwerfen?</string>
+    
+    <string name="refuse_to_save_draft_marked_encrypted_dlg_title">Speichern des Entwurfs verweigern.</string>
+    <string name="refuse_to_save_draft_marked_encrypted_instructions_fmt">Die Speicherung von als verschlüsselt markierten Entwürfen verweigern.</string>
+    
+    <string name="continue_without_public_key_dlg_title">Ohne öffentlichen Schlüssel fortfahren?</string>
+    <string name="continue_without_public_key_instructions_fmt">Einer oder mehrere Empfänger besitzen keinen abgespeicherten öffentlichen Schlüssel. Fortfahren?</string>
 
     <string name="charset_not_found">Die Nachricht konnte nicht dargestellt werden, da das Charset \"<xliff:g id="charset">%s</xliff:g>\" nicht gefunden wurde.</string>
 
@@ -1035,47 +1050,47 @@ Willkommen zum \"K-9 Mail\"-Setup. K-9 ist eine quelloffene E-Mail-Anwendung fü
     <string name="messagelist_sent_to_me_sigil">»</string>
     <string name="messagelist_sent_cc_me_sigil">›</string>
     <string name="error_unable_to_connect">Verbindungsfehler.</string>
+    
+    <string name="import_export_action">Einstellungen Importieren &amp; Exportieren</string>
+    <string name="settings_export_account">Kontoeinstellungen exportieren</string>
+    <string name="settings_export_all">Einstellungen und Konten exportieren</string>
+    <string name="settings_import_dialog_title">Importieren</string>
+    <string name="settings_export_dialog_title">Export</string>
+    <string name="settings_import">Einstellungen importieren</string>
+    <string name="settings_import_selection">Auswahl importieren</string>
+    <string name="settings_import_global_settings">Globale Einstellungen</string>
+    <string name="settings_exporting">Einstellungen Exportieren...</string>
+    <string name="settings_importing">Einstellungen Importieren...</string>
+    <string name="settings_import_scanning_file">Datei lesen...</string>
+    <string name="settings_export_success">Exportiere Einstellungen erfolgreich in <xliff:g id="filename">%s</xliff:g> gespeichert</string>
+    <string name="settings_import_global_settings_success">Globale Einstellungen erfolgreich von <xliff:g id="filename">%s</xliff:g> importiert</string>
+    <string name="settings_import_success"><xliff:g id="accounts">%s</xliff:g> erfolgreich von <xliff:g id="filename">%s</xliff:g> importiert</string>
+    <plurals name="settings_import_success">
+        <item quantity="one">1 Konto</item>
+        <item quantity="other"><xliff:g id="numAccounts">%s</xliff:g> Konten</item>
+    </plurals>
+    <string name="settings_export_failure">Exportieren der Einstellungen ist fehlgeschlagen</string>
+    <string name="settings_import_failure">Importieren der Einstellungen von <xliff:g id="filename">%s</xliff:g> sind fehlgeschlagen</string>
+    <string name="settings_export_success_header">Export erfolgreich</string>
+    <string name="settings_export_failed_header">Export fehlgeschlagen</string>
+    <string name="settings_import_success_header">Import erfolgreich</string>
+    <string name="settings_import_failed_header">Import fehlgeschlagen</string>
+    <string name="settings_import_activate_account_header">Konto aktivieren</string>
+    <string name="settings_import_activate_account_intro">Um das Konto \"<xliff:g id="account">%s</xliff:g>\" zu benutzen müssen sie das <xliff:g id="server_passwords">%s</xliff:g> angeben.</string>
+    <plurals name="settings_import_server_passwords">
+        <item quantity="one">Server Passwort</item>
+        <item quantity="other">Server Passwörter</item>
+    </plurals>
+    <string name="settings_import_incoming_server">Posteingangsserver (<xliff:g id="hostname">%s</xliff:g>):</string>
+    <string name="settings_import_outgoing_server">Postausgangsserver (<xliff:g id="hostname">%s</xliff:g>):</string>
+    <plurals name="settings_import_setting_passwords">
+        <item quantity="one">Passwort Setzen...</item>
+        <item quantity="other">Passwörter setzen...</item>
+    </plurals>
+    <string name="settings_import_use_incoming_server_password">Passwort des Posteingangsservers benutzen</string>
+    <string name="activate_account_action">Aktivieren</string>
 
-    <!-- NEW: <string name="import_export_action">Settings Import &amp; Export</string>-->
+    <string name="settings_unknown_version">Kann die Datei-Version <xliff:g id="version">%s</xliff:g> nicht verwenden</string>
-    <!-- NEW: <string name="settings_export_account">Export account settings</string>-->
-    <!-- NEW: <string name="settings_export_all">Export settings and accounts</string>-->
-    <!-- NEW: <string name="settings_import_dialog_title">Import</string>-->
-    <!-- NEW: <string name="settings_export_dialog_title">Export</string>-->
-    <!-- NEW: <string name="settings_import">Import settings</string>-->
-    <!-- NEW: <string name="settings_import_selection">Import selection</string>-->
-    <!-- NEW: <string name="settings_import_global_settings">Global settings</string>-->
-    <!-- NEW: <string name="settings_exporting">Exporting settings...</string>-->
-    <!-- NEW: <string name="settings_importing">Importing settings...</string>-->
-    <!-- NEW: <string name="settings_import_scanning_file">Scanning file...</string>-->
-    <!-- NEW: <string name="settings_export_success">Saved exported settings to <xliff:g id="filename">%s</xliff:g></string>-->
-    <!-- NEW: <string name="settings_import_global_settings_success">Imported global settings from <xliff:g id="filename">%s</xliff:g></string>-->
-    <!-- NEW: <string name="settings_import_success">Imported <xliff:g id="accounts">%s</xliff:g> from <xliff:g id="filename">%s</xliff:g></string>-->
-    <!-- NEW: <plurals name="settings_import_success">
-        <item quantity="one">1 account</item>
-        <item quantity="other"><xliff:g id="numAccounts">%s</xliff:g> accounts</item>
-    </plurals>-->
-    <!-- NEW: <string name="settings_export_failure">Failed to export settings</string>-->
-    <!-- NEW: <string name="settings_import_failure">Failed to import any settings from <xliff:g id="filename">%s</xliff:g></string>-->
-    <!-- NEW: <string name="settings_export_success_header">Export succeeded</string>-->
-    <!-- NEW: <string name="settings_export_failed_header">Export failed</string>-->
-    <!-- NEW: <string name="settings_import_success_header">Import succeeded</string>-->
-    <!-- NEW: <string name="settings_import_failed_header">Import failed</string>-->
-    <!-- NEW: <string name="settings_import_activate_account_header">Activate account</string>-->
-    <!-- NEW: <string name="settings_import_activate_account_intro">To be able to use the account \"<xliff:g id="account">%s</xliff:g>\" you need to provide the <xliff:g id="server_passwords">%s.</xliff:g></string>-->
-    <!-- NEW: <plurals name="settings_import_server_passwords">
-        <item quantity="one">server password</item>
-        <item quantity="other">server passwords</item>
-    </plurals>-->
-    <!-- NEW: <string name="settings_import_incoming_server">Incoming server (<xliff:g id="hostname">%s</xliff:g>):</string>-->
-    <!-- NEW: <string name="settings_import_outgoing_server">Outgoing server (<xliff:g id="hostname">%s</xliff:g>):</string>-->
-    <!-- NEW: <plurals name="settings_import_setting_passwords">
-        <item quantity="one">Setting password...</item>
-        <item quantity="other">Setting passwords...</item>
-    </plurals>-->
-    <!-- NEW: <string name="settings_import_use_incoming_server_password">Use the incoming server password</string>-->
-    <!-- NEW: <string name="activate_account_action">Activate</string>-->
-
-    <!-- NEW: <string name="settings_unknown_version">Unable to handle file of version <xliff:g id="version">%s</xliff:g></string>-->
 
     <string name="account_unavailable">Konto \"<xliff:g id="account">%s</xliff:g>\" ist nicht verfügbar; Bitte SD-Karte prüfen.</string>
 
@@ -1085,6 +1100,6 @@ Willkommen zum \"K-9 Mail\"-Setup. K-9 ist eine quelloffene E-Mail-Anwendung fü
 
     <string name="manage_accounts_move_up_action">Nach oben verschieben</string>
     <string name="manage_accounts_move_down_action">Nach unten verschieben</string>
-    <!-- NEW: <string name="manage_accounts_moving_message">Moving account...</string>-->
+    <string name="manage_accounts_moving_message">Konto verschieben...</string>
-
+    
 </resources>

res/values-fr/strings.xml

@@ -84,6 +84,7 @@ Android Localizer (aiLocalizer)
     <string name="forward_action">Transférer</string>
     <string name="move_action">Déplacer</string>
     <string name="continue_action">Continuer</string>
+    <string name="back_action">Retour</string>
     <string name="done_action">Terminé</string>
     <string name="remove_action">Supprimer</string>
     <string name="discard_action">Abandonner</string>
@@ -363,6 +364,7 @@ Bienvenue dans la configuration de K-9 Mail. K-9 Mail est un client de messageri
     <string name="global_settings_confirm_actions_summary">Demander une confirmation pour chacune des actions sélectionnées</string>
     <string name="global_settings_confirm_action_archive">Archiver</string>
     <string name="global_settings_confirm_action_delete">Supprimer (mode lecture)</string>
+    <string name="global_settings_confirm_action_delete_starred">Supprimer étoilé (mode lecture)</string>
     <string name="global_settings_confirm_action_spam">Spam</string>
     <string name="global_settings_confirm_action_mark_all_as_read">Marquer tout comme lu</string>
     <string name="global_settings_confirm_action_send">Envoyer</string>
@@ -385,7 +387,7 @@ Bienvenue dans la configuration de K-9 Mail. K-9 Mail est un client de messageri
     <string name="account_setup_basics_default_label">Envoyer les messages de ce compte par défaut.</string>
     <string name="account_setup_basics_manual_setup_action">Configuration manuelle</string>
 
-    <string name="account_setup_check_settings_title" />
+    <string name="account_setup_check_settings_title"></string>
     <string name="account_setup_check_settings_retr_info_msg">Récupération des informations de compte\u2026</string>
     <string name="account_setup_check_settings_check_incoming_msg">Vérification des paramètres de serveur entrant\u2026</string>
     <string name="account_setup_check_settings_check_outgoing_msg">Vérification des paramètres de serveur sortant\u2026</string>
@@ -446,7 +448,7 @@ Bienvenue dans la configuration de K-9 Mail. K-9 Mail est un client de messageri
     <string name="account_setup_expunge_policy_on_poll">Pendant chaque récupération</string>
     <string name="account_setup_expunge_policy_manual">Seulement manuellement</string>
 
-    <!-- NEW: <string name="account_setup_incoming_autodetect_namespace_label">Auto-detect IMAP namespace</string>-->
+    <string name="account_setup_incoming_autodetect_namespace_label">Auto-detection des espaces de noms IMAP</string>
     <string name="account_setup_incoming_imap_path_prefix_label">Préfixe de chemin IMAP</string>
 
     <string name="drafts_folder_label">Nom du dossier des brouillons</string>
@@ -587,9 +589,13 @@ Bienvenue dans la configuration de K-9 Mail. K-9 Mail est un client de messageri
     <string name="account_settings_reply_after_quote_label">Réponse après la citation</string>
     <string name="account_settings_reply_after_quote_summary">Faire précéder la réponse par le texte d\'origine</string>
 
+	<string name="account_settings_strip_signature_label">Retirer signature dans réponse citée</string>
+    <string name="account_settings_strip_signature_summary">Lorsque vous répondez à des messages, la signature du texte cité sera éffacée</string>
+
     <string name="account_settings_message_format_label">Format du message</string>
     <string name="account_settings_message_format_html">HTML (formattage et images conservés)</string>
     <string name="account_settings_message_format_text">Text brut (formattage et images omis)</string>
+	<string name="account_settings_message_format_auto">Automatique (Text brut à moins de répondre à un message HTML)</string>
 
     <string name="account_settings_message_read_receipt_label">Accusé de réception</string>
     <string name="account_settings_message_read_receipt_summary">Toujours demander un accusé de réception</string>
@@ -611,7 +617,9 @@ Bienvenue dans la configuration de K-9 Mail. K-9 Mail est un client de messageri
     <string name="account_settings_crypto_app_not_available">Non disponible</string>
     <string name="account_settings_crypto_auto_signature">Signature automatique</string>
     <string name="account_settings_crypto_auto_signature_summary">Utiliser l\'adresse e-mail du compte pour déduire la clé de signature</string>
-
+	<string name="account_settings_crypto_auto_encrypt">Cryptation automatique</string>
+	<string name="account_settings_crypto_auto_encrypt_summary">Cryptation automatique si une clé publique correspond au destinataire.</string>
+	
     <string name="account_settings_mail_check_frequency_label">Fréquence de vérification du dossier</string>
     <string name="account_settings_second_class_check_frequency_label">Fréquence de vérification pour 2ème classe</string>
 
@@ -1037,6 +1045,12 @@ Bienvenue dans la configuration de K-9 Mail. K-9 Mail est un client de messageri
     <string name="save_or_discard_draft_message_dlg_title">Enregistrer le brouillon\u00A0?</string>
     <string name="save_or_discard_draft_message_instructions_fmt">Enregistrer ou abandonner ce message\u00A0?</string>
 
+	<string name="refuse_to_save_draft_marked_encrypted_dlg_title">Refuser d\'enregistrer des brouillons.</string>
+	<string name="refuse_to_save_draft_marked_encrypted_instructions_fmt">Refuser d\'enregistrer un message marqué comme crypté.</string>
+	
+	<string name="continue_without_public_key_dlg_title">Continuer sans clé publique?</string>
+	<string name="continue_without_public_key_instructions_fmt">Un ou plusieurs destinataires n\'ont pas de clé publique enregistrée. Continuer?</string>
+	
     <string name="charset_not_found">Ce message ne peut être affiché parce que le jeu de caractères «\u00A0<xliff:g id="charset">%s</xliff:g>\u00A0» n\'a pu être trouvé.</string>
 
     <string name="select_text_now">Sélectionnez le texte à copier</string>