Remove defunct 'buggy' message for 4.0 from HelpActivity. And add the other half of new History impl that I forgot

git-svn-id: http://zxing.googlecode.com/svn/trunk/android@2125 59b500cc-1b3d-0410-9834-0bbf25fbcc57

31 files changed, 33 insertions, 79 deletions

diff --git a/res/values-ar/strings.xml b/res/values-ar/strings.xml
index 1f545233..b374ea10 100644
--- a/res/values-ar/strings.xml
+++ b/res/values-ar/strings.xml
@@ -66,7 +66,6 @@
   <string name="menu_settings">إعدادات</string>
   <string name="menu_share">مشاركة</string>
   <string name="msg_about">حسب مكتبة الرمز الشريطي ZXing مفتوحة المصادر</string>
-  <string name="msg_buggy">يوجد بالهاتف أخطاء معروفة تتسبب في حدوث مشكلات في مسح الرمز الشريطي. لمزيد من المعلومات، قم بزيارة http://code.google.com/p/zxing/wiki/FrequentlyAskedQuestions</string>
   <string name="msg_bulk_mode_scanned">معظم الدراسي : الباركود الممسوحة ضوئيا وحفظها</string>
   <string name="msg_camera_framework_bug">عفوا، حدثت مشكلة في كاميرا جهاز Android. قد تحتاج إلى إعادة تشغيل الجهاز.</string>
   <string name="msg_default_format">التنسيق</string>
diff --git a/res/values-bg/strings.xml b/res/values-bg/strings.xml
index 6482a42b..94d6f6cc 100644
--- a/res/values-bg/strings.xml
+++ b/res/values-bg/strings.xml
@@ -66,7 +66,6 @@
   <string name="menu_settings">Настройки</string>
   <string name="menu_share">Сподели</string>
   <string name="msg_about">Базирано на библиотеката с отворен код\nZXing Barcode</string>
-  <string name="msg_buggy">Това устройство демонстрира проблеми при сканиране на баркодове. За повече информация посетете http://code.google.com/p/zxing/wiki/FrequentlyAskedQuestions</string>
   <string name="msg_bulk_mode_scanned">Масов режим: баркодът е сканиран и записан</string>
   <string name="msg_camera_framework_bug">Съжаляваме, срещнахме проблем с камерата. Може да се наложи да рестартирате устройството си.</string>
   <string name="msg_default_format">Формат</string>
diff --git a/res/values-ca/strings.xml b/res/values-ca/strings.xml
index 3358a03e..74a9741d 100644
--- a/res/values-ca/strings.xml
+++ b/res/values-ca/strings.xml
@@ -66,7 +66,6 @@
   <string name="menu_settings">Configuració</string>
   <string name="menu_share">Comparteix</string>
   <string name="msg_about">L\'aplicació oficial per a l\'Android del projecte de codi obert de codis de barres ZXing.</string>
-  <string name="msg_buggy">Aquests dispostiu té errors coneguts que poden causar problemes en escanejar codis de barres. Per obtenir més informació, visiteu http://code.google.com/p/zxing/wiki/FrequentlyAskedQuestions (en anglès)</string>
   <string name="msg_bulk_mode_scanned">Mode en bloc: codi de barres escanejat i desat</string>
   <string name="msg_camera_framework_bug">S\'ha produït un problema amb la càmera de l\'Android. Potser haureu de reiniciar el dispositiu.</string>
   <string name="msg_default_format">Format</string>
diff --git a/res/values-cs/strings.xml b/res/values-cs/strings.xml
index f01c7ffb..60f04096 100644
--- a/res/values-cs/strings.xml
+++ b/res/values-cs/strings.xml
@@ -66,7 +66,6 @@
   <string name="menu_settings">Nastavení</string>
   <string name="menu_share">Sdílet</string>
   <string name="msg_about">Na bázi open source ZXing Barcode Library</string>
-  <string name="msg_buggy">Tento přístroj má známé chyby, které způsobují problémy čárového kódu. Pro Více informací najdete na http://code.google.com/p/zxing/wiki/FrequentlyAskedQuestions</string>
   <string name="msg_bulk_mode_scanned">Bulk režimu: čárový kód naskenované a uložené</string>
   <string name="msg_camera_framework_bug">Omlouváme se, fotoaparát má problém. Možná bude nutné restartovat zařízení</string>
   <string name="msg_default_format">Formát</string>
