From d78dcfa216d199cb91e1066e6e1e17fcfb06f576 Mon Sep 17 00:00:00 2001
From: srowen <srowen@59b500cc-1b3d-0410-9834-0bbf25fbcc57>
Date: Thu, 17 Jun 2010 12:26:41 +0000
Subject: [PATCH] Add bulk scan mode with preference (and rearrange prefs a
 bit). Reorder main strings file, add new pref string and remove
 probably-incorrect ellipses from Asian language translations

git-svn-id: http://zxing.googlecode.com/svn/trunk@1443 59b500cc-1b3d-0410-9834-0bbf25fbcc57
---
 android/res/values-ar/strings.xml             |  9 ++--
 android/res/values-cs/strings.xml             |  1 +
 android/res/values-da/strings.xml             |  1 +
 android/res/values-de/strings.xml             |  1 +
 android/res/values-es/strings.xml             |  1 +
 android/res/values-fi/strings.xml             |  1 +
 android/res/values-fr/strings.xml             |  1 +
 android/res/values-hu/strings.xml             |  1 +
 android/res/values-it/strings.xml             |  1 +
 android/res/values-ja-rJP/strings.xml         |  7 ++--
 android/res/values-nl/strings.xml             |  1 +
 android/res/values-pl/strings.xml             |  1 +
 android/res/values-pt/strings.xml             |  1 +
 android/res/values-ru/strings.xml             |  1 +
 android/res/values-sv/strings.xml             |  1 +
 android/res/values-zh-rCN/strings.xml         |  7 ++--
 android/res/values-zh-rTW/strings.xml         |  7 ++--
 android/res/values/strings.xml                | 41 ++++++++++---------
 android/res/xml/preferences.xml               | 19 ++++++---
 .../zxing/client/android/CaptureActivity.java | 21 +++++++++-
 .../client/android/PreferencesActivity.java   |  1 +
 21 files changed, 84 insertions(+), 41 deletions(-)

diff --git a/android/res/values-ar/strings.xml b/android/res/values-ar/strings.xml
index bb528a5b..059b51c9 100644
--- a/android/res/values-ar/strings.xml
+++ b/android/res/values-ar/strings.xml
@@ -74,23 +74,23 @@
   <string name="msg_default_type">النوع</string>
   <string name="msg_encode_barcode_failed">تعذر إنشاء الرمز الشريطي المطلوب.</string>
   <string name="msg_encode_contents_failed">تعذر ترميز رمز شريطي من البيانات المتوفرة.</string>
-  <string name="msg_encode_in_progress">إنشاء رمز شريطي...</string>
+  <string name="msg_encode_in_progress">إنشاء رمز شريطي</string>
   <string name="msg_google_shopper_missing">لم يتم تثبيت Google Shopper</string>
   <string name="msg_install_google_shopper">يجمع Google Shopper بين مسح الرمز الشريطي مع الأسعار والتعليقات وغيرها بدون فتح المتصفح. هل تريد استخدامه؟</string>
   <string name="msg_intent_failed">عفوا، تعذر تشغيل التطبيق المطلوب. قد تكون محتويات الرمز الشريطي غير صحيحة.</string>
-  <string name="msg_loading_apps">تحميل قائمة التطبيقات...</string>
+  <string name="msg_loading_apps">تحميل قائمة التطبيقات</string>
   <string name="msg_not_our_results">تقوم الآن بالخروج من التطبيق. نتائج البحث التي ستظهر لك غير مرتبطة بهذا التطبيق.</string>
   <string name="msg_sbc_book_not_searchable">عفوا، لا يمكن البحث في هذا الكتاب.</string>
   <string name="msg_sbc_failed">عفوا، حدثت مشكلة في عملية البحث.</string>
   <string name="msg_sbc_no_page_returned">لم يتم إرجاع أية صفحة</string>
   <string name="msg_sbc_page">الصفحة</string>
