From cc11a147c3da6195fe22b925f8a9a80734f44f7a Mon Sep 17 00:00:00 2001
From: Janne Koschinski <janne@kuschku.de>
Date: Sat, 19 May 2018 03:18:38 +0200
Subject: [PATCH] Update translations

- Removes unnecessarily translated strings
- Updates translation text
---
 app/src/main/res/values-de/strings_defaults.xml     | 3 ---
 app/src/main/res/values-de/strings_preferences.xml  | 2 +-
 app/src/main/res/values-lt/strings_defaults.xml     | 3 ---
 app/src/main/res/values-lt/strings_preferences.xml  | 2 +-
 app/src/main/res/values-pt-rBR/strings_defaults.xml | 9 ++++++++-
 app/src/main/res/values-pt/strings_defaults.xml     | 3 ---
 app/src/main/res/values-pt/strings_preferences.xml  | 2 +-
 app/src/main/res/values-sr/strings_defaults.xml     | 3 ---
 app/src/main/res/values/strings_defaults.xml        | 6 +++---
 9 files changed, 14 insertions(+), 19 deletions(-)

diff --git a/app/src/main/res/values-de/strings_defaults.xml b/app/src/main/res/values-de/strings_defaults.xml
index 4376322c3..98a55db16 100644
--- a/app/src/main/res/values-de/strings_defaults.xml
+++ b/app/src/main/res/values-de/strings_defaults.xml
@@ -21,10 +21,7 @@
   <string name="default_bufferviewconfig_name">Alle Chats</string>
 
   <string name="default_identity_identity_name">Standardidentität</string>
-  <string name="default_identity_name">&lt;leer&gt;</string>
   <string name="default_identity_realname">Quassel-IRC-Benutzer</string>
-  <string name="default_identity_nick">quassel%1$d</string>
-  <string name="default_identity_ident">quassel</string>
   <string name="default_identity_awayreason">Mit\'m Fahrrad Sahne holen.</string>
   <string name="default_identity_autoawayreason">Nicht da. Nein, ehrlich. Nicht da!</string>
   <string name="default_identity_detachawayreason">Alle Quassel-Clients sind vom Erdboden verschwunden…</string>
diff --git a/app/src/main/res/values-de/strings_preferences.xml b/app/src/main/res/values-de/strings_preferences.xml
index 3b48dfe1b..0e4741481 100644
--- a/app/src/main/res/values-de/strings_preferences.xml
+++ b/app/src/main/res/values-de/strings_preferences.xml
@@ -149,4 +149,4 @@
   <string name="preference_show_notification_title">Benachrichtigung anzeigen</string>
   <string name="preference_show_notification_summary">Zeigt eine permanente Benachrichtigung an, damit Quasseldroid durchgehend verbunden bleiben kann</string>
 
-  </resources>
+</resources>
diff --git a/app/src/main/res/values-lt/strings_defaults.xml b/app/src/main/res/values-lt/strings_defaults.xml
index 8458bb58b..c835e5f5f 100644
--- a/app/src/main/res/values-lt/strings_defaults.xml
+++ b/app/src/main/res/values-lt/strings_defaults.xml
@@ -21,10 +21,7 @@
   <string name="default_bufferviewconfig_name">Visi pokalbiai</string>
 
   <string name="default_identity_identity_name">Numatyta tapatybė</string>
-  <string name="default_identity_name">&lt;tuščias&gt;</string>
   <string name="default_identity_realname">Quassel IRC vartotojas</string>
-  <string name="default_identity_nick">quassel%1$d</string>
-  <string name="default_identity_ident">quassel</string>
   <string name="default_identity_awayreason">Išėjau žvejoti.</string>
   <string name="default_identity_autoawayreason">Manęs nėra. Prižadu!</string>
   <string name="default_identity_detachawayreason">Visi Quassel klientai išnyko nuo žemės paviršiaus…</string>
diff --git a/app/src/main/res/values-lt/strings_preferences.xml b/app/src/main/res/values-lt/strings_preferences.xml
index 72c782a53..e18c189ce 100644
--- a/app/src/main/res/values-lt/strings_preferences.xml
+++ b/app/src/main/res/values-lt/strings_preferences.xml
@@ -149,4 +149,4 @@
   <string name="preference_show_notification_title">Rodyti aktyvųjį pranešimą</string>
   <string name="preference_show_notification_summary">Quasseldroid bus visada prijungtas rodant pastovų pranešimą</string>
 