diff --git a/res/values-da/strings.xml b/res/values-da/strings.xml
index 27528d2e..1cd6e3e0 100644
--- a/res/values-da/strings.xml
+++ b/res/values-da/strings.xml
@@ -66,7 +66,6 @@
   <string name="menu_settings">Indstillinger</string>
   <string name="menu_share">Del</string>
   <string name="msg_about">Open sourceprojektet ZXings officielle Android-app.</string>
-  <string name="msg_buggy">Denne enhed har kendte fejl, der forårsager stregkodescanningsproblemer. For mere information, besøg http://code.google.com/p/zxing/wiki/FrequentlyAskedQuestions (på engelsk)</string>
   <string name="msg_bulk_mode_scanned">Massetilstand: stregkode scannet og gemt</string>
   <string name="msg_camera_framework_bug">Beklager, Android-kameraet er stødt på et problem. Du skal muligvis genstarte enheden.</string>
   <string name="msg_default_format">Format</string>
diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml
index ffea4f17..d4c6546c 100644
--- a/res/values-de/strings.xml
+++ b/res/values-de/strings.xml
@@ -66,7 +66,6 @@
   <string name="menu_settings">Einstellungen</string>
   <string name="menu_share">Senden</string>
   <string name="msg_about">Basiert auf der Open Source ZXing Barcode Bibliothek </string>
-  <string name="msg_buggy">Bei diesem Gerät sind Fehler bekannt, die beim Barcode-Scanning Probleme bereiten. Weitere Informationen auf http://code.google.com/p/zxing/wiki/FrequentlyAskedQuestions</string>
   <string name="msg_bulk_mode_scanned">Bulk-Modus: Barcode gescannt und gespeichert</string>
   <string name="msg_camera_framework_bug">Bei der Android-Kamera ist leider ein Fehler aufgetreten. Es könnte sein, dass Sie das Gerät neu starten müssen.</string>
   <string name="msg_default_format">Format</string>
diff --git a/res/values-el/strings.xml b/res/values-el/strings.xml
index c85ada91..06299ac0 100644
--- a/res/values-el/strings.xml
+++ b/res/values-el/strings.xml
@@ -66,7 +66,6 @@
   <string name="menu_settings">Ρυθμίσεις</string>
   <string name="menu_share">Κοινή χρήση</string>
   <string name="msg_about">Η επίσημη εφαρμογή του Android από το πρότζεκτ ανοιχτού κώδικα ZXing barcode.</string>
-  <string name="msg_buggy">Αυτή η συσκευή έχει γνωστά σφάλματα που ίσως προκαλέσουν προβλήματα στο σκανάρισμα. Για περισσότερες πληροφορίες, επισκεφτείτε http://code.google.com/p/zxing/wiki/FrequentlyAskedQuestions</string>
   <string name="msg_bulk_mode_scanned">Μαζική λειτουργία: barcode σκαναρίστηκε και αποθηκεύτηκε</string>
   <string name="msg_camera_framework_bug">Συγνώμη, προέκυψε ένα πρόβλημα με την κάμερα. Ίσως χρειαστεί να επανεκιννήσετε τη συσκευή.</string>
   <string name="msg_default_format">Διαμόρφωση</string>
diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml
index 06cb7266..21279634 100644
--- a/res/values-es/strings.xml
+++ b/res/values-es/strings.xml
@@ -66,7 +66,6 @@
   <string name="menu_settings">Configuración</string>
   <string name="menu_share">Compartir</string>
   <string name="msg_about">La aplicación oficial de Android del proyecto de código de barras de código abierto ZXing.</string>
-  <string name="msg_buggy">Este dispositivo tiene errores conocidos que causan problemas de escaneado de código de barras. Para más información, visite http://code.google.com/p/zxing/wiki/FrequentlyAskedQuestions</string>
   <string name="msg_bulk_mode_scanned">Modo Masivo: código de barras escaneado y guardado</string>
   <string name="msg_camera_framework_bug">Lo sentimos, la cámara de Android ha encontrado un problema. Es posible que necesite reiniciar el dispositivo.</string>
   <string name="msg_default_format">Formato</string>
diff --git a/res/values-fi/strings.xml b/res/values-fi/strings.xml
index 32787072..49306085 100644
--- a/res/values-fi/strings.xml
+++ b/res/values-fi/strings.xml
@@ -66,7 +66,6 @@
   <string name="menu_settings">Asetukset</string>
   <string name="menu_share">Jaa</string>
   <string name="msg_about">Perustuu avoimen koodin ZXing Barcode kirjastoon</string>