-  <string name="msg_sbc_searching_book">البحث في الكتاب...</string>
+  <string name="msg_sbc_searching_book">البحث في الكتاب</string>
   <string name="msg_sbc_snippet_unavailable">الأجزاء غير متاحة</string>
   <string name="msg_sbc_unknown_page">صفحة غير معروفة</string>
   <string name="msg_share_explanation">يمكنك مشاركة البيانات عن طريق عرض رمز شريطي على الشاشة ومسحه من خلال هاتف آخر.</string>
   <string name="msg_share_subject_line">توجد هنا محتويات الرمز الشريطي الذي قمت بمسحه</string>
   <string name="msg_unmount_usb">رجاء إيقاف التخزين على USB للمتابعة.</string>
-  <string name="preferences_actions_title">عند العثور على رمز شريطي...</string>
+  <string name="preferences_actions_title">عند العثور على رمز شريطي</string>
   <string name="preferences_bulk_mode_summary">المسح الضوئي وحفظها بشكل مستمر العديد من الرموز الشريطية</string>
   <string name="preferences_bulk_mode_title">جل وضع المسح الضوئي</string>
   <string name="preferences_copy_to_clipboard_title">نسخ إلى الحافظة</string>
@@ -104,6 +104,7 @@
   <string name="preferences_name">إعدادات</string>
   <string name="preferences_play_beep_title">صوت تنبيه</string>
   <string name="preferences_result_title">إعدادات النتائج</string>
+  <string name="preferences_scanning_title">عندما لمسح الباركود</string>
   <string name="preferences_vibrate_title">اهتزاز</string>
   <string name="result_address_book">تم العثور على معلومات جهة الاتصال</string>
   <string name="result_calendar">تم العثور على حدث التقويم</string>
diff --git a/android/res/values-cs/strings.xml b/android/res/values-cs/strings.xml
index 79e31366..1652d4fa 100644
--- a/android/res/values-cs/strings.xml
+++ b/android/res/values-cs/strings.xml
@@ -104,6 +104,7 @@
   <string name="preferences_name">Nastavení</string>
   <string name="preferences_play_beep_title">Zvuky</string>
   <string name="preferences_result_title">Výsledek nastavení</string>
+  <string name="preferences_scanning_title">Při skenování pro čárové kódy\u2026</string>
   <string name="preferences_vibrate_title">Vibrace</string>
   <string name="result_address_book">Našel jsem kontakt</string>
   <string name="result_calendar">Našel jsem kalendář</string>
diff --git a/android/res/values-da/strings.xml b/android/res/values-da/strings.xml
index 01c5aeaa..9c728d75 100644
--- a/android/res/values-da/strings.xml
+++ b/android/res/values-da/strings.xml
@@ -104,6 +104,7 @@
   <string name="preferences_name">Indstillinger</string>
   <string name="preferences_play_beep_title">Bip</string>
   <string name="preferences_result_title">Resultatindstillinger</string>
+  <string name="preferences_scanning_title">NÃ¥r scanning for stregkoder\u2026</string>
   <string name="preferences_vibrate_title">vibrere</string>
   <string name="result_address_book">Fundet kontaktinfo</string>
   <string name="result_calendar">Fundet kalendarbegivenhed</string>
diff --git a/android/res/values-de/strings.xml b/android/res/values-de/strings.xml
index dc5e7bfa..5bf7d500 100644
--- a/android/res/values-de/strings.xml
+++ b/android/res/values-de/strings.xml
@@ -104,6 +104,7 @@
   <string name="preferences_name">Einstellungen</string>
   <string name="preferences_play_beep_title">Ton</string>
   <string name="preferences_result_title">Ergebnis-Einstellungen</string>
+  <string name="preferences_scanning_title">Beim Scannen von Barcodes für\u2026</string>
   <string name="preferences_vibrate_title">Vibration</string>
   <string name="result_address_book">Kontakt gefunden</string>
   <string name="result_calendar">Termin gefunden</string>
diff --git a/android/res/values-es/strings.xml b/android/res/values-es/strings.xml
index ec1d6799..82f19b26 100644
--- a/android/res/values-es/strings.xml
+++ b/android/res/values-es/strings.xml
@@ -104,6 +104,7 @@
   <string name="preferences_name">Configuración</string>
   <string name="preferences_play_beep_title">Bip</string>
   <string name="preferences_result_title">Configuración de resultados</string>
