From 1e5560dd1ce1208cfc21cb09214466546fcdda8f Mon Sep 17 00:00:00 2001
From: M66B <M66B@users.noreply.github.com>
Date: Sun, 7 Jul 2019 09:54:49 +0200
Subject: [PATCH] Updated text, crowdin sync

---
 app/src/main/res/values-de-rDE/strings.xml |  1 -
 app/src/main/res/values-es-rES/strings.xml |  2 +-
 app/src/main/res/values-fi-rFI/strings.xml |  1 -
 app/src/main/res/values-fr-rFR/strings.xml |  1 -
 app/src/main/res/values-it-rIT/strings.xml |  1 -
 app/src/main/res/values-ja-rJP/strings.xml | 65 +++++++++++++++++++++-
 app/src/main/res/values-nl-rNL/strings.xml |  5 +-
 app/src/main/res/values-ro-rRO/strings.xml |  1 +
 app/src/main/res/values-zh-rCN/strings.xml |  2 +-
 app/src/main/res/values/strings.xml        |  6 +-
 10 files changed, 76 insertions(+), 9 deletions(-)

diff --git a/app/src/main/res/values-de-rDE/strings.xml b/app/src/main/res/values-de-rDE/strings.xml
index 81deb6875d..b4663a496c 100644
--- a/app/src/main/res/values-de-rDE/strings.xml
+++ b/app/src/main/res/values-de-rDE/strings.xml
@@ -80,7 +80,6 @@
     <string name="title_edit_folder">Ordner bearbeiten</string>
     <string name="title_setup">Einstellungen</string>
     <string name="title_setup_help">Hilfe</string>
-    <string name="title_setup_welcome">Das Empfangen und Senden von Nachrichten erfordert die Einrichtung eines Kontos und einer Identität, wie in jeder anderen E-Mail-Anwendung.</string>
     <string name="title_setup_quick">Schnelleinrichtung</string>
     <string name="title_setup_quick_remark">Um schnell ein Konto und eine Identität für die meisten Anbieter einzurichten</string>
     <string name="title_setup_quick_hint">Die Schnelleinrichtung wird Konfigurationsinformationen von autoconfig.thunderbird.net laden</string>
diff --git a/app/src/main/res/values-es-rES/strings.xml b/app/src/main/res/values-es-rES/strings.xml
index ce68dd38c6..7d2140df27 100644
--- a/app/src/main/res/values-es-rES/strings.xml
+++ b/app/src/main/res/values-es-rES/strings.xml
@@ -80,7 +80,6 @@
     <string name="title_edit_folder">Editar carpeta</string>
     <string name="title_setup">Ajustes</string>
     <string name="title_setup_help">Ayuda</string>
-    <string name="title_setup_welcome">Recibir y enviar mensajes requiere configurar una cuenta y una identidad como en cualquier otra aplicación de correo electrónico.</string>
     <string name="title_setup_quick">Configuración rápida</string>
     <string name="title_setup_quick_remark">Para configurar rápidamente una cuenta y una identidad para la mayoría de los proveedores</string>
     <string name="title_setup_quick_hint">La configuración rápida obtendrá información de configuración de autoconfig.thunderbird.net</string>
@@ -142,6 +141,7 @@
     <string name="title_advanced_schedule">Programar</string>
     <string name="title_advanced_unseen">Todos los mensajes no leídos</string>
     <string name="title_advanced_flagged">Todos los mensajes destacados</string>
+    <string name="title_advanced_delete_unseen">Eliminar mensajes no leídos antiguos</string>
     <string name="title_advanced_kept_removed">Comprobar si los mensajes antiguos fueron eliminados del servidor</string>
     <string name="title_advanced_sync_folders">Sincronizar lista de carpetas</string>
     <string name="title_advanced_keyboard">Mostrar teclado por defecto</string>
diff --git a/app/src/main/res/values-fi-rFI/strings.xml b/app/src/main/res/values-fi-rFI/strings.xml
index a074e97be4..1eb4ac4aa9 100644
--- a/app/src/main/res/values-fi-rFI/strings.xml
+++ b/app/src/main/res/values-fi-rFI/strings.xml
@@ -80,7 +80,6 @@
     <string name="title_edit_folder">Muokkaa kansiota</string>
     <string name="title_setup">Asetukset</string>
     <string name="title_setup_help">Ohje</string>
-    <string name="title_setup_welcome">Viestien vastaanottaminen ja lähettäminen vaatii tilin ja identiteetin asettamisen, kuten missä tahansa sähköpostisovelluksessa.</string>
     <string name="title_setup_quick">Pika-asetukset</string>
     <string name="title_setup_quick_remark">Tilin ja identiteetin nopeaan asettamiseen useimmille palveluntarjoajille</string>
     <string name="title_setup_quick_hint">Pika-asennus hakee asetustiedot osoitteesta autoconfig.thunderbird.net</string>