-  <string name="msg_buggy">Tämä laite on tunnettuja vikoja, jotka aiheuttavat viivakoodi skannauksen ongelmia. Varten Lisätietoja http://code.google.com/p/zxing/wiki/FrequentlyAskedQuestions</string>
   <string name="msg_bulk_mode_scanned">Bulk tila: viivakoodi skannataan ja tallennetaan</string>
   <string name="msg_camera_framework_bug">Anteeksi, Android kamera kohtasi virheen. Sinun täytyy ehkä käynnistää laite uudelleen.</string>
   <string name="msg_default_format">Formaatti</string>
diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml
index e066ee23..bb99dbc6 100644
--- a/res/values-fr/strings.xml
+++ b/res/values-fr/strings.xml
@@ -66,7 +66,6 @@
   <string name="menu_settings">Paramètres</string>
   <string name="menu_share">Partager</string>
   <string name="msg_about">L\'application Android officielle du projet libre ZXing.</string>
-  <string name="msg_buggy">Cet appareil a rencontré un bogue entraînant des problèmes de lecture de codes-barres. Pour plus d\'informations, rendez-vous sur http://code.google.com/p/zxing/wiki/FrequentlyAskedQuestions</string>
   <string name="msg_bulk_mode_scanned">Mode lecture en rafale : code-barres scanné et enregistré</string>
   <string name="msg_camera_framework_bug">Désolé, la caméra Android rencontré un problème. Un redémarrage de l\'appareil est peut-être nécessaire.</string>
   <string name="msg_default_format">Format</string>
diff --git a/res/values-he/strings.xml b/res/values-he/strings.xml
index 8309b8c9..27d9604f 100755
--- a/res/values-he/strings.xml
+++ b/res/values-he/strings.xml
@@ -66,7 +66,6 @@
   <string name="menu_settings">הגדרות</string>
   <string name="menu_share">שתף</string>
   <string name="msg_about">מבוסס עם ספריית הקוד הפתוח ZXing Barcode Library</string>
-  <string name="msg_buggy">במכשיר זה יופיעו תקלות ידועות שיגרמו לבעיות בסריקת ברקודים. לקבלת מידע נוסף, בקר http://code.google.com/p/zxing/wiki/FrequentlyAskedQuestions</string>
   <string name="msg_bulk_mode_scanned">מצב קבוצה: ברקוד נסרק ונשמר</string>
   <string name="msg_camera_framework_bug">סליחה, מצלמת האנדרואיד נתקלה בבעיה. ייתכן שיהיה עליך להפעיל מחדש את המכשיר.</string>
   <string name="msg_default_format">פורמט</string>
diff --git a/res/values-hi/strings.xml b/res/values-hi/strings.xml
index 8ca47486..0fe7aaf2 100644
--- a/res/values-hi/strings.xml
+++ b/res/values-hi/strings.xml
@@ -66,7 +66,6 @@
   <string name="menu_settings">सेटिंग्स</string>
   <string name="menu_share">शेयर</string>
   <string name="msg_about">खुला स्रोत ZXing बारकोड परियोजना के आधिकारिक Android के बॉक्स.</string>
-  <string name="msg_buggy">इस डिवाइस कीड़े कि बारकोड स्कैनिंग समस्याओं के कारण जाना जाता है. अधिक जानकारी के लिए, http://code.google.com/p/zxing/wiki/FrequentlyAskedQuestions यात्रा</string>
   <string name="msg_bulk_mode_scanned">थोक मोड: बारकोड स्कैन और बचाया</string>
   <string name="msg_camera_framework_bug">क्षमा करें, Android कैमरा एक समस्या का सामना करना पड़ा. आप डिवाइस को पुनरारंभ करने की आवश्यकता हो सकती है.</string>
   <string name="msg_default_format">प्रारूप</string>
diff --git a/res/values-hu/strings.xml b/res/values-hu/strings.xml
index dcecdb81..8747ae29 100644
--- a/res/values-hu/strings.xml
+++ b/res/values-hu/strings.xml
@@ -66,7 +66,6 @@
   <string name="menu_settings">Beállítások</string>
   <string name="menu_share">Megosztás</string>
   <string name="msg_about">A nyílt forráskódú ZXing vonalkód projekt hivatalos Android alkalmazása.</string>
