From f207abb2c1631c4183fff529e8a82b230cbc5cb1 Mon Sep 17 00:00:00 2001 From: PavelRatushny Date: Wed, 13 Sep 2017 19:00:44 +0300 Subject: [PATCH 1/2] Remove loading library --- .../src/net/osmand/plus/render/NativeOsmandLibrary.java | 9 --------- 1 file changed, 9 deletions(-) diff --git a/OsmAnd/src/net/osmand/plus/render/NativeOsmandLibrary.java b/OsmAnd/src/net/osmand/plus/render/NativeOsmandLibrary.java index 9f3b32608f..f0e1ed4ae6 100644 --- a/OsmAnd/src/net/osmand/plus/render/NativeOsmandLibrary.java +++ b/OsmAnd/src/net/osmand/plus/render/NativeOsmandLibrary.java @@ -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$ From 70b6eb87ba979b1d4a81fda9e9013b4e7d3856b9 Mon Sep 17 00:00:00 2001 From: xmd5a Date: Wed, 13 Sep 2017 19:05:02 +0300 Subject: [PATCH 2/2] Update phrases --- OsmAnd/res/values-ru/phrases.xml | 9 +++++++++ OsmAnd/res/values/phrases.xml | 9 +++++++++ 2 files changed, 18 insertions(+) diff --git a/OsmAnd/res/values-ru/phrases.xml b/OsmAnd/res/values-ru/phrases.xml index f7c91fa892..36db4c9c33 100644 --- a/OsmAnd/res/values-ru/phrases.xml +++ b/OsmAnd/res/values-ru/phrases.xml @@ -3499,4 +3499,13 @@ Каноэ: да Каноэ: нет + Архив + Министерство + Государственная служба + Социальная защита + Социальные службы + Казначейство + Транспортное учреждение + Законодательное учреждение + diff --git a/OsmAnd/res/values/phrases.xml b/OsmAnd/res/values/phrases.xml index bb602b0966..f8c0deb317 100644 --- a/OsmAnd/res/values/phrases.xml +++ b/OsmAnd/res/values/phrases.xml @@ -3469,4 +3469,13 @@ Network + Archive + Ministry + Public service + Social security + Social services + Treasury + Transport institution + Legislative institution +