From e76a9c06c33e21138c32a34432c3c405f5c737a9 Mon Sep 17 00:00:00 2001
From: kruks23 <scardenas@openmailbox.org>
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 @@
 
         <activity
             android:name=".ui.ConversationActivity"
-            android:label="@string/title_activity_conversations"
+            android:label="@string/app_name"
             android:launchMode="singleTask"
             android:windowSoftInputMode="stateHidden" >
             <intent-filter>
@@ -107,7 +107,7 @@
             android:windowSoftInputMode="stateHidden" />
         <activity
             android:name=".ui.ShareWithActivity"
-            android:label="@string/title_activity_conversations" >
+            android:label="@string/app_name" >
             <intent-filter>
                 <action android:name="android.intent.action.SEND" />
 
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 @@
   <string name="title_activity_settings">Nastavení</string>
   <string name="title_activity_conference_details">Detaily konference</string>
   <string name="title_activity_contact_details">Detaily kontaktu</string>
-  <string name="title_activity_conversations">Conversations</string>
   <string name="title_activity_sharewith">Sdílet s konverzací</string>
   <string name="title_activity_start_conversation">Začít konverzaci</string>
   <string name="title_activity_choose_contact">Vybrat kontakt</string>
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 @@
   <string name="title_activity_settings">Einstellungen</string>
   <string name="title_activity_conference_details">Konferenz-Details</string>
   <string name="title_activity_contact_details">Kontaktdetails</string>
-  <string name="title_activity_conversations">Conversations</string>
   <string name="title_activity_sharewith">Mit Unterhaltung teilen</string>
   <string name="title_activity_start_conversation">Beginne Unterhaltung</string>
   <string name="title_activity_choose_contact">Kontakt auswählen</string>
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 @@
   <string name="title_activity_settings">Ajustes</string>
   <string name="title_activity_conference_details">Detalles de Conversación</string>
   <string name="title_activity_contact_details">Detalles del Contacto</string>
-  <string name="title_activity_conversations">Conversaciones</string>
   <string name="title_activity_sharewith">Compartir con Conversación</string>
   <string name="title_activity_start_conversation">Nueva Conversación</string>
   <string name="title_activity_choose_contact">Elegir contacto</string>
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 @@
   <string name="title_activity_settings">Ezarpenak</string>
   <string name="title_activity_conference_details">Konferentziaren xehetasunak</string>
   <string name="title_activity_contact_details">Kontaktuaren xehetasunak</string>
-  <string name="title_activity_conversations">Conversations</string>
   <string name="title_activity_sharewith">Elkarrizketa batekin partekatu</string>
   <string name="title_activity_start_conversation">Elkarrizketa hasi</string>
   <string name="title_activity_choose_contact">Kontaktua hautatu</string>
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 @@
   <string name="title_activity_settings">Paramètres</string>
   <string name="title_activity_conference_details">Détails de la conférence</string>
   <string name="title_activity_contact_details">Détails du contact</string>
-  <string name="title_activity_conversations">Conversations</string>
   <string name="title_activity_sharewith">Partager avec Conversation</string>
   <string name="title_activity_start_conversation">Lancement de Conversation</string>
   <string name="title_activity_choose_contact">Choix du contact</string>
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 @@
   <string name="title_activity_settings">Impostazioni</string>
   <string name="title_activity_conference_details">Dettagli conferenza</string>
   <string name="title_activity_contact_details">Dettagli del contatto</string>
-  <string name="title_activity_conversations">Conversations</string>
   <string name="title_activity_sharewith">Condividi con Conversation</string>
   <string name="title_activity_start_conversation">Inizia una Conversazione</string>
   <string name="title_activity_choose_contact">Scegli contatto</string>
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 @@
   <string name="title_activity_settings">הגדרות</string>
   <string name="title_activity_conference_details">פרטי ועידה</string>
   <string name="title_activity_contact_details">פרטי איש קשר</string>
-  <string name="title_activity_conversations">דיונים</string>
   <string name="title_activity_sharewith">שתף בעזרת Conversations</string>
   <string name="title_activity_start_conversation">התחל דיון</string>
   <string name="title_activity_choose_contact">בחר איש קשר</string>
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 @@
   <string name="title_activity_settings">Instellingen</string>
   <string name="title_activity_conference_details">Groepsgespreksgegevens</string>
   <string name="title_activity_contact_details">Contactgegevens</string>
-  <string name="title_activity_conversations">Gesprekken</string>
   <string name="title_activity_sharewith">Delen met gesprek</string>
   <string name="title_activity_start_conversation">Start gesprek</string>
   <string name="title_activity_choose_contact">Kies contact</string>
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 @@
   <string name="title_activity_settings">Настройки</string>
   <string name="title_activity_conference_details">Сведения о Конференции</string>
   <string name="title_activity_contact_details">Сведения о Контакте</string>
-  <string name="title_activity_conversations">Conversations</string>
   <string name="title_activity_sharewith">Поделиться</string>
   <string name="title_activity_start_conversation">Начать беседу</string>
   <string name="title_activity_choose_contact">Выберите собеседника</string>
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 @@
   <string name="title_activity_settings">Inställningar</string>
   <string name="title_activity_conference_details">Konferensdetaljer</string>
   <string name="title_activity_contact_details">Kontaktdetaljer</string>
-  <string name="title_activity_conversations">Conversations</string>
   <string name="title_activity_sharewith">Dela med konversation</string>
   <string name="title_activity_start_conversation">Starta konversation</string>
   <string name="title_activity_choose_contact">Välj kontakt</string>
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 @@
   <string name="title_activity_settings">设置</string>
   <string name="title_activity_conference_details">讨论组详情</string>
   <string name="title_activity_contact_details">联系人详情</string>
-  <string name="title_activity_conversations">Conversations</string>
   <string name="title_activity_sharewith">分享会话</string>
   <string name="title_activity_start_conversation">开始会话</string>
   <string name="title_activity_choose_contact">选择联系人</string>
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 @@
   <string name="title_activity_manage_accounts">管理帳戶</string>
   <string name="title_activity_conference_details">群組詳情</string>
   <string name="title_activity_contact_details">聯絡人詳情</string>
-  <string name="title_activity_conversations">對話</string>
   <string name="title_activity_sharewith">分享對話</string>
   <string name="title_activity_start_conversation">開始對話</string>
   <string name="title_activity_choose_contact">選擇聯絡人</string>
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 @@
     <string name="title_activity_settings">Settings</string>
     <string name="title_activity_conference_details">Conference Details</string>
     <string name="title_activity_contact_details">Contact Details</string>
-    <string name="title_activity_conversations">Conversations</string>
     <string name="title_activity_sharewith">Share with Conversation</string>
     <string name="title_activity_start_conversation">Start Conversation</string>
     <string name="title_activity_choose_contact">Choose contact</string>