auto import from //branches/cupcake/...@132276

17 files changed, 537 insertions, 76 deletions

diff --git a/res/color/landing_page_text.xml b/res/color/landing_page_text.xml
new file mode 100644
index 0000000..3737def
--- /dev/null
+++ b/res/color/landing_page_text.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2007 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+  
+          http://www.apache.org/licenses/LICENSE-2.0
+  
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:state_focused="true" android:color="#ff000000"/>
+    <item android:state_selected="true" android:color="#ff000000"/>
+    <item android:color="#ff808080"/>
+</selector>
diff --git a/res/drawable/default_background.9.png b/res/drawable/default_background.9.png
index b4dfdf1..33cb551 100644
--- a/res/drawable/default_background.9.png
+++ b/res/drawable/default_background.9.png
diff --git a/res/layout/account_view.xml b/res/layout/account_view.xml
index 057cb32..9ec8c77 100644
--- a/res/layout/account_view.xml
+++ b/res/layout/account_view.xml
@@ -23,71 +23,70 @@
     android:layout_width="fill_parent"
     android:layout_height="?android:attr/listPreferredItemHeight">
 
-    <RelativeLayout
-        android:paddingLeft="0dip"
+    <ImageView
+        android:id="@+id/providerIcon"
+        android:layout_gravity="center_vertical"
+        android:scaleType="fitXY"
+        android:paddingLeft="5dip"
+        android:paddingRight="2dip"
         android:layout_width="39dip"
-        android:layout_height="48dip"
-        android:layout_gravity="center_vertical">
-        <ImageView
-            android:id="@+id/providerIcon"
-            android:layout_alignParentLeft="true"
-            android:layout_centerVertical="true"
-            android:scaleType="fitXY"
-            android:paddingLeft="5dip"
-            android:paddingRight="2dip"
-            android:layout_width="39dip"
-            android:layout_height="32dip"/> 
-    </RelativeLayout>
+        android:layout_height="32dip"/>
 
     <LinearLayout
         android:id="@+id/underBubble"
-        android:orientation="vertical"
+        android:orientation="horizontal"
         android:layout_weight="1"
         android:layout_width="0dip"
         android:layout_height="fill_parent">    
 
-        <LinearLayout 
-            android:orientation="horizontal"
-            android:layout_width="fill_parent"
-            android:layout_height="0dip"
-            android:gravity="center_vertical"
-            android:layout_weight="1">
-            <TextView android:id="@+id/providerName"
-                android:textAppearance="?android:attr/textAppearanceSmall"
-                android:maxLines="1"
-                android:textSize="16sp"
-                android:ellipsize="marquee"
-                android:layout_weight="1"
-                android:layout_width="0dip"
-                android:layout_height="wrap_content" />
-            <TextView android:id="@+id/conversations"
-                android:textSize="12sp"
-                android:maxLines="1"
-                android:paddingRight="3dip"
-                android:gravity="right"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content" />
-        </LinearLayout>
-        <LinearLayout android:id="@+id/loginNameSection"
-            android:orientation="horizontal"
-            android:layout_width="fill_parent"
-            android:layout_height="0dip"
-            android:gravity="center_vertical"
-            android:layout_weight="1">
-            <ImageView
-                android:id="@+id/statusIcon"
-                android:scaleType="fitXY"
-                android:paddingRight="6dip"
-                android:layout_width="24dip"
-                android:layout_height="18dip"/>
+        <LinearLayout
+            android:orientation="vertical"
+            android:layout_weight="1"
+            android:layout_width="0dip"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center_vertical">    
+
+            <LinearLayout
+                android:orientation="horizontal"
+                android:layout_width="fill_parent"
+                android:layout_height="wrap_content">
+                
+                <TextView android:id="@+id/providerName"
+                    android:textColor="@color/landing_page_text"
+                    android:textAppearance="?android:attr/textAppearanceLarge"
+                    android:textStyle="bold"
+                    android:maxLines="1"
+                    android:layout_weight="0"
+                    android:ellipsize="marquee"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content" />
+                <TextView android:id="@+id/conversations"
+                    android:textAppearance="?android:attr/textAppearanceMedium"
+                    android:textColor="@color/landing_page_text"
+                    android:maxLines="1"
+                    android:layout_weight="1"
+                    android:paddingRight="3dip"
+                    android:paddingLeft="5dip"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content" />
+            </LinearLayout>
+            
             <TextView android:id="@+id/loginName"