-  <string name="msg_buggy">Ennek a készüléknek vannak ismert hibái, melyek vonalkód olvasási problémákat okoznak. További információkért látogassa meg a http://code.google.com/p/zxing/wiki/FrequentlyAskedQuestions weboldalt</string>
   <string name="msg_bulk_mode_scanned">Tömeges beolvasás: vonalkód beszkennelve és mentve</string>
   <string name="msg_camera_framework_bug">Android kamera hiba. Lehet, hogy újra kell indítania a készüléket.</string>
   <string name="msg_default_format">Formátum</string>
diff --git a/res/values-id/strings.xml b/res/values-id/strings.xml
index 09301386..d0eb7aaa 100644
--- a/res/values-id/strings.xml
+++ b/res/values-id/strings.xml
@@ -66,7 +66,6 @@
   <string name="menu_settings">Pengaturan</string>
   <string name="menu_share">Bagikan</string>
   <string name="msg_about">ZXing barcode merupakan aplikasi proyek resmi dari Android.</string>
-  <string name="msg_buggy">Perangkat ini diketahui memiliki bug yang dapat menyebabkan pemindaian barcode bermasalah. Untuk informasi lebih lanjut, kunjungi http://code.google.com/p/zxing/wiki/FrequentlyAskedQuestions</string>
   <string name="msg_bulk_mode_scanned">Bulk mode: barcode sudah dipindai dan disimpan</string>
   <string name="msg_camera_framework_bug">Maaf, kamera pada Android mengalami masalah. Anda mungkin perlu me-restart perangkat.</string>
   <string name="msg_default_format">Bentuk</string>
diff --git a/res/values-it/strings.xml b/res/values-it/strings.xml
index f6aadfb0..5d33d0f9 100644
--- a/res/values-it/strings.xml
+++ b/res/values-it/strings.xml
@@ -66,7 +66,6 @@
   <string name="menu_settings">Impostazioni</string>
   <string name="menu_share">Condividi</string>
   <string name="msg_about">Basato sulla libreria di software libero ZXing Barcode</string>
-  <string name="msg_buggy">Questo dispositivo ha un bug noto che causa problemi con la scansione dei codici a barre. Per ulteriori informazioni, visita http://code.google.com/p/zxing/wiki/FrequentlyAskedQuestions</string>
   <string name="msg_bulk_mode_scanned">Modalità di gruppo: codici a barre scansionati e salvati</string>
   <string name="msg_camera_framework_bug">Spiacenti, la fotocamera Android ha riscontrato un problema. Potrebbe essere necessario riavviare il dispositivo.</string>
   <string name="msg_default_format">Formato</string>
diff --git a/res/values-iw/strings.xml b/res/values-iw/strings.xml
index 8309b8c9..27d9604f 100644
--- a/res/values-iw/strings.xml
+++ b/res/values-iw/strings.xml
@@ -66,7 +66,6 @@
   <string name="menu_settings">הגדרות</string>
   <string name="menu_share">שתף</string>
   <string name="msg_about">מבוסס עם ספריית הקוד הפתוח ZXing Barcode Library</string>
-  <string name="msg_buggy">במכשיר זה יופיעו תקלות ידועות שיגרמו לבעיות בסריקת ברקודים. לקבלת מידע נוסף, בקר http://code.google.com/p/zxing/wiki/FrequentlyAskedQuestions</string>
   <string name="msg_bulk_mode_scanned">מצב קבוצה: ברקוד נסרק ונשמר</string>
   <string name="msg_camera_framework_bug">סליחה, מצלמת האנדרואיד נתקלה בבעיה. ייתכן שיהיה עליך להפעיל מחדש את המכשיר.</string>
   <string name="msg_default_format">פורמט</string>
diff --git a/res/values-ja/strings.xml b/res/values-ja/strings.xml
index 9f8b20f2..47980b09 100644
--- a/res/values-ja/strings.xml
+++ b/res/values-ja/strings.xml
@@ -66,7 +66,6 @@
   <string name="menu_settings">設定</string>
   <string name="menu_share">共有</string>
   <string name="msg_about">オープンソースのバーコード ライブラリ、ZXing を使用しています</string>
-  <string name="msg_buggy">このデバイスでは、バーコードのスキャンに問題があります。 詳細については、http://code.google.com/p/zxing/wiki/FrequentlyAskedQuestions を参照してください </string>
   <string name="msg_bulk_mode_scanned">連続モード：バーコードスキャンして保存</string>
   <string name="msg_camera_framework_bug">申し訳ありませんが、Androidのカメラに問題が発生しました。デバイスを再起動する必要があります。</string>
   <string name="msg_default_format">フォーマット</string>
