diff --git a/android/res/values-ar/strings.xml b/android/res/values-ar/strings.xml
index 8546b5a69..4089785e8 100644
--- a/android/res/values-ar/strings.xml
+++ b/android/res/values-ar/strings.xml
@@ -96,6 +96,7 @@
   <string name="preferences_custom_product_search_summary">استخدم %s كعنصر نائب لمعرف المنتج</string>
   <string name="preferences_custom_product_search_title">عنوان بحث مخصص</string>
   <string name="preferences_decode_1D_title">فك الرموز الشريطية 1D</string>
+  <string name="preferences_decode_Data_Matrix_title">فك رموز البيانات ماتريكس</string>
   <string name="preferences_decode_QR_title">فك رموز QR</string>
   <string name="preferences_front_light_summary">تقوم بتحسين عملية المسح في إضاءة ضعيفة في بعض الهواتف، ولكن يمكن أن يتسبب في حدوث سطوع</string>
   <string name="preferences_front_light_title">استخدم إضاءة أمامية</string>
@@ -121,13 +122,13 @@
   <string name="title_about">إصدار ماسح الرمز الشريطي</string>
   <string name="wa_name">التكوين اللاسلك</string>
   <string name="wifi_changing_network">تغيير الشبكة</string>
+  <string name="wifi_connect_failed">فشل شبكة الاتصال</string>
   <string name="wifi_connected">متصل</string>
   <string name="wifi_creating_network">إنشاء شبكة</string>
   <string name="wifi_modifying_network">تعديل شبكة</string>
+  <string name="wifi_ssid_label">اسم الشبكة</string>
   <string name="wifi_ssid_missing">اسم الشبكة مفقود</string>
   <string name="wifi_type_incorrect">شبكة نوع غير صحيح</string>
-  <string name="wifi_ssid_label">اسم الشبكة</string>
   <string name="wifi_type_label">نوع</string>
-  <string name="wifi_connect_failed">فشل شبكة الاتصال</string>
   <string name="zxing_url">http://code.google.com/p/zxing</string>
 </resources>
diff --git a/android/res/values-cs/strings.xml b/android/res/values-cs/strings.xml
index 518b381cf..07517916c 100644
--- a/android/res/values-cs/strings.xml
+++ b/android/res/values-cs/strings.xml
@@ -96,6 +96,7 @@
   <string name="preferences_custom_product_search_summary">Použijte %s jako zástupný symbol pro ID produktu, a %f pro formát</string>
   <string name="preferences_custom_product_search_title">Vlastní vyhledávání URL.</string>
   <string name="preferences_decode_1D_title">Dekódovat 1D kódy</string>
+  <string name="preferences_decode_Data_Matrix_title">Dekódovat Data Matrix</string>
   <string name="preferences_decode_QR_title">Dekódovat QR kódy</string>
   <string name="preferences_front_light_summary">Zlepšuje skenování při slabém osvětlení na některých telefonech, ale může způsobit oslnění. Nefunguje na všech telefonech.</string>
   <string name="preferences_front_light_title">Přední světla</string>
@@ -121,13 +122,13 @@
   <string name="title_about">Barcode Scanner v</string>
   <string name="wa_name">Bezdrátová konfigurace</string>
   <string name="wifi_changing_network">Změna síť</string>
+  <string name="wifi_connect_failed">Síťové připojení se nezdařilo</string>
   <string name="wifi_connected">Připojeno</string>
   <string name="wifi_creating_network">Vytvoření sítě</string>
   <string name="wifi_modifying_network">Úprava sítě</string>
+  <string name="wifi_ssid_label">Jméno sítě</string>
   <string name="wifi_ssid_missing">Název sítě chybí</string>
   <string name="wifi_type_incorrect">Typ sítě nesprávné</string>
-  <string name="wifi_ssid_label">Jméno sítě</string>
   <string name="wifi_type_label">Typ</string>
-  <string name="wifi_connect_failed">Síťové připojení se nezdařilo</string>
   <string name="zxing_url">http://code.google.com/p/zxing</string>
 </resources>
diff --git a/android/res/values-da/strings.xml b/android/res/values-da/strings.xml
index f672f1b42..9be2065f2 100644
--- a/android/res/values-da/strings.xml
+++ b/android/res/values-da/strings.xml
@@ -96,6 +96,7 @@
   <string name="preferences_custom_product_search_summary">Brug %s som en pladsholder for produkt-id, og %f for format</string>
   <string name="preferences_custom_product_search_title">Brugerdefineret søge-URL</string>
   <string name="preferences_decode_1D_title">Oversæt 1D stregkoder</string>
+  <string name="preferences_decode_Data_Matrix_title">Oversæt Data Matrix</string>
   <string name="preferences_decode_QR_title">Oversæt QR Koder</string>
   <string name="preferences_front_light_summary">Forbedrer scanning i svagt lys på nogle telefoner, men kan forårsage blænding. Virker ikke på alle telefoner.</string>
   <string name="preferences_front_light_title">Brug frontlys</string>
@@ -121,13 +122,13 @@
   <string name="title_about">Barcode Scanner v</string>
   <string name="wa_name">Wifi-forbindelse</string>
   <string name="wifi_changing_network">Ændring Network</string>
+  <string name="wifi_connect_failed">Netværksforbindelse mislykkedes</string>
   <string name="wifi_connected">Connected</string>
   <string name="wifi_creating_network">Oprettelse af netværk</string>
   <string name="wifi_modifying_network">Ændring Network</string>
+  <string name="wifi_ssid_label">Netværksnavn</string>
   <string name="wifi_ssid_missing">Netværk navn mangler</string>
   <string name="wifi_type_incorrect">Netværk type forkert</string>
-  <string name="wifi_ssid_label">Netværksnavn</string>
   <string name="wifi_type_label">Type</string>
-  <string name="wifi_connect_failed">Netværksforbindelse mislykkedes</string>
   <string name="zxing_url">http://code.google.com/p/zxing</string>
 </resources>
diff --git a/android/res/values-de/strings.xml b/android/res/values-de/strings.xml
index 96b4e8a71..cb98606d3 100644
--- a/android/res/values-de/strings.xml
+++ b/android/res/values-de/strings.xml
@@ -96,6 +96,7 @@
   <string name="preferences_custom_product_search_summary">Verwenden Sie %s als Platzhalter für die Produkt-ID und %f für die Format</string>
   <string name="preferences_custom_product_search_title">Eigene Such-URL</string>
   <string name="preferences_decode_1D_title">Dekodiere 1D Barcodes</string>
+  <string name="preferences_decode_Data_Matrix_title">Dekodiere Data Matrix</string>
   <string name="preferences_decode_QR_title">Dekodiere QR Codes</string>
   <string name="preferences_front_light_summary">Erhöht Scannen bei schwachem Licht bei einigen Mobiltelefonen, kann aber Blendung verursachen. Funktioniert nicht auf allen Handys funktionieren.</string>
   <string name="preferences_front_light_title">Vor Licht</string>
@@ -120,14 +121,14 @@
   <string name="share_name">Weitergabe mittels Barcode</string>
   <string name="title_about">Barcode Scanner v</string>
   <string name="wa_name">Wifi konfiguration</string>
-  <string name="zxing_url">http://code.google.com/p/zxing</string>
   <string name="wifi_changing_network">Ändern der Netzwerkeinstellungen</string>
+  <string name="wifi_connect_failed">Network Verbindung fehlgeschlagen</string>
   <string name="wifi_connected">Verbunden</string>
   <string name="wifi_creating_network">Erstellen Network</string>
   <string name="wifi_modifying_network">Ändern Network</string>
+  <string name="wifi_ssid_label">Network Name</string>
   <string name="wifi_ssid_missing">Netzwerk-Name fehlt</string>
   <string name="wifi_type_incorrect">Netzwerk-Typ nicht korrekt</string>
