am 2a7e29a4: Reconcile with jb-release
* commit '2a7e29a49148e428f32576a65efffc91f6332bfe':
diff --git a/res/values-cs/strings.xml b/res/values-cs/strings.xml
index a6b497d..5600ac8 100644
--- a/res/values-cs/strings.xml
+++ b/res/values-cs/strings.xml
@@ -109,7 +109,7 @@
<string name="transfer_clear_dlg_msg" msgid="1712376797268438075">"Ze seznamu budou vymazány všechny položky."</string>
<string name="outbound_noti_title" msgid="8051906709452260849">"Sdílení Bluetooth: Odeslané soubory"</string>
<string name="inbound_noti_title" msgid="4143352641953027595">"Sdílení Bluetooth: Přijaté soubory"</string>
- <string name="noti_caption" msgid="7508708288885707365">"Úspěšné operace: <xliff:g id="SUCCESSFUL_NUMBER_0">%1$s</xliff:g>, neúspěšné operace: <xliff:g id="UNSUCCESSFUL_NUMBER">%2$s</xliff:g>."</string>
+ <string name="noti_caption" msgid="7508708288885707365">"Úspěšné: <xliff:g id="SUCCESSFUL_NUMBER_0">%1$s</xliff:g>, neúspěšné: <xliff:g id="UNSUCCESSFUL_NUMBER">%2$s</xliff:g>."</string>
<string name="transfer_menu_clear_all" msgid="790017462957873132">"Vymazat seznam"</string>
<string name="transfer_menu_open" msgid="3368984869083107200">"Otevřít"</string>
<string name="transfer_menu_clear" msgid="5854038118831427492">"Vymazat ze seznamu"</string>
diff --git a/res/values-en-rGB/strings.xml b/res/values-en-rGB/strings.xml
index 87f5f91..47ebdee 100644
--- a/res/values-en-rGB/strings.xml
+++ b/res/values-en-rGB/strings.xml
@@ -26,7 +26,7 @@
<string name="unknown_device" msgid="9221903979877041009">"Unknown device"</string>
<string name="unknownNumber" msgid="4994750948072751566">"Unknown"</string>
<string name="airplane_error_title" msgid="2683839635115739939">"Aeroplane mode"</string>
- <string name="airplane_error_msg" msgid="8698965595254137230">"You can\'t use Bluetooth in Airplane mode."</string>
+ <string name="airplane_error_msg" msgid="8698965595254137230">"You can\'t use Bluetooth in Aeroplane mode."</string>
<string name="bt_enable_title" msgid="8657832550503456572"></string>
<string name="bt_enable_line1" msgid="7203551583048149">"To use Bluetooth services, you must first turn on Bluetooth."</string>
<string name="bt_enable_line2" msgid="4341936569415937994">"Turn on Bluetooth now?"</string>
diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml
index df33c65..5921493 100644
--- a/res/values-es/strings.xml
+++ b/res/values-es/strings.xml
@@ -38,16 +38,16 @@
<string name="incoming_file_confirm_ok" msgid="281462442932231475">"Aceptar"</string>
<string name="incoming_file_confirm_timeout_ok" msgid="1414676773249857278">"Aceptar"</string>
<string name="incoming_file_confirm_timeout_content" msgid="172779756093975981">"Se ha agotado el tiempo para aceptar el archivo entrante de \"<xliff:g id="SENDER">%1$s</xliff:g>\"."</string>
- <string name="incoming_file_confirm_Notification_title" msgid="2958227698135117210">"Compartir con Bluetooth: archivo entrante"</string>
+ <string name="incoming_file_confirm_Notification_title" msgid="2958227698135117210">"Bluetooth: archivo entrante"</string>
<string name="incoming_file_confirm_Notification_caption" msgid="6671081128475981157">"¿Quieres recibir este archivo?"</string>
<string name="incoming_file_toast_msg" msgid="1733710749992901811">"Otro dispositivo quiere enviarte un archivo. Confirma que quieres recibirlo."</string>
- <string name="notification_receiving" msgid="4674648179652543984">"Compartir con Bluetooth: recibiendo <xliff:g id="FILE">%1$s</xliff:g>"</string>
+ <string name="notification_receiving" msgid="4674648179652543984">"Bluetooth: recibiendo <xliff:g id="FILE">%1$s</xliff:g>"</string>
<string name="notification_received" msgid="3324588019186687985">"Compartir con Bluetooth: <xliff:g id="FILE">%1$s</xliff:g> recibido"</string>
- <string name="notification_received_fail" msgid="3619350997285714746">"Compartir con Bluetooth: archivo <xliff:g id="FILE">%1$s</xliff:g> no recibido"</string>
- <string name="notification_sending" msgid="3035748958534983833">"Compartir con Bluetooth: enviando <xliff:g id="FILE">%1$s</xliff:g>"</string>
- <string name="notification_sent" msgid="9218710861333027778">"Compartir con Bluetooth: <xliff:g id="FILE">%1$s</xliff:g> enviado"</string>
+ <string name="notification_received_fail" msgid="3619350997285714746">"Bluetooth: <xliff:g id="FILE">%1$s</xliff:g> no recibido"</string>
+ <string name="notification_sending" msgid="3035748958534983833">"Bluetooth: enviando <xliff:g id="FILE">%1$s</xliff:g>"</string>
+ <string name="notification_sent" msgid="9218710861333027778">"Bluetooth: <xliff:g id="FILE">%1$s</xliff:g> enviado"</string>
<string name="notification_sent_complete" msgid="302943281067557969">"100% completado"</string>
- <string name="notification_sent_fail" msgid="6696082233774569445">"Compartir con Bluetooth: el archivo <xliff:g id="FILE">%1$s</xliff:g> no se ha enviado."</string>
+ <string name="notification_sent_fail" msgid="6696082233774569445">"Bluetooth: archivo <xliff:g id="FILE">%1$s</xliff:g> no enviado"</string>
<string name="download_title" msgid="3353228219772092586">"Transferencia de archivos"</string>
<string name="download_line1" msgid="4926604799202134144">"De: \"<xliff:g id="SENDER">%1$s</xliff:g>\""</string>
<string name="download_line2" msgid="5876973543019417712">"Archivo: <xliff:g id="FILE">%1$s</xliff:g>"</string>
@@ -78,7 +78,7 @@
<string name="not_exist_file_desc" msgid="4059531573790529229">"El archivo no existe. "\n</string>
<string name="enabling_progress_title" msgid="436157952334723406">"Por favor, espera..."</string>
<string name="enabling_progress_content" msgid="4601542238119927904">"Activando Bluetooth..."</string>
- <string name="bt_toast_1" msgid="972182708034353383">"Se recibirá el archivo. Comprueba el progreso en el panel de notificaciones."</string>
+ <string name="bt_toast_1" msgid="972182708034353383">"Se recibirá el archivo. Comprueba el progreso en la barra de notificaciones."</string>
<string name="bt_toast_2" msgid="8602553334099066582">"No se puede recibir el archivo."</string>
<string name="bt_toast_3" msgid="6707884165086862518">"Se ha detenido la recepción del archivo de \"<xliff:g id="SENDER">%1$s</xliff:g>\""</string>
<string name="bt_toast_4" msgid="4678812947604395649">"Enviando archivo a \"<xliff:g id="RECIPIENT">%1$s</xliff:g>\""</string>
@@ -100,15 +100,15 @@
<string name="status_connection_error" msgid="947681831523219891">"Conexión incorrecta"</string>
<string name="status_protocol_error" msgid="3245444473429269539">"No se puede procesar la solicitud correctamente."</string>
<string name="status_unknown_error" msgid="8156660554237824912">"Error desconocido"</string>
- <string name="btopp_live_folder" msgid="7967791481444474554">"Bluetooth recibido"</string>
+ <string name="btopp_live_folder" msgid="7967791481444474554">"Recibido por Bluetooth"</string>
<string name="download_success" msgid="7036160438766730871">"Recepción de <xliff:g id="FILE_SIZE">%1$s</xliff:g> completada"</string>
<string name="upload_success" msgid="4014469387779648949">"Envío de <xliff:g id="FILE_SIZE">%1$s</xliff:g> completado"</string>
<string name="inbound_history_title" msgid="6940914942271327563">"Transferencias entrantes"</string>
<string name="outbound_history_title" msgid="4279418703178140526">"Transferencias salientes"</string>
<string name="no_transfers" msgid="3482965619151865672">"El historial de transferencias está vacío."</string>
<string name="transfer_clear_dlg_msg" msgid="1712376797268438075">"Se borrarán todos los elementos de la lista."</string>
- <string name="outbound_noti_title" msgid="8051906709452260849">"Compartir con Bluetooth: archivos enviados"</string>
- <string name="inbound_noti_title" msgid="4143352641953027595">"Compartir con Bluetooth: archivos recibidos"</string>
+ <string name="outbound_noti_title" msgid="8051906709452260849">"Bluetooth: archivos enviados"</string>
+ <string name="inbound_noti_title" msgid="4143352641953027595">"Bluetooth: archivos recibidos"</string>
<string name="noti_caption" msgid="7508708288885707365">"Correctos: <xliff:g id="SUCCESSFUL_NUMBER_0">%1$s</xliff:g>; error en <xliff:g id="UNSUCCESSFUL_NUMBER">%2$s</xliff:g>"</string>
<string name="transfer_menu_clear_all" msgid="790017462957873132">"Borrar lista"</string>
<string name="transfer_menu_open" msgid="3368984869083107200">"Abrir"</string>
diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml
index 19f0caa..b642fc3 100644
--- a/res/values-zh-rCN/strings.xml
+++ b/res/values-zh-rCN/strings.xml
@@ -105,7 +105,7 @@
<string name="upload_success" msgid="4014469387779648949">"<xliff:g id="FILE_SIZE">%1$s</xliff:g> 发送完成。"</string>
<string name="inbound_history_title" msgid="6940914942271327563">"传入历史记录"</string>
<string name="outbound_history_title" msgid="4279418703178140526">"传出历史记录"</string>
- <string name="no_transfers" msgid="3482965619151865672">"传输历史记录为空。"</string>
+ <string name="no_transfers" msgid="3482965619151865672">"没有传输历史记录。"</string>
<string name="transfer_clear_dlg_msg" msgid="1712376797268438075">"所有项都将从列表中清除。"</string>
<string name="outbound_noti_title" msgid="8051906709452260849">"蓝牙共享：已发送的文件"</string>
<string name="inbound_noti_title" msgid="4143352641953027595">"蓝牙共享：已接收的文件"</string>
diff --git a/res/values-zh-rTW/strings.xml b/res/values-zh-rTW/strings.xml
index dd9535f..13f9776 100644
--- a/res/values-zh-rTW/strings.xml
+++ b/res/values-zh-rTW/strings.xml
@@ -100,7 +100,7 @@
<string name="status_connection_error" msgid="947681831523219891">"連線失敗。"</string>
<string name="status_protocol_error" msgid="3245444473429269539">"無法正確處理要求。"</string>
<string name="status_unknown_error" msgid="8156660554237824912">"未知的錯誤。"</string>
- <string name="btopp_live_folder" msgid="7967791481444474554">"已透過藍牙接收"</string>
+ <string name="btopp_live_folder" msgid="7967791481444474554">"已透過藍牙接收的檔案"</string>
<string name="download_success" msgid="7036160438766730871">"已完成 <xliff:g id="FILE_SIZE">%1$s</xliff:g> 的接收作業。"</string>
<string name="upload_success" msgid="4014469387779648949">"已完成 <xliff:g id="FILE_SIZE">%1$s</xliff:g> 的傳送作業。"</string>
<string name="inbound_history_title" msgid="6940914942271327563">"向內傳輸"</string>
