Fix:Android:Default to 0 if we can't find the svn rev of the last commit

git-svn-id: http://svn.code.sf.net/p/navit/code/trunk/navit@6135 ffa7fe5e-494d-0410-b361-a75ebd5db220

6 files changed, 53 insertions, 90 deletions

diff --git a/ci/build_android.sh b/ci/build_android.sh
index 708b67402..968765f28 100644
--- a/ci/build_android.sh
+++ b/ci/build_android.sh
@@ -131,6 +131,7 @@ cd $BUILD_PATH
 export PATH=$ANDROID_NDK_BIN:$ANDROID_SDK_TOOLS:$ANDROID_SDK_PLATFORM_TOOLS:$PATH
 android list targets
 svn_rev=` cd ~/navit/; git log -1|grep git-svn-id:|cut -c 65-68`
+if [[ "$svn_rev" == "" ]]; then svn_rev="0"; fi
 sed -i -e "s/ANDROID_VERSION_INT=\"0\"/ANDROID_VERSION_INT=\"${svn_rev}\"/g" ~/navit/navit/android/CMakeLists.txt
 cp ~/navit/navit/android/CMakeLists.txt $CIRCLE_ARTIFACTS/
 
diff --git a/circle.yml b/circle.yml
index a003643db..628d130e1 100644
--- a/circle.yml
+++ b/circle.yml
@@ -3,9 +3,9 @@ machine:
     ANDROID_HOME: /home/ubuntu/android
     ANDROID_NDK_HOME: /home/ubuntu/android/android-ndk
     ANDROID_SDK_CDN: https://dl.google.com/android
-    ANDROID_SDK_FILE: android-sdk_r24.2-linux.tgz
+    ANDROID_SDK_FILE: android-sdk_r24.0.2-linux.tgz
     ANDROID_NDK_CDN: http://dl.google.com/android/ndk
-    ANDROID_NDK_FILE: android-ndk-r10e-linux-x86_64.bin
+    ANDROID_NDK_FILE: android-ndk-r10d-linux-x86_64.bin
     CMAKE_FILE: ../Toolchain/arm-eabi.cmake
 dependencies:
   cache_directories:
diff --git a/navit/android/AndroidManifest.xml.cmake b/navit/android/AndroidManifest.xml.cmake
index 9267f65a3..c70ab66aa 100644
--- a/navit/android/AndroidManifest.xml.cmake
+++ b/navit/android/AndroidManifest.xml.cmake
@@ -5,7 +5,7 @@
       android:versionCode="@ANDROID_VERSION_INT@"
       android:versionName="@ANDROID_VERSION_NAME@-@ANDROID_VERSION_INT@"
       android:installLocation="auto">
-    <uses-sdk android:minSdkVersion="7" android:targetSdkVersion="@ANDROID_API_VERSION@"/>
+    <uses-sdk android:minSdkVersion="3" android:targetSdkVersion="@ANDROID_API_VERSION@"/>
     <uses-feature android:name="android.hardware.location.network" android:required="false"/>
     <uses-feature android:name="android.hardware.touchscreen" android:required="false"/>
     <supports-screens android:smallScreens="true" android:normalScreens="true" android:largeScreens="true" android:resizeable="true" android:anyDensity="true"/>
@@ -20,7 +20,8 @@
                  android:name=".NavitAppConfig">
         <activity android:name="Navit"
                   android:label="@string/app_name"
-                  android:configChanges="locale|touchscreen|keyboard|keyboardHidden|navigation|orientation|fontScale|screenSize">
+                  android:theme="@android:style/Theme.NoTitleBar"
+                  android:configChanges="locale|touchscreen|keyboard|keyboardHidden|navigation|orientation|fontScale">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <category android:name="android.intent.category.LAUNCHER" />
diff --git a/navit/android/AndroidManifest.xml.in b/navit/android/AndroidManifest.xml.in
index 5a43ee277..09e8410ff 100644
--- a/navit/android/AndroidManifest.xml.in
+++ b/navit/android/AndroidManifest.xml.in
@@ -10,7 +10,8 @@
                  android:name=".NavitAppConfig">
         <activity android:name="Navit"
                   android:label="@string/app_name"
-		  android:configChanges="locale|touchscreen|keyboard|keyboardHidden|navigation|orientation|fontScale|screenSize">
+                  android:theme="@android:style/Theme.NoTitleBar"
+		  android:configChanges="locale|touchscreen|keyboard|keyboardHidden|navigation|orientation|fontScale">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <category android:name="android.intent.category.LAUNCHER" />
@@ -26,7 +27,7 @@
 		<activity android:name=".NavitAddressResultListActivity"></activity>
         <activity android:name=".FileBrowserActivity"></activity>
     </application>