+                android:textAppearance="?android:attr/textAppearanceSmall"
+                android:textColor="@color/landing_page_text"
                 android:ellipsize="marquee"
-                android:textSize="16sp"
                 android:maxLines="1"
-                android:layout_weight="1"
-                android:layout_width="0dip"
-                android:layout_height="wrap_content"/>
+                android:layout_width="fill_parent"
+               android:layout_height="wrap_content"/>
         </LinearLayout>
+        <ImageView
+            android:id="@+id/statusIcon"
+            android:scaleType="fitXY"
+            android:paddingRight="6dip"
+            android:paddingLeft="6dip"
+            android:layout_weight="0"
+            android:layout_gravity="center_vertical"
+            android:layout_width="30dip"
+            android:layout_height="18dip"/>
     </LinearLayout>
-    <View android:layout_width="5dip" android:layout_height="fill_parent"/>
 </com.android.providers.im.ProviderListItem>
diff --git a/res/values-cs/strings.xml b/res/values-cs/strings.xml
new file mode 100644
index 0000000..bb35717
--- /dev/null
+++ b/res/values-cs/strings.xml
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Copyright (C) 2009 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+<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">"číst zprávy chatu"</string>
+    <string name="ro_perm_desc">"Povoluje aplikacím číst data z poskytovatele obsahu chatu."</string>
+    <string name="wo_perm_label">"chatovat"</string>
+    <string name="wo_perm_desc">"Povoluje aplikacím zapisovat data do poskytovatele obsahu chatových zpráv."</string>
+    <string name="im_label">"Chat"</string>
+    <string name="landing_page_title">"Chat – vyberte účet"</string>
+    <string name="menu_add_account">"Přidat účet"</string>
+    <string name="menu_edit_account">"Upravit účet"</string>
+    <string name="menu_remove_account">"Odstranit účet"</string>
+    <string name="sign_in">"Přihlásit se"</string>
+    <string name="menu_sign_out">"Odhlásit se"</string>
+    <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="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>
+</resources>
diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml
new file mode 100644
index 0000000..a0f61fe
--- /dev/null
+++ b/res/values-de/strings.xml
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Copyright (C) 2009 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+<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_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_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>
+    <string name="menu_add_account">"Konto hinzufügen"</string>
+    <string name="menu_edit_account">"Konto bearbeiten"</string>
+    <string name="menu_remove_account">"Konto entfernen"</string>
+    <string name="sign_in">"Anmelden"</string>
+    <string name="menu_sign_out">"Abmelden"</string>
+    <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="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>
+</resources>
diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml
new file mode 100644
index 0000000..128c806
--- /dev/null
+++ b/res/values-es/strings.xml
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Copyright (C) 2009 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+<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">"leer mensajes instantáneos"</string>
+    <string name="ro_perm_desc">"Permite que las aplicaciones lean datos del proveedor de contenido de MI."</string>
+    <string name="wo_perm_label">"escribir mensajes instantáneos"</string>
+    <string name="wo_perm_desc">"Permite que las aplicaciones escriban datos en el proveedor de contenido de MI."</string>
+    <string name="im_label">"MI"</string>
+    <string name="landing_page_title">"Chat: seleccionar una cuenta"</string>
+    <string name="menu_add_account">"Añadir cuenta"</string>
+    <string name="menu_edit_account">"Editar cuenta"</string>
+    <string name="menu_remove_account">"Eliminar cuenta"</string>
+    <string name="sign_in">"Acceder"</string>
+    <string name="menu_sign_out">"Salir"</string>
+    <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="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>
+</resources>
diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml
new file mode 100644
index 0000000..c3f2712
--- /dev/null
+++ b/res/values-fr/strings.xml
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Copyright (C) 2009 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+<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">"lire les messages instantanés"</string>
+    <string name="ro_perm_desc">"Permet aux applications de lire les données du prestataire de contenu de messagerie instantanée."</string>
+    <string name="wo_perm_label">"écrire des messages instantanées"</string>
+    <string name="wo_perm_desc">"Permet aux applications d\'écrire les données pour le prestataire de contenu de messagerie instantanée."</string>
+    <string name="im_label">"Messagerie instantanée"</string>
+    <string name="landing_page_title">"Chat : sélectionner un compte"</string>
+    <string name="menu_add_account">"Ajouter un compte"</string>
+    <string name="menu_edit_account">"Modifier un compte"</string>
+    <string name="menu_remove_account">"Supprimer un compte"</string>
+    <string name="sign_in">"Connexion"</string>
+    <string name="menu_sign_out">"Déconnexion"</string>
+    <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="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>
+</resources>
diff --git a/res/values-it/strings.xml b/res/values-it/strings.xml
new file mode 100644
index 0000000..336af3a
--- /dev/null
+++ b/res/values-it/strings.xml
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Copyright (C) 2009 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+<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">"leggere messaggi immediati"</string>
+    <string name="ro_perm_desc">"Consente alle applicazioni di leggere dati del provider di contenuti IM."</string>
+    <string name="wo_perm_label">"scrivere messaggi immediati"</string>
+    <string name="wo_perm_desc">"Consente alle applicazioni di scrivere dati per il provider di contenuti IM."</string>
+    <string name="im_label">"IM"</string>
+    <string name="landing_page_title">"Chat - Seleziona un account"</string>
+    <string name="menu_add_account">"Aggiungi account"</string>
+    <string name="menu_edit_account">"Modifica account"</string>
+    <string name="menu_remove_account">"Rimuovi account"</string>
+    <string name="sign_in">"Accedi"</string>
+    <string name="menu_sign_out">"Esci"</string>
+    <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="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>
+</resources>
diff --git a/res/values-ja/strings.xml b/res/values-ja/strings.xml
new file mode 100644
index 0000000..89c5700
--- /dev/null
+++ b/res/values-ja/strings.xml
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Copyright (C) 2009 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+<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">"インスタントメッセージを表示"</string>
+    <string name="ro_perm_desc">"アプリケーションでIMコンテンツプロバイダからデータを読み取れるようにします。"</string>
+    <string name="wo_perm_label">"インスタントメッセージを作成"</string>
+    <string name="wo_perm_desc">"アプリケーションからIMコンテンツプロバイダにデータを書き込めるようにします。"</string>
+    <string name="im_label">"IM"</string>
+    <string name="landing_page_title">"チャット-アカウントを選択"</string>
+    <string name="menu_add_account">"アカウントを追加"</string>
+    <string name="menu_edit_account">"アカウントを編集"</string>
+    <string name="menu_remove_account">"アカウントを削除"</string>
+    <string name="sign_in">"ログイン"</string>
+    <string name="menu_sign_out">"ログアウト"</string>
+    <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="add_account">"<xliff:g id="ACCOUNT">%1$s</xliff:g>アカウントを追加"</string>
+    <string name="menu_view_contact_list">"連絡先リスト"</string>
+    <string name="signing_in_wait">"ログイン中..."</string>
+</resources>
diff --git a/res/values-ko/strings.xml b/res/values-ko/strings.xml
new file mode 100644
index 0000000..b3395e6
--- /dev/null
+++ b/res/values-ko/strings.xml
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Copyright (C) 2009 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+<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">"인스턴트 메시지 읽기"</string>
+    <string name="ro_perm_desc">"채팅 콘텐츠 제공업체에서 제공한 데이터를 읽을 수 있는 권한을 응용프로그램에 부여합니다."</string>
+    <string name="wo_perm_label">"인스턴트 메시지 쓰기"</string>
+    <string name="wo_perm_desc">"채팅 콘텐츠 제공업체에 데이터를 쓸 수 있는 권한을 응용프로그램에 부여합니다."</string>
+    <string name="im_label">"채팅"</string>
+    <string name="landing_page_title">"채팅 - 계정 선택"</string>
+    <string name="menu_add_account">"계정 추가"</string>
+    <string name="menu_edit_account">"계정 수정"</string>
+    <string name="menu_remove_account">"계정 삭제"</string>
+    <string name="sign_in">"로그인"</string>
+    <string name="menu_sign_out">"로그아웃"</string>
+    <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="add_account">"<xliff:g id="ACCOUNT">%1$s</xliff:g> 계정 추가"</string>
+    <string name="menu_view_contact_list">"연락처 목록"</string>
+    <string name="signing_in_wait">"로그인하는 중..."</string>
+</resources>
diff --git a/res/values-nl/strings.xml b/res/values-nl/strings.xml
new file mode 100644
index 0000000..dbaebbb
--- /dev/null
+++ b/res/values-nl/strings.xml
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Copyright (C) 2009 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+<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">"chatberichten lezen"</string>
+    <string name="ro_perm_desc">"Toepassingen toestaan gegevens te lezen van de provider van chatinhoud."</string>
+    <string name="wo_perm_label">"chatberichten schrijven"</string>
+    <string name="wo_perm_desc">"Toepassingen toestaan gegevens te schrijven naar de provider van chatinhoud."</string>
+    <string name="im_label">"Chat"</string>
+    <string name="landing_page_title">"Chatten - Een account selecteren"</string>
+    <string name="menu_add_account">"Account toevoegen"</string>
+    <string name="menu_edit_account">"Account bewerken"</string>
+    <string name="menu_remove_account">"Account verwijderen"</string>
+    <string name="sign_in">"Aanmelden"</string>
+    <string name="menu_sign_out">"Afmelden"</string>
+    <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="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="signing_in_wait">"Aanmelden..."</string>
+</resources>
diff --git a/res/values-pl/strings.xml b/res/values-pl/strings.xml
new file mode 100644
index 0000000..95538ba
--- /dev/null
+++ b/res/values-pl/strings.xml
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Copyright (C) 2009 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+<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">"odczytaj wiadomości komunikatora"</string>
+    <string name="ro_perm_desc">"Zezwalaj aplikacjom na odczytywanie danych dostawcy zawartości komunikatora"</string>
+    <string name="wo_perm_label">"zapisz wiadomości komunikatora"</string>
+    <string name="wo_perm_desc">"Zezwalaj aplikacjom na zapisywanie danych do dostawcy zawartości komunikatora"</string>
+    <string name="im_label">"Komunikator"</string>
+    <string name="landing_page_title">"Czat: Wybierz konto"</string>
+    <string name="menu_add_account">"Dodaj konto"</string>
+    <string name="menu_edit_account">"Edytuj konto"</string>
+    <string name="menu_remove_account">"Usuń konto"</string>
+    <string name="sign_in">"Zaloguj się"</string>
+    <string name="menu_sign_out">"Wyloguj się"</string>
+    <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="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>
+</resources>
diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml
new file mode 100644
index 0000000..994b47e
--- /dev/null
+++ b/res/values-ru/strings.xml
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Copyright (C) 2009 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+<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">"читать мгновенные сообщения"</string>
+    <string name="ro_perm_desc">"Позволяет приложениям считавать данные через поставщика чата."</string>
+    <string name="wo_perm_label">"писать мгновенные сообщения"</string>
+    <string name="wo_perm_desc">"Позволяет приложениям записывать данные через поставщика чата."</string>
+    <string name="im_label">"Чат"</string>
+    <string name="landing_page_title">"Чат – выберите аккаунт"</string>
+    <string name="menu_add_account">"Добавить аккаунт"</string>
+    <string name="menu_edit_account">"Изменить аккаунт"</string>
+    <string name="menu_remove_account">"Удалить аккаунт"</string>
+    <string name="sign_in">"Вход"</string>
+    <string name="menu_sign_out">"Выход"</string>
+    <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="add_account">"Добавить аккаунт <xliff:g id="ACCOUNT">%1$s</xliff:g>"</string>
+    <string name="menu_view_contact_list">"Список контактов"</string>
+    <string name="signing_in_wait">"Выполняется вход..."</string>
+</resources>
diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml
new file mode 100644
index 0000000..255f29f
--- /dev/null
+++ b/res/values-zh-rCN/strings.xml
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Copyright (C) 2009 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+<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">"阅读即时消息"</string>
+    <string name="ro_perm_desc">"允许应用程序从即时消息内容提供者处读取数据。"</string>
+    <string name="wo_perm_label">"编写即时消息"</string>
+    <string name="wo_perm_desc">"允许应用程序向即时消息内容提供者写入数据。"</string>
+    <string name="im_label">"即时消息"</string>
+    <string name="landing_page_title">"聊天 - 选择一个帐户"</string>
+    <string name="menu_add_account">"添加帐户"</string>
+    <string name="menu_edit_account">"编辑帐户"</string>
+    <string name="menu_remove_account">"删除帐户"</string>
+    <string name="sign_in">"登录"</string>
+    <string name="menu_sign_out">"登出"</string>
+    <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="add_account">"添加 <xliff:g id="ACCOUNT">%1$s</xliff:g> 帐户"</string>
+    <string name="menu_view_contact_list">"联系人列表"</string>
+    <string name="signing_in_wait">"正在登录..."</string>
+</resources>
diff --git a/res/values-zh-rTW/strings.xml b/res/values-zh-rTW/strings.xml
new file mode 100644
index 0000000..713fc19
--- /dev/null
+++ b/res/values-zh-rTW/strings.xml
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Copyright (C) 2009 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+<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">"讀取即時訊息"</string>
+    <string name="ro_perm_desc">"允許應用程式讀取來自即時訊息內容提供者的資料。"</string>
+    <string name="wo_perm_label">"撰寫即時訊息"</string>
+    <string name="wo_perm_desc">"允許應用程式將資料寫入即時訊息內容提供者。"</string>
+    <string name="im_label">"即時訊息"</string>
+    <string name="landing_page_title">"即時通訊 - 選取帳戶"</string>
+    <string name="menu_add_account">"新增帳戶"</string>
+    <string name="menu_edit_account">"編輯帳戶"</string>
+    <string name="menu_remove_account">"移除帳戶"</string>
+    <string name="sign_in">"登入"</string>
+    <string name="menu_sign_out">"登出"</string>
+    <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="add_account">"新增 <xliff:g id="ACCOUNT">%1$s</xliff:g> 帳戶"</string>
+    <string name="menu_view_contact_list">"通訊錄"</string>
+    <string name="signing_in_wait">"登入中…"</string>
+</resources>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index c2b75a1..2519476 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -53,10 +53,8 @@
     <!-- These strings displayed on the landing page. -->
     <!-- The title of the landing page.-->
     <string name="choose_account_title">Chat - Select an account</string>
