Merge commit 'korg/cupcake'

13 files changed, 26 insertions, 48 deletions

diff --git a/res/values-cs/strings.xml b/res/values-cs/strings.xml
index bb35717..c10ecf0 100644
--- a/res/values-cs/strings.xml
+++ b/res/values-cs/strings.xml
@@ -29,8 +29,7 @@
     <string name="menu_settings">"Nastavení"</string>
     <string name="menu_sign_out_all">"Odhlásit se ze všech služeb"</string>
     <string name="choose_account_title">"Chat – vyberte účet"</string>
-    <!-- no translation found for conversations (6809253595345281731) -->
-    <skip />
+    <string name="conversations">"(%1$d)"</string>
     <string name="add_account">"Přidat účet <xliff:g id="ACCOUNT">%1$s</xliff:g>"</string>
     <string name="menu_view_contact_list">"Seznam kontaktů"</string>
     <string name="signing_in_wait">"Přihlašování..."</string>
diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml
index a0f61fe..04614f7 100644
--- a/res/values-de/strings.xml
+++ b/res/values-de/strings.xml
@@ -15,9 +15,9 @@
 -->
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="ro_perm_label">"Instant Messages lesen"</string>
+    <string name="ro_perm_label">"Chat-Nachrichten lesen"</string>
     <string name="ro_perm_desc">"Ermöglicht Anwendungen das Lesen von Daten des IM-Content-Providers."</string>
-    <string name="wo_perm_label">"Instant Messages verfassen"</string>
+    <string name="wo_perm_label">"Chat-Nachrichten verfassen"</string>
     <string name="wo_perm_desc">"Ermöglicht Anwendungen das Schreiben von Daten an den IM-Content-Provider."</string>
     <string name="im_label">"IM"</string>
     <string name="landing_page_title">"Chat - Konto auswählen"</string>
@@ -29,8 +29,7 @@
     <string name="menu_settings">"Einstellungen"</string>
     <string name="menu_sign_out_all">"Alle abmelden"</string>
     <string name="choose_account_title">"Chat - Konto auswählen"</string>
-    <!-- no translation found for conversations (6809253595345281731) -->
-    <skip />
+    <string name="conversations">"(%1$d)"</string>
     <string name="add_account">"<xliff:g id="ACCOUNT">%1$s</xliff:g>-Konto hinzufügen"</string>
     <string name="menu_view_contact_list">"Kontaktliste"</string>
     <string name="signing_in_wait">"Anmeldung..."</string>
diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml
index 128c806..0d76f3b 100644
--- a/res/values-es/strings.xml
+++ b/res/values-es/strings.xml
@@ -29,8 +29,7 @@
     <string name="menu_settings">"Configuración"</string>
     <string name="menu_sign_out_all">"Salir de todo"</string>
     <string name="choose_account_title">"Chat: seleccionar una cuenta"</string>
-    <!-- no translation found for conversations (6809253595345281731) -->
-    <skip />
+    <string name="conversations">"(%1$d)"</string>
     <string name="add_account">"Añadir cuenta <xliff:g id="ACCOUNT">%1$s</xliff:g>"</string>
     <string name="menu_view_contact_list">"Lista de contactos"</string>
     <string name="signing_in_wait">"Accediendo..."</string>
diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml
index 3da7c82..b24f8d0 100644
--- a/res/values-fr/strings.xml
+++ b/res/values-fr/strings.xml
@@ -29,8 +29,7 @@
     <string name="menu_settings">"Paramètres"</string>
     <string name="menu_sign_out_all">"Se déconnecter de tout"</string>
     <string name="choose_account_title">"Chat : sélectionner un compte"</string>
-    <!-- no translation found for conversations (6809253595345281731) -->
-    <skip />
+    <string name="conversations">"(%1$d)"</string>
     <string name="add_account">"Ajouter le compte <xliff:g id="ACCOUNT">%1$s</xliff:g>"</string>
     <string name="menu_view_contact_list">"Liste de contacts"</string>
     <string name="signing_in_wait">"Connexion..."</string>
diff --git a/res/values-it/strings.xml b/res/values-it/strings.xml
index 70065fb..334b002 100644
--- a/res/values-it/strings.xml
+++ b/res/values-it/strings.xml
@@ -29,8 +29,7 @@
     <string name="menu_settings">"Impostazioni"</string>
     <string name="menu_sign_out_all">"Esci da tutto"</string>
     <string name="choose_account_title">"Chat - Seleziona un account"</string>
