Android-builders-club/OsmAnd
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge branch 'master' of github.com:osmandapp/Osmand

Browse source
This commit is contained in:
Victor Shcherb 2015-05-22 19:05:31 +03:00
commit 0acbb5f5f5
2 changed files with 4 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
OsmAnd/jni/Application.mk
View file

@ -2,6 +2,9 @@ APP_STL := gnustl_shared
APP_CPPFLAGS := -std=c++11 -fexceptions -frtti
APP_SHORT_COMMANDS := true
# Specify least supported Android platform version
APP_PLATFORM := android-9
ifeq ($(wildcard $(ANDROID_NDK)/toolchains/*-4.7),)
NDK_TOOLCHAIN_VERSION := 4.8
else

2
OsmAnd/res/values-ca/phrases.xml
View file

@ -713,7 +713,7 @@
<string name="poi_club_veterans">Associació de veterans</string>
<string name="poi_club_linux">Associació d\'usuaris de Linux</string>
<string name="poi_club_history">Associació d\'història</string>
<string name="poi_club_music">Cub musical</string>
<string name="poi_club_music">Club musical</string>
<string name="poi_club_ethnic">Agrupació ètnica</string>
<string name="poi_club_nature">Grup naturalista</string>
<string name="poi_club_photography">Associació fotogràfica</string>