-  <string name="wifi_ssid_label">Network Name</string>
   <string name="wifi_type_label">Typ</string>
-  <string name="wifi_connect_failed">Network Verbindung fehlgeschlagen</string>
+  <string name="zxing_url">http://code.google.com/p/zxing</string>
 </resources>
diff --git a/android/res/values-es/strings.xml b/android/res/values-es/strings.xml
index 3ba8a93af..433ec458c 100644
--- a/android/res/values-es/strings.xml
+++ b/android/res/values-es/strings.xml
@@ -96,6 +96,7 @@
   <string name="preferences_custom_product_search_summary">Use %s como un marcador de posición para el identificador del producto, y %f para el formato</string>
   <string name="preferences_custom_product_search_title">Búsqueda de productos con URL personalizada</string>
   <string name="preferences_decode_1D_title">Descodificar códigos de barras 1D</string>
+  <string name="preferences_decode_Data_Matrix_title">Descodificar Data Matrix</string>
   <string name="preferences_decode_QR_title">Descodificar códigos QR</string>
   <string name="preferences_front_light_summary">Activar luz delantera si está disponible, pero puede causar deslumbramiento. No funciona en todos los teléfonos.</string>
   <string name="preferences_front_light_title">Luz delantera</string>
@@ -121,13 +122,13 @@
   <string name="title_about">Escáner de código de barras v</string>
   <string name="wa_name">Configuración de la red</string>
   <string name="wifi_changing_network">Cambio de la red</string>
+  <string name="wifi_connect_failed">Conexión de red no</string>
   <string name="wifi_connected">Conectado</string>
   <string name="wifi_creating_network">Creación de la Red</string>
   <string name="wifi_modifying_network">Modificación de la Red</string>
+  <string name="wifi_ssid_label">Nombre de red</string>
   <string name="wifi_ssid_missing">Nombre de la red desaparecidas</string>
   <string name="wifi_type_incorrect">Red de tipo incorrecto</string>
-  <string name="wifi_ssid_label">Nombre de red</string>
   <string name="wifi_type_label">Tipo</string>
-  <string name="wifi_connect_failed">Conexión de red no</string>
   <string name="zxing_url">http://code.google.com/p/zxing</string>
 </resources>
diff --git a/android/res/values-fi/strings.xml b/android/res/values-fi/strings.xml
index 0f78473b5..b8d274925 100644
--- a/android/res/values-fi/strings.xml
+++ b/android/res/values-fi/strings.xml
@@ -96,6 +96,7 @@
   <string name="preferences_custom_product_search_summary">Käytä %s paikkana tuotetunnukselle tunnus ja %f muoto</string>
   <string name="preferences_custom_product_search_title">Mukautettu hakukone</string>
   <string name="preferences_decode_1D_title">Dekoodaa 1D viivakoodeja</string>
+  <string name="preferences_decode_Data_Matrix_title">Dekoodaa Data Matrix</string>
   <string name="preferences_decode_QR_title">Dekoodaa QR koodeja</string>
   <string name="preferences_front_light_summary">Activoi valo edessä, jos käytettävissä, mutta saattaa aiheuttaa häikäisyä. Ei toimi kaikissa puhelimissa.</string>
   <string name="preferences_front_light_title">Valo edessä</string>
@@ -121,13 +122,13 @@
   <string name="title_about">Viivakoodin lukija v</string>
   <string name="wa_name">Langattoman yhteyden</string>
   <string name="wifi_changing_network">Vaihtaminen Verkko</string>
+  <string name="wifi_connect_failed">Verkkoyhteys ei</string>
   <string name="wifi_connected">Kytketty</string>
   <string name="wifi_creating_network">Luominen verkoston</string>
   <string name="wifi_modifying_network">Muuttaminen Verkko</string>
+  <string name="wifi_ssid_label">Verkon nimi</string>
   <string name="wifi_ssid_missing">Verkon nimi puuttuu</string>
   <string name="wifi_type_incorrect">Verkon tyyppi virheellinen</string>
-  <string name="wifi_ssid_label">Verkon nimi</string>
   <string name="wifi_type_label">Tyyppi</string>
-  <string name="wifi_connect_failed">Verkkoyhteys ei</string>
   <string name="zxing_url">http://code.google.com/p/zxing</string>
 </resources>
diff --git a/android/res/values-fr/strings.xml b/android/res/values-fr/strings.xml
index 997f4777d..43732dc89 100644
--- a/android/res/values-fr/strings.xml
+++ b/android/res/values-fr/strings.xml
@@ -96,6 +96,7 @@
   <string name="preferences_custom_product_search_summary">Utiliser %s à la place de l\'identifiant du produit, et %f pour le format</string>
   <string name="preferences_custom_product_search_title">URL de recherche personnalisée</string>
   <string name="preferences_decode_1D_title">Lire les codes-barres unidimensionnels (1D)</string>
+  <string name="preferences_decode_Data_Matrix_title">Lire Data Matrix</string>
   <string name="preferences_decode_QR_title">Lire les codes QR</string>
   <string name="preferences_front_light_summary">Allumer la lampe derrière le téléphone quand la lumière ambiante est faible. Peut provoquer des reflets et ne fonctionne pas sur tous les téléphones.</string>
   <string name="preferences_front_light_title">Flash</string>
@@ -121,13 +122,13 @@
   <string name="title_about">Barcode Scanner v</string>
   <string name="wa_name">Configuration du réseau Wifi</string>
   <string name="wifi_changing_network">Changement de réseau Wifi</string>
+  <string name="wifi_connect_failed">La connexion au réseau Wifi a échoué</string>
   <string name="wifi_connected">Connecté au réseau Wifi</string>
   <string name="wifi_creating_network">Création d\'un réseau Wifi</string>
   <string name="wifi_modifying_network">Modification du réseau Wifi</string>
+  <string name="wifi_ssid_label">Nom du réseau Wifi</string>
   <string name="wifi_ssid_missing">Nom du réseau Wifi requis</string>
   <string name="wifi_type_incorrect">Type de réseau Wifi incorrect</string>
-  <string name="wifi_connect_failed">La connexion au réseau Wifi a échoué</string>
-  <string name="wifi_ssid_label">Nom du réseau Wifi</string>
   <string name="wifi_type_label">Type</string>
   <string name="zxing_url">http://code.google.com/p/zxing</string>
 </resources>
diff --git a/android/res/values-hu/strings.xml b/android/res/values-hu/strings.xml
index d9557b8e6..470de67be 100644
--- a/android/res/values-hu/strings.xml
+++ b/android/res/values-hu/strings.xml
@@ -96,6 +96,7 @@
   <string name="preferences_custom_product_search_summary">Használja a %s helyktöltést a termék azonosító helyén, és %f esetében formátum</string>
   <string name="preferences_custom_product_search_title">Egyedi keresés URL</string>
   <string name="preferences_decode_1D_title">1D vonalkódok megfejtése</string>
+  <string name="preferences_decode_Data_Matrix_title">Data Matrix megfejtése</string>
   <string name="preferences_decode_QR_title">QR-kódok megfejtése</string>
   <string name="preferences_front_light_summary">Javítja a szkennelést kevés fény mellett néhány telefonon, de csillogást okozhat. Nem működik a telefon minden.</string>
   <string name="preferences_front_light_title">Elülső lámpa használata</string>
@@ -121,13 +122,13 @@
   <string name="title_about">Barcode Scanner v</string>
   <string name="wa_name">Hálózati konfiguráció</string>
   <string name="wifi_changing_network">Változó Hálózat</string>
+  <string name="wifi_connect_failed">Hálózati kapcsolat nem</string>
   <string name="wifi_connected">Összefüggő</string>
   <string name="wifi_creating_network">Hálózat létrehozása</string>
   <string name="wifi_modifying_network">Módosítása Hálózat</string>
