diff --git a/android/res/values-ru/strings.xml b/android/res/values-ru/strings.xml index 10c1efdfc3..62cc04900e 100644 --- a/android/res/values-ru/strings.xml +++ b/android/res/values-ru/strings.xml @@ -333,6 +333,7 @@ Недавний путь Автозум + Простая цветовая схема для пробок Выключено 1 час 2 часа diff --git a/android/res/values/donottranslate.xml b/android/res/values/donottranslate.xml index 247f0117cb..e06482dd40 100644 --- a/android/res/values/donottranslate.xml +++ b/android/res/values/donottranslate.xml @@ -51,6 +51,7 @@ AutoZoom LargeFontSize UseMobileData + TrafficSimplifiedColors %1$s: %2$s %2$s :%1$s diff --git a/android/res/values/strings.xml b/android/res/values/strings.xml index 387e537dab..cc88cfa6cf 100644 --- a/android/res/values/strings.xml +++ b/android/res/values/strings.xml @@ -335,6 +335,7 @@ Recent track Auto zoom + Simplified colour scheme for traffic Off 1 hour 2 hours diff --git a/android/res/xml-v21/prefs_route.xml b/android/res/xml-v21/prefs_route.xml index 89826e6ec1..1a75689965 100644 --- a/android/res/xml-v21/prefs_route.xml +++ b/android/res/xml-v21/prefs_route.xml @@ -19,8 +19,14 @@ android:switchTextOff=""/> + android:key="@string/pref_auto_zoom" + android:title="@string/pref_map_auto_zoom" + android:switchTextOn="" + android:switchTextOff=""/> + + \ No newline at end of file diff --git a/android/res/xml/prefs_route.xml b/android/res/xml/prefs_route.xml index 70c3fcfbe8..e1884eae88 100644 --- a/android/res/xml/prefs_route.xml +++ b/android/res/xml/prefs_route.xml @@ -17,4 +17,8 @@ + + \ No newline at end of file diff --git a/android/src/com/mapswithme/maps/settings/RoutePrefsFragment.java b/android/src/com/mapswithme/maps/settings/RoutePrefsFragment.java index dda64ad753..30a2990c6c 100644 --- a/android/src/com/mapswithme/maps/settings/RoutePrefsFragment.java +++ b/android/src/com/mapswithme/maps/settings/RoutePrefsFragment.java @@ -181,6 +181,20 @@ public class RoutePrefsFragment extends PreferenceFragment } }); + boolean simplifiedColorsEnabled = Framework.nativeGetSimplifiedTrafficColorsEnabled(); + final TwoStatePreference prefSimplifiedColors = (TwoStatePreference)findPreference( + getString(R.string.pref_traffic_simplified_colors)); + prefSimplifiedColors.setChecked(simplifiedColorsEnabled); + prefSimplifiedColors.setOnPreferenceChangeListener(new Preference.OnPreferenceChangeListener() + { + @Override + public boolean onPreferenceChange(Preference preference, Object newValue) + { + Framework.nativeSetSimplifiedTrafficColorsEnabled((Boolean)newValue); + return true; + } + }); + update(); } diff --git a/iphone/Maps/LocalizedStrings/ar.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/ar.lproj/Localizable.strings index 1e206b6af4..6a971191f1 100644 --- a/iphone/Maps/LocalizedStrings/ar.lproj/Localizable.strings +++ b/iphone/Maps/LocalizedStrings/ar.lproj/Localizable.strings @@ -519,6 +519,8 @@ "pref_map_auto_zoom" = "تكبير تلقائي"; +"pref_traffic_simplified_colors_title" = "Simplified colour scheme for traffic"; + "duration_disabled" = "لا يعمل"; "duration_1_hour" = "1 ساعة"; diff --git a/iphone/Maps/LocalizedStrings/cs.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/cs.lproj/Localizable.strings index 10842c04c3..017eef0afa 100644 --- a/iphone/Maps/LocalizedStrings/cs.lproj/Localizable.strings +++ b/iphone/Maps/LocalizedStrings/cs.lproj/Localizable.strings @@ -519,6 +519,8 @@ "pref_map_auto_zoom" = "Automatické zvětšení"; +"pref_traffic_simplified_colors_title" = "Simplified colour scheme for traffic"; + "duration_disabled" = "Vypnuto"; "duration_1_hour" = "1 hodina"; diff --git a/iphone/Maps/LocalizedStrings/da.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/da.lproj/Localizable.strings index 0d264caece..602501f8da 100644 --- a/iphone/Maps/LocalizedStrings/da.lproj/Localizable.strings +++ b/iphone/Maps/LocalizedStrings/da.lproj/Localizable.strings @@ -519,6 +519,8 @@ "pref_map_auto_zoom" = "Auto zoom"; +"pref_traffic_simplified_colors_title" = "Simplified colour scheme for traffic"; + "duration_disabled" = "Fra"; "duration_1_hour" = "1 time"; diff --git a/iphone/Maps/LocalizedStrings/de.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/de.lproj/Localizable.strings index ec9938f282..6e700a2ad0 100644 --- a/iphone/Maps/LocalizedStrings/de.lproj/Localizable.strings +++ b/iphone/Maps/LocalizedStrings/de.lproj/Localizable.strings @@ -519,6 +519,8 @@ "pref_map_auto_zoom" = "Auto-Zoom"; +"pref_traffic_simplified_colors_title" = "Simplified colour scheme for traffic"; + "duration_disabled" = "Aus"; "duration_1_hour" = "1 Stunde"; diff --git a/iphone/Maps/LocalizedStrings/el.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/el.lproj/Localizable.strings index 819b886ae8..def370f219 100644 --- a/iphone/Maps/LocalizedStrings/el.lproj/Localizable.strings +++ b/iphone/Maps/LocalizedStrings/el.lproj/Localizable.strings @@ -519,6 +519,8 @@ "pref_map_auto_zoom" = "Αυτόματη μεγέθυνση"; +"pref_traffic_simplified_colors_title" = "Simplified colour scheme for traffic"; + "duration_disabled" = "Απενεργ."; "duration_1_hour" = "1 ώρα"; diff --git a/iphone/Maps/LocalizedStrings/en-GB.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/en-GB.lproj/Localizable.strings index dd8400acee..5eadbf6842 100644 --- a/iphone/Maps/LocalizedStrings/en-GB.lproj/Localizable.strings +++ b/iphone/Maps/LocalizedStrings/en-GB.lproj/Localizable.strings @@ -519,6 +519,8 @@ "pref_map_auto_zoom" = "Auto zoom"; +"pref_traffic_simplified_colors_title" = "Simplified colour scheme for traffic"; + "duration_disabled" = "Off"; "duration_1_hour" = "1 hour"; diff --git a/iphone/Maps/LocalizedStrings/en.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/en.lproj/Localizable.strings index ea2a63578d..8c7d54c0a8 100644 --- a/iphone/Maps/LocalizedStrings/en.lproj/Localizable.strings +++ b/iphone/Maps/LocalizedStrings/en.lproj/Localizable.strings @@ -519,6 +519,8 @@ "pref_map_auto_zoom" = "Auto zoom"; +"pref_traffic_simplified_colors_title" = "Simplified colour scheme for traffic"; + "duration_disabled" = "Off"; "duration_1_hour" = "1 hour"; diff --git a/iphone/Maps/LocalizedStrings/es.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/es.lproj/Localizable.strings index 9efda93d58..bf8a26c583 100644 --- a/iphone/Maps/LocalizedStrings/es.lproj/Localizable.strings +++ b/iphone/Maps/LocalizedStrings/es.lproj/Localizable.strings @@ -519,6 +519,8 @@ "pref_map_auto_zoom" = "Autozoom"; +"pref_traffic_simplified_colors_title" = "Simplified colour scheme for traffic"; + "duration_disabled" = "Desactivada"; "duration_1_hour" = "1 hora"; diff --git a/iphone/Maps/LocalizedStrings/fi.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/fi.lproj/Localizable.strings index cf9e4b460e..9515630426 100644 --- a/iphone/Maps/LocalizedStrings/fi.lproj/Localizable.strings +++ b/iphone/Maps/LocalizedStrings/fi.lproj/Localizable.strings @@ -519,6 +519,8 @@ "pref_map_auto_zoom" = "Automaattinen zoomaus"; +"pref_traffic_simplified_colors_title" = "Simplified colour scheme for traffic"; + "duration_disabled" = "Pois päältä"; "duration_1_hour" = "1 tunti"; diff --git a/iphone/Maps/LocalizedStrings/fr.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/fr.lproj/Localizable.strings index 958a3e2fcc..79f9aeb33d 100644 --- a/iphone/Maps/LocalizedStrings/fr.lproj/Localizable.strings +++ b/iphone/Maps/LocalizedStrings/fr.lproj/Localizable.strings @@ -519,6 +519,8 @@ "pref_map_auto_zoom" = "Zoom automatique"; +"pref_traffic_simplified_colors_title" = "Simplified colour scheme for traffic"; + "duration_disabled" = "Désactivé"; "duration_1_hour" = "1 heure"; diff --git a/iphone/Maps/LocalizedStrings/hu.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/hu.lproj/Localizable.strings index cd08102a43..bf32161ca7 100644 --- a/iphone/Maps/LocalizedStrings/hu.lproj/Localizable.strings +++ b/iphone/Maps/LocalizedStrings/hu.lproj/Localizable.strings @@ -519,6 +519,8 @@ "pref_map_auto_zoom" = "Auto-zoom"; +"pref_traffic_simplified_colors_title" = "Simplified colour scheme for traffic"; + "duration_disabled" = "Kikapcsolva"; "duration_1_hour" = "1 óra"; diff --git a/iphone/Maps/LocalizedStrings/id.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/id.lproj/Localizable.strings index ce47b27019..9d7a39225a 100644 --- a/iphone/Maps/LocalizedStrings/id.lproj/Localizable.strings +++ b/iphone/Maps/LocalizedStrings/id.lproj/Localizable.strings @@ -519,6 +519,8 @@ "pref_map_auto_zoom" = "Perbesar otomatis"; +"pref_traffic_simplified_colors_title" = "Simplified colour scheme for traffic"; + "duration_disabled" = "Nonaktif"; "duration_1_hour" = "1 jam"; diff --git a/iphone/Maps/LocalizedStrings/it.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/it.lproj/Localizable.strings index 2dc14ed6bf..c7358bc761 100644 --- a/iphone/Maps/LocalizedStrings/it.lproj/Localizable.strings +++ b/iphone/Maps/LocalizedStrings/it.lproj/Localizable.strings @@ -519,6 +519,8 @@ "pref_map_auto_zoom" = "Zoom automatico"; +"pref_traffic_simplified_colors_title" = "Simplified colour scheme for traffic"; + "duration_disabled" = "Disabilitato"; "duration_1_hour" = "1 ora"; diff --git a/iphone/Maps/LocalizedStrings/ja.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/ja.lproj/Localizable.strings index 1254236301..e1763b86c5 100644 --- a/iphone/Maps/LocalizedStrings/ja.lproj/Localizable.strings +++ b/iphone/Maps/LocalizedStrings/ja.lproj/Localizable.strings @@ -519,6 +519,8 @@ "pref_map_auto_zoom" = "自動ズーム"; +"pref_traffic_simplified_colors_title" = "Simplified colour scheme for traffic"; + "duration_disabled" = "オフ"; "duration_1_hour" = "1時間"; diff --git a/iphone/Maps/LocalizedStrings/ko.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/ko.lproj/Localizable.strings index 7dc8c2f94d..c8839d6e91 100644 --- a/iphone/Maps/LocalizedStrings/ko.lproj/Localizable.strings +++ b/iphone/Maps/LocalizedStrings/ko.lproj/Localizable.strings @@ -519,6 +519,8 @@ "pref_map_auto_zoom" = "자동 줌"; +"pref_traffic_simplified_colors_title" = "Simplified colour scheme for traffic"; + "duration_disabled" = "선택 안 함"; "duration_1_hour" = "1시간"; diff --git a/iphone/Maps/LocalizedStrings/nb.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/nb.lproj/Localizable.strings index 15a53225da..2ce35caa0d 100644 --- a/iphone/Maps/LocalizedStrings/nb.lproj/Localizable.strings +++ b/iphone/Maps/LocalizedStrings/nb.lproj/Localizable.strings @@ -519,6 +519,8 @@ "pref_map_auto_zoom" = "Automatisk zooming"; +"pref_traffic_simplified_colors_title" = "Simplified colour scheme for traffic"; + "duration_disabled" = "Av"; "duration_1_hour" = "1 time"; diff --git a/iphone/Maps/LocalizedStrings/nl.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/nl.lproj/Localizable.strings index 88e70fa258..1af43c4632 100644 --- a/iphone/Maps/LocalizedStrings/nl.lproj/Localizable.strings +++ b/iphone/Maps/LocalizedStrings/nl.lproj/Localizable.strings @@ -519,6 +519,8 @@ "pref_map_auto_zoom" = "Automatisch zoomen"; +"pref_traffic_simplified_colors_title" = "Simplified colour scheme for traffic"; + "duration_disabled" = "Uit"; "duration_1_hour" = "1 uur"; diff --git a/iphone/Maps/LocalizedStrings/pl.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/pl.lproj/Localizable.strings index 2bc307f142..ebc8a2eab7 100644 --- a/iphone/Maps/LocalizedStrings/pl.lproj/Localizable.strings +++ b/iphone/Maps/LocalizedStrings/pl.lproj/Localizable.strings @@ -519,6 +519,8 @@ "pref_map_auto_zoom" = "Auto zoom"; +"pref_traffic_simplified_colors_title" = "Simplified colour scheme for traffic"; + "duration_disabled" = "Wyłączona"; "duration_1_hour" = "1 godzina"; diff --git a/iphone/Maps/LocalizedStrings/pt.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/pt.lproj/Localizable.strings index bdd4d98a60..f7b552ac19 100644 --- a/iphone/Maps/LocalizedStrings/pt.lproj/Localizable.strings +++ b/iphone/Maps/LocalizedStrings/pt.lproj/Localizable.strings @@ -519,6 +519,8 @@ "pref_map_auto_zoom" = "Zoom automático"; +"pref_traffic_simplified_colors_title" = "Simplified colour scheme for traffic"; + "duration_disabled" = "Desligado"; "duration_1_hour" = "1 hora"; diff --git a/iphone/Maps/LocalizedStrings/ro.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/ro.lproj/Localizable.strings index d4426f7e3f..de5ddf4ca5 100644 --- a/iphone/Maps/LocalizedStrings/ro.lproj/Localizable.strings +++ b/iphone/Maps/LocalizedStrings/ro.lproj/Localizable.strings @@ -519,6 +519,8 @@ "pref_map_auto_zoom" = "Zoom automat"; +"pref_traffic_simplified_colors_title" = "Simplified colour scheme for traffic"; + "duration_disabled" = "Oprit"; "duration_1_hour" = "1 oră"; diff --git a/iphone/Maps/LocalizedStrings/ru.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/ru.lproj/Localizable.strings index 0ec4b406c8..2cde8d64b3 100644 --- a/iphone/Maps/LocalizedStrings/ru.lproj/Localizable.strings +++ b/iphone/Maps/LocalizedStrings/ru.lproj/Localizable.strings @@ -519,6 +519,8 @@ "pref_map_auto_zoom" = "Автозум"; +"pref_traffic_simplified_colors_title" = "Простая цветовая схема для пробок"; + "duration_disabled" = "Выключено"; "duration_1_hour" = "1 час"; diff --git a/iphone/Maps/LocalizedStrings/sk.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/sk.lproj/Localizable.strings index b26d96739c..80a6387d3a 100644 --- a/iphone/Maps/LocalizedStrings/sk.lproj/Localizable.strings +++ b/iphone/Maps/LocalizedStrings/sk.lproj/Localizable.strings @@ -519,6 +519,8 @@ "pref_map_auto_zoom" = "Automatický zoom"; +"pref_traffic_simplified_colors_title" = "Simplified colour scheme for traffic"; + "duration_disabled" = "Vypnúť"; "duration_1_hour" = "1 hodina"; diff --git a/iphone/Maps/LocalizedStrings/sv.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/sv.lproj/Localizable.strings index 15195ed4e8..ce18db4794 100644 --- a/iphone/Maps/LocalizedStrings/sv.lproj/Localizable.strings +++ b/iphone/Maps/LocalizedStrings/sv.lproj/Localizable.strings @@ -519,6 +519,8 @@ "pref_map_auto_zoom" = "Automatisk zoom"; +"pref_traffic_simplified_colors_title" = "Simplified colour scheme for traffic"; + "duration_disabled" = "Av"; "duration_1_hour" = "1 timme"; diff --git a/iphone/Maps/LocalizedStrings/th.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/th.lproj/Localizable.strings index 3cc2301f6f..ad4a69bdd4 100644 --- a/iphone/Maps/LocalizedStrings/th.lproj/Localizable.strings +++ b/iphone/Maps/LocalizedStrings/th.lproj/Localizable.strings @@ -519,6 +519,8 @@ "pref_map_auto_zoom" = "ซูมอัตโนมัติ"; +"pref_traffic_simplified_colors_title" = "Simplified colour scheme for traffic"; + "duration_disabled" = "ปิด"; "duration_1_hour" = "1 ชั่วโมง"; diff --git a/iphone/Maps/LocalizedStrings/tr.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/tr.lproj/Localizable.strings index c46f52ddf3..e18b60260b 100644 --- a/iphone/Maps/LocalizedStrings/tr.lproj/Localizable.strings +++ b/iphone/Maps/LocalizedStrings/tr.lproj/Localizable.strings @@ -519,6 +519,8 @@ "pref_map_auto_zoom" = "Otomatik yakınlaştırma"; +"pref_traffic_simplified_colors_title" = "Simplified colour scheme for traffic"; + "duration_disabled" = "Kapalı"; "duration_1_hour" = "1 saat"; diff --git a/iphone/Maps/LocalizedStrings/uk.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/uk.lproj/Localizable.strings index 9f32d0fc64..8195af2491 100644 --- a/iphone/Maps/LocalizedStrings/uk.lproj/Localizable.strings +++ b/iphone/Maps/LocalizedStrings/uk.lproj/Localizable.strings @@ -519,6 +519,8 @@ "pref_map_auto_zoom" = "Автозум"; +"pref_traffic_simplified_colors_title" = "Simplified colour scheme for traffic"; + "duration_disabled" = "Вимкнуто"; "duration_1_hour" = "1 година"; diff --git a/iphone/Maps/LocalizedStrings/vi.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/vi.lproj/Localizable.strings index 937baa901c..bcb4ff40eb 100644 --- a/iphone/Maps/LocalizedStrings/vi.lproj/Localizable.strings +++ b/iphone/Maps/LocalizedStrings/vi.lproj/Localizable.strings @@ -519,6 +519,8 @@ "pref_map_auto_zoom" = "Ống dòm tự động"; +"pref_traffic_simplified_colors_title" = "Simplified colour scheme for traffic"; + "duration_disabled" = "Tắt"; "duration_1_hour" = "1 giờ"; diff --git a/iphone/Maps/LocalizedStrings/zh-Hans.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/zh-Hans.lproj/Localizable.strings index 4ea78a1cef..ab081d0404 100644 --- a/iphone/Maps/LocalizedStrings/zh-Hans.lproj/Localizable.strings +++ b/iphone/Maps/LocalizedStrings/zh-Hans.lproj/Localizable.strings @@ -519,6 +519,8 @@ "pref_map_auto_zoom" = "自动缩放"; +"pref_traffic_simplified_colors_title" = "Simplified colour scheme for traffic"; + "duration_disabled" = "关闭"; "duration_1_hour" = "1小时"; diff --git a/iphone/Maps/LocalizedStrings/zh-Hant.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/zh-Hant.lproj/Localizable.strings index 0fb318cf0a..ace9067031 100644 --- a/iphone/Maps/LocalizedStrings/zh-Hant.lproj/Localizable.strings +++ b/iphone/Maps/LocalizedStrings/zh-Hant.lproj/Localizable.strings @@ -519,6 +519,8 @@ "pref_map_auto_zoom" = "自動縮放"; +"pref_traffic_simplified_colors_title" = "Simplified colour scheme for traffic"; + "duration_disabled" = "關閉"; "duration_1_hour" = "1小時"; diff --git a/strings.txt b/strings.txt index aaad055545..6236661cdc 100644 --- a/strings.txt +++ b/strings.txt @@ -5700,6 +5700,10 @@ el = Αυτόματη μεγέθυνση sk = Automatický zoom + [pref_traffic_simplified_colors_title] + en = Simplified colour scheme for traffic + ru = Простая цветовая схема для пробок + [duration_disabled] tags = ios,android en = Off