From d27d69a311bf43856dcc833c2eeaffdbd6872f50 Mon Sep 17 00:00:00 2001
From: Eric Fischer <enf@google.com>
Date: Mon, 30 Nov 2009 11:37:28 -0800
Subject: [PATCH] Import revised translations.  DO NOT MERGE

---
 res/values-cs/strings.xml     | 18 +++++++++---------
 res/values-es/strings.xml     |  4 ++--
 res/values-ko/strings.xml     |  6 +++---
 res/values-pl/strings.xml     |  6 +++---
 res/values-ru/strings.xml     |  2 +-
 res/values-zh-rCN/strings.xml | 10 +++++-----
 6 files changed, 23 insertions(+), 23 deletions(-)

diff --git a/res/values-cs/strings.xml b/res/values-cs/strings.xml
index 7d5e716..2586987 100644
--- a/res/values-cs/strings.xml
+++ b/res/values-cs/strings.xml
@@ -94,10 +94,10 @@
     <string name="chat_with" msgid="8562954189958846831">"Chat s uživatelem <xliff:g id="USER">%1$s</xliff:g>"</string>
     <string name="me" msgid="8421609599685404593">"Já"</string>
     <string name="compose_hint" msgid="1735533889811320962">"Sem zadejte zprávu"</string>
-    <string name="contact_online" msgid="4241843267436748586">"uživatel <xliff:g id="USER">%1$s</xliff:g> je online"</string>
+    <string name="contact_online" msgid="4241843267436748586">"<xliff:g id="USER">%1$s</xliff:g> je online"</string>
     <string name="contact_away" msgid="2333627320542883164">"uživatel <xliff:g id="USER">%1$s</xliff:g> je pryč"</string>
     <string name="contact_busy" msgid="9175172991334146704">"<xliff:g id="USER">%1$s</xliff:g> je zaneprázdněn"</string>
-    <string name="contact_offline" msgid="7054903259540426223">"uživatel <xliff:g id="USER">%1$s</xliff:g> je offline"</string>
+    <string name="contact_offline" msgid="7054903259540426223">"<xliff:g id="USER">%1$s</xliff:g> je offline"</string>
     <string name="contact_joined" msgid="6713312815095658394">"Uživatel <xliff:g id="USER">%1$s</xliff:g> se připojil"</string>
     <string name="contact_left" msgid="3020686291216941829">"uživatel <xliff:g id="USER">%1$s</xliff:g> odešel"</string>
     <string name="time_stamp" format="date" msgid="8952691401963972802">"'Odesláno v '<xliff:g id="HOUR">hh</xliff:g>':'<xliff:g id="MINUTE">mm</xliff:g>' '<xliff:g id="AMPM">a</xliff:g>' dne '<xliff:g id="DATE">EEEE</xliff:g>"</string>
@@ -176,21 +176,21 @@
     <string name="general_error" msgid="2784900425265121080">"Kód chyby: <xliff:g id="CODE">%1$d</xliff:g>"</string>
   <string-array name="default_smiley_names">
     <item msgid="1496436377093882868">"Happy"</item>
-    <item msgid="4535010061202018372">"Smutný"</item>
-    <item msgid="9126439186030536335">"Mrkající"</item>
+    <item msgid="4535010061202018372">"Ach jo"</item>
+    <item msgid="9126439186030536335">"Mrknutí"</item>
     <item msgid="850866187116359823">"Vypláznutý jazyk"</item>
     <item msgid="394905071090547502">"Překvapený"</item>
     <item msgid="154223719974718360">"Pusa"</item>
-    <item msgid="7922997411177141520">"Hej!"</item>
+    <item msgid="7922997411177141520">"Zlobím se!"</item>
     <item msgid="2507841103887006866">"Cool"</item>
     <item msgid="7305800612774038776">"Cinkání zlaťáků"</item>
-    <item msgid="8019801991256267534">"Šlápota v úsměvu"</item>
+    <item msgid="8019801991256267534">"Trapas!"</item>
     <item msgid="6054214980935551183">"V rozpacích"</item>
     <item msgid="6425740366789820735">"Andílek"</item>
     <item msgid="6790879686860830930">"Nerozhodný"</item>
-    <item msgid="8487432187298106600">"Rozplakaný"</item>
+    <item msgid="8487432187298106600">"Bůůů, fňuk, fňuk"</item>
     <item msgid="1697327406585784541">"Ani muk"</item>
-    <item msgid="4623875498872672218">"Smějící se"</item>
-    <item msgid="6044435333460205962">"Zmatený"</item>
+    <item msgid="4623875498872672218">"Smích"</item>
+    <item msgid="6044435333460205962">"Zmatek"</item>
   </string-array>
 </resources>
diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml
index 98c2e2e..4d5d0e8 100644
--- a/res/values-es/strings.xml
+++ b/res/values-es/strings.xml
@@ -97,14 +97,14 @@
     <string name="contact_online" msgid="4241843267436748586">"<xliff:g id="USER">%1$s</xliff:g> está conectado"</string>
     <string name="contact_away" msgid="2333627320542883164">"<xliff:g id="USER">%1$s</xliff:g> está ausente"</string>
     <string name="contact_busy" msgid="9175172991334146704">"<xliff:g id="USER">%1$s</xliff:g> está ocupado"</string>
-    <string name="contact_offline" msgid="7054903259540426223">"<xliff:g id="USER">%1$s</xliff:g> está desconectado"</string>
+    <string name="contact_offline" msgid="7054903259540426223">"<xliff:g id="USER">%1$s</xliff:g> está desconectado/a"</string>
     <string name="contact_joined" msgid="6713312815095658394">"<xliff:g id="USER">%1$s</xliff:g> se ha unido al chat"</string>
     <string name="contact_left" msgid="3020686291216941829">"<xliff:g id="USER">%1$s</xliff:g> se ha desconectado"</string>
     <string name="time_stamp" format="date" msgid="8952691401963972802">"'Enviado a las '<xliff:g id="HOUR">hh</xliff:g>':'<xliff:g id="MINUTE">mm</xliff:g>' '<xliff:g id="AMPM">a</xliff:g>' el '<xliff:g id="DATE">EEEE</xliff:g>"</string>
     <string name="send" msgid="2726588254020771734">"Enviar"</string>
     <string name="msg_sent_failed" msgid="4209970218075996979">"No se ha podido enviar el mensaje."</string>
     <string name="disconnected_warning" msgid="6798248948843269795">"Se ha perdido la conexión con el servidor. Los mensajes se enviarán cuando se restablezca la conexión."</string>
-    <string name="contact_offline_warning" msgid="8822964251595561504">"<xliff:g id="USER_0">%1$s</xliff:g> está desconectado. Los mensajes enviados se entregarán cuando <xliff:g id="USER_1">%1$s</xliff:g> vuelva a conectarse."</string>
+    <string name="contact_offline_warning" msgid="8822964251595561504">"<xliff:g id="USER_0">%1$s</xliff:g> está desconectado/a. Los mensajes enviados se entregarán cuando <xliff:g id="USER_1">%1$s</xliff:g> vuelva a conectarse."</string>
     <string name="contact_not_in_list_warning" msgid="2411313232707156524">"<xliff:g id="USER">%1$s</xliff:g> no figura en tu lista de contactos."</string>
     <string name="select_link_title" msgid="5020179468567358399">"Seleccionar enlace"</string>
     <string name="empty_chat_list" msgid="7268903855432844937">"No hay ningún chat activo."</string>
diff --git a/res/values-ko/strings.xml b/res/values-ko/strings.xml
index cf98293..84add88 100644
--- a/res/values-ko/strings.xml
+++ b/res/values-ko/strings.xml
@@ -117,11 +117,11 @@
     <string name="hide_offline_contacts" msgid="8017909244732772990">"오프라인 주소록 숨기기"</string>
     <string name="notification_group_title" msgid="4944275706770811080">"알림 설정"</string>
     <string name="notification_enabled_title" msgid="6447889693376465773">"메신저 알림"</string>
-    <string name="notification_enabled_summary" msgid="2090889893066171466">"메신저가 오면 상태 표시줄에 알림"</string>
+    <string name="notification_enabled_summary" msgid="2090889893066171466">"메시지가 오면 상태 표시줄에 알림"</string>
     <string name="notification_vibrate_title" msgid="5603532186091800924">"진동"</string>
-    <string name="notification_vibrate_summary" msgid="1875275321875946598">"메신저가 오면 진동"</string>
+    <string name="notification_vibrate_summary" msgid="1875275321875946598">"메시지가 오면 진동"</string>
     <string name="notification_sound_title" msgid="8367990268592958299">"사운드"</string>
-    <string name="notification_sound_summary" msgid="3634976543811200858">"메신저가 오면 벨소리 재생"</string>
+    <string name="notification_sound_summary" msgid="3634976543811200858">"메시지가 오면 벨소리 재생"</string>
     <string name="notification_ringtone_title" msgid="4847700898968990954">"벨소리 선택"</string>
     <string name="invitation_prompt" msgid="1776461436395016582">"<xliff:g id="USER">%1$s</xliff:g>님이 그룹 채팅에 초대하셨습니다."</string>
     <string name="invitation_sent_prompt" msgid="2542342110609014148">"<xliff:g id="USER">%1$s</xliff:g>님에게 초대장을 보냈습니다."</string>
diff --git a/res/values-pl/strings.xml b/res/values-pl/strings.xml
index 0da89a3..be70cc8 100644
--- a/res/values-pl/strings.xml
+++ b/res/values-pl/strings.xml
@@ -62,7 +62,7 @@
     <string name="keep_me_signed_in" msgid="2883914867912933061">"Zaloguj mnie automatycznie."</string>
     <string name="sign_up" msgid="7071654280992136839">"Nie masz konta?"</string>
     <string name="check_auto_sign_in" msgid="308461891031463647">"Ta opcja powoduje automatyczne logowanie użytkownika przy każdym uruchomieniu tej aplikacji. Aby wyłączyć tę opcję, wyloguj się, a następnie usuń zaznaczenie pola wyboru „Zaloguj automatycznie”."</string>
