merge in jb-release history after reset to jb-dev
diff --git a/res/values-es-rUS/strings.xml b/res/values-es-rUS/strings.xml
index 9abc3b7..5326009 100644
--- a/res/values-es-rUS/strings.xml
+++ b/res/values-es-rUS/strings.xml
@@ -11,8 +11,8 @@
<string name="touch" msgid="4727218133711188355">"Tocar para transmitir"</string>
<string name="beam_progress" msgid="7453634884807323920">"Transmisión entrante..."</string>
<string name="beam_complete" msgid="477026736424637435">"Transmisión completa"</string>
- <string name="beam_failed" msgid="5116241718189888630">"La transferencia no se completó"</string>
- <string name="beam_canceled" msgid="5425192751826544741">"Transferencia cancelada"</string>
+ <string name="beam_failed" msgid="5116241718189888630">"La transmisión no se completó"</string>
+ <string name="beam_canceled" msgid="5425192751826544741">"Transmisión cancelada"</string>
<string name="cancel" msgid="61873902552555096">"Cancelar"</string>
<string name="beam_touch_to_view" msgid="7853129156831642630">"Toca para ver"</string>
<string name="beam_handover_not_supported" msgid="4083165921751489015">"El dispositivo del receptor no admite la transferencia de archivos de gran tamaño."</string>
@@ -22,8 +22,8 @@
<string name="disconnecting_headset" msgid="868262189044372780">"Desconectando..."</string>
<string name="disconnected_headset" msgid="4066109452701733916">"Desconectados"</string>
<string name="pairing_headset" msgid="6443461444755646137">"Sincronizando..."</string>
- <string name="pairing_headset_failed" msgid="6509629663883514688">"No se pudo vincular"</string>
- <string name="failed_to_enable_bt" msgid="7229153323594758077">"Error al habilitar Bluetooth"</string>
+ <string name="pairing_headset_failed" msgid="6509629663883514688">"No se pudo sincronizar"</string>
+ <string name="failed_to_enable_bt" msgid="7229153323594758077">"Error al activar Bluetooth"</string>
<string name="confirm_pairing" msgid="4112568077038265363">"¿Realmente deseas sincronizar el dispositivo Bluetooth <xliff:g id="DEVICE_NAME">%1$s</xliff:g>?"</string>
<string name="pair_yes" msgid="3525614878559994448">"Sí"</string>
<string name="pair_no" msgid="5022308368904055020">"No"</string>
diff --git a/res/values-ms/strings.xml b/res/values-ms/strings.xml
index 8f3b659..7e53ff3 100644
--- a/res/values-ms/strings.xml
+++ b/res/values-ms/strings.xml
@@ -15,16 +15,15 @@
<string name="beam_canceled" msgid="5425192751826544741">"Pancar dibatalkan"</string>
<string name="cancel" msgid="61873902552555096">"Batal"</string>
<string name="beam_touch_to_view" msgid="7853129156831642630">"Sentuh untuk melihat"</string>
- <!-- no translation found for beam_handover_not_supported (4083165921751489015) -->
- <skip />
+ <string name="beam_handover_not_supported" msgid="4083165921751489015">"Peranti penerima tidak menyokong pemindahan fail besar melalui pancaran."</string>
<string name="connecting_headset" msgid="3929250919225573008">"Menyambung"</string>
<string name="connected_headset" msgid="4047751837023241955">"Disambungkan"</string>
- <string name="connect_headset_failed" msgid="7500801585498094863">"Tidak boleh menyambung"</string>
+ <string name="connect_headset_failed" msgid="7500801585498094863">"Tidak dapat menyambung"</string>
<string name="disconnecting_headset" msgid="868262189044372780">"Memutuskan sambungan"</string>
<string name="disconnected_headset" msgid="4066109452701733916">"Diputuskan sambungan"</string>
<string name="pairing_headset" msgid="6443461444755646137">"Menjadikan pasangan"</string>
- <string name="pairing_headset_failed" msgid="6509629663883514688">"Tidak boleh berpasangan"</string>
- <string name="failed_to_enable_bt" msgid="7229153323594758077">"Tidak boleh mendayakan Bluetooth"</string>
+ <string name="pairing_headset_failed" msgid="6509629663883514688">"Tidak dapat berpasangan"</string>
+ <string name="failed_to_enable_bt" msgid="7229153323594758077">"Tidak dapat mendayakan Bluetooth"</string>
<string name="confirm_pairing" msgid="4112568077038265363">"Adakah anda pasti anda mahu memadankan peranti Bluetooth <xliff:g id="DEVICE_NAME">%1$s</xliff:g>?"</string>
<string name="pair_yes" msgid="3525614878559994448">"Ya"</string>
<string name="pair_no" msgid="5022308368904055020">"Tidak"</string>