-    <!-- no translation found for conversations (6809253595345281731) -->
-    <skip />
+    <string name="conversations">"(%1$d)"</string>
     <string name="add_account">"Aggiungi account <xliff:g id="ACCOUNT">%1$s</xliff:g>"</string>
     <string name="menu_view_contact_list">"Elenco contatti"</string>
     <string name="signing_in_wait">"Accesso..."</string>
diff --git a/res/values-ko/strings.xml b/res/values-ko/strings.xml
index b3395e6..bf94474 100644
--- a/res/values-ko/strings.xml
+++ b/res/values-ko/strings.xml
@@ -29,8 +29,7 @@
     <string name="menu_settings">"설정"</string>
     <string name="menu_sign_out_all">"모두 로그아웃"</string>
     <string name="choose_account_title">"채팅 - 계정 선택"</string>
-    <!-- no translation found for conversations (6809253595345281731) -->
-    <skip />
+    <string name="conversations">"(%1$d)"</string>
     <string name="add_account">"<xliff:g id="ACCOUNT">%1$s</xliff:g> 계정 추가"</string>
     <string name="menu_view_contact_list">"연락처 목록"</string>
     <string name="signing_in_wait">"로그인하는 중..."</string>
diff --git a/res/values-nb/strings.xml b/res/values-nb/strings.xml
index 1f22b81..2630329 100644
--- a/res/values-nb/strings.xml
+++ b/res/values-nb/strings.xml
@@ -15,32 +15,21 @@
 -->
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <!-- no translation found for ro_perm_label (8923213594676670163) -->
-    <skip />
-    <!-- no translation found for ro_perm_desc (6154703403388711809) -->
-    <skip />
-    <!-- no translation found for wo_perm_label (4771652386754813294) -->
-    <skip />
-    <!-- no translation found for wo_perm_desc (470416777693330370) -->
-    <skip />
+    <string name="ro_perm_label">"les lynmeldinger"</string>
+    <string name="ro_perm_desc">"Tillat applikasjoner å lese data fra lynmeldingsoperatøren."</string>
+    <string name="wo_perm_label">"write instant messages"</string>
+    <string name="wo_perm_desc">"Tillat applikasjonerå skrive data til lynmeldingsoperatøren."</string>
     <string name="im_label">"Nettprat"</string>
-    <!-- no translation found for landing_page_title (2177721703095999384) -->
-    <skip />
-    <!-- no translation found for menu_add_account (4184762314855405486) -->
-    <skip />
-    <!-- no translation found for menu_edit_account (6585077522972888350) -->
-    <skip />
-    <!-- no translation found for menu_remove_account (8013513817623405880) -->
-    <skip />
+    <string name="landing_page_title">"Lynmeldinger - velg en konto"</string>
+    <string name="menu_add_account">"Legg til konto"</string>
+    <string name="menu_edit_account">"Rediger konto"</string>
+    <string name="menu_remove_account">"Fjern konto"</string>
     <string name="sign_in">"Logg inn"</string>
     <string name="menu_sign_out">"Logg ut"</string>
     <string name="menu_settings">"Innstillinger"</string>
-    <!-- no translation found for menu_sign_out_all (945106187701517280) -->
-    <skip />
-    <!-- no translation found for choose_account_title (3179220583433723296) -->
-    <skip />
-    <!-- no translation found for conversations (6809253595345281731) -->
-    <skip />
+    <string name="menu_sign_out_all">"Logg ut alle"</string>
+    <string name="choose_account_title">"Lynmeldinger - velg en konto"</string>
+    <string name="conversations">"COUNT samtaler"</string>
     <string name="add_account">"Legg til <xliff:g id="ACCOUNT">%1$s</xliff:g>-konto"</string>
     <string name="menu_view_contact_list">"Kontaktliste"</string>
     <string name="signing_in_wait">"Logger inn…"</string>
diff --git a/res/values-nl/strings.xml b/res/values-nl/strings.xml
index dbaebbb..852c514 100644
--- a/res/values-nl/strings.xml
+++ b/res/values-nl/strings.xml
@@ -29,9 +29,8 @@
     <string name="menu_settings">"Instellingen"</string>
     <string name="menu_sign_out_all">"Overal afmelden"</string>
     <string name="choose_account_title">"Chatten - Een account selecteren"</string>
