diff options
author | Daniel Gultsch <inputmice@siacs.eu> | 2014-12-30 09:36:17 +0100 |
---|---|---|
committer | Daniel Gultsch <inputmice@siacs.eu> | 2014-12-30 09:36:17 +0100 |
commit | b71740f0d40ed3fb3e5b790d80ed6cb235f97d04 (patch) | |
tree | 99367303fb7b92cb1f34d8c236ad53c31c1d4bb4 | |
parent | 8f93f9c314d1bf731eac64007f3c9459fa92de1f (diff) | |
parent | cacddef75668c1811d951795c2276c20255c9142 (diff) |
Merge remote-tracking branch 'origin/development' into development
-rw-r--r-- | src/main/res/values-ca/strings.xml | 3 | ||||
-rw-r--r-- | src/main/res/values-cs/strings.xml | 1 | ||||
-rw-r--r-- | src/main/res/values-de/strings.xml | 1 | ||||
-rw-r--r-- | src/main/res/values-es/strings.xml | 1 | ||||
-rw-r--r-- | src/main/res/values-eu/strings.xml | 1 | ||||
-rw-r--r-- | src/main/res/values-fr/strings.xml | 1 | ||||
-rw-r--r-- | src/main/res/values-gl/strings.xml | 3 | ||||
-rw-r--r-- | src/main/res/values-it/strings.xml | 1 | ||||
-rw-r--r-- | src/main/res/values-iw/strings.xml | 3 | ||||
-rw-r--r-- | src/main/res/values-nl/strings.xml | 1 | ||||
-rw-r--r-- | src/main/res/values-ru/strings.xml | 1 | ||||
-rw-r--r-- | src/main/res/values-sv/strings.xml | 3 | ||||
-rw-r--r-- | src/main/res/values-zh-rCN/strings.xml | 3 | ||||
-rw-r--r-- | src/main/res/values-zh-rTW/strings.xml | 3 | ||||
-rw-r--r-- | src/main/res/values/strings.xml | 4 |
15 files changed, 8 insertions, 22 deletions
diff --git a/src/main/res/values-ca/strings.xml b/src/main/res/values-ca/strings.xml index cfbe428bf..ae1da4720 100644 --- a/src/main/res/values-ca/strings.xml +++ b/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> @@ -80,4 +79,4 @@ <string name="pref_never_send_crash_summary">Enviant traces d\'execució ajudes al futur desenvolupament del Conversations.</string> <string name="pref_ui_options">Opcions de UI</string> -</resources>
\ No newline at end of file +</resources> diff --git a/src/main/res/values-cs/strings.xml b/src/main/res/values-cs/strings.xml index 9e9552469..33c7310bf 100644 --- a/src/main/res/values-cs/strings.xml +++ b/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> diff --git a/src/main/res/values-de/strings.xml b/src/main/res/values-de/strings.xml index f959c382a..06acfb6ba 100644 --- a/src/main/res/values-de/strings.xml +++ b/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> diff --git a/src/main/res/values-es/strings.xml b/src/main/res/values-es/strings.xml index f53d5368a..d47a3adc4 100644 --- a/src/main/res/values-es/strings.xml +++ b/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> diff --git a/src/main/res/values-eu/strings.xml b/src/main/res/values-eu/strings.xml index 41f3793bf..04388f4f6 100644 --- a/src/main/res/values-eu/strings.xml +++ b/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> diff --git a/src/main/res/values-fr/strings.xml b/src/main/res/values-fr/strings.xml index e1db316dc..b3b86f1f7 100644 --- a/src/main/res/values-fr/strings.xml +++ b/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> diff --git a/src/main/res/values-gl/strings.xml b/src/main/res/values-gl/strings.xml index 581164630..637237b8e 100644 --- a/src/main/res/values-gl/strings.xml +++ b/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> @@ -127,4 +126,4 @@ <string name="invalid_jid">O identificador non é un identificador de Jabber válido</string> <string name="pref_ui_options">Opcións de interfaz</string> -</resources>
\ No newline at end of file +</resources> diff --git a/src/main/res/values-it/strings.xml b/src/main/res/values-it/strings.xml index 703dab9d3..af4dc3e0f 100644 --- a/src/main/res/values-it/strings.xml +++ b/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> diff --git a/src/main/res/values-iw/strings.xml b/src/main/res/values-iw/strings.xml index fd8eaa0ba..79fe9f3a5 100644 --- a/src/main/res/values-iw/strings.xml +++ b/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> @@ -221,4 +220,4 @@ <string name="send_private_message_to">שלח הודעה פרטית אל %s</string> <string name="pref_ui_options">אפשרויות ממשק משתמש</string> -</resources>
\ No newline at end of file +</resources> diff --git a/src/main/res/values-nl/strings.xml b/src/main/res/values-nl/strings.xml index be3632daf..cb47ae97e 100644 --- a/src/main/res/values-nl/strings.xml +++ b/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> diff --git a/src/main/res/values-ru/strings.xml b/src/main/res/values-ru/strings.xml index 2aa26b0be..efc5ba6c5 100644 --- a/src/main/res/values-ru/strings.xml +++ b/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> diff --git a/src/main/res/values-sv/strings.xml b/src/main/res/values-sv/strings.xml index a3ed9112e..2c3cb9c3c 100644 --- a/src/main/res/values-sv/strings.xml +++ b/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> @@ -257,4 +256,4 @@ <string name="account_status_disabled">Tillfälligt inaktiverad</string> <string name="mgmt_account_disable">Inaktivera tillfälligt</string> -</resources>
\ No newline at end of file +</resources> diff --git a/src/main/res/values-zh-rCN/strings.xml b/src/main/res/values-zh-rCN/strings.xml index a7898425a..b3b9604e6 100644 --- a/src/main/res/values-zh-rCN/strings.xml +++ b/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> @@ -257,4 +256,4 @@ <string name="pref_use_send_button_to_indicate_status">发送按钮显示状态</string> <string name="pref_use_send_button_to_indicate_status_summary">发送按钮采用其他颜色以示发送状态的区别</string> -</resources>
\ No newline at end of file +</resources> diff --git a/src/main/res/values-zh-rTW/strings.xml b/src/main/res/values-zh-rTW/strings.xml index 2c3ea225c..24872cf7a 100644 --- a/src/main/res/values-zh-rTW/strings.xml +++ b/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> @@ -260,4 +259,4 @@ <string name="pref_conference_name">群組名稱</string> <string name="pref_conference_name_summary">使用群組的名稱而不是 JID 來識別之。 </string> -</resources>
\ No newline at end of file +</resources> diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml index f75a698b9..34c574ee7 100644 --- a/src/main/res/values/strings.xml +++ b/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> @@ -279,7 +279,7 @@ <string name="pref_expert_options_summary">Please be careful with these</string> <string name="title_activity_about">About Conversations</string> <string name="pref_about_conversations_summary">Build and licensing information</string> - <string name="pref_about_message" translatable="false"> + <string name="pref_about_message" translatable="false"> Conversations • the very last word in instant messaging. \n\nCopyright © 2014 Daniel Gultsch \n\nThis program is free software: you can redistribute it and/or modify |