+  <string name="preferences_scanning_title">Cuando escanea códigos de barras\u2026</string>
   <string name="preferences_vibrate_title">Vibrar</string>
   <string name="result_address_book">Información de contacto encontrado</string>
   <string name="result_calendar">Evento agendado encontrado</string>
diff --git a/android/res/values-fi/strings.xml b/android/res/values-fi/strings.xml
index 09043aec..f6dde5a7 100644
--- a/android/res/values-fi/strings.xml
+++ b/android/res/values-fi/strings.xml
@@ -104,6 +104,7 @@
   <string name="preferences_name">Asetukset</string>
   <string name="preferences_play_beep_title">Piip</string>
   <string name="preferences_result_title">Tuloksien asetukset</string>
+  <string name="preferences_scanning_title">Kun skannaus viivakoodia\u2026</string>
   <string name="preferences_vibrate_title">Värinä</string>
   <string name="result_address_book">Läydettiin kontakti tietoja</string>
   <string name="result_calendar">Löydetty kalenteri tapahtuma</string>
diff --git a/android/res/values-fr/strings.xml b/android/res/values-fr/strings.xml
index 5a188089..98dcf25f 100644
--- a/android/res/values-fr/strings.xml
+++ b/android/res/values-fr/strings.xml
@@ -104,6 +104,7 @@
   <string name="preferences_name">Paramètres</string>
   <string name="preferences_play_beep_title">Bip</string>
   <string name="preferences_result_title">Paramètres de résultat</string>
+  <string name="preferences_scanning_title">Lors de la numérisation de codes à barres\u2026</string>
   <string name="preferences_vibrate_title">Vibrer</string>
   <string name="result_address_book">Information de contact trouvée</string>
   <string name="result_calendar">Evénement de l\'agenda trouvée</string>
diff --git a/android/res/values-hu/strings.xml b/android/res/values-hu/strings.xml
index 4c5d6b84..c30c0712 100644
--- a/android/res/values-hu/strings.xml
+++ b/android/res/values-hu/strings.xml
@@ -104,6 +104,7 @@
   <string name="preferences_name">Beállítások</string>
   <string name="preferences_play_beep_title">Sípolás</string>
   <string name="preferences_result_title">Találati beállítások</string>
+  <string name="preferences_scanning_title">Ha a lapolvasó a vonalkód\u2026</string>
   <string name="preferences_vibrate_title">Rezgés</string>
   <string name="result_address_book">Kapcsolat információ találat</string>
   <string name="result_calendar">Naptár esemény találat</string>
diff --git a/android/res/values-it/strings.xml b/android/res/values-it/strings.xml
index c0231a33..f1252252 100644
--- a/android/res/values-it/strings.xml
+++ b/android/res/values-it/strings.xml
@@ -104,6 +104,7 @@
   <string name="preferences_name">Impostazioni</string>
   <string name="preferences_play_beep_title">Suona</string>
   <string name="preferences_result_title">Impostazioni risultato</string>
+  <string name="preferences_scanning_title">Durante la scansione di codici a barre\u2026</string>
   <string name="preferences_vibrate_title">Vibra</string>
   <string name="result_address_book">Info contatto trovata</string>
   <string name="result_calendar">Evento calendario trovato</string>
diff --git a/android/res/values-ja-rJP/strings.xml b/android/res/values-ja-rJP/strings.xml
index 81322f1c..4889b64a 100644
--- a/android/res/values-ja-rJP/strings.xml
+++ b/android/res/values-ja-rJP/strings.xml
@@ -74,7 +74,7 @@
   <string name="msg_default_type">タイプ</string>
   <string name="msg_encode_barcode_failed">バーコードを作成できませんでした。</string>
   <string name="msg_encode_contents_failed">このデータからバーコードを作成できませんでした。</string>
-  <string name="msg_encode_in_progress">バーコード作成中\u2026</string>
+  <string name="msg_encode_in_progress">バーコード作成中</string>
   <string name="msg_google_shopper_missing">Googleのショッパーがインストールされていません</string>
   <string name="msg_install_google_shopper">Googleのショッパーを組み合わせた価格、レビューなどのブラウザを開かずに複数のスキャンのバーコードです。それを試してみたいか？</string>
   <string name="msg_intent_failed">指定されたアプリケーションを起動できませんでした。バーコードの内容が無効である可能性があります。</string>
