From c1af65732a64cfb888e3604de8014a6e7d12ec89 Mon Sep 17 00:00:00 2001 From: Christian Basler 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 @@ يتصل… إثبات العمل جاري إثبات العمل لإرسال الرسالة - + علبة الوارد + مسودات + تاريخ الإرسال + غير مقروء + مُهملات + تسمية + 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 @@ - - - - - Posteingang - Entwürfe - Gesendet - Ungelesen - Papierkorb - Broadcasts - \ 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 Chan Kontakt Identität - Postausgang Entwurf öffentlicher Schlüssel angefordert empfangen @@ -128,4 +127,12 @@ Als Alternative kann in den Einstellungen ein vertrauenswürdiger Knoten konfigu Nachrichten und Kontakte importieren (aber keine Identitäten) Kodierung auswählen Von + Die Datei kann nicht verarbeitet werden + Posteingang + Postausgang + Entwürfe + Gesendet + Ungelesen + Papierkorb + Broadcasts 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 @@ brouillon envoyé reçu - Boîte d\'envoi Encodage non supporté \'%s\', \'SIMPLE\' est utilisé. \'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. Sélectionner le codage des messages @@ -125,4 +124,12 @@ Choix du codage https://dissem.github.io/Abit/aider De + Le fichier ne peut pas être traité + Boîte de réception + Boîte d\'envoi + Brouillons + Envoyé + Non lues + Corbeille + Diffusions 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 @@ - - - - - Inbox - Drafts - Sent - Unread - Trash - Broadcasts - \ 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 draft sent received - Outbox Unsupported encoding ‘%s’, using ‘SIMPLE’ instead. ‘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’. Select Message Encoding @@ -127,4 +126,12 @@ As an alternative you could configure a trusted node in the settings, but as of Got it Select encoding From + The file could not be processed + Inbox + Outbox + Drafts + Sent + Unread + Trash + Broadcasts