From 9bbbcc897dff7b5a8f9a25894d7f75825a1f803d Mon Sep 17 00:00:00 2001
From: Herbert von Broeuschmeul <Herbert.Broeuschmeul@gmail.com>
Date: Fri, 11 May 2012 18:41:52 +0200
Subject: update version numbers and readme file for version 1.2.5

Conflicts:
	readme.textile
	version.txt
---
 AndroidManifest.xml      |  2 +-
 readme.textile           | 13 ++++++++++---
 res/values/constants.xml |  2 +-
 version.txt              | 11 +++++++++--
 4 files changed, 21 insertions(+), 7 deletions(-)

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index ed20856..8a1f1b2 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -20,7 +20,7 @@
 -->
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
       package="org.broeuschmeul.android.gps.bluetooth.provider"
-      android:versionCode="124"
+      android:versionCode="125"
       android:versionName="@string/versionName">
 
     <uses-sdk android:targetSdkVersion="4" android:minSdkVersion="3" />
diff --git a/readme.textile b/readme.textile
index 7ac24db..e988ab4 100644
--- a/readme.textile
+++ b/readme.textile
@@ -1,14 +1,21 @@
-*"BlueGps4Cupcake 1.2.4":http://sourceforge.net/projects/bluegps4droid/files/Apk/BlueGPS4Droid_1.2.x/BlueGps4Cupcake_1.2.4.apk/download* (2012-03-27)
+*"BlueGps4Cupcake 1.2.5":http://sourceforge.net/projects/bluegps4droid/files/Apk/BlueGPS4Droid_1.2.x/BlueGps4Cupcake_1.2.5.apk/download (2012-05-11)*
+* BlueGps4Droid version 1.2.5 for Cupcake and Donuts - *Do not use with Eclair, Froyo or Gingerbread !!!*
+* Bluetooth support is provided using the backport-android-bluetooth package: "http://code.google.com/p/backport-android-bluetooth":http://code.google.com/p/backport-android-bluetooth.
+
+*"BlueGps4Droid 1.2.5":http://sourceforge.net/projects/bluegps4droid/files/Apk/BlueGPS4Droid_1.2.x/BlueGps4Droid_1.2.5.apk/download (2012-05-01)*
+* Add Portuguese translation (thanks to rsantospereira (XDA: rikpereira) and meiji (XDA: meiji.emperor))
+
+BlueGps4Cupcake 1.2.4 (2012-03-27)
 * BlueGps4Droid version 1.2.4 for Cupcake and Donuts - *Do not use with Eclair, Froyo or Gingerbread !!!*
 * Bluetooth support is provided using the backport-android-bluetooth package:  "http://code.google.com/p/backport-android-bluetooth":http://code.google.com/p/backport-android-bluetooth.
 
-*"BlueGps4Droid 1.2.4":http://sourceforge.net/projects/bluegps4droid/files/Apk/BlueGPS4Droid_1.2.x/BlueGps4Droid_1.2.4.apk/download* (2012-03-27)
+BlueGps4Droid 1.2.4 (2012-03-26)
 * Bug fix (Ticket #9: "Handle NMEA timestamps without fractional seconds":https://sourceforge.net/p/bluegps4droid/tickets/9/ ) (thanks to Jeffrey Hutzelman)
 * Update copyright info in source and about app message
 
 BlueGps4Cupcake 1.2.3 (2011-09-08)
 * BlueGps4Droid version 1.2.3 for Cupcake and Donuts - *Do not use with Eclair, Froyo or Gingerbread !!!*
-* Bluetooth support is provided using the backport-android-bluetooth package:  "http://code.google.com/p/backport-android-bluetooth":http://code.google.com/p/backport-android-bluetooth.
+* Bluetooth support is provided using the backport-android-bluetooth package: "http://code.google.com/p/backport-android-bluetooth":http://code.google.com/p/backport-android-bluetooth.
 
 BlueGps4Droid 1.2.3 (2011-09-08)
 * Add Russian translation (thanks to skleroz)
diff --git a/res/values/constants.xml b/res/values/constants.xml
index 9b47fe2..da2f17b 100644
--- a/res/values/constants.xml
+++ b/res/values/constants.xml
@@ -19,7 +19,7 @@
 	along with BluetoothGPS4Droid. If not, see : http://www.gnu.org/licenses/.
 -->
 <resources>
-	<string name="versionName">1.2.4</string>
+	<string name="versionName">1.2.5</string>
 
     <string name="pref_start_gps_key">startGps</string>
     <string name="pref_gps_location_provider_key">gpsLocationProviderKey</string>
diff --git a/version.txt b/version.txt
index 3266c57..befd91a 100644
--- a/version.txt
+++ b/version.txt
@@ -1,7 +1,14 @@
-BlueGps4Cupcake 1.2.3 (2012-03-27)
-	* BlueGps4Droid version 1.2.4 for Cupcake and Donuts - Do not use with Eclair, Froyo or Gingerbread !!!
+BlueGps4Droid 1.2.5 (2012-05-11)
+	* BlueGps4Droid version 1.2.5 for Cupcake and Donuts - Do not use with Eclair, Froyo or Gingerbread !!!
 	* Bluetooth support is provided using the backport-android-bluetooth package: http://code.google.com/p/backport-android-bluetooth.
 
+BlueGps4Droid 1.2.5 (2012-05-01)
+	* Add Portuguese translation (thanks to rsantospereira (XDA: rikpereira) and meiji (XDA: meiji.emperor))
+
+BlueGps4Cupcake 1.2.4 (2012-03-27)
+	* BlueGps4Droid version 1.2.4 for Cupcake and Donuts - Do not use with Eclair, Froyo or Gingerbread !!!
+	* Bluetooth support is provided using the backport-android-bluetooth package: http://code.google.com/p/backport-android-bluetooth.
+
 BlueGps4Droid 1.2.4 (2012-03-26)
 	* Bug fix: bug #9 Handle NMEA timestamps without fractional seconds(thanks to Jeffrey Hutzelman)
 	* Update copyright info in source and about app message
-- 
cgit v1.1