-    <uses-sdk android:minSdkVersion="7" android:targetSdkVersion="19"/>
+    <uses-sdk android:minSdkVersion="4" android:targetSdkVersion="8"/>
     <supports-screens android:smallScreens="true" android:normalScreens="true" android:largeScreens="true" android:resizeable="true" android:anyDensity="true"/>
     <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />
     <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
diff --git a/po/de.po.in b/po/de.po.in
index 2d8fa932f..d49324e59 100644
--- a/po/de.po.in
+++ b/po/de.po.in
@@ -40,8 +40,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: navit 0.5.0\n"
 "Report-Msgid-Bugs-To: \n"
-"PO-Revision-Date: 2015-07-20 21:54+0000\n"
-"Last-Translator: Mathias Klein <ma_klein@gmx.de>\n"
+"PO-Revision-Date: 2015-07-23 12:34+0000\n"
+"Last-Translator: Robotaxi <robotaxi@arcor.de>\n"
 "Language-Team: Martin Schaller <martin-s@sourceforge.net>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -393,7 +393,7 @@ msgstr "dann haben Sie Ihr Ziel erreicht."
 #. TRANSLATORS: the arg. is distance
 #, c-format
 msgid "You have reached your destination %s"
-msgstr "Sie haben Ihr Ziel %s erreicht"
+msgstr "%s haben Sie Ihr Ziel erreicht"
 
 #. TRANSLATORS: Exit as a noun, as in "Exit 43 Greenmound-East"
 msgid "Interchange"
@@ -2808,9 +2808,3 @@ msgstr ""
 "Navit kann jede text-to-speech engine nutzen, die installiert ist. Die\r\n"
 "derzeit angewählte engine kann Ihre Sprache nicht wiedergeben.\r\n"
 "Soll das System den Voice-Download Dialog öffnen?"
-
-#~ msgid "%d m"
-#~ msgstr "%d m"
-
-#~ msgid "in %d m"
-#~ msgstr "in %d m"
diff --git a/po/pt_BR.po.in b/po/pt_BR.po.in
index d534039dc..2a53b913e 100644
--- a/po/pt_BR.po.in
+++ b/po/pt_BR.po.in
@@ -86,14 +86,6 @@ msgid "sixth exit"
 msgstr "sexta saída"
 
 #, c-format
-msgid "%d m"
-msgstr ""
-
-#, c-format
-msgid "in %d m"
-msgstr ""
-
-#, c-format
 msgid "%d feet"
 msgstr "%d pés"
 
@@ -102,14 +94,6 @@ msgid "in %d feet"
 msgstr "em %d pés"
 
 #, c-format
-msgid "%d meters"
-msgstr "%d metros"
-
-#, c-format
-msgid "in %d meters"
-msgstr "em %d metros"
-
-#, c-format
 msgid "%d.%d miles"
 msgstr "%d.%d milhas"
 
@@ -118,14 +102,6 @@ msgid "in %d.%d miles"
 msgstr "em %d.%d milhas"
 
 #, c-format
-msgid "%d.%d kilometers"
-msgstr "%d.%d quilômetros"
-
-#, c-format
-msgid "in %d.%d kilometers"
-msgstr "em %d.%d quilômetros"
-
-#, c-format
 msgid "one mile"
 msgid_plural "%d miles"
 msgstr[0] "uma milha"
@@ -138,6 +114,22 @@ msgstr[0] "em uma milha"
 msgstr[1] "em %d milhas"
 
 #, c-format
+msgid "%d meters"
+msgstr "%d metros"
+
+#, c-format
+msgid "in %d meters"
+msgstr "em %d metros"
+
+#, c-format
+msgid "%d.%d kilometers"
+msgstr "%d.%d quilômetros"
+
+#, c-format
+msgid "in %d.%d kilometers"
+msgstr "em %d.%d quilômetros"
+
+#, c-format
 msgid "one kilometer"
 msgid_plural "%d kilometers"
 msgstr[0] "um quilômetro"
@@ -218,10 +210,10 @@ msgstr "Continue na via por %s"
 msgid "Enter the roundabout soon"
 msgstr "Entre na rotatória em seguida"
 
-#. TRANSLATORS: first arg. is the distance to the roundabout, second arg. is the manieth exit
+#. TRANSLATORS: %s is the distance to the roundabout
 #, c-format
-msgid "Enter the roundabout %1$s and leave at the %2$s"
-msgstr ""
+msgid "Enter the roundabout %s"
+msgstr "Entre na rotatória %s"
 
 #. TRANSLATORS: first arg. is the manieth exit, second arg. is the destination to follow
 #, c-format
