Bye, bye Talk. Welcome Hangouts (2/2)

Patch Set 2:  Add Simplified Chinese translation
              Fix "application" in default

Change-Id: I2da62bbb24342ce614e06a0959066c2b35463b43

21 files changed, 23 insertions, 23 deletions

diff --git a/res/values-af/cm_strings.xml b/res/values-af/cm_strings.xml
index 2028d8f04..5b4e01e3a 100644
--- a/res/values-af/cm_strings.xml
+++ b/res/values-af/cm_strings.xml
@@ -254,7 +254,7 @@
     <string name="icon_picker_gallery">Gallery</string>
     <string name="icon_picker_google_small">Google (klein)</string>
     <string name="icon_picker_googleplus">Google Plus</string>
-    <string name="icon_picker_googletalk">Google Talk</string>
+    <string name="icon_picker_googletalk">Hangouts</string>
     <string name="icon_picker_maps">Kaarte</string>
     <string name="icon_picker_movie">Flieks</string>
     <string name="icon_picker_music">Musiek</string>
diff --git a/res/values-da/cm_strings.xml b/res/values-da/cm_strings.xml
index 6e29c9298..29535d666 100644
--- a/res/values-da/cm_strings.xml
+++ b/res/values-da/cm_strings.xml
@@ -270,7 +270,7 @@
     <string name="icon_picker_gallery">Galleri</string>
     <string name="icon_picker_google_small">Google (lille)</string>
     <string name="icon_picker_googleplus">Google Plus</string>
-    <string name="icon_picker_googletalk">Google Talk</string>
+    <string name="icon_picker_googletalk">Hangouts</string>
     <string name="icon_picker_maps">Kort</string>
     <string name="icon_picker_movie">Film</string>
     <string name="icon_picker_music">Musik</string>
diff --git a/res/values-de/cm_strings.xml b/res/values-de/cm_strings.xml
index 5245ba152..3c9341238 100644
--- a/res/values-de/cm_strings.xml
+++ b/res/values-de/cm_strings.xml
@@ -249,7 +249,7 @@
     <string name="icon_picker_gallery">Galerie</string>
     <string name="icon_picker_google_small">Google (klein)</string>
     <string name="icon_picker_googleplus">Google+</string>
-    <string name="icon_picker_googletalk">Google Talk</string>
+    <string name="icon_picker_googletalk">Hangouts</string>
     <string name="icon_picker_maps">Maps</string>
     <string name="icon_picker_movie">Film</string>
     <string name="icon_picker_music">Musik</string>
diff --git a/res/values-el/cm_strings.xml b/res/values-el/cm_strings.xml
index c8ee7ffe3..82a50b5b5 100644
--- a/res/values-el/cm_strings.xml
+++ b/res/values-el/cm_strings.xml
@@ -273,7 +273,7 @@
     <string name="icon_picker_gallery">Συλλογή</string>
     <string name="icon_picker_google_small">Google (μικρό)</string>
     <string name="icon_picker_googleplus">Google Plus</string>
-    <string name="icon_picker_googletalk">Google Talk</string>
+    <string name="icon_picker_googletalk">Hangouts</string>
     <string name="icon_picker_maps">Χάρτες</string>
     <string name="icon_picker_movie">Ταινίες</string>
     <string name="icon_picker_music">Μουσική</string>
diff --git a/res/values-es/cm_strings.xml b/res/values-es/cm_strings.xml
index d93e63236..1bd02882f 100644
--- a/res/values-es/cm_strings.xml
+++ b/res/values-es/cm_strings.xml
@@ -265,7 +265,7 @@
     <string name="icon_picker_gallery">Galería</string>
     <string name="icon_picker_google_small">Google (pequeño)</string>
     <string name="icon_picker_googleplus">Google+</string>
-    <string name="icon_picker_googletalk">Google Talk</string>
+    <string name="icon_picker_googletalk">Hangouts</string>
     <string name="icon_picker_maps">Mapas</string>
     <string name="icon_picker_movie">Películas</string>
     <string name="icon_picker_music">Música</string>
diff --git a/res/values-fi/cm_strings.xml b/res/values-fi/cm_strings.xml
index fec9c9cef..21e4e681a 100644
--- a/res/values-fi/cm_strings.xml
+++ b/res/values-fi/cm_strings.xml
@@ -223,7 +223,7 @@
     <string name="icon_picker_gallery">Galleria</string>
     <string name="icon_picker_google_small">Google (pieni)</string>
     <string name="icon_picker_googleplus">Google+</string>
-    <string name="icon_picker_googletalk">Google Talk</string>
+    <string name="icon_picker_googletalk">Hangouts</string>
     <string name="icon_picker_maps">Maps</string>
     <string name="icon_picker_movie">Elokuva</string>
     <string name="icon_picker_music">Musiikki</string>
diff --git a/res/values-fr/cm_strings.xml b/res/values-fr/cm_strings.xml
index cb631ba13..6369abace 100644
--- a/res/values-fr/cm_strings.xml
+++ b/res/values-fr/cm_strings.xml
@@ -270,7 +270,7 @@
     <string name="icon_picker_gallery">Galerie</string>
     <string name="icon_picker_google_small">Google (petit)</string>
     <string name="icon_picker_googleplus">Google Plus</string>
-    <string name="icon_picker_googletalk">Google Talk</string>
+    <string name="icon_picker_googletalk">Hangouts</string>
     <string name="icon_picker_maps">Google Maps</string>
     <string name="icon_picker_movie">Vidéos</string>
     <string name="icon_picker_music">Musique</string>
diff --git a/res/values-hu/cm_strings.xml b/res/values-hu/cm_strings.xml
index 92cc45bff..a8bb61f32 100644
--- a/res/values-hu/cm_strings.xml
+++ b/res/values-hu/cm_strings.xml
@@ -263,7 +263,7 @@
     <string name="icon_picker_gallery">Galéria</string>
     <string name="icon_picker_google_small">Google (kicsi)</string>
     <string name="icon_picker_googleplus">Google+</string>
-    <string name="icon_picker_googletalk">Google Csevegő</string>
+    <string name="icon_picker_googletalk">Hangouts</string>
     <string name="icon_picker_maps">Térkép</string>
     <string name="icon_picker_movie">Film</string>
     <string name="icon_picker_music">Zene</string>
diff --git a/res/values-it/cm_strings.xml b/res/values-it/cm_strings.xml
index c87357547..6fd39fc8b 100644
--- a/res/values-it/cm_strings.xml
+++ b/res/values-it/cm_strings.xml
@@ -266,7 +266,7 @@
     <string name="icon_picker_gallery">Galleria</string>
     <string name="icon_picker_google_small">Google (Piccolo)</string>
     <string name="icon_picker_googleplus">Google+</string>
-    <string name="icon_picker_googletalk">Google Talk</string>
+    <string name="icon_picker_googletalk">Hangouts</string>
     <string name="icon_picker_maps">Mappe</string>
     <string name="icon_picker_movie">Video</string>
     <string name="icon_picker_music">Musica</string>
diff --git a/res/values-iw/cm_strings.xml b/res/values-iw/cm_strings.xml
index 077159d8a..59ff82395 100644
--- a/res/values-iw/cm_strings.xml
+++ b/res/values-iw/cm_strings.xml
@@ -243,7 +243,7 @@
     <string name="icon_picker_gallery">גלריה</string>
     <string name="icon_picker_google_small">Google (קטן)</string>
     <string name="icon_picker_googleplus">Google Plus</string>
-    <string name="icon_picker_googletalk">Google Talk</string>
+    <string name="icon_picker_googletalk">Hangouts</string>
     <string name="icon_picker_maps">מפות</string>
     <string name="icon_picker_movie">סרט</string>
     <string name="icon_picker_music">מוסיקה</string>
diff --git a/res/values-ja/cm_strings.xml b/res/values-ja/cm_strings.xml
index 880900366..316743f57 100644
--- a/res/values-ja/cm_strings.xml
+++ b/res/values-ja/cm_strings.xml
@@ -52,7 +52,7 @@
     <string name="icon_picker_facebook">Facebook</string>
     <string name="icon_picker_gallery">ギャラリー</string>
     <string name="icon_picker_googleplus">Googleプラス</string>
-    <string name="icon_picker_googletalk">Googleトーク</string>
+    <string name="icon_picker_googletalk">Hangouts</string>
     <string name="icon_picker_maps">地図</string>
     <string name="icon_picker_movie">動画</string>
     <string name="icon_picker_music">音楽</string>
diff --git a/res/values-ko/cm_strings.xml b/res/values-ko/cm_strings.xml
index fd5e34425..e25c0b743 100644
--- a/res/values-ko/cm_strings.xml
+++ b/res/values-ko/cm_strings.xml
@@ -213,7 +213,7 @@
     <string name="icon_picker_gallery">갤러리</string>
     <string name="icon_picker_google_small">Google (소형)</string>
     <string name="icon_picker_googleplus">Google Plus</string>
-    <string name="icon_picker_googletalk">Google 토크</string>
+    <string name="icon_picker_googletalk">Hangouts</string>
     <string name="icon_picker_maps">지도</string>
     <string name="icon_picker_movie">영화</string>
     <string name="icon_picker_music">음악</string>
diff --git a/res/values-lt/cm_strings.xml b/res/values-lt/cm_strings.xml
index adc160968..e682992b8 100644
--- a/res/values-lt/cm_strings.xml
+++ b/res/values-lt/cm_strings.xml
@@ -243,7 +243,7 @@
     <string name="icon_picker_gallery">Galerija</string>
     <string name="icon_picker_google_small">Google (mažas)</string>
     <string name="icon_picker_googleplus">Google Plius</string>
-    <string name="icon_picker_googletalk">Google Pokalbiai</string>
+    <string name="icon_picker_googletalk">Hangouts</string>
     <string name="icon_picker_maps">Žemėlapiai</string>
     <string name="icon_picker_movie">Filmai</string>
     <string name="icon_picker_music">Muzika</string>
diff --git a/res/values-nb/cm_strings.xml b/res/values-nb/cm_strings.xml
index 5ea53eadb..9c833fffd 100644
--- a/res/values-nb/cm_strings.xml
+++ b/res/values-nb/cm_strings.xml
@@ -271,7 +271,7 @@
     <string name="icon_picker_gallery">Galleri</string>
     <string name="icon_picker_google_small">Google (liten)</string>
     <string name="icon_picker_googleplus">Google+</string>
-    <string name="icon_picker_googletalk">Google Talk</string>
+    <string name="icon_picker_googletalk">Hangouts</string>
     <string name="icon_picker_maps">Maps</string>
     <string name="icon_picker_movie">Film</string>
     <string name="icon_picker_music">Musikk</string>
diff --git a/res/values-nl/cm_strings.xml b/res/values-nl/cm_strings.xml
index 23a035c00..d26f16923 100644
--- a/res/values-nl/cm_strings.xml
+++ b/res/values-nl/cm_strings.xml
@@ -247,7 +247,7 @@
     <string name="icon_picker_gallery">Galerij</string>
     <string name="icon_picker_google_small">Google (klein)</string>
     <string name="icon_picker_googleplus">Google+</string>
-    <string name="icon_picker_googletalk">Talk</string>
+    <string name="icon_picker_googletalk">Hangouts</string>
     <string name="icon_picker_maps">Maps</string>
     <string name="icon_picker_movie">Play Movies &amp; TV</string>
     <string name="icon_picker_music">Play Music</string>
diff --git a/res/values-pl/cm_strings.xml b/res/values-pl/cm_strings.xml
index 51fdbb2a2..0e29b483e 100644
--- a/res/values-pl/cm_strings.xml
+++ b/res/values-pl/cm_strings.xml
@@ -245,7 +245,7 @@
     <string name="icon_picker_gallery">Galeria</string>
     <string name="icon_picker_google_small">Google (małe)</string>
     <string name="icon_picker_googleplus">Google Plus</string>
-    <string name="icon_picker_googletalk">Google Talk</string>
+    <string name="icon_picker_googletalk">Hangouts</string>
     <string name="icon_picker_maps">Mapy</string>
     <string name="icon_picker_movie">Film</string>
     <string name="icon_picker_music">Muzyka</string>
diff --git a/res/values-pt/cm_strings.xml b/res/values-pt/cm_strings.xml
index d267f5968..05b1bf667 100644
--- a/res/values-pt/cm_strings.xml
+++ b/res/values-pt/cm_strings.xml
@@ -255,7 +255,7 @@
     <string name="icon_picker_gallery">Galeria</string>
     <string name="icon_picker_google_small">Google (pequeno)</string>
     <string name="icon_picker_googleplus">Google Plus</string>