-    <string name="sign_in" msgid="6204326200860136567">"Zaloguj"</string>
+    <string name="sign_in" msgid="6204326200860136567">"Zaloguj się"</string>
     <string name="signing_in_to" msgid="2689649632858697221">"Logowanie do konta <xliff:g id="ACCOUNT">%1$s</xliff:g>"</string>
     <string name="signing_in_wait" msgid="987357161364666888">"Trwa logowanie…"</string>
     <string name="bg_data_prompt_title" msgid="4861800723853178111">"Dane w tle są wyłączone"</string>
@@ -185,12 +185,12 @@
     <item msgid="2507841103887006866">"Na luzie"</item>
     <item msgid="7305800612774038776">"Pazerny"</item>
     <item msgid="8019801991256267534">"Nietaktowny"</item>
-    <item msgid="6054214980935551183">"Zakłopotanie"</item>
+    <item msgid="6054214980935551183">"Zawstydzony"</item>
     <item msgid="6425740366789820735">"Anioł"</item>
     <item msgid="6790879686860830930">"Niezdecydowany"</item>
     <item msgid="8487432187298106600">"Płacze"</item>
     <item msgid="1697327406585784541">"Milczy jak grób"</item>
     <item msgid="4623875498872672218">"Śmieje się"</item>
-    <item msgid="6044435333460205962">"Zakłopotanie"</item>
+    <item msgid="6044435333460205962">"Zakłopotany"</item>
   </string-array>
 </resources>
diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml
index c243a82..3f96274 100644
--- a/res/values-ru/strings.xml
+++ b/res/values-ru/strings.xml
@@ -117,7 +117,7 @@
     <string name="hide_offline_contacts" msgid="8017909244732772990">"Скрыть контакты, отсутствующие в сети"</string>
     <string name="notification_group_title" msgid="4944275706770811080">"Настройки уведомлений"</string>
     <string name="notification_enabled_title" msgid="6447889693376465773">"Уведомления чата"</string>
-    <string name="notification_enabled_summary" msgid="2090889893066171466">"Уведомлять о получении сообщения чата в строке состояния"</string>
+    <string name="notification_enabled_summary" msgid="2090889893066171466">"Показывать уведомления в строке состояния при получении новых соообщений"</string>
     <string name="notification_vibrate_title" msgid="5603532186091800924">"Вибрация"</string>
     <string name="notification_vibrate_summary" msgid="1875275321875946598">"Сигнал вибрации при получении сообщения чата"</string>
     <string name="notification_sound_title" msgid="8367990268592958299">"Звуковой сигнал"</string>
diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml
index ef7ae12..b095d80 100644
--- a/res/values-zh-rCN/strings.xml
+++ b/res/values-zh-rCN/strings.xml
@@ -41,7 +41,7 @@
     <string name="menu_view_contact_list" msgid="4630377976475003130">"联系人列表"</string>
     <string name="menu_invite_contact" msgid="4669830812552484236">"邀请..."</string>
     <string name="menu_switch_chats" msgid="5113455126377025717">"切换聊天"</string>
-    <string name="menu_insert_smiley" msgid="2555290958985391105">"插入表情符"</string>
+    <string name="menu_insert_smiley" msgid="2555290958985391105">"插入表情符号"</string>
     <string name="menu_plus" msgid="5000617247235760106">"MENU+"</string>
     <string name="default_input_title" msgid="6182729628894599563">"输入"</string>
     <string name="confirm" msgid="3229086014444547636">"确认"</string>
@@ -175,13 +175,13 @@
     <string name="not_signed_in" msgid="8894662143178849906">"您当前未登录。"</string>
     <string name="general_error" msgid="2784900425265121080">"错误代码 <xliff:g id="CODE">%1$d</xliff:g>"</string>
   <string-array name="default_smiley_names">
-    <item msgid="1496436377093882868">"幸福"</item>
-    <item msgid="4535010061202018372">"悲伤"</item>
+    <item msgid="1496436377093882868">"开心"</item>
+    <item msgid="4535010061202018372">"忧伤"</item>
     <item msgid="9126439186030536335">"眨眼"</item>
-    <item msgid="850866187116359823">"吐舌头"</item>
+    <item msgid="850866187116359823">"吐舌"</item>
     <item msgid="394905071090547502">"惊讶"</item>
     <item msgid="154223719974718360">"亲吻"</item>
-    <item msgid="7922997411177141520">"大喊"</item>
+    <item msgid="7922997411177141520">"叫喊"</item>
     <item msgid="2507841103887006866">"酷"</item>
     <item msgid="7305800612774038776">"财迷"</item>
     <item msgid="8019801991256267534">"说错了话"</item>
-- 
2.11.0