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

Merge remote-tracking branch 'origin/master'

Browse source
This commit is contained in:
Weblate 2017-09-14 12:48:30 +02:00
commit a9aa708a46
3 changed files with 18 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
OsmAnd/res/values-ru/phrases.xml
View file

@ -3499,4 +3499,13 @@
<string name="poi_boat_canoe_rental_rental_yes">Каноэ: да</string>
<string name="poi_boat_canoe_rental_rental_no">Каноэ: нет</string>
<string name="poi_government_archive">Архив</string>
<string name="poi_government_ministry">Министерство</string>
<string name="poi_government_public_service">Государственная служба</string>
<string name="poi_government_social_security">Социальная защита</string>
<string name="poi_government_social_services">Социальные службы</string>
<string name="poi_government_treasury">Казначейство</string>
<string name="poi_government_transportation">Транспортное учреждение</string>
<string name="poi_government_legislative">Законодательное учреждение</string>
</resources>

9
OsmAnd/res/values/phrases.xml
View file

@ -3469,4 +3469,13 @@
<string name="poi_network">Network</string>
<string name="poi_government_archive">Archive</string>
<string name="poi_government_ministry">Ministry</string>
<string name="poi_government_public_service">Public service</string>
<string name="poi_government_social_security">Social security</string>
<string name="poi_government_social_services">Social services</string>
<string name="poi_government_treasury">Treasury</string>
<string name="poi_government_transportation">Transport institution</string>
<string name="poi_government_legislative">Legislative institution</string>
</resources>

9
OsmAnd/src/net/osmand/plus/render/NativeOsmandLibrary.java
View file

@ -35,15 +35,6 @@ public class NativeOsmandLibrary extends NativeLibrary {
try {
log.debug("Loading native gnustl_shared..."); //$NON-NLS-1$
System.loadLibrary("gnustl_shared");
if (android.os.Build.VERSION.SDK_INT >= 8) {
log.debug("Loading jnigraphics, since Android >= 2.2 ..."); //$NON-NLS-1$
try {
System.loadLibrary("jnigraphics");
} catch( UnsatisfiedLinkError e ) {
// handle "Shared library already opened" error
log.debug("Failed to load jnigraphics: " + e); //$NON-NLS-1$
}
}
log.debug("Loading native libraries..."); //$NON-NLS-1$
System.loadLibrary("osmand");
log.debug("Creating NativeOsmandLibrary instance..."); //$NON-NLS-1$