diff --git a/app/src/main/res/values-fr-rFR/strings.xml b/app/src/main/res/values-fr-rFR/strings.xml
index 9e9a605a34..c7d50d5d5f 100644
--- a/app/src/main/res/values-fr-rFR/strings.xml
+++ b/app/src/main/res/values-fr-rFR/strings.xml
@@ -80,7 +80,6 @@
     <string name="title_edit_folder">Modifier le dossier</string>
     <string name="title_setup">Configuration</string>
     <string name="title_setup_help">Aide</string>
-    <string name="title_setup_welcome">La réception et l\'envoi de messages nécessitent la création d\'un compte et d\'une identité comme dans toute autre application de messagerie.</string>
     <string name="title_setup_quick">Configuration rapide</string>
     <string name="title_setup_quick_remark">Pour configurer rapidement un compte et une identité pour la plupart des fournisseurs</string>
     <string name="title_setup_quick_hint">La configuration rapide récupérera les informations de configuration de autoconfig.thunderbird.net</string>
diff --git a/app/src/main/res/values-it-rIT/strings.xml b/app/src/main/res/values-it-rIT/strings.xml
index 232c478ee4..8612983f58 100644
--- a/app/src/main/res/values-it-rIT/strings.xml
+++ b/app/src/main/res/values-it-rIT/strings.xml
@@ -80,7 +80,6 @@
     <string name="title_edit_folder">Modifica cartella</string>
     <string name="title_setup">Impostazioni</string>
     <string name="title_setup_help">Aiuto</string>
-    <string name="title_setup_welcome">Ricezione e invio di messaggi richiede l\'impostazione di un account e di un\'identità come in qualsiasi altra applicazione email.</string>
     <string name="title_setup_quick">Configurazione rapida</string>
     <string name="title_setup_quick_remark">Per impostare rapidamente un account e un\'identità per la maggior parte dei fornitori</string>
     <string name="title_setup_quick_hint">La configurazione rapida recupererà le informazioni di configurazione da autoconfig.thunderbird.net</string>
diff --git a/app/src/main/res/values-ja-rJP/strings.xml b/app/src/main/res/values-ja-rJP/strings.xml
index 70489fbc5e..8f8e39b577 100644
--- a/app/src/main/res/values-ja-rJP/strings.xml
+++ b/app/src/main/res/values-ja-rJP/strings.xml
@@ -1,3 +1,66 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--Generated by crowdin.com-->
-<resources></resources>
+<resources>
+    <string name="app_changelog">変更履歴</string>
+    <string name="channel_service">サービス</string>
+    <string name="channel_send">送信</string>
+    <string name="channel_notification">通知</string>
+    <string name="channel_update">更新</string>
+    <string name="channel_warning">警告</string>
+    <string name="channel_error">エラー</string>
+    <string name="channel_group_contacts">連絡先</string>
+    <string name="tile_synchronize">同期</string>
+    <string name="tile_unseen">新着メッセージ</string>
+    <string name="shortcut_compose">作成</string>
+    <string name="shortcut_setup">設定</string>
+    <string name="title_name_count">%1$s (%2$s)</string>
+    <string name="menu_answers">テンプレート</string>
+    <string name="menu_operations">操作</string>
+    <string name="menu_setup">設定</string>
+    <string name="menu_faq">サポート</string>
+    <string name="menu_issue">問題を報告</string>
+    <string name="menu_privacy">プライバシー</string>
+    <string name="menu_about">このアプリについて</string>
+    <string name="menu_pro">Pro版の機能</string>
+    <string name="menu_invite">招待</string>
+    <string name="menu_rate">このアプリを評価</string>
+    <string name="menu_other">その他のアプリ</string>
+    <string name="title_welcome">ようこそ</string>
+    <string name="title_agree">同意する</string>
+    <string name="title_disagree">同意しない</string>
+    <string name="title_version">バージョン %1$s</string>
+    <string name="title_list_accounts">アカウント</string>
+    <string name="title_setup_to_do">To Do</string>
+    <string name="title_setup_done">完了</string>
+    <string name="title_setup_export">設定をエクスポート</string>
+    <string name="title_setup_import">設定をインポート</string>
+    <string name="title_setup_password">パスワード</string>
+    <string name="title_setup_theme">テーマを選択</string>
+    <string name="title_setup_options">オプション</string>
+    <string name="title_advanced_section_synchronize">受信</string>
+    <string name="title_advanced_section_send">送信</string>
+    <string name="title_advanced_section_connection">接続</string>
+    <string name="title_advanced_section_display">表示</string>
+    <string name="title_advanced_section_behavior">動作</string>
+    <string name="title_advanced_section_notifications">通知</string>
+    <string name="title_advanced_section_misc">その他</string>
+    <string name="title_advanced_schedule">スケジュール</string>
+    <string name="title_advanced_unseen">すべての未読メッセージ</string>
+    <string name="title_advanced_flagged">すべてのスター付きメッセージ</string>
+    <string name="title_advanced_delete_unseen">古い未読メッセージを削除</string>
+    <string name="title_advanced_autosend">メッセージの送信時に確認</string>
+    <string name="title_advanced_notify_action_trash">ゴミ箱</string>
+    <string name="title_advanced_notify_action_archive">アーカイブ</string>
+    <string name="title_advanced_notify_action_reply">返信</string>
+    <string name="title_advanced_notify_action_flag">スター</string>
+    <string name="title_advanced_updates">更新を確認</string>
+    <string name="title_advanced_crash_reports">エラーレポートを送信</string>
+    <string name="title_advanced_debug">デバッグモード</string>
+    <string name="title_identity_name">名前</string>
+    <string name="title_identity_email">メールアドレス</string>
+    <string name="title_optional">オプション</string>
+    <string name="title_recommended">おすすめ</string>
+    <string name="title_account_name">アカウント名</string>
+    <string name="title_domain">ドメイン名</string>
+    <string name="title_host">ホスト名</string>
+</resources>
diff --git a/app/src/main/res/values-nl-rNL/strings.xml b/app/src/main/res/values-nl-rNL/strings.xml
index d9120ee6d3..7b4e36e337 100644
--- a/app/src/main/res/values-nl-rNL/strings.xml
+++ b/app/src/main/res/values-nl-rNL/strings.xml
@@ -80,7 +80,10 @@
     <string name="title_edit_folder">Bewerk map</string>
     <string name="title_setup">Instellingen</string>
     <string name="title_setup_help">Help</string>