-    <!-- no translation found for conversations (6809253595345281731) -->
-    <skip />
+    <string name="conversations">"(%1$d)"</string>
     <string name="add_account">"<xliff:g id="ACCOUNT">%1$s</xliff:g>-account toevoegen"</string>
-    <string name="menu_view_contact_list">"Lijst met contactpersonen"</string>
+    <string name="menu_view_contact_list">"Lijst met contacten"</string>
     <string name="signing_in_wait">"Aanmelden..."</string>
 </resources>
diff --git a/res/values-pl/strings.xml b/res/values-pl/strings.xml
index 95538ba..c2154ba 100644
--- a/res/values-pl/strings.xml
+++ b/res/values-pl/strings.xml
@@ -29,8 +29,7 @@
     <string name="menu_settings">"Ustawienia"</string>
     <string name="menu_sign_out_all">"Wyloguj wszystkie"</string>
     <string name="choose_account_title">"Czat: Wybierz konto"</string>
-    <!-- no translation found for conversations (6809253595345281731) -->
-    <skip />
+    <string name="conversations">"(%1$d)"</string>
     <string name="add_account">"Dodaj konto <xliff:g id="ACCOUNT">%1$s</xliff:g>"</string>
     <string name="menu_view_contact_list">"Lista kontaktów"</string>
     <string name="signing_in_wait">"Trwa logowanie..."</string>
diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml
index 994b47e..5f6fb65 100644
--- a/res/values-ru/strings.xml
+++ b/res/values-ru/strings.xml
@@ -29,8 +29,7 @@
     <string name="menu_settings">"Настройки"</string>
     <string name="menu_sign_out_all">"Выйти отовсюду"</string>
     <string name="choose_account_title">"Чат – выберите аккаунт"</string>
-    <!-- no translation found for conversations (6809253595345281731) -->
-    <skip />
+    <string name="conversations">"(%1$d)"</string>
     <string name="add_account">"Добавить аккаунт <xliff:g id="ACCOUNT">%1$s</xliff:g>"</string>
     <string name="menu_view_contact_list">"Список контактов"</string>
     <string name="signing_in_wait">"Выполняется вход..."</string>
diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml
index 255f29f..6d4307e 100644
--- a/res/values-zh-rCN/strings.xml
+++ b/res/values-zh-rCN/strings.xml
@@ -29,8 +29,7 @@
     <string name="menu_settings">"设置"</string>
     <string name="menu_sign_out_all">"全部登出"</string>
     <string name="choose_account_title">"聊天 - 选择一个帐户"</string>
-    <!-- no translation found for conversations (6809253595345281731) -->
-    <skip />
+    <string name="conversations">"(%1$d)"</string>
     <string name="add_account">"添加 <xliff:g id="ACCOUNT">%1$s</xliff:g> 帐户"</string>
     <string name="menu_view_contact_list">"联系人列表"</string>
     <string name="signing_in_wait">"正在登录..."</string>
diff --git a/res/values-zh-rTW/strings.xml b/res/values-zh-rTW/strings.xml
index 713fc19..0b3a949 100644
--- a/res/values-zh-rTW/strings.xml
+++ b/res/values-zh-rTW/strings.xml
@@ -29,8 +29,7 @@
     <string name="menu_settings">"設定"</string>
     <string name="menu_sign_out_all">"全部登出"</string>
     <string name="choose_account_title">"即時通訊 - 選取帳戶"</string>
-    <!-- no translation found for conversations (6809253595345281731) -->
-    <skip />
+    <string name="conversations">"(%1$d)"</string>
     <string name="add_account">"新增 <xliff:g id="ACCOUNT">%1$s</xliff:g> 帳戶"</string>
     <string name="menu_view_contact_list">"通訊錄"</string>
     <string name="signing_in_wait">"登入中…"</string>
diff --git a/res/values/config.xml b/res/values/config.xml
index bac58b4..8060c3d 100644
--- a/res/values/config.xml
+++ b/res/values/config.xml
@@ -21,5 +21,5 @@
      for different hardware and product builds. -->
 <resources>
     <!-- Flag indicating whether IM app should be shown in the application tray -->
-    <bool name="enableLandingPageActivity">true</bool>
+    <bool name="enableLandingPageActivity">false</bool>
 </resources>