diff --git a/Makefile b/Makefile
index 74c8b1396..629e6062f 100644
--- a/Makefile
+++ b/Makefile
@@ -510,3 +510,9 @@ linphone-android-sdk: generate-apk
 mediastreamer2-sdk: update-mediastreamer2-project generate-mediastreamer2-apk
 	@cd $(TOPDIR)/submodules/linphone/mediastreamer2/java && \
 	$(ANT) mediastreamer2-sdk
+
+pull-transifex:
+	tx pull -af
+
+push-transifex:
+	tx push -s -t -f
diff --git a/res/values-ar/strings.xml b/res/values-ar/strings.xml
index a90710657..0f1eac98d 100644
--- a/res/values-ar/strings.xml
+++ b/res/values-ar/strings.xml
@@ -117,7 +117,7 @@
   <string name="pref_ilbc_summary">قد يكون iLBC غير متاحة وذلك حسب معالج ARM وإصدار نظام تشغيل أندرويد.</string>
   <string name="pref_echo_cancellation">إزالة الصدى</string>
   <string name="pref_autostart">البدء خلال الإقلاع</string>
-  <string name="pref_enable_outbound_proxy">وسيط خارج النطاق</string>
+  <string name="pref_enable_outbound_proxy">وسيط التوجُّه</string>
   <string name="pref_codecs">المراميز</string>
   <string name="pref_communication_expire_title">مهلة الاتصال</string>
   <string name="pref_incoming_expire_title">مهلة المكالمة الواردة</string>
@@ -237,7 +237,7 @@
   <string name="call_stats_upload">صبيب الرفع :</string>
   <string name="call_stats_download">صبيب التنزيل :</string>
   <string name="call_stats_ice">توصيل ICE :</string>
-  <string name="call_stats_video_resolution">مقاس الفيديو :</string>
+  <string name="call_stats_video_resolution">حجم الفيديو :</string>
   <!--Used by Android to help blind people by describing them images-->
   <string name="content_description_add_contact">إضافة إلى زر جهات الاتصال</string>
   <string name="content_description_about"></string>
@@ -292,7 +292,7 @@
   <string name="button_history">التاريخ</string>
   <string name="button_contacts">الأسماء</string>
   <string name="button_settings">اﻹعدادات</string>
-  <string name="button_chat">البوابة</string>
+  <string name="button_chat">المحادثة</string>
   <string name="button_about">حول</string>
   <string name="button_setup_cancel">إلغاء</string>
   <string name="button_setup_back">الرجوع</string>
diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml
index 37b6475cc..4227b9c83 100644
--- a/res/values-de/strings.xml
+++ b/res/values-de/strings.xml
@@ -283,7 +283,7 @@
   <string name="button_history">Historie</string>
   <string name="button_contacts">Kontakte</string>
   <string name="button_settings">Einstellungen</string>
-  <string name="button_chat">Tor</string>
+  <string name="button_chat">Nachrichten</string>
   <string name="button_about">Über</string>
   <string name="button_setup_cancel">Abbrechen</string>
   <string name="button_setup_back">Zurück</string>
diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml
new file mode 100644
index 000000000..b156f4f53
--- /dev/null
+++ b/res/values-es/strings.xml
@@ -0,0 +1,156 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<resources>
+  <string name="pref_disable_account">Deshabilitar</string>
+  <string name="pref_tunnel">Túnel</string>
+  <string name="pref_tunnel_port">Puerto</string>
+  <string name="pref_tunnel_mode">Modo</string>
+  <!--do not change order without changing corresponding entry_values in non_localizable_strings.xml-->
+  <string-array name="tunnel_mode_entries">
+    <item>deshabilitado</item>
+    <item>sólo 3G</item>
+    <item>siempre</item>
+    <item>auto</item>
+  </string-array>
+  <string name="not_ready_to_make_new_call">No preparado para una nueva llamada</string>
+  <string name="bad_target_uri">Contacto erróneo: %s</string>
+  <string name="verify_sas_fmt">Verifica %s</string>
+  <string name="communication_encrypted">Cifrado</string>
+  <string name="waiting_for_startup">Comenzando...</string>
+  <string name="couldnt_accept_call">Ocurrió un error al aceptar la llamada</string>
+  <string name="error_adding_new_call">Error al añadir nueva llamada</string>
+  <string name="transfer_started">Transferencia iniciada</string>
+  <string name="transfer_dialog_title">Transferir llamada a</string>
+  <string name="transfer_to_new_call">Nueva llamada</string>
+  <string name="resume_dialog_title">Continuar llamada</string>
+  <string name="cannot_resume_paused_by_remote_call">No puedo continuar una llamada puesta en pausa remotamente</string>
+  <string name="conf_show_details_text">Mostrar detalles</string>
+  <string name="skipable_error_service_not_ready">Aviso: el servicio no está preparado</string>
+  <string name="close_button_text">Cerrar</string>
+  <string name="status_active_call">activa</string>
+  <string name="state_paused">puesta en pausa</string>
+  <string name="state_paused_by_remote">puesta en pausa remotamente</string>
+  <string name="state_streams_running"></string>
+  <string name="state_incoming_received">entrante</string>
+  <string name="state_outgoing_ringing">sonando</string>
+  <string name="state_outgoing_progress">llamando</string>
+  <string name="mutemic_button_txt">Silenciar</string>
+  <string name="speaker_button_txt">Altavoz</string>
+  <string name="bluetooth_button_txt">Bluetooth</string>
+  <string name="CancelButtonText">Cancelar</string>
+  <string name="AddCallButtonText">Añadir llamada</string>
+  <string name="TransferCallButtonText">Transferir llamada</string>
+  <string name="conf_admin_choice_enter">Entrar en conferencia</string>
+  <string name="conf_admin_choice_leave">Dejar momentáneamente la conferencia</string>
+  <string name="conf_admin_choice_terminate">Terminar la conferencia</string>
+  <string name="hangup">Colgar</string>
+  <string name="conf_simple_merge_bt_txt">Unir</string>
+  <string name="conf_simple_transfer_bt_txt">Transferir</string>
+  <string name="conf_simple_video_bt_txt">vídeo</string>
+  <!--<string name="conf_simple_no_current_call">No active call</string>-->
+  <string name="show_send_dtmfs_button">Teclado numérico</string>
+  <string name="conf_conference">Conferencia</string>
+  <string name="in_conf">Eres parte de ella</string>
+  <string name="in_conf_leave">Salir</string>
+  <string name="out_conf">Has salido de ella</string>
+  <string name="out_conf_enter">Entrar</string>
+  <string name="pref_audio_soft_volume_title">Usar volumen por software</string>
+  <string name="pref_ipv6_title">Usar ipv6 en vez de ipv4</string>
+  <string name="incoming_call_dialog_title">%s le está llamando</string>
+  <string name="accept">Aceptar</string>
+  <string name="decline">Declinar</string>
+  <string name="unknown_incoming_call_name">Desconocido</string>
+  <string name="pref_network_title">Red</string>
+  <string name="pref_transport">Transporte</string>
+  <string name="pref_transport_udp">UDP</string>
+  <string name="pref_transport_tcp">TCP</string>
+  <string name="pref_transport_tls">TLS</string>
+  <string name="pref_transport_use_random_ports">Usar puertos aleatorios</string>
+  <string name="pref_sip_port_title">Puerto SIP a usar</string>
+  <string name="at_least_a_protocol">Se requiere al menos un elemento</string>
+  <string name="error">Error</string>
+  <string name="click_to_show_first_login_view">Empezar</string>
+  <string name="dialer_null_on_new_intent">Aplicación no preparado</string>
+  <string name="pref_add_account">Añadir cuenta</string>
+  <string name="no_phone_numbers">No se encontraron números de teléfono para %s</string>
+  <string name="filter_contacts">Filtrar contactos</string>
+  <string name="title_numbers_dialog">números de teléfono de %s</string>
+  <string name="pref_delete_account">Borrar ésta cuenta</string>
+  <string name="pref_default_account">Usar como predeterminada</string>
+  <string name="pref_echo_canceller_calibration">Calibrado del cancelador de eco</string>
+  <string name="pref_video_use_front_camera_title">Usar cámara frontal</string>
+  <string name="pref_video">Vídeo</string>
+  <string name="pref_preferences">Preferencias</string>
+  <string name="pref_video_codecs_title">Codecs</string>
+  <string name="pref_preferred_video_size">Tamaño de vídeo preferido</string>
+  <string name="menu_videocall_switch_camera_title">Cámara frontal/trasera</string>
+  <string name="menu_videocall_change_resolution_when_low_resolution">Probar alta resolución</string>
+  <string name="menu_videocall_change_resolution_when_high_resolution">Baja resolución</string>
+  <string name="menu_videocall_change_resolution_title">Cambiar resolución</string>
+  <string name="menu_videocall_toggle_camera_disable">Deshabilitar cámara</string>
+  <string name="menu_videocall_toggle_camera_enable">Habilitar cámara</string>
+  <string name="menu_videocall_terminate_call_title">Terminar llamada</string>
+  <string name="pref_video_automatically_share_my_video_title">Compartir mi cámara</string>
+  <string name="pref_video_automatically_accept_video_title">Aceptar peticiones de vídeo entrantes</string>
+  <string name="pref_video_automatically_share_my_video">Enviar mi cámara automáticamente</string>
+  <string name="pref_video_automatically_accept_video">Aceptar peticiones de vídeo siempre</string>
+  <string name="pref_video_initiate_call_with_video_title">Iniciar videollamadas</string>
+  <string name="pref_video_initiate_call_with_video">Siempre enviar peticiones de vídeo</string>
+  <string name="pref_video_enable_title">Habilitar Vídeo</string>
+  <string name="pref_animation_enable_title">Habilitar animaciones</string>
+  <string name="pref_escape_plus">Sustituir + por 00</string>
+  <string name="pref_ilbc_summary">iLBC puede no estar disponible dependiendo del procesador ARM y la versión de S.O. Android</string>
+  <string name="pref_echo_cancellation">Cancelación de eco</string>
+  <string name="pref_enable_outbound_proxy">Proxy saliente</string>
+  <string name="pref_codecs">Codecs</string>
+  <string name="conference">Conferencia</string>
+  <string name="call_stats_video">Vídeo</string>
+  <!--Used by Android to help blind people by describing them images-->
+  <string name="content_description_about"></string>
+  <string name="content_description_chat"></string>
+  <string name="content_description_dial_back"></string>
+  <string name="content_description_contact_picture"></string>
+  <string name="content_description_send_message"></string>
+  <string name="content_description_detail"></string>
+  <string name="content_description_delete"></string>
+  <string name="content_description_new_discussion"></string>
+  <string name="content_description_edit"></string>
+  <string name="content_description_validate"></string>
+  <string name="content_description_all_contacts"></string>
+  <string name="content_description_linphone_contacts"></string>
+  <string name="content_description_call_direction"></string>
+  <string name="content_description_all_calls"></string>
+  <string name="content_description_missed_calls"></string>
+  <string name="content_description_switch_video"></string>
+  <string name="content_description_toggle_speaker"></string>
+  <string name="content_description_toggle_micro"></string>
+  <string name="content_description_add_call"></string>
+  <string name="content_description_pause"></string>
+  <string name="content_description_hang_up"></string>
+  <string name="content_description_numpad"></string>
+  <string name="content_description_settings"></string>
+  <string name="content_description_dialer"></string>
+  <string name="content_description_history"></string>
+  <string name="content_description_contacts"></string>
+  <string name="content_description_led"></string>
+  <string name="content_description_call_quality"></string>
+  <string name="content_description_encryption"></string>
+  <string name="content_description_switch_camera"></string>
+  <string name="content_description_welcome"></string>
+  <string name="content_description_cancel"></string>
+  <string name="content_description_next"></string>
+  <string name="content_description_back"></string>
+  <string name="content_description_setup_ok"></string>
+  <string name="content_description_message_status"></string>
+  <string name="content_description_conference"></string>
+  <string name="content_description_mark"></string>
+  <string name="button_setup_cancel">Cancelar</string>
+  <string name="button_cancel">Cancelar</string>
+  <string name="button_transfer">Transferir</string>
+  <string name="button_add_call">Añadir llamada</string>
+  <string name="button_video">Vídeo</string>
+  <string name="button_speaker">Altavoz</string>
+  <string name="button_bluetooth">Bluetooth</string>
+  <string name="call_update_yes">Aceptar</string>
+  <string name="call_update_no">Declinar</string>
+  <string name="zrtp_accept">Aceptar</string>
+</resources>
diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml
index 844d91345..02b6a6ab6 100644
--- a/res/values-fr/strings.xml
+++ b/res/values-fr/strings.xml
@@ -301,7 +301,6 @@
   <string name="button_edit">Modifier</string>
   <string name="button_cancel">Annuler</string>
   <string name="button_ok">Valider</string>
