diff options
author | kazer_ <kazer_@ffa7fe5e-494d-0410-b361-a75ebd5db220> | 2015-08-04 18:15:11 +0000 |
---|---|---|
committer | kazer_ <kazer_@ffa7fe5e-494d-0410-b361-a75ebd5db220> | 2015-08-04 18:15:11 +0000 |
commit | 00f0ac4138c452474d2e57143637603f024932ad (patch) | |
tree | 3d411b47054764136f394c6d0ad0f6492efa88d4 | |
parent | 0e060fefee6c926547171284639015260798db28 (diff) | |
parent | 8cbc81d37a2b77988122e69b7e5ccea849f12a4b (diff) | |
download | navit-00f0ac4138c452474d2e57143637603f024932ad.tar.gz |
Update:Translations:Updated French (fr) translation from launchpad
git-svn-id: http://svn.code.sf.net/p/navit/code/trunk/navit@6134 ffa7fe5e-494d-0410-b361-a75ebd5db220
-rw-r--r-- | ci/build_android.sh | 5 | ||||
-rw-r--r-- | circle.yml | 4 | ||||
-rw-r--r-- | navit/android/AndroidManifest.xml.cmake | 5 | ||||
-rw-r--r-- | navit/android/AndroidManifest.xml.in | 5 | ||||
-rw-r--r-- | po/fr.po.in | 9 |
5 files changed, 14 insertions, 14 deletions
diff --git a/ci/build_android.sh b/ci/build_android.sh index d524db86f..708b67402 100644 --- a/ci/build_android.sh +++ b/ci/build_android.sh @@ -1,6 +1,4 @@ #!/bin/bash -set -e - red='\e[0;31m' grn='\e[0;32m' yel='\e[1;33m' @@ -36,7 +34,7 @@ export SDK_ADD_FILTER="platform-tool,tools,build-tools-21.0.1,extra-android-m2re export SDK_UPD_FILTER="platform-tool,tools,build-tools-21.0.1,extra-android-m2repository,extra-android-support" -[ -d $ANDROID_HOME ] || mkdir $ANDROID_HOME +mkdir $ANDROID_HOME # If path already has our environment no need to set it if echo "$ANDROID_ENV" | grep -q "$PATH"; then @@ -133,7 +131,6 @@ 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/fr.po.in b/po/fr.po.in index 8b4d7624a..032a00b43 100644 --- a/po/fr.po.in +++ b/po/fr.po.in @@ -22,14 +22,15 @@ # mercier133 https://launchpad.net/~mercierdamien # metehyi https://launchpad.net/~metehyi # pierre https://launchpad.net/~pmghost4 +# quent57 https://launchpad.net/~quent57 # yannick56 https://launchpad.net/~yleny msgid "" msgstr "" "Project-Id-Version: navit 0.5.0\n" "Report-Msgid-Bugs-To: \n" -"PO-Revision-Date: 2015-07-19 03:58+0000\n" -"Last-Translator: Michael von Glasow <Unknown>\n" +"PO-Revision-Date: 2015-08-02 19:54+0000\n" +"Last-Translator: quent57 <quent57@yahoo.fr>\n" "Language-Team: KaZeR <kazer@altern.org>\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -259,10 +260,10 @@ msgid "Merge %1$s%2$s|left" msgstr "" msgid "on your left" -msgstr "" +msgstr "sur votre gauche" msgid "on your right" -msgstr "" +msgstr "sur votre droite" #. TRANSLATORS: the first arg. is exit ref and/or name, the second is the direction of exit and the third is distance #, c-format |