Android-x86
Fork
Donation

  • R/O
  • HTTP
  • SSH
  • HTTPS

packages-apps-IM: Commit

packages/apps/IM


Commit MetaInfo

Revision309973bfee8cf5e05002ae4facf65e49a3821120 (tree)
Time2009-07-26 09:48:03
AuthorJean-Baptiste Queru <jbq@goog...>
CommiterJean-Baptiste Queru

Log Message

Merge korg/donut into korg/master

Change Summary

Incremental Difference

--- a/libwbxml/Android.mk
+++ b/libwbxml/Android.mk
@@ -85,7 +85,7 @@ LOCAL_SHARED_LIBRARIES += \
8585 libutils \
8686 libexpat
8787
88-LOCAL_MODULE_TAGS := tests
88+LOCAL_MODULE_TAGS := optional
8989
9090 LOCAL_MODULE := wbxmltest
9191
--- a/res/values-de/strings.xml
+++ b/res/values-de/strings.xml
@@ -20,7 +20,7 @@
2020 <string name="menu_add_contact">"Kontakt hinzufügen"</string>
2121 <string name="menu_remove_contact">"Kontakt löschen"</string>
2222 <string name="menu_block_contact">"Kontakt blockieren"</string>
23- <string name="menu_view_blocked">"Gesperrt"</string>
23+ <string name="menu_view_blocked">"Blockiert"</string>
2424 <string name="menu_view_accounts">"Liste der Konten"</string>
2525 <string name="menu_settings">"Einstellungen"</string>
2626 <string name="menu_start_chat">"Chat starten"</string>
@@ -35,7 +35,7 @@
3535 <string name="default_input_title">"Eingabe"</string>
3636 <string name="confirm">"Bestätigen"</string>
3737 <string name="confirm_delete_contact">"Kontakt \"<xliff:g id="USER">%1$s</xliff:g>\" wird gelöscht."</string>
38- <string name="confirm_block_contact">"Kontakt \"<xliff:g id="USER">%1$s</xliff:g>\" wird gesperrt."</string>
38+ <string name="confirm_block_contact">"Kontakt \"<xliff:g id="USER">%1$s</xliff:g>\" wird blockiert."</string>
3939 <string name="confirm_unblock_contact">"Blockierung des Kontakts \"<xliff:g id="USER">%1$s</xliff:g>\" wird aufgehoben."</string>
4040 <string name="ok">"OK"</string>
4141 <string name="cancel">"Abbrechen"</string>
@@ -66,8 +66,8 @@
6666 <string name="contacts_picker_title">"Kontakte für Einladung auswählen"</string>
6767 <string name="contact_filter_hint">"Gesuchten Kontakt eingeben"</string>
6868 <string name="empty_contact_list">"Keine Kontakte gefunden"</string>
69- <string name="blocked_list_title">"Gesperrte Kontakte - <xliff:g id="USER">%1$s</xliff:g>"</string>
70- <string name="no_blocked_contact">"Keine gesperrten Kontakte"</string>
69+ <string name="blocked_list_title">"Blockierte Kontakte - <xliff:g id="USER">%1$s</xliff:g>"</string>
70+ <string name="no_blocked_contact">"Keine blockierten Kontakte"</string>
7171 <string name="contact_profile_title">"Kontaktprofil"</string>
7272 <string name="label_status">"Status:"</string>
7373 <string name="label_client_type">"Clienttyp:"</string>
@@ -127,14 +127,14 @@
127127 <string name="group_chat_invite_notify_text">"Neue Einladung zum Gruppenchat von <xliff:g id="USER">%s</xliff:g>"</string>
128128 <string name="add_contact_success">"Kontakt \"<xliff:g id="USER">%1$s</xliff:g>\" hinzugefügt"</string>
129129 <string name="delete_contact_success">"Kontakt \"<xliff:g id="USER">%1$s</xliff:g>\" gelöscht"</string>
130- <string name="block_contact_success">"Kontakt \"<xliff:g id="USER">%1$s</xliff:g>\" gesperrt"</string>
130+ <string name="block_contact_success">"Kontakt \"<xliff:g id="USER">%1$s</xliff:g>\" blockiert"</string>
131131 <string name="unblock_contact_success">"Blockierung des Kontakts \"<xliff:g id="USER">%1$s</xliff:g>\" aufgehoben"</string>
132132 <string name="perm_label">"Chat-Service starten"</string>
133133 <string name="perm_desc">"Ermöglicht Anwendungen das eigenständige Starten von Chat-Services."</string>
134134 <string name="error">"Achtung"</string>
135135 <string name="login_service_failed">"Anmeldung beim <xliff:g id="SERVICE">%1$s</xliff:g>-Service nicht möglich. Bitte versuchen Sie es später erneut."\n"(Details: <xliff:g id="DESCRIPTION">%2$s</xliff:g>)"</string>
136136 <string name="add_list_failed">"Die Liste wurde nicht hinzugefügt."</string>
137- <string name="block_contact_failed">"Kontakt wurde nicht gesperrt."</string>
137+ <string name="block_contact_failed">"Kontakt wurde nicht blockiert."</string>
138138 <string name="unblock_contact_failed">"Blockierung des Kontakts wurde nicht aufgehoben."</string>
139139 <string name="select_contact">"Wählen Sie zunächst einen Kontakt aus."</string>
140140 <string name="disconnected">"Getrennt"\n</string>
@@ -142,7 +142,7 @@
142142 <string name="load_contact_list_failed">"Kontaktliste wurde nicht geladen."</string>
143143 <string name="cant_connect_to_server">"Verbindung zum Server kann nicht hergestellt werden. Überprüfen Sie die Verbindung."</string>
144144 <string name="contact_already_exist">"<xliff:g id="USER">%1$s</xliff:g> ist bereits in der Kontaktliste vorhanden."</string>
145- <string name="contact_blocked">"Kontakt \"<xliff:g id="USER">%1$s</xliff:g>\" wurde gesperrt."</string>
145+ <string name="contact_blocked">"Kontakt \"<xliff:g id="USER">%1$s</xliff:g>\" wurde blockiert."</string>
146146 <string name="contact_not_loaded">"Kontaktliste wird geladen, bitte warten."</string>
147147 <string name="network_error">"Ein Netzwerkfehler ist aufgetreten."</string>
148148 <string name="service_not_support">"Diese Funktion wird vom Server nicht unterstützt."</string>
@@ -155,7 +155,7 @@
155155 <string name="message_queue_full">"Die Nachrichtenwarteschlange ist voll."</string>
156156 <string name="domain_not_supported">"Das Weiterleiten an die Domäne wird vom Server nicht unterstützt."</string>
157157 <string name="unknown_user">"Der eingegebene Benutzername wird nicht erkannt."</string>
158- <string name="recipient_blocked_the_user">"Sie werden leider vom Benutzer gesperrt."</string>
158+ <string name="recipient_blocked_the_user">"Sie werden leider vom Benutzer blockiert."</string>
159159 <string name="session_expired">"Die Sitzung ist abgelaufen, bitte melden Sie sich erneut an."</string>
160160 <string name="forced_logout">"Sie haben sich von einem anderen Client aus angemeldet."</string>
161161 <string name="already_logged_in">"Sie haben sich bereits von einem anderen Client aus angemeldet."</string>
@@ -166,7 +166,7 @@
166166 <item>"Glücklich"</item>
167167 <item>"Traurig"</item>
168168 <item>"Zwinkern"</item>
169- <item>"Zunge rausstrecken"</item>
169+ <item>"Zunge herausstrecken"</item>
170170 <item>"Überrascht"</item>
171171 <item>"Kuss"</item>
172172 <item>"Schreien"</item>
--- /dev/null
+++ b/res/values-es-rUS/strings.xml
@@ -0,0 +1,184 @@
1+<?xml version="1.0" encoding="UTF-8"?>
2+<!-- Copyright (C) 2009 The Android Open Source Project
3+
4+ Licensed under the Apache License, Version 2.0 (the "License");
5+ you may not use this file except in compliance with the License.
6+ You may obtain a copy of the License at
7+
8+ http://www.apache.org/licenses/LICENSE-2.0
9+
10+ Unless required by applicable law or agreed to in writing, software
11+ distributed under the License is distributed on an "AS IS" BASIS,
12+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13+ See the License for the specific language governing permissions and
14+ limitations under the License.
15+-->
16+<resources xmlns:android="http://schemas.android.com/apk/res/android"
17+ xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
18+ <string name="im_label">"Mensajería instantánea"</string>
19+ <string name="menu_cancel_signin">"Cancelar inicio de sesión"</string>
20+ <string name="menu_add_contact">"Agregar contacto"</string>
21+ <string name="menu_remove_contact">"Eliminar contacto"</string>
22+ <string name="menu_block_contact">"Bloquear contacto"</string>
23+ <string name="menu_view_blocked">"Bloqueado"</string>
24+ <string name="menu_view_accounts">"Lista de cuentas"</string>
25+ <string name="menu_settings">"Configuración"</string>
26+ <string name="menu_start_chat">"Iniciar chat"</string>
27+ <string name="menu_sign_out">"Cerrar sesión"</string>
28+ <string name="menu_view_profile">"Ver perfil"</string>
29+ <string name="menu_end_conversation">"Finalizar chat"</string>
30+ <string name="menu_view_contact_list">"Lista de contactos"</string>
31+ <string name="menu_invite_contact">"Invitar a..."</string>
32+ <string name="menu_switch_chats">"Modificar chats"</string>
33+ <string name="menu_insert_smiley">"Insertar ícono gestual"</string>
34+ <string name="menu_plus">"Menú+"</string>
35+ <string name="default_input_title">"Entrada"</string>
36+ <string name="confirm">"Confirmar"</string>
37+ <string name="confirm_delete_contact">"El contacto \"<xliff:g id="USER">%1$s</xliff:g>\" se eliminará."</string>
38+ <string name="confirm_block_contact">"El contacto \"<xliff:g id="USER">%1$s</xliff:g>\" se bloqueará."</string>
39+ <string name="confirm_unblock_contact">"El contacto \"<xliff:g id="USER">%1$s</xliff:g>\" se desbloqueará."</string>
40+ <string name="ok">"Aceptar"</string>
41+ <string name="cancel">"Cancelar"</string>
42+ <string name="yes">"Aceptar"</string>
43+ <string name="no">"Cancelar"</string>
44+ <string name="signed_out_prompt">"Se ha cerrado la sesión de <xliff:g id="ACCOUNT">%1$s</xliff:g>."</string>
45+ <string name="signed_out_prompt_with_error">"Se ha cerrado la sesión de <xliff:g id="ACCOUNT">%1$s</xliff:g> porque <xliff:g id="REASON">%2$s</xliff:g>."</string>
46+ <string name="add_account">"Agregar cuenta <xliff:g id="ACCOUNT">%1$s</xliff:g>"</string>
47+ <string name="label_username">"Nombre de usuario:"</string>
48+ <string name="label_password">"Contraseña:"</string>
49+ <string name="remember_password">"Recordar mi contraseña."</string>
50+ <string name="keep_me_signed_in">"Iniciar sesión automáticamente"</string>
51+ <string name="sign_up">"¿No tienes una cuenta?"</string>
52+ <string name="check_auto_sign_in">"Esta opción inicia la sesión automáticamente cada vez que abres la aplicación. Para desactivarla, sal de la sesión y quita la marca de verificación de la casilla \"Iniciar sesión automáticamente\"."</string>
53+ <string name="sign_in">"Inicia sesión"</string>
54+ <string name="signing_in_to">"Iniciando sesión en <xliff:g id="ACCOUNT">%1$s</xliff:g>"</string>
55+ <string name="signing_in_wait">"Iniciando sesión..."</string>
56+ <string name="bg_data_prompt_title">"Datos de fondo desactivados"</string>
57+ <string name="bg_data_prompt_message">"<xliff:g id="PROVIDER">%1$s</xliff:g> necesita que se habiliten datos de fondo."</string>
58+ <string name="bg_data_prompt_ok">"Habilitar"</string>
59+ <string name="bg_data_prompt_cancel">"Salir"</string>
60+ <string name="ongoing_conversation">"Chats en curso (<xliff:g id="NUMBER">%1$d</xliff:g>)"</string>
61+ <string name="online_count">"<xliff:g id="NUMBER">%1$d</xliff:g> en línea"</string>
62+ <string name="subscriptions">"Invitaciones de amigos"</string>
63+ <string name="unknown_contact">"("<i>"Desconocida"</i>")"</string>
64+ <string name="empty_contact_group">"Vacío"</string>
65+ <string name="empty_conversation_group">"No hay conversaciones"</string>
66+ <string name="contacts_picker_title">"Seleccionar contacto(s) para invitar"</string>
67+ <string name="contact_filter_hint">"Escribir para buscar contacto"</string>
68+ <string name="empty_contact_list">"No se encontraron contactos."</string>
69+ <string name="blocked_list_title">"Contactos bloqueados - <xliff:g id="USER">%1$s</xliff:g>"</string>
70+ <string name="no_blocked_contact">"No hay contactos bloqueados."</string>
71+ <string name="contact_profile_title">"Perfil de contacto"</string>
72+ <string name="label_status">"Estado:"</string>
73+ <string name="label_client_type">"Tipo de cliente:"</string>
74+ <string name="client_type_computer">"Computadora"</string>
75+ <string name="client_type_mobile">"Celular"</string>
76+ <string name="presence_available">"En línea"</string>
77+ <string name="presence_busy">"Ocupado"</string>
78+ <string name="presence_away">"Ausente"</string>
79+ <string name="presence_idle">"Inactivo"</string>
80+ <string name="presence_offline">"Desconectado"</string>
81+ <string name="presence_invisible">"Aparecer desconectado"</string>
82+ <string name="chat_with">"Chatear con <xliff:g id="USER">%1$s</xliff:g>"</string>
83+ <string name="me">"Yo"</string>
84+ <string name="compose_hint">"Escribir para componer"</string>
85+ <string name="contact_online">"<xliff:g id="USER">%1$s</xliff:g> está en línea"</string>
86+ <string name="contact_away">"<xliff:g id="USER">%1$s</xliff:g> está ausente"</string>
87+ <string name="contact_busy">"<xliff:g id="USER">%1$s</xliff:g> está ocupado"</string>
88+ <string name="contact_offline">"<xliff:g id="USER">%1$s</xliff:g> está desconectado"</string>
89+ <string name="contact_joined">"<xliff:g id="USER">%1$s</xliff:g> se ha unido"</string>
90+ <string name="contact_left">"<xliff:g id="USER">%1$s</xliff:g> se ha ido"</string>
91+ <string name="time_stamp" format="date">"'Enviado el '<xliff:g id="DATE">EEEE</xliff:g>' a las '<xliff:g id="HOUR">hh</xliff:g><xliff:g id="MINUTE">mm</xliff:g><xliff:g id="AMPM">a</xliff:g>"</string>
92+ <string name="send">"Enviar"</string>
93+ <string name="msg_sent_failed">"Este mensaje no pudo enviarse."</string>
94+ <string name="disconnected_warning">"Se ha perdido la conexión con el servidor. Los mensajes se enviarán cuando estés en línea."</string>
95+ <string name="contact_offline_warning">"<xliff:g id="USER_0">%1$s</xliff:g> está desconectado. Los mensajes que le envíes los recibirá cuando <xliff:g id="USER_1">%1$s</xliff:g> vuelva a conectarse."</string>
96+ <string name="contact_not_in_list_warning">"<xliff:g id="USER">%1$s</xliff:g> no está en tu lista de contactos."</string>
97+ <string name="select_link_title">"Seleccionar vínculo"</string>
98+ <string name="empty_chat_list">"No hay chats activos."</string>
99+ <string name="add_contact_title">"Agregar contacto"</string>
100+ <string name="input_contact_label">"Dirección de correo electrónico de la persona que deseas invitar:"</string>
101+ <string name="choose_list_label">"Selecciona una lista:"</string>
102+ <string name="invite_instruction">"Escribe un nombre de Contactos para agregarlo."</string>
103+ <string name="invite_label">"Enviar invitación"</string>
104+ <string name="setting_title">"Configuración general"</string>
105+ <string name="hide_offline_contacts">"Ocultar contactos desconectados"</string>
106+ <string name="notification_group_title">"Configuración de notificación"</string>
107+ <string name="notification_enabled_title">"Notificaciones de mensajería instantánea"</string>
108+ <string name="notification_enabled_summary">"Notificar en la barra de estado cuando llega mensajería instantánea"</string>
109+ <string name="notification_vibrate_title">"Vibrar"</string>
110+ <string name="notification_vibrate_summary">"Vibrar también cuando llega mensajería instantánea"</string>
111+ <string name="notification_sound_title">"Sonido"</string>
112+ <string name="notification_sound_summary">"Reproducir también tono de timbre cuando llega mensajería instantánea"</string>
113+ <string name="notification_ringtone_title">"Seleccionar tono de timbre"</string>
114+ <string name="invitation_prompt">"<xliff:g id="USER">%1$s</xliff:g> te ha invitado a unirte a un grupo de chat."</string>
115+ <string name="invitation_sent_prompt">"La invitación se ha enviado a <xliff:g id="USER">%1$s</xliff:g>"</string>
116+ <string name="accept_invitation">"Aceptar"</string>
117+ <string name="decline_invitation">"Rechazar"</string>
118+ <string name="subscription_prompt">"<xliff:g id="USER">%1$s</xliff:g> te ha invitado a estar en su lista de contactos."</string>
119+ <string name="approve_subscription">"Aceptar"</string>
120+ <string name="decline_subscription">"Rechazar"</string>
121+ <string name="approve_subscription_error">"No se ha podido aprobar la suscripción de <xliff:g id="USER">%1$s</xliff:g>. Vuelve a intentarlo más tarde."</string>
122+ <string name="decline_subscription_error">"No se ha podido declinar la suscripción de <xliff:g id="USER">%1$s</xliff:g>. Vuelve a intentarlo más tarde."</string>
123+ <string name="newMessages_label">"Mensajes nuevos de <xliff:g id="PROVIDER">%1$s</xliff:g>"</string>
124+ <string name="num_unread_chats">"<xliff:g id="NUMBER">%1$d</xliff:g> chats no leídos"</string>
125+ <string name="subscription_notify_text">"Invitación de amigo nuevo de <xliff:g id="USER">%s</xliff:g>"</string>
126+ <string name="notify_groupchat_label">"Invitación para chat en grupo"</string>
127+ <string name="group_chat_invite_notify_text">"Nueva invitación de chat en grupo de <xliff:g id="USER">%s</xliff:g>"</string>
128+ <string name="add_contact_success">"Contacto \"<xliff:g id="USER">%1$s</xliff:g>\" agregado."</string>
129+ <string name="delete_contact_success">"Contacto \"<xliff:g id="USER">%1$s</xliff:g>\" eliminado."</string>
130+ <string name="block_contact_success">"Contacto \"<xliff:g id="USER">%1$s</xliff:g>\" bloqueado."</string>
131+ <string name="unblock_contact_success">"Contacto \"<xliff:g id="USER">%1$s</xliff:g>\" desbloqueado."</string>
132+ <string name="perm_label">"iniciar servicio de mensajería instantánea"</string>
133+ <string name="perm_desc">"Permite a las aplicaciones iniciar el servicio de mensajería instantánea por Internet."</string>
134+ <string name="error">"Atención"</string>
135+ <string name="login_service_failed">"No es posible iniciar sesión en el servicio <xliff:g id="SERVICE">%1$s</xliff:g>. Vuelve a intentarlo más tarde."\n"(Detalle:<xliff:g id="DESCRIPTION">%2$s</xliff:g>)"</string>
136+ <string name="add_list_failed">"La lista no se agregó."</string>
137+ <string name="block_contact_failed">"El contacto no se bloqueó."</string>
138+ <string name="unblock_contact_failed">"El contacto no se desbloqueó."</string>
139+ <string name="select_contact">"Selecciona primero un contacto."</string>
140+ <string name="disconnected">"Desconectado"\n</string>
141+ <string name="service_error">"Error del servidor"</string>
142+ <string name="load_contact_list_failed">"La lista de contactos no se cargó."</string>
143+ <string name="cant_connect_to_server">"No es posible conectarse al servidor. Verifica tu conexión."</string>
144+ <string name="contact_already_exist">"<xliff:g id="USER">%1$s</xliff:g> ya existe en tu lista de contactos."</string>
145+ <string name="contact_blocked">"El contacto \"<xliff:g id="USER">%1$s</xliff:g>\" ha sido bloqueado."</string>
146+ <string name="contact_not_loaded">"Espera mientras se carga tu lista de contactos"</string>
147+ <string name="network_error">"Se ha producido un error en la red."</string>
148+ <string name="service_not_support">"El servidor no admite esta funcionalidad."</string>
149+ <string name="invalid_password">"La contraseña ingresada no es válida."</string>
150+ <string name="internal_server_error">"EL servidor encontró un error."</string>
151+ <string name="not_implemented">"El servidor no admite esta funcionalidad."</string>
152+ <string name="service_unavaiable">"El servidor no está disponible en este momento."</string>
153+ <string name="timeout">"El tiempo del servidor se ha agotado."</string>
154+ <string name="version_not_supported">"El servidor no admite la versión actual."</string>
155+ <string name="message_queue_full">"La lista de mensajes está llena."</string>
156+ <string name="domain_not_supported">"El servidor no admite reenviar al dominio."</string>
157+ <string name="unknown_user">"El nombre de usuario que has ingresado no está reconocido."</string>
158+ <string name="recipient_blocked_the_user">"Lo sentimos, el usuario te ha bloqueado."</string>
159+ <string name="session_expired">"La sesión ha expirado. Vuelve a iniciar sesión"</string>
160+ <string name="forced_logout">"has iniciado sesión desde otro cliente."</string>
161+ <string name="already_logged_in">"ya has iniciado sesión desde otro cliente."</string>
162+ <string name="msisdn_error">"El número de teléfono no puede leerse de tu tarjeta SIM. Ponte en contacto con tu operador para obtener ayuda."</string>
163+ <string name="not_signed_in">"Actualmente, no has iniciado sesión."</string>
164+ <string name="general_error">"Código de error <xliff:g id="CODE">%1$d</xliff:g>"</string>
165+ <string-array name="default_smiley_names">
166+ <item>"Feliz"</item>
167+ <item>"Triste"</item>
168+ <item>"Guiñando un ojo"</item>
169+ <item>"Con la lengua afuera"</item>
170+ <item>"Sorprendido"</item>
171+ <item>"Besando"</item>
172+ <item>"Gritando"</item>
173+ <item>"En la onda"</item>
174+ <item>"Dinero en boca"</item>
175+ <item>"Meter la pata"</item>
176+ <item>"Avergonzado"</item>
177+ <item>"Ángel"</item>
178+ <item>"Indeciso"</item>
179+ <item>"Llorando"</item>
180+ <item>"Los labios están cerrados"</item>
181+ <item>"Riendo"</item>
182+ <item>"Confundido"</item>
183+ </string-array>
184+</resources>
--- a/res/values-es/strings.xml
+++ b/res/values-es/strings.xml
@@ -102,7 +102,7 @@
102102 <string name="invite_instruction">"Escribe el nombre del contacto que quieras añadir."</string>
103103 <string name="invite_label">"Enviar invitación"</string>
104104 <string name="setting_title">"Configuración general"</string>
105- <string name="hide_offline_contacts">"Ocultar desconectados"</string>
105+ <string name="hide_offline_contacts">"Ocultar contactos desconectados"</string>
106106 <string name="notification_group_title">"Configuración de notificaciones"</string>
107107 <string name="notification_enabled_title">"Notificaciones de MI"</string>
108108 <string name="notification_enabled_summary">"Avisar en la barra de estado al recibir un mensaje instantáneo"</string>
--- a/res/values-fr/strings.xml
+++ b/res/values-fr/strings.xml
@@ -30,7 +30,7 @@
3030 <string name="menu_view_contact_list">"Liste de contacts"</string>
3131 <string name="menu_invite_contact">"Inviter..."</string>
3232 <string name="menu_switch_chats">"Changer de chat"</string>
33- <string name="menu_insert_smiley">"Insérer une émoticône"</string>
33+ <string name="menu_insert_smiley">"Insérer un émoticône"</string>
3434 <string name="menu_plus">"Menu+"</string>
3535 <string name="default_input_title">"Entrée"</string>
3636 <string name="confirm">"Confirmer"</string>
@@ -72,7 +72,7 @@
7272 <string name="label_status">"État :"</string>
7373 <string name="label_client_type">"Type de client :"</string>
7474 <string name="client_type_computer">"Ordinateur"</string>
75- <string name="client_type_mobile">"Portable"</string>
75+ <string name="client_type_mobile">"Mobile"</string>
7676 <string name="presence_available">"En ligne"</string>
7777 <string name="presence_busy">"Occupé"</string>
7878 <string name="presence_away">"Absent"</string>
@@ -81,7 +81,7 @@
8181 <string name="presence_invisible">"Apparaître hors ligne"</string>
8282 <string name="chat_with">"Chatter avec <xliff:g id="USER">%1$s</xliff:g>"</string>
8383 <string name="me">"Moi"</string>
84- <string name="compose_hint">"Saisissez votre message"</string>
84+ <string name="compose_hint">"Cliquer pour composer"</string>
8585 <string name="contact_online">"<xliff:g id="USER">%1$s</xliff:g> est en ligne"</string>
8686 <string name="contact_away">"<xliff:g id="USER">%1$s</xliff:g> est absent"</string>
8787 <string name="contact_busy">"<xliff:g id="USER">%1$s</xliff:g> est occupé"</string>
@@ -102,7 +102,7 @@
102102 <string name="invite_instruction">"Saisissez un nom à ajouter à partir de vos contacts"</string>
103103 <string name="invite_label">"Envoyer une invitation"</string>
104104 <string name="setting_title">"Paramètres généraux"</string>
105- <string name="hide_offline_contacts">"Masquer contacts hors ligne"</string>
105+ <string name="hide_offline_contacts">"Masquer les contacts hors ligne"</string>
106106 <string name="notification_group_title">"Paramètres des notifications"</string>
107107 <string name="notification_enabled_title">"Notifications de chat"</string>
108108 <string name="notification_enabled_summary">"Signaler la réception d\'un chat dans la barre d\'état"</string>
--- a/res/values-it/strings.xml
+++ b/res/values-it/strings.xml
@@ -30,7 +30,7 @@
3030 <string name="menu_view_contact_list">"Elenco contatti"</string>
3131 <string name="menu_invite_contact">"Invita..."</string>
3232 <string name="menu_switch_chats">"Cambia conversazione"</string>
33- <string name="menu_insert_smiley">"Inserisci emoticon"</string>
33+ <string name="menu_insert_smiley">"Inserisci smile"</string>
3434 <string name="menu_plus">"Menu+"</string>
3535 <string name="default_input_title">"Input"</string>
3636 <string name="confirm">"Conferma"</string>
@@ -75,13 +75,13 @@
7575 <string name="client_type_mobile">"Portatile"</string>
7676 <string name="presence_available">"Online"</string>
7777 <string name="presence_busy">"Occupato"</string>
78- <string name="presence_away">"Assente"</string>
78+ <string name="presence_away">"Non al computer"</string>
7979 <string name="presence_idle">"Inattivo"</string>
8080 <string name="presence_offline">"Offline"</string>
8181 <string name="presence_invisible">"Invisibile"</string>
8282 <string name="chat_with">"Conversazione con <xliff:g id="USER">%1$s</xliff:g>"</string>
8383 <string name="me">"Io"</string>
84- <string name="compose_hint">"Digita qui per scrivere"</string>
84+ <string name="compose_hint">"Digita per comporre"</string>
8585 <string name="contact_online">"<xliff:g id="USER">%1$s</xliff:g> è online"</string>
8686 <string name="contact_away">"<xliff:g id="USER">%1$s</xliff:g> non è al computer"</string>
8787 <string name="contact_busy">"<xliff:g id="USER">%1$s</xliff:g> è occupato"</string>
--- a/res/values-pl/strings.xml
+++ b/res/values-pl/strings.xml
@@ -15,7 +15,7 @@
1515 -->
1616 <resources xmlns:android="http://schemas.android.com/apk/res/android"
1717 xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
18- <string name="im_label">"Czat"</string>
18+ <string name="im_label">"Komunikator"</string>
1919 <string name="menu_cancel_signin">"Anuluj logowanie"</string>
2020 <string name="menu_add_contact">"Dodaj kontakt"</string>
2121 <string name="menu_remove_contact">"Usuń kontakt"</string>
@@ -30,7 +30,7 @@
3030 <string name="menu_view_contact_list">"Lista kontaktów"</string>
3131 <string name="menu_invite_contact">"Zaproś…"</string>
3232 <string name="menu_switch_chats">"Przełącz czaty"</string>
33- <string name="menu_insert_smiley">"Wstaw emotikon"</string>
33+ <string name="menu_insert_smiley">"Wstaw buźkę"</string>
3434 <string name="menu_plus">"Menu+"</string>
3535 <string name="default_input_title">"Katalog wejściowy"</string>
3636 <string name="confirm">"Potwierdź"</string>
@@ -79,7 +79,7 @@
7979 <string name="presence_idle">"Bezczynność"</string>
8080 <string name="presence_offline">"Offline"</string>
8181 <string name="presence_invisible">"Pokazuj jako offline"</string>
82- <string name="chat_with">"Czat z użytkownikiem <xliff:g id="USER">%1$s</xliff:g>"</string>
82+ <string name="chat_with">"Czatuj z użytkownikiem <xliff:g id="USER">%1$s</xliff:g>"</string>
8383 <string name="me">"Ja"</string>
8484 <string name="compose_hint">"Wpisz, aby utworzyć"</string>
8585 <string name="contact_online">"Użytkownik <xliff:g id="USER">%1$s</xliff:g> jest dostępny"</string>
@@ -105,11 +105,11 @@
105105 <string name="hide_offline_contacts">"Ukryj kontakty offline"</string>
106106 <string name="notification_group_title">"Ustawienia powiadomień"</string>
107107 <string name="notification_enabled_title">"Powiadamiaj o czacie"</string>
108- <string name="notification_enabled_summary">"Sygnalizuj nową wiadomość czatu na pasku stanu"</string>
108+ <string name="notification_enabled_summary">"Sygnalizuj nową wiadomość na czacie na pasku stanu"</string>
109109 <string name="notification_vibrate_title">"Wibracje"</string>
110- <string name="notification_vibrate_summary">"Sygnalizuj wiadomość czatu wibracją"</string>
110+ <string name="notification_vibrate_summary">"Sygnalizuj wiadomość na czacie wibracją"</string>
111111 <string name="notification_sound_title">"Dźwięk"</string>
112- <string name="notification_sound_summary">"Sygnalizuj wiadomość czatu dzwonkiem"</string>
112+ <string name="notification_sound_summary">"Sygnalizuj wiadomość na czacie dzwonkiem"</string>
113113 <string name="notification_ringtone_title">"Wybierz dzwonek"</string>
114114 <string name="invitation_prompt">"<xliff:g id="USER">%1$s</xliff:g> przesyła zaproszenie do czatu grupowego."</string>
115115 <string name="invitation_sent_prompt">"Wysłano zaproszenie do użytkownika <xliff:g id="USER">%1$s</xliff:g>."</string>
@@ -129,7 +129,7 @@
129129 <string name="delete_contact_success">"Usunięto kontakt „<xliff:g id="USER">%1$s</xliff:g>”."</string>
130130 <string name="block_contact_success">"Zablokowano kontakt „<xliff:g id="USER">%1$s</xliff:g>”."</string>
131131 <string name="unblock_contact_success">"Odblokowano kontakt „<xliff:g id="USER">%1$s</xliff:g>”."</string>
132- <string name="perm_label">"uruchom usługę czatu"</string>
132+ <string name="perm_label">"uruchom usługę wiadomości błyskawicznych"</string>
133133 <string name="perm_desc">"Umożliwia aplikacjom uruchamianie czatu na żądanie."</string>
134134 <string name="error">"Uwaga"</string>
135135 <string name="login_service_failed">"Nie można zalogować do usługi <xliff:g id="SERVICE">%1$s</xliff:g>. Spróbuj ponownie później."\n"(Szczegóły: <xliff:g id="DESCRIPTION">%2$s</xliff:g>)"</string>
--- /dev/null
+++ b/res/values-pt/strings.xml
@@ -0,0 +1,192 @@
1+<?xml version="1.0" encoding="UTF-8"?>
2+<!-- Copyright (C) 2009 The Android Open Source Project
3+
4+ Licensed under the Apache License, Version 2.0 (the "License");
5+ you may not use this file except in compliance with the License.
6+ You may obtain a copy of the License at
7+
8+ http://www.apache.org/licenses/LICENSE-2.0
9+
10+ Unless required by applicable law or agreed to in writing, software
11+ distributed under the License is distributed on an "AS IS" BASIS,
12+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13+ See the License for the specific language governing permissions and
14+ limitations under the License.
15+-->
16+<resources xmlns:android="http://schemas.android.com/apk/res/android"
17+ xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
18+ <string name="im_label">"MI"</string>
19+ <string name="menu_cancel_signin">"Cancelar login."</string>
20+ <string name="menu_add_contact">"Adicionar contato"</string>
21+ <string name="menu_remove_contact">"Excluir contato"</string>
22+ <string name="menu_block_contact">"Bloquear contato"</string>
23+ <string name="menu_view_blocked">"Bloqueados"</string>
24+ <string name="menu_view_accounts">"Lista de contas"</string>
25+ <string name="menu_settings">"Configurações"</string>
26+ <string name="menu_start_chat">"Iniciar chat"</string>
27+ <string name="menu_sign_out">"Sair"</string>
28+ <string name="menu_view_profile">"Exibir perfil."</string>
29+ <string name="menu_end_conversation">"Encerrar chat"</string>
30+ <string name="menu_view_contact_list">"Lista de contatos"</string>
31+ <string name="menu_invite_contact">"Convidar…"</string>
32+ <string name="menu_switch_chats">"Trocar chat"</string>
33+ <string name="menu_insert_smiley">"Inserir emoticon"</string>
34+ <!-- no translation found for menu_plus (5000617247235760106) -->
35+ <skip />
36+ <string name="default_input_title">"Entrada"</string>
37+ <string name="confirm">"Confirmar"</string>
38+ <string name="confirm_delete_contact">"O contato \"<xliff:g id="USER">%1$s</xliff:g>\" será excluído."</string>
39+ <string name="confirm_block_contact">"O contato \"<xliff:g id="USER">%1$s</xliff:g>\" será bloqueado."</string>
40+ <string name="confirm_unblock_contact">"O contato \"<xliff:g id="USER">%1$s</xliff:g>\" será desbloqueado."</string>
41+ <string name="ok">"OK"</string>
42+ <string name="cancel">"Cancelar"</string>
43+ <string name="yes">"OK"</string>
44+ <string name="no">"Cancelar"</string>
45+ <string name="signed_out_prompt">"Você foi desconectado de <xliff:g id="ACCOUNT">%1$s</xliff:g>."</string>
46+ <string name="signed_out_prompt_with_error">"Você foi desconectado de <xliff:g id="ACCOUNT">%1$s</xliff:g> porque <xliff:g id="REASON">%2$s</xliff:g>."</string>
47+ <string name="add_account">"Adicionar conta <xliff:g id="ACCOUNT">%1$s</xliff:g>"</string>
48+ <string name="label_username">"Nome de usuário:"</string>
49+ <string name="label_password">"Senha:"</string>
50+ <string name="remember_password">"Lembrar minha senha."</string>
51+ <string name="keep_me_signed_in">"Fazer login automaticamente."</string>
52+ <string name="sign_up">"Não tem uma conta?"</string>
53+ <string name="check_auto_sign_in">"Esta opção realiza seu login automaticamente toda vez que você abre este aplicativo. Para desativá-la, saia de sua conta e desmarque a caixa de seleção \"Fazer login automaticamente\"."</string>
54+ <string name="sign_in">"Fazer login"</string>
55+ <string name="signing_in_to">"Fazendo login em <xliff:g id="ACCOUNT">%1$s</xliff:g>"</string>
56+ <string name="signing_in_wait">"Fazendo login"</string>
57+ <!-- no translation found for bg_data_prompt_title (4861800723853178111) -->
58+ <skip />
59+ <!-- no translation found for bg_data_prompt_message (2343305645142823544) -->
60+ <skip />
61+ <!-- no translation found for bg_data_prompt_ok (3443385427882751532) -->
62+ <skip />
63+ <!-- no translation found for bg_data_prompt_cancel (7206105589826174638) -->
64+ <skip />
65+ <string name="ongoing_conversation">"Chats ativos (<xliff:g id="NUMBER">%1$d</xliff:g>)"</string>
66+ <string name="online_count">"<xliff:g id="NUMBER">%1$d</xliff:g> on-line"</string>
67+ <string name="subscriptions">"Convites de amigo"</string>
68+ <string name="unknown_contact">"("<i>"Desconhecido"</i>")"</string>
69+ <string name="empty_contact_group">"Vazia"</string>
70+ <string name="empty_conversation_group">"Sem conversas"</string>
71+ <string name="contacts_picker_title">"Selecione os contatos para convidar"</string>
72+ <string name="contact_filter_hint">"Digite para localizar contato"</string>
73+ <string name="empty_contact_list">"Nenhum contato localizado."</string>
74+ <string name="blocked_list_title">"Contatos bloqueados - <xliff:g id="USER">%1$s</xliff:g>"</string>
75+ <string name="no_blocked_contact">"Nenhum contato bloqueado."</string>
76+ <string name="contact_profile_title">"Perfil do contato"</string>
77+ <string name="label_status">"Status:"</string>
78+ <string name="label_client_type">"Tipo de cliente:"</string>
79+ <string name="client_type_computer">"Computador"</string>
80+ <string name="client_type_mobile">"Celular"</string>
81+ <string name="presence_available">"On-line"</string>
82+ <string name="presence_busy">"Ocupado"</string>
83+ <string name="presence_away">"Ausente"</string>
84+ <string name="presence_idle">"Inativo"</string>
85+ <string name="presence_offline">"Off-line"</string>
86+ <string name="presence_invisible">"Aparecer off-line"</string>
87+ <string name="chat_with">"Chat com <xliff:g id="USER">%1$s</xliff:g>"</string>
88+ <string name="me">"Eu"</string>
89+ <!-- no translation found for compose_hint (1735533889811320962) -->
90+ <skip />
91+ <string name="contact_online">"<xliff:g id="USER">%1$s</xliff:g> está on-line"</string>
92+ <string name="contact_away">"<xliff:g id="USER">%1$s</xliff:g> está ausente"</string>
93+ <string name="contact_busy">"<xliff:g id="USER">%1$s</xliff:g> está ocupado"</string>
94+ <string name="contact_offline">"<xliff:g id="USER">%1$s</xliff:g> está off-line"</string>
95+ <string name="contact_joined">"<xliff:g id="USER">%1$s</xliff:g> entrou"</string>
96+ <string name="contact_left">"<xliff:g id="USER">%1$s</xliff:g> saiu"</string>
97+ <!-- no translation found for time_stamp (8952691401963972802) -->
98+ <skip />
99+ <string name="send">"Enviar"</string>
100+ <string name="msg_sent_failed">"Esta mensagem não foi enviada."</string>
101+ <string name="disconnected_warning">"Conexão com o servidor perdida. As mensagens serão enviadas ao reestabelecer a conexão."</string>
102+ <string name="contact_offline_warning">"<xliff:g id="USER_0">%1$s</xliff:g> está off-line. As mensagens que você enviar serão entregues quando <xliff:g id="USER_1">%1$s</xliff:g> estiver on-line."</string>
103+ <string name="contact_not_in_list_warning">"<xliff:g id="USER">%1$s</xliff:g> não está na sua Lista de contatos."</string>
104+ <string name="select_link_title">"Selecionar link"</string>
105+ <string name="empty_chat_list">"Nenhum chat ativo."</string>
106+ <string name="add_contact_title">"Adicionar contato"</string>
107+ <string name="input_contact_label">"Endereço de e-mail da pessoa que você deseja convidar:"</string>
108+ <!-- no translation found for choose_list_label (1430489448508574145) -->
109+ <skip />
110+ <string name="invite_instruction">"Digite um nome para adicionar a partir dos contatos."</string>
111+ <string name="invite_label">"Enviar convite"</string>
112+ <string name="setting_title">"Configurações gerais"</string>
113+ <string name="hide_offline_contacts">"Ocultar contatos off-line"</string>
114+ <string name="notification_group_title">"Configurações de notificação"</string>
115+ <string name="notification_enabled_title">"Notificações de MI"</string>
116+ <string name="notification_enabled_summary">"Notificar na barra de status ao receber MI"</string>
117+ <string name="notification_vibrate_title">"Vibrar"</string>
118+ <string name="notification_vibrate_summary">"Também vibrar ao receber MI"</string>
119+ <string name="notification_sound_title">"Som"</string>
120+ <string name="notification_sound_summary">"Também tocar ringtone ao receber MI"</string>
121+ <string name="notification_ringtone_title">"Selecionar ringtone"</string>
122+ <string name="invitation_prompt">"<xliff:g id="USER">%1$s</xliff:g> convidou você para entrar em um chat em grupo."</string>
123+ <string name="invitation_sent_prompt">"O convite foi enviado para <xliff:g id="USER">%1$s</xliff:g>."</string>
124+ <string name="accept_invitation">"Aceitar"</string>
125+ <string name="decline_invitation">"Recusar"</string>
126+ <string name="subscription_prompt">"<xliff:g id="USER">%1$s</xliff:g> convidou você para fazer parte de sua Lista de contatos."</string>
127+ <string name="approve_subscription">"Aceitar"</string>
128+ <string name="decline_subscription">"Recusar"</string>
129+ <string name="approve_subscription_error">"Inscrição de <xliff:g id="USER">%1$s</xliff:g> não foi aprovada. Tente novamente mais tarde."</string>
130+ <string name="decline_subscription_error">"Não foi possível recusar a inscrição de <xliff:g id="USER">%1$s</xliff:g>. Tente novamente mais tarde."</string>
131+ <string name="newMessages_label">"Novas mensagens de <xliff:g id="PROVIDER">%1$s</xliff:g>"</string>
132+ <string name="num_unread_chats">"<xliff:g id="NUMBER">%1$d</xliff:g> chats não lidos"</string>
133+ <string name="subscription_notify_text">"Novo convite de amigo de <xliff:g id="USER">%s</xliff:g>"</string>
134+ <string name="notify_groupchat_label">"Convite para chat em grupo"</string>
135+ <string name="group_chat_invite_notify_text">"Novo convite para chat em grupo de <xliff:g id="USER">%s</xliff:g>"</string>
136+ <string name="add_contact_success">"Contato \"<xliff:g id="USER">%1$s</xliff:g>\" adicionado."</string>
137+ <string name="delete_contact_success">"Contato \"<xliff:g id="USER">%1$s</xliff:g>\" excluído."</string>
138+ <string name="block_contact_success">"Contato \"<xliff:g id="USER">%1$s</xliff:g>\" bloqueado."</string>
139+ <string name="unblock_contact_success">"Contato \"<xliff:g id="USER">%1$s</xliff:g>\" desbloqueado."</string>
140+ <string name="perm_label">"iniciar serviço de MI"</string>
141+ <string name="perm_desc">"Permite que os aplicativos iniciem o serviço de MI pela internet."</string>
142+ <string name="error">"Atenção"</string>
143+ <string name="login_service_failed">"Não foi possível acessar o serviço <xliff:g id="SERVICE">%1$s</xliff:g>. Tente novamente mais tarde."\n"(Detalhes: <xliff:g id="DESCRIPTION">%2$s</xliff:g>)"</string>
144+ <string name="add_list_failed">"A lista não foi adicionada."</string>
145+ <string name="block_contact_failed">"O contato não foi bloqueado."</string>
146+ <string name="unblock_contact_failed">"O contato não foi desbloqueado."</string>
147+ <string name="select_contact">"Selecione um contato antes."</string>
148+ <string name="disconnected">"Desconectado!"\n</string>
149+ <string name="service_error">"Erro do serviço."</string>
150+ <string name="load_contact_list_failed">"A Lista de contatos não foi carregada."</string>
151+ <string name="cant_connect_to_server">"Não foi possível conectar com o servidor. Verifique sua conexão."</string>
152+ <string name="contact_already_exist">"<xliff:g id="USER">%1$s</xliff:g> já existe na sua Lista de contatos."</string>
153+ <string name="contact_blocked">"Contato \"<xliff:g id="USER">%1$s</xliff:g>\" foi bloqueado."</string>
154+ <string name="contact_not_loaded">"Aguarde enquanto a Lista de contatos é carregada."</string>
155+ <string name="network_error">"Ocorreu um erro de rede."</string>
156+ <string name="service_not_support">"O servidor não suporta este recurso."</string>
157+ <string name="invalid_password">"A senha inserida não é válida."</string>
158+ <string name="internal_server_error">"O servidor encontrou um erro."</string>
159+ <string name="not_implemented">"O servidor não suporta este recurso."</string>
160+ <string name="service_unavaiable">"O servidor está indisponível no momento."</string>
161+ <string name="timeout">"O tempo do servidor expirou."</string>
162+ <string name="version_not_supported">"O servidor não suporta a versão atual."</string>
163+ <string name="message_queue_full">"A fila de mensagens está cheia."</string>
164+ <string name="domain_not_supported">"O servidor não suporta o envio de dados para o domínio."</string>
165+ <string name="unknown_user">"O nome de usuário inserido não foi reconhecido."</string>
166+ <string name="recipient_blocked_the_user">"Você foi bloqueado pelo usuário."</string>
167+ <string name="session_expired">"A sessão expirou; faça login novamente."</string>
168+ <string name="forced_logout">"você fez login como outro cliente."</string>
169+ <string name="already_logged_in">"você já fez login como outro cliente."</string>
170+ <string name="msisdn_error">"Não é possível ler o número do telefone no cartão SIM. Entre em contato com o seu operador para obter ajuda."</string>
171+ <string name="not_signed_in">"Você não está conectado."</string>
172+ <string name="general_error">"Código de erro <xliff:g id="CODE">%1$d</xliff:g>"</string>
173+ <string-array name="default_smiley_names">
174+ <item>"Feliz"</item>
175+ <item>"Triste"</item>
176+ <item>"Piscando"</item>
177+ <item>"Língua de fora"</item>
178+ <item>"Surpreso"</item>
179+ <item>"Beijo"</item>
180+ <item>"Gritando"</item>
181+ <item>"Descontraído"</item>
182+ <item>"Cifrão na boca"</item>
183+ <item>"Opa"</item>
184+ <item>"Constrangido"</item>
185+ <item>"Anjo"</item>
186+ <item>"Indeciso"</item>
187+ <item>"Chorando"</item>
188+ <item>"Boca fechada"</item>
189+ <item>"Sorrindo"</item>
190+ <item>"Confuso"</item>
191+ </string-array>
192+</resources>
--- a/res/values-zh-rTW/strings.xml
+++ b/res/values-zh-rTW/strings.xml
@@ -17,24 +17,24 @@
1717 xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
1818 <string name="im_label">"即時訊息"</string>
1919 <string name="menu_cancel_signin">"取消登入"</string>
20- <string name="menu_add_contact">"新增連絡人"</string>
21- <string name="menu_remove_contact">"刪除連絡人"</string>
22- <string name="menu_block_contact">"封鎖連絡人"</string>
20+ <string name="menu_add_contact">"新增聯絡人"</string>
21+ <string name="menu_remove_contact">"刪除聯絡人"</string>
22+ <string name="menu_block_contact">"封鎖聯絡人"</string>
2323 <string name="menu_view_blocked">"封鎖"</string>
2424 <string name="menu_view_accounts">"帳戶清單"</string>
2525 <string name="menu_settings">"設定"</string>
26- <string name="menu_start_chat">"開始交談"</string>
26+ <string name="menu_start_chat">"開始即時通訊"</string>
2727 <string name="menu_sign_out">"登出"</string>
2828 <string name="menu_view_profile">"觀看個人檔案"</string>
29- <string name="menu_end_conversation">"結束交談"</string>
30- <string name="menu_view_contact_list">"連絡人清單"</string>
29+ <string name="menu_end_conversation">"結束即時通訊"</string>
30+ <string name="menu_view_contact_list">"聯絡人清單"</string>
3131 <string name="menu_invite_contact">"邀請…"</string>
32- <string name="menu_switch_chats">"切換交談"</string>
32+ <string name="menu_switch_chats">"切換即時通訊"</string>
3333 <string name="menu_insert_smiley">"插入表情符號"</string>
34- <string name="menu_plus">"選單+"</string>
34+ <string name="menu_plus">"[選單] +"</string>
3535 <string name="default_input_title">"輸入"</string>
3636 <string name="confirm">"確認"</string>
37- <string name="confirm_delete_contact">"「<xliff:g id="USER">%1$s</xliff:g>」會被刪除。"</string>
37+ <string name="confirm_delete_contact">"刪除「<xliff:g id="USER">%1$s</xliff:g>」?"</string>
3838 <string name="confirm_block_contact">"封鎖「<xliff:g id="USER">%1$s</xliff:g>」。"</string>
3939 <string name="confirm_unblock_contact">"「<xliff:g id="USER">%1$s</xliff:g>」會被解除封鎖。"</string>
4040 <string name="ok">"確定"</string>
@@ -49,7 +49,7 @@
4949 <string name="remember_password">"記住我的密碼。"</string>
5050 <string name="keep_me_signed_in">"自動登入"</string>
5151 <string name="sign_up">"您有帳戶嗎?"</string>
52- <string name="check_auto_sign_in">"此選項可以讓您開啟應用程式時自動登入。若要停用請登出,並清除「自動登入」核取方塊。"</string>
52+ <string name="check_auto_sign_in">"此選項可讓您開啟應用程式時自動登入。如要停用,請登出並清除 [自動登入] 核取方塊。"</string>
5353 <string name="sign_in">"登入"</string>
5454 <string name="signing_in_to">"登入 <xliff:g id="ACCOUNT">%1$s</xliff:g>"</string>
5555 <string name="signing_in_wait">"登入中…"</string>
@@ -57,74 +57,74 @@
5757 <string name="bg_data_prompt_message">"<xliff:g id="PROVIDER">%1$s</xliff:g> 需要啟用背景資料。"</string>
5858 <string name="bg_data_prompt_ok">"啟用"</string>
5959 <string name="bg_data_prompt_cancel">"結束"</string>
60- <string name="ongoing_conversation">"進行中的交談 (<xliff:g id="NUMBER">%1$d</xliff:g>)"</string>
60+ <string name="ongoing_conversation">"進行中的即時通訊 (<xliff:g id="NUMBER">%1$d</xliff:g>)"</string>
6161 <string name="online_count">"線上人數 <xliff:g id="NUMBER">%1$d</xliff:g>"</string>
6262 <string name="subscriptions">"邀請朋友"</string>
6363 <string name="unknown_contact">"("<i>" 未知的 "</i>")"</string>
64- <string name="empty_contact_group">"沒有連絡人"</string>
64+ <string name="empty_contact_group">"沒有聯絡人"</string>
6565 <string name="empty_conversation_group">"沒有對話"</string>
66- <string name="contacts_picker_title">"選取要邀請的連絡人"</string>
67- <string name="contact_filter_hint">"輸入關鍵字尋找連絡人"</string>
68- <string name="empty_contact_list">"找不到連絡人。"</string>
69- <string name="blocked_list_title">"已封鎖連絡人 - <xliff:g id="USER">%1$s</xliff:g>"</string>
70- <string name="no_blocked_contact">"沒有封鎖的連絡人。"</string>
71- <string name="contact_profile_title">"連絡人檔案"</string>
66+ <string name="contacts_picker_title">"選取要邀請的聯絡人"</string>
67+ <string name="contact_filter_hint">"輸入關鍵字尋找聯絡人"</string>
68+ <string name="empty_contact_list">"找不到聯絡人。"</string>
69+ <string name="blocked_list_title">"已封鎖聯絡人 - <xliff:g id="USER">%1$s</xliff:g>"</string>
70+ <string name="no_blocked_contact">"沒有封鎖的聯絡人。"</string>
71+ <string name="contact_profile_title">"聯絡人檔案"</string>
7272 <string name="label_status">"狀態:"</string>
73- <string name="label_client_type">"客戶端類型:"</string>
73+ <string name="label_client_type">"用戶端類型:"</string>
7474 <string name="client_type_computer">"電腦"</string>
75- <string name="client_type_mobile">"行動"</string>
75+ <string name="client_type_mobile">"行動裝置"</string>
7676 <string name="presence_available">"線上"</string>
7777 <string name="presence_busy">"忙碌"</string>
7878 <string name="presence_away">"外出"</string>
7979 <string name="presence_idle">"閒置"</string>
8080 <string name="presence_offline">"離線"</string>
8181 <string name="presence_invisible">"顯示離線"</string>
82- <string name="chat_with">"與 <xliff:g id="USER">%1$s</xliff:g> 交談"</string>
82+ <string name="chat_with">"與<xliff:g id="USER">%1$s</xliff:g>進行即時通訊"</string>
8383 <string name="me">"我"</string>
84- <string name="compose_hint">"輸入文字開始撰寫"</string>
84+ <string name="compose_hint">"請在此輸入文字"</string>
8585 <string name="contact_online">"<xliff:g id="USER">%1$s</xliff:g> 在線上"</string>
8686 <string name="contact_away">"<xliff:g id="USER">%1$s</xliff:g> 顯示離開"</string>
8787 <string name="contact_busy">"<xliff:g id="USER">%1$s</xliff:g> 目前忙碌"</string>
8888 <string name="contact_offline">"<xliff:g id="USER">%1$s</xliff:g> 顯示離線"</string>
89- <string name="contact_joined">"<xliff:g id="USER">%1$s</xliff:g> 加入交談"</string>
89+ <string name="contact_joined">"<xliff:g id="USER">%1$s</xliff:g> 已加入"</string>
9090 <string name="contact_left">"<xliff:g id="USER">%1$s</xliff:g> 已離開"</string>
9191 <string name="time_stamp" format="date">"'傳送時間:'<xliff:g id="HOUR">hh</xliff:g>':'<xliff:g id="MINUTE">mm</xliff:g>' '<xliff:g id="AMPM">a</xliff:g>','<xliff:g id="DATE">EEEE</xliff:g>"</string>
9292 <string name="send">"傳送"</string>
9393 <string name="msg_sent_failed">"訊息無法傳送。"</string>
9494 <string name="disconnected_warning">"與伺服器連線中斷。您的訊息將在下次登入時傳送。"</string>
9595 <string name="contact_offline_warning">"<xliff:g id="USER_0">%1$s</xliff:g> 顯示離線。您的訊息將在 <xliff:g id="USER_1">%1$s</xliff:g> 登入時傳送。"</string>
96- <string name="contact_not_in_list_warning">"<xliff:g id="USER">%1$s</xliff:g> 不在您的連絡人清單。"</string>
96+ <string name="contact_not_in_list_warning">"<xliff:g id="USER">%1$s</xliff:g>不在您的聯絡人清單。"</string>
9797 <string name="select_link_title">"選取連結"</string>
98- <string name="empty_chat_list">"沒有交談"</string>
99- <string name="add_contact_title">"新增連絡人"</string>
98+ <string name="empty_chat_list">"沒有進行中的即時通訊"</string>
99+ <string name="add_contact_title">"新增聯絡人"</string>
100100 <string name="input_contact_label">"您要邀請的對象電子郵件地址:"</string>
101101 <string name="choose_list_label">"選擇一個清單:"</string>
102- <string name="invite_instruction">"輸入連絡人姓名。"</string>
102+ <string name="invite_instruction">"輸入聯絡人姓名。"</string>
103103 <string name="invite_label">"傳送邀請"</string>
104104 <string name="setting_title">"一般設定"</string>
105- <string name="hide_offline_contacts">"隱藏離線連絡人"</string>
105+ <string name="hide_offline_contacts">"隱藏離線聯絡人"</string>
106106 <string name="notification_group_title">"通知設定"</string>
107107 <string name="notification_enabled_title">"即時訊息通知"</string>
108- <string name="notification_enabled_summary">"收到訊息時在狀態列顯示通知"</string>
108+ <string name="notification_enabled_summary">"收到即時訊息時,在狀態列中顯示通知"</string>
109109 <string name="notification_vibrate_title">"震動"</string>
110- <string name="notification_vibrate_summary">"收到訊息時震動視窗"</string>
110+ <string name="notification_vibrate_summary">"收到即時訊息時振動提醒"</string>
111111 <string name="notification_sound_title">"音效"</string>
112- <string name="notification_sound_summary">"收到訊息時播放鈴聲"</string>
112+ <string name="notification_sound_summary">"收到即時訊息時播放鈴聲"</string>
113113 <string name="notification_ringtone_title">"選取鈴聲"</string>
114- <string name="invitation_prompt">"<xliff:g id="USER">%1$s</xliff:g> 邀請您加入群組交談。"</string>
114+ <string name="invitation_prompt">"<xliff:g id="USER">%1$s</xliff:g>邀請您加入群組即時通訊。"</string>
115115 <string name="invitation_sent_prompt">"已傳送邀請給 <xliff:g id="USER">%1$s</xliff:g>。"</string>
116116 <string name="accept_invitation">"接受"</string>
117117 <string name="decline_invitation">"拒絕"</string>
118- <string name="subscription_prompt">"<xliff:g id="USER">%1$s</xliff:g> 想要將您新增到連絡人清單。"</string>
118+ <string name="subscription_prompt">"<xliff:g id="USER">%1$s</xliff:g>想要將您新增到聯絡人清單。"</string>
119119 <string name="approve_subscription">"接受"</string>
120120 <string name="decline_subscription">"拒絕"</string>
121121 <string name="approve_subscription_error">"訂閱 <xliff:g id="USER">%1$s</xliff:g> 資訊失敗。請稍後再試一次。"</string>
122122 <string name="decline_subscription_error">"拒絕訂閱 <xliff:g id="USER">%1$s</xliff:g> 資訊失敗。請稍後再試一次。"</string>
123123 <string name="newMessages_label">"來自 <xliff:g id="PROVIDER">%1$s</xliff:g> 的新訊息"</string>
124- <string name="num_unread_chats">"<xliff:g id="NUMBER">%1$d</xliff:g> 個未讀交談"</string>
125- <string name="subscription_notify_text">"<xliff:g id="USER">%s</xliff:g> 邀請您"</string>
126- <string name="notify_groupchat_label">"群組交談邀請"</string>
127- <string name="group_chat_invite_notify_text">"來自 <xliff:g id="USER">%s</xliff:g> 的群組交談邀請"</string>
124+ <string name="num_unread_chats">"<xliff:g id="NUMBER">%1$d</xliff:g> 個未讀即時訊息"</string>
125+ <string name="subscription_notify_text">"<xliff:g id="USER">%s</xliff:g>傳送朋友邀請給您"</string>
126+ <string name="notify_groupchat_label">"群組即時通訊邀請"</string>
127+ <string name="group_chat_invite_notify_text">"來自<xliff:g id="USER">%s</xliff:g>的群組即時通訊邀請"</string>
128128 <string name="add_contact_success">"「<xliff:g id="USER">%1$s</xliff:g>」已新增。"</string>
129129 <string name="delete_contact_success">"「<xliff:g id="USER">%1$s</xliff:g>」已刪除。"</string>
130130 <string name="block_contact_success">"「<xliff:g id="USER">%1$s</xliff:g>」已封鎖。"</string>
@@ -134,16 +134,16 @@
134134 <string name="error">"注意"</string>
135135 <string name="login_service_failed">"無法登入 <xliff:g id="SERVICE">%1$s</xliff:g> 服務。請稍候再試一次。"\n" (詳細內容:<xliff:g id="DESCRIPTION">%2$s</xliff:g>)"</string>
136136 <string name="add_list_failed">"清單未增加"</string>
137- <string name="block_contact_failed">"連絡人未封鎖。"</string>
138- <string name="unblock_contact_failed">"連絡人未解除封鎖。"</string>
139- <string name="select_contact">"請先選取連絡人。"</string>
140- <string name="disconnected">"連線中斷!"\n</string>
137+ <string name="block_contact_failed">"聯絡人未封鎖。"</string>
138+ <string name="unblock_contact_failed">"聯絡人未解除封鎖。"</string>
139+ <string name="select_contact">"請先選取聯絡人。"</string>
140+ <string name="disconnected">"已中斷連線!"\n</string>
141141 <string name="service_error">"服務錯誤!"</string>
142- <string name="load_contact_list_failed">"未載入連絡人清單。"</string>
142+ <string name="load_contact_list_failed">"聯絡人清單未載入。"</string>
143143 <string name="cant_connect_to_server">"無法連線到伺服器。請檢查連線狀態。"</string>
144- <string name="contact_already_exist">"<xliff:g id="USER">%1$s</xliff:g> 已在您的連絡人清單。"</string>
144+ <string name="contact_already_exist">"<xliff:g id="USER">%1$s</xliff:g>已在您的聯絡人清單。"</string>
145145 <string name="contact_blocked">"「<xliff:g id="USER">%1$s</xliff:g>」已封鎖。"</string>
146- <string name="contact_not_loaded">"請等待連絡人清單載入完成。"</string>
146+ <string name="contact_not_loaded">"請等待聯絡人清單載入完成。"</string>
147147 <string name="network_error">"網路發生問題。"</string>
148148 <string name="service_not_support">"伺服器不支援此功能。"</string>
149149 <string name="invalid_password">"您輸入的密碼無效。"</string>
@@ -155,11 +155,11 @@
155155 <string name="message_queue_full">"訊息佇列已滿。"</string>
156156 <string name="domain_not_supported">"伺服器不支援網域名稱轉址。"</string>
157157 <string name="unknown_user">"您輸入的使用者名稱無法辨識。"</string>
158- <string name="recipient_blocked_the_user">"抱歉,您被此使用者封鎖。"</string>
158+ <string name="recipient_blocked_the_user">"很抱歉,您被此使用者封鎖。"</string>
159159 <string name="session_expired">"登入時限已到,請重新登入。"</string>
160- <string name="forced_logout">"您已在其他程式登入。"</string>
161- <string name="already_logged_in">"您已在另一台機器上登入。"</string>
162- <string name="msisdn_error">"抱歉,無法從 SIM 卡讀取電話號碼。請與您的服務商尋求協助。"</string>
160+ <string name="forced_logout">"您已在其他用戶端登入。"</string>
161+ <string name="already_logged_in">"您已在其他用戶端登入。"</string>
162+ <string name="msisdn_error">"很抱歉,無法從 SIM 卡讀取電話號碼。請向您的電信業者尋求協助。"</string>
163163 <string name="not_signed_in">"您尚未登入。"</string>
164164 <string name="general_error">"錯誤代碼 <xliff:g id="CODE">%1$d</xliff:g>"</string>
165165 <string-array name="default_smiley_names">
--- a/samples/PluginDemo/res/values-de/strings.xml
+++ b/samples/PluginDemo/res/values-de/strings.xml
@@ -38,7 +38,7 @@
3838 <item>"Glücklich"</item>
3939 <item>"Traurig"</item>
4040 <item>"Zwinkern"</item>
41- <item>"Zunge rausstrecken"</item>
41+ <item>"Zunge herausstrecken"</item>
4242 <item>"Überrascht"</item>
4343 <item>"Kuss"</item>
4444 <item>"Schreien"</item>
--- /dev/null
+++ b/samples/PluginDemo/res/values-es-rUS/strings.xml
@@ -0,0 +1,75 @@
1+<?xml version="1.0" encoding="UTF-8"?>
2+<!-- Copyright (C) 2009 The Android Open Source Project
3+
4+ Licensed under the Apache License, Version 2.0 (the "License");
5+ you may not use this file except in compliance with the License.
6+ You may obtain a copy of the License at
7+
8+ http://www.apache.org/licenses/LICENSE-2.0
9+
10+ Unless required by applicable law or agreed to in writing, software
11+ distributed under the License is distributed on an "AS IS" BASIS,
12+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13+ See the License for the specific language governing permissions and
14+ limitations under the License.
15+-->
16+<resources xmlns:android="http://schemas.android.com/apk/res/android"
17+ xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
18+ <string name="menu_add_contact">"Agregar contacto"</string>
19+ <string name="menu_remove_contact">"Eliminar contacto"</string>
20+ <string name="menu_block_contact">"Bloquear"</string>
21+ <string name="menu_contact_list">"Lista de contactos"</string>
22+ <string name="menu_start_chat">"Enviar mensajería instantánea"</string>
23+ <string name="menu_view_profile">"Información de Buddy"</string>
24+ <string name="menu_end_conversation">"Finalizar conversación"</string>
25+ <string name="menu_switch_chats">"Modificar chats"</string>
26+ <string name="menu_insert_smiley">"Insertar emoticones"</string>
27+ <string name="sign_up">"Obtén una cuenta nueva"</string>
28+ <string name="check_save_password">"Para tu seguridad, si pierdes o te roban el teléfono, ingresa al sitio web desde tu computadora y cambia la contraseña."</string>
29+ <string name="buddy_list_title">"Lista de contactos - <xliff:g id="USERNAME">%1$s</xliff:g>"</string>
30+ <string name="label_username">"Nombre de usuario:"</string>
31+ <string name="ongoing_conversation">"Conversaciones (<xliff:g id="NUMBER">%1$d</xliff:g>)"</string>
32+ <string name="contact_profile_title">"Información de contacto"</string>
33+ <string name="presence_available">"Disponible"</string>
34+ <string name="add_contact_title">"Agregar contacto"</string>
35+ <string name="input_contact_label">"Nombre en pantalla de la persona que deseas agregar:"</string>
36+ <string name="invite_label">"Agregar Buddy"</string>
37+ <string-array name="smiley_names">
38+ <item>"Feliz"</item>
39+ <item>"Triste"</item>
40+ <item>"Guiñando un ojo"</item>
41+ <item>"Con la lengua afuera"</item>
42+ <item>"Sorprendido"</item>
43+ <item>"Besando"</item>
44+ <item>"Gritando"</item>
45+ <item>"En la onda"</item>
46+ <item>"Dinero en boca"</item>
47+ <item>"Meter la pata"</item>
48+ <item>"Avergonzado"</item>
49+ <item>"Ángel"</item>
50+ <item>"Indeciso"</item>
51+ <item>"Llorando"</item>
52+ <item>"Los labios están cerrados"</item>
53+ <item>"Riendo"</item>
54+ <item>"Confundido"</item>
55+ </string-array>
56+ <string-array name="smiley_texts">
57+ <item>":-)"</item>
58+ <item>":-("</item>
59+ <item>";-)"</item>
60+ <item>":-P"</item>
61+ <item>"=-O"</item>
62+ <item>":-*"</item>
63+ <item>":O"</item>
64+ <item>"B-)"</item>
65+ <item>":-$"</item>
66+ <item>":-!"</item>
67+ <item>":-["</item>
68+ <item>"O:-)"</item>
69+ <item>":-\\"</item>
70+ <item>":\'("</item>
71+ <item>":-X"</item>
72+ <item>":-D"</item>
73+ <item>"o_O"</item>
74+ </string-array>
75+</resources>
--- /dev/null
+++ b/samples/PluginDemo/res/values-pt/strings.xml
@@ -0,0 +1,75 @@
1+<?xml version="1.0" encoding="UTF-8"?>
2+<!-- Copyright (C) 2009 The Android Open Source Project
3+
4+ Licensed under the Apache License, Version 2.0 (the "License");
5+ you may not use this file except in compliance with the License.
6+ You may obtain a copy of the License at
7+
8+ http://www.apache.org/licenses/LICENSE-2.0
9+
10+ Unless required by applicable law or agreed to in writing, software
11+ distributed under the License is distributed on an "AS IS" BASIS,
12+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13+ See the License for the specific language governing permissions and
14+ limitations under the License.
15+-->
16+<resources xmlns:android="http://schemas.android.com/apk/res/android"
17+ xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
18+ <string name="menu_add_contact">"Adicionar contato"</string>
19+ <string name="menu_remove_contact">"Excluir contato"</string>
20+ <string name="menu_block_contact">"Bloquear"</string>
21+ <string name="menu_contact_list">"Lista de contatos"</string>
22+ <string name="menu_start_chat">"Enviar MI"</string>
23+ <string name="menu_view_profile">"Informações de amigo"</string>
24+ <string name="menu_end_conversation">"Encerrar conversa"</string>
25+ <string name="menu_switch_chats">"Trocar chats"</string>
26+ <string name="menu_insert_smiley">"Inserir emoticons"</string>
27+ <string name="sign_up">"Obter uma nova conta"</string>
28+ <string name="check_save_password">"Para sua segurança, se você perder o seu telefone ou ele for roubado, acesse o site no seu computador e mude sua senha."</string>
29+ <string name="buddy_list_title">"Lista de contatos - <xliff:g id="USERNAME">%1$s</xliff:g>"</string>
30+ <string name="label_username">"Nome de usuário:"</string>
31+ <string name="ongoing_conversation">"Conversas (<xliff:g id="NUMBER">%1$d</xliff:g>)"</string>
32+ <string name="contact_profile_title">"Informações de contato"</string>
33+ <string name="presence_available">"Disponível"</string>
34+ <string name="add_contact_title">"Adicionar contato"</string>
35+ <string name="input_contact_label">"Nome de tela da pessoa que deseja adicionar:"</string>
36+ <string name="invite_label">"Adicionar amigo"</string>
37+ <string-array name="smiley_names">
38+ <item>"Feliz"</item>
39+ <item>"Triste"</item>
40+ <item>"Piscando"</item>
41+ <item>"Língua de fora"</item>
42+ <item>"Surpreso"</item>
43+ <item>"Beijo"</item>
44+ <item>"Gritando"</item>
45+ <item>"Descontraído"</item>
46+ <item>"Cifrão na boca"</item>
47+ <item>"Bola fora"</item>
48+ <item>"Constrangido"</item>
49+ <item>"Anjo"</item>
50+ <item>"Indeciso"</item>
51+ <item>"Chorando"</item>
52+ <item>"Boca fechada"</item>
53+ <item>"Sorrindo"</item>
54+ <item>"Confuso"</item>
55+ </string-array>
56+ <string-array name="smiley_texts">
57+ <item>":-)"</item>
58+ <item>":-("</item>
59+ <item>";-)"</item>
60+ <item>":-P"</item>
61+ <item>"=-O"</item>
62+ <item>":-*"</item>
63+ <item>":O"</item>
64+ <item>"B-)"</item>
65+ <item>":-$"</item>
66+ <item>":-!"</item>
67+ <item>":-["</item>
68+ <item>"O:-)"</item>
69+ <item>":-\\"</item>
70+ <item>":\'("</item>
71+ <item>":-X"</item>
72+ <item>":-D"</item>
73+ <item>"o_O"</item>
74+ </string-array>
75+</resources>
--- a/samples/PluginDemo/res/values-zh-rTW/strings.xml
+++ b/samples/PluginDemo/res/values-zh-rTW/strings.xml
@@ -15,24 +15,24 @@
1515 -->
1616 <resources xmlns:android="http://schemas.android.com/apk/res/android"
1717 xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
18- <string name="menu_add_contact">"新增連絡人"</string>
19- <string name="menu_remove_contact">"刪除連絡人"</string>
18+ <string name="menu_add_contact">"新增聯絡人"</string>
19+ <string name="menu_remove_contact">"刪除聯絡人"</string>
2020 <string name="menu_block_contact">"封鎖"</string>
21- <string name="menu_contact_list">"連絡人清單"</string>
21+ <string name="menu_contact_list">"聯絡人清單"</string>
2222 <string name="menu_start_chat">"傳送即時訊息"</string>
2323 <string name="menu_view_profile">"好友資訊"</string>
2424 <string name="menu_end_conversation">"結束對談"</string>
25- <string name="menu_switch_chats">"切換交談"</string>
25+ <string name="menu_switch_chats">"切換即時通訊"</string>
2626 <string name="menu_insert_smiley">"插入表情符號"</string>
2727 <string name="sign_up">"取得新帳戶"</string>
2828 <string name="check_save_password">"為了安全起見,如果電話遺失或遭竊,請使用電腦前往該網站並變更密碼。"</string>
29- <string name="buddy_list_title">"連絡人清單 - <xliff:g id="USERNAME">%1$s</xliff:g>"</string>
29+ <string name="buddy_list_title">"聯絡人清單 - <xliff:g id="USERNAME">%1$s</xliff:g>"</string>
3030 <string name="label_username">"使用者名稱:"</string>
3131 <string name="ongoing_conversation">"對談 (<xliff:g id="NUMBER">%1$d</xliff:g>)"</string>
32- <string name="contact_profile_title">"連絡人資訊"</string>
32+ <string name="contact_profile_title">"聯絡人資訊"</string>
3333 <string name="presence_available">"可用"</string>
34- <string name="add_contact_title">"新增連絡人"</string>
35- <string name="input_contact_label">"要新增之連絡人在畫面上的名稱:"</string>
34+ <string name="add_contact_title">"新增聯絡人"</string>
35+ <string name="input_contact_label">"要新增之聯絡人在畫面上的名稱:"</string>
3636 <string name="invite_label">"新增好友"</string>
3737 <string-array name="smiley_names">
3838 <item>"開心"</item>
--- a/src/com/android/im/imps/SmsCirChannel.java
+++ b/src/com/android/im/imps/SmsCirChannel.java
@@ -22,8 +22,8 @@ import com.android.im.engine.SmsService;
2222 import com.android.im.engine.SystemService;
2323 import com.android.im.engine.SmsService.SmsListener;
2424 import com.android.im.engine.SmsService.SmsSendFailureCallback;
25-import com.android.internal.telephony.gsm.EncodeException;
26-import com.android.internal.telephony.gsm.GsmAlphabet;
25+import com.android.internal.telephony.EncodeException;
26+import com.android.internal.telephony.GsmAlphabet;
2727
2828 public class SmsCirChannel extends CirChannel
2929 implements SmsListener, SmsSendFailureCallback {
--- a/src/com/android/im/service/AndroidSmsService.java
+++ b/src/com/android/im/service/AndroidSmsService.java
@@ -31,8 +31,8 @@ import android.net.Uri;
3131 import android.provider.Telephony;
3232 import static android.provider.Telephony.Sms.Intents.DATA_SMS_RECEIVED_ACTION;
3333 import android.telephony.PhoneNumberUtils;
34-import android.telephony.gsm.SmsManager;
35-import android.telephony.gsm.SmsMessage;
34+import android.telephony.SmsManager;
35+import android.telephony.SmsMessage;
3636 import android.util.Log;
3737
3838 import com.android.im.engine.SmsService;
Show on old repository browser