diff --git a/res/values-ko/strings.xml b/res/values-ko/strings.xml
index 2862ac59..0857a929 100644
--- a/res/values-ko/strings.xml
+++ b/res/values-ko/strings.xml
@@ -66,7 +66,6 @@
   <string name="menu_settings">설정</string>
   <string name="menu_share">공유</string>
   <string name="msg_about">오픈소스 ZXing Barcode Library를 이용하여 제작된 어플</string>
-  <string name="msg_buggy">해당 기기는 바코드 스캐닝시 알려진 버그가 있습니다. 더 많은 정보를 얻기 위해서는 다음 주소를 방문하세요.(영문)http://code.google.com/p/zxing/wiki/FrequentlyAskedQuestions</string>
   <string name="msg_bulk_mode_scanned">일괄 스캔 모드: 바코드가 읽히고 저장됩니다.</string>
   <string name="msg_camera_framework_bug">죄송합니다. 기기의 카메라에 오류가 생겼습니다. 기기를 재시작 해야될 수도 있습니다.</string>
   <string name="msg_default_format">포맷</string>
diff --git a/res/values-nl/strings.xml b/res/values-nl/strings.xml
index 9a8e9261..e87f4f04 100644
--- a/res/values-nl/strings.xml
+++ b/res/values-nl/strings.xml
@@ -66,7 +66,6 @@
   <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_format">Formaat</string>
diff --git a/res/values-pl/strings.xml b/res/values-pl/strings.xml
index 8674115c..28951c62 100644
--- a/res/values-pl/strings.xml
+++ b/res/values-pl/strings.xml
@@ -66,7 +66,6 @@
   <string name="menu_settings">Ustawienia</string>
   <string name="menu_share">Udostępnij</string>
   <string name="msg_about">Bazowane na bibliotece kodów paskowych ZXing o otwartym źródle</string>
-  <string name="msg_buggy">To urządzenie wykazuje znane błędy które powodują problemy podczas skanowania kodów paskowych. W celu otrzymania dalszych informacji, odwiedź http://code.google.com/p/zxing/wiki/FrequentlyAskedQuestions</string>
   <string name="msg_bulk_mode_scanned">Tryb zbiorcze: skanowania kodów kreskowych i zapisaniu</string>
   <string name="msg_camera_framework_bug">Przepraszamy, aparat Android napotkał problem. Może wystąpić potrzeba ponownego uruchomienia urządzenia.</string>
   <string name="msg_default_format">Format</string>
diff --git a/res/values-pt/strings.xml b/res/values-pt/strings.xml
index 87f68752..d2e9bd31 100644
--- a/res/values-pt/strings.xml
+++ b/res/values-pt/strings.xml
@@ -66,7 +66,6 @@
   <string name="menu_settings">Definições</string>
   <string name="menu_share">Partilhar</string>
   <string name="msg_about">Baseado na biblioteca de código de barras de código aberto ZXing</string>
-  <string name="msg_buggy">Este dispositivo tem bugs conhecidos que causam problemas de varredura de código de barras. Para obter mais informações, visite http://code.google.com/p/zxing/wiki/FrequentlyAskedQuestions</string>
   <string name="msg_bulk_mode_scanned">Modo em massa: código de barras lido e guardado</string>
   <string name="msg_camera_framework_bug">Desculpe, a câmera do Android encontrou um problema. Poderá precisar de reiniciar o dispositivo.</string>
   <string name="msg_default_format">Formato</string>
diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml
index 0f167fac..47b6651d 100644
--- a/res/values-ru/strings.xml
+++ b/res/values-ru/strings.xml
@@ -66,7 +66,6 @@
   <string name="menu_settings">Настройки</string>
   <string name="menu_share">Поделиться</string>
   <string name="msg_about">Основано на свободной библиотеке штрих-кодов ZXing</string>
-  <string name="msg_buggy">Это устройство имеет известные ошибки при сканировании штрих-кода. Для получения более подробной информации, посетите http://code.google.com/p/zxing/wiki/FrequentlyAskedQuestions</string>
   <string name="msg_bulk_mode_scanned">Массовый режим: сохранять историю сканирования</string>
   <string name="msg_camera_framework_bug">К сожалению, возникла ошибка камеры. Вам может потребоваться перезагрузка устройства.</string>
   <string name="msg_default_format">Формат</string>