@@ -84,13 +84,13 @@
   <string name="msg_sbc_failed">検索中に問題が発生しました。</string>
   <string name="msg_sbc_no_page_returned">検索結果はありません</string>
   <string name="msg_sbc_page">ページ</string>
-  <string name="msg_sbc_searching_book">書籍を検索中\u2026</string>
+  <string name="msg_sbc_searching_book">書籍を検索中</string>
   <string name="msg_sbc_snippet_unavailable">要約文はありません</string>
   <string name="msg_sbc_unknown_page">不明なページ</string>
   <string name="msg_share_explanation">画面にバーコードを表示させ、別の端末でスキャンすれば データを共有することができます。</string>
   <string name="msg_share_subject_line">スキャンしたバーコードの内容を送信します。</string>
   <string name="msg_unmount_usb">申し訳ありませんが、SDカードにアクセスできないです。</string>
-  <string name="preferences_actions_title">バーコード発見時\u2026</string>
+  <string name="preferences_actions_title">バーコード発見時</string>
   <string name="preferences_bulk_mode_summary">スキャンして保存する多くのバーコード連続</string>
   <string name="preferences_bulk_mode_title">バルクモードでのスキャン</string>
   <string name="preferences_copy_to_clipboard_title">クリップボードにコピーする</string>
@@ -104,6 +104,7 @@
   <string name="preferences_name">設定</string>
   <string name="preferences_play_beep_title">通知音</string>
   <string name="preferences_result_title">検索結果の設定</string>
+  <string name="preferences_scanning_title">時バーコードスキャン</string>
   <string name="preferences_vibrate_title">バイブ</string>
   <string name="result_address_book">連絡先がヒットしました</string>
   <string name="result_calendar">カレンダーの予定がヒットしました</string>
diff --git a/android/res/values-nl/strings.xml b/android/res/values-nl/strings.xml
index 9b290261..cbdd82a1 100644
--- a/android/res/values-nl/strings.xml
+++ b/android/res/values-nl/strings.xml
@@ -104,6 +104,7 @@
   <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>
diff --git a/android/res/values-pl/strings.xml b/android/res/values-pl/strings.xml
index d29f41c3..cfdba673 100644
--- a/android/res/values-pl/strings.xml
+++ b/android/res/values-pl/strings.xml
@@ -104,6 +104,7 @@
   <string name="preferences_name">Ustawienia</string>
   <string name="preferences_play_beep_title">Piszcz</string>
   <string name="preferences_result_title">Ustawienia rezultatów</string>
+  <string name="preferences_scanning_title">Podczas skanowania kodów kreskowych\u2026</string>
   <string name="preferences_vibrate_title">Wibruj</string>
   <string name="result_address_book">Znaleziono dane kontaktu</string>
   <string name="result_calendar">Znaleziono wydarzenie kalendarza</string>
diff --git a/android/res/values-pt/strings.xml b/android/res/values-pt/strings.xml
index 17c554f5..c25ac16a 100644
--- a/android/res/values-pt/strings.xml
+++ b/android/res/values-pt/strings.xml
@@ -104,6 +104,7 @@
   <string name="preferences_name">Definições</string>
   <string name="preferences_play_beep_title">Bip</string>
   <string name="preferences_result_title">Definições de resultados</string>
+  <string name="preferences_scanning_title">Quando a digitalização de códigos de barras\u2026</string>
   <string name="preferences_vibrate_title">Vibrar</string>
   <string name="result_address_book">Info de contacto encontrada</string>
   <string name="result_calendar">Evento de calendário encontrado </string>
diff --git a/android/res/values-ru/strings.xml b/android/res/values-ru/strings.xml
index dc780184..00e98b67 100644
--- a/android/res/values-ru/strings.xml
+++ b/android/res/values-ru/strings.xml
@@ -104,6 +104,7 @@
   <string name="preferences_name">Настройки</string>
   <string name="preferences_play_beep_title">Пищать</string>
   <string name="preferences_result_title">Настройки результата</string>