+  <string name="wifi_ssid_label">Hálózat neve</string>
   <string name="wifi_ssid_missing">A hálózat neve hiányzik</string>
   <string name="wifi_type_incorrect">Hálózati típusú hibás</string>
-  <string name="wifi_ssid_label">Hálózat neve</string>
   <string name="wifi_type_label">Típusú</string>
-  <string name="wifi_connect_failed">Hálózati kapcsolat nem</string>
   <string name="zxing_url">http://code.google.com/p/zxing</string>
 </resources>
diff --git a/android/res/values-it/strings.xml b/android/res/values-it/strings.xml
index 4c3561ca5..f61f4aa27 100644
--- a/android/res/values-it/strings.xml
+++ b/android/res/values-it/strings.xml
@@ -96,6 +96,7 @@
   <string name="preferences_custom_product_search_summary">Utilizza %s come segnaposto per l\'ID del prodotto, e per il formato %f</string>
   <string name="preferences_custom_product_search_title">URL ricerca prodotto personalizzata</string>
   <string name="preferences_decode_1D_title">Decodifica codice a barre 1D</string>
+  <string name="preferences_decode_Data_Matrix_title">Decodifica Data Matrix</string>
   <string name="preferences_decode_QR_title">Decodifica codici QR</string>
   <string name="preferences_front_light_summary">Consentire la luce anteriore, se disponibile, ma può provocare abbagliamento. Non funziona su tutti i telefoni.</string>
   <string name="preferences_front_light_title">Luce anteriore</string>
@@ -121,13 +122,13 @@
   <string name="title_about">Scansione codice a barre v</string>
   <string name="wa_name">Configurazione di rete</string>
   <string name="wifi_changing_network">Cambiare Network</string>
+  <string name="wifi_connect_failed">La connessione di rete non riuscita</string>
   <string name="wifi_connected">Collegato</string>
   <string name="wifi_creating_network">Creazione di rete</string>
   <string name="wifi_modifying_network">Modifica della rete</string>
+  <string name="wifi_ssid_label">Nome di rete</string>
   <string name="wifi_ssid_missing">Nome della rete mancante</string>
   <string name="wifi_type_incorrect">Tipo di rete non corretto</string>
-  <string name="wifi_ssid_label">Nome di rete</string>
   <string name="wifi_type_label">Tipo</string>
-  <string name="wifi_connect_failed">La connessione di rete non riuscita</string>
   <string name="zxing_url">http://code.google.com/p/zxing</string>
 </resources>
diff --git a/android/res/values-ja-rJP/strings.xml b/android/res/values-ja-rJP/strings.xml
index dc47ccce4..8974cd4ef 100644
--- a/android/res/values-ja-rJP/strings.xml
+++ b/android/res/values-ja-rJP/strings.xml
@@ -96,6 +96,7 @@
   <string name="preferences_custom_product_search_summary">URL中の「%s」はスキャン結果に置換される</string>
   <string name="preferences_custom_product_search_title">カスタム商品サーチ URL</string>
   <string name="preferences_decode_1D_title">1Dバーコードを読み取る</string>
+  <string name="preferences_decode_Data_Matrix_title">デコードデータマトリックスコード</string>
   <string name="preferences_decode_QR_title">QRコードを読み取る</string>
   <string name="preferences_front_light_summary">有効にするフロントライト可能な場合</string>
   <string name="preferences_front_light_title">フロントライト</string>
@@ -121,13 +122,13 @@
   <string name="title_about">>QRコードスキャナー v</string>
   <string name="wa_name">ネットワーク構成</string>
   <string name="wifi_changing_network">ネットワークを変更する</string>
+  <string name="wifi_connect_failed">ネットワーク接続が失敗しました。</string>
   <string name="wifi_connected">接続</string>
   <string name="wifi_creating_network">作成ネットワーク</string>
   <string name="wifi_modifying_network">ネットワークを変更する</string>
+  <string name="wifi_ssid_label">ネットワーク名</string>
   <string name="wifi_ssid_missing">ネットワーク名を欠いて</string>
   <string name="wifi_type_incorrect">ネットワーク型不正</string>
-  <string name="wifi_ssid_label">ネットワーク名</string>
   <string name="wifi_type_label">タイプ</string>
-  <string name="wifi_connect_failed">ネットワーク接続が失敗しました。</string>
   <string name="zxing_url">http://code.google.com/p/zxing</string>
 </resources>
