Final changes for Barcode Scanner 3.2.

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

diff --git a/android/AndroidManifest.xml b/android/AndroidManifest.xml
index 074cb92..deacde3 100755 (executable)
--- a/android/AndroidManifest.xml
+++ b/android/AndroidManifest.xml
@@ -20,8 +20,8 @@ version to be published. The next versionCode will be 7, regardless of whether t
 versionName is 2.31, 2.4, or 3.0. -->
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
           package="com.google.zxing.client.android"
-          android:versionName="3.2 beta 1"
-          android:versionCode="44">
+          android:versionName="3.2"
+          android:versionCode="45">
   <!-- We require Cupcake (Android 1.5) or later, but are really targeting Donut. -->
   <uses-sdk android:minSdkVersion="3"
             android:targetSdkVersion="4"/>

diff --git a/android/assets/html/whatsnew.html b/android/assets/html/whatsnew.html
index 52bf3bd..1ac9c38 100644 (file)
--- a/android/assets/html/whatsnew.html
+++ b/android/assets/html/whatsnew.html
@@ -6,7 +6,7 @@
 <p>New in version 3.2:</p>
 <ul>
   <li>Allowed devices without autofocus to see Barcode Scanner in the Market.</li>
-  <li>New Finnish, Dutch, and Czech translations.</li>
+  <li>New Finnish, Swedish, Dutch, and Czech translations.</li>
   <li>Added a Google Shopper button when scanning products.</li>
   <li>Fixed a possible crash on unsupported hardware.</li>
   <li>Better layouts on QVGA devices like the HTC Tattoo.</li>

diff --git a/android/res/values/strings.xml b/android/res/values/strings.xml
index efc1120..06d0511 100755 (executable)
--- a/android/res/values/strings.xml
+++ b/android/res/values/strings.xml
@@ -67,7 +67,7 @@
   <string name="msg_encode_contents_failed">Could not encode a barcode from the data provided.</string>
   <string name="msg_encode_in_progress">Generating a barcode\u2026</string>
   <string name="msg_google_shopper_missing">Google Shopper is not installed</string>
-  <string name="msg_install_google_shopper">Google Shopper is a new Android app with prices, reviews, and more. Would you like to install it from Market?</string>
+  <string name="msg_install_google_shopper">Google Shopper combines barcode scanning with prices, reviews and more without opening the browser. Would you like to try it?</string>
   <string name="msg_intent_failed">Sorry, the requested application could not be launched. The barcode contents may be invalid.</string>
   <string name="msg_loading_apps">Loading list of applications\u2026</string>
   <string name="msg_not_our_results">You are leaving this application. The search results you will see are not related to this application.</string>