-  </resources>
+</resources>
diff --git a/app/src/main/res/values-pt-rBR/strings_defaults.xml b/app/src/main/res/values-pt-rBR/strings_defaults.xml
index 99253b7ee..d784a323e 100644
--- a/app/src/main/res/values-pt-rBR/strings_defaults.xml
+++ b/app/src/main/res/values-pt-rBR/strings_defaults.xml
@@ -17,4 +17,11 @@
   with this program.  If not, see <http://www.gnu.org/licenses/>.
   -->
 
-<resources></resources>
+<resources>
+  <string name="default_bufferviewconfig_name">Todas as Conversas</string>
+
+  <string name="default_identity_identity_name">Identidade Padrão</string>
+  <string name="default_identity_realname">Usuário Quassel IRC</string>
+  <string name="default_identity_awayreason">Fui pescar.</string>
+  <string name="default_identity_detachawayreason">Todos os clientes Quassel desapareceram da face da terra…</string>
+</resources>
diff --git a/app/src/main/res/values-pt/strings_defaults.xml b/app/src/main/res/values-pt/strings_defaults.xml
index 4a7aee5ad..6b5f66094 100644
--- a/app/src/main/res/values-pt/strings_defaults.xml
+++ b/app/src/main/res/values-pt/strings_defaults.xml
@@ -21,10 +21,7 @@
   <string name="default_bufferviewconfig_name">Todos os Chats</string>
 
   <string name="default_identity_identity_name">Identidade Padrão</string>
-  <string name="default_identity_name">&lt;vazio&gt;</string>
   <string name="default_identity_realname">Utilizador Quassel IRC</string>
-  <string name="default_identity_nick">quassel%1$d</string>
-  <string name="default_identity_ident">quassel</string>
   <string name="default_identity_awayreason">Fui pescar.</string>
   <string name="default_identity_autoawayreason">Não estou aqui. Não, a sério. Não estou aqui!</string>
   <string name="default_identity_detachawayreason">Todos os clientes Quassel desapareceram da face da terra…</string>
diff --git a/app/src/main/res/values-pt/strings_preferences.xml b/app/src/main/res/values-pt/strings_preferences.xml
index 34f61468e..c452dd7f1 100644
--- a/app/src/main/res/values-pt/strings_preferences.xml
+++ b/app/src/main/res/values-pt/strings_preferences.xml
@@ -147,4 +147,4 @@
   <string name="preference_show_notification_title">Mostrar notificação</string>
   <string name="preference_show_notification_summary">Mantém o Quasseldroid sempre conectado, mostrando uma notificação persistente</string>
 
-  </resources>
+</resources>
diff --git a/app/src/main/res/values-sr/strings_defaults.xml b/app/src/main/res/values-sr/strings_defaults.xml
index d28296825..d46833686 100644
--- a/app/src/main/res/values-sr/strings_defaults.xml
+++ b/app/src/main/res/values-sr/strings_defaults.xml
@@ -21,10 +21,7 @@
   <string name="default_bufferviewconfig_name">Svi Četovi</string>
 
   <string name="default_identity_identity_name">Podrazumjevani Identitet</string>
-  <string name="default_identity_name">&lt;empty&gt;</string>
   <string name="default_identity_realname">Quassel IRC Korisnik</string>
-  <string name="default_identity_nick">quassel%1$d</string>
-  <string name="default_identity_ident">quassel</string>
   <string name="default_identity_awayreason">Otišli pecati.</string>
   <string name="default_identity_autoawayreason">Ne ovde. Ne, stvarno. ne ovde!</string>
   <string name="default_identity_detachawayreason">Svi Quassel klijenti su nestali sa lica zemlje…</string>
diff --git a/app/src/main/res/values/strings_defaults.xml b/app/src/main/res/values/strings_defaults.xml
index e4e1464d0..0460f647e 100644
--- a/app/src/main/res/values/strings_defaults.xml
+++ b/app/src/main/res/values/strings_defaults.xml
@@ -21,10 +21,10 @@
   <string name="default_bufferviewconfig_name">All Chats</string>
 
   <string name="default_identity_identity_name">Default Identity</string>
-  <string name="default_identity_name">&lt;empty&gt;</string>
+  <string name="default_identity_name" translatable="false">&lt;empty&gt;</string>
   <string name="default_identity_realname">Quassel IRC User</string>
-  <string name="default_identity_nick">quassel%1$d</string>
-  <string name="default_identity_ident">quassel</string>
+  <string name="default_identity_nick" translatable="false">quassel%1$d</string>
+  <string name="default_identity_ident" translatable="false">quassel</string>
   <string name="default_identity_awayreason">Gone fishing.</string>
   <string name="default_identity_autoawayreason">Not here. No, really. not here!</string>
   <string name="default_identity_detachawayreason">All Quassel clients vanished from the face of the earth…</string>
-- 
GitLab