diff --git a/android/res/values-de/strings.xml b/android/res/values-de/strings.xml
index c4bb3945b..c0d9eec09 100644
--- a/android/res/values-de/strings.xml
+++ b/android/res/values-de/strings.xml
@@ -99,4 +99,4 @@
   <string name="share_name">Weitergabe mittels Barcode</string>
   <string name="title_about">Barcode Scanner v</string>
   <string name="zxing_url">http://code.google.com/p/zxing</string>
-</resources>
+</resources>
\ No newline at end of file
diff --git a/android/res/values-es/strings.xml b/android/res/values-es/strings.xml
index 01083d03c..fcdf43510 100644
--- a/android/res/values-es/strings.xml
+++ b/android/res/values-es/strings.xml
@@ -15,88 +15,88 @@
  limitations under the License.
  -->
 <resources>
-   <string name="app_name">Escáner de código de barras</string>
-   <string name="bookmark_picker_name">Marcadores</string>
-   <string name="button_add_calendar">Añadir a calendario</string>
-   <string name="button_add_contact">Añadir contacto</string>
-   <string name="button_back">Atrás</string>
-   <string name="button_book_search">Búsqueda de libros</string>
-   <string name="button_cancel">Cancelar</string>
-   <string name="button_clipboard_empty">Portapapeles vacía</string>
-   <string name="button_custom_product_search">Búsqueda personalizada</string>
-   <string name="button_dial">Marcar número</string>
-   <string name="button_done">Terminar</string>
-   <string name="button_email">Enviar correo electrónico</string>
-   <string name="button_get_directions">Obtener direcciones</string>
-   <string name="button_mms">Enviar MMS</string>
-   <string name="button_ok">OK</string>
-   <string name="button_open_browser">Abrir navegador</string>
-   <string name="button_product_search">Búsqueda de productos</string>
-   <string name="button_search_book_contents">Buscar contenido del libro</string>
-   <string name="button_read_book">Búsqueda de libro</string>
-   <string name="button_share_bookmark">Compartir marcador</string>
-   <string name="button_share_by_email">Compartir por correo electrónico</string>
-   <string name="button_share_by_sms">Compartir por SMS</string>
-   <string name="button_share_clipboard">Compartir portapapeles</string>
-   <string name="button_share_contact">Compartir contacto</string>
-   <string name="button_show_map">Mostrar mapa</string>
-   <string name="button_sms">Enviar SMS</string>
-   <string name="button_web_search">Búsqueda Web</string>
-   <string name="contents_contact">Información de contacto</string>
-   <string name="contents_email">Dirección de correo electrónico</string>
-   <string name="contents_location">Coordenadas geográficas</string>
-   <string name="contents_phone">Número de teléfono</string>
-   <string name="contents_sms">Dirección SMS</string>
-   <string name="contents_text">Texto</string>
-   <string name="menu_about">Acerca de</string>
-   <string name="menu_help">Ayuda</string>
-   <string name="menu_settings">Configuración</string>
-   <string name="menu_history">Historia</string>
-   <string name="menu_share">Compartir</string>
-   <string name="msg_about">Basado en la libreria de código de barras de código abierto ZXing</string>
-   <string name="msg_default_contents">Contenidos</string>
-   <string name="msg_default_format">Formato</string>
-   <string name="msg_default_mms_subject">Hola</string>
-   <string name="msg_default_status">Coloque un código de barras en el interior del rectángulo de visor para escanear.</string>
-   <string name="msg_default_type">Tipo</string>
-   <string name="msg_encode_barcode_failed">No se pudo generar el código de barras solicitado.</string>
-   <string name="msg_encode_contents_failed">No puede codificar un código de barras con estos datos.</string>
-   <string name="msg_encode_in_progress">Generando un código de barras\u2026</string>
-   <string name="msg_intent_failed">Lo sentimos, la aplicación solicitada no pudo ser lanzado. El contenido de código de barras puede ser inválida.</string>
-   <string name="msg_sbc_book_not_searchable">Lo sentimos, no se puede buscar en este libro.</string>
-   <string name="msg_sbc_failed">Lo sentimos, la búsqueda ha detectado un problema.</string>
-   <string name="msg_sbc_no_page_returned">Página no encontrada</string>
-   <string name="msg_sbc_page">Página</string>
-   <string name="msg_sbc_snippet_unavailable">Fragmentos no están disponibles</string>
-   <string name="msg_sbc_unknown_page">Página desconocida</string>
-   <string name="msg_sbc_searching_book">Buscando libro\u2026</string>
-   <string name="msg_share_explanation">Usted puede compartir los datos mostrando un código de barras en la pantalla y escanear con otro teléfono.</string>
-   <string name="msg_share_subject_line">Aquí está el contenido de el código de barras que ha escaneado</string>
-   <string name="preferences_actions_title">Cuando encuentra un código de barras\u2026</string>
-   <string name="preferences_copy_to_clipboard_title">Copiar al portapapeles</string>
-   <string name="preferences_decode_1D_title">Descodificar códigos de barras 1D</string>
-   <string name="preferences_decode_QR_title">Descodificar códigos QR</string>
-   <string name="preferences_general_title">Configuración general</string>
-   <string name="preferences_name">Configuración</string>
-   <string name="preferences_play_beep_title">Bip</string>
-   <string name="preferences_vibrate_title">Vibrar</string>
-   <string name="preferences_result_title">Configuración de resultados</string>
-   <string name="preferences_custom_product_search_title">URL personalizada de búsqueda de productos</string>
-   <string name="preferences_custom_product_search_summary">Usar %s como un marcador de posición para el identificador de producto</string>
-   <string name="result_address_book">Información de contacto encontrado</string>
-   <string name="result_calendar">Evento agendado encontrado</string>
-   <string name="result_email_address">Dirección de correo electrónico encontrado</string>
-   <string name="result_geo">Coordenadas geográficas encontradas</string>
-   <string name="result_isbn">Libro encontrado</string>
-   <string name="result_product">Producto encontrado</string>
-   <string name="result_sms">Dirección de SMS encontrado</string>
-   <string name="result_tel">Número de teléfono encontrado</string>
-   <string name="result_text">Texto encontrado</string>
-   <string name="result_uri">URL encontrado</string>
-   <string name="history_title">Historia</string>
-   <string name="history_clear_text">Borrar historial</string>
-   <string name="sbc_name">Búsqueda de libros de Google</string>
-   <string name="share_name">Compartir por códigos de barras</string>
-   <string name="title_about">Escáner de código de barras v</string>
-   <string name="zxing_url">http://code.google.com/p/zxing</string>
-</resources>
+  <string name="app_name">Escáner de código de barras</string>
+  <string name="bookmark_picker_name">Marcadores</string>
+  <string name="button_add_calendar">Añadir a calendario</string>
+  <string name="button_add_contact">Añadir contacto</string>
+  <string name="button_back">Regresar</string>
+  <string name="button_book_search">Búsqueda de libros</string>
+  <string name="button_cancel">Cancelar</string>
+  <string name="button_clipboard_empty">Vaciar portapapeles</string>
+  <string name="button_custom_product_search">Búsqueda personalizada</string>
+  <string name="button_dial">Marcar número</string>
+  <string name="button_done">Terminar</string>
+  <string name="button_email">Enviar correo electrónico</string>
+  <string name="button_get_directions">Obtener direcciones</string>
+  <string name="button_mms">Enviar MMS</string>
+  <string name="button_ok">OK</string>
+  <string name="button_open_browser">Abrir navegador</string>
+  <string name="button_product_search">Búsqueda de productos</string>
+  <string name="button_search_book_contents">Buscar contenido dellibro</string>
+  <string name="button_read_book">Búsqueda de libro</string>
+  <string name="button_share_bookmark">Compartir marcador</string>
+  <string name="button_share_by_email">Compartir por correo electrónico</string>
+  <string name="button_share_by_sms">Compartir por SMS</string>
+  <string name="button_share_clipboard">Compartir portapapeles</string>
+  <string name="button_share_contact">Compartir contacto</string>
+  <string name="button_show_map">Mostrar mapa</string>
+  <string name="button_sms">Enviar SMS</string>
+  <string name="button_web_search">Búsqueda Web</string>
+  <string name="contents_contact">Información de contacto</string>
+  <string name="contents_email">Dirección de correo electrónico</string>
+  <string name="contents_location">Coordenadas geográficas</string>
+  <string name="contents_phone">Número de teléfono</string>
+  <string name="contents_sms">Dirección SMS</string>
+  <string name="contents_text">Texto</string>
+  <string name="menu_about">Acerca de</string>
+  <string name="menu_help">Ayuda</string>
+  <string name="menu_settings">Configuración</string>
+  <string name="menu_history">Historia</string>
+  <string name="menu_share">Compartir</string>
+  <string name="msg_about">Basado en la libreria de código de barras de código abierto ZXing</string>
+  <string name="msg_default_contents">Contenidos</string>
+  <string name="msg_default_format">Formato</string>
+  <string name="msg_default_mms_subject">Hola</string>
+  <string name="msg_default_status">Coloque un código de barras en el interior del rectángulo de el visor para escanear.</string>
+  <string name="msg_default_type">Tipo</string>
+  <string name="msg_encode_barcode_failed">No se pudo generar el código de barras solicitado.</string>
+  <string name="msg_encode_contents_failed">No puede codificar un código de barras con estos datos.</string>
+  <string name="msg_encode_in_progress">Generando un código de barras\u2026</string>
+  <string name="msg_intent_failed">Lo sentimos, la aplicación solicitada no pudo ser lanzada. El contenido de código de barras puede ser inválida.</string>
+  <string name="msg_sbc_book_not_searchable">Lo sentimos, no se puede buscar en este libro.</string>
+  <string name="msg_sbc_failed">Lo sentimos, la búsqueda ha detectado un problema.</string>
+  <string name="msg_sbc_no_page_returned">Página no encontrada</string>
+  <string name="msg_sbc_page">Página</string>
+  <string name="msg_sbc_snippet_unavailable">Fragmentos no están disponibles</string>
+  <string name="msg_sbc_unknown_page">Página desconocida</string>
+  <string name="msg_sbc_searching_book">Buscando libro\u2026</string>
+  <string name="msg_share_explanation">Usted puede compartir los datos mostrando un código de barras en su pantalla y escanear con otro teléfono.</string>
+  <string name="msg_share_subject_line">Aquí está el contenido de el código de barras que ha escaneado</string>
+  <string name="preferences_actions_title">Cuando encuentra un código de barras\u2026</string>
+  <string name="preferences_copy_to_clipboard_title">Copiar al portapapeles</string>
+  <string name="preferences_decode_1D_title">Descodificar códigos de barras 1D</string>
+  <string name="preferences_decode_QR_title">Descodificar códigos QR</string>
+  <string name="preferences_general_title">Configuración general</string>
+  <string name="preferences_name">Configuración</string>
+  <string name="preferences_play_beep_title">Bip</string>
+  <string name="preferences_vibrate_title">Vibrar</string>
+  <string name="preferences_result_title">Configuración de resultados</string>
+  <string name="preferences_custom_product_search_title">Búsqueda de productos con URL personalizada</string>
+  <string name="preferences_custom_product_search_summary">Usar %s como un marcador de posición para el identificador de producto</string>
+  <string name="result_address_book">Información de contacto encontrado</string>
+  <string name="result_calendar">Evento agendado encontrado</string>
+  <string name="result_email_address">Dirección de correo electrónico encontrado</string>
+  <string name="result_geo">Coordenadas geográficas encontradas</string>
+  <string name="result_isbn">Libro encontrado</string>
+  <string name="result_product">Producto encontrado</string>
+  <string name="result_sms">Dirección de SMS encontrado</string>
+  <string name="result_tel">Número de teléfono encontrado</string>
+  <string name="result_text">Texto encontrado</string>
+  <string name="result_uri">URL encontrado</string>
+  <string name="history_title">Historia</string>
+  <string name="history_clear_text">Borrar historial</string>
+  <string name="sbc_name">Búsqueda de libros de Google</string>
+  <string name="share_name">Compartir por códigos de barras</string>
+  <string name="title_about">Escáner de código de barras v</string>
+  <string name="zxing_url">http://code.google.com/p/zxing</string>
+</resources>
\ No newline at end of file
diff --git a/android/res/values-it/strings.xml b/android/res/values-it/strings.xml
index 584d172ae..049b8aa59 100644
--- a/android/res/values-it/strings.xml
+++ b/android/res/values-it/strings.xml
@@ -99,4 +99,4 @@
   <string name="share_name">Condividi tramite codice a barre</string>
   <string name="title_about">Scansione codice a barre v</string>
   <string name="zxing_url">http://code.google.com/p/zxing</string>
