Merge remote-tracking branch 'origin/development' into development

src/main/res/values-ca/strings.xml

@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
 
-    <string name="app_name">Conversations</string>
     <string name="action_settings">Preferències</string>
     <string name="action_add">Nova conversa</string>
     <string name="action_accounts">Gestionar comptes</string>

src/main/res/values-cs/strings.xml

@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
 
-    <string name="app_name">Conversations</string>
     <string name="action_settings">Nastavení</string>
     <string name="action_add">Nová konverzace</string>
     <string name="action_accounts">Nastavení účtů</string>

src/main/res/values-de/strings.xml

@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
 
-    <string name="app_name">Conversations</string>
     <string name="action_settings">Einstellungen</string>
     <string name="action_add">Neue Unterhaltung</string>
     <string name="action_accounts">Konten verwalten</string>

src/main/res/values-es/strings.xml

@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
 
-    <string name="app_name">Conversations</string>
     <string name="action_settings">Ajustes</string>
     <string name="action_add">Nueva conversación</string>
     <string name="action_accounts">Gestionar cuentas</string>

src/main/res/values-eu/strings.xml

@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <resources>
 
-    <string name="app_name">Conversations</string>
     <string name="action_settings">Ezarpenak</string>
     <string name="action_add">Elkarrizketa berria</string>
     <string name="action_accounts">Kontuak kudeatu</string>

src/main/res/values-fr/strings.xml

@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
 
-    <string name="app_name">Conversations</string>
     <string name="action_settings">Paramètres</string>
     <string name="action_add">Nouvelle conversation</string>
     <string name="action_accounts">Gérer les comptes</string>

src/main/res/values-gl/strings.xml

@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
 
-    <string name="app_name">Conversations</string>
     <string name="action_settings">Axustes</string>
     <string name="action_add">Nova conversa</string>
     <string name="action_accounts">Xestionar contas</string>

src/main/res/values-it/strings.xml

@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
 
-    <string name="app_name">Conversations</string>
     <string name="action_settings">Impostazioni</string>
     <string name="action_add">Nuova conversazione</string>
     <string name="action_accounts">Gestisci utenti</string>

src/main/res/values-iw/strings.xml

@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
 
-    <string name="app_name">Conversations</string>
     <string name="action_settings">הגדרות</string>
     <string name="action_add">דיון חדש</string>
     <string name="action_accounts">נהל חשבונות</string>

src/main/res/values-nl/strings.xml

@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
 
-    <string name="app_name">Conversations</string>
     <string name="action_settings">Instellingen</string>
     <string name="action_add">Nieuw gesprek</string>
     <string name="action_accounts">Beheer account</string>

src/main/res/values-ru/strings.xml

@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
 
-    <string name="app_name">Conversations</string>
     <string name="action_settings">Настройки</string>
     <string name="action_add">Новая беседа</string>
     <string name="action_accounts">Управление аккаунтами</string>

src/main/res/values-sv/strings.xml

@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
 
-    <string name="app_name">Conversations</string>
     <string name="action_settings">Inställningar</string>
     <string name="action_add">Ny konversation</string>
     <string name="action_accounts">Kontoinställningar</string>

src/main/res/values-zh-rCN/strings.xml

@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
 
-    <string name="app_name">Conversations</string>
     <string name="action_settings">设置</string>
     <string name="action_add">新会话</string>
     <string name="action_accounts">管理账户</string>

src/main/res/values-zh-rTW/strings.xml

@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
 
-    <string name="app_name">Conversations</string>
     <string name="action_settings">設定</string>
     <string name="action_add">新對話</string>
     <string name="action_accounts">管理帳戶</string>

src/main/res/values/strings.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
 
-    <string name="app_name">Conversations</string>
+    <string name="app_name" translatable="false">Conversations</string>
     <string name="action_settings">Settings</string>
     <string name="action_add">New conversation</string>
     <string name="action_accounts">Manage accounts</string>