[0.2.2] updated version

+ and menu_settings, from non-english strings.xml
+ Fixes #2

README.md

@@ -1,11 +1,83 @@
 BarcodeScanner
 ==============
 
-cross-platform BarcodeScanner for Cordova / PhoneGap
+Cross-platform BarcodeScanner for Cordova / PhoneGap.
 
-follows the Cordova Plugin spec https://github.com/alunny/cordova-plugin-spec
+Follows the [Cordova Plugin spec](https://github.com/alunny/cordova-plugin-spec), so that it works with [Pluginstall](https://github.com/alunny/pluginstall).
+
+Note: the Android source for this project includes an Android Library Project.
+pluginstall currently doesn't support Library Project refs, so its been
+prebuilt as a jar library. Any updates to the Library Project should be
+committed with an updated jar.
+
+## Using the plugin ##
+The plugin creates the object `window.plugins.barcodeScanner` with the method `scan(success, fail)`. 
+The following barcode types are currently supported:
+
+### Android
+
+* QR_CODE
+* DATA_MATRIX
+* UPC_E
+* UPC_A
+* EAN_8
+* EAN_13
+* CODE_128
+* CODE_39
+* CODE_93
+* CODABAR
+* ITF
+* RSS14
+* PDF417
+* RSS_EXPANDED
+
+### iOS
+
+* QR_CODE
+* DATA_MATRIX
+* UPC_E
+* UPC_A
+* EAN_8
+* EAN_13
+* CODE_128
+* CODE_3
+
+`success` and `fail` are callback functions. Success is passed an object with data, type and cancelled properties. Data is the text representation of the barcode data, type is the type of barcode detected and cancelled is whether or not the user cancelled the scan.
+
+A full example could be:
+
+    window.plugins.barcodeScanner.scan( function(result) {
+            alert("We got a barcode\n" +
+                      "Result: " + result.text + "\n" +
+                      "Format: " + result.format + "\n" +
+                      "Cancelled: " + result.cancelled);
+        }, function(error) {
+		    alert("Scanning failed: " + error);
+	    }
+	);
+
+## Encoding a Barcode ##
+The plugin creates the object `window.plugins.barcodeScanner` with the method `encode(type, data, success, fail)`. 
+Supported encoding types:
+
+* TEXT_TYPE
+* EMAIL_TYPE
+* PHONE_TYPE
+* SMS_TYPE
+
+A full example could be:
+
+        window.plugins.barcodeScanner.encode(BarcodeScanner.Encode.TEXT_TYPE, "http://www.nytimes.com", function(success) {
+  	        alert("encode success: " + success);
+  	      }, function(fail) {
+  	        alert("encoding failed: " + fail);
+  	      }
+  	    );
+
+## Thanks on Github ##
+
+So many -- check out the original [iOS](https://github.com/phonegap/phonegap-plugins/tree/master/iOS/BarcodeScanner) and [Android](https://github.com/phonegap/phonegap-plugins/tree/master/Android/BarcodeScanner) repos.
 
-so that it works with Pluginstall https://github.com/alunny/pluginstall
 
 ## Licence ##
 

plugin.xml

@@ -2,7 +2,7 @@
 <plugin xmlns="http://www.phonegap.com/ns/plugins/1.0"
     xmlns:android="http://schemas.android.com/apk/res/android"
     id="com.phonegap.plugins.barcodescanner"
-    version="0.0.1">
+    version="0.2.2">
 
     <name>BarcodeScanner</name>
 
@@ -232,77 +232,29 @@
             <string name="zxing_url">http://code.google.com/p/zxing</string>
         </config-file>
 
-<!--
 
-./values-ar:
-strings.xml
+        <source-file src="LibraryProject/res/values-ar/strings.xml" target-dir="res/values-ar"/>
+        <source-file src="LibraryProject/res/values-bg/strings.xml" target-dir="res/values-bg"/>
+        <source-file src="LibraryProject/res/values-cs/strings.xml" target-dir="res/values-cs"/>
+        <source-file src="LibraryProject/res/values-da/strings.xml" target-dir="res/values-da"/>
+        <source-file src="LibraryProject/res/values-de/strings.xml" target-dir="res/values-de"/>
+        <source-file src="LibraryProject/res/values-es/strings.xml" target-dir="res/values-es"/>
+        <source-file src="LibraryProject/res/values-fi/strings.xml" target-dir="res/values-fi"/>
+        <source-file src="LibraryProject/res/values-fr/strings.xml" target-dir="res/values-fr"/>
+        <source-file src="LibraryProject/res/values-he/strings.xml" target-dir="res/values-he"/>
+        <source-file src="LibraryProject/res/values-hu/strings.xml" target-dir="res/values-hu"/>
+        <source-file src="LibraryProject/res/values-it/strings.xml" target-dir="res/values-it"/>
+        <source-file src="LibraryProject/res/values-ja-rJP/strings.xml" target-dir="res/values-ja-rJP"/>
+        <source-file src="LibraryProject/res/values-nl/strings.xml" target-dir="res/values-nl"/>
+        <source-file src="LibraryProject/res/values-pl/strings.xml" target-dir="res/values-pl"/>
+        <source-file src="LibraryProject/res/values-pt/strings.xml" target-dir="res/values-pt"/>
+        <source-file src="LibraryProject/res/values-ru/strings.xml" target-dir="res/values-ru"/>
+        <source-file src="LibraryProject/res/values-sk/strings.xml" target-dir="res/values-sk"/>
+        <source-file src="LibraryProject/res/values-sl/strings.xml" target-dir="res/values-sl"/>
+        <source-file src="LibraryProject/res/values-sv/strings.xml" target-dir="res/values-sv"/>
+        <source-file src="LibraryProject/res/values-tr/strings.xml" target-dir="res/values-tr"/>
+        <source-file src="LibraryProject/res/values-zh-rCN/strings.xml" target-dir="res/values-zh-rCN"/>
+        <source-file src="LibraryProject/res/values-zh-rTW/strings.xml" target-dir="res/values-zh-rTW"/>
 
-./values-bg:
-strings.xml
-
-./values-cs:
-strings.xml
-
-./values-da:
-strings.xml
-
-./values-de:
-strings.xml
-
-./values-es:
-strings.xml
-
-./values-fi:
-strings.xml
-
-./values-fr:
-strings.xml
-
-./values-he:
-strings.xml
-
-./values-hu:
-strings.xml
-
-./values-it:
-strings.xml
-
-./values-ja-rJP:
-strings.xml
-
-./values-kr:
-strings.xml
-
-./values-nl:
-strings.xml
-
-./values-pl:
-strings.xml
-
-./values-pt:
-strings.xml
-
-./values-ru:
-strings.xml
-
-./values-sk:
-strings.xml
-
-./values-sl:
-strings.xml
-
-./values-sv:
-strings.xml
-
-./values-tr:
-strings.xml
-
-./values-zh-rCN:
-strings.xml
-
-./values-zh-rTW:
-strings.xml
-
--->
     </platform>
 </plugin>

src/android/LibraryProject/res/values-ar/strings.xml

@@ -15,7 +15,7 @@
  limitations under the License.
  -->
 <resources>
-  <string name="app_name">ماسح الرمز الشريطي</string>
+  <!-- string name="app_name">ماسح الرمز الشريطي</string -->
   <string name="app_picker_name">تطبيقات</string>
   <string name="bookmark_picker_name">إشارات مرجعية</string>
   <string name="button_add_calendar">إضافة إلى التقويم</string>
@@ -59,7 +59,7 @@
   <string name="menu_about">حول</string>
   <string name="menu_help">تعليمات</string>
   <string name="menu_history">سجل</string>
-  <string name="menu_settings">إعدادات</string>
+  <!-- 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>

src/android/LibraryProject/res/values-bg/strings.xml

@@ -15,7 +15,7 @@
  limitations under the License.
  -->
 <resources>
-  <string name="app_name">Баркод Скенер</string>
+  <!-- string name="app_name">Баркод Скенер</string -->
   <string name="app_picker_name">Приложения</string>
   <string name="bookmark_picker_name">Отметки</string>
   <string name="button_add_calendar">Добави в календар</string>
@@ -59,7 +59,7 @@
   <string name="menu_about">Относно</string>
   <string name="menu_help">Помощ</string>
   <string name="menu_history">История</string>
-  <string name="menu_settings">Настройки</string>
+  <!-- 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>

src/android/LibraryProject/res/values-cs/strings.xml

@@ -15,7 +15,7 @@
  limitations under the License.
  -->
 <resources>
-  <string name="app_name">Barcode Scanner</string>
+  <!-- string name="app_name">Barcode Scanner</string -->
   <string name="app_picker_name">Aplikace</string>
   <string name="bookmark_picker_name">Záložky</string>
   <string name="button_add_calendar">Přidat do kalendáře</string>
@@ -59,7 +59,7 @@
   <string name="menu_about">O</string>
   <string name="menu_help">Pomoc!</string>
   <string name="menu_history">Historie</string>
-  <string name="menu_settings">Nastavení</string>
+  <!-- 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>

src/android/LibraryProject/res/values-da/strings.xml

@@ -15,7 +15,7 @@
  limitations under the License.
  -->
 <resources>
-  <string name="app_name">Barcode Scanner</string>
+  <!-- string name="app_name">Barcode Scanner</string -->
   <string name="app_picker_name">Applikationer</string>
   <string name="bookmark_picker_name">Bogmærker</string>
   <string name="button_add_calendar">Tilføj til kalendar</string>
@@ -59,7 +59,7 @@
   <string name="menu_about">Om</string>
   <string name="menu_help">Hjælp</string>
   <string name="menu_history">Historik</string>
-  <string name="menu_settings">Indstillinger</string>
+  <!-- string name="menu_settings">Indstillinger</string -->
   <string name="menu_share">Del</string>
   <string name="msg_about">Baseret på open source ZXing Barcode Library</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>

src/android/LibraryProject/res/values-de/strings.xml

@@ -15,7 +15,7 @@
  limitations under the License.
  -->
 <resources>
-  <string name="app_name">Barcode Scanner</string>
+  <!-- string name="app_name">Barcode Scanner</string -->
   <string name="app_picker_name">Anwendungen</string>
   <string name="bookmark_picker_name">Lesezeichen</string>
   <string name="button_add_calendar">Termin hinzufügen</string>
@@ -59,7 +59,7 @@
   <string name="menu_about">Info</string>
   <string name="menu_help">Hilfe</string>
   <string name="menu_history">Historie</string>
-  <string name="menu_settings">Einstellungen</string>
+  <!-- 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>

src/android/LibraryProject/res/values-es/strings.xml

@@ -15,7 +15,7 @@
  limitations under the License.
  -->
 <resources>
-  <string name="app_name">Barcode Scanner</string>
+  <!-- string name="app_name">Barcode Scanner</string -->
   <string name="app_picker_name">Aplicaciónes</string>
   <string name="bookmark_picker_name">Marcadores</string>
   <string name="button_add_calendar">Añadir a calendario</string>
@@ -59,7 +59,7 @@
   <string name="menu_about">Acerca de</string>
   <string name="menu_help">Ayuda</string>
   <string name="menu_history">Historia</string>
-  <string name="menu_settings">Configuración</string>
+  <!-- string name="menu_settings">Configuración</string -->
   <string name="menu_share">Compartir</string>
   <string name="msg_about">Basado en la libreria de código de barras de código abierto ZXing</string>
   <string name="msg_buggy">Este dispositivo ha conocido errores de escaneo de código de barras causa problemas. Para más información, visite http://code.google.com/p/zxing/wiki/FrequentlyAskedQuestions</string>

src/android/LibraryProject/res/values-fi/strings.xml

@@ -15,7 +15,7 @@
  limitations under the License.
  -->
 <resources>
-  <string name="app_name">Barcode Scanner</string>
+  <!-- string name="app_name">Barcode Scanner</string -->
   <string name="app_picker_name">Ohjelmat</string>
   <string name="bookmark_picker_name">Kirjanmerkit</string>
   <string name="button_add_calendar">Lisää kalenteriin</string>
@@ -59,7 +59,7 @@
   <string name="menu_about">Tietoja</string>
   <string name="menu_help">Apua</string>
   <string name="menu_history">Historia</string>
-  <string name="menu_settings">Asetukset</string>
+  <!-- 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>

src/android/LibraryProject/res/values-fr/strings.xml

@@ -15,7 +15,7 @@
  limitations under the License.
  -->
 <resources>
-  <string name="app_name">Barcode Scanner</string>
+  <!-- string name="app_name">Barcode Scanner</string -->
   <string name="app_picker_name">Applications</string>
   <string name="bookmark_picker_name">Marques-pages</string>
   <string name="button_add_calendar">Ajouter à l\'agenda</string>
@@ -59,7 +59,7 @@
   <string name="menu_about">A propos</string>
   <string name="menu_help">Aide</string>
   <string name="menu_history">Historique</string>
-  <string name="menu_settings">Paramètres</string>
+  <!-- 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>

src/android/LibraryProject/res/values-he/strings.xml

@@ -15,7 +15,7 @@
  limitations under the License.
  -->
 <resources>
-  <string name="app_name">סורק ברקודים</string>
+  <!-- string name="app_name">סורק ברקודים</string -->
   <string name="app_picker_name">יישומים</string>
   <string name="bookmark_picker_name">סימניות</string>
   <string name="button_add_calendar">הוסף ללוח שנה</string>
@@ -59,7 +59,7 @@
   <string name="menu_about">אודות</string>
   <string name="menu_help">עזרה</string>
   <string name="menu_history">היסטוריה</string>
-  <string name="menu_settings">הגדרות</string>
+  <!-- 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>

src/android/LibraryProject/res/values-hu/strings.xml

@@ -15,7 +15,7 @@
  limitations under the License.
  -->
 <resources>
-  <string name="app_name">Barcode Scanner</string>
+  <!-- string name="app_name">Barcode Scanner</string -->
   <string name="app_picker_name">Alkalmazások</string>
   <string name="bookmark_picker_name">Könyvjelzők</string>
   <string name="button_add_calendar">Hozzáadás a naptárhoz</string>
@@ -59,7 +59,7 @@
   <string name="menu_about">Rólunk</string>
   <string name="menu_help">Segítség</string>
   <string name="menu_history">Előzmények</string>
-  <string name="menu_settings">Beállítások</string>
+  <!-- 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 Barcode Library alapján.</string>
   <string name="msg_buggy">Ennek a készüléknek ismert hibái vannak, amik 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>

src/android/LibraryProject/res/values-it/strings.xml

@@ -15,7 +15,7 @@
  limitations under the License.
  -->
 <resources>
-  <string name="app_name">Barcode Scanner</string>
+  <!-- string name="app_name">Barcode Scanner</string -->
   <string name="app_picker_name">Applicazioni</string>
   <string name="bookmark_picker_name">Segnalibri</string>
   <string name="button_add_calendar">Aggiungi al calendario</string>
@@ -59,7 +59,7 @@
   <string name="menu_about">Info</string>
   <string name="menu_help">Aiuto</string>
   <string name="menu_history">Cronologia</string>
-  <string name="menu_settings">Impostazioni</string>
+  <!-- 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>

src/android/LibraryProject/res/values-ja-rJP/strings.xml

@@ -15,7 +15,7 @@
  limitations under the License.
  -->
 <resources>
-  <string name="app_name">QRコードスキャナー</string>
+  <!-- string name="app_name">QRコードスキャナー</string -->
   <string name="app_picker_name">アプリケーション</string>
   <string name="bookmark_picker_name">ブックマーク</string>
   <string name="button_add_calendar">カレンダーに追加</string>
@@ -59,7 +59,7 @@
   <string name="menu_about">詳細</string>
   <string name="menu_help">ヘルプ</string>
   <string name="menu_history">履歴</string>
-  <string name="menu_settings">設定</string>
+  <!-- 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>

src/android/LibraryProject/res/values-kr/strings.xml

@@ -15,7 +15,7 @@
  limitations under the License.
  -->
 <resources>
-  <string name="app_name">바코드 스캐너</string>
+  <!-- string name="app_name">바코드 스캐너</string -->
   <string name="app_picker_name">어플리케이션</string>
   <string name="bookmark_picker_name">즐겨찾기</string>
   <string name="button_add_calendar">일정에 추가하기</string>
@@ -59,7 +59,7 @@
   <string name="menu_about">정보</string>
   <string name="menu_help">도움말</string>
   <string name="menu_history">기록</string>
-  <string name="menu_settings">설정</string>
+  <!-- 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>

src/android/LibraryProject/res/values-nl/strings.xml

@@ -15,7 +15,7 @@
  limitations under the License.
  -->
 <resources>
-  <string name="app_name">Barcode Scanner</string>
+  <!-- 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>
@@ -59,7 +59,7 @@
   <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_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>

src/android/LibraryProject/res/values-pl/strings.xml

@@ -15,7 +15,7 @@
  limitations under the License.
  -->
 <resources>
-  <string name="app_name">Barcode Scanner</string>
+  <!-- string name="app_name">Barcode Scanner</string -->
   <string name="app_picker_name">Aplikacje</string>
   <string name="bookmark_picker_name">Zakładki</string>
   <string name="button_add_calendar">Dodaj do kalendarza</string>
@@ -59,7 +59,7 @@
   <string name="menu_about">O aplikacji</string>
   <string name="menu_help">Pomoc</string>
   <string name="menu_history">Historia</string>
-  <string name="menu_settings">Ustawienia</string>
+  <!-- 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>

src/android/LibraryProject/res/values-pt/strings.xml

@@ -15,7 +15,7 @@
  limitations under the License.
  -->
 <resources>
-  <string name="app_name">Barcode Scanner</string>
+  <!-- string name="app_name">Barcode Scanner</string -->
   <string name="app_picker_name">Applications</string>
   <string name="bookmark_picker_name">Marcadores</string>
   <string name="button_add_calendar">Adicionar ao calendário</string>
@@ -59,7 +59,7 @@
   <string name="menu_about">Acerca de</string>
   <string name="menu_help">Ajuda</string>
   <string name="menu_history">Histórico</string>
-  <string name="menu_settings">Definições</string>
+  <!-- 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>

src/android/LibraryProject/res/values-ru/strings.xml

@@ -15,7 +15,7 @@
  limitations under the License.
  -->
 <resources>
-  <string name="app_name">Сканер штрих-кодов</string>
+  <!-- string name="app_name">Сканер штрих-кодов</string -->
   <string name="app_picker_name">Программы</string>
   <string name="bookmark_picker_name">Закладки</string>
   <string name="button_add_calendar">Добавить в календарь</string>
@@ -59,7 +59,7 @@
   <string name="menu_about">О программе</string>
   <string name="menu_help">Помощь</string>
   <string name="menu_history">История</string>
-  <string name="menu_settings">Настройки</string>
+  <!-- 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>

src/android/LibraryProject/res/values-sk/strings.xml

@@ -15,7 +15,7 @@
  limitations under the License.
  -->
 <resources>
-  <string name="app_name">Barcode Scanner</string>
+  <!-- string name="app_name">Barcode Scanner</string -->
   <string name="app_picker_name">Aplikácie</string>
   <string name="bookmark_picker_name">Záložky</string>
   <string name="button_add_calendar">Pridať do kalendára</string>
@@ -59,7 +59,7 @@
   <string name="menu_about">O programe</string>
   <string name="menu_help">Nápoveda</string>
   <string name="menu_history">História</string>
-  <string name="menu_settings">Nastavenia</string>
+  <!-- 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>

src/android/LibraryProject/res/values-sl/strings.xml

@@ -15,7 +15,7 @@
  limitations under the License.
  -->
 <resources>
-  <string name="app_name">Barcode Scanner</string>
+  <!-- string name="app_name">Barcode Scanner</string -->
   <string name="app_picker_name">Aplikacije</string>
   <string name="bookmark_picker_name">Zaznamki</string>
   <string name="button_add_calendar">Dodaj v koledar</string>
@@ -59,7 +59,7 @@
   <string name="menu_about">O programu</string>
   <string name="menu_help">Pomoč</string>
   <string name="menu_history">Zgodovina</string>
-  <string name="menu_settings">Nastavitve</string>
+  <!-- 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>

src/android/LibraryProject/res/values-sv/strings.xml

@@ -15,7 +15,7 @@
  limitations under the License.
  -->
 <resources>
-  <string name="app_name">Barcode Scanner</string>
+  <!-- string name="app_name">Barcode Scanner</string -->
   <string name="app_picker_name">Applikationer</string>
   <string name="bookmark_picker_name">Bokmärken</string>
   <string name="button_add_calendar">Lägg till i kalendern</string>
@@ -59,7 +59,7 @@
   <string name="menu_about">Om</string>
   <string name="menu_help">Hjälp</string>
   <string name="menu_history">Historik</string>
-  <string name="menu_settings">Inställningar</string>
+  <!-- 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">Här enheten har kända buggar som gör att streckkoden scanning problem. För mer information, besök http://code.google.com/p/zxing/wiki/FrequentlyAskedQuestions</string>

src/android/LibraryProject/res/values-tr/strings.xml

@@ -15,7 +15,7 @@
  limitations under the License.
  -->
 <resources>
-  <string name="app_name">Barkod Tarayıcısı</string>
+  <!-- string name="app_name">Barkod Tarayıcısı</string -->
   <string name="app_picker_name">Uygulamalar</string>
   <string name="bookmark_picker_name">Yer imleri</string>
   <string name="button_add_calendar">Takvime ekle</string>
@@ -59,7 +59,7 @@
   <string name="menu_about">Hakkında</string>
   <string name="menu_help">Yardım</string>
   <string name="menu_history">Geçmiş</string>
-  <string name="menu_settings">Ayarlar</string>
+  <!-- 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>

src/android/LibraryProject/res/values-zh-rCN/strings.xml

@@ -15,7 +15,7 @@
  limitations under the License.
  -->
 <resources>
-  <string name="app_name">条码扫描器</string>
+  <!-- string name="app_name">条码扫描器</string -->
   <string name="app_picker_name">应用</string>
   <string name="bookmark_picker_name">书签</string>
   <string name="button_add_calendar">添加事件至日历</string>
@@ -59,7 +59,7 @@
   <string name="menu_about">关于</string>
   <string name="menu_help">帮助</string>
   <string name="menu_history">历史</string>
-  <string name="menu_settings">设置</string>
+  <!-- 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>

src/android/LibraryProject/res/values-zh-rTW/strings.xml

@@ -15,7 +15,7 @@
  limitations under the License.
  -->
 <resources>
-  <string name="app_name">條碼掃描器</string>
+  <!-- string name="app_name">條碼掃描器</string -->
   <string name="app_picker_name">應用程式</string>
   <string name="bookmark_picker_name">書籤</string>
   <string name="button_add_calendar">加入事件至日曆</string>
@@ -59,7 +59,7 @@
   <string name="menu_about">關於</string>
   <string name="menu_help">幫助</string>
   <string name="menu_history">記錄</string>
-  <string name="menu_settings">設置</string>
+  <!-- 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>

src/android/LibraryProject/res/values/strings.xml

@@ -15,7 +15,7 @@
  limitations under the License.
  -->
 <resources>
-  <string name="app_name">Barcode Scanner</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>
@@ -59,7 +59,7 @@
   <string name="menu_about">About</string>
   <string name="menu_help">Help</string>
   <string name="menu_history">History</string>
-  <string name="menu_settings">Settings</string>
+  <!-- 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>

src/android/com/phonegap/plugins/barcodescanner/BarcodeScanner.java

@@ -121,7 +121,7 @@ public class BarcodeScanner extends Plugin {
                     //Log.d(LOG_TAG, "This should never happen");
                 }
                 this.success(new PluginResult(PluginResult.Status.OK, obj), this.callback);
-            } if (resultCode == Activity.RESULT_CANCELED) {
+            } else if (resultCode == Activity.RESULT_CANCELED) {
                 JSONObject obj = new JSONObject();
                 try {
                     obj.put(TEXT, "");

src/ios/CDVBarcodeScanner.mm

@@ -16,7 +16,20 @@
 //------------------------------------------------------------------------------
 #import "zxing-all-in-one.h"
 
-#import <CORDOVA/CDVPlugin.h>
+#import <Cordova/CDVPlugin.h>
+
+
+//------------------------------------------------------------------------------
+// Delegate to handle orientation functions
+// 
+//------------------------------------------------------------------------------
+@protocol CDVBarcodeScannerOrientationDelegate <NSObject>
+
+- (NSUInteger)supportedInterfaceOrientations;
+- (BOOL)shouldAutorotateToInterfaceOrientation:(UIInterfaceOrientation)interfaceOrientation;
+- (BOOL)shouldAutorotate;
+
+@end
 
 //------------------------------------------------------------------------------
 // Adds a shutter button to the UI, and changes the scan from continuous to
@@ -72,11 +85,13 @@
 //------------------------------------------------------------------------------
 // view controller for the ui
 //------------------------------------------------------------------------------
-@interface CDVbcsViewController : UIViewController {}
+@interface CDVbcsViewController : UIViewController <CDVBarcodeScannerOrientationDelegate> {}
 @property (nonatomic, retain) CDVbcsProcessor*  processor;
 @property (nonatomic, retain) NSString*        alternateXib;
 @property (nonatomic)         BOOL             shutterPressed;
 @property (nonatomic, retain) IBOutlet UIView* overlayView;
+// unsafe_unretained is equivalent to assign - used to prevent retain cycles in the property below
+@property (nonatomic, unsafe_unretained) id orientationDelegate;
 
 - (id)initWithProcessor:(CDVbcsProcessor*)processor alternateOverlay:(NSString *)alternateXib;
 - (void)startCapturing;
@@ -234,6 +249,8 @@ parentViewController:(UIViewController*)parentViewController
     }
     
     self.viewController = [[[CDVbcsViewController alloc] initWithProcessor: self alternateOverlay:self.alternateXib] autorelease];
+    // here we set the orientation delegate to the MainViewController of the app (orientation controlled in the Project Settings)
+    self.viewController.orientationDelegate = self.plugin.viewController;
     
     // delayed [self openDialog];
     [self performSelector:@selector(openDialog) withObject:nil afterDelay:1];
@@ -283,7 +300,7 @@ parentViewController:(UIViewController*)parentViewController
 - (NSString*)setUpCaptureSession {
     NSError* error = nil;
     
-    AVCaptureSession* captureSession = [[AVCaptureSession alloc] init];
+    AVCaptureSession* captureSession = [[[AVCaptureSession alloc] init] autorelease];
     self.captureSession = captureSession;
     
     AVCaptureDevice* device = [AVCaptureDevice defaultDeviceWithMediaType:AVMediaTypeVideo];
@@ -629,6 +646,17 @@ parentViewController:(UIViewController*)parentViewController
     [self.view addSubview:[self buildOverlayView]];
 }
 
+//--------------------------------------------------------------------------
+- (void)viewWillAppear:(BOOL)animated {
+    
+    // set video orientation to what the camera sees
+    self.processor.previewLayer.orientation = [[UIApplication sharedApplication] statusBarOrientation];
+    
+    // this fixes the bug when the statusbar is landscape, and the preview layer
+    // starts up in portrait (not filling the whole view)
+    self.processor.previewLayer.frame = self.view.bounds;
+}
+
 //--------------------------------------------------------------------------
 - (void)viewDidAppear:(BOOL)animated {
     [self startCapturing];
@@ -641,13 +669,6 @@ parentViewController:(UIViewController*)parentViewController
     self.processor.capturing = YES;
 }
 
-//--------------------------------------------------------------------------
-- (BOOL)shouldAutorotateToInterfaceOrientation:(UIInterfaceOrientation)interfaceOrientation {
-    // rotation currently not supported
-    if (interfaceOrientation == UIInterfaceOrientationPortrait) return YES;
-    return NO;
-}
-
 //--------------------------------------------------------------------------
 - (void)shutterButtonPressed {
     self.shutterPressed = YES;
@@ -796,4 +817,42 @@ parentViewController:(UIViewController*)parentViewController
     return result;
 }
 
-@end
+#pragma mark CDVBarcodeScannerOrientationDelegate
+
+- (BOOL)shouldAutorotate
+{   
+    return NO;
+}
+
+- (UIInterfaceOrientation)preferredInterfaceOrientationForPresentation
+{
+    return UIInterfaceOrientationPortrait;
+}
+
+- (NSUInteger)supportedInterfaceOrientations
+{
+    return UIInterfaceOrientationMaskPortrait;
+}
+
+- (BOOL)shouldAutorotateToInterfaceOrientation:(UIInterfaceOrientation)interfaceOrientation
+{
+    if ((self.orientationDelegate != nil) && [self.orientationDelegate respondsToSelector:@selector(shouldAutorotateToInterfaceOrientation:)]) {
+        return [self.orientationDelegate shouldAutorotateToInterfaceOrientation:interfaceOrientation];
+    }
+    
+    return YES;
+}
+
+- (void) willAnimateRotationToInterfaceOrientation:(UIInterfaceOrientation)orientation duration:(NSTimeInterval)duration
+{
+    [CATransaction begin];
+    
+    self.processor.previewLayer.orientation = orientation;
+    [self.processor.previewLayer layoutSublayers];
+    self.processor.previewLayer.frame = self.view.bounds;
+    
+    [CATransaction commit];
+    [super willAnimateRotationToInterfaceOrientation:orientation duration:duration];
+}
+
+@end