moparisthebest/Conversations
1
0
Fork 0
mirror of https://github.com/moparisthebest/Conversations synced 2024-11-24 09:42:17 -05:00
Code Issues Releases Wiki Activity

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

Browse Source
This commit is contained in:
Daniel Gultsch 2014-12-30 09:36:17 +01:00
commit b71740f0d4
15 changed files with 8 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/main/res/values-ca/strings.xml
View File

@ -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>
</resources>

1
src/main/res/values-cs/strings.xml
View File

@ -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>

1
src/main/res/values-de/strings.xml
View File

@ -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>

1
src/main/res/values-es/strings.xml
View File

@ -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>

1
src/main/res/values-eu/strings.xml
View File

@ -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>

1
src/main/res/values-fr/strings.xml
View File

@ -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>

3
src/main/res/values-gl/strings.xml
View File

@ -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>
</resources>

1
src/main/res/values-it/strings.xml
View File

@ -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>

3
src/main/res/values-iw/strings.xml
View File

@ -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>
</resources>

1
src/main/res/values-nl/strings.xml
View File

@ -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>

1
src/main/res/values-ru/strings.xml
View File

@ -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>

3
src/main/res/values-sv/strings.xml
View File

@ -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>
</resources>

3
src/main/res/values-zh-rCN/strings.xml
View File

@ -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>
</resources>

3
src/main/res/values-zh-rTW/strings.xml
View File

@ -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>
</resources>

4
src/main/res/values/strings.xml
View File

@ -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