From c1af65732a64cfb888e3604de8014a6e7d12ec89 Mon Sep 17 00:00:00 2001
From: Christian Basler <chrigu.meyer@gmail.com>
Date: Wed, 21 Feb 2018 15:05:08 +0100
Subject: [PATCH] Improve translations

Moved labels.xml into strings.xml as they are handled by Weblate and it was a mess anyway.
---
 app/src/main/res/values-ar/strings.xml |  8 +++++++-
 app/src/main/res/values-de/labels.xml  | 25 -------------------------
 app/src/main/res/values-de/strings.xml |  9 ++++++++-
 app/src/main/res/values-fr/strings.xml |  9 ++++++++-
 app/src/main/res/values/labels.xml     | 25 -------------------------
 app/src/main/res/values/strings.xml    |  9 ++++++++-
 6 files changed, 31 insertions(+), 54 deletions(-)
 delete mode 100644 app/src/main/res/values-de/labels.xml
 delete mode 100644 app/src/main/res/values/labels.xml

diff --git a/app/src/main/res/values-ar/strings.xml b/app/src/main/res/values-ar/strings.xml
index c5d3f5c..986d7f2 100644
--- a/app/src/main/res/values-ar/strings.xml
+++ b/app/src/main/res/values-ar/strings.xml
@@ -39,4 +39,10 @@
     <string name="connection_info_pending">يتصل…</string>
     <string name="proof_of_work_title">إثبات العمل</string>
     <string name="proof_of_work_text_0">جاري إثبات العمل لإرسال الرسالة</string>
-    </resources>
+    <string name="inbox">علبة الوارد</string>
+    <string name="draft">مسودات</string>
+    <string name="sent">تاريخ الإرسال</string>
+    <string name="unread">غير مقروء</string>
+    <string name="trash">مُهملات</string>
+    <string name="label">تسمية</string>
+</resources>
diff --git a/app/src/main/res/values-de/labels.xml b/app/src/main/res/values-de/labels.xml
deleted file mode 100644
index d62843a..0000000
--- a/app/src/main/res/values-de/labels.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-  ~ Copyright 2015 Christian Basler
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~     http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License.
-  -->
-
-<resources>
-    <string name="inbox">Posteingang</string>
-    <string name="draft">Entwürfe</string>
-    <string name="sent">Gesendet</string>
-    <string name="unread">Ungelesen</string>
-    <string name="trash">Papierkorb</string>
-    <string name="broadcasts">Broadcasts</string>
-</resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index 4a9cc7e..086c834 100644
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -104,7 +104,6 @@ Als Alternative kann in den Einstellungen ein vertrauenswürdiger Knoten konfigu
     <string name="title_chan_detail">Chan</string>
     <string name="title_contact_detail">Kontakt</string>
     <string name="title_identity_detail">Identität</string>
-    <string name="outbox">Postausgang</string>
     <string name="status_draft">Entwurf</string>
     <string name="status_public_key">öffentlicher Schlüssel angefordert</string>
     <string name="status_received">empfangen</string>
@@ -128,4 +127,12 @@ Als Alternative kann in den Einstellungen ein vertrauenswürdiger Knoten konfigu
     <string name="import_data_summary">Nachrichten und Kontakte importieren (aber keine Identitäten)</string>
     <string name="select_encoding">Kodierung auswählen</string>
     <string name="from">Von</string>
+    <string name="invalid_wif_file">Die Datei kann nicht verarbeitet werden</string>
+    <string name="inbox">Posteingang</string>
+    <string name="outbox">Postausgang</string>
+    <string name="draft">Entwürfe</string>
+    <string name="sent">Gesendet</string>
+    <string name="unread">Ungelesen</string>
+    <string name="trash">Papierkorb</string>
+    <string name="broadcasts">Broadcasts</string>
 </resources>
diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml
index 345307c..2e872e0 100644
--- a/app/src/main/res/values-fr/strings.xml
+++ b/app/src/main/res/values-fr/strings.xml
@@ -105,7 +105,6 @@
     <string name="status_draft">brouillon</string>
     <string name="status_sent">envoyé</string>
     <string name="status_received">reçu</string>
-    <string name="outbox">Boîte d\'envoi</string>
     <string name="error_unsupported_encoding">Encodage non supporté \'%s\', \'SIMPLE\' est utilisé.</string>
     <string name="select_encoding_warning">\'EXTENDED\' est un nouveau format de message qui ne fonctionne pas encore partout, mais qui a des avantages intéressants. Sélectionnez \'SIMPLE\' pour être sûr.</string>
     <string name="select_encoding_title">Sélectionner le codage des messages</string>
@@ -125,4 +124,12 @@
     <string name="select_encoding">Choix du codage</string>
 <string name="help_out_link">https://dissem.github.io/Abit/aider</string>
     <string name="from">De</string>
+    <string name="invalid_wif_file">Le fichier ne peut pas être traité</string>
+    <string name="inbox">Boîte de réception</string>
+    <string name="outbox">Boîte d\'envoi</string>
+    <string name="draft">Brouillons</string>
+    <string name="sent">Envoyé</string>
+    <string name="unread">Non lues</string>
+    <string name="trash">Corbeille</string>
+    <string name="broadcasts">Diffusions</string>
 </resources>
diff --git a/app/src/main/res/values/labels.xml b/app/src/main/res/values/labels.xml
deleted file mode 100644
index c1e7259..0000000
--- a/app/src/main/res/values/labels.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-  ~ Copyright 2015 Christian Basler
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~     http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License.
-  -->
-
-<resources>
-    <string name="inbox">Inbox</string>
-    <string name="draft">Drafts</string>
-    <string name="sent">Sent</string>
-    <string name="unread">Unread</string>
-    <string name="trash">Trash</string>
-    <string name="broadcasts">Broadcasts</string>
-</resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 9d4edbb..bc041e3 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -108,7 +108,6 @@ As an alternative you could configure a trusted node in the settings, but as of
     <string name="status_draft">draft</string>
     <string name="status_sent">sent</string>
     <string name="status_received">received</string>
-    <string name="outbox">Outbox</string>
     <string name="error_unsupported_encoding">Unsupported encoding ‘%s’, using ‘SIMPLE’ instead.</string>
     <string name="select_encoding_warning">‘EXTENDED’ is a new message format that\'s not widely supported yet but has some interesting features. To stay on the save side, select ‘SIMPLE’.</string>
     <string name="select_encoding_title">Select Message Encoding</string>
@@ -127,4 +126,12 @@ As an alternative you could configure a trusted node in the settings, but as of
     <string name="got_it">Got it</string>
     <string name="select_encoding">Select encoding</string>
     <string name="from">From</string>
+    <string name="invalid_wif_file">The file could not be processed</string>
+    <string name="inbox">Inbox</string>
+    <string name="outbox">Outbox</string>
+    <string name="draft">Drafts</string>
+    <string name="sent">Sent</string>
+    <string name="unread">Unread</string>
+    <string name="trash">Trash</string>
+    <string name="broadcasts">Broadcasts</string>
 </resources>