diff --git a/android/res/values-nl/strings.xml b/android/res/values-nl/strings.xml
index 4e6c477cb..f33550a41 100644
--- a/android/res/values-nl/strings.xml
+++ b/android/res/values-nl/strings.xml
@@ -1,133 +1,134 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Copyright (C) 2010 ZXing authors
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
- -->
-<resources>
-  <string name="app_name">Barcode Scanner</string>
-  <string name="app_picker_name">Applicaties</string>
-  <string name="bookmark_picker_name">Bladwijzers</string>
-  <string name="button_add_calendar">Voeg toe aan agenda</string>
-  <string name="button_add_contact">Voeg contact toe</string>
-  <string name="button_back">Terug</string>
-  <string name="button_book_search">Zoek Boeken</string>
-  <string name="button_cancel">Annuleren</string>
-  <string name="button_clipboard_empty">Plakbord is leeg</string>
-  <string name="button_custom_product_search">Aangepast zoeken</string>
-  <string name="button_dial">Bel nummer</string>
-  <string name="button_done">Ga verder</string>
-  <string name="button_email">Verzend email</string>
-  <string name="button_get_directions">Verkrijg richtingen</string>
-  <string name="button_google_shopper">Google Shopper</string>
-  <string name="button_mms">Verzend MMS</string>
-  <string name="button_ok">Ok</string>
-  <string name="button_open_browser">Open de browser</string>
-  <string name="button_product_search">Zoek Producten</string>
-  <string name="button_read_book">Doorzoek boek</string>
-  <string name="button_search_book_contents">Zoek hoofdstukken uit boek</string>
-  <string name="button_share_app">Applicatie</string>
-  <string name="button_share_bookmark">Bladwijzer</string>
-  <string name="button_share_by_email">Deel via email</string>
-  <string name="button_share_by_sms">Deel via SMS</string>
-  <string name="button_share_clipboard">Plakbord</string>
-  <string name="button_share_contact">Contact</string>
-  <string name="button_show_map">Laat kaart zien</string>
-  <string name="button_sms">Verzend SMS</string>
-  <string name="button_web_search">Zoek op internet</string>
-  <string name="button_wifi">Verbind met draadloos netwerk</string>
-  <string name="contents_contact">Contact informatie</string>
-  <string name="contents_email">E-mailadres</string>
-  <string name="contents_location">Geografische coordinaten</string>
-  <string name="contents_phone">Telefoonnummer</string>
-  <string name="contents_sms">SMSnummer</string>
-  <string name="contents_text">Tekst</string>
-  <string name="history_clear_text">Leeg geschiedenis</string>
-  <string name="history_email_title">Barcode Scanner geschiedenis</string>
-  <string name="history_send">Verzend geschiedenis</string>
-  <string name="history_title">Geschiedenis</string>
-  <string name="menu_about">Over</string>
-  <string name="menu_help">Help</string>
-  <string name="menu_history">Geschiedenis</string>
-  <string name="menu_settings">Instellingen</string>
-  <string name="menu_share">Deel</string>
-  <string name="msg_about">Gebaseerd op de open source ZXing Barcodebibliotheek</string>
-  <string name="msg_buggy">Dit apparaat heeft bekende bugs die ervoor zorgen dat er zich problemen voor kunnen doen bij het scannen. Voor meer informatie, bezoek http://code.google.com/p/zxing/wiki/FrequentlyAskedQuestions</string>
-  <string name="msg_bulk_mode_scanned">Bulk mode: barcode gescand en opgeslagen</string>
-  <string name="msg_camera_framework_bug">Sorry, er is een probleem met de Androidcamera. Probeer je telefoon te herstarten.</string>
-  <string name="msg_default_contents">Hoofdstukken</string>
-  <string name="msg_default_format">Formaat</string>
-  <string name="msg_default_meta">Metadata</string>
-  <string name="msg_default_mms_subject">Hallo</string>
-  <string name="msg_default_status">Plaats een barcode binnen de rechthoek om hem te scannen.</string>
-  <string name="msg_default_time">Tijd</string>
-  <string name="msg_default_type">Type</string>
-  <string name="msg_encode_barcode_failed">Kan de gevraagde barcode niet genereren.</string>
-  <string name="msg_encode_contents_failed">Kan geen barcode van de gegeven data maken.</string>
-  <string name="msg_google_shopper_missing">Google Shopper is niet geinstalleerd</string>
-  <string name="msg_install_google_shopper">Google Shopper combineert barcode scannen met prijzen, reviews en nog veel meer zonder het openen van de browser. Wilt u het proberen?</string>
-  <string name="msg_intent_failed">Sorry, de gevraagde applicatie kan niet gestart worden. De barcode kan verkeerd zijn.</string>
-  <string name="msg_loading_apps">Lijst van applicaties aan het laden\u2026</string>
-  <string name="msg_not_our_results">Je verlaat deze applicatie. De zoekresultaten die je ziet zijn niet gerelateerd aan deze applicatie.</string>
-  <string name="msg_sbc_book_not_searchable">Sorry, dit boek is niet zoekbaar.</string>
-  <string name="msg_sbc_failed">Sorry, er was een probleem met zoeken</string>
-  <string name="msg_sbc_no_page_returned">Geen pagina ontvangen</string>
-  <string name="msg_sbc_page">Pagina</string>
-  <string name="msg_sbc_searching_book">Zoekt naar boek\u2026</string>
-  <string name="msg_sbc_snippet_unavailable">Korte beschrijving niet beschikbaar</string>
-  <string name="msg_sbc_unknown_page">Onbekende pagina</string>
-  <string name="msg_share_explanation">Je kan data delen door een barcode op het scherm te laten zien, en deze door een andere telefoon te scannen.</string>
-  <string name="msg_share_subject_line">Hier is de barcode die ik gescand heb</string>
-  <string name="msg_unmount_usb">Sorry, de SD-kaart is niet toegankelijk.</string>
-  <string name="preferences_actions_title">Als een barcode is gevonden\u2026</string>
-  <string name="preferences_bulk_mode_summary">Scan continue barcodes en sla ze allemaal op</string>
-  <string name="preferences_bulk_mode_title">Bulk scan modus</string>
-  <string name="preferences_copy_to_clipboard_title">Kopieer naar plakbord</string>
-  <string name="preferences_custom_product_search_summary">Gebruik %s voor de plaats van het product ID en %f voor het formaat</string>
-  <string name="preferences_custom_product_search_title">Zoek aangepaste URL</string>
-  <string name="preferences_decode_1D_title">Decodeer 1D barcodes</string>
-  <string name="preferences_decode_QR_title">Decodeer QR codes</string>
-  <string name="preferences_front_light_summary">Inschakelen van achtergrondlicht, indien beschikbaar. Dit kan in sommige gevallen leiden tot slechte herkenning van barcodes. Werkt niet op alle telefoons.</string>
-  <string name="preferences_front_light_title">Achtergrondlicht</string>
-  <string name="preferences_general_title">Basisinstellingen</string>
-  <string name="preferences_name">Instellingen</string>
-  <string name="preferences_play_beep_title">Piepen</string>
-  <string name="preferences_result_title">Instellingen voor resultaat</string>
-  <string name="preferences_scanning_title">Bij het scannen van barcodes voor de\u2026</string>
-  <string name="preferences_vibrate_title">Trillen</string>
-  <string name="result_address_book">Contact informatie gevonden</string>
-  <string name="result_calendar">Agendagebeurtenis gevonden</string>
-  <string name="result_email_address">E-mailadres gevonden</string>
-  <string name="result_geo">Geografische coordinaten gevonden</string>
-  <string name="result_isbn">Boek gevonden</string>
-  <string name="result_product">Product gevonden</string>
-  <string name="result_sms">SMSnummer gevonden</string>
-  <string name="result_tel">Telefoonnummer gevonden</string>
-  <string name="result_text">Tekst gevonden</string>
-  <string name="result_uri">URL gevonden</string>
-  <string name="result_wifi">Netwerkconfiguratie gevonden </string>
-  <string name="sbc_name">Zoek boeken met Google Books</string>
-  <string name="share_name">Deel via barcode</string>
-  <string name="title_about">Barcode Scanner v</string>
-  <string name="wa_name">Netwerkconfiguratie</string>
-  <string name="wifi_changing_network">Veranderen van Netwerk</string>
-  <string name="wifi_connected">Verbonden</string>
-  <string name="wifi_creating_network">Netwerk creeren</string>
-  <string name="wifi_modifying_network">Netwerk wijzigen</string>
-  <string name="wifi_ssid_missing">Netwerk naam ontbreekt</string>
-  <string name="wifi_type_incorrect">Onjuist netwerktype</string>
-  <string name="wifi_ssid_label">Netwerknaam (SSID)</string>
-  <string name="wifi_type_label">Type</string>
-  <string name="wifi_connect_failed">Netwerk verbinding is mislukt</string>
-  <string name="zxing_url">http://code.google.com/p/zxing</string>
-</resources>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Copyright (C) 2010 ZXing authors
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+ -->
+<resources>
+  <string name="app_name">Barcode Scanner</string>
+  <string name="app_picker_name">Applicaties</string>
+  <string name="bookmark_picker_name">Bladwijzers</string>
+  <string name="button_add_calendar">Voeg toe aan agenda</string>
+  <string name="button_add_contact">Voeg contact toe</string>
+  <string name="button_back">Terug</string>
+  <string name="button_book_search">Zoek Boeken</string>
+  <string name="button_cancel">Annuleren</string>
+  <string name="button_clipboard_empty">Plakbord is leeg</string>
+  <string name="button_custom_product_search">Aangepast zoeken</string>
+  <string name="button_dial">Bel nummer</string>
+  <string name="button_done">Ga verder</string>
+  <string name="button_email">Verzend email</string>
+  <string name="button_get_directions">Verkrijg richtingen</string>
+  <string name="button_google_shopper">Google Shopper</string>
+  <string name="button_mms">Verzend MMS</string>
+  <string name="button_ok">Ok</string>
+  <string name="button_open_browser">Open de browser</string>
+  <string name="button_product_search">Zoek Producten</string>
+  <string name="button_read_book">Doorzoek boek</string>
+  <string name="button_search_book_contents">Zoek hoofdstukken uit boek</string>
+  <string name="button_share_app">Applicatie</string>
+  <string name="button_share_bookmark">Bladwijzer</string>
+  <string name="button_share_by_email">Deel via email</string>
+  <string name="button_share_by_sms">Deel via SMS</string>
+  <string name="button_share_clipboard">Plakbord</string>
+  <string name="button_share_contact">Contact</string>
+  <string name="button_show_map">Laat kaart zien</string>
+  <string name="button_sms">Verzend SMS</string>
+  <string name="button_web_search">Zoek op internet</string>
+  <string name="button_wifi">Verbind met draadloos netwerk</string>
+  <string name="contents_contact">Contact informatie</string>
+  <string name="contents_email">E-mailadres</string>
+  <string name="contents_location">Geografische coordinaten</string>
+  <string name="contents_phone">Telefoonnummer</string>
+  <string name="contents_sms">SMSnummer</string>
+  <string name="contents_text">Tekst</string>
+  <string name="history_clear_text">Leeg geschiedenis</string>
+  <string name="history_email_title">Barcode Scanner geschiedenis</string>
+  <string name="history_send">Verzend geschiedenis</string>
+  <string name="history_title">Geschiedenis</string>
+  <string name="menu_about">Over</string>
+  <string name="menu_help">Help</string>
+  <string name="menu_history">Geschiedenis</string>
+  <string name="menu_settings">Instellingen</string>
+  <string name="menu_share">Deel</string>
+  <string name="msg_about">Gebaseerd op de open source ZXing Barcodebibliotheek</string>
+  <string name="msg_buggy">Dit apparaat heeft bekende bugs die ervoor zorgen dat er zich problemen voor kunnen doen bij het scannen. Voor meer informatie, bezoek http://code.google.com/p/zxing/wiki/FrequentlyAskedQuestions</string>
+  <string name="msg_bulk_mode_scanned">Bulk mode: barcode gescand en opgeslagen</string>
+  <string name="msg_camera_framework_bug">Sorry, er is een probleem met de Androidcamera. Probeer je telefoon te herstarten.</string>
+  <string name="msg_default_contents">Hoofdstukken</string>
+  <string name="msg_default_format">Formaat</string>
+  <string name="msg_default_meta">Metadata</string>
+  <string name="msg_default_mms_subject">Hallo</string>
+  <string name="msg_default_status">Plaats een barcode binnen de rechthoek om hem te scannen.</string>
+  <string name="msg_default_time">Tijd</string>
+  <string name="msg_default_type">Type</string>
+  <string name="msg_encode_barcode_failed">Kan de gevraagde barcode niet genereren.</string>
+  <string name="msg_encode_contents_failed">Kan geen barcode van de gegeven data maken.</string>
+  <string name="msg_google_shopper_missing">Google Shopper is niet geinstalleerd</string>
+  <string name="msg_install_google_shopper">Google Shopper combineert barcode scannen met prijzen, reviews en nog veel meer zonder het openen van de browser. Wilt u het proberen?</string>
+  <string name="msg_intent_failed">Sorry, de gevraagde applicatie kan niet gestart worden. De barcode kan verkeerd zijn.</string>
+  <string name="msg_loading_apps">Lijst van applicaties aan het laden\u2026</string>
+  <string name="msg_not_our_results">Je verlaat deze applicatie. De zoekresultaten die je ziet zijn niet gerelateerd aan deze applicatie.</string>
+  <string name="msg_sbc_book_not_searchable">Sorry, dit boek is niet zoekbaar.</string>
+  <string name="msg_sbc_failed">Sorry, er was een probleem met zoeken</string>
+  <string name="msg_sbc_no_page_returned">Geen pagina ontvangen</string>
+  <string name="msg_sbc_page">Pagina</string>
+  <string name="msg_sbc_searching_book">Zoekt naar boek\u2026</string>
+  <string name="msg_sbc_snippet_unavailable">Korte beschrijving niet beschikbaar</string>
+  <string name="msg_sbc_unknown_page">Onbekende pagina</string>
+  <string name="msg_share_explanation">Je kan data delen door een barcode op het scherm te laten zien, en deze door een andere telefoon te scannen.</string>
+  <string name="msg_share_subject_line">Hier is de barcode die ik gescand heb</string>
+  <string name="msg_unmount_usb">Sorry, de SD-kaart is niet toegankelijk.</string>
+  <string name="preferences_actions_title">Als een barcode is gevonden\u2026</string>
+  <string name="preferences_bulk_mode_summary">Scan continue barcodes en sla ze allemaal op</string>
+  <string name="preferences_bulk_mode_title">Bulk scan modus</string>
+  <string name="preferences_copy_to_clipboard_title">Kopieer naar plakbord</string>
+  <string name="preferences_custom_product_search_summary">Gebruik %s voor de plaats van het product ID en %f voor het formaat</string>
+  <string name="preferences_custom_product_search_title">Zoek aangepaste URL</string>
+  <string name="preferences_decode_1D_title">Decodeer 1D barcodes</string>
+  <string name="preferences_decode_Data_Matrix_title">Decodeer Data Matrix</string>
+  <string name="preferences_decode_QR_title">Decodeer QR codes</string>
+  <string name="preferences_front_light_summary">Inschakelen van achtergrondlicht, indien beschikbaar. Dit kan in sommige gevallen leiden tot slechte herkenning van barcodes. Werkt niet op alle telefoons.</string>
+  <string name="preferences_front_light_title">Achtergrondlicht</string>
+  <string name="preferences_general_title">Basisinstellingen</string>
+  <string name="preferences_name">Instellingen</string>
+  <string name="preferences_play_beep_title">Piepen</string>
+  <string name="preferences_result_title">Instellingen voor resultaat</string>
+  <string name="preferences_scanning_title">Bij het scannen van barcodes voor de\u2026</string>
+  <string name="preferences_vibrate_title">Trillen</string>
+  <string name="result_address_book">Contact informatie gevonden</string>
+  <string name="result_calendar">Agendagebeurtenis gevonden</string>
+  <string name="result_email_address">E-mailadres gevonden</string>
+  <string name="result_geo">Geografische coordinaten gevonden</string>
+  <string name="result_isbn">Boek gevonden</string>
+  <string name="result_product">Product gevonden</string>
+  <string name="result_sms">SMSnummer gevonden</string>
+  <string name="result_tel">Telefoonnummer gevonden</string>
+  <string name="result_text">Tekst gevonden</string>
+  <string name="result_uri">URL gevonden</string>
+  <string name="result_wifi">Netwerkconfiguratie gevonden </string>
+  <string name="sbc_name">Zoek boeken met Google Books</string>
+  <string name="share_name">Deel via barcode</string>
+  <string name="title_about">Barcode Scanner v</string>
+  <string name="wa_name">Netwerkconfiguratie</string>
+  <string name="wifi_changing_network">Veranderen van Netwerk</string>
+  <string name="wifi_connect_failed">Netwerk verbinding is mislukt</string>
+  <string name="wifi_connected">Verbonden</string>
+  <string name="wifi_creating_network">Netwerk creeren</string>
+  <string name="wifi_modifying_network">Netwerk wijzigen</string>
+  <string name="wifi_ssid_label">Netwerknaam (SSID)</string>
+  <string name="wifi_ssid_missing">Netwerk naam ontbreekt</string>
+  <string name="wifi_type_incorrect">Onjuist netwerktype</string>
+  <string name="wifi_type_label">Type</string>
+  <string name="zxing_url">http://code.google.com/p/zxing</string>
+</resources>
diff --git a/android/res/values-pl/strings.xml b/android/res/values-pl/strings.xml
index a20aa3522..dab196650 100644
--- a/android/res/values-pl/strings.xml
+++ b/android/res/values-pl/strings.xml
@@ -96,6 +96,7 @@
   <string name="preferences_custom_product_search_summary">Użyj %s jako zamiennik dla ID produktu, a dla formatu %f</string>
   <string name="preferences_custom_product_search_title">Własny URL wyszukiwania</string>
   <string name="preferences_decode_1D_title">Dekoduj kody 1D</string>
