diff options
| author | Herbert von Broeuschmeul <Herbert.Broeuschmeul@gmail.com> | 2012-03-24 00:44:14 +0100 |
|---|---|---|
| committer | Herbert von Broeuschmeul <Herbert.Broeuschmeul@gmail.com> | 2012-03-24 00:44:14 +0100 |
| commit | 01bcfd6aa8f1d16a07c54d8cc6ad21411080223d (patch) | |
| tree | 7ee445719f20528fd605b5198d58c92ee91bb67a | |
| parent | 51b3eaf859c30629bfd8ccd67731e956a9fa5055 (diff) | |
| parent | aa7539559beb4fc5ce6892b2c2265fe5a630583e (diff) | |
| download | BlueGPS-01bcfd6aa8f1d16a07c54d8cc6ad21411080223d.zip BlueGPS-01bcfd6aa8f1d16a07c54d8cc6ad21411080223d.tar.gz BlueGPS-01bcfd6aa8f1d16a07c54d8cc6ad21411080223d.tar.bz2 | |
Merge branch 'BlueGPS4Droid_1.2.x' into BlueGPS4Cupcake_1.2.x
| -rw-r--r-- | .classpath | 1 | ||||
| -rw-r--r-- | AndroidManifest.xml | 2 | ||||
| -rw-r--r-- | res/values-es/strings.xml | 4 | ||||
| -rw-r--r-- | res/values-fr/strings.xml | 4 | ||||
| -rw-r--r-- | res/values-ru/strings.xml | 4 | ||||
| -rw-r--r-- | res/values/constants.xml | 2 | ||||
| -rw-r--r-- | res/values/strings.xml | 4 |
7 files changed, 11 insertions, 10 deletions
@@ -4,5 +4,6 @@ <classpathentry kind="src" path="gen"/>
<classpathentry kind="con" path="com.android.ide.eclipse.adt.ANDROID_FRAMEWORK"/>
<classpathentry kind="lib" path="lib/backport-android-bluetooth2.jar"/>
+ <classpathentry exported="true" kind="con" path="com.android.ide.eclipse.adt.LIBRARIES"/>
<classpathentry kind="output" path="bin/classes"/>
</classpath>
diff --git a/AndroidManifest.xml b/AndroidManifest.xml index 0b88c69..ed20856 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="123"
+ android:versionCode="124"
android:versionName="@string/versionName">
<uses-sdk android:targetSdkVersion="4" android:minSdkVersion="3" />
diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml index 5dfe15c..b09cae1 100644 --- a/res/values-es/strings.xml +++ b/res/values-es/strings.xml @@ -115,8 +115,8 @@ <string name="about_title">Acerca de</string> <string name="about_version">Versión BluetoothGPS4Droid</string> - <string name="about_copyright_1">Copyright (C) 2010 Herbert von Broeuschmeul</string> - <string name="about_copyright_2">Copyright (C) 2010 BluetoothGPS4Droid Project</string> + <string name="about_copyright_1">Copyright (C) 2010, 2011, 2012 Herbert von Broeuschmeul</string> + <string name="about_copyright_2">Copyright (C) 2010, 2011, 2012 BluetoothGPS4Droid Project</string> <string name="about_app_desc">Bluetooth GPS para Android es una aplicación que permite utilizar un GPS bluetooth externo con un terminal Android. </string> diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml index 93681bf..6338866 100644 --- a/res/values-fr/strings.xml +++ b/res/values-fr/strings.xml @@ -112,8 +112,8 @@ <string name="about_title">À propos de</string>
<string name="about_version">BluetoothGPS4Droid version</string>
- <string name="about_copyright_1">Copyright (C) 2010 Herbert von Broeuschmeul</string>
- <string name="about_copyright_2">Copyright (C) 2010 BluetoothGPS4Droid Project</string>
+ <string name="about_copyright_1">Copyright (C) 2010, 2011, 2012 Herbert von Broeuschmeul</string>
+ <string name="about_copyright_2">Copyright (C) 2010, 2011, 2012 BluetoothGPS4Droid Project</string>
<string name="about_app_desc">Bluetooth GPS for Android est une application
qui permet d\'utiliser un GPS bluetooth externe avec un terminal Android.
</string>
diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml index 4d4c893..df491e8 100644 --- a/res/values-ru/strings.xml +++ b/res/values-ru/strings.xml @@ -108,8 +108,8 @@ <string name="service_closed_because_connection_problem_notification">"Причина: %s"</string>
<string name="about_title">О программе</string>
<string name="about_version">BluetoothGPS4Droid версии</string>
- <string name="about_copyright_1">Copyright (C) 2010 Herbert von Broeuschmeul</string>
- <string name="about_copyright_2">Copyright (C) 2010 BluetoothGPS4Droid Project</string>
+ <string name="about_copyright_1">Copyright (C) 2010, 2011, 2012 Herbert von Broeuschmeul</string>
+ <string name="about_copyright_2">Copyright (C) 2010, 2011, 2012 BluetoothGPS4Droid Project</string>
<string name="about_app_desc">Bluetooth GPS for Android - приложение для использования
внешнего bluetooth GPS приемника.
</string>
diff --git a/res/values/constants.xml b/res/values/constants.xml index 331eef3..9b47fe2 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.3</string>
+ <string name="versionName">1.2.4</string>
<string name="pref_start_gps_key">startGps</string>
<string name="pref_gps_location_provider_key">gpsLocationProviderKey</string>
diff --git a/res/values/strings.xml b/res/values/strings.xml index 1889aec..b8acc17 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -112,8 +112,8 @@ <string name="about_title">About</string>
<string name="about_version">BluetoothGPS4Droid version</string>
- <string name="about_copyright_1">Copyright (C) 2010 Herbert von Broeuschmeul</string>
- <string name="about_copyright_2">Copyright (C) 2010 BluetoothGPS4Droid Project</string>
+ <string name="about_copyright_1">Copyright (C) 2010, 2011, 2012 Herbert von Broeuschmeul</string>
+ <string name="about_copyright_2">Copyright (C) 2010, 2011, 2012 BluetoothGPS4Droid Project</string>
<string name="about_app_desc">Bluetooth GPS for Android is an application
for using an external bluetooth GPS on Android devices.
</string>
|