+  <string name="preferences_scanning_title">При сканировании штрих-кодов\u2026</string>
   <string name="preferences_vibrate_title">Вибрировать</string>
   <string name="result_address_book">Найдены контактные данные</string>
   <string name="result_calendar">Найдено событие для календаря</string>
diff --git a/android/res/values-sv/strings.xml b/android/res/values-sv/strings.xml
index d0d261fb..7da81fac 100644
--- a/android/res/values-sv/strings.xml
+++ b/android/res/values-sv/strings.xml
@@ -104,6 +104,7 @@
   <string name="preferences_name">Inställningar</string>
   <string name="preferences_play_beep_title">Pip</string>
   <string name="preferences_result_title">Resultatinställningar</string>
+  <string name="preferences_scanning_title">När du skannar för streckkoder\u2026</string>
   <string name="preferences_vibrate_title">Vibrera</string>
   <string name="result_address_book">Hittade kontaktinformation</string>
   <string name="result_calendar">Hittade kalenderpost</string>
diff --git a/android/res/values-zh-rCN/strings.xml b/android/res/values-zh-rCN/strings.xml
index 7020dce5..d2890cb0 100644
--- a/android/res/values-zh-rCN/strings.xml
+++ b/android/res/values-zh-rCN/strings.xml
@@ -74,7 +74,7 @@
   <string name="msg_default_type">类型</string>
   <string name="msg_encode_barcode_failed">找不到条码。</string>
   <string name="msg_encode_contents_failed">不能从已有数据中读取条码。   </string>
-  <string name="msg_encode_in_progress">正在生成条码\u2026</string>
+  <string name="msg_encode_in_progress">正在生成条码</string>
   <string name="msg_google_shopper_missing">谷歌购物未安装</string>
   <string name="msg_install_google_shopper">谷歌购物结合条码扫描价格，评论和不打开浏览器。您想尝试吗？</string>
   <string name="msg_intent_failed">抱歉，无法打开所需软件。 条码内容可能无效。</string>
@@ -84,13 +84,13 @@
   <string name="msg_sbc_failed">抱歉，搜索时遇到错误。</string>
   <string name="msg_sbc_no_page_returned">没有返回页面</string>
   <string name="msg_sbc_page">页面</string>
-  <string name="msg_sbc_searching_book">搜索图书\u2026</string>
+  <string name="msg_sbc_searching_book">搜索图书</string>
   <string name="msg_sbc_snippet_unavailable">摘录不可用</string>
   <string name="msg_sbc_unknown_page">未知页面</string>
   <string name="msg_share_explanation">你可以在你的手机屏幕上显示条码，并使用其他手机扫描此条码方式进行分享</string>
   <string name="msg_share_subject_line">这是我所扫描条码的内容</string>
   <string name="msg_unmount_usb">对不起，SD卡是不可访问。</string>
-  <string name="preferences_actions_title">找到条码时\u2026</string>
+  <string name="preferences_actions_title">找到条码时</string>
   <string name="preferences_bulk_mode_summary">连续扫描并保存许多条形码</string>
   <string name="preferences_bulk_mode_title">批量扫描模式</string>
   <string name="preferences_copy_to_clipboard_title">复制到剪切板</string>
@@ -104,6 +104,7 @@
   <string name="preferences_name">设置</string>
   <string name="preferences_play_beep_title">提示音</string>
   <string name="preferences_result_title">结果设置</string>
+  <string name="preferences_scanning_title">当扫描条形码</string>
   <string name="preferences_vibrate_title">振动</string>
   <string name="result_address_book">找到联系人信息</string>
   <string name="result_calendar">找到日历事件</string>
diff --git a/android/res/values-zh-rTW/strings.xml b/android/res/values-zh-rTW/strings.xml
index 18cb552a..666fe47b 100644
--- a/android/res/values-zh-rTW/strings.xml
+++ b/android/res/values-zh-rTW/strings.xml
@@ -74,7 +74,7 @@
   <string name="msg_default_type">類型</string>
   <string name="msg_encode_barcode_failed">找不到條碼。</string>
   <string name="msg_encode_contents_failed">無法讀取條碼。   </string>