+  <string name="preferences_decode_Data_Matrix_title">Dekoduj Decode Matrix</string>
   <string name="preferences_decode_QR_title">Dekoduj kody QR</string>
   <string name="preferences_front_light_summary">Polepsza skanowanie przy małej ilości światła w niektórych telefonach, ale może powodować odbłysk. Nie działa na wszystkich telefonach.</string>
   <string name="preferences_front_light_title">Używaj lampy frontowej</string>
@@ -121,13 +122,13 @@
   <string name="title_about">Skaner Kodów Paskowych v</string>
   <string name="wa_name">Konfiguracja sieci</string>
   <string name="wifi_changing_network">Zmiana sieci</string>
+  <string name="wifi_connect_failed">Połączenie sieciowe nie</string>
   <string name="wifi_connected">Połączony</string>
   <string name="wifi_creating_network">Tworzenie sieci</string>
   <string name="wifi_modifying_network">Modyfikowanie sieci</string>
+  <string name="wifi_ssid_label">Nazwa sieci</string>
   <string name="wifi_ssid_missing">Nazwa sieci brakuje</string>
   <string name="wifi_type_incorrect">Typ sieci nieprawidłowe</string>
-  <string name="wifi_ssid_label">Nazwa sieci</string>
   <string name="wifi_type_label">Typ</string>
