~singpolyma/cheogram-android

f5427837618b8fabd4e24c9ef19769bf6e60502b — Daniel Gultsch 7 years ago 3216813 + e76a9c0
Merge pull request #949 from kruks23/title_activity

Remove title_activity_conversations and use app_name instead
M settings.gradle => settings.gradle +0 -1
@@ 1,5 1,4 @@
include ':libs:MemorizingTrustManager'
include ':libs:minidns'
include ':libs:openpgp-api-lib'

rootProject.name = 'Conversations'

M src/main/AndroidManifest.xml => src/main/AndroidManifest.xml +2 -2
@@ 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" />


M src/main/res/values-cs/strings.xml => src/main/res/values-cs/strings.xml +0 -1
@@ 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>

M src/main/res/values-de/strings.xml => src/main/res/values-de/strings.xml +0 -1
@@ 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>

M src/main/res/values-es/strings.xml => src/main/res/values-es/strings.xml +0 -1
@@ 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>

M src/main/res/values-eu/strings.xml => src/main/res/values-eu/strings.xml +0 -1
@@ 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>

M src/main/res/values-fr/strings.xml => src/main/res/values-fr/strings.xml +0 -1
@@ 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>

M src/main/res/values-it/strings.xml => src/main/res/values-it/strings.xml +0 -1
@@ 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>

M src/main/res/values-iw/strings.xml => src/main/res/values-iw/strings.xml +0 -1
@@ 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>

M src/main/res/values-nl/strings.xml => src/main/res/values-nl/strings.xml +0 -1
@@ 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>

M src/main/res/values-ru/strings.xml => src/main/res/values-ru/strings.xml +0 -1
@@ 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>

M src/main/res/values-sv/strings.xml => src/main/res/values-sv/strings.xml +0 -1
@@ 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>

M src/main/res/values-zh-rCN/strings.xml => src/main/res/values-zh-rCN/strings.xml +0 -1
@@ 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>

M src/main/res/values-zh-rTW/strings.xml => src/main/res/values-zh-rTW/strings.xml +0 -1
@@ 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>

M src/main/res/values/strings.xml => src/main/res/values/strings.xml +0 -1
@@ 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>