-  <string name="button_back">Retour</string>
   <string name="button_all_contacts">Tous</string>
   <string name="button_sip_contacts">SIP</string>
   <string name="button_add_contact">+ Contact</string>
diff --git a/res/values-he/strings.xml b/res/values-he/strings.xml
index 054b2b22d..e5ff6a7f1 100644
--- a/res/values-he/strings.xml
+++ b/res/values-he/strings.xml
@@ -122,7 +122,7 @@
   <string name="button_history">היסטוריה</string>
   <string name="button_contacts">אנשי קשר</string>
   <string name="button_settings">הגדרות</string>
-  <string name="button_chat">שער</string>
+  <string name="button_chat">שיחה</string>
   <string name="button_about">אודות</string>
   <string name="button_setup_cancel">ביטול</string>
   <string name="button_setup_back">חזור</string>
diff --git a/res/values-ja/strings.xml b/res/values-ja/strings.xml
index 020d870ff..eec3ffa3e 100644
--- a/res/values-ja/strings.xml
+++ b/res/values-ja/strings.xml
@@ -292,7 +292,7 @@
   <string name="button_history">履歴</string>
   <string name="button_contacts">コンタクト</string>
   <string name="button_settings">設定</string>
-  <string name="button_chat">ゲート</string>
+  <string name="button_chat">チャット</string>
   <string name="button_about">アバウト</string>
   <string name="button_setup_cancel">キャンセル</string>
   <string name="button_setup_back">戻る</string>
diff --git a/res/values-nl/strings.xml b/res/values-nl/strings.xml
index 6f4e6826c..92bd5b817 100644
--- a/res/values-nl/strings.xml
+++ b/res/values-nl/strings.xml
@@ -158,6 +158,7 @@
   <string name="button_history">Geschiedenis</string>
   <string name="button_contacts">Contacten</string>
   <string name="button_settings">Instellingen</string>
+  <string name="button_chat">Chat</string>
   <string name="button_about">Over</string>
   <string name="button_setup_cancel">Annuleren</string>
   <string name="button_cancel">Annuleren</string>