-  <string name="msg_encode_in_progress">正在產生條碼\u2026</string>
+  <string name="msg_encode_in_progress">正在產生條碼</string>
   <string name="msg_google_shopper_missing">未安裝谷歌購物</string>
   <string name="msg_install_google_shopper">谷歌購物結合條碼掃描價格，評論，更無需打開瀏覽器。您想試用嗎？</string>
   <string name="msg_intent_failed">抱歉，無法打開所需軟體。 條碼內容可能無效。</string>
@@ -84,13 +84,13 @@
   <string name="msg_sbc_failed">抱歉，搜索時遇到錯誤。</string>
   <string name="msg_sbc_no_page_returned">沒有返回頁面</string>
   <string name="msg_sbc_page">頁面</string>
-  <string name="msg_sbc_searching_book">搜索圖書\u2026</string>
+  <string name="msg_sbc_searching_book">搜索圖書</string>
   <string name="msg_sbc_snippet_unavailable">無法始用摘要</string>
   <string name="msg_sbc_unknown_page">未知頁面</string>
   <string name="msg_share_explanation">你可以在你的手機螢幕上顯示條碼，並使用其他手機掃描此條碼方式並傳送或分享給朋友</string>
   <string name="msg_share_subject_line">這是我所掃描條碼的內容</string>
   <string name="msg_unmount_usb">對不起，無法讀取SD卡。</string>
-  <string name="preferences_actions_title">找到條碼時\u2026</string>
+  <string name="preferences_actions_title">找到條碼時</string>
   <string name="preferences_bulk_mode_summary">條碼掃描和挽救了許多人不斷</string>
   <string name="preferences_bulk_mode_title">批量掃描模式</string>
   <string name="preferences_copy_to_clipboard_title">復製到剪貼簿</string>
@@ -104,6 +104,7 @@
   <string name="preferences_name">設置</string>
   <string name="preferences_play_beep_title">提示音</string>
   <string name="preferences_result_title">結果設定</string>
+  <string name="preferences_scanning_title">當掃描條形碼</string>
   <string name="preferences_vibrate_title">振動</string>
   <string name="result_address_book">找到聯絡人</string>
   <string name="result_calendar">找到日曆事件</string>
diff --git a/android/res/values/strings.xml b/android/res/values/strings.xml
index 68fcf953..eab75abc 100755
--- a/android/res/values/strings.xml
+++ b/android/res/values/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
- Copyright (C) 2008 ZXing authors
+ 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.
@@ -15,8 +15,8 @@
  limitations under the License.
  -->
 <resources>
-  <string name="app_picker_name">Applications</string>
   <string name="app_name">Barcode Scanner</string>
+  <string name="app_picker_name">Applications</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>
@@ -34,8 +34,8 @@
   <string name="button_ok">OK</string>
   <string name="button_open_browser">Open browser</string>
   <string name="button_product_search">Product Search</string>
-  <string name="button_search_book_contents">Search contents</string>
   <string name="button_read_book">Browse book</string>
+  <string name="button_search_book_contents">Search contents</string>
   <string name="button_share_app">Application</string>
   <string name="button_share_bookmark">Bookmark</string>
   <string name="button_share_by_email">Share via email</string>
@@ -52,10 +52,14 @@
   <string name="contents_phone">Phone number</string>
   <string name="contents_sms">SMS address</string>
   <string name="contents_text">Plain text</string>
+  <string name="history_clear_text">Clear history</string>
+  <string name="history_email_title">Barcode Scanner history</string>
+  <string name="history_send">Send history</string>
+  <string name="history_title">History</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_settings">Settings</string>
   <string name="menu_share">Share</string>
   <string name="msg_about">Based on the open source ZXing Barcode Library</string>
   <string name="msg_buggy">This device has known bugs that cause barcode scanning problems. For more information, visit http://code.google.com/p/zxing/wiki/FrequentlyAskedQuestions</string>