-  <string name="wifi_connect_failed">Połączenie sieciowe nie</string>
   <string name="zxing_url">http://code.google.com/p/zxing</string>
 </resources>
diff --git a/android/res/values-pt/strings.xml b/android/res/values-pt/strings.xml
index 5f577e828..90fc3a856 100644
--- a/android/res/values-pt/strings.xml
+++ b/android/res/values-pt/strings.xml
@@ -96,6 +96,7 @@
   <string name="preferences_custom_product_search_summary">Use %s como um espaço reservado para a identificação do produto, e para o formato %f</string>
   <string name="preferences_custom_product_search_title">URL de pesquisa personalizada </string>
   <string name="preferences_decode_1D_title">Descodificar código de barras 1D</string>
+  <string name="preferences_decode_Data_Matrix_title">Descodificar Data Matrix</string>
   <string name="preferences_decode_QR_title">Descodificar códigos QR</string>
   <string name="preferences_front_light_summary">Melhora a digitalização em baixa luminosidade em alguns aparelhos, mas pode causar ofuscamento. Não funciona em todos os telefones.</string>
   <string name="preferences_front_light_title">Use a luz da frente</string>
@@ -121,13 +122,13 @@
   <string name="title_about">Scanner de código barras v</string>
   <string name="wa_name">Configuração de rede</string>
   <string name="wifi_changing_network">Mudar Rede</string>
+  <string name="wifi_connect_failed">A conexão de rede não</string>
   <string name="wifi_connected">Ligado</string>
   <string name="wifi_creating_network">Criação da rede</string>
   <string name="wifi_modifying_network">Modificando Rede</string>
+  <string name="wifi_ssid_label">Nome da Rede</string>
   <string name="wifi_ssid_missing">Nome da rede em falta</string>
   <string name="wifi_type_incorrect">Rede de tipo incorreto</string>
-  <string name="wifi_ssid_label">Nome da Rede</string>
   <string name="wifi_type_label">Tipo</string>
-  <string name="wifi_connect_failed">A conexão de rede não</string>
   <string name="zxing_url">http://code.google.com/p/zxing</string>
 </resources>
diff --git a/android/res/values-ru/strings.xml b/android/res/values-ru/strings.xml
index 529675ace..24dfd9e88 100644
--- a/android/res/values-ru/strings.xml
+++ b/android/res/values-ru/strings.xml
@@ -96,6 +96,7 @@
   <string name="preferences_custom_product_search_summary">%s будет заменён на ID товара, и %f для формата</string>
   <string name="preferences_custom_product_search_title">URL пользовательского поиска</string>
   <string name="preferences_decode_1D_title">Распознавать линейные штрих-коды</string>
+  <string name="preferences_decode_Data_Matrix_title">Распознавать Data Matrix</string>
   <string name="preferences_decode_QR_title">Распознавать QR-коды</string>
   <string name="preferences_front_light_summary">Включите свет, если передние доступно. Не работает на всех телефонах.</string>
   <string name="preferences_front_light_title">Передние омыватели</string>
@@ -121,13 +122,13 @@
   <string name="title_about">Сканер штрих-кодов версии </string>
   <string name="wa_name">конфигурации сети</string>
   <string name="wifi_changing_network">Изменение сети</string>
+  <string name="wifi_connect_failed">Подключение к сети не удалось</string>
   <string name="wifi_connected">Связанный</string>
   <string name="wifi_creating_network">Создание сети</string>
   <string name="wifi_modifying_network">Изменение сети</string>
+  <string name="wifi_ssid_label">Имя сети</string>
   <string name="wifi_ssid_missing">Сеть отсутствует имя</string>
   <string name="wifi_type_incorrect">Тип сети неправильный</string>
-  <string name="wifi_ssid_label">Имя сети</string>
   <string name="wifi_type_label">Тип</string>
-  <string name="wifi_connect_failed">Подключение к сети не удалось</string>
   <string name="zxing_url">http://code.google.com/p/zxing</string>
 </resources>
diff --git a/android/res/values-sl/strings.xml b/android/res/values-sl/strings.xml
index 0f5d8b41e..7723f3cc7 100644
--- a/android/res/values-sl/strings.xml
+++ b/android/res/values-sl/strings.xml
@@ -96,6 +96,7 @@
   <string name="preferences_custom_product_search_summary">Uporabi %s kot prostor za ID produkta ter %f za format</string>
   <string name="preferences_custom_product_search_title">URL za iskanje po meri</string>
   <string name="preferences_decode_1D_title">Preberi 1D črtno kodo</string>
+  <string name="preferences_decode_Data_Matrix_title">Preberi Data Matrix</string>
   <string name="preferences_decode_QR_title">Preberi QR kodo</string>
   <string name="preferences_front_light_summary">Izboljša branje pri slabi svetlobi na nekaterih telefonih, a lahko povzroči blesk. Ne deluje na vseh telefonih.</string>
   <string name="preferences_front_light_title">Uporabite sprednjo luč</string>
@@ -121,13 +122,13 @@
   <string name="title_about">Barcode Scanner v</string>
   <string name="wa_name">Wifi povezava</string>
   <string name="wifi_changing_network">Menjam omrežje</string>
+  <string name="wifi_connect_failed">Napaka omrežne povezave</string>
   <string name="wifi_connected">Povezan</string>
   <string name="wifi_creating_network">Kreiram omrežje</string>
   <string name="wifi_modifying_network">Urejam omrežje</string>
+  <string name="wifi_ssid_label">Ime omrežja</string>
   <string name="wifi_ssid_missing">Manjka ime omrežja</string>
   <string name="wifi_type_incorrect">Nepravilen tip omrežja</string>
-  <string name="wifi_connect_failed">Napaka omrežne povezave</string>
-  <string name="wifi_ssid_label">Ime omrežja</string>
   <string name="wifi_type_label">Tip</string>
   <string name="zxing_url">http://code.google.com/p/zxing</string>
 </resources>
diff --git a/android/res/values-sv/strings.xml b/android/res/values-sv/strings.xml
index bafa99cf2..872a94d94 100644
--- a/android/res/values-sv/strings.xml
+++ b/android/res/values-sv/strings.xml
@@ -96,6 +96,7 @@
   <string name="preferences_custom_product_search_summary">Skriv %s där produktens ID ska placeras, och %f för format</string>
   <string name="preferences_custom_product_search_title">Anpassad sök-URL</string>
   <string name="preferences_decode_1D_title">Avkoda 1D steckkod</string>
+  <string name="preferences_decode_Data_Matrix_title">Avkoda Data Matrix</string>
   <string name="preferences_decode_QR_title">Avkoda QR-koder</string>
   <string name="preferences_front_light_summary">Aktivera ljuset framför, om det finns. Fungerar inte på alla telefoner.</string>
   <string name="preferences_front_light_title">Ljuset framför</string>
@@ -121,13 +122,13 @@
   <string name="title_about">Barcode Scanner v</string>
   <string name="wa_name">Nätverkskonfiguration</string>
   <string name="wifi_changing_network">Ändra Network</string>
+  <string name="wifi_connect_failed">Nätverksanslutning misslyckades</string>
   <string name="wifi_connected">Ansluten</string>
   <string name="wifi_creating_network">Skapa nätverk</string>
   <string name="wifi_modifying_network">Modifiera nätverk</string>
