diff options
| author | dswitkin@google.com <dswitkin@google.com@59b500cc-1b3d-0410-9834-0bbf25fbcc57> | 2012-01-31 02:50:53 +0400 |
|---|---|---|
| committer | dswitkin@google.com <dswitkin@google.com@59b500cc-1b3d-0410-9834-0bbf25fbcc57> | 2012-01-31 02:50:53 +0400 |
| commit | 240593386ed8a9ec0a855556d8ff3e2e6fe6f440 (patch) | |
| tree | 8dfe4cd1659008ff5cc4164034840b7d1c07ffee | |
| parent | 37b78e6008c4deaf033ac0810a831017015f1933 (diff) | |
| download | zxing-android-embedded-240593386ed8a9ec0a855556d8ff3e2e6fe6f440.tar.xz | |
Bumped version to 4.0 final and fixed Finnish translation which broke the build.
git-svn-id: http://zxing.googlecode.com/svn/trunk/android@2136 59b500cc-1b3d-0410-9834-0bbf25fbcc57
| -rwxr-xr-x | AndroidManifest.xml | 4 | ||||
| -rw-r--r-- | assets/html-en/whatsnew.html | 4 | ||||
| -rw-r--r-- | res/values-fi/strings.xml | 2 |
3 files changed, 6 insertions, 4 deletions
diff --git a/AndroidManifest.xml b/AndroidManifest.xml index 35d16ab1..a94dff58 100755 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -16,8 +16,8 @@ --> <manifest xmlns:android="http://schemas.android.com/apk/res/android" package="com.google.zxing.client.android" - android:versionName="4.0 beta 1" - android:versionCode="78" + android:versionName="4.0" + android:versionCode="79" android:installLocation="auto"> <uses-permission android:name="android.permission.CAMERA"/> diff --git a/assets/html-en/whatsnew.html b/assets/html-en/whatsnew.html index 85586121..e6ce5da9 100644 --- a/assets/html-en/whatsnew.html +++ b/assets/html-en/whatsnew.html @@ -6,11 +6,13 @@ <body> <p><strong>New in version 4.0:</strong></p> <ul> - <li>Rewrote the camera code to use newer functionality like using the front light.</li> + <li>Added new camera features like front light support.</li> + <li>Updated the app to require Android 2.1 (Froyo).</li> <li>Wrote a new history screen.</li> <li>Removed some unneeded permissions.</li> <li>Made some WiFi improvements.</li> <li>Many, many bug fixes.</li> + <li>Many translation fixes.</li> </ul> </body> </html> diff --git a/res/values-fi/strings.xml b/res/values-fi/strings.xml index 7ac2b5d4..37122d1f 100644 --- a/res/values-fi/strings.xml +++ b/res/values-fi/strings.xml @@ -100,7 +100,7 @@ <string name="preferences_decode_1D_title">1D-viivakoodeja</string> <string name="preferences_decode_Data_Matrix_title">Data Matrix</string> <string name="preferences_decode_QR_title">QR-koodeja</string> - <string name="preferences_front_light_summary">Salamavalon käyttö saattaa auttaa hämärässä, mutta se saattaa aiheuttaa myös häikäisyä. Ei toimi kaikissa puhelimissa.</string> <string name="preferences_front_light_title">Valo edessä</string> + <string name="preferences_front_light_summary">Salamavalon käyttö saattaa auttaa hämärässä, mutta se saattaa aiheuttaa myös häikäisyä. Ei toimi kaikissa puhelimissa.</string> <string name="preferences_front_light_title">Käytä valoa</string> <string name="preferences_general_title">Yleiset asetukset</string> <string name="preferences_name">Asetukset</string> |