@@ -63,11 +67,11 @@
   <string name="msg_camera_framework_bug">Sorry, the Android camera encountered a problem. You may need to restart the device.</string>
   <string name="msg_default_contents">Contents</string>
   <string name="msg_default_format">Format</string>
+  <string name="msg_default_meta">Metadata</string>
   <string name="msg_default_mms_subject">Hi</string>
-  <string name="msg_default_meta">Metadata</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_default_time">Time</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_in_progress">Generating a barcode\u2026</string>
@@ -80,27 +84,28 @@
   <string name="msg_sbc_failed">Sorry, the search encountered a problem.</string>
   <string name="msg_sbc_no_page_returned">No page returned</string>
   <string name="msg_sbc_page">Page</string>
+  <string name="msg_sbc_searching_book">Searching book\u2026</string>
   <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_subject_line">Here\'s the contents of a barcode I scanned</string>
   <string name="msg_unmount_usb">Sorry, the SD card is not accessible.</string>
   <string name="preferences_actions_title">When a barcode is found\u2026</string>
+  <string name="preferences_bulk_mode_summary">Scan and save many barcodes continuously</string>
+  <string name="preferences_bulk_mode_title">Bulk scan mode</string>
   <string name="preferences_copy_to_clipboard_title">Copy to clipboard</string>
+  <string name="preferences_custom_product_search_summary">Use %s as a placeholder for the product ID</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_QR_title">Decode QR Codes</string>
+  <string name="preferences_front_light_summary">Improves scanning in low light on some phones, but may cause glare</string>
+  <string name="preferences_front_light_title">Use front light</string>
   <string name="preferences_general_title">General settings</string>
   <string name="preferences_name">Settings</string>
   <string name="preferences_play_beep_title">Beep</string>
-  <string name="preferences_vibrate_title">Vibrate</string>
-  <string name="preferences_front_light_title">Use front light</string>
-  <string name="preferences_front_light_summary">Improves scanning in low light on some phones, but may cause glare</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_bulk_mode_title">Bulk scan mode</string>
-  <string name="preferences_bulk_mode_summary">Scan and save many barcodes continuously</string>
+  <string name="preferences_scanning_title">When scanning for barcodes\u2026</string>
+  <string name="preferences_vibrate_title">Vibrate</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>
@@ -109,16 +114,12 @@
   <string name="result_product">Found product</string>
   <string name="result_sms">Found SMS address</string>
   <string name="result_tel">Found phone number</string>
-  <string name="result_uri">Found URL</string>
   <string name="result_text">Found plain text</string>
+  <string name="result_uri">Found URL</string>
   <string name="result_wifi">Found Wifi Configuration</string>
-  <string name="history_title">History</string>
-  <string name="history_clear_text">Clear history</string>
-  <string name="history_send">Send history</string>
-  <string name="history_email_title">Barcode Scanner history</string>
   <string name="sbc_name">Google Book Search</string>
   <string name="share_name">Share via barcode</string>
-  <string name="wa_name">Wifi Connection</string>
   <string name="title_about">Barcode Scanner v</string>
+  <string name="wa_name">Wifi Connection</string>
   <string name="zxing_url">http://code.google.com/p/zxing</string>
 </resources>
diff --git a/android/res/xml/preferences.xml b/android/res/xml/preferences.xml
index 5a8c564d..d605b761 100755
--- a/android/res/xml/preferences.xml
+++ b/android/res/xml/preferences.xml
@@ -15,7 +15,7 @@
  limitations under the License.
  -->
 <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
-  <PreferenceCategory android:title="@string/preferences_general_title">
+  <PreferenceCategory android:title="@string/preferences_scanning_title">
     <CheckBoxPreference
         android:key="preferences_decode_1D"
         android:defaultValue="true"
@@ -24,11 +24,6 @@
         android:key="preferences_decode_QR"
         android:defaultValue="true"
         android:title="@string/preferences_decode_QR_title"/>
-    <CheckBoxPreference
-        android:key="preferences_front_light"
-        android:defaultValue="false"
-        android:title="@string/preferences_front_light_title"
-        android:summary="@string/preferences_front_light_summary"/>
   </PreferenceCategory>
   <PreferenceCategory android:title="@string/preferences_actions_title">
     <CheckBoxPreference