-    <!-- Displays if there is only one ongoing chat on the landing page.-->
-    <string name="one_conversation">1 chat</string>
     <!-- Displays the number of ongoing chats on the landing page.-->
-    <string name="conversations"><xliff:g id="count">%1$d</xliff:g> chats</string>
+    <string name="conversations">(%1$d)</string>
     <!-- The add account label on the landing page if there isn't any account.-->
     <string name="add_account">Add <xliff:g id="account">%1$s</xliff:g> account</string>
     
diff --git a/src/com/android/providers/im/ProviderListItem.java b/src/com/android/providers/im/ProviderListItem.java
index 958e067..69c0d0d 100644
--- a/src/com/android/providers/im/ProviderListItem.java
+++ b/src/com/android/providers/im/ProviderListItem.java
@@ -42,7 +42,6 @@ public class ProviderListItem extends LinearLayout {
     private TextView mChatView;
     private View mUnderBubble;
     private Drawable mBubbleDrawable, mDefaultBackground;
-    private View mLoginNameSection;
     
     private int mProviderIdColumn;
     private int mProviderFullnameColumn;
@@ -63,7 +62,6 @@ public class ProviderListItem extends LinearLayout {
         mLoginName = (TextView) findViewById(R.id.loginName);
         mChatView = (TextView) findViewById(R.id.conversations);
         mUnderBubble = (View) findViewById(R.id.underBubble);
-        mLoginNameSection = (View) findViewById(R.id.loginNameSection);
         mBubbleDrawable = getResources().getDrawable(R.drawable.bubble);
         mDefaultBackground = getResources().getDrawable(R.drawable.default_background);
         
@@ -95,21 +93,23 @@ public class ProviderListItem extends LinearLayout {
                 brandingRes.getDrawable(BrandingResourceIDs.DRAWABLE_LOGO));
 
         mUnderBubble.setBackgroundDrawable(mDefaultBackground);
+        statusIcon.setVisibility(View.GONE);
+
         if (!cursor.isNull(mActiveAccountIdColumn)) {
-            mLoginNameSection.setVisibility(View.VISIBLE);
+            mLoginName.setVisibility(View.VISIBLE);
             providerName.setVisibility(View.VISIBLE);
             providerName.setText(providerDisplayName);
-            loginName.setText(cursor.getString(mActiveAccountUserNameColumn));
 
             long accountId = cursor.getLong(mActiveAccountIdColumn);
-
             int connectionStatus = cursor.getInt(mAccountConnectionStatusColumn);
 
+            String secondRowText;
+
+            chatView.setVisibility(View.GONE);
+
             switch (connectionStatus) {
                 case Im.ConnectionStatus.CONNECTING:
-                    statusIcon.setVisibility(View.GONE);
-                    chatView.setVisibility(View.VISIBLE);
-                    chatView.setText(R.string.signing_in_wait);
+                    secondRowText = r.getString(R.string.signing_in_wait);
                     break;
 
                 case Im.ConnectionStatus.ONLINE:
@@ -118,28 +118,27 @@ public class ProviderListItem extends LinearLayout {
                             brandingRes.getDrawable(presenceIconId));
                     statusIcon.setVisibility(View.VISIBLE);
                     ContentResolver cr = mActivity.getContentResolver();
+                    
                     int count = getConversationCount(cr, accountId);
                     if (count > 0) {
-                        chatView.setVisibility(View.VISIBLE);
-                        if (count == 1) {
-                            chatView.setText(R.string.one_conversation);
-                        } else {
-                            chatView.setText(r.getString(R.string.conversations, count));
-                        }
                         mUnderBubble.setBackgroundDrawable(mBubbleDrawable);
-                    } else {
-                        chatView.setVisibility(View.GONE);
+                        chatView.setVisibility(View.VISIBLE);
+                        chatView.setText(r.getString(R.string.conversations, count));
                     }
+                    
+                    secondRowText = cursor.getString(mActiveAccountUserNameColumn);
                     break;
 
                 default:
-                    statusIcon.setVisibility(View.GONE);
-                    chatView.setVisibility(View.GONE);
+                    secondRowText = cursor.getString(mActiveAccountUserNameColumn);
                     break;
             }
+
+            loginName.setText(secondRowText);
+
         } else {
             // No active account, show add account
-            mLoginNameSection.setVisibility(View.GONE);
+            mLoginName.setVisibility(View.GONE);
 
             mProviderName.setText(providerDisplayName);
         }