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-01-25 22:31:44 +01:00
commit 5651c54ca4
3 changed files with 10 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
OsmAnd/build.gradle
View file

@ -302,7 +302,7 @@ tasks.withType(JavaCompile) {
repositories { repositories {
ivy { ivy {
name = "OsmAndBinariesIvy" name = "OsmAndBinariesIvy"
url = "http://builder.osmand.net:81" url = "http://builder.osmand.net"
layout "pattern" , { layout "pattern" , {
artifact "ivy/[organisation]/[module]/[revision]/[artifact]-[revision].[ext]" artifact "ivy/[organisation]/[module]/[revision]/[artifact]-[revision].[ext]"
} }

6
OsmAnd/build.xml
View file

@ -17,11 +17,11 @@
<target name="download_resources"> <target name="download_resources">
<get src="http://builder.osmand.net:81/binaries/android/OsmAndCore_wrapper.jar" <get src="http://builder.osmand.net/binaries/android/OsmAndCore_wrapper.jar"
dest="libs/OsmAndCore_wrapper.jar" usetimestamp="true"/> dest="libs/OsmAndCore_wrapper.jar" usetimestamp="true"/>
<get src="http://builder.osmand.net:81/ivy/net.osmand/OsmAndCore_android/0.1-SNAPSHOT/OsmAndCore_android-0.1-SNAPSHOT.aar" <get src="http://builder.osmand.net/ivy/net.osmand/OsmAndCore_android/0.1-SNAPSHOT/OsmAndCore_android-0.1-SNAPSHOT.aar"
dest="OsmAndCore_android.aar" usetimestamp="true"/> dest="OsmAndCore_android.aar" usetimestamp="true"/>
<get src="http://builder.osmand.net:81/ivy/net.osmand/OsmAndCore_androidNativeRelease/0.1-SNAPSHOT/OsmAndCore_androidNativeRelease-0.1-SNAPSHOT.aar" <get src="http://builder.osmand.net/ivy/net.osmand/OsmAndCore_androidNativeRelease/0.1-SNAPSHOT/OsmAndCore_androidNativeRelease-0.1-SNAPSHOT.aar"
dest="OsmAndCore_androidNativeRelease.aar" usetimestamp="true"/> dest="OsmAndCore_androidNativeRelease.aar" usetimestamp="true"/>
</target> </target>

6
OsmAnd/res/values-sc/strings.xml
View file

@ -1833,4 +1833,10 @@ Si cussigiat de annànghere unu o prus puntos intermedios pro megiorare sas pres
<string name="proxy_pref_title">Proxy</string> <string name="proxy_pref_title">Proxy</string>
<string name="proxy_pref_descr">Imposta una cunnessione a ìnternet tramite proxy</string> <string name="proxy_pref_descr">Imposta una cunnessione a ìnternet tramite proxy</string>
<string name="rendering_attr_streetLighting_name">Illuminatzione pùbblica</string> <string name="rendering_attr_streetLighting_name">Illuminatzione pùbblica</string>
<string name="version_settings_descr">Iscàrriga versiones de isvilupu</string>
<string name="version_settings">Versiones</string>
<string name="points">Puntos</string>
<string name="tracks">Rastas</string>
<string name="my_location">Positzione mea</string>
<string name="osm_editing_manage">Gesti</string>
</resources> </resources>