diff --git a/res/values-sk/strings.xml b/res/values-sk/strings.xml
index a5bd191a..da7746c2 100644
--- a/res/values-sk/strings.xml
+++ b/res/values-sk/strings.xml
@@ -66,7 +66,6 @@
   <string name="menu_settings">Nastavenia</string>
   <string name="menu_share">Zdieľať</string>
   <string name="msg_about">Založené na otvorených zdrojových kódoch knižnice čiarových kódov ZXing</string>
-  <string name="msg_buggy">Toto zariadenie má známe chyby, ktoré spôsobujú problémy skenovania čiarových kódov. Pre viac informácií navštívte http://code.google.com/p/zxing/wiki/FrequentlyAskedQuestions</string>
   <string name="msg_bulk_mode_scanned">Hromadný mód: čiarový kód naskenovaný a uložený</string>
   <string name="msg_camera_framework_bug">Ospravedlňujeme sa, fotoaparát narazil na problém. Možno bude potrebné reštartovať zariadenie.</string>
   <string name="msg_default_format">Formát</string>
diff --git a/res/values-sl/strings.xml b/res/values-sl/strings.xml
index 0e123f19..d02b16d8 100644
--- a/res/values-sl/strings.xml
+++ b/res/values-sl/strings.xml
@@ -66,7 +66,6 @@
   <string name="menu_settings">Nastavitve</string>
   <string name="menu_share">Deli</string>
   <string name="msg_about">Temelji na odprtokodni ZXing Barcode knjižnici</string>
-  <string name="msg_buggy">Ta naprava ima znane hrošče, ki povzročajo težave z branjem črtih kod. Za več informacij obiščite http://code.google.com/p/zxing/wiki/FrequentlyAskedQuestions</string>
   <string name="msg_bulk_mode_scanned">Slikanje na debelo: črtna koda prebrana in shranjena</string>
   <string name="msg_camera_framework_bug">Oprostite, Android kamera je naletela na težave. Mogoče boste morali ponovno zagnati napravo.</string>
   <string name="msg_default_format">Format</string>
diff --git a/res/values-sv/strings.xml b/res/values-sv/strings.xml
index a6e2715b..2b699366 100644
--- a/res/values-sv/strings.xml
+++ b/res/values-sv/strings.xml
@@ -66,7 +66,6 @@
   <string name="menu_settings">Inställningar</string>
   <string name="menu_share">Dela</string>
   <string name="msg_about">Baserad på ZXing Barcode Library som är öppen källkod</string>
-  <string name="msg_buggy">Den här enheten har kända buggar som medför problem med skanning av streckkoder. För mer information, besök http://code.google.com/p/zxing/wiki/FrequentlyAskedQuestions</string>
   <string name="msg_bulk_mode_scanned">Bulk-läge: streckkod skannas och sparas</string>
   <string name="msg_camera_framework_bug">Tyvärr, Androidens kamera fick problem. Du kan behöva starta om enheten.</string>
   <string name="msg_default_format">Format</string>
diff --git a/res/values-tr/strings.xml b/res/values-tr/strings.xml
index 42708ddc..49be6476 100644
--- a/res/values-tr/strings.xml
+++ b/res/values-tr/strings.xml
@@ -66,7 +66,6 @@
   <string name="menu_settings">Ayarlar</string>
   <string name="menu_share">Paylaş</string>
   <string name="msg_about">Açık kaynak ZXing Barkod Kitaplığı temellidir</string>
-  <string name="msg_buggy">Bu cihaz barkod tarama sorunlarına yol açtığı bilinen hatalar içermektedir. Daha fazla bilgi için şu adresi ziyaret edin: http://code.google.com/p/zxing/wiki/FrequentlyAskedQuestions</string>
   <string name="msg_bulk_mode_scanned">Toplu modu: taranan ve kaydedilen barkodlar</string>
   <string name="msg_camera_framework_bug">Üzgünüz, Android kamera bir sorunla karşılaştı. Cihazı yeniden başlatmanız gerekebilir.</string>
   <string name="msg_default_format">Biçim</string>
diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml
index 13631359..b96ef103 100644
--- a/res/values-zh-rCN/strings.xml
+++ b/res/values-zh-rCN/strings.xml
@@ -66,7 +66,6 @@
   <string name="menu_settings">设置</string>
   <string name="menu_share">分享</string>
   <string name="msg_about">基于ZXing开源条码引擎</string>
