Merge branch 'origin/master' into Weblate.

kontalk · Nov 19, 2020 · 8d78530 · 8d78530
2 parents 2a126f2 + e0ce968
commit 8d78530
Show file tree

Hide file tree

Showing 7 changed files with 1,692 additions and 1,852 deletions.
diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
@@ -702,4 +702,6 @@ Deaktivieren Sie die Verschlüsselung nur wenn Ihr Kontakt keinen persönlichen
     <string name="pref_uitheme_label_light">Hell</string>
     <string name="pref_uitheme_label_default">Wird vom Batteriesparmodus eingestellt</string>
     <string name="pref_ui_theme">Thema</string>
+    <string name="notification_text_registration_running">Registrierung läuft</string>
+    <string name="notification_ticker_registration_running">Kontalk-Registrierung läuft</string>
 </resources>
diff --git a/app/src/main/res/values-el/strings.xml b/app/src/main/res/values-el/strings.xml
diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml
diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml
diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml
@@ -692,4 +692,6 @@ http://kontalk.org/</string>
     <string name="contacts_list_recents_title">最近のチャット</string>
     <string name="save_attachment">添付ファイルを保存</string>
     <string name="pref_account_settings_system">アカウントの管理</string>
+    <string name="notification_text_registration_running">登録しています</string>
+    <string name="notification_ticker_registration_running">Kontalk の登録を行なっています</string>
 </resources>
diff --git a/app/src/main/res/values-pt-rBR/strings.xml b/app/src/main/res/values-pt-rBR/strings.xml
diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml