From e76a9c06c33e21138c32a34432c3c405f5c737a9 Mon Sep 17 00:00:00 2001 From: kruks23 Date: Fri, 30 Jan 2015 17:02:53 +0100 Subject: [PATCH] Remove title_activity_conversations and use app_name instead --- settings.gradle | 1 - src/main/AndroidManifest.xml | 4 ++-- src/main/res/values-cs/strings.xml | 1 - src/main/res/values-de/strings.xml | 1 - src/main/res/values-es/strings.xml | 1 - src/main/res/values-eu/strings.xml | 1 - src/main/res/values-fr/strings.xml | 1 - src/main/res/values-it/strings.xml | 1 - src/main/res/values-iw/strings.xml | 1 - src/main/res/values-nl/strings.xml | 1 - src/main/res/values-ru/strings.xml | 1 - src/main/res/values-sv/strings.xml | 1 - src/main/res/values-zh-rCN/strings.xml | 1 - src/main/res/values-zh-rTW/strings.xml | 1 - src/main/res/values/strings.xml | 1 - 15 files changed, 2 insertions(+), 16 deletions(-) diff --git a/settings.gradle b/settings.gradle index 5a34181a4..aee35962f 100644 --- a/settings.gradle +++ b/settings.gradle @@ -1,5 +1,4 @@ include ':libs:MemorizingTrustManager' -include ':libs:minidns' include ':libs:openpgp-api-lib' rootProject.name = 'Conversations' diff --git a/src/main/AndroidManifest.xml b/src/main/AndroidManifest.xml index f3d58d579..e4e91d801 100644 --- a/src/main/AndroidManifest.xml +++ b/src/main/AndroidManifest.xml @@ -33,7 +33,7 @@ @@ -107,7 +107,7 @@ android:windowSoftInputMode="stateHidden" /> + android:label="@string/app_name" > diff --git a/src/main/res/values-cs/strings.xml b/src/main/res/values-cs/strings.xml index 30e9e6b85..3cfb6b13d 100644 --- a/src/main/res/values-cs/strings.xml +++ b/src/main/res/values-cs/strings.xml @@ -19,7 +19,6 @@ Nastavení Detaily konference Detaily kontaktu - Conversations Sdílet s konverzací Začít konverzaci Vybrat kontakt diff --git a/src/main/res/values-de/strings.xml b/src/main/res/values-de/strings.xml index e2f33eeea..7f26fd5e0 100644 --- a/src/main/res/values-de/strings.xml +++ b/src/main/res/values-de/strings.xml @@ -19,7 +19,6 @@ Einstellungen Konferenz-Details Kontaktdetails - Conversations Mit Unterhaltung teilen Beginne Unterhaltung Kontakt auswählen diff --git a/src/main/res/values-es/strings.xml b/src/main/res/values-es/strings.xml index a37bc401f..410a1b53c 100644 --- a/src/main/res/values-es/strings.xml +++ b/src/main/res/values-es/strings.xml @@ -19,7 +19,6 @@ Ajustes Detalles de Conversación Detalles del Contacto - Conversaciones Compartir con Conversación Nueva Conversación Elegir contacto diff --git a/src/main/res/values-eu/strings.xml b/src/main/res/values-eu/strings.xml index 5e3256954..ab05708d0 100644 --- a/src/main/res/values-eu/strings.xml +++ b/src/main/res/values-eu/strings.xml @@ -19,7 +19,6 @@ Ezarpenak Konferentziaren xehetasunak Kontaktuaren xehetasunak - Conversations Elkarrizketa batekin partekatu Elkarrizketa hasi Kontaktua hautatu diff --git a/src/main/res/values-fr/strings.xml b/src/main/res/values-fr/strings.xml index 7767fb606..5495144fc 100644 --- a/src/main/res/values-fr/strings.xml +++ b/src/main/res/values-fr/strings.xml @@ -19,7 +19,6 @@ Paramètres Détails de la conférence Détails du contact - Conversations Partager avec Conversation Lancement de Conversation Choix du contact diff --git a/src/main/res/values-it/strings.xml b/src/main/res/values-it/strings.xml index e733dff85..c32e95854 100644 --- a/src/main/res/values-it/strings.xml +++ b/src/main/res/values-it/strings.xml @@ -19,7 +19,6 @@ Impostazioni Dettagli conferenza Dettagli del contatto - Conversations Condividi con Conversation Inizia una Conversazione Scegli contatto diff --git a/src/main/res/values-iw/strings.xml b/src/main/res/values-iw/strings.xml index 7c6c59d98..010da80e0 100644 --- a/src/main/res/values-iw/strings.xml +++ b/src/main/res/values-iw/strings.xml @@ -15,7 +15,6 @@ הגדרות פרטי ועידה פרטי איש קשר - דיונים שתף בעזרת Conversations התחל דיון בחר איש קשר diff --git a/src/main/res/values-nl/strings.xml b/src/main/res/values-nl/strings.xml index ad298325d..d2c90d252 100644 --- a/src/main/res/values-nl/strings.xml +++ b/src/main/res/values-nl/strings.xml @@ -19,7 +19,6 @@ Instellingen Groepsgespreksgegevens Contactgegevens - Gesprekken Delen met gesprek Start gesprek Kies contact diff --git a/src/main/res/values-ru/strings.xml b/src/main/res/values-ru/strings.xml index 7e3f47c85..4a96a7fe9 100644 --- a/src/main/res/values-ru/strings.xml +++ b/src/main/res/values-ru/strings.xml @@ -15,7 +15,6 @@ Настройки Сведения о Конференции Сведения о Контакте - Conversations Поделиться Начать беседу Выберите собеседника diff --git a/src/main/res/values-sv/strings.xml b/src/main/res/values-sv/strings.xml index 79a8656b3..da04e7758 100644 --- a/src/main/res/values-sv/strings.xml +++ b/src/main/res/values-sv/strings.xml @@ -19,7 +19,6 @@ Inställningar Konferensdetaljer Kontaktdetaljer - Conversations Dela med konversation Starta konversation Välj kontakt diff --git a/src/main/res/values-zh-rCN/strings.xml b/src/main/res/values-zh-rCN/strings.xml index 5c42e0b96..49ca9b974 100644 --- a/src/main/res/values-zh-rCN/strings.xml +++ b/src/main/res/values-zh-rCN/strings.xml @@ -15,7 +15,6 @@ 设置 讨论组详情 联系人详情 - Conversations 分享会话 开始会话 选择联系人 diff --git a/src/main/res/values-zh-rTW/strings.xml b/src/main/res/values-zh-rTW/strings.xml index e38defbfa..8aed12d6f 100644 --- a/src/main/res/values-zh-rTW/strings.xml +++ b/src/main/res/values-zh-rTW/strings.xml @@ -13,7 +13,6 @@ 管理帳戶 群組詳情 聯絡人詳情 - 對話 分享對話 開始對話 選擇聯絡人 diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml index ae8dcd678..9d3300d8d 100644 --- a/src/main/res/values/strings.xml +++ b/src/main/res/values/strings.xml @@ -21,7 +21,6 @@ Settings Conference Details Contact Details - Conversations Share with Conversation Start Conversation Choose contact