+  <string name="wifi_ssid_label">Nätverksnamn</string>
   <string name="wifi_ssid_missing">Nätverksnamn saknas</string>
   <string name="wifi_type_incorrect">Nätverkstyp felaktig</string>
-  <string name="wifi_ssid_label">Nätverksnamn</string>
   <string name="wifi_type_label">Typ</string>
-  <string name="wifi_connect_failed">Nätverksanslutning misslyckades</string>
   <string name="zxing_url">http://code.google.com/p/zxing</string>
 </resources>
diff --git a/android/res/values-tr/strings.xml b/android/res/values-tr/strings.xml
index 1bb3ebd83..f8cee0dd1 100644
--- a/android/res/values-tr/strings.xml
+++ b/android/res/values-tr/strings.xml
@@ -96,6 +96,7 @@
   <string name="preferences_custom_product_search_summary">Ürün kimliği için yer tutucu olarak %s öğesini kullan</string>
   <string name="preferences_custom_product_search_title">Özel arama URL</string>
   <string name="preferences_decode_1D_title">1D barkodlarını çöz</string>
+  <string name="preferences_decode_Data_Matrix_title">Data Matrix Çöz</string>
   <string name="preferences_decode_QR_title">QR Kodlarını Çöz</string>
   <string name="preferences_front_light_summary">Bazı telefonlarda düşük ışıkta taramayı geliştirir, ancak parlak ışığa neden olabilir</string>
   <string name="preferences_front_light_title">Ön ışığı kullan</string>
diff --git a/android/res/values-zh-rCN/strings.xml b/android/res/values-zh-rCN/strings.xml
index 59c3be946..790f25db2 100644
--- a/android/res/values-zh-rCN/strings.xml
+++ b/android/res/values-zh-rCN/strings.xml
@@ -96,6 +96,7 @@
   <string name="preferences_custom_product_search_summary">使用％s作为产品ID占位</string>
   <string name="preferences_custom_product_search_title">自定义搜索网址</string>
   <string name="preferences_decode_1D_title">解码一维条码</string>
+  <string name="preferences_decode_Data_Matrix_title">数据矩阵码解码</string>
   <string name="preferences_decode_QR_title">解码QR条码</string>
   <string name="preferences_front_light_summary">使前灯如果可用</string>
   <string name="preferences_front_light_title">前灯</string>
@@ -121,13 +122,13 @@
   <string name="title_about">条码扫描器</string>
   <string name="wa_name">网络配置</string>
   <string name="wifi_changing_network">不断变化的网络</string>
+  <string name="wifi_connect_failed">网络连接失败</string>
   <string name="wifi_connected">连接的</string>
   <string name="wifi_creating_network">创建网络</string>
   <string name="wifi_modifying_network">修改网络</string>
+  <string name="wifi_ssid_label">网络名称</string>
   <string name="wifi_ssid_missing">网络实名失踪</string>
   <string name="wifi_type_incorrect">网络类型不正确</string>
-  <string name="wifi_ssid_label">网络名称</string>
   <string name="wifi_type_label">类型</string>
-  <string name="wifi_connect_failed">网络连接失败</string>
   <string name="zxing_url">http://code.google.com/p/zxing</string>
 </resources>
diff --git a/android/res/values-zh-rTW/strings.xml b/android/res/values-zh-rTW/strings.xml
index 409c23149..43a544399 100644
--- a/android/res/values-zh-rTW/strings.xml
+++ b/android/res/values-zh-rTW/strings.xml
@@ -96,6 +96,7 @@
   <string name="preferences_custom_product_search_summary">使用％s作為佔位符的產品ID</string>
   <string name="preferences_custom_product_search_title">自定義搜索網址</string>
   <string name="preferences_decode_1D_title">解碼一維條碼</string>
+  <string name="preferences_decode_Data_Matrix_title">數據矩陣碼解碼</string>
   <string name="preferences_decode_QR_title">解碼QR條碼</string>
   <string name="preferences_front_light_summary">改善在低光源的環境下掃描的成功率, 但有可能造成過度曝光的現象</string>
   <string name="preferences_front_light_title">使用前光源</string>
@@ -121,13 +122,13 @@
   <string name="title_about">條碼掃描器</string>
   <string name="wa_name">網絡配置</string>
   <string name="wifi_changing_network">不斷變化的網絡</string>
+  <string name="wifi_connect_failed">網絡連接失敗</string>
   <string name="wifi_connected">連接的</string>
   <string name="wifi_creating_network">創建網絡</string>
   <string name="wifi_modifying_network">修改網絡</string>
+  <string name="wifi_ssid_label">網絡名稱</string>
   <string name="wifi_ssid_missing">網絡實名失踪</string>
   <string name="wifi_type_incorrect">網絡類型不正確</string>
-  <string name="wifi_ssid_label">網絡名稱</string>
   <string name="wifi_type_label">類型</string>
-  <string name="wifi_connect_failed">網絡連接失敗</string>
   <string name="zxing_url">http://code.google.com/p/zxing</string>
 </resources>
diff --git a/android/res/values/strings.xml b/android/res/values/strings.xml
index 62014f228..b261c7bfd 100755
--- a/android/res/values/strings.xml
+++ b/android/res/values/strings.xml
@@ -96,6 +96,7 @@
   <string name="preferences_custom_product_search_summary">Use %s as a placeholder for the product ID, and %f for format</string>
   <string name="preferences_custom_product_search_title">Custom search URL</string>
   <string name="preferences_decode_1D_title">Decode 1D barcodes</string>
+  <string name="preferences_decode_Data_Matrix_title">Decode Data Matrix</string>
   <string name="preferences_decode_QR_title">Decode QR Codes</string>
   <string name="preferences_front_light_summary">Improves scanning in low light on some phones, but may cause glare. Does not work on all phones.</string>
   <string name="preferences_front_light_title">Use front light</string>
diff --git a/android/res/xml/preferences.xml b/android/res/xml/preferences.xml
index d605b761b..8ef9a1e34 100755
--- a/android/res/xml/preferences.xml
+++ b/android/res/xml/preferences.xml
@@ -24,6 +24,10 @@
         android:key="preferences_decode_QR"
         android:defaultValue="true"
         android:title="@string/preferences_decode_QR_title"/>
+    <CheckBoxPreference
+        android:key="preferences_decode_Data_Matrix"
+        android:defaultValue="true"
+        android:title="@string/preferences_decode_Data_Matrix_title"/>
   </PreferenceCategory>
   <PreferenceCategory android:title="@string/preferences_actions_title">
     <CheckBoxPreference