@@ -50,4 +45,16 @@
         android:title="@string/preferences_custom_product_search_title"
         android:summary="@string/preferences_custom_product_search_summary"/>
   </PreferenceCategory>
+    <PreferenceCategory android:title="@string/preferences_general_title">
+    <CheckBoxPreference
+        android:key="preferences_front_light"
+        android:defaultValue="false"
+        android:title="@string/preferences_front_light_title"
+        android:summary="@string/preferences_front_light_summary"/>
+    <CheckBoxPreference
+        android:key="preferences_bulk_mode"
+        android:defaultValue="false"
+        android:title="@string/preferences_bulk_mode_title"
+        android:summary="@string/preferences_bulk_mode_summary"/>
+  </PreferenceCategory>
 </PreferenceScreen>
diff --git a/android/src/com/google/zxing/client/android/CaptureActivity.java b/android/src/com/google/zxing/client/android/CaptureActivity.java
index 02cb6b06..c82e4a81 100755
--- a/android/src/com/google/zxing/client/android/CaptureActivity.java
+++ b/android/src/com/google/zxing/client/android/CaptureActivity.java
@@ -17,6 +17,7 @@
 package com.google.zxing.client.android;
 
 import android.util.TypedValue;
+import android.widget.Toast;
 import com.google.zxing.BarcodeFormat;
 import com.google.zxing.Result;
 import com.google.zxing.ResultMetadataType;
@@ -94,6 +95,7 @@ public final class CaptureActivity extends Activity implements SurfaceHolder.Cal
   private static final int ABOUT_ID = Menu.FIRST + 4;
 
   private static final long INTENT_RESULT_DURATION = 1500L;
+  private static final long BULK_MODE_SCAN_DELAY_MS = 1000L;
   private static final float BEEP_VOLUME = 0.10f;
   private static final long VIBRATE_DURATION = 200L;
 
@@ -458,14 +460,29 @@ public final class CaptureActivity extends Activity implements SurfaceHolder.Cal
           handleDecodeExternally(rawResult, barcode);
           break;
         case ZXING_LINK:
-          if(returnUrlTemplate == null){
+          if (returnUrlTemplate == null){
             handleDecodeInternally(rawResult, barcode);
           } else {
             handleDecodeExternally(rawResult, barcode);
           }
           break;
         case NONE:
-          handleDecodeInternally(rawResult, barcode);
+          SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(this);
+          if (prefs.getBoolean(PreferencesActivity.KEY_BULK_MODE, false)) {
+            Toast.makeText(this, R.string.msg_bulk_mode_scanned, Toast.LENGTH_SHORT).show();
+            // Wait a moment or else it will scan the same barcode continuously about 3 times
+            try {
+              Thread.sleep(BULK_MODE_SCAN_DELAY_MS);
+            } catch (InterruptedException ie) {
+              // continue
+            }
+            resetStatusView();
+            if (handler != null) {
+              handler.sendEmptyMessage(R.id.restart_preview);
+            }
+          } else {
+            handleDecodeInternally(rawResult, barcode);
+          }
           break;
       }
     }
diff --git a/android/src/com/google/zxing/client/android/PreferencesActivity.java b/android/src/com/google/zxing/client/android/PreferencesActivity.java
index d34e7ffa..9a37e78f 100755
--- a/android/src/com/google/zxing/client/android/PreferencesActivity.java
+++ b/android/src/com/google/zxing/client/android/PreferencesActivity.java
@@ -39,6 +39,7 @@ public final class PreferencesActivity extends PreferenceActivity
   public static final String KEY_VIBRATE = "preferences_vibrate";
   public static final String KEY_COPY_TO_CLIPBOARD = "preferences_copy_to_clipboard";
   public static final String KEY_FRONT_LIGHT = "preferences_front_light";
+  public static final String KEY_BULK_MODE = "preferences_bulk_mode";
 
   public static final String KEY_HELP_VERSION_SHOWN = "preferences_help_version_shown";
   public static final String KEY_NOT_OUR_RESULTS_SHOWN = "preferences_not_out_results_shown";
-- 
2.20.1