-    <string name="title_setup_welcome">Ontvangen en verzenden van berichten vereist het instellen van een account en een identiteit zoals in elke andere e-mail app.</string>
+    <string name="title_setup_welcome">        Ontvangen en verzenden van berichten vereist een account en een identiteit zoals in elke andere e-mail app.
+        De snelle setup zal zowel een account als identiteit maken door alleen om uw naam, e-mailadres en wachtwoord te vragen.
+        Accounts en identiteiten (aliassen) kunnen ook handmatig worden ingesteld indien nodig.
+    </string>
     <string name="title_setup_quick">Snel instellen</string>
     <string name="title_setup_quick_remark">Voor het snel instellen van een account en een identiteit voor de meeste providers</string>
     <string name="title_setup_quick_hint">De snelle instelling zal configuratie informatie ophalen van autoconfig.thunderbird.net</string>
diff --git a/app/src/main/res/values-ro-rRO/strings.xml b/app/src/main/res/values-ro-rRO/strings.xml
index e47adabd44..770769df7c 100644
--- a/app/src/main/res/values-ro-rRO/strings.xml
+++ b/app/src/main/res/values-ro-rRO/strings.xml
@@ -149,6 +149,7 @@
     <string name="title_advanced_schedule">Programat</string>
     <string name="title_advanced_unseen">Toate mesajele necitite</string>
     <string name="title_advanced_flagged">Toate mesajele marcate</string>
+    <string name="title_advanced_delete_unseen">Șterge mesajele vechi necitite</string>
     <string name="title_advanced_kept_removed">Verifică dacă mesajele vechi au fost înlăturate de pe server</string>
     <string name="title_advanced_sync_folders">Sincronizare lista dosare</string>
     <string name="title_advanced_keyboard">Afișare implicită a tastaturii</string>
diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml
index 164af081c8..dedbf66686 100644
--- a/app/src/main/res/values-zh-rCN/strings.xml
+++ b/app/src/main/res/values-zh-rCN/strings.xml
@@ -72,7 +72,6 @@
     <string name="title_edit_folder">编辑文件夹</string>
     <string name="title_setup">设置</string>
     <string name="title_setup_help">帮助</string>
-    <string name="title_setup_welcome">像任何其他电邮App一样，接收和发送消息需要设置一个帐户和身份</string>
     <string name="title_setup_quick">快速设置</string>
     <string name="title_setup_quick_remark">为大多数邮件服务提供商快速设置账户和身份</string>
     <string name="title_setup_quick_hint">快速设置将从autoconfig.thunderbird.net 获取配置信息</string>
@@ -134,6 +133,7 @@
     <string name="title_advanced_schedule">任务计划</string>
     <string name="title_advanced_unseen">所有未读消息</string>
     <string name="title_advanced_flagged">所有已标星消息</string>
+    <string name="title_advanced_delete_unseen">删除旧的未读消息</string>
     <string name="title_advanced_kept_removed">检查旧消息是否从服务器上被移除</string>
     <string name="title_advanced_sync_folders">同步文件夹列表</string>
     <string name="title_advanced_keyboard">默认显示键盘</string>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 7edbb604a5..3bc854f405 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -103,7 +103,11 @@
 
     <string name="title_setup">Settings</string>
     <string name="title_setup_help">Help</string>
-    <string name="title_setup_welcome">Receiving and sending messages requires setting up an account and an identity like in any other email app.</string>
+    <string name="title_setup_welcome">
+        Receiving and sending messages requires setting up an account and an identity like in any other email app.
+        The quick setup will create both an account and identity by just asking for your name, email address and password.
+        Accounts and identities (aliases) can be setup manually too if needed.
+    </string>
     <string name="title_setup_quick">Quick setup</string>
     <string name="title_setup_quick_remark">To quickly setup an account and an identity for most providers</string>
     <string name="title_setup_quick_hint">The quick setup will fetch configuration information from autoconfig.thunderbird.net</string>