-  <string name="msg_buggy">此设备存在已知问题，将导致条码扫描器出错。更多信息，请访问 http://code.google.com/p/zxing/wiki/FrequentlyAskedQuestions</string>
   <string name="msg_bulk_mode_scanned">批量扫描：找到条码，已保存</string>
   <string name="msg_camera_framework_bug">抱歉，Android相机出现问题。您可能需要重启设备。</string>
   <string name="msg_default_format">格式</string>
diff --git a/res/values-zh-rTW/strings.xml b/res/values-zh-rTW/strings.xml
index e68a9f8e..f88ce523 100644
--- a/res/values-zh-rTW/strings.xml
+++ b/res/values-zh-rTW/strings.xml
@@ -66,7 +66,6 @@
   <string name="menu_settings">設定</string>
   <string name="menu_share">分享</string>
   <string name="msg_about">ZXing 開放原始碼條碼掃描專案的官方 Android 應用程式</string>
-  <string name="msg_buggy">該裝置有已知的錯誤導致條碼掃描有問題。如需更多資訊，請至 http://code.google.com/p/zxing/wiki/FrequentlyAskedQuestions</string>
   <string name="msg_bulk_mode_scanned">大量掃描模式：條碼掃描並儲存</string>
   <string name="msg_camera_framework_bug">很抱歉，相機出現問題。您可能需要重新啟動設備。</string>
   <string name="msg_default_format">格式</string>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 5d3f9ba9..d12a2223 100755
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -66,7 +66,6 @@
   <string name="menu_settings">Settings</string>
   <string name="menu_share">Share</string>
   <string name="msg_about">The official Android app of the open source ZXing barcode project.</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>
   <string name="msg_bulk_mode_scanned">Bulk mode: barcode scanned and saved</string>
   <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_format">Format</string>
diff --git a/src/com/google/zxing/client/android/CaptureActivity.java b/src/com/google/zxing/client/android/CaptureActivity.java
index 30859f4c..dad8ed12 100755
--- a/src/com/google/zxing/client/android/CaptureActivity.java
+++ b/src/com/google/zxing/client/android/CaptureActivity.java
@@ -22,6 +22,7 @@ import com.google.zxing.ResultMetadataType;
 import com.google.zxing.ResultPoint;
 import com.google.zxing.client.android.camera.CameraManager;
 import com.google.zxing.client.android.history.HistoryActivity;
+import com.google.zxing.client.android.history.HistoryItem;
 import com.google.zxing.client.android.history.HistoryManager;
 import com.google.zxing.client.android.result.ResultButtonListener;
 import com.google.zxing.client.android.result.ResultHandler;
@@ -110,6 +111,7 @@ public final class CaptureActivity extends Activity implements SurfaceHolder.Cal
 
   private CameraManager cameraManager;
   private CaptureActivityHandler handler;
+  private Result savedResultToShow;
   private ViewfinderView viewfinderView;
   private TextView statusView;
   private View resultView;
@@ -379,6 +381,35 @@ public final class CaptureActivity extends Activity implements SurfaceHolder.Cal
   }
 
   @Override