-    <string name="icon_picker_googletalk">Google Talk</string>
+    <string name="icon_picker_googletalk">Hangouts</string>
     <string name="icon_picker_maps">Mapas</string>
     <string name="icon_picker_movie">Filme</string>
     <string name="icon_picker_music">Música</string>
@@ -685,4 +685,4 @@ controle adicionais. \'Remover\' apaga a linha selecionada.
     </string>
     <string name="volume_keys_control_ring_stream">Botões de volume controlam o volume do toque</string>
     <string name="icon_picker_contacts">Contatos</string>
-</resources>
\ No newline at end of file
+</resources>
diff --git a/res/values-ro/cm_strings.xml b/res/values-ro/cm_strings.xml
index e64d750f2..3f827f7aa 100644
--- a/res/values-ro/cm_strings.xml
+++ b/res/values-ro/cm_strings.xml
@@ -242,7 +242,7 @@
     <string name="icon_picker_gallery">"Galerie"</string>
     <string name="icon_picker_google_small">"Google (mic)"</string>
     <string name="icon_picker_googleplus">"Google Plus"</string>
-    <string name="icon_picker_googletalk">"Google Talk"</string>
+    <string name="icon_picker_googletalk">"Hangouts"</string>
     <string name="icon_picker_maps">"Hărţi"</string>
     <string name="icon_picker_movie">"Film"</string>
     <string name="icon_picker_music">"Muzică"</string>
diff --git a/res/values-tr/cm_strings.xml b/res/values-tr/cm_strings.xml
index 06e25aa50..2c30ee02d 100644
--- a/res/values-tr/cm_strings.xml
+++ b/res/values-tr/cm_strings.xml
@@ -270,7 +270,7 @@
     <string name="icon_picker_gallery">Galeri</string>
     <string name="icon_picker_google_small">Google (küçük)</string>
     <string name="icon_picker_googleplus">Google Plus</string>
-    <string name="icon_picker_googletalk">Google Talk</string>
+    <string name="icon_picker_googletalk">Hangouts</string>
     <string name="icon_picker_maps">Haritalar</string>
     <string name="icon_picker_movie">Film</string>
     <string name="icon_picker_music">Müzik</string>
diff --git a/res/values-zh-rCN/cm_strings.xml b/res/values-zh-rCN/cm_strings.xml
index de0741172..a9e720cb3 100644
--- a/res/values-zh-rCN/cm_strings.xml
+++ b/res/values-zh-rCN/cm_strings.xml
@@ -270,7 +270,7 @@
     <string name="icon_picker_gallery">图库</string>
     <string name="icon_picker_google_small">Google (小)</string>
     <string name="icon_picker_googleplus">Google Plus</string>
-    <string name="icon_picker_googletalk">Google Talk</string>
+    <string name="icon_picker_googletalk">环聊</string>
     <string name="icon_picker_maps">地图</string>
     <string name="icon_picker_movie">影片</string>
     <string name="icon_picker_music">音乐</string>
diff --git a/res/values/cm_strings.xml b/res/values/cm_strings.xml
index 787083f75..c377490cb 100644
--- a/res/values/cm_strings.xml
+++ b/res/values/cm_strings.xml
@@ -395,7 +395,7 @@
 
     <!-- Lock screen shortcuts -->
     <string name="picker_activities">Activities</string>
-    <string name="select_custom_app_title">Select custom application</string>
+    <string name="select_custom_app_title">Select custom app</string>
     <string name="select_custom_activity_title">Select custom activity</string>
     <string name="icon_picker_choose_icon_title">Choose icon</string>
     <string name="icon_picker_alarm">Alarm</string>
@@ -410,7 +410,7 @@
     <string name="icon_picker_gallery">Gallery</string>
     <string name="icon_picker_google_small">Google (small)</string>
     <string name="icon_picker_googleplus">Google Plus</string>
-    <string name="icon_picker_googletalk">Google Talk</string>
+    <string name="icon_picker_googletalk">Hangouts</string>
     <string name="icon_picker_maps">Maps</string>
     <string name="icon_picker_movie">Movie</string>
     <string name="icon_picker_music">Music</string>