diff --git a/android/src/com/google/zxing/client/android/DecodeFormatManager.java b/android/src/com/google/zxing/client/android/DecodeFormatManager.java
index bd883fc88..27b208fb5 100644
--- a/android/src/com/google/zxing/client/android/DecodeFormatManager.java
+++ b/android/src/com/google/zxing/client/android/DecodeFormatManager.java
@@ -32,7 +32,7 @@ final class DecodeFormatManager {
   static final Vector<BarcodeFormat> PRODUCT_FORMATS;
   static final Vector<BarcodeFormat> ONE_D_FORMATS;
   static final Vector<BarcodeFormat> QR_CODE_FORMATS;
-  static final Vector<BarcodeFormat> ALL_FORMATS;
+  static final Vector<BarcodeFormat> DATA_MATRIX_FORMATS;
   static {
     PRODUCT_FORMATS = new Vector<BarcodeFormat>(5);
     PRODUCT_FORMATS.add(BarcodeFormat.UPC_A);
@@ -48,9 +48,8 @@ final class DecodeFormatManager {
     ONE_D_FORMATS.add(BarcodeFormat.ITF);
     QR_CODE_FORMATS = new Vector<BarcodeFormat>(1);
     QR_CODE_FORMATS.add(BarcodeFormat.QR_CODE);
-    ALL_FORMATS = new Vector<BarcodeFormat>(ONE_D_FORMATS.size() + QR_CODE_FORMATS.size());
-    ALL_FORMATS.addAll(ONE_D_FORMATS);
-    ALL_FORMATS.addAll(QR_CODE_FORMATS);
+    DATA_MATRIX_FORMATS = new Vector<BarcodeFormat>(1);
+    DATA_MATRIX_FORMATS.add(BarcodeFormat.DATA_MATRIX);
   }
 
   private DecodeFormatManager() {}
@@ -92,6 +91,9 @@ final class DecodeFormatManager {
       if (Intents.Scan.QR_CODE_MODE.equals(decodeMode)) {
         return QR_CODE_FORMATS;
       }
+      if (Intents.Scan.DATA_MATRIX_MODE.equals(decodeMode)) {
+        return DATA_MATRIX_FORMATS;
+      }
       if (Intents.Scan.ONE_D_MODE.equals(decodeMode)) {
         return ONE_D_FORMATS;
       }
diff --git a/android/src/com/google/zxing/client/android/DecodeThread.java b/android/src/com/google/zxing/client/android/DecodeThread.java
index 52a5a8d75..09a3b3b62 100755
--- a/android/src/com/google/zxing/client/android/DecodeThread.java
+++ b/android/src/com/google/zxing/client/android/DecodeThread.java
@@ -56,18 +56,18 @@ final class DecodeThread extends Thread {
     // The prefs can't change while the thread is running, so pick them up once here.
     if (decodeFormats == null || decodeFormats.isEmpty()) {
       SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(activity);
-      boolean decode1D = prefs.getBoolean(PreferencesActivity.KEY_DECODE_1D, true);
-      boolean decodeQR = prefs.getBoolean(PreferencesActivity.KEY_DECODE_QR, true);
-      if (decode1D && decodeQR) {
-        hints.put(DecodeHintType.POSSIBLE_FORMATS, DecodeFormatManager.ALL_FORMATS);
-      } else if (decode1D) {
-        hints.put(DecodeHintType.POSSIBLE_FORMATS, DecodeFormatManager.ONE_D_FORMATS);
-      } else if (decodeQR) {
-        hints.put(DecodeHintType.POSSIBLE_FORMATS, DecodeFormatManager.QR_CODE_FORMATS);
+      decodeFormats = new Vector<BarcodeFormat>();
+      if (prefs.getBoolean(PreferencesActivity.KEY_DECODE_1D, true)) {
+        decodeFormats.addAll(DecodeFormatManager.ONE_D_FORMATS);
+      }
+      if (prefs.getBoolean(PreferencesActivity.KEY_DECODE_QR, true)) {
+        decodeFormats.addAll(DecodeFormatManager.QR_CODE_FORMATS);
+      }
+      if (prefs.getBoolean(PreferencesActivity.KEY_DECODE_DATA_MATRIX, true)) {
+        decodeFormats.addAll(DecodeFormatManager.DATA_MATRIX_FORMATS);
       }
-    } else {
-      hints.put(DecodeHintType.POSSIBLE_FORMATS, decodeFormats);
     }
+    hints.put(DecodeHintType.POSSIBLE_FORMATS, decodeFormats);
 
     if (characterSet != null) {
       hints.put(DecodeHintType.CHARACTER_SET, characterSet);
diff --git a/android/src/com/google/zxing/client/android/Intents.java b/android/src/com/google/zxing/client/android/Intents.java
index 5e268ee46..74dd0af24 100755
--- a/android/src/com/google/zxing/client/android/Intents.java
+++ b/android/src/com/google/zxing/client/android/Intents.java
@@ -74,6 +74,11 @@ public final class Intents {
      */
     public static final String QR_CODE_MODE = "QR_CODE_MODE";
 
+    /**
+     * Decode only Data Matrix codes.
+     */
+    public static final String DATA_MATRIX_MODE = "DATA_MATRIX_MODE";
+
     /**
      * If a barcode is found, Barcodes returns RESULT_OK to onActivityResult() of the app which
      * requested the scan via startSubActivity(). The barcodes contents can be retrieved with
diff --git a/android/src/com/google/zxing/client/android/PreferencesActivity.java b/android/src/com/google/zxing/client/android/PreferencesActivity.java
index 04e144104..480a1d3b3 100755
--- a/android/src/com/google/zxing/client/android/PreferencesActivity.java
+++ b/android/src/com/google/zxing/client/android/PreferencesActivity.java
@@ -23,6 +23,9 @@ import android.preference.CheckBoxPreference;
 import android.preference.PreferenceActivity;
 import android.preference.PreferenceScreen;
 
+import java.util.ArrayList;
+import java.util.Collection;
+
 /**
  * The main settings activity.
  *
@@ -33,6 +36,7 @@ public final class PreferencesActivity extends PreferenceActivity
 
   public static final String KEY_DECODE_1D = "preferences_decode_1D";
   public static final String KEY_DECODE_QR = "preferences_decode_QR";
+  public static final String KEY_DECODE_DATA_MATRIX = "preferences_decode_Data_Matrix";
   public static final String KEY_CUSTOM_PRODUCT_SEARCH = "preferences_custom_product_search";
 
   public static final String KEY_PLAY_BEEP = "preferences_play_beep";
@@ -46,6 +50,7 @@ public final class PreferencesActivity extends PreferenceActivity
 
   private CheckBoxPreference decode1D;
   private CheckBoxPreference decodeQR;
+  private CheckBoxPreference decodeDataMatrix;
 
   @Override
   protected void onCreate(Bundle icicle) {
@@ -56,6 +61,7 @@ public final class PreferencesActivity extends PreferenceActivity
     preferences.getSharedPreferences().registerOnSharedPreferenceChangeListener(this);
     decode1D = (CheckBoxPreference) preferences.findPreference(KEY_DECODE_1D);
     decodeQR = (CheckBoxPreference) preferences.findPreference(KEY_DECODE_QR);
+    decodeDataMatrix = (CheckBoxPreference) preferences.findPreference(KEY_DECODE_DATA_MATRIX);
     disableLastCheckedPref();
   }
 
@@ -64,17 +70,19 @@ public final class PreferencesActivity extends PreferenceActivity
   }
 
   private void disableLastCheckedPref() {
+    Collection<CheckBoxPreference> checked = new ArrayList<CheckBoxPreference>(3);
     if (decode1D.isChecked()) {
-      decodeQR.setEnabled(true);
-    } else {
-      decodeQR.setEnabled(false);
-      decodeQR.setChecked(true);
+      checked.add(decode1D);
     }
     if (decodeQR.isChecked()) {
-      decode1D.setEnabled(true);
-    } else {
-      decode1D.setEnabled(false);
-      decode1D.setChecked(true);
+      checked.add(decodeQR);
+    }
+    if (decodeDataMatrix.isChecked()) {
+      checked.add(decodeDataMatrix);
+    }
+    boolean disable = checked.size() < 2;
+    for (CheckBoxPreference pref : new CheckBoxPreference[] {decode1D, decodeQR, decodeDataMatrix}) {
+      pref.setEnabled(!(disable && checked.contains(pref)));
     }
   }
 
diff --git a/core/src/com/google/zxing/MultiFormatReader.java b/core/src/com/google/zxing/MultiFormatReader.java
index c817d6801..42a97fe7c 100644
--- a/core/src/com/google/zxing/MultiFormatReader.java
+++ b/core/src/com/google/zxing/MultiFormatReader.java
@@ -130,8 +130,7 @@ public final class MultiFormatReader implements Reader {
       }
       readers.addElement(new QRCodeReader());
 
-      // TODO re-enable once Data Matrix is ready
-      // readers.addElement(new DataMatrixReader());
+      readers.addElement(new DataMatrixReader());
 
       // TODO: Enable once PDF417 has passed QA
       //readers.addElement(new PDF417Reader());