From d8c8132b5e6bff440cfc2e6b4e74c986d4109101 Mon Sep 17 00:00:00 2001 From: GITNE Date: Thu, 15 Mar 2018 17:00:00 +0100 Subject: [PATCH 01/18] Remove executable permission from non-executable files --- .../src/net/osmand/osm/io/OsmBaseStorage.java | 0 OsmAnd/.settings/org.eclipse.jdt.core.prefs | 0 OsmAnd/proguard-project.txt | 0 OsmAnd/res/drawable-hdpi/ic_action_battery.png | Bin OsmAnd/res/drawable-hdpi/map_search_dark.png | Bin OsmAnd/res/drawable-hdpi/map_search_night.png | Bin .../drawable-hdpi/widget_battery_charging_day.png | Bin .../drawable-hdpi/widget_battery_charging_night.png | Bin OsmAnd/res/drawable-hdpi/widget_battery_day.png | Bin OsmAnd/res/drawable-hdpi/widget_battery_night.png | Bin .../drawable-large-hdpi/map_intermediate_point.png | Bin OsmAnd/res/drawable-large-hdpi/map_search_dark.png | Bin OsmAnd/res/drawable-large-hdpi/map_search_night.png | Bin OsmAnd/res/drawable-large-hdpi/map_target_point.png | Bin .../widget_battery_charging_day.png | Bin .../widget_battery_charging_night.png | Bin .../res/drawable-large-hdpi/widget_battery_day.png | Bin .../drawable-large-hdpi/widget_battery_night.png | Bin .../drawable-large-xhdpi/map_intermediate_point.png | Bin OsmAnd/res/drawable-large-xhdpi/map_search_dark.png | Bin .../res/drawable-large-xhdpi/map_search_night.png | Bin .../res/drawable-large-xhdpi/map_target_point.png | Bin .../widget_battery_charging_day.png | Bin .../widget_battery_charging_night.png | Bin .../res/drawable-large-xhdpi/widget_battery_day.png | Bin .../drawable-large-xhdpi/widget_battery_night.png | Bin OsmAnd/res/drawable-large/map_search_dark.png | Bin OsmAnd/res/drawable-large/map_search_night.png | Bin OsmAnd/res/drawable-large/warnings_limit.png | Bin .../drawable-large/widget_battery_charging_day.png | Bin .../widget_battery_charging_night.png | Bin OsmAnd/res/drawable-large/widget_battery_day.png | Bin OsmAnd/res/drawable-large/widget_battery_night.png | Bin .../drawable-mdpi/bg_download_bar_light_grey.9.png | Bin .../bg_download_bar_light_orange.9.png | Bin OsmAnd/res/drawable-mdpi/ic_action_battery.png | Bin OsmAnd/res/drawable-mdpi/ic_action_circle.png | Bin OsmAnd/res/drawable-mdpi/ic_action_label.png | Bin OsmAnd/res/drawable-mdpi/ic_action_wikipedia.png | Bin OsmAnd/res/drawable-mdpi/map_intermediate_point.png | Bin OsmAnd/res/drawable-mdpi/map_search_dark.png | Bin OsmAnd/res/drawable-mdpi/map_search_night.png | Bin OsmAnd/res/drawable-mdpi/map_target_point.png | Bin OsmAnd/res/drawable-mdpi/warnings_limit.png | Bin .../drawable-mdpi/widget_battery_charging_day.png | Bin .../drawable-mdpi/widget_battery_charging_night.png | Bin OsmAnd/res/drawable-mdpi/widget_battery_day.png | Bin OsmAnd/res/drawable-mdpi/widget_battery_night.png | Bin .../widget_monitoring_rec_inactive_day.png | Bin .../widget_monitoring_rec_inactive_night.png | Bin .../drawable-xhdpi/bg_download_bar_light_grey.9.png | Bin .../bg_download_bar_light_orange.9.png | Bin OsmAnd/res/drawable-xhdpi/ic_action_battery.png | Bin OsmAnd/res/drawable-xhdpi/ic_action_circle.png | Bin OsmAnd/res/drawable-xhdpi/ic_action_label.png | Bin OsmAnd/res/drawable-xhdpi/ic_action_wikipedia.png | Bin .../res/drawable-xhdpi/map_intermediate_point.png | Bin OsmAnd/res/drawable-xhdpi/map_search_dark.png | Bin OsmAnd/res/drawable-xhdpi/map_search_night.png | Bin OsmAnd/res/drawable-xhdpi/map_target_point.png | Bin OsmAnd/res/drawable-xhdpi/warnings_limit.png | Bin .../drawable-xhdpi/widget_battery_charging_day.png | Bin .../widget_battery_charging_night.png | Bin OsmAnd/res/drawable-xhdpi/widget_battery_day.png | Bin OsmAnd/res/drawable-xhdpi/widget_battery_night.png | Bin .../widget_monitoring_rec_inactive_day.png | Bin .../widget_monitoring_rec_inactive_night.png | Bin .../bg_download_bar_light_grey.9.png | Bin .../bg_download_bar_light_orange.9.png | Bin OsmAnd/res/drawable-xxhdpi/ic_action_battery.png | Bin OsmAnd/res/drawable-xxhdpi/ic_action_circle.png | Bin OsmAnd/res/drawable-xxhdpi/ic_action_label.png | Bin OsmAnd/res/drawable-xxhdpi/ic_action_wikipedia.png | Bin .../res/drawable-xxhdpi/map_intermediate_point.png | Bin OsmAnd/res/drawable-xxhdpi/map_search_dark.png | Bin OsmAnd/res/drawable-xxhdpi/map_search_night.png | Bin OsmAnd/res/drawable-xxhdpi/warnings_limit.png | Bin .../drawable-xxhdpi/widget_battery_charging_day.png | Bin .../widget_battery_charging_night.png | Bin OsmAnd/res/drawable-xxhdpi/widget_battery_day.png | Bin OsmAnd/res/drawable-xxhdpi/widget_battery_night.png | Bin .../widget_monitoring_rec_inactive_day.png | Bin .../widget_monitoring_rec_inactive_night.png | Bin .../CacheFragmentStatePagerAdapter.java | 0 .../observablescrollview/ObservableGridView.java | 0 .../observablescrollview/ObservableListView.java | 0 .../observablescrollview/ObservableScrollView.java | 0 .../ObservableScrollViewCallbacks.java | 0 .../observablescrollview/ObservableWebView.java | 0 .../android/observablescrollview/ScrollState.java | 0 .../android/observablescrollview/ScrollUtils.java | 0 .../android/observablescrollview/Scrollable.java | 0 .../TouchInterceptionFrameLayout.java | 0 .../res/drawable-hdpi/map_search_dark.png | Bin .../res/drawable-mdpi/map_search_dark.png | Bin .../res/drawable-xhdpi/map_search_dark.png | Bin .../res/drawable-xxhdpi/map_search_dark.png | Bin OsmAndCore-sample/res/layout/activity_main.xml | 0 OsmAndCore-sample/res/mipmap-hdpi/sample_app.png | Bin OsmAndCore-sample/res/mipmap-mdpi/sample_app.png | Bin OsmAndCore-sample/res/mipmap-xhdpi/sample_app.png | Bin OsmAndCore-sample/res/mipmap-xxhdpi/sample_app.png | Bin OsmAndCore-sample/res/mipmap-xxxhdpi/sample_app.png | Bin gradle/wrapper/gradle-wrapper.jar | Bin 104 files changed, 0 insertions(+), 0 deletions(-) mode change 100755 => 100644 OsmAnd-java/src/net/osmand/osm/io/OsmBaseStorage.java mode change 100755 => 100644 OsmAnd/.settings/org.eclipse.jdt.core.prefs mode change 100755 => 100644 OsmAnd/proguard-project.txt mode change 100755 => 100644 OsmAnd/res/drawable-hdpi/ic_action_battery.png mode change 100755 => 100644 OsmAnd/res/drawable-hdpi/map_search_dark.png mode change 100755 => 100644 OsmAnd/res/drawable-hdpi/map_search_night.png mode change 100755 => 100644 OsmAnd/res/drawable-hdpi/widget_battery_charging_day.png mode change 100755 => 100644 OsmAnd/res/drawable-hdpi/widget_battery_charging_night.png mode change 100755 => 100644 OsmAnd/res/drawable-hdpi/widget_battery_day.png mode change 100755 => 100644 OsmAnd/res/drawable-hdpi/widget_battery_night.png mode change 100755 => 100644 OsmAnd/res/drawable-large-hdpi/map_intermediate_point.png mode change 100755 => 100644 OsmAnd/res/drawable-large-hdpi/map_search_dark.png mode change 100755 => 100644 OsmAnd/res/drawable-large-hdpi/map_search_night.png mode change 100755 => 100644 OsmAnd/res/drawable-large-hdpi/map_target_point.png mode change 100755 => 100644 OsmAnd/res/drawable-large-hdpi/widget_battery_charging_day.png mode change 100755 => 100644 OsmAnd/res/drawable-large-hdpi/widget_battery_charging_night.png mode change 100755 => 100644 OsmAnd/res/drawable-large-hdpi/widget_battery_day.png mode change 100755 => 100644 OsmAnd/res/drawable-large-hdpi/widget_battery_night.png mode change 100755 => 100644 OsmAnd/res/drawable-large-xhdpi/map_intermediate_point.png mode change 100755 => 100644 OsmAnd/res/drawable-large-xhdpi/map_search_dark.png mode change 100755 => 100644 OsmAnd/res/drawable-large-xhdpi/map_search_night.png mode change 100755 => 100644 OsmAnd/res/drawable-large-xhdpi/map_target_point.png mode change 100755 => 100644 OsmAnd/res/drawable-large-xhdpi/widget_battery_charging_day.png mode change 100755 => 100644 OsmAnd/res/drawable-large-xhdpi/widget_battery_charging_night.png mode change 100755 => 100644 OsmAnd/res/drawable-large-xhdpi/widget_battery_day.png mode change 100755 => 100644 OsmAnd/res/drawable-large-xhdpi/widget_battery_night.png mode change 100755 => 100644 OsmAnd/res/drawable-large/map_search_dark.png mode change 100755 => 100644 OsmAnd/res/drawable-large/map_search_night.png mode change 100755 => 100644 OsmAnd/res/drawable-large/warnings_limit.png mode change 100755 => 100644 OsmAnd/res/drawable-large/widget_battery_charging_day.png mode change 100755 => 100644 OsmAnd/res/drawable-large/widget_battery_charging_night.png mode change 100755 => 100644 OsmAnd/res/drawable-large/widget_battery_day.png mode change 100755 => 100644 OsmAnd/res/drawable-large/widget_battery_night.png mode change 100755 => 100644 OsmAnd/res/drawable-mdpi/bg_download_bar_light_grey.9.png mode change 100755 => 100644 OsmAnd/res/drawable-mdpi/bg_download_bar_light_orange.9.png mode change 100755 => 100644 OsmAnd/res/drawable-mdpi/ic_action_battery.png mode change 100755 => 100644 OsmAnd/res/drawable-mdpi/ic_action_circle.png mode change 100755 => 100644 OsmAnd/res/drawable-mdpi/ic_action_label.png mode change 100755 => 100644 OsmAnd/res/drawable-mdpi/ic_action_wikipedia.png mode change 100755 => 100644 OsmAnd/res/drawable-mdpi/map_intermediate_point.png mode change 100755 => 100644 OsmAnd/res/drawable-mdpi/map_search_dark.png mode change 100755 => 100644 OsmAnd/res/drawable-mdpi/map_search_night.png mode change 100755 => 100644 OsmAnd/res/drawable-mdpi/map_target_point.png mode change 100755 => 100644 OsmAnd/res/drawable-mdpi/warnings_limit.png mode change 100755 => 100644 OsmAnd/res/drawable-mdpi/widget_battery_charging_day.png mode change 100755 => 100644 OsmAnd/res/drawable-mdpi/widget_battery_charging_night.png mode change 100755 => 100644 OsmAnd/res/drawable-mdpi/widget_battery_day.png mode change 100755 => 100644 OsmAnd/res/drawable-mdpi/widget_battery_night.png mode change 100755 => 100644 OsmAnd/res/drawable-mdpi/widget_monitoring_rec_inactive_day.png mode change 100755 => 100644 OsmAnd/res/drawable-mdpi/widget_monitoring_rec_inactive_night.png mode change 100755 => 100644 OsmAnd/res/drawable-xhdpi/bg_download_bar_light_grey.9.png mode change 100755 => 100644 OsmAnd/res/drawable-xhdpi/bg_download_bar_light_orange.9.png mode change 100755 => 100644 OsmAnd/res/drawable-xhdpi/ic_action_battery.png mode change 100755 => 100644 OsmAnd/res/drawable-xhdpi/ic_action_circle.png mode change 100755 => 100644 OsmAnd/res/drawable-xhdpi/ic_action_label.png mode change 100755 => 100644 OsmAnd/res/drawable-xhdpi/ic_action_wikipedia.png mode change 100755 => 100644 OsmAnd/res/drawable-xhdpi/map_intermediate_point.png mode change 100755 => 100644 OsmAnd/res/drawable-xhdpi/map_search_dark.png mode change 100755 => 100644 OsmAnd/res/drawable-xhdpi/map_search_night.png mode change 100755 => 100644 OsmAnd/res/drawable-xhdpi/map_target_point.png mode change 100755 => 100644 OsmAnd/res/drawable-xhdpi/warnings_limit.png mode change 100755 => 100644 OsmAnd/res/drawable-xhdpi/widget_battery_charging_day.png mode change 100755 => 100644 OsmAnd/res/drawable-xhdpi/widget_battery_charging_night.png mode change 100755 => 100644 OsmAnd/res/drawable-xhdpi/widget_battery_day.png mode change 100755 => 100644 OsmAnd/res/drawable-xhdpi/widget_battery_night.png mode change 100755 => 100644 OsmAnd/res/drawable-xhdpi/widget_monitoring_rec_inactive_day.png mode change 100755 => 100644 OsmAnd/res/drawable-xhdpi/widget_monitoring_rec_inactive_night.png mode change 100755 => 100644 OsmAnd/res/drawable-xxhdpi/bg_download_bar_light_grey.9.png mode change 100755 => 100644 OsmAnd/res/drawable-xxhdpi/bg_download_bar_light_orange.9.png mode change 100755 => 100644 OsmAnd/res/drawable-xxhdpi/ic_action_battery.png mode change 100755 => 100644 OsmAnd/res/drawable-xxhdpi/ic_action_circle.png mode change 100755 => 100644 OsmAnd/res/drawable-xxhdpi/ic_action_label.png mode change 100755 => 100644 OsmAnd/res/drawable-xxhdpi/ic_action_wikipedia.png mode change 100755 => 100644 OsmAnd/res/drawable-xxhdpi/map_intermediate_point.png mode change 100755 => 100644 OsmAnd/res/drawable-xxhdpi/map_search_dark.png mode change 100755 => 100644 OsmAnd/res/drawable-xxhdpi/map_search_night.png mode change 100755 => 100644 OsmAnd/res/drawable-xxhdpi/warnings_limit.png mode change 100755 => 100644 OsmAnd/res/drawable-xxhdpi/widget_battery_charging_day.png mode change 100755 => 100644 OsmAnd/res/drawable-xxhdpi/widget_battery_charging_night.png mode change 100755 => 100644 OsmAnd/res/drawable-xxhdpi/widget_battery_day.png mode change 100755 => 100644 OsmAnd/res/drawable-xxhdpi/widget_battery_night.png mode change 100755 => 100644 OsmAnd/res/drawable-xxhdpi/widget_monitoring_rec_inactive_day.png mode change 100755 => 100644 OsmAnd/res/drawable-xxhdpi/widget_monitoring_rec_inactive_night.png mode change 100755 => 100644 OsmAnd/src/com/github/ksoichiro/android/observablescrollview/CacheFragmentStatePagerAdapter.java mode change 100755 => 100644 OsmAnd/src/com/github/ksoichiro/android/observablescrollview/ObservableGridView.java mode change 100755 => 100644 OsmAnd/src/com/github/ksoichiro/android/observablescrollview/ObservableListView.java mode change 100755 => 100644 OsmAnd/src/com/github/ksoichiro/android/observablescrollview/ObservableScrollView.java mode change 100755 => 100644 OsmAnd/src/com/github/ksoichiro/android/observablescrollview/ObservableScrollViewCallbacks.java mode change 100755 => 100644 OsmAnd/src/com/github/ksoichiro/android/observablescrollview/ObservableWebView.java mode change 100755 => 100644 OsmAnd/src/com/github/ksoichiro/android/observablescrollview/ScrollState.java mode change 100755 => 100644 OsmAnd/src/com/github/ksoichiro/android/observablescrollview/ScrollUtils.java mode change 100755 => 100644 OsmAnd/src/com/github/ksoichiro/android/observablescrollview/Scrollable.java mode change 100755 => 100644 OsmAnd/src/com/github/ksoichiro/android/observablescrollview/TouchInterceptionFrameLayout.java mode change 100755 => 100644 OsmAndCore-sample/res/drawable-hdpi/map_search_dark.png mode change 100755 => 100644 OsmAndCore-sample/res/drawable-mdpi/map_search_dark.png mode change 100755 => 100644 OsmAndCore-sample/res/drawable-xhdpi/map_search_dark.png mode change 100755 => 100644 OsmAndCore-sample/res/drawable-xxhdpi/map_search_dark.png mode change 100755 => 100644 OsmAndCore-sample/res/layout/activity_main.xml mode change 100755 => 100644 OsmAndCore-sample/res/mipmap-hdpi/sample_app.png mode change 100755 => 100644 OsmAndCore-sample/res/mipmap-mdpi/sample_app.png mode change 100755 => 100644 OsmAndCore-sample/res/mipmap-xhdpi/sample_app.png mode change 100755 => 100644 OsmAndCore-sample/res/mipmap-xxhdpi/sample_app.png mode change 100755 => 100644 OsmAndCore-sample/res/mipmap-xxxhdpi/sample_app.png mode change 100755 => 100644 gradle/wrapper/gradle-wrapper.jar diff --git a/OsmAnd-java/src/net/osmand/osm/io/OsmBaseStorage.java b/OsmAnd-java/src/net/osmand/osm/io/OsmBaseStorage.java old mode 100755 new mode 100644 diff --git a/OsmAnd/.settings/org.eclipse.jdt.core.prefs b/OsmAnd/.settings/org.eclipse.jdt.core.prefs old mode 100755 new mode 100644 diff --git a/OsmAnd/proguard-project.txt b/OsmAnd/proguard-project.txt old mode 100755 new mode 100644 diff --git a/OsmAnd/res/drawable-hdpi/ic_action_battery.png b/OsmAnd/res/drawable-hdpi/ic_action_battery.png old mode 100755 new mode 100644 diff --git a/OsmAnd/res/drawable-hdpi/map_search_dark.png b/OsmAnd/res/drawable-hdpi/map_search_dark.png old mode 100755 new mode 100644 diff --git a/OsmAnd/res/drawable-hdpi/map_search_night.png b/OsmAnd/res/drawable-hdpi/map_search_night.png old mode 100755 new mode 100644 diff --git a/OsmAnd/res/drawable-hdpi/widget_battery_charging_day.png b/OsmAnd/res/drawable-hdpi/widget_battery_charging_day.png old mode 100755 new mode 100644 diff --git a/OsmAnd/res/drawable-hdpi/widget_battery_charging_night.png b/OsmAnd/res/drawable-hdpi/widget_battery_charging_night.png old mode 100755 new mode 100644 diff --git a/OsmAnd/res/drawable-hdpi/widget_battery_day.png b/OsmAnd/res/drawable-hdpi/widget_battery_day.png old mode 100755 new mode 100644 diff --git a/OsmAnd/res/drawable-hdpi/widget_battery_night.png b/OsmAnd/res/drawable-hdpi/widget_battery_night.png old mode 100755 new mode 100644 diff --git a/OsmAnd/res/drawable-large-hdpi/map_intermediate_point.png b/OsmAnd/res/drawable-large-hdpi/map_intermediate_point.png old mode 100755 new mode 100644 diff --git a/OsmAnd/res/drawable-large-hdpi/map_search_dark.png b/OsmAnd/res/drawable-large-hdpi/map_search_dark.png old mode 100755 new mode 100644 diff --git a/OsmAnd/res/drawable-large-hdpi/map_search_night.png b/OsmAnd/res/drawable-large-hdpi/map_search_night.png old mode 100755 new mode 100644 diff --git a/OsmAnd/res/drawable-large-hdpi/map_target_point.png b/OsmAnd/res/drawable-large-hdpi/map_target_point.png old mode 100755 new mode 100644 diff --git a/OsmAnd/res/drawable-large-hdpi/widget_battery_charging_day.png b/OsmAnd/res/drawable-large-hdpi/widget_battery_charging_day.png old mode 100755 new mode 100644 diff --git a/OsmAnd/res/drawable-large-hdpi/widget_battery_charging_night.png b/OsmAnd/res/drawable-large-hdpi/widget_battery_charging_night.png old mode 100755 new mode 100644 diff --git a/OsmAnd/res/drawable-large-hdpi/widget_battery_day.png b/OsmAnd/res/drawable-large-hdpi/widget_battery_day.png old mode 100755 new mode 100644 diff --git a/OsmAnd/res/drawable-large-hdpi/widget_battery_night.png b/OsmAnd/res/drawable-large-hdpi/widget_battery_night.png old mode 100755 new mode 100644 diff --git a/OsmAnd/res/drawable-large-xhdpi/map_intermediate_point.png b/OsmAnd/res/drawable-large-xhdpi/map_intermediate_point.png old mode 100755 new mode 100644 diff --git a/OsmAnd/res/drawable-large-xhdpi/map_search_dark.png b/OsmAnd/res/drawable-large-xhdpi/map_search_dark.png old mode 100755 new mode 100644 diff --git a/OsmAnd/res/drawable-large-xhdpi/map_search_night.png b/OsmAnd/res/drawable-large-xhdpi/map_search_night.png old mode 100755 new mode 100644 diff --git a/OsmAnd/res/drawable-large-xhdpi/map_target_point.png b/OsmAnd/res/drawable-large-xhdpi/map_target_point.png old mode 100755 new mode 100644 diff --git a/OsmAnd/res/drawable-large-xhdpi/widget_battery_charging_day.png b/OsmAnd/res/drawable-large-xhdpi/widget_battery_charging_day.png old mode 100755 new mode 100644 diff --git a/OsmAnd/res/drawable-large-xhdpi/widget_battery_charging_night.png b/OsmAnd/res/drawable-large-xhdpi/widget_battery_charging_night.png old mode 100755 new mode 100644 diff --git a/OsmAnd/res/drawable-large-xhdpi/widget_battery_day.png b/OsmAnd/res/drawable-large-xhdpi/widget_battery_day.png old mode 100755 new mode 100644 diff --git a/OsmAnd/res/drawable-large-xhdpi/widget_battery_night.png b/OsmAnd/res/drawable-large-xhdpi/widget_battery_night.png old mode 100755 new mode 100644 diff --git a/OsmAnd/res/drawable-large/map_search_dark.png b/OsmAnd/res/drawable-large/map_search_dark.png old mode 100755 new mode 100644 diff --git a/OsmAnd/res/drawable-large/map_search_night.png b/OsmAnd/res/drawable-large/map_search_night.png old mode 100755 new mode 100644 diff --git a/OsmAnd/res/drawable-large/warnings_limit.png b/OsmAnd/res/drawable-large/warnings_limit.png old mode 100755 new mode 100644 diff --git a/OsmAnd/res/drawable-large/widget_battery_charging_day.png b/OsmAnd/res/drawable-large/widget_battery_charging_day.png old mode 100755 new mode 100644 diff --git a/OsmAnd/res/drawable-large/widget_battery_charging_night.png b/OsmAnd/res/drawable-large/widget_battery_charging_night.png old mode 100755 new mode 100644 diff --git a/OsmAnd/res/drawable-large/widget_battery_day.png b/OsmAnd/res/drawable-large/widget_battery_day.png old mode 100755 new mode 100644 diff --git a/OsmAnd/res/drawable-large/widget_battery_night.png b/OsmAnd/res/drawable-large/widget_battery_night.png old mode 100755 new mode 100644 diff --git a/OsmAnd/res/drawable-mdpi/bg_download_bar_light_grey.9.png b/OsmAnd/res/drawable-mdpi/bg_download_bar_light_grey.9.png old mode 100755 new mode 100644 diff --git a/OsmAnd/res/drawable-mdpi/bg_download_bar_light_orange.9.png b/OsmAnd/res/drawable-mdpi/bg_download_bar_light_orange.9.png old mode 100755 new mode 100644 diff --git a/OsmAnd/res/drawable-mdpi/ic_action_battery.png b/OsmAnd/res/drawable-mdpi/ic_action_battery.png old mode 100755 new mode 100644 diff --git a/OsmAnd/res/drawable-mdpi/ic_action_circle.png b/OsmAnd/res/drawable-mdpi/ic_action_circle.png old mode 100755 new mode 100644 diff --git a/OsmAnd/res/drawable-mdpi/ic_action_label.png b/OsmAnd/res/drawable-mdpi/ic_action_label.png old mode 100755 new mode 100644 diff --git a/OsmAnd/res/drawable-mdpi/ic_action_wikipedia.png b/OsmAnd/res/drawable-mdpi/ic_action_wikipedia.png old mode 100755 new mode 100644 diff --git a/OsmAnd/res/drawable-mdpi/map_intermediate_point.png b/OsmAnd/res/drawable-mdpi/map_intermediate_point.png old mode 100755 new mode 100644 diff --git a/OsmAnd/res/drawable-mdpi/map_search_dark.png b/OsmAnd/res/drawable-mdpi/map_search_dark.png old mode 100755 new mode 100644 diff --git a/OsmAnd/res/drawable-mdpi/map_search_night.png b/OsmAnd/res/drawable-mdpi/map_search_night.png old mode 100755 new mode 100644 diff --git a/OsmAnd/res/drawable-mdpi/map_target_point.png b/OsmAnd/res/drawable-mdpi/map_target_point.png old mode 100755 new mode 100644 diff --git a/OsmAnd/res/drawable-mdpi/warnings_limit.png b/OsmAnd/res/drawable-mdpi/warnings_limit.png old mode 100755 new mode 100644 diff --git a/OsmAnd/res/drawable-mdpi/widget_battery_charging_day.png b/OsmAnd/res/drawable-mdpi/widget_battery_charging_day.png old mode 100755 new mode 100644 diff --git a/OsmAnd/res/drawable-mdpi/widget_battery_charging_night.png b/OsmAnd/res/drawable-mdpi/widget_battery_charging_night.png old mode 100755 new mode 100644 diff --git a/OsmAnd/res/drawable-mdpi/widget_battery_day.png b/OsmAnd/res/drawable-mdpi/widget_battery_day.png old mode 100755 new mode 100644 diff --git a/OsmAnd/res/drawable-mdpi/widget_battery_night.png b/OsmAnd/res/drawable-mdpi/widget_battery_night.png old mode 100755 new mode 100644 diff --git a/OsmAnd/res/drawable-mdpi/widget_monitoring_rec_inactive_day.png b/OsmAnd/res/drawable-mdpi/widget_monitoring_rec_inactive_day.png old mode 100755 new mode 100644 diff --git a/OsmAnd/res/drawable-mdpi/widget_monitoring_rec_inactive_night.png b/OsmAnd/res/drawable-mdpi/widget_monitoring_rec_inactive_night.png old mode 100755 new mode 100644 diff --git a/OsmAnd/res/drawable-xhdpi/bg_download_bar_light_grey.9.png b/OsmAnd/res/drawable-xhdpi/bg_download_bar_light_grey.9.png old mode 100755 new mode 100644 diff --git a/OsmAnd/res/drawable-xhdpi/bg_download_bar_light_orange.9.png b/OsmAnd/res/drawable-xhdpi/bg_download_bar_light_orange.9.png old mode 100755 new mode 100644 diff --git a/OsmAnd/res/drawable-xhdpi/ic_action_battery.png b/OsmAnd/res/drawable-xhdpi/ic_action_battery.png old mode 100755 new mode 100644 diff --git a/OsmAnd/res/drawable-xhdpi/ic_action_circle.png b/OsmAnd/res/drawable-xhdpi/ic_action_circle.png old mode 100755 new mode 100644 diff --git a/OsmAnd/res/drawable-xhdpi/ic_action_label.png b/OsmAnd/res/drawable-xhdpi/ic_action_label.png old mode 100755 new mode 100644 diff --git a/OsmAnd/res/drawable-xhdpi/ic_action_wikipedia.png b/OsmAnd/res/drawable-xhdpi/ic_action_wikipedia.png old mode 100755 new mode 100644 diff --git a/OsmAnd/res/drawable-xhdpi/map_intermediate_point.png b/OsmAnd/res/drawable-xhdpi/map_intermediate_point.png old mode 100755 new mode 100644 diff --git a/OsmAnd/res/drawable-xhdpi/map_search_dark.png b/OsmAnd/res/drawable-xhdpi/map_search_dark.png old mode 100755 new mode 100644 diff --git a/OsmAnd/res/drawable-xhdpi/map_search_night.png b/OsmAnd/res/drawable-xhdpi/map_search_night.png old mode 100755 new mode 100644 diff --git a/OsmAnd/res/drawable-xhdpi/map_target_point.png b/OsmAnd/res/drawable-xhdpi/map_target_point.png old mode 100755 new mode 100644 diff --git a/OsmAnd/res/drawable-xhdpi/warnings_limit.png b/OsmAnd/res/drawable-xhdpi/warnings_limit.png old mode 100755 new mode 100644 diff --git a/OsmAnd/res/drawable-xhdpi/widget_battery_charging_day.png b/OsmAnd/res/drawable-xhdpi/widget_battery_charging_day.png old mode 100755 new mode 100644 diff --git a/OsmAnd/res/drawable-xhdpi/widget_battery_charging_night.png b/OsmAnd/res/drawable-xhdpi/widget_battery_charging_night.png old mode 100755 new mode 100644 diff --git a/OsmAnd/res/drawable-xhdpi/widget_battery_day.png b/OsmAnd/res/drawable-xhdpi/widget_battery_day.png old mode 100755 new mode 100644 diff --git a/OsmAnd/res/drawable-xhdpi/widget_battery_night.png b/OsmAnd/res/drawable-xhdpi/widget_battery_night.png old mode 100755 new mode 100644 diff --git a/OsmAnd/res/drawable-xhdpi/widget_monitoring_rec_inactive_day.png b/OsmAnd/res/drawable-xhdpi/widget_monitoring_rec_inactive_day.png old mode 100755 new mode 100644 diff --git a/OsmAnd/res/drawable-xhdpi/widget_monitoring_rec_inactive_night.png b/OsmAnd/res/drawable-xhdpi/widget_monitoring_rec_inactive_night.png old mode 100755 new mode 100644 diff --git a/OsmAnd/res/drawable-xxhdpi/bg_download_bar_light_grey.9.png b/OsmAnd/res/drawable-xxhdpi/bg_download_bar_light_grey.9.png old mode 100755 new mode 100644 diff --git a/OsmAnd/res/drawable-xxhdpi/bg_download_bar_light_orange.9.png b/OsmAnd/res/drawable-xxhdpi/bg_download_bar_light_orange.9.png old mode 100755 new mode 100644 diff --git a/OsmAnd/res/drawable-xxhdpi/ic_action_battery.png b/OsmAnd/res/drawable-xxhdpi/ic_action_battery.png old mode 100755 new mode 100644 diff --git a/OsmAnd/res/drawable-xxhdpi/ic_action_circle.png b/OsmAnd/res/drawable-xxhdpi/ic_action_circle.png old mode 100755 new mode 100644 diff --git a/OsmAnd/res/drawable-xxhdpi/ic_action_label.png b/OsmAnd/res/drawable-xxhdpi/ic_action_label.png old mode 100755 new mode 100644 diff --git a/OsmAnd/res/drawable-xxhdpi/ic_action_wikipedia.png b/OsmAnd/res/drawable-xxhdpi/ic_action_wikipedia.png old mode 100755 new mode 100644 diff --git a/OsmAnd/res/drawable-xxhdpi/map_intermediate_point.png b/OsmAnd/res/drawable-xxhdpi/map_intermediate_point.png old mode 100755 new mode 100644 diff --git a/OsmAnd/res/drawable-xxhdpi/map_search_dark.png b/OsmAnd/res/drawable-xxhdpi/map_search_dark.png old mode 100755 new mode 100644 diff --git a/OsmAnd/res/drawable-xxhdpi/map_search_night.png b/OsmAnd/res/drawable-xxhdpi/map_search_night.png old mode 100755 new mode 100644 diff --git a/OsmAnd/res/drawable-xxhdpi/warnings_limit.png b/OsmAnd/res/drawable-xxhdpi/warnings_limit.png old mode 100755 new mode 100644 diff --git a/OsmAnd/res/drawable-xxhdpi/widget_battery_charging_day.png b/OsmAnd/res/drawable-xxhdpi/widget_battery_charging_day.png old mode 100755 new mode 100644 diff --git a/OsmAnd/res/drawable-xxhdpi/widget_battery_charging_night.png b/OsmAnd/res/drawable-xxhdpi/widget_battery_charging_night.png old mode 100755 new mode 100644 diff --git a/OsmAnd/res/drawable-xxhdpi/widget_battery_day.png b/OsmAnd/res/drawable-xxhdpi/widget_battery_day.png old mode 100755 new mode 100644 diff --git a/OsmAnd/res/drawable-xxhdpi/widget_battery_night.png b/OsmAnd/res/drawable-xxhdpi/widget_battery_night.png old mode 100755 new mode 100644 diff --git a/OsmAnd/res/drawable-xxhdpi/widget_monitoring_rec_inactive_day.png b/OsmAnd/res/drawable-xxhdpi/widget_monitoring_rec_inactive_day.png old mode 100755 new mode 100644 diff --git a/OsmAnd/res/drawable-xxhdpi/widget_monitoring_rec_inactive_night.png b/OsmAnd/res/drawable-xxhdpi/widget_monitoring_rec_inactive_night.png old mode 100755 new mode 100644 diff --git a/OsmAnd/src/com/github/ksoichiro/android/observablescrollview/CacheFragmentStatePagerAdapter.java b/OsmAnd/src/com/github/ksoichiro/android/observablescrollview/CacheFragmentStatePagerAdapter.java old mode 100755 new mode 100644 diff --git a/OsmAnd/src/com/github/ksoichiro/android/observablescrollview/ObservableGridView.java b/OsmAnd/src/com/github/ksoichiro/android/observablescrollview/ObservableGridView.java old mode 100755 new mode 100644 diff --git a/OsmAnd/src/com/github/ksoichiro/android/observablescrollview/ObservableListView.java b/OsmAnd/src/com/github/ksoichiro/android/observablescrollview/ObservableListView.java old mode 100755 new mode 100644 diff --git a/OsmAnd/src/com/github/ksoichiro/android/observablescrollview/ObservableScrollView.java b/OsmAnd/src/com/github/ksoichiro/android/observablescrollview/ObservableScrollView.java old mode 100755 new mode 100644 diff --git a/OsmAnd/src/com/github/ksoichiro/android/observablescrollview/ObservableScrollViewCallbacks.java b/OsmAnd/src/com/github/ksoichiro/android/observablescrollview/ObservableScrollViewCallbacks.java old mode 100755 new mode 100644 diff --git a/OsmAnd/src/com/github/ksoichiro/android/observablescrollview/ObservableWebView.java b/OsmAnd/src/com/github/ksoichiro/android/observablescrollview/ObservableWebView.java old mode 100755 new mode 100644 diff --git a/OsmAnd/src/com/github/ksoichiro/android/observablescrollview/ScrollState.java b/OsmAnd/src/com/github/ksoichiro/android/observablescrollview/ScrollState.java old mode 100755 new mode 100644 diff --git a/OsmAnd/src/com/github/ksoichiro/android/observablescrollview/ScrollUtils.java b/OsmAnd/src/com/github/ksoichiro/android/observablescrollview/ScrollUtils.java old mode 100755 new mode 100644 diff --git a/OsmAnd/src/com/github/ksoichiro/android/observablescrollview/Scrollable.java b/OsmAnd/src/com/github/ksoichiro/android/observablescrollview/Scrollable.java old mode 100755 new mode 100644 diff --git a/OsmAnd/src/com/github/ksoichiro/android/observablescrollview/TouchInterceptionFrameLayout.java b/OsmAnd/src/com/github/ksoichiro/android/observablescrollview/TouchInterceptionFrameLayout.java old mode 100755 new mode 100644 diff --git a/OsmAndCore-sample/res/drawable-hdpi/map_search_dark.png b/OsmAndCore-sample/res/drawable-hdpi/map_search_dark.png old mode 100755 new mode 100644 diff --git a/OsmAndCore-sample/res/drawable-mdpi/map_search_dark.png b/OsmAndCore-sample/res/drawable-mdpi/map_search_dark.png old mode 100755 new mode 100644 diff --git a/OsmAndCore-sample/res/drawable-xhdpi/map_search_dark.png b/OsmAndCore-sample/res/drawable-xhdpi/map_search_dark.png old mode 100755 new mode 100644 diff --git a/OsmAndCore-sample/res/drawable-xxhdpi/map_search_dark.png b/OsmAndCore-sample/res/drawable-xxhdpi/map_search_dark.png old mode 100755 new mode 100644 diff --git a/OsmAndCore-sample/res/layout/activity_main.xml b/OsmAndCore-sample/res/layout/activity_main.xml old mode 100755 new mode 100644 diff --git a/OsmAndCore-sample/res/mipmap-hdpi/sample_app.png b/OsmAndCore-sample/res/mipmap-hdpi/sample_app.png old mode 100755 new mode 100644 diff --git a/OsmAndCore-sample/res/mipmap-mdpi/sample_app.png b/OsmAndCore-sample/res/mipmap-mdpi/sample_app.png old mode 100755 new mode 100644 diff --git a/OsmAndCore-sample/res/mipmap-xhdpi/sample_app.png b/OsmAndCore-sample/res/mipmap-xhdpi/sample_app.png old mode 100755 new mode 100644 diff --git a/OsmAndCore-sample/res/mipmap-xxhdpi/sample_app.png b/OsmAndCore-sample/res/mipmap-xxhdpi/sample_app.png old mode 100755 new mode 100644 diff --git a/OsmAndCore-sample/res/mipmap-xxxhdpi/sample_app.png b/OsmAndCore-sample/res/mipmap-xxxhdpi/sample_app.png old mode 100755 new mode 100644 diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar old mode 100755 new mode 100644 From e31467827f4ab65a1304ac55e206433538b88d00 Mon Sep 17 00:00:00 2001 From: Chumva Date: Sat, 17 Mar 2018 17:08:12 +0200 Subject: [PATCH 02/18] deleted text lines limit for favourites description row --- .../mapcontextmenu/builders/FavouritePointMenuBuilder.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/OsmAnd/src/net/osmand/plus/mapcontextmenu/builders/FavouritePointMenuBuilder.java b/OsmAnd/src/net/osmand/plus/mapcontextmenu/builders/FavouritePointMenuBuilder.java index 4616d5696f..25d1696e7e 100644 --- a/OsmAnd/src/net/osmand/plus/mapcontextmenu/builders/FavouritePointMenuBuilder.java +++ b/OsmAnd/src/net/osmand/plus/mapcontextmenu/builders/FavouritePointMenuBuilder.java @@ -160,7 +160,6 @@ public class FavouritePointMenuBuilder extends MenuBuilder { } llText.addView(textView); - LinearLayout.LayoutParams llTextViewParams = new LinearLayout.LayoutParams(0, ViewGroup.LayoutParams.WRAP_CONTENT); llTextViewParams.weight = 1f; llTextViewParams.setMargins(0, 0, dpToPx(10f), 0); @@ -175,7 +174,7 @@ public class FavouritePointMenuBuilder extends MenuBuilder { private void buildDescription(View view) { String desc = fav.getDescription(); if (!Algorithms.isEmpty(desc)) { - buildDescriptionRow(view, desc, 0, 5, true); + buildDescriptionRow(view, desc, 0, 0, true); } } From bf7f0424df983152017281c99db73fdaefaacecc Mon Sep 17 00:00:00 2001 From: Chumva Date: Sat, 17 Mar 2018 17:51:10 +0200 Subject: [PATCH 03/18] Remove search by matching poi key name and instead use english translation (preparation for synonyms support) --- .../src/net/osmand/osm/AbstractPoiType.java | 5 ++ .../src/net/osmand/osm/MapPoiTypes.java | 17 +++++++ .../osmand/search/core/SearchCoreFactory.java | 9 ++-- .../src/net/osmand/plus/AppInitializer.java | 46 +++++++++++++++++++ .../android/sample1/SampleApplication.java | 18 ++++++++ 5 files changed, 91 insertions(+), 4 deletions(-) diff --git a/OsmAnd-java/src/net/osmand/osm/AbstractPoiType.java b/OsmAnd-java/src/net/osmand/osm/AbstractPoiType.java index bb5e2ea215..77988f04ae 100644 --- a/OsmAnd-java/src/net/osmand/osm/AbstractPoiType.java +++ b/OsmAnd-java/src/net/osmand/osm/AbstractPoiType.java @@ -69,6 +69,11 @@ public abstract class AbstractPoiType { return registry.getTranslation(this); } + + public String getEnTranslation() { + return registry.getEnTranslation(this); + } + public String getPoiAdditionalCategoryTranslation() { if (poiAdditionalCategory != null) { return registry.getPoiTranslation(poiAdditionalCategory); diff --git a/OsmAnd-java/src/net/osmand/osm/MapPoiTypes.java b/OsmAnd-java/src/net/osmand/osm/MapPoiTypes.java index 83da14f21a..d82b6ae350 100644 --- a/OsmAnd-java/src/net/osmand/osm/MapPoiTypes.java +++ b/OsmAnd-java/src/net/osmand/osm/MapPoiTypes.java @@ -54,6 +54,9 @@ public class MapPoiTypes { String getTranslation(AbstractPoiType type); String getTranslation(String keyName); + String getEnTranslation(AbstractPoiType type); + + String getEnTranslation(String keyName); } public static MapPoiTypes getDefaultNoInit() { @@ -696,6 +699,16 @@ public class MapPoiTypes { } + public String getEnTranslation(AbstractPoiType abstractPoiType) { + if (poiTranslator != null) { + String translation = poiTranslator.getEnTranslation(abstractPoiType); + if (!Algorithms.isEmpty(translation)) { + return translation; + } + } + return getBasePoiName(abstractPoiType); + } + public String getTranslation(AbstractPoiType abstractPoiType) { if (poiTranslator != null) { String translation = poiTranslator.getTranslation(abstractPoiType); @@ -703,6 +716,10 @@ public class MapPoiTypes { return translation; } } + return getBasePoiName(abstractPoiType); + } + + private String getBasePoiName(AbstractPoiType abstractPoiType) { String name = abstractPoiType.getKeyName(); if(name.startsWith("osmand_")) { name = name.substring("osmand_".length()); diff --git a/OsmAnd-java/src/net/osmand/search/core/SearchCoreFactory.java b/OsmAnd-java/src/net/osmand/search/core/SearchCoreFactory.java index aeb04761a0..6d8d227193 100644 --- a/OsmAnd-java/src/net/osmand/search/core/SearchCoreFactory.java +++ b/OsmAnd-java/src/net/osmand/search/core/SearchCoreFactory.java @@ -616,13 +616,13 @@ public class SearchCoreFactory { List results = new ArrayList() ; NameStringMatcher nm = phrase.getNameStringMatcher(); for (PoiFilter pf : topVisibleFilters) { - if (!phrase.isUnknownSearchWordPresent() || nm.matches(pf.getTranslation())) { + if (!phrase.isUnknownSearchWordPresent() || nm.matches(pf.getTranslation()) || nm.matches(pf.getEnTranslation())) { results.add(pf); } } if (phrase.isUnknownSearchWordPresent()) { for (PoiCategory c : categories) { - if (!results.contains(c) && nm.matches(c.getTranslation())) { + if (!results.contains(c) && (nm.matches(c.getTranslation()) || nm.matches(c.getEnTranslation()) ) ) { results.add(c); } } @@ -631,13 +631,14 @@ public class SearchCoreFactory { Entry e = it.next(); PoiType pt = e.getValue(); if (pt.getCategory() != types.getOtherMapCategory()) { - if (!results.contains(pt) && (nm.matches(e.getKey()) || nm.matches(pt.getTranslation()))) { + if (!results.contains(pt) && ( nm.matches(pt.getEnTranslation()) || nm.matches(pt.getTranslation()) )) { results.add(pt); } List additionals = pt.getPoiAdditionals(); if (additionals != null) { for (PoiType a : additionals) { - if (!a.isReference() && !results.contains(a) && (nm.matches(a.getKeyName().replace('_', ' ')) || nm.matches(a.getTranslation()))) { + if (!a.isReference() && !results.contains(a) && + ( nm.matches(a.getEnTranslation()) || nm.matches(a.getTranslation()) )) { results.add(a); } } diff --git a/OsmAnd/src/net/osmand/plus/AppInitializer.java b/OsmAnd/src/net/osmand/plus/AppInitializer.java index 4a0b65cc15..3cfba9db6f 100644 --- a/OsmAnd/src/net/osmand/plus/AppInitializer.java +++ b/OsmAnd/src/net/osmand/plus/AppInitializer.java @@ -9,7 +9,11 @@ import android.content.Context; import android.content.DialogInterface; import android.content.Intent; import android.content.SharedPreferences; +import android.content.res.Configuration; +import android.content.res.Resources; +import android.os.Build; import android.support.v7.app.AlertDialog; +import android.util.DisplayMetrics; import net.osmand.IProgress; import net.osmand.IndexConstants; @@ -58,6 +62,7 @@ import java.io.IOException; import java.lang.reflect.Field; import java.util.ArrayList; import java.util.List; +import java.util.Locale; import java.util.Random; import btools.routingapp.BRouterServiceConnection; @@ -306,6 +311,17 @@ public class AppInitializer implements IProgress { } } + Resources getLocalizedResources(String loc) { + if(Build.VERSION.SDK_INT < 17) { + return null; + } + Locale desiredLocale = new Locale(loc); + Configuration conf = app.getResources().getConfiguration(); + conf = new Configuration(conf); + conf.setLocale(desiredLocale); + Context localizedContext = app.createConfigurationContext(conf); + return localizedContext.getResources(); + } private void initPoiTypes() { if(app.getAppPath("poi_types.xml").exists()) { @@ -313,6 +329,9 @@ public class AppInitializer implements IProgress { } else { app.poiTypes.init(); } + + final Resources en = getLocalizedResources("en"); + app.poiTypes.setPoiTranslator(new MapPoiTypes.PoiTranslator() { @@ -337,6 +356,33 @@ public class AppInitializer implements IProgress { } return null; } + + @Override + public String getEnTranslation(AbstractPoiType type) { + if(type.getBaseLangType() != null) { + return getEnTranslation(type.getBaseLangType()) + " (" + app.getLangTranslation(type.getLang()).toLowerCase() +")"; + } + return getEnTranslation(type.getIconKeyName()); + } + + + @Override + public String getEnTranslation(String keyName) { + if(en == null) { + return Algorithms.capitalizeFirstLetter( + keyName.replace('_', ' ')); + } + try { + Field f = R.string.class.getField("poi_" + keyName); + if (f != null) { + Integer in = (Integer) f.get(null); + return en.getString(in); + } + } catch (Exception e) { + LOG.debug("No translation for "+ keyName + " " + e.getMessage()); + } + return null; + } }); } diff --git a/OsmAndCore-sample/src/net/osmand/core/samples/android/sample1/SampleApplication.java b/OsmAndCore-sample/src/net/osmand/core/samples/android/sample1/SampleApplication.java index 2b6a51d859..368f6dac5f 100644 --- a/OsmAndCore-sample/src/net/osmand/core/samples/android/sample1/SampleApplication.java +++ b/OsmAndCore-sample/src/net/osmand/core/samples/android/sample1/SampleApplication.java @@ -212,6 +212,24 @@ public class SampleApplication extends Application { public String getTranslation(String keyName) { return null; } + + + @Override + public String getEnTranslation(AbstractPoiType type) { + if(type.getBaseLangType() != null) { + return getEnTranslation(type.getBaseLangType()) + " (" + getLangTranslation(type.getLang()).toLowerCase() +")"; + } + return getEnTranslation(type.getIconKeyName()); + } + + + @Override + public String getEnTranslation(String keyName) { + return Algorithms.capitalizeFirstLetter( + keyName.replace('_', ' ')); + + } + }); searchUICore.initSearchUICore(); From 7a1bd48ed1d1f39933a8d739d9f5ca7c458da430 Mon Sep 17 00:00:00 2001 From: ezjerry liao Date: Sat, 17 Mar 2018 16:10:31 +0000 Subject: [PATCH 04/18] Translated using Weblate (Chinese (Traditional)) Currently translated at 100.0% (3427 of 3427 strings) --- OsmAnd/res/values-zh-rTW/phrases.xml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/OsmAnd/res/values-zh-rTW/phrases.xml b/OsmAnd/res/values-zh-rTW/phrases.xml index 47bc04bfc6..6764560228 100644 --- a/OsmAnd/res/values-zh-rTW/phrases.xml +++ b/OsmAnd/res/values-zh-rTW/phrases.xml @@ -3816,4 +3816,6 @@ 商店的送貨點 +烤肉架：是的 + From 2eaf97b5bc6c30b6bf8559ff914f72a123c15b17 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Piotr=20Sok=C3=B3=C5=82?= Date: Sat, 17 Mar 2018 09:09:15 +0000 Subject: [PATCH 05/18] Translated using Weblate (Polish) Currently translated at 99.2% (2484 of 2504 strings) --- OsmAnd/res/values-pl/strings.xml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/OsmAnd/res/values-pl/strings.xml b/OsmAnd/res/values-pl/strings.xml index 69860a22af..c25366322c 100644 --- a/OsmAnd/res/values-pl/strings.xml +++ b/OsmAnd/res/values-pl/strings.xml @@ -1,4 +1,5 @@ - + + Przezroczysty styl To urządzenie nie obsługuje biblioteki renderowania natywnego. @@ -3030,4 +3031,5 @@ Reprezentuje obszar: %1$s x %2$s Możesz importować grupy z ulubionych lub tras punktów jako markery. Sporty spływowe Usunięto grupę + Wyczyść wszystkie punkty pośrednie From 70a08254cc9ced73e9d81845dab17e613007bed7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pavel=20Kotr=C4=8D?= Date: Sat, 17 Mar 2018 12:55:46 +0000 Subject: [PATCH 06/18] Translated using Weblate (Czech) Currently translated at 93.9% (3220 of 3427 strings) --- OsmAnd/res/values-cs/phrases.xml | 78 +++++++++++++++++++++++++++++++- 1 file changed, 77 insertions(+), 1 deletion(-) diff --git a/OsmAnd/res/values-cs/phrases.xml b/OsmAnd/res/values-cs/phrases.xml index dbfd97ccb1..38054209b7 100644 --- a/OsmAnd/res/values-cs/phrases.xml +++ b/OsmAnd/res/values-cs/phrases.xml @@ -3499,4 +3499,80 @@ Čištění vody Přístup k místu s vodou - +Lezecký styl + Zásuvka + CHAdeMO + Typ 2 + Typ 2 kombinovaný + Typ 3 + CEE blue + Schuko + +Zdymadlo + Podjezdná výška + Podjezdná výška (uzavřeno) + Podjezdná výška (otevřeno) + Šířka plavební dráhy + + Metro + + Šavarma + Gyudon + Tapas + Heuriger + Buschenschank + Bagel + Soba + Delikatesy + Suki + Udon + Bistro + Yakitori + Cidrerie + Pita + Fondue + Pastel + Terijaki + Šavarma + + Tex-mex + Party potřeby + Pačinko + Chopper + Dualsport + Vodní skútry: ano + Vodní skútry: ne + Rokle + Horská oblast + + Antuka + Tartan + Umělý trávník + DecoTurf + Kovový rošt + + Umístění: pod zemí + Umístění: pod vodou + Umístění: u země + Umístění: nad zemí + Umístění: na střeše + Umístění: na střeše + Umístění: venku + Umístění: uvnitř + Umístění: námořní plošina + Umístění: schránka + Umístění: na mostě + Umístění: na zdi + Umístění: vstup + + Viditelnost: z chodníku + Viditelnost: z ulice + Viditelnost: z dálky + + Otevřeno + Zavřeno + Omezeno + Nefunkční + Vyžaduje údržbu + + From ce6fd4067ef1619ea576019aea63923ef2a356b3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sveinn=20=C3=AD=20Felli?= Date: Sat, 17 Mar 2018 11:53:12 +0000 Subject: [PATCH 07/18] Translated using Weblate (Icelandic) Currently translated at 98.3% (3372 of 3427 strings) --- OsmAnd/res/values-is/phrases.xml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/OsmAnd/res/values-is/phrases.xml b/OsmAnd/res/values-is/phrases.xml index e15f2bf552..ada26dbb64 100644 --- a/OsmAnd/res/values-is/phrases.xml +++ b/OsmAnd/res/values-is/phrases.xml @@ -3714,4 +3714,6 @@ Afhendingarstaður verslunar +Steikingargrill: já + From c78a4feaaa4235af9eae0ba7df85fa5e2dc2a183 Mon Sep 17 00:00:00 2001 From: Viktar Vauchkevich Date: Sat, 17 Mar 2018 16:54:07 +0000 Subject: [PATCH 08/18] Translated using Weblate (Belarusian) Currently translated at 100.0% (3427 of 3427 strings) --- OsmAnd/res/values-be/phrases.xml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/OsmAnd/res/values-be/phrases.xml b/OsmAnd/res/values-be/phrases.xml index b1407973d9..9f0780aeff 100644 --- a/OsmAnd/res/values-be/phrases.xml +++ b/OsmAnd/res/values-be/phrases.xml @@ -3826,4 +3826,6 @@ Пункт дастаўкі замоў +Мангал: так + From c79e446dbc5d021193005a280e399ae77580f035 Mon Sep 17 00:00:00 2001 From: Franco Date: Sat, 17 Mar 2018 17:05:29 +0000 Subject: [PATCH 09/18] Translated using Weblate (Spanish (Argentina)) Currently translated at 100.0% (2504 of 2504 strings) --- OsmAnd/res/values-es-rAR/strings.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/OsmAnd/res/values-es-rAR/strings.xml b/OsmAnd/res/values-es-rAR/strings.xml index b7e2cfc6cb..0094b0006a 100644 --- a/OsmAnd/res/values-es-rAR/strings.xml +++ b/OsmAnd/res/values-es-rAR/strings.xml @@ -1905,7 +1905,7 @@ Tanto la ubicación como el tiempo del estacionamiento se muestran en el menú p Error: no se cerró la nota de OSM Confirmar - ¿Quieres borrar el punto GPX de referencia? + ¿Quieres borrar el punto GPX? Editar punto GPX Color del GPX Ancho del GPX From 2e6fc0bf2a41eb45cdb75e5fe11716d5238a8dae Mon Sep 17 00:00:00 2001 From: Franco Date: Sat, 17 Mar 2018 17:12:44 +0000 Subject: [PATCH 10/18] Translated using Weblate (Spanish (American)) Currently translated at 100.0% (3427 of 3427 strings) --- OsmAnd/res/values-es-rUS/phrases.xml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/OsmAnd/res/values-es-rUS/phrases.xml b/OsmAnd/res/values-es-rUS/phrases.xml index 508b330947..8cc0c4334f 100644 --- a/OsmAnd/res/values-es-rUS/phrases.xml +++ b/OsmAnd/res/values-es-rUS/phrases.xml @@ -3595,4 +3595,10 @@ Venta de pisos Alfarería +Nombre de los rápidos del río + + Punto de entrega de la tienda + + Parrilla de barbacoa: sí + From 3d9d884748b7e21ea772bb2841b47ff036da66e9 Mon Sep 17 00:00:00 2001 From: Franco Date: Sat, 17 Mar 2018 17:19:40 +0000 Subject: [PATCH 11/18] Translated using Weblate (Spanish (Argentina)) Currently translated at 100.0% (3427 of 3427 strings) --- OsmAnd/res/values-es-rAR/phrases.xml | 206 ++++++++++++++------------- 1 file changed, 104 insertions(+), 102 deletions(-) diff --git a/OsmAnd/res/values-es-rAR/phrases.xml b/OsmAnd/res/values-es-rAR/phrases.xml index b6addaddff..ba945233d8 100644 --- a/OsmAnd/res/values-es-rAR/phrases.xml +++ b/OsmAnd/res/values-es-rAR/phrases.xml @@ -1024,7 +1024,7 @@ Duchas Sí No - Supervisado: Sí + Supervisado: sí Supervisado: No Sí No @@ -1225,7 +1225,7 @@ Rural Asientos - Respaldo: Sí + Respaldo: sí Respaldo: No Intermitente @@ -1378,12 +1378,12 @@ Sí Lugares para discapacitados: No Lugares para discapacitados - Lugares para mujeres: Sí + Lugares para mujeres: sí Lugares para mujeres: No Lugares para mujeres Lugares para estudiantes Lugares para profesores - Lugares para padres: Sí + Lugares para padres: sí Lugares para padres: No Lugares para padres @@ -1422,7 +1422,7 @@ Albergue transitorio -Conexión a Internet: Sí +Conexión a Internet: sí Conexión a Internet: No Monedas @@ -1604,12 +1604,12 @@ Sí Cerveza artesanal: No - Comida para llevar: Sí + Comida para llevar: sí Comida para llevar: No Comida para llevar: Únicamente Servicio a domicilio: No - Servicio a domicilio: Sí + Servicio a domicilio: sí Servicio a domicilio: Únicamente Asientos exteriores: Si @@ -1622,7 +1622,7 @@ Sí - Artículos usados: Sí + Artículos usados: sí Artículos usados: No Artículos usados: Únicamente @@ -1645,17 +1645,17 @@ Femenino Mujeres: Prohibido Cubierto (interior) - Al aire libre: Sí + Al aire libre: sí Sí Baños: No - Baños para personas en sillas de rueda: Sí + Baños para personas en sillas de rueda: sí Baños para personas en sillas de rueda: No Acceso a los baños: Clientes Acceso a los baños: Permisivo Acceso a los baños: Comunidad Acceso a los baños: Público - Cambiador de pañales: Sí + Cambiador de pañales: sí Cambiador de pañales: No Habitación para cambio de pañales @@ -1792,7 +1792,7 @@ Sí Bancos (asientos): No - Cesto de basura: Sí + Cesto de basura: sí Cesto de basura: No Transporte público @@ -1891,7 +1891,7 @@ Tipo de puente móvil: Transportador Tipo de puente móvil: Retráctil -Iluminado: Sí +Iluminado: sí Iluminado: No Superficie: Sin pavimento @@ -1932,8 +1932,8 @@ Estructura del puente: Madera simple Objeto histórico - Vigilancia: Sí - Con tienda: Sí + Vigilancia: sí + Con tienda: sí Venta Venden bicicletas: No @@ -2001,7 +2001,7 @@ Miel - Ascensor: Sí + Ascensor: sí Ascensor: No Monumento técnico @@ -2126,11 +2126,11 @@ No Sí Campamento scout: No - Sólo para grupos: Sí + Sólo para grupos: sí Sólo para grupos: No Sí Lavarropas: No - Ducha: Sí + Ducha: sí Ducha: No Ducha: caliente Ducha: exterior @@ -2138,9 +2138,9 @@ Ducha: interior Sí Casas rodante: No - Improvisado: Sí + Improvisado: sí Improvisado: No - Estación de descarga sanitaria: Sí + Estación de descarga sanitaria: sí Estación de descarga sanitaria: No Estación de descarga sanitaria sólo para clientes Sí @@ -2208,17 +2208,17 @@ Descripción para sordos Escalera - Barandilla: Sí + Barandilla: sí Barandilla: No - Rampa: Sí + Rampa: sí Rampa: No - Rampa para sillas de rueda: Sí + Rampa para sillas de rueda: sí Rampa para sillas de rueda: No - Rampa para cochecitos: Sí + Rampa para cochecitos: sí Rampa para cochecitos: No - Rampa para bicicletas: Sí + Rampa para bicicletas: sí Rampa para bicicletas: No - Rampa para equipajes: Sí + Rampa para equipajes: sí Rampa para equipajes: No Cantidad de escalones Estado de los escalones: Buena @@ -2229,7 +2229,7 @@ Decoración de la fachada Desfibrilador - Desfibrilador: Sí + Desfibrilador: sí Tipo: Guerra Tipo: Túmulo @@ -2385,7 +2385,7 @@ Escultor Cruz - Cumbre a la cruz: Sí + Cumbre a la cruz: sí Ex campo de prisioneros Tipo: Campo de concentración @@ -2395,14 +2395,14 @@ Tipo: Gulag Temperatura - Bañarse: Sí + Bañarse: sí Bañarse: No Calzada dividida Guardería náutica -Transportadora: Sí +Transportadora: sí Referencia del puente Referencia del túnel @@ -2487,7 +2487,7 @@ Longitud -Conexión a Internet: Sí +Conexión a Internet: sí Médico general Oftalmología @@ -2568,9 +2568,9 @@ Billar -Horno de microondas: Sí +Horno de microondas: sí Horno de microondas: No - Calentador de agua: Sí + Calentador de agua: sí Calentador de agua: No En superficie @@ -2610,13 +2610,13 @@ Inscripción: NE En construcción - Cajero automático: Sí + Cajero automático: sí Cajero automático: No Lugar para fogata Gabinete exterior -Comercio justo: Sí +Comercio justo: sí Comercio justo: No Sólo productos de comercio justo @@ -2688,7 +2688,7 @@ Estación de reparación para bicicletas Canilla pública -Activado por botón: Sí +Activado por botón: sí Activado por botón: No Despegue @@ -2713,7 +2713,7 @@ Orientación del sitio en vuelo libre: O Orientación del sitio en vuelo libre: NO Sin horario de vuelo (vuelo libre) - Directrices de invitado: Sí + Directrices de invitado: sí Directrices de invitado: No Centro de bronceado (solárium) @@ -2788,80 +2788,80 @@ Rol del trabajador en salud: Técnico Rol del trabajador en salud: Brujo/a - Asesoría (adicción): Sí + Asesoría (adicción): sí Asesoría (adicción): No - Asesoría (prenatal): Sí + Asesoría (prenatal): sí Asesoría (prenatal): No - Asesoría (orientación infantil): Sí + Asesoría (orientación infantil): sí Asesoría (orientación infantil): No - Asesoría (pareja): Sí + Asesoría (pareja): sí Asesoría (pareja): No - Asesoría (crisis): Sí + Asesoría (crisis): sí Asesoría (crisis): No - Asesoría (drogas): Sí + Asesoría (drogas): sí Asesoría (drogas): No - Asesoría (educación): Sí + Asesoría (educación): sí Asesoría (educación): No - Asesoría (familiar): Sí + Asesoría (familiar): sí Asesoría (familiar): No - Asesoría (sin hogar): Sí + Asesoría (sin hogar): sí Asesoría (sin hogar): No - Asesoría (inmigrantes): Sí + Asesoría (inmigrantes): sí Asesoría (inmigrantes): No - Asesoría (matrimonio): Sí + Asesoría (matrimonio): sí Asesoría (matrimonio): No - Asesoría (nutrición): Sí + Asesoría (nutrición): sí Asesoramiento (nutrición): No - Asesoría (rehabilitación): Sí + Asesoría (rehabilitación): sí Asesoría (rehabilitación): No - Asesoría (sexual): Sí + Asesoría (sexual): sí Asesoría (sexual): No - Asesoría (abuso sexual): Sí + Asesoría (abuso sexual): sí Asesoría (abuso sexual): No - Asesoría (víctimas): Sí + Asesoría (víctimas): sí Asesoría (víctimas): No - Asesoría (violencia): Sí + Asesoría (violencia): sí Asesoría (violencia): No Rol del trabajador en salud: Psicólogo/a - Provisto para bebés: Sí + Provisto para bebés: sí Provisto para bebés: No - Provisto para niños pequeños: Sí + Provisto para niños pequeños: sí Provisto para niños pequeños: No - Provisto para niños: Sí + Provisto para niños: sí Provisto para niños: No - Provisto para adultos: Sí + Provisto para adultos: sí Provisto para adultos: No - Provisto para mujeres: Sí + Provisto para mujeres: sí Provisto para mujeres: No - Provisto para adultos mayores: Sí + Provisto para adultos mayores: sí Provisto para adultos mayores: No - Provisto para chicas: Sí + Provisto para chicas: sí Provisto para chicas: No - Provisto para hombres: Sí + Provisto para hombres: sí Provisto para hombres: No - Provisto para chicos: Sí + Provisto para chicos: sí Provisto para chicos: No Capacidad (camas) - Servicios para pacientes: Sí + Servicios para pacientes: sí Servicios para pacientes: No Servicios para pacientes: Únicamente - Asesoría: Sí + Asesoría: sí Asesoría: No - Emergencias: Sí + Emergencias: sí Emergencias: No Sí Visitas domiciliarias: No - Malaria: Sí + Malaria: sí Malaria: No - Ébola: Sí + Ébola: sí Ébola: No - Autismo: Sí + Autismo: sí Autismo: No - SIDA: Sí + SIDA: sí SIDA: No Consultorio médico @@ -2887,7 +2887,7 @@ Estanque Arroyo Cisterna - En servicio: Sí + En servicio: sí Estilo de hidrante: wsh Tipo de gabinete: Energía @@ -2907,7 +2907,7 @@ Profundidad -Salado: Sí +Salado: sí Salado: No Designado Escombrera @@ -2919,7 +2919,7 @@ Activación del cruce: Local Activación del cruce: Remota Cruce de barreras: No - Cruce de barreras: Sí + Cruce de barreras: sí Cruce de barreras: Completas Cruce de barreras: Semi-barreras Cruce de barreras: Semi-barreras dobles @@ -2994,7 +2994,7 @@ Estación de bombeo - Pantalla: Sí + Pantalla: sí Pantalla: No Pantalla análoga Pantalla digital @@ -3020,7 +3020,7 @@ Soporte: Techo Soporte: Torre - Pantalla de información para pasajeros: Sí + Pantalla de información para pasajeros: sí Pantalla de información para pasajeros: No Acuicultura @@ -3401,7 +3401,7 @@ Sí - Vino: Sí + Vino: sí Vino: venta Vino: servido @@ -3436,7 +3436,7 @@ Ventas Venden motocicletas: No - Venden motocicletas: Sí; usadas + Venden motocicletas: sí; usadas Venden motocicletas: usadas Alquiler Alquilan motocicletas: No @@ -3501,11 +3501,11 @@ Dirección: Salida Dirección: Todas -Refugio del invierno: Sí +Refugio del invierno: sí Refugio del invierno: No Reservación: Requerida Reservación: Recomendada - Reservación: Sí + Reservación: sí Reservación: No Reservación: Sólo miembros @@ -3514,21 +3514,21 @@ Barcos de alquiler Alquiler de barcos - Lanchas de motor: Sí + Lanchas de motor: sí Lanchas de motor: No - Casas flotantes: Sí + Casas flotantes: sí Casas flotantes: No - Barcos a pedal: Sí + Barcos a pedal: sí Barcos a pedal: No - Motos de agua: Sí + Motos de agua: sí Motos de agua: No - Veleros: Sí + Veleros: sí Veleros: No - Botes: Sí + Botes: sí Botes: No - Kayaks: Sí + Kayaks: sí Kayaks: No - Canoas: Sí + Canoas: sí Canoas: No Red @@ -3673,16 +3673,16 @@ Enchufe: AS/NZS 3112: corriente Enchufe: AS/NZS 3112: salida - Automóvil: Sí + Automóvil: sí Automóvil: No - Bicicleta: Sí + Bicicleta: sí Bicicleta: No - Motoneta (scooter): Sí + Motoneta (scooter): sí Motoneta (scooter): No - Camión: Sí + Camión: sí Camión: No - Tarifa de estacionamiento: Sí + Tarifa de estacionamiento: sí Tarifa de estacionamiento: No Tarifa de estacionamiento @@ -3715,21 +3715,21 @@ Código postal - Deportiva: Sí + Deportiva: sí Deportiva: No - Escalada en bloque: Sí + Escalada en bloque: sí Escalada en bloque: No - Moulinette: Sí + Moulinette: sí Moulinette: No - Tradicional: Sí + Tradicional: sí Tradicional: No - Rutas multipaso: Sí + Rutas multipaso: sí Rutas multipaso: No - Hielo: Sí + Hielo: sí Hielo: No - Mixto: Sí + Mixto: sí Mixto: No - Psicobloc: Sí + Psicobloc: sí Psicobloc: No Longitud de escalada @@ -3743,7 +3743,7 @@ Escalada en roca: Pórfido Calidad de la escalada: Sólido Calidad de la escalada: Frágil - Anclajes fijos: Sí + Anclajes fijos: sí Anclajes fijos: No Orientación del muro: N Orientación del muro: NE @@ -3753,7 +3753,7 @@ Orientación del muro: SO Orientación del muro: O Orientación del muro: NO - Registro de la escalada en la cumbre: Sí + Registro de la escalada en la cumbre: sí Registro de la escalada en la cumbre: No Rutas de escalada @@ -3840,4 +3840,6 @@ Punto de entrega de la tienda +Parrilla de barbacoa: sí + From 79442ecf7c2a329c452b0b59b1a4ec7e294e869d Mon Sep 17 00:00:00 2001 From: FTno Date: Sun, 18 Mar 2018 10:44:11 +0000 Subject: [PATCH 12/18] =?UTF-8?q?Translated=20using=20Weblate=20(Norwegian?= =?UTF-8?q?=20Bokm=C3=A5l)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Currently translated at 96.2% (2409 of 2504 strings) --- OsmAnd/res/values-nb/strings.xml | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/OsmAnd/res/values-nb/strings.xml b/OsmAnd/res/values-nb/strings.xml index 10cbdc18b6..bd12954f13 100644 --- a/OsmAnd/res/values-nb/strings.xml +++ b/OsmAnd/res/values-nb/strings.xml @@ -1,4 +1,5 @@ - + + Velg fargeskjema for veier: Veifargeskjema Vis retning til målet @@ -2757,4 +2758,6 @@ V S N - \ No newline at end of file + Slett alle mellomliggende punkter + Gruppe slettet + From 63725064e83f210784488c8f57661074527867d2 Mon Sep 17 00:00:00 2001 From: Verdulo Date: Sun, 18 Mar 2018 12:58:30 +0000 Subject: [PATCH 13/18] Translated using Weblate (Esperanto) Currently translated at 100.0% (3427 of 3427 strings) --- OsmAnd/res/values-eo/phrases.xml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/OsmAnd/res/values-eo/phrases.xml b/OsmAnd/res/values-eo/phrases.xml index f14e540854..106f99fb06 100644 --- a/OsmAnd/res/values-eo/phrases.xml +++ b/OsmAnd/res/values-eo/phrases.xml @@ -3794,4 +3794,6 @@ Ricevejo de aĉetaĵoj +Rostigilo: jes + From 5a8e0940fe82aaf4ecdf35a3dd46109593af2674 Mon Sep 17 00:00:00 2001 From: ezjerry liao Date: Sat, 17 Mar 2018 16:13:27 +0000 Subject: [PATCH 14/18] Translated using Weblate (Chinese (Traditional)) Currently translated at 100.0% (3427 of 3427 strings) --- OsmAnd/res/values-zh-rTW/phrases.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/OsmAnd/res/values-zh-rTW/phrases.xml b/OsmAnd/res/values-zh-rTW/phrases.xml index 6764560228..c14c42fa7f 100644 --- a/OsmAnd/res/values-zh-rTW/phrases.xml +++ b/OsmAnd/res/values-zh-rTW/phrases.xml @@ -622,7 +622,7 @@ 酒館 美食街 飲用水 - 燒烤 + 烤肉 農用引擎 籃筐製造商 @@ -3218,7 +3218,7 @@ 壽司 炸魚和薯條 海鮮 - 燒烤 + 烤肉 麵 甜甜圈 拉麵 From b9c72ec28de2b2746b8405a8a497e4a09fab4497 Mon Sep 17 00:00:00 2001 From: Ettore Atalan Date: Sun, 18 Mar 2018 23:19:50 +0000 Subject: [PATCH 15/18] Translated using Weblate (German) Currently translated at 100.0% (3427 of 3427 strings) --- OsmAnd/res/values-de/phrases.xml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/OsmAnd/res/values-de/phrases.xml b/OsmAnd/res/values-de/phrases.xml index 695385a1b8..e073f29d1a 100644 --- a/OsmAnd/res/values-de/phrases.xml +++ b/OsmAnd/res/values-de/phrases.xml @@ -3784,4 +3784,8 @@ Name der Stromschnellen +Anlieferungsstelle des Geschäftes + + Barbecue-Grill: ja + From 6981321b943169b2b82eabaf6572277730d7fbb9 Mon Sep 17 00:00:00 2001 From: Ettore Atalan Date: Sun, 18 Mar 2018 23:20:25 +0000 Subject: [PATCH 16/18] Translated using Weblate (German) Currently translated at 100.0% (2504 of 2504 strings) --- OsmAnd/res/values-de/strings.xml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/OsmAnd/res/values-de/strings.xml b/OsmAnd/res/values-de/strings.xml index af4fcae355..29176356ac 100644 --- a/OsmAnd/res/values-de/strings.xml +++ b/OsmAnd/res/values-de/strings.xml @@ -1,4 +1,5 @@ - + + Korrigierte Distanz Wikipedia-Artikel zur Umgebung @@ -2940,4 +2941,5 @@ Abgedeckte Fläche: %1$s x %2$s IN DER NÄHE Gruppe gelöscht Wildwasser Sportarten + Alle Zwischenpunkte löschen From 8333eaf17f53bec0bdcb92845cbd55674f05ee74 Mon Sep 17 00:00:00 2001 From: Victor Shcherb Date: Mon, 19 Mar 2018 13:43:45 +0200 Subject: [PATCH 17/18] Fix #5115 --- OsmAnd-java/src/net/osmand/util/OpeningHoursParser.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/OsmAnd-java/src/net/osmand/util/OpeningHoursParser.java b/OsmAnd-java/src/net/osmand/util/OpeningHoursParser.java index b131da8d40..908a154565 100644 --- a/OsmAnd-java/src/net/osmand/util/OpeningHoursParser.java +++ b/OsmAnd-java/src/net/osmand/util/OpeningHoursParser.java @@ -39,6 +39,7 @@ public class OpeningHoursParser { DateFormatSymbols dateFormatSymbols = DateFormatSymbols.getInstance(Locale.US); monthsStr = dateFormatSymbols.getShortMonths(); daysStr = getTwoLettersStringArray(dateFormatSymbols.getShortWeekdays()); + dateFormatSymbols = DateFormatSymbols.getInstance(); localMothsStr = dateFormatSymbols.getShortMonths(); localDaysStr = getTwoLettersStringArray(dateFormatSymbols.getShortWeekdays()); @@ -78,8 +79,8 @@ public class OpeningHoursParser { String[] newStrings = new String[strings.length]; for (int i = 0; i < strings.length; i++) { if (strings[i] != null) { - if (strings[i].length() > 2) { - newStrings[i] = Algorithms.capitalizeFirstLetter(strings[i].substring(0, 2)); + if (strings[i].length() > 3) { + newStrings[i] = Algorithms.capitalizeFirstLetter(strings[i].substring(0, 3)); } else { newStrings[i] = Algorithms.capitalizeFirstLetter(strings[i]); } From 389ae9c476f2e831688995de3836f193c7fe8d7f Mon Sep 17 00:00:00 2001 From: Alexander Sytnyk Date: Mon, 19 Mar 2018 16:00:07 +0200 Subject: [PATCH 18/18] Add facebook analytics --- OsmAnd/AndroidManifest-free.xml | 4 ++++ OsmAnd/build.gradle | 2 +- OsmAnd/no_translate.xml | 1 + 3 files changed, 6 insertions(+), 1 deletion(-) diff --git a/OsmAnd/AndroidManifest-free.xml b/OsmAnd/AndroidManifest-free.xml index 660f7ef14c..56db0caea4 100644 --- a/OsmAnd/AndroidManifest-free.xml +++ b/OsmAnd/AndroidManifest-free.xml @@ -6,6 +6,10 @@ android:icon="@mipmap/icon_free" android:label="@string/app_name_free" tools:replace="android:icon, android:label"> + + + + + 2057524931189530 €7,99 OsmAnd Live UA-28342846-2