+  public void onActivityResult(int requestCode, int resultCode, Intent intent) {
+    if (resultCode == RESULT_OK) {
+      if (requestCode == HISTORY_REQUEST_CODE) {
+        int itemNumber = intent.getIntExtra(Intents.History.ITEM_NUMBER, -1);
+        if (itemNumber >= 0) {
+          HistoryItem historyItem = historyManager.buildHistoryItem(itemNumber);
+          decodeOrStoreSavedBitmap(null, historyItem.getResult());
+        }
+      }
+    }
+  }
+
+  private void decodeOrStoreSavedBitmap(Bitmap bitmap, Result result) {
+    // Bitmap isn't used yet -- will be used soon
+    if (handler == null) {
+      savedResultToShow = result;
+    } else {
+      if (result != null) {
+        savedResultToShow = result;
+      }
+      if (savedResultToShow != null) {
+        Message message = Message.obtain(handler, R.id.decode_succeeded, savedResultToShow);
+        handler.sendMessage(message);
+      }
+      savedResultToShow = null;
+    }
+  }
+
+  @Override
   public void surfaceCreated(SurfaceHolder holder) {
     if (holder == null) {
       Log.e(TAG, "*** WARNING *** surfaceCreated() gave us a null surface!");
@@ -409,12 +440,12 @@ public final class CaptureActivity extends Activity implements SurfaceHolder.Cal
     inactivityTimer.onActivity();
     lastResult = rawResult;
     ResultHandler resultHandler = ResultHandlerFactory.makeResultHandler(this, rawResult);
-    historyManager.addHistoryItem(rawResult, resultHandler);
 
     if (barcode == null) {
       // This is from history -- no saved barcode
       handleDecodeInternally(rawResult, resultHandler, null);
     } else {
+      historyManager.addHistoryItem(rawResult, resultHandler);
       beepManager.playBeepSoundAndVibrate();
       drawResultPoints(barcode, rawResult);
       switch (source) {
@@ -689,6 +720,7 @@ public final class CaptureActivity extends Activity implements SurfaceHolder.Cal
       if (handler == null) {
         handler = new CaptureActivityHandler(this, decodeFormats, characterSet, cameraManager);
       }
+      decodeOrStoreSavedBitmap(null, null);
     } catch (IOException ioe) {
       Log.w(TAG, ioe);
       displayFrameworkBugMessageAndExit();
diff --git a/src/com/google/zxing/client/android/HelpActivity.java b/src/com/google/zxing/client/android/HelpActivity.java
index 7f8e125c..cb145cc9 100644
--- a/src/com/google/zxing/client/android/HelpActivity.java
+++ b/src/com/google/zxing/client/android/HelpActivity.java
@@ -17,13 +17,9 @@
 package com.google.zxing.client.android;
 
 import android.app.Activity;
-import android.app.AlertDialog;
-import android.content.DialogInterface;
 import android.content.Intent;
 import android.net.Uri;
-import android.os.Build;
 import android.os.Bundle;
-import android.util.Log;
 import android.view.View;
 import android.view.KeyEvent;
 import android.webkit.WebView;
@@ -37,18 +33,6 @@ import android.widget.Button;
  */
 public final class HelpActivity extends Activity {
 
-  private static final String TAG = HelpActivity.class.getSimpleName();
-
-  // Actually guessing at the Desire's MODEL for now:
-  private static final String[] BUGGY_MODEL_SUBSTRINGS = {
-      "Desire",
-      "Pulse", // Camera doesn't come on
-      "Geeksphone", // Doesn't support YUV?
-      "supersonic", // aka Evo
-  };
-  private static final Uri BUGGY_URI =
-      Uri.parse("http://code.google.com/p/zxing/wiki/FrequentlyAskedQuestions");
-
   // Use this key and one of the values below when launching this activity via intent. If not
   // present, the default page will be loaded.
   public static final String REQUESTED_PAGE_KEY = "requested_page_key";
@@ -59,7 +43,6 @@ public final class HelpActivity extends Activity {
       "file:///android_asset/html-" + LocaleManager.getTranslatedAssetLanguage() + '/';
   private static final String WEBVIEW_STATE_PRESENT = "webview_state_present";
 
-  private static boolean initialized = false;
   private WebView webView;
   private Button backButton;
 
@@ -77,16 +60,6 @@ public final class HelpActivity extends Activity {
     }
   };
 
-  private final DialogInterface.OnClickListener groupsListener =
-      new DialogInterface.OnClickListener() {
-    @Override
-    public void onClick(DialogInterface dialogInterface, int i) {
-      Intent intent = new Intent(Intent.ACTION_VIEW, BUGGY_URI);
-      intent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_WHEN_TASK_RESET);
-      HelpActivity.this.startActivity(intent);
-    }
-  };
-
   @Override
   protected void onCreate(Bundle icicle) {
     super.onCreate(icicle);
@@ -116,28 +89,6 @@ public final class HelpActivity extends Activity {
     backButton.setOnClickListener(backListener);
     View doneButton = findViewById(R.id.done_button);
     doneButton.setOnClickListener(doneListener);
-
-    if (!initialized) {
-      initialized = true;
-      checkBuggyDevice();
-    }
-  }
-
-  private void checkBuggyDevice() {
-    String model = Build.MODEL;
-    Log.i(TAG, "Build model is " + model);
-    if (model != null) {
-      for (String buggyModelSubstring : BUGGY_MODEL_SUBSTRINGS) {
-        if (model.contains(buggyModelSubstring)) {
-          AlertDialog.Builder builder = new AlertDialog.Builder(this);
-          builder.setMessage(R.string.msg_buggy);
-          builder.setPositiveButton(R.string.button_ok, groupsListener);
-          builder.setNegativeButton(R.string.button_cancel, null);
-          builder.show();
-          break;
-        }
-      }
-    }
   }
 
   @Override