@@ -242,25 +234,25 @@ msgstr "agora"
 msgid "then"
 msgstr "em seguida"
 
-#. TRANSLATORS: the arg. is the phrase 'onto ...'.
+#. TRANSLATORS: the arg. is the phrase 'onto ...'. Right merge, the stuff after | doesn't have to be included.
 #, c-format
-msgid "then right merge%1$s"
+msgid "then merge%1$s|right"
 msgstr ""
 
-#. TRANSLATORS: the first arg. is distance, the second is the phrase 'onto ...'.
+#. TRANSLATORS: the first arg. is distance, the second is the phrase 'onto ...'. Right merge, the stuff after | doesn't have to be included.
 #, c-format
-msgid "Merge right %1$s%2$s"
+msgid "Merge %1$s%2$s|right"
 msgstr ""
 
-#. TRANSLATORS: the arg. is the phrase 'onto ...'. Left merge
+#. TRANSLATORS: the arg. is the phrase 'onto ...'. Left merge, the stuff after | doesn't have to be included.
 #, c-format
-msgid "then left merge%1$s"
-msgstr ""
+msgid "then merge%1$s|left"
+msgstr "em seguida vire a %1$s|esquerda"
 
-#. TRANSLATORS: the first arg. is distance, the second is the phrase 'onto ...'. Left merge
+#. TRANSLATORS: the first arg. is distance, the second is the phrase 'onto ...'. Left merge, the stuff after | doesn't have to be included.
 #, c-format
-msgid "Merge left %1$s%2$s"
-msgstr ""
+msgid "Merge %1$s%2$s|left"
+msgstr "Vire a %1$s%2$s|esquerda"
 
 msgid "on your left"
 msgstr "à sua esquerda"
@@ -345,23 +337,23 @@ msgstr "após %i vias"
 msgid "Turn %1$s%2$s %3$s%4$s"
 msgstr "Vire a %1$s%2$s %3$s%4$s"
 
-#. TRANSLATORS: Left U-turn
-msgid "then make a left U-turn"
-msgstr ""
+#. TRANSLATORS: Left U-turn, the stuff after | doesn't have to be included.
+msgid "then make a U-turn|left"
+msgstr "então faça o retorno"
 
-#. TRANSLATORS: the arg. is distance. Left U-turn
+#. TRANSLATORS: the arg. is distance. Left U-turn, the stuff after | doesn't have to be included.
 #, c-format
-msgid "Make a left U-turn %1$s"
-msgstr ""
+msgid "Make a U-turn %1$s|left"
+msgstr "Faça o retorno a esquerda %1$s"
 
-#. TRANSLATORS: Right U-turn, the stuff after
-msgid "then make a right U-turn"
-msgstr ""
+#. TRANSLATORS: Right U-turn, the stuff after | doesn't have to be included.
+msgid "then make a U-turn|right"
+msgstr "então faça o retorno a direita"
 
-#. TRANSLATORS: the arg. is distance. Right U-turn
+#. TRANSLATORS: the arg. is distance. Right U-turn, the stuff after | doesn't have to be included.
 #, c-format
-msgid "Make a right U-turn %1$s"
-msgstr ""
+msgid "Make a U-turn %1$s|right"
+msgstr "Faça o retorno a direita %1$s"
 
 #. An empty placeholder that we can use in the future for
 #. * some motorway commands that are now suppressed but we
@@ -2786,29 +2778,3 @@ msgid ""
 "currently selected engine reports it is unable to speak in your language. "
 "Should we ask the system to show voice download dialog?"
 msgstr ""
-
-#, c-format
-#~ msgid "Enter the roundabout %s"
-#~ msgstr "Entre na rotatória %s"
-
-#, c-format
-#~ msgid "then merge%1$s|left"
-#~ msgstr "em seguida vire a %1$s|esquerda"
-
-#, c-format
-#~ msgid "Merge %1$s%2$s|left"
-#~ msgstr "Vire a %1$s%2$s|esquerda"
-
-#~ msgid "then make a U-turn|left"
-#~ msgstr "então faça o retorno"
-
-#, c-format
-#~ msgid "Make a U-turn %1$s|left"
-#~ msgstr "Faça o retorno a esquerda %1$s"
-
-#~ msgid "then make a U-turn|right"
-#~ msgstr "então faça o retorno a direita"
-
-#, c-format
-#~ msgid "Make a U-turn %1$s|right"
-#~ msgstr "Faça o retorno a direita %1$s"