-</resources>
+</resources>
\ No newline at end of file
diff --git a/android/res/values-ru/strings.xml b/android/res/values-ru/strings.xml
index 6fa9f7d7f..83dbd084b 100644
--- a/android/res/values-ru/strings.xml
+++ b/android/res/values-ru/strings.xml
@@ -99,4 +99,4 @@
   <string name="share_name">Поделиться через штрих-код</string>
   <string name="title_about">Сканер штрих-кодов версии </string>
   <string name="zxing_url">http://code.google.com/p/zxing</string>
-</resources>
+</resources>
\ No newline at end of file
diff --git a/android/res/values-zh-rCN/strings.xml b/android/res/values-zh-rCN/strings.xml
index 080a996c3..8cc68e5df 100644
--- a/android/res/values-zh-rCN/strings.xml
+++ b/android/res/values-zh-rCN/strings.xml
@@ -23,6 +23,7 @@
   <string name="button_book_search">打开图书搜索</string>
   <string name="button_cancel">取消</string>
   <string name="button_clipboard_empty">剪切板清空</string>
+  <string name="button_custom_product_search">自定义搜索</string>
   <string name="button_dial">拨号</string>
   <string name="button_done">完成</string>
   <string name="button_email">发送email</string>
@@ -79,6 +80,9 @@
   <string name="preferences_name">设置</string>
   <string name="preferences_play_beep_title">提示音</string>
   <string name="preferences_vibrate_title">振动</string>
+  <string name="preferences_result_title">结果设置</string>
+  <string name="preferences_custom_product_search_title">自定义搜索网址</string>
+  <string name="preferences_custom_product_search_summary">使用％s作为产品ID占位</string>
   <string name="result_address_book">找到联系人信息</string>
   <string name="result_calendar">找到日历事件</string>
   <string name="result_email_address">找到email地址</string>
diff --git a/android/res/values-zh-rTW/strings.xml b/android/res/values-zh-rTW/strings.xml
index 1cbe3d6bd..665b8e0b0 100644
--- a/android/res/values-zh-rTW/strings.xml
+++ b/android/res/values-zh-rTW/strings.xml
@@ -23,6 +23,7 @@
   <string name="button_book_search">打開圖書搜索</string>
   <string name="button_cancel">取消</string>
   <string name="button_clipboard_empty">剪切板清空</string>
+  <string name="button_custom_product_search">自定義搜索</string>  
   <string name="button_dial">撥號</string>
   <string name="button_done">完成</string>
   <string name="button_email">發送email</string>
@@ -79,6 +80,9 @@
   <string name="preferences_name">設置</string>
   <string name="preferences_play_beep_title">提示音</string>
   <string name="preferences_vibrate_title">振動</string>
+  <string name="preferences_result_title">結果設置</string>
+  <string name="preferences_custom_product_search_title">自定義搜索網址</string>
+  <string name="preferences_custom_product_search_summary">使用％s作為佔位符的產品ID</string>
   <string name="result_address_book">找到聯系人信息</string>
   <string name="result_calendar">找到日歷事件</string>
   <string name="result_email_address">找到email地址</string>
diff --git a/android/res/values/strings.xml b/android/res/values/strings.xml
index 286d7635a..47e22e5ef 100755
--- a/android/res/values/strings.xml
+++ b/android/res/values/strings.xml
@@ -17,7 +17,6 @@
 <resources>
   <string name="app_name">Barcode Scanner</string>
   <string name="bookmark_picker_name">Bookmarks</string>
-
   <string name="button_add_calendar">Add to calendar</string>
   <string name="button_add_contact">Add contact</string>
   <string name="button_back">Back</string>
@@ -43,33 +42,27 @@
   <string name="button_show_map">Show map</string>
   <string name="button_sms">Send SMS</string>
   <string name="button_web_search">Web search</string>
-
   <string name="contents_contact">Contact info</string>
   <string name="contents_email">Email address</string>
   <string name="contents_location">Geographic coordinates</string>
   <string name="contents_phone">Phone number</string>
   <string name="contents_sms">SMS address</string>
   <string name="contents_text">Plain text</string>
-
   <string name="menu_about">About</string>
   <string name="menu_help">Help</string>
   <string name="menu_settings">Settings</string>
   <string name="menu_history">History</string>
   <string name="menu_share">Share</string>
-
   <string name="msg_about">Based on the open source ZXing Barcode Library</string>
   <string name="msg_default_contents">Contents</string>
   <string name="msg_default_format">Format</string>
   <string name="msg_default_mms_subject">Hi</string>
-  <string name="msg_default_status">Place a barcode inside the viewfinder rectangle to scan it.
-  </string>
+  <string name="msg_default_status">Place a barcode inside the viewfinder rectangle to scan it.</string>
   <string name="msg_default_type">Type</string>
   <string name="msg_encode_barcode_failed">Could not generate the requested barcode.</string>
-  <string name="msg_encode_contents_failed">Could not encode a barcode from the data provided.
-  </string>
+  <string name="msg_encode_contents_failed">Could not encode a barcode from the data provided.</string>
   <string name="msg_encode_in_progress">Generating a barcode\u2026</string>
-  <string name="msg_intent_failed">Sorry, the requested application could not be launched.
-    The barcode contents may be invalid.</string>
+  <string name="msg_intent_failed">Sorry, the requested application could not be launched. The barcode contents may be invalid.</string>
   <string name="msg_sbc_book_not_searchable">Sorry, this book is not searchable.</string>
   <string name="msg_sbc_failed">Sorry, the search encountered a problem.</string>
   <string name="msg_sbc_no_page_returned">No page returned</string>
@@ -77,10 +70,8 @@
   <string name="msg_sbc_snippet_unavailable">Snippet not available</string>
   <string name="msg_sbc_unknown_page">Unknown page</string>
   <string name="msg_sbc_searching_book">Searching book\u2026</string>
-  <string name="msg_share_explanation">You can share data by displaying a barcode on
-    your screen and scanning it with another phone.</string>
+  <string name="msg_share_explanation">You can share data by displaying a barcode on your screen and scanning it with another phone.</string>
   <string name="msg_share_subject_line">Here\'s the contents of a barcode I scanned</string>
-
   <string name="preferences_actions_title">When a barcode is found\u2026</string>
   <string name="preferences_copy_to_clipboard_title">Copy to clipboard</string>
   <string name="preferences_decode_1D_title">Decode 1D barcodes</string>
@@ -91,9 +82,7 @@
   <string name="preferences_vibrate_title">Vibrate</string>
   <string name="preferences_result_title">Result settings</string>
   <string name="preferences_custom_product_search_title">Custom search URL</string>
-  <string name="preferences_custom_product_search_summary">Use %s as a placeholder for the product
-    ID</string>
-
+  <string name="preferences_custom_product_search_summary">Use %s as a placeholder for the product ID</string>
   <string name="result_address_book">Found contact info</string>
   <string name="result_calendar">Found calendar event</string>
   <string name="result_email_address">Found email address</string>
@@ -104,14 +93,10 @@
   <string name="result_tel">Found phone number</string>
   <string name="result_text">Found plain text</string>
   <string name="result_uri">Found URL</string>
-
   <string name="history_title">History</string>
   <string name="history_clear_text">Clear history</string>
-
   <string name="sbc_name">Google Book Search</string>
   <string name="share_name">Share via barcode</string>
-
   <string name="title_about">Barcode Scanner v</string>
-
   <string name="zxing_url">http://code.google.com/p/zxing</string>
-</resources>
+</resources>
\ No newline at end of file