diff --git a/android/res/values-ar/strings.xml b/android/res/values-ar/strings.xml index 9e20e8e7b1..f78fb021f1 100644 --- a/android/res/values-ar/strings.xml +++ b/android/res/values-ar/strings.xml @@ -152,8 +152,6 @@ الإشارات المرجعية اللون - - الدبوس المُثَبَت أماكني diff --git a/android/res/values-cs/strings.xml b/android/res/values-cs/strings.xml index f0b0a88318..4917ea5c3e 100644 --- a/android/res/values-cs/strings.xml +++ b/android/res/values-cs/strings.xml @@ -147,8 +147,6 @@ Záložky Barva - - Špendlík Moje místa diff --git a/android/res/values-da/strings.xml b/android/res/values-da/strings.xml index c8c888b2f6..5bd1d06630 100644 --- a/android/res/values-da/strings.xml +++ b/android/res/values-da/strings.xml @@ -150,8 +150,6 @@ Bogmærker Farve - - Placeret knappenål Mine Steder diff --git a/android/res/values-de/strings.xml b/android/res/values-de/strings.xml index e4826bf914..b6a8d93421 100644 --- a/android/res/values-de/strings.xml +++ b/android/res/values-de/strings.xml @@ -152,8 +152,6 @@ Lesezeichengruppen Farbe - - Gesetzte Stecknadel Meine Orte diff --git a/android/res/values-es/strings.xml b/android/res/values-es/strings.xml index 96cef7be93..16233e7aa4 100644 --- a/android/res/values-es/strings.xml +++ b/android/res/values-es/strings.xml @@ -143,8 +143,6 @@ Grupos de marcadores Marcadores - - Etiqueta colocada Mis lugares diff --git a/android/res/values-fi/strings.xml b/android/res/values-fi/strings.xml index bbfff3a429..48f7cd9c6f 100644 --- a/android/res/values-fi/strings.xml +++ b/android/res/values-fi/strings.xml @@ -152,8 +152,6 @@ Kirjanmerkit Väri - - Pudotettu nasta Paikkani diff --git a/android/res/values-fr/strings.xml b/android/res/values-fr/strings.xml index df96b51385..8a26aa4953 100644 --- a/android/res/values-fr/strings.xml +++ b/android/res/values-fr/strings.xml @@ -151,8 +151,6 @@ Signets Couleur - - Épingle placée Mes endroits diff --git a/android/res/values-hu/strings.xml b/android/res/values-hu/strings.xml index b431ae83db..ba21cfa209 100644 --- a/android/res/values-hu/strings.xml +++ b/android/res/values-hu/strings.xml @@ -147,8 +147,6 @@ Könyvjelzők Szín - - Beszúrt jelző Saját helyeim diff --git a/android/res/values-in/strings.xml b/android/res/values-in/strings.xml index 2651f8eea7..9f99246244 100644 --- a/android/res/values-in/strings.xml +++ b/android/res/values-in/strings.xml @@ -152,8 +152,6 @@ Penanda Warna - - Pin yang Ditancapkan Tempat-tempat Saya diff --git a/android/res/values-it/strings.xml b/android/res/values-it/strings.xml index 59d9ded24d..1631d24111 100644 --- a/android/res/values-it/strings.xml +++ b/android/res/values-it/strings.xml @@ -147,8 +147,6 @@ Segnalibri Colore - - Pin trascinato I miei luoghi diff --git a/android/res/values-ja/strings.xml b/android/res/values-ja/strings.xml index 4bb5b53e90..2e1c231f73 100644 --- a/android/res/values-ja/strings.xml +++ b/android/res/values-ja/strings.xml @@ -147,8 +147,6 @@ ブックマーク 表示色 - - ドロップしたピン マイロケーション diff --git a/android/res/values-ko/strings.xml b/android/res/values-ko/strings.xml index 1711a65972..4493f95f15 100644 --- a/android/res/values-ko/strings.xml +++ b/android/res/values-ko/strings.xml @@ -146,8 +146,6 @@ 북마크 색깔 - - 알수 없는 핀 내 장소 diff --git a/android/res/values-nb/strings.xml b/android/res/values-nb/strings.xml index 9a43ecf7f3..058b82c9b9 100644 --- a/android/res/values-nb/strings.xml +++ b/android/res/values-nb/strings.xml @@ -152,8 +152,6 @@ Bokmerker Farge - - Droppet merke Mine steder diff --git a/android/res/values-nl/strings.xml b/android/res/values-nl/strings.xml index 1411197350..10be1d5765 100644 --- a/android/res/values-nl/strings.xml +++ b/android/res/values-nl/strings.xml @@ -140,8 +140,6 @@ Bladwijzers Kleur - - Geplaatste Speld Mijn Plaatsen diff --git a/android/res/values-pl/strings.xml b/android/res/values-pl/strings.xml index 224b2e2274..8406cfd4ee 100644 --- a/android/res/values-pl/strings.xml +++ b/android/res/values-pl/strings.xml @@ -147,8 +147,6 @@ Zakładki Kolor - - Znacznik Moje miejsca diff --git a/android/res/values-pt/strings.xml b/android/res/values-pt/strings.xml index 0d88505dec..4c3bba35c1 100644 --- a/android/res/values-pt/strings.xml +++ b/android/res/values-pt/strings.xml @@ -145,8 +145,6 @@ Favoritos Cor - - Marcador posicionado Os meus locais diff --git a/android/res/values-ro/strings.xml b/android/res/values-ro/strings.xml index bc2f58e107..41cbcd06e7 100644 --- a/android/res/values-ro/strings.xml +++ b/android/res/values-ro/strings.xml @@ -152,8 +152,6 @@ Marcaje Culoare - - Poziție marcată Locurile mele diff --git a/android/res/values-ru/strings.xml b/android/res/values-ru/strings.xml index bab4fd9b8f..97141157cd 100644 --- a/android/res/values-ru/strings.xml +++ b/android/res/values-ru/strings.xml @@ -151,8 +151,6 @@ Метки Цвет - - Новая метка Мои Метки @@ -835,4 +833,5 @@ Почтовый индекс Введите корректный почтовый индекс Владелец + Неизвестное место diff --git a/android/res/values-sk/strings.xml b/android/res/values-sk/strings.xml index 226eee18d5..73b81604fb 100644 --- a/android/res/values-sk/strings.xml +++ b/android/res/values-sk/strings.xml @@ -147,8 +147,6 @@ Záložky Farba - - Špendlík Moje miesta diff --git a/android/res/values-sv/strings.xml b/android/res/values-sv/strings.xml index 4b5cf69e3b..54356cc952 100644 --- a/android/res/values-sv/strings.xml +++ b/android/res/values-sv/strings.xml @@ -148,8 +148,6 @@ Bokmärken Färg - - Släppt knappnål Mina Platser diff --git a/android/res/values-th/strings.xml b/android/res/values-th/strings.xml index f603769eb1..4b24aaaee5 100644 --- a/android/res/values-th/strings.xml +++ b/android/res/values-th/strings.xml @@ -152,8 +152,6 @@ บุ๊กมาร์ก สี - - ปักหมุด สถานที่ของฉัน diff --git a/android/res/values-tr/strings.xml b/android/res/values-tr/strings.xml index 49bf2dc3ef..9ddbc1acb4 100644 --- a/android/res/values-tr/strings.xml +++ b/android/res/values-tr/strings.xml @@ -152,8 +152,6 @@ Yer İmleri Renk - - Bırakılan Pin Yerlerim diff --git a/android/res/values-uk/strings.xml b/android/res/values-uk/strings.xml index 691b42394b..43ddf6fa33 100644 --- a/android/res/values-uk/strings.xml +++ b/android/res/values-uk/strings.xml @@ -151,8 +151,6 @@ Мітки Колір - - Нова мітка Мої Мітки diff --git a/android/res/values-vi/strings.xml b/android/res/values-vi/strings.xml index 8c47c384ac..64a7a667b8 100644 --- a/android/res/values-vi/strings.xml +++ b/android/res/values-vi/strings.xml @@ -152,8 +152,6 @@ Đánh dấu Màu sắc - - Con Dấu đã Đặt Các Địa chỉ của Tôi diff --git a/android/res/values-zh-rTW/strings.xml b/android/res/values-zh-rTW/strings.xml index 2d3f4a17c1..ee20494ba3 100644 --- a/android/res/values-zh-rTW/strings.xml +++ b/android/res/values-zh-rTW/strings.xml @@ -148,8 +148,6 @@ 書籤 顏色 - - 已放置圖釘 我的地點 diff --git a/android/res/values-zh/strings.xml b/android/res/values-zh/strings.xml index a1ca6f02c0..060e513f04 100644 --- a/android/res/values-zh/strings.xml +++ b/android/res/values-zh/strings.xml @@ -148,8 +148,6 @@ 书签 色彩 - - 已放置图钉 我的位置 diff --git a/android/res/values/strings.xml b/android/res/values/strings.xml index 87e9bc1166..b77e5f0f4b 100644 --- a/android/res/values/strings.xml +++ b/android/res/values/strings.xml @@ -153,8 +153,6 @@ Bookmarks Color - - Dropped Pin My Places @@ -837,4 +835,5 @@ ZIP Code Enter correct ZIP Code Operator + Unknown Place diff --git a/android/src/com/mapswithme/maps/MwmApplication.java b/android/src/com/mapswithme/maps/MwmApplication.java index f9bb50d548..d29bb9d28e 100644 --- a/android/src/com/mapswithme/maps/MwmApplication.java +++ b/android/src/com/mapswithme/maps/MwmApplication.java @@ -151,7 +151,7 @@ public class MwmApplication extends Application nativeAddLocalization("country_status_download_failed", getString(R.string.country_status_download_failed)); nativeAddLocalization("try_again", getString(R.string.try_again)); nativeAddLocalization("not_enough_free_space_on_sdcard", getString(R.string.not_enough_free_space_on_sdcard)); - nativeAddLocalization("dropped_pin", getString(R.string.dropped_pin)); + nativeAddLocalization("placepage_unknown_place", getString(R.string.placepage_unknown_place)); nativeAddLocalization("my_places", getString(R.string.my_places)); nativeAddLocalization("my_position", getString(R.string.my_position)); nativeAddLocalization("routes", getString(R.string.routes)); diff --git a/iphone/Maps/Classes/MWMPlacePageViewManager.mm b/iphone/Maps/Classes/MWMPlacePageViewManager.mm index 6da93e3749..273043d99b 100644 --- a/iphone/Maps/Classes/MWMPlacePageViewManager.mm +++ b/iphone/Maps/Classes/MWMPlacePageViewManager.mm @@ -224,7 +224,7 @@ extern NSString * const kBookmarksChangedNotification; else if (self.entity.isBookmark) name = self.entity.bookmarkTitle; else - name = L(@"dropped_pin"); + name = L(@"placepage_unknown_place"); m2::PointD const & org = self.entity.mercator; return self.entity.isMyPosition ? MWMRoutePoint(org) diff --git a/iphone/Maps/Classes/MapsAppDelegate.mm b/iphone/Maps/Classes/MapsAppDelegate.mm index 075c769dd3..4dfa492a26 100644 --- a/iphone/Maps/Classes/MapsAppDelegate.mm +++ b/iphone/Maps/Classes/MapsAppDelegate.mm @@ -83,7 +83,7 @@ void InitLocalizedStrings() f.AddString("cancel", [L(@"cancel") UTF8String]); f.AddString("try_again", [L(@"try_again") UTF8String]); // Default texts for bookmarks added in C++ code (by URL Scheme API) - f.AddString("dropped_pin", [L(@"dropped_pin") UTF8String]); + f.AddString("placepage_unknown_place", [L(@"placepage_unknown_place") UTF8String]); f.AddString("my_places", [L(@"my_places") UTF8String]); f.AddString("my_position", [L(@"my_position") UTF8String]); f.AddString("routes", [L(@"routes") UTF8String]); diff --git a/iphone/Maps/ar.lproj/Localizable.strings b/iphone/Maps/ar.lproj/Localizable.strings index 540f6c98e6..6b99c3c243 100644 --- a/iphone/Maps/ar.lproj/Localizable.strings +++ b/iphone/Maps/ar.lproj/Localizable.strings @@ -242,9 +242,6 @@ /* Add bookmark dialog - bookmark color */ "color" = "اللون"; -/* Unknown Dropped Pin title, when name can't be determined */ -"dropped_pin" = "الدبوس المُثَبَت"; - /* Default bookmarks set name */ "my_places" = "أماكني"; @@ -1381,3 +1378,5 @@ "error_enter_correct_zip_code" = "Enter correct ZIP Code"; "editor_operator" = "Operator"; + +"placepage_unknown_place" = "Unknown Place"; diff --git a/iphone/Maps/cs.lproj/Localizable.strings b/iphone/Maps/cs.lproj/Localizable.strings index f3b2d169ef..8b01a9a52f 100644 --- a/iphone/Maps/cs.lproj/Localizable.strings +++ b/iphone/Maps/cs.lproj/Localizable.strings @@ -242,9 +242,6 @@ /* Add bookmark dialog - bookmark color */ "color" = "Barva"; -/* Unknown Dropped Pin title, when name can't be determined */ -"dropped_pin" = "Špendlík"; - /* Default bookmarks set name */ "my_places" = "Moje místa"; @@ -1381,3 +1378,5 @@ "error_enter_correct_zip_code" = "Enter correct ZIP Code"; "editor_operator" = "Operator"; + +"placepage_unknown_place" = "Unknown Place"; diff --git a/iphone/Maps/da.lproj/Localizable.strings b/iphone/Maps/da.lproj/Localizable.strings index d0a4a4be0b..e8d2b2de5f 100644 --- a/iphone/Maps/da.lproj/Localizable.strings +++ b/iphone/Maps/da.lproj/Localizable.strings @@ -242,9 +242,6 @@ /* Add bookmark dialog - bookmark color */ "color" = "Farve"; -/* Unknown Dropped Pin title, when name can't be determined */ -"dropped_pin" = "Placeret knappenål"; - /* Default bookmarks set name */ "my_places" = "Mine Steder"; @@ -1381,3 +1378,5 @@ "error_enter_correct_zip_code" = "Enter correct ZIP Code"; "editor_operator" = "Operator"; + +"placepage_unknown_place" = "Unknown Place"; diff --git a/iphone/Maps/de.lproj/Localizable.strings b/iphone/Maps/de.lproj/Localizable.strings index 2cadac2e0f..9caa75c844 100644 --- a/iphone/Maps/de.lproj/Localizable.strings +++ b/iphone/Maps/de.lproj/Localizable.strings @@ -242,9 +242,6 @@ /* Add bookmark dialog - bookmark color */ "color" = "Farbe"; -/* Unknown Dropped Pin title, when name can't be determined */ -"dropped_pin" = "Gesetzte Stecknadel"; - /* Default bookmarks set name */ "my_places" = "Meine Orte"; @@ -1381,3 +1378,5 @@ "error_enter_correct_zip_code" = "Richtige Postleitzahl eingeben"; "editor_operator" = "Operator"; + +"placepage_unknown_place" = "Unknown Place"; diff --git a/iphone/Maps/en.lproj/Localizable.strings b/iphone/Maps/en.lproj/Localizable.strings index d4b5cf45e1..47af1bb9ea 100644 --- a/iphone/Maps/en.lproj/Localizable.strings +++ b/iphone/Maps/en.lproj/Localizable.strings @@ -242,9 +242,6 @@ /* Add bookmark dialog - bookmark color */ "color" = "Color"; -/* Unknown Dropped Pin title, when name can't be determined */ -"dropped_pin" = "Dropped Pin"; - /* Default bookmarks set name */ "my_places" = "My Places"; @@ -1381,3 +1378,5 @@ "error_enter_correct_zip_code" = "Enter correct ZIP Code"; "editor_operator" = "Operator"; + +"placepage_unknown_place" = "Unknown Place"; diff --git a/iphone/Maps/es.lproj/Localizable.strings b/iphone/Maps/es.lproj/Localizable.strings index 2ed03d954e..7cbb68a882 100644 --- a/iphone/Maps/es.lproj/Localizable.strings +++ b/iphone/Maps/es.lproj/Localizable.strings @@ -242,9 +242,6 @@ /* Add bookmark dialog - bookmark color */ "color" = "Color"; -/* Unknown Dropped Pin title, when name can't be determined */ -"dropped_pin" = "Etiqueta colocada"; - /* Default bookmarks set name */ "my_places" = "Mis lugares"; @@ -1381,3 +1378,5 @@ "error_enter_correct_zip_code" = "Enter correct ZIP Code"; "editor_operator" = "Operator"; + +"placepage_unknown_place" = "Unknown Place"; diff --git a/iphone/Maps/fi.lproj/Localizable.strings b/iphone/Maps/fi.lproj/Localizable.strings index b4c5bce8e9..080d2c0015 100644 --- a/iphone/Maps/fi.lproj/Localizable.strings +++ b/iphone/Maps/fi.lproj/Localizable.strings @@ -242,9 +242,6 @@ /* Add bookmark dialog - bookmark color */ "color" = "Väri"; -/* Unknown Dropped Pin title, when name can't be determined */ -"dropped_pin" = "Pudotettu nasta"; - /* Default bookmarks set name */ "my_places" = "Paikkani"; @@ -1381,3 +1378,5 @@ "error_enter_correct_zip_code" = "Enter correct ZIP Code"; "editor_operator" = "Operator"; + +"placepage_unknown_place" = "Unknown Place"; diff --git a/iphone/Maps/fr.lproj/Localizable.strings b/iphone/Maps/fr.lproj/Localizable.strings index bd019dd0df..1acc2c6403 100644 --- a/iphone/Maps/fr.lproj/Localizable.strings +++ b/iphone/Maps/fr.lproj/Localizable.strings @@ -242,9 +242,6 @@ /* Add bookmark dialog - bookmark color */ "color" = "Couleur"; -/* Unknown Dropped Pin title, when name can't be determined */ -"dropped_pin" = "Épingle placée"; - /* Default bookmarks set name */ "my_places" = "Mes endroits"; @@ -1381,3 +1378,5 @@ "error_enter_correct_zip_code" = "Enter correct ZIP Code"; "editor_operator" = "Operator"; + +"placepage_unknown_place" = "Unknown Place"; diff --git a/iphone/Maps/hu.lproj/Localizable.strings b/iphone/Maps/hu.lproj/Localizable.strings index fd0051deb7..d684620478 100644 --- a/iphone/Maps/hu.lproj/Localizable.strings +++ b/iphone/Maps/hu.lproj/Localizable.strings @@ -242,9 +242,6 @@ /* Add bookmark dialog - bookmark color */ "color" = "Szín"; -/* Unknown Dropped Pin title, when name can't be determined */ -"dropped_pin" = "Beszúrt jelző"; - /* Default bookmarks set name */ "my_places" = "Saját helyeim"; @@ -1381,3 +1378,5 @@ "error_enter_correct_zip_code" = "Enter correct ZIP Code"; "editor_operator" = "Operator"; + +"placepage_unknown_place" = "Unknown Place"; diff --git a/iphone/Maps/id.lproj/Localizable.strings b/iphone/Maps/id.lproj/Localizable.strings index ede88e125c..5d5df35f97 100644 --- a/iphone/Maps/id.lproj/Localizable.strings +++ b/iphone/Maps/id.lproj/Localizable.strings @@ -242,9 +242,6 @@ /* Add bookmark dialog - bookmark color */ "color" = "Warna"; -/* Unknown Dropped Pin title, when name can't be determined */ -"dropped_pin" = "Pin yang Ditancapkan"; - /* Default bookmarks set name */ "my_places" = "Tempat-tempat Saya"; @@ -1381,3 +1378,5 @@ "error_enter_correct_zip_code" = "Enter correct ZIP Code"; "editor_operator" = "Operator"; + +"placepage_unknown_place" = "Unknown Place"; diff --git a/iphone/Maps/it.lproj/Localizable.strings b/iphone/Maps/it.lproj/Localizable.strings index 4fc3cbfb4b..125883756e 100644 --- a/iphone/Maps/it.lproj/Localizable.strings +++ b/iphone/Maps/it.lproj/Localizable.strings @@ -242,9 +242,6 @@ /* Add bookmark dialog - bookmark color */ "color" = "Colore"; -/* Unknown Dropped Pin title, when name can't be determined */ -"dropped_pin" = "Pin trascinato"; - /* Default bookmarks set name */ "my_places" = "I miei luoghi"; @@ -1381,3 +1378,5 @@ "error_enter_correct_zip_code" = "Enter correct ZIP Code"; "editor_operator" = "Operator"; + +"placepage_unknown_place" = "Unknown Place"; diff --git a/iphone/Maps/ja.lproj/Localizable.strings b/iphone/Maps/ja.lproj/Localizable.strings index 001e730c11..253a7dcb9e 100644 --- a/iphone/Maps/ja.lproj/Localizable.strings +++ b/iphone/Maps/ja.lproj/Localizable.strings @@ -242,9 +242,6 @@ /* Add bookmark dialog - bookmark color */ "color" = "表示色"; -/* Unknown Dropped Pin title, when name can't be determined */ -"dropped_pin" = "ドロップしたピン"; - /* Default bookmarks set name */ "my_places" = "マイロケーション"; @@ -1381,3 +1378,5 @@ "error_enter_correct_zip_code" = "Enter correct ZIP Code"; "editor_operator" = "Operator"; + +"placepage_unknown_place" = "Unknown Place"; diff --git a/iphone/Maps/ko.lproj/Localizable.strings b/iphone/Maps/ko.lproj/Localizable.strings index e121b96fb9..a5185e7ce9 100644 --- a/iphone/Maps/ko.lproj/Localizable.strings +++ b/iphone/Maps/ko.lproj/Localizable.strings @@ -242,9 +242,6 @@ /* Add bookmark dialog - bookmark color */ "color" = "색깔"; -/* Unknown Dropped Pin title, when name can't be determined */ -"dropped_pin" = "알수 없는 핀"; - /* Default bookmarks set name */ "my_places" = "내 장소"; @@ -1381,3 +1378,5 @@ "error_enter_correct_zip_code" = "Enter correct ZIP Code"; "editor_operator" = "Operator"; + +"placepage_unknown_place" = "Unknown Place"; diff --git a/iphone/Maps/nb.lproj/Localizable.strings b/iphone/Maps/nb.lproj/Localizable.strings index 0e9770dfa1..3ea3ecbb04 100644 --- a/iphone/Maps/nb.lproj/Localizable.strings +++ b/iphone/Maps/nb.lproj/Localizable.strings @@ -242,9 +242,6 @@ /* Add bookmark dialog - bookmark color */ "color" = "Farge"; -/* Unknown Dropped Pin title, when name can't be determined */ -"dropped_pin" = "Droppet merke"; - /* Default bookmarks set name */ "my_places" = "Mine steder"; @@ -1381,3 +1378,5 @@ "error_enter_correct_zip_code" = "Enter correct ZIP Code"; "editor_operator" = "Operator"; + +"placepage_unknown_place" = "Unknown Place"; diff --git a/iphone/Maps/nl.lproj/Localizable.strings b/iphone/Maps/nl.lproj/Localizable.strings index 7ca540d688..9f52fd3c01 100644 --- a/iphone/Maps/nl.lproj/Localizable.strings +++ b/iphone/Maps/nl.lproj/Localizable.strings @@ -242,9 +242,6 @@ /* Add bookmark dialog - bookmark color */ "color" = "Kleur"; -/* Unknown Dropped Pin title, when name can't be determined */ -"dropped_pin" = "Geplaatste Speld"; - /* Default bookmarks set name */ "my_places" = "Mijn Plaatsen"; @@ -1381,3 +1378,5 @@ "error_enter_correct_zip_code" = "Enter correct ZIP Code"; "editor_operator" = "Operator"; + +"placepage_unknown_place" = "Unknown Place"; diff --git a/iphone/Maps/pl.lproj/Localizable.strings b/iphone/Maps/pl.lproj/Localizable.strings index d0803e6d8f..2f1afd1328 100644 --- a/iphone/Maps/pl.lproj/Localizable.strings +++ b/iphone/Maps/pl.lproj/Localizable.strings @@ -242,9 +242,6 @@ /* Add bookmark dialog - bookmark color */ "color" = "Kolor"; -/* Unknown Dropped Pin title, when name can't be determined */ -"dropped_pin" = "Znacznik"; - /* Default bookmarks set name */ "my_places" = "Moje miejsca"; @@ -1381,3 +1378,5 @@ "error_enter_correct_zip_code" = "Enter correct ZIP Code"; "editor_operator" = "Operator"; + +"placepage_unknown_place" = "Unknown Place"; diff --git a/iphone/Maps/pt.lproj/Localizable.strings b/iphone/Maps/pt.lproj/Localizable.strings index 85f6ed36bd..925e86dd1e 100644 --- a/iphone/Maps/pt.lproj/Localizable.strings +++ b/iphone/Maps/pt.lproj/Localizable.strings @@ -242,9 +242,6 @@ /* Add bookmark dialog - bookmark color */ "color" = "Cor"; -/* Unknown Dropped Pin title, when name can't be determined */ -"dropped_pin" = "Marcador posicionado"; - /* Default bookmarks set name */ "my_places" = "Os meus locais"; @@ -1381,3 +1378,5 @@ "error_enter_correct_zip_code" = "Enter correct ZIP Code"; "editor_operator" = "Operator"; + +"placepage_unknown_place" = "Unknown Place"; diff --git a/iphone/Maps/ro.lproj/Localizable.strings b/iphone/Maps/ro.lproj/Localizable.strings index 850a036a2c..b5e4bbf4fe 100644 --- a/iphone/Maps/ro.lproj/Localizable.strings +++ b/iphone/Maps/ro.lproj/Localizable.strings @@ -242,9 +242,6 @@ /* Add bookmark dialog - bookmark color */ "color" = "Culoare"; -/* Unknown Dropped Pin title, when name can't be determined */ -"dropped_pin" = "Poziție marcată"; - /* Default bookmarks set name */ "my_places" = "Locurile mele"; @@ -1381,3 +1378,5 @@ "error_enter_correct_zip_code" = "Enter correct ZIP Code"; "editor_operator" = "Operator"; + +"placepage_unknown_place" = "Unknown Place"; diff --git a/iphone/Maps/ru.lproj/Localizable.strings b/iphone/Maps/ru.lproj/Localizable.strings index 61991211e5..1ca6fc000a 100644 --- a/iphone/Maps/ru.lproj/Localizable.strings +++ b/iphone/Maps/ru.lproj/Localizable.strings @@ -242,9 +242,6 @@ /* Add bookmark dialog - bookmark color */ "color" = "Цвет"; -/* Unknown Dropped Pin title, when name can't be determined */ -"dropped_pin" = "Новая метка"; - /* Default bookmarks set name */ "my_places" = "Мои Метки"; @@ -1383,3 +1380,5 @@ "error_enter_correct_zip_code" = "Введите корректный почтовый индекс"; "editor_operator" = "Владелец"; + +"placepage_unknown_place" = "Неизвестное место"; diff --git a/iphone/Maps/sk.lproj/Localizable.strings b/iphone/Maps/sk.lproj/Localizable.strings index ead2cab428..1b879173e7 100644 --- a/iphone/Maps/sk.lproj/Localizable.strings +++ b/iphone/Maps/sk.lproj/Localizable.strings @@ -242,9 +242,6 @@ /* Add bookmark dialog - bookmark color */ "color" = "Farba"; -/* Unknown Dropped Pin title, when name can't be determined */ -"dropped_pin" = "Špendlík"; - /* Default bookmarks set name */ "my_places" = "Moje miesta"; @@ -1381,3 +1378,5 @@ "error_enter_correct_zip_code" = "Enter correct ZIP Code"; "editor_operator" = "Operator"; + +"placepage_unknown_place" = "Unknown Place"; diff --git a/iphone/Maps/sv.lproj/Localizable.strings b/iphone/Maps/sv.lproj/Localizable.strings index 1ff72682f1..b81fc338cc 100644 --- a/iphone/Maps/sv.lproj/Localizable.strings +++ b/iphone/Maps/sv.lproj/Localizable.strings @@ -242,9 +242,6 @@ /* Add bookmark dialog - bookmark color */ "color" = "Färg"; -/* Unknown Dropped Pin title, when name can't be determined */ -"dropped_pin" = "Släppt knappnål"; - /* Default bookmarks set name */ "my_places" = "Mina Platser"; @@ -1381,3 +1378,5 @@ "error_enter_correct_zip_code" = "Enter correct ZIP Code"; "editor_operator" = "Operator"; + +"placepage_unknown_place" = "Unknown Place"; diff --git a/iphone/Maps/th.lproj/Localizable.strings b/iphone/Maps/th.lproj/Localizable.strings index db00d225b4..3cfb42a912 100644 --- a/iphone/Maps/th.lproj/Localizable.strings +++ b/iphone/Maps/th.lproj/Localizable.strings @@ -242,9 +242,6 @@ /* Add bookmark dialog - bookmark color */ "color" = "สี"; -/* Unknown Dropped Pin title, when name can't be determined */ -"dropped_pin" = "ปักหมุด"; - /* Default bookmarks set name */ "my_places" = "สถานที่ของฉัน"; @@ -1381,3 +1378,5 @@ "error_enter_correct_zip_code" = "Enter correct ZIP Code"; "editor_operator" = "Operator"; + +"placepage_unknown_place" = "Unknown Place"; diff --git a/iphone/Maps/tr.lproj/Localizable.strings b/iphone/Maps/tr.lproj/Localizable.strings index 6af834a58c..af0b6276e4 100644 --- a/iphone/Maps/tr.lproj/Localizable.strings +++ b/iphone/Maps/tr.lproj/Localizable.strings @@ -242,9 +242,6 @@ /* Add bookmark dialog - bookmark color */ "color" = "Renk"; -/* Unknown Dropped Pin title, when name can't be determined */ -"dropped_pin" = "Bırakılan Pin"; - /* Default bookmarks set name */ "my_places" = "Yerlerim"; @@ -1381,3 +1378,5 @@ "error_enter_correct_zip_code" = "Enter correct ZIP Code"; "editor_operator" = "Operator"; + +"placepage_unknown_place" = "Unknown Place"; diff --git a/iphone/Maps/uk.lproj/Localizable.strings b/iphone/Maps/uk.lproj/Localizable.strings index fd24e76089..bb1ca2ad52 100644 --- a/iphone/Maps/uk.lproj/Localizable.strings +++ b/iphone/Maps/uk.lproj/Localizable.strings @@ -242,9 +242,6 @@ /* Add bookmark dialog - bookmark color */ "color" = "Колір"; -/* Unknown Dropped Pin title, when name can't be determined */ -"dropped_pin" = "Нова мітка"; - /* Default bookmarks set name */ "my_places" = "Мої Мітки"; @@ -1381,3 +1378,5 @@ "error_enter_correct_zip_code" = "Enter correct ZIP Code"; "editor_operator" = "Operator"; + +"placepage_unknown_place" = "Unknown Place"; diff --git a/iphone/Maps/vi.lproj/Localizable.strings b/iphone/Maps/vi.lproj/Localizable.strings index 03a44c6122..6fb9f5c010 100644 --- a/iphone/Maps/vi.lproj/Localizable.strings +++ b/iphone/Maps/vi.lproj/Localizable.strings @@ -242,9 +242,6 @@ /* Add bookmark dialog - bookmark color */ "color" = "Màu sắc"; -/* Unknown Dropped Pin title, when name can't be determined */ -"dropped_pin" = "Con Dấu đã Đặt"; - /* Default bookmarks set name */ "my_places" = "Các Địa chỉ của Tôi"; @@ -1381,3 +1378,5 @@ "error_enter_correct_zip_code" = "Enter correct ZIP Code"; "editor_operator" = "Operator"; + +"placepage_unknown_place" = "Unknown Place"; diff --git a/iphone/Maps/zh-Hans.lproj/Localizable.strings b/iphone/Maps/zh-Hans.lproj/Localizable.strings index f16cee137b..cddb7bf665 100644 --- a/iphone/Maps/zh-Hans.lproj/Localizable.strings +++ b/iphone/Maps/zh-Hans.lproj/Localizable.strings @@ -242,9 +242,6 @@ /* Add bookmark dialog - bookmark color */ "color" = "色彩"; -/* Unknown Dropped Pin title, when name can't be determined */ -"dropped_pin" = "已放置图钉"; - /* Default bookmarks set name */ "my_places" = "我的位置"; @@ -1381,3 +1378,5 @@ "error_enter_correct_zip_code" = "Enter correct ZIP Code"; "editor_operator" = "Operator"; + +"placepage_unknown_place" = "Unknown Place"; diff --git a/iphone/Maps/zh-Hant.lproj/Localizable.strings b/iphone/Maps/zh-Hant.lproj/Localizable.strings index 2abb5e771a..53c286a311 100644 --- a/iphone/Maps/zh-Hant.lproj/Localizable.strings +++ b/iphone/Maps/zh-Hant.lproj/Localizable.strings @@ -242,9 +242,6 @@ /* Add bookmark dialog - bookmark color */ "color" = "顏色"; -/* Unknown Dropped Pin title, when name can't be determined */ -"dropped_pin" = "已放置圖釘"; - /* Default bookmarks set name */ "my_places" = "我的地點"; @@ -1381,3 +1378,5 @@ "error_enter_correct_zip_code" = "Enter correct ZIP Code"; "editor_operator" = "Operator"; + +"placepage_unknown_place" = "Unknown Place"; diff --git a/map/framework.cpp b/map/framework.cpp index c5a5cdeadb..e5c116f8c1 100644 --- a/map/framework.cpp +++ b/map/framework.cpp @@ -304,7 +304,7 @@ Framework::Framework() // Init strings bundle. // @TODO. There are hardcoded strings below which are defined in strings.txt as well. // It's better to use strings form strings.txt intead of hardcoding them here. - m_stringsBundle.SetDefaultString("dropped_pin", "Dropped Pin"); + m_stringsBundle.SetDefaultString("placepage_unknown_place", "Unknown Place"); m_stringsBundle.SetDefaultString("my_places", "My Places"); m_stringsBundle.SetDefaultString("routes", "Routes"); m_stringsBundle.SetDefaultString("wifi", "WiFi"); @@ -687,7 +687,7 @@ void Framework::FillPointInfo(m2::PointD const & mercator, string const & custom if (feature) FillInfoFromFeatureType(*feature, info); else - info.m_customName = customTitle.empty() ? m_stringsBundle.GetString("dropped_pin") : customTitle; + info.m_customName = customTitle.empty() ? m_stringsBundle.GetString("placepage_unknown_place") : customTitle; // This line overwrites mercator center from area feature which can be far away. info.SetMercator(mercator); diff --git a/strings.txt b/strings.txt index 5e241e287d..cc15bbff33 100644 --- a/strings.txt +++ b/strings.txt @@ -2614,38 +2614,6 @@ nb = Farge fi = Väri - [dropped_pin] - en = Dropped Pin - tags = ios - comment = Unknown Dropped Pin title, when name can't be determined - cs = Špendlík - sk = Špendlík - de = Gesetzte Stecknadel - es = Etiqueta colocada - fr = Épingle placée - it = Pin trascinato - ja = ドロップしたピン - ko = 알수 없는 핀 - nl = Geplaatste Speld - ru = Новая метка - uk = Нова мітка - zh-Hant = 已放置圖釘 - pl = Znacznik - pt = Marcador posicionado - hu = Beszúrt jelző - th = ปักหมุด - zh-Hans = 已放置图钉 - ar = الدبوس المُثَبَت - da = Placeret knappenål - tr = Bırakılan Pin - sv = Släppt knappnål - he = סיכת סימון - id = Pin yang Ditancapkan - vi = Con Dấu đã Đặt - ro = Poziție marcată - nb = Droppet merke - fi = Pudotettu nasta - [my_places] en = My Places tags = ios @@ -16265,3 +16233,8 @@ tags = ios, android en = Operator ru = Владелец + + [placepage_unknown_place] + tags = ios, android + en = Unknown Place + ru = Неизвестное место