diff --git a/3party/opening_hours/rules_evaluation.cpp b/3party/opening_hours/rules_evaluation.cpp index 96218904cb..6df560b683 100644 --- a/3party/opening_hours/rules_evaluation.cpp +++ b/3party/opening_hours/rules_evaluation.cpp @@ -2,10 +2,8 @@ #include "rules_evaluation_private.hpp" #include -#include #include #include -#include #include #include @@ -112,9 +110,6 @@ osmoh::RuleState ModifierToRuleState(osmoh::RuleSequence::Modifier const modifie case Modifier::Comment: return osmoh::RuleState::Unknown; } - std::cerr << "Unreachable\n"; - std::abort(); - return osmoh::RuleState::Unknown; } // Transform timspan with extended end of the form of diff --git a/android/jni/com/mapswithme/maps/Framework.cpp b/android/jni/com/mapswithme/maps/Framework.cpp index 0a733474cf..9bcc415fe1 100644 --- a/android/jni/com/mapswithme/maps/Framework.cpp +++ b/android/jni/com/mapswithme/maps/Framework.cpp @@ -59,8 +59,6 @@ #include #include -#include - using namespace std; using namespace std::placeholders; @@ -176,8 +174,7 @@ bool Framework::CreateDrapeEngine(JNIEnv * env, jobject jSurface, int densityDpi // Vulkan is supported only since Android 8.0, because some Android devices with Android 7.x // have fatal driver issue, which can lead to process termination and whole OS destabilization. int constexpr kMinSdkVersionForVulkan = 26; - int const sdkVersion = android_get_device_api_level(); - LOG(LINFO, ("Android SDK version in the Drape Engine:", sdkVersion)); + int const sdkVersion = GetAndroidSdkVersion(); auto const vulkanForbidden = sdkVersion < kMinSdkVersionForVulkan || dp::SupportManager::Instance().IsVulkanForbidden(); if (vulkanForbidden) diff --git a/android/jni/com/mapswithme/maps/SearchEngine.cpp b/android/jni/com/mapswithme/maps/SearchEngine.cpp index c3dcdc43c1..53a8dd2ea5 100644 --- a/android/jni/com/mapswithme/maps/SearchEngine.cpp +++ b/android/jni/com/mapswithme/maps/SearchEngine.cpp @@ -39,7 +39,7 @@ FeatureID const kEmptyFeatureId; Results g_results; // Timestamp of last search query. Results with older stamps are ignored. -jlong g_queryTimestamp; +uint64_t g_queryTimestamp; // Implements 'NativeSearchListener' java interface. jobject g_javaListener; jmethodID g_updateResultsId; @@ -74,7 +74,7 @@ jobject ToJavaResult(Result & result, search::ProductInfo const & productInfo, b jni::TScopedLocalIntArrayRef ranges( env, env->NewIntArray(static_cast(result.GetHighlightRangesCount() * 2))); jint * rawArr = env->GetIntArrayElements(ranges, nullptr); - for (size_t i = 0; i < result.GetHighlightRangesCount(); i++) + for (int i = 0; i < result.GetHighlightRangesCount(); i++) { auto const & range = result.GetHighlightRange(i); rawArr[2 * i] = range.first; @@ -146,7 +146,7 @@ jobject ToJavaResult(Result & result, search::ProductInfo const & productInfo, b } void OnResults(Results const & results, vector const & productInfo, - jlong timestamp, bool isMapAndTable, bool hasPosition, double lat, double lon) + long long timestamp, bool isMapAndTable, bool hasPosition, double lat, double lon) { // Ignore results from obsolete searches. if (g_queryTimestamp > timestamp) @@ -158,12 +158,13 @@ void OnResults(Results const & results, vector const & prod { jni::TScopedLocalObjectArrayRef jResults( env, BuildSearchResults(results, productInfo, hasPosition, lat, lon)); - env->CallVoidMethod(g_javaListener, g_updateResultsId, jResults.get(), timestamp); + env->CallVoidMethod(g_javaListener, g_updateResultsId, jResults.get(), + static_cast(timestamp)); } if (results.IsEndMarker()) { - env->CallVoidMethod(g_javaListener, g_endResultsId, timestamp); + env->CallVoidMethod(g_javaListener, g_endResultsId, static_cast(timestamp)); if (isMapAndTable && results.IsEndedNormal()) g_framework->NativeFramework()->GetSearchAPI().PokeSearchInViewport(); } diff --git a/android/jni/com/mapswithme/opengl/androidoglcontextfactory.cpp b/android/jni/com/mapswithme/opengl/androidoglcontextfactory.cpp index f71451471b..4089939de8 100644 --- a/android/jni/com/mapswithme/opengl/androidoglcontextfactory.cpp +++ b/android/jni/com/mapswithme/opengl/androidoglcontextfactory.cpp @@ -10,7 +10,6 @@ #include #include -#include #include #include @@ -107,9 +106,14 @@ AndroidOGLContextFactory::AndroidOGLContextFactory(JNIEnv * env, jobject jsurfac } // Check ES3 availability. - bool const isES3Supported = IsSupportedRGB8(m_display, true /* es3 */) && - android_get_device_api_level() >= kMinSdkVersionForES3; - m_supportedES3 = isES3Supported && gl3stubInit(); + bool availableES3 = IsSupportedRGB8(m_display, true /* es3 */); + if (availableES3) + { + int const sdkVersion = GetAndroidSdkVersion(); + if (sdkVersion != 0) + availableES3 = (sdkVersion >= kMinSdkVersionForES3); + } + m_supportedES3 = availableES3 && gl3stubInit(); SetSurface(env, jsurface); diff --git a/android/jni/com/mapswithme/platform/Platform.cpp b/android/jni/com/mapswithme/platform/Platform.cpp index 28d17923a3..483a365f37 100644 --- a/android/jni/com/mapswithme/platform/Platform.cpp +++ b/android/jni/com/mapswithme/platform/Platform.cpp @@ -16,6 +16,8 @@ #include #include +#include + std::string Platform::GetMemoryInfo() const { JNIEnv * env = jni::GetEnv(); @@ -241,6 +243,19 @@ void Platform::AndroidSecureStorage::Remove(std::string const & key) env->CallStaticVoidMethod(m_secureStorageClass, removeMethodId, context, jni::TScopedLocalRef(env, jni::ToJavaString(env, key)).get()); } + +int GetAndroidSdkVersion() +{ + char osVersion[PROP_VALUE_MAX + 1]; + if (__system_property_get("ro.build.version.sdk", osVersion) == 0) + return 0; + + int version; + if (!strings::to_int(std::string(osVersion), version)) + version = 0; + + return version; +} } // namespace android Platform & GetPlatform() diff --git a/android/jni/com/mapswithme/platform/Platform.hpp b/android/jni/com/mapswithme/platform/Platform.hpp index 10e9e5e6b9..9693484ca7 100644 --- a/android/jni/com/mapswithme/platform/Platform.hpp +++ b/android/jni/com/mapswithme/platform/Platform.hpp @@ -55,4 +55,7 @@ private: jobject m_functorProcessObject = nullptr; AndroidSecureStorage m_secureStorage; }; + +extern int GetAndroidSdkVersion(); + } // namespace android diff --git a/android/res/values-ar/strings.xml b/android/res/values-ar/strings.xml index fef6feabe9..b3f71ce3e7 100644 --- a/android/res/values-ar/strings.xml +++ b/android/res/values-ar/strings.xml @@ -1254,28 +1254,22 @@ متجر صغير محل نسخ مستحضرات تجميل - ﺔﺒﻠﻌﻤﻟﺍ ﺔﻤﻌﻃﻷﺍ ﻊﻴﺒﻟ ﻞﺤﻣ متجر شامل متجر عدد وأدوات غسيل جاف متجر إلكترونيات متجر منتجات جنسية متجر - ﺔﻋﺭﺰﻤﻟﺍ ﺔﻳﺬﻏﺃ ﺮﺠﺘﻣ متجر زهور منظموا الجنازات معرض أثاث حضانة متجر هدايا متجر خضروات وفواكه - ﺕﺍﻭﺮﻀﺧ مصفف شعر - ﺕﺍﺪﻌﻣ ﻞﺤﻣ - ﺔﻴﺤﺼﻟﺍ ﺔﻳﺬﻏﻼﻟ ﺮﺠﺘﻣ - ﺔﻴﻟﺰﻨﻣ ﺕﺍﻭﺩﺃ ﻞﺤﻣ + متجر عدد وأدوات مجوهرات كشك - ﺦﺒﻄﻤﻟﺍ ﺮﺠﺘﻣ مغسلة ملابس مركز تسوق قاعة تدليك @@ -1287,12 +1281,10 @@ كشك الجرائد مركز بصريات معدات خارجية - ﺕﺎﻨﺠﻌﻣ سمسار تسليف متجر للحيوانات الأليفة محل صور سماك - ﺔﻠﻤﻌﺘﺴﻣ ﺕﺍﻭﺩﺍ ﺮﺠﺘﻣ متجر أحذية أدوات رياضية متجر قرطاسية @@ -1307,29 +1299,6 @@ متجر فيديو متجر ألعاب فيديو متجر مشروبات روحية - ﻒﺤﺘﻟﺍ - ﻥﻮﻨﻔﻟﺍ ﺮﺠﺘﻣ - ﻝﺎﻔﻃﻸﻟ ﺮﺠﺘﻣ - ﺐﺋﺎﻘﺤﻟﺍ ﺮﺠﺘﻣ - ﺮﺠﺘﻣ - ﻱﺮﻴﺧ ﺮﺠﺘﻣ - ﻦﺒﺠﻟﺍ ﺮﺠﺘﻣ - ﺔﻳﻭﺪﻴﻟﺍ ﻑﺮﺤﻟﺍﻭ ﻥﻮﻨﻔﻟﺍ - ﻥﺎﺒﻟﻷﺍ ﺕﺎﺠﺘﻨﻣ - ﺔﻴﺋﺎﺑﺮﻬﻜﻟﺍ ﺕﺍﻭﺩﻷﺍ ﺮﺠﺘﻣ - ﺪﻴﺻ ﺮﺠﺘﻣ - ﺔﻴﻠﺧﺍﺩ ﺕﺍﺭﻮﻜﻳﺩ - ﺐﻴﺼﻧﺎﻴﻟﺍ ﺮﻛﺍﺬﺗ - ﺔﻴﺒﻄﻟﺍ ﺕﺍﺩﺍﺪﻣﻹﺍ - ﺔﻴﺋﺍﺬﻏ ﺕﻼﻤﻜﻣ - ﺕﺎﻧﺎﻫﺪﻟﺍ - ﺭﻮﻄﻌﻟﺍ - ﺔﻃﺎﻴﺨﻟﺍ ﺕﺍﺪﻌﻣ - ﻦﻳﺰﺨﺘﻟﺍ ﺕﺍﺪﺣﻭ ﺮﻴﺟﺄﺗ - ﻎﺒﺗ - ﺔﻳﺭﺎﺠﺘﻟﺍ ﺕﺍﺪﻳﺭﻮﺘﻟﺍ - ﺕﺎﻋﺎﺳ - ﺔﻠﻤﺠﻟﺎﺑ ﺔﻴﺋﺍﺬﻐﻟﺍ ﺩﺍﻮﻤﻟﺍ ﺓﺭﺎﺠﺗ رياضة كرة القدم الأمريكية الرماية diff --git a/android/res/values-be/strings.xml b/android/res/values-be/strings.xml index 8d2d490387..1f8ad45215 100644 --- a/android/res/values-be/strings.xml +++ b/android/res/values-be/strings.xml @@ -915,39 +915,7 @@ Напоі Продаж аўтадамоў Касметыка - Дэлікатэсная крама - Сельскагаспадарчыя прадукты Рытуальныя паслугі - Бакалея - Будаўнічы магазін - Крама здаровай ежы - Крама посуду - Крама для кухні - Кандытарскія вырабы - Крама сэканд-хэнд - Антыкварыят - Крама мастацтваў - Дзіцячая крама - Крама сумак - Буцік - Дабрачынная крама - Сырны магазін - Мастацтва і рамёствы - Малочныя прадукты - Крама электратэхнікі - Рыбалоўны магазін - Ўпрыгажэнні інтэр\'еру - Латарэйныя білеты - Медыцынскія прыналежнасці - Харчовыя дабаўкі - Фарбы - Парфумерыя - Швейныя прыналежнасці - Арэнда сховішчаў - Тытунь - Гандлёвая прыналежнасць - Гадзіннік - Аптовая крама Спорт Амерыканскі футбол Стральба з лука diff --git a/android/res/values-bg/strings.xml b/android/res/values-bg/strings.xml index 431fb13335..7b41807a79 100644 --- a/android/res/values-bg/strings.xml +++ b/android/res/values-bg/strings.xml @@ -780,38 +780,6 @@ Торфено блато Блато Телекомуникационна компания - Магазин за деликатеси - Магазин за селскостопански храни - Хранителни стоки - Магазин за хардуер - Магазин за здравословни храни - Магазин за домакински принадлежности - Магазин за кухня - Тестени изделия - Магазин втора употреба - Антики - Магазин за изкуства - Детски магазин - Магазин за чанти - Бутик - Благотворителен магазин - Магазин за сирене - Изкуства и занаяти - Млечни продукти - Електрически магазин - Риболовен магазин - Вътрешни декорации - Лотарийни билети - Медицински изделия - Хранителни добавки - Бои - Парфюмерия - Шивашки консумативи - Склад под наем - Тютюн - Търговия с консумативи - Часовници - Магазин на едро Спорт Американски футбол Стрелба с лък diff --git a/android/res/values-cs/strings.xml b/android/res/values-cs/strings.xml index 6118148e9c..43a05ef7ac 100644 --- a/android/res/values-cs/strings.xml +++ b/android/res/values-cs/strings.xml @@ -1247,27 +1247,21 @@ Smíšené zboží Kopírovací obchod Kosmetika - Prodejna lahůdek Obchodní dům Železářství Chemické čištění Elektronika Obchod s erotickými pomůckami Obchod - Prodejna farmářských potravin Květinářství Pohřební služba Nábytek Školka Obchod s dárkovým zbožím Ovoce a zelenina - Potraviny Kadeřnictví Železářství - Prodejna zdravé výživy - Obchod s domácími potřebami Klenotnictví - Prodejna kuchyní Prádelna Obchoďák Masážní salon @@ -1279,12 +1273,10 @@ Novinový stánek Optika Venkovní vybavení - Pečivo Zastavárna Zverimex Fotografický obchod Prodej ryb - Obchod z druhé ruky Obuv Sportovní zboží Papírnictví @@ -1298,29 +1290,6 @@ Videopůjčovna Obchod s videohrami Vinařství - Starožitnosti - Obchod s uměním - Dětský obchod - Obchod s taškami - Butik - Charitativní obchod - Prodejna sýrů - Umění a řemesla - Mléčné výrobky - Elektro obchod - Rybářský obchod - Interiérové dekorace - Loterijní lístky - Zdravotní zásoby - Doplňky výživy - Barvy - Parfumerie - Šicí potřeby - Pronájem skladu - Tabák - Obchod se zásobami - Hodinky - Velkoobchodní prodejna Sport Americký fotbal Lukostřelba diff --git a/android/res/values-da/strings.xml b/android/res/values-da/strings.xml index 562ab92b9e..67778e00be 100644 --- a/android/res/values-da/strings.xml +++ b/android/res/values-da/strings.xml @@ -1236,27 +1236,21 @@ Døgnbutik Kopieringsbutik Kosmetik - Delikatessebutik Stormagasin Isenkræmmer Renseri Elektronikbutik Erotisk butik Butik - Farm Food Shop Blomsterbutik Bedemand Møbelbutik Planteskole Gavebutik Grønthandler - Købmand Frisør Isenkræmmer - Helsekostbutik - Husholdningsartikler butik Smykkebutik - Køkkenforretning Vaskeri Indkøbscenter Massageklinik @@ -1268,12 +1262,10 @@ Avis-kiosk Optiker Fritidsudstyr - Bagværk Pantelåner Dyrehandel Fotobutik Fiskehandler - Genbrugsbutik Skobutik Sportsudstyr Kontorartikler @@ -1288,29 +1280,6 @@ Videobutik Computerspilbutik Vinhandel - Antikviteter - Kunstbutik - Børnebutik - Tasker butik - Boutique - Velgørenhedsbutik - Ostebutik - Kunst og kunsthåndværk - Mejeriprodukter - El-butik - Fiskeri butik - Indvendige dekorationer - Lotterikuponer - Medicinske forsyninger - Kosttilskud - Maling - Parfumeri - Syudstyr - Lagerudlejning - Tobak - Handler forsyninger - Ure - Engros butik Sport Amerikansk fodbold Bueskydning diff --git a/android/res/values-de/strings.xml b/android/res/values-de/strings.xml index 6ecac1f3f8..01c8603d17 100644 --- a/android/res/values-de/strings.xml +++ b/android/res/values-de/strings.xml @@ -1451,27 +1451,21 @@ Gemischtwarenladen Kopierladen Kosmetikgeschäft - Feinkostgeschäft Kaufhaus Baumarkt Chemische Reinigung Elektronik Erotikladen Textilgeschäft - Hoflebensmittelladen Florist Bestattungsinstitut Möbelgeschäft Gärtnerei Geschenkladen Gemüseladen - Lebensmittelgeschäft Friseur - Baumarkt - Reformhaus - Haushaltswarengeschäft + Eisenwarengeschäft Juweliergeschäft - Küchengeschäft Wäscherei Einkaufszentrum Massagesalon @@ -1483,12 +1477,10 @@ Zeitungsstand Optiker Outdoor-Ausrüstung - Gebäck Pfandleihe Tierhandlung Fotofachgeschäft Fischhändler - Second-Hand-Laden Schuhgeschäft Sportartikel Schreibwarenladen @@ -1503,29 +1495,6 @@ Videothek Gameshop Wein- und Spirituosengeschäft - Antiquitäten - Kunstgeschäft - Kinderladen - Taschen Shop - Boutique - Wohltätigkeitsladen - Käseladen - Kunst und Handwerk - Milchprodukte - Elektrogeschäft - Angelgeschäft - Innendekorationen - Lotteriescheine - Medizinische Versorgung - Nahrungsergänzungsmittel - Farben - Parfümerie - Nähzubehör - Speichermiete - Tabak - Handelsbedarf - Uhren - Großhandelsgeschäft Sport American Football Bogenschießen diff --git a/android/res/values-el/strings.xml b/android/res/values-el/strings.xml index b4742bb7a8..b4929065df 100644 --- a/android/res/values-el/strings.xml +++ b/android/res/values-el/strings.xml @@ -1250,28 +1250,22 @@ Ψιλικατζίδικο Φωτοτυπείο Καλλυντικά - Κατάστημα Delicatessen Πολυκατάστημα Είδη κιγκαλερίας Στεγνό καθάρισμα Ηλεκτρονικά Κατάστημα ερωτικών ειδών Κατάστημα - Κατάστημα Αγροτικών Τροφίμων Ανθοπωλείο Γραφεία τελετών Κατάστημα επίπλων Κατάστημα ειδών κήπου Είδη δώρου Μανάβικο - Παντοπωλείο Κομμωτής - Κατάστημα υλικού - Κατάστημα υγιεινής διατροφής - Κατάστημα οικιακών ειδών + Είδη κιγκαλερίας Κοσμηματοπωλείο Περίπτερο - Κατάστημα κουζίνας Άπλυτα Εμπορικό κέντρο Αίθουσα μασάζ @@ -1283,12 +1277,10 @@ Εφημεριδοπώλης Κατάστημα οπτικών Εξοπλισμός υπαίθρου - Ζύμη Ενεχυροδανειστήριο Κατάστημα για κατοικίδια Φωτογραφείο Κατάστημα με θαλασσινά - Κατάστημα μεταχειρισμένων Υποδηματοπωλείο Αθλητικά είδη Κατάστημα γραφικής ύλης @@ -1303,29 +1295,6 @@ Βίντεο Κλαμπ Κατάστημα βιντεοπαιχνιδιών Οινοπωλείο - Αντίκες - Κατάστημα Τεχνών - Παιδικό κατάστημα - Κατάστημα τσαντών - Μπουτίκ - Φιλανθρωπικό κατάστημα - Τυροκομείο - Τέχνες και χειροτεχνήματα - Γαλακτοκομικά προϊόντα - Μαγαζί ηλεκτρικών ειδών - Κατάστημα ψαρέματος - Διακοσμήσεις εσωτερικών χώρων - Λαχεία - Ιατρικά Είδη - Συμπληρώματα Διατροφής - Βαφές - Αρωματοποιία - Είδη Ραπτικής - Ενοικίαση αποθηκευτικού χώρου - Καπνός - Εμπόριο Προμήθειες - Ρολόγια - Κατάστημα χονδρικής Αθλητισμός αμερικάνικο ποδόσφαιρο Τοξοβολία diff --git a/android/res/values-es/strings.xml b/android/res/values-es/strings.xml index f25dc0cdb0..f4a7d26d47 100644 --- a/android/res/values-es/strings.xml +++ b/android/res/values-es/strings.xml @@ -1345,28 +1345,22 @@ Tienda de barrio Centro de copiado Productos cosméticos - Tienda de delicatessen Grandes almacenes Ferretería Tintorería Electrónica Sex Shop Tienda - Tienda de alimentos de granja Floristería Funeraria Tienda de muebles Vivero Tienda de regalos Frutería - Tienda de comestibles Peluquería Ferretería - Tienda de comida saludable - Tienda de artículos para el hogar Joyería Quiosco - Tienda de cocina Lavandería Centro comercial Salón de masajes @@ -1378,12 +1372,10 @@ Puesto de venta de periódicos Óptica Equipamiento - Pastelería Casa de empeños Tienda de mascotas Artículos de fotografía Pescadería - Tienda de segunda mano Zapatería Artículos de deporte Papelería @@ -1398,29 +1390,6 @@ Tienda de vídeo Tienda de videojuegos Tienda de vinos - Antigüedades - Tienda de artes - Tienda de niños - Tienda de bolsos - Boutique - Tienda de caridad - Tienda de queso - Artes y manualidades - Productos lácteos - Tienda de electricidad - Tienda de pesca - Decoraciones interiores - Boletos de lotería - Suministros médicos - Suplementos Nutricionales - Pinturas - Perfumería - Materiales de costura - Alquiler de almacenamiento - Tabaco - Suministros comerciales - Relojes - Almacén al por mayor Deporte Fútbol americano Tiro al arco diff --git a/android/res/values-eu/strings.xml b/android/res/values-eu/strings.xml index 0fd75993d4..f75daf3174 100644 --- a/android/res/values-eu/strings.xml +++ b/android/res/values-eu/strings.xml @@ -1311,28 +1311,22 @@ Auzoko denda Kopiatu zentroa Produktu kosmetikoak - Delicatesen Denda Denda handiak Burdindegia Garbigailua Elektronika Sexu denda Denda - Baserriko Janari Denda Loradenda Tanatorioa Altzari denda Haurtzaindegia Denda Fruta denda - Janariak Barber-denda - Hardware denda - Osasuneko Elikagaien Denda - Etxeko tresneria denda + Burdindegia Bitxiak Kioskoa - Sukalde-denda Garbitegia Merkataritza-gune Masaje gela @@ -1344,12 +1338,10 @@ Kioskoa Optika Ekipamendua - Gozogintza Peoia Animali denda Argazkilaritza artikuluak Arrain-denda - Bigarren eskuko denda Zapata-denda Kirol artikuluak Papergintza @@ -1364,29 +1356,6 @@ Bideo-denda Bideo-jokoen denda Ardo-denda - Antigoalekoak - Arte Denda - Haurrentzako denda - Poltsen Denda - Boutique - Ongintzazko Denda - Gazta Denda - Arteak eta Eskulanak - Esnekiak - Elektrizitate Denda - Arrantza Denda - Barruko Apaingarriak - Loteria Sarrerak - Medikuntza-hornidura - Nutrizio osagarriak - Margoak - Lurringintza - Josteko hornigaiak - Biltegiratzeko alokairua - Tabakoa - Lanbideen hornidurak - Erlojuak - Handizkako denda Kirola Futbola Arku-tiroa diff --git a/android/res/values-fa/strings.xml b/android/res/values-fa/strings.xml index fe2e445d7d..33993ac4c3 100644 --- a/android/res/values-fa/strings.xml +++ b/android/res/values-fa/strings.xml @@ -1157,28 +1157,22 @@ فروشگاه فروشگاه چاپ و تکثیر فروشگاه - ﯽﺷﻭﺮﻓ ﻪﯾﺬﻏﺍ ﻩﺎﮕﺷﻭﺮﻓ مرکز خرید فروشگاه خشک شویی فروشگاه فروشگاه فروشگاه - ﻪﻋﺭﺰﻣ ﯽﯾﺍﺬﻏ ﺩﺍﻮﻣ ﻩﺎﮕﺷﻭﺮﻓ فروشگاه مسئول تشییع جنازه فروشگاه فروشگاه فروشگاه فروشگاه - ﺭﺎﺑﺭﺍﻮﺧ ارایشگاه - ﺭﺍﺰﻓﺍ ﺖﺨﺳ ﻩﺎﮕﺷﻭﺮﻓ - ﯽﺘﺷﺍﺪﻬﺑ ﯽﯾﺍﺬﻏ ﺩﺍﻮﻣ ﻩﺎﮕﺷﻭﺮﻓ - ﯽﮕﻧﺎﺧ ﻡﺯﺍﻮﻟ ﻩﺎﮕﺷﻭﺮﻓ + فروشگاه طلا فروشی دَکهِ - ﻪﻧﺎﺧﺰﭙﺷﺁ ﻩﺎﮕﺷﻭﺮﻓ لباس شویی فروشگاه سالن ماساژ @@ -1190,12 +1184,10 @@ فروشگاه فروشگاه فروشگاه - ﯽﻨﯾﺮﯿﺷ عتیقه فروشی فروشگاه فروشگاه فروشگاه - ﻡﻭﺩ ﺖﺳﺩ ﻩﺎﮕﺷﻭﺮﻓ فروشگاه فروشگاه لوازم التحریر @@ -1210,29 +1202,6 @@ فروشگاه رسانه‌های تصویری فروشگاه بازی‌های رایانه‌ای فروشگاه - ﺕﺎﺟ ﻪﻘﯿﺘﻋ - ﺮﻨﻫ ﻩﺎﮕﺷﻭﺮﻓ - ﻥﺎﮐﺩﻮﮐ ﻩﺎﮕﺷﻭﺮﻓ - ﻒﯿﮐ ﻩﺎﮕﺷﻭﺮﻓ - ﮏﯿﺗﻮﺑ - ﻪﯾﺮﯿﺧ ﻩﺎﮕﺷﻭﺮﻓ - ﺮﯿﻨﭘ ﻩﺎﮕﺷﻭﺮﻓ - ﯽﺘﺳﺩ ﻊﯾﺎﻨﺻ ﻭ ﺮﻨﻫ - ﯽﻨﺒﻟ ﺕﻻﻮﺼﺤﻣ - ﯽﮑﯾﺮﺘﮑﻟﺍ ﻡﺯﺍﻮﻟ ﻩﺯﺎﻐﻣ - ﯼﺮﯿﮕﯿﻫﺎﻣ ﻩﺎﮕﺷﻭﺮﻓ - ﯽﻠﺧﺍﺩ ﻥﻮﯿﺳﺍﺭﻮﮐﺩ - ﯽﯾﺎﻣﺯﺁ ﺖﺨﺑ ﻂﯿﻠﺑ - ﯽﮑﺷﺰﭘ ﻡﺯﺍﻮﻟ - ﯽﯾﺍﺬﻏ ﯼﺎﻫ ﻞﻤﮑﻣ - ﺪﻨﮐ ﯽﻣ ﮓﻧﺭ - ﯼﺯﺎﺳﺮﻄﻋ - ﯽﻃﺎﯿﺧ ﻡﺯﺍﻮﻟ - ﺭﺎﺒﻧﺍ ﻩﺭﺎﺟﺍ - ﻮﮐﺎﺒﻨﺗ - ﻡﺯﺍﻮﻟ ﺕﺭﺎﺠﺗ - ﺖﻋﺎﺳ - ﯽﺷﻭﺮﻓ ﻩﺪﻤﻋ ﻩﺎﮕﺷﻭﺮﻓ ورزش فوتبال آمریکایی تیراندازی با کمان diff --git a/android/res/values-fi/strings.xml b/android/res/values-fi/strings.xml index 14ff9271f4..0d466e684a 100644 --- a/android/res/values-fi/strings.xml +++ b/android/res/values-fi/strings.xml @@ -1261,28 +1261,22 @@ Lähikauppa Painotalo Kosmetiikka - Herkkukauppa Tavaratalo Rautakauppa Kuivapesula Elektroniikka Erotiikkaliike Kauppa - Maatilaruokakauppa Floristi Hautaustoimisto Huonekalukauppa Taimitarha Lahjatavaraliike Vihanneskauppias - Päivittäistavarakauppa Kampaamo Rautakauppa - Terveysruokakauppa - Taloustavarakauppa Korukauppa Kioski - Keittiökauppa Pesula Ostoskeskus Hierontahuone @@ -1294,12 +1288,10 @@ Lehtikioski Optikko Ulkoiluvarusteet - Leivonnainen Panttilainaamo Eläinkauppa Valokuvakauppa Kalakauppias - Second Hand Store Kenkäkauppa Urheilukauppa Kirjoitustarvikekauppa @@ -1314,29 +1306,6 @@ Videokauppa Videopelikauppa Alkoholimyymälä - Antiikkia - Taidekauppa - Lasten kauppa - Laukkukauppa - Boutique - Hyväntekeväisyysmyymälä - Juustokauppa - Käsityöt - Maitotuotteet - Sähköliike - Kalastuskauppa - Sisustuskoristeet - Lottoliput - Lääketieteellisiä tarvikkeita - Ravintolisät - Maalit - Hajuvedet - Ompelutarvikkeet - Varastoinnin vuokraus - Tupakka - Kauppa tarvikkeita - Kellot - Tukkukauppa Urheilu Amerikkalainen jalkapallo Jousiammunta diff --git a/android/res/values-fr/strings.xml b/android/res/values-fr/strings.xml index fd594131de..8888ac112d 100644 --- a/android/res/values-fr/strings.xml +++ b/android/res/values-fr/strings.xml @@ -1409,28 +1409,22 @@ Supérette Boutique de photocopies Produits de beauté - Épicerie fine Grand magasin Magasin de bricolage Nettoyage à sec Magasin d\'électroménager Boutique érotique Magasin de tissus - Magasin d\'alimentation à la ferme Fleuriste Pompes funèbres Magasin de meubles Jardinerie Boutique de souvenirs Primeur - Épicerie Coiffeur Quincaillerie - Magasin d\'alimentation diététique - Magasin d\'articles ménagers Bijouterie Kiosque - Magasin de cuisine Laverie Centre commercial Salon de massage @@ -1442,12 +1436,10 @@ Kiosque à journaux Opticien Matériel de loisirs de plein air - Pâtisserie Prêteur sur gages Animalerie Matériel de photographie Poissonnier - Boutique d\'objets d\'occasion Magasin de chaussures Articles de sport Papeterie @@ -1462,29 +1454,6 @@ Boutique de vidéos Boutique de jeux vidéo Caviste - Antiquités - Boutique d\'art - Magasin pour enfants - Magasin de sacs - Boutique - Magasin de charité - Fromagerie - L\'artisanat - Les produits laitiers - Store électrique - Magasin de pêche - Décorations intérieures - Tickets de loterie - Materiel médical - Suppléments nutritionnels - Des peintures - Parfumerie - Matériel de couture - Location de stockage - Le tabac - Fournitures de métiers - Montres - Magasin de gros Sport Football américain Tir à l\'arc diff --git a/android/res/values-hu/strings.xml b/android/res/values-hu/strings.xml index 21ab9bc792..4812f39fbc 100644 --- a/android/res/values-hu/strings.xml +++ b/android/res/values-hu/strings.xml @@ -1246,28 +1246,22 @@ Csemegebolt Fénymásoló üzlet Kozmetikum - Csemegebolt Áruház Vaskereskedés Ruhatisztító Elektronika Erotikus bolt Bolt - Farm Food Shop Virágos Temetkezési vállalkozó Bútoráruház Faiskola Ajándékbolt Zöldséges - Élelmiszerbolt Fodrász - Hardver üzlet - Egészségügyi élelmiszerbolt - Háztartási bolt + Vaskereskedés Ékszer Trafik - Konyhabolt Mosoda A pláza Masszázs szalon @@ -1279,12 +1273,10 @@ Újságárus Optika Kültéri felszerelés - Cukrászsütemény Zálogház Házikedvenc-üzlet Fénykép üzlet Halüzlet - Second Hand Store Cipőbolt Sporteszközök Írószer bolt @@ -1299,29 +1291,6 @@ Videotéka Videojáték bolt Szeszesital-üzlet - Régiségek - Művészeti Bolt - Gyermekbolt - Táskák bolt - Butik - Jótékonysági Bolt - Sajtbolt - Művészetek és kézművesség - Tejtermékek - Elektronikai üzlet - Horgászbolt - Belső dekorációk - Sorsjegyek - Orvosi eszközök - Táplálékkiegészítők - Festékek - Illatszerek - Varrás kellékek - Tárhely bérlés - Dohány - Kellékekkel kereskedik - Órák - Nagykereskedelmi üzlet Sport Amerikai foci Íjászat diff --git a/android/res/values-in/strings.xml b/android/res/values-in/strings.xml index 367a5939b9..f8fdb6b722 100644 --- a/android/res/values-in/strings.xml +++ b/android/res/values-in/strings.xml @@ -1239,28 +1239,22 @@ Mini market Fotokopi Kosmetik - Toko Kue Toko serba ada Toko perangkat keras Cuci Kering Elektronik Toko Erotik Toko - Toko Makanan Pertanian Tukang bunga Direktur Pemakaman Toko mebel Penitipan anak Toko hadiah Penjual sayuran - Kebutuhan sehari-hari Penata rambut Toko perangkat keras - Toko Makanan Kesehatan - Toko Peralatan Rumah Tangga Perhiasan Toko - Toko Dapur Londri Tempat Pijat Toko telepon @@ -1271,12 +1265,10 @@ Kios Surat Kabar Toko kacamata Peralatan Outdoor - Kue-kue Rumah Gadai Toko hewan Studio Foto Penjual Ikan - Toko Barang bekas Toko sepatu Barang olahraga Toko Alat Tulis @@ -1290,29 +1282,6 @@ Toko video Toko permainan video Toko anggur - Barang antik - Toko Seni - Toko anak-anak - Toko Tas - Butik - Toko Amal - Toko Keju - Seni dan kerajinan - Produk susu - Toko elektronik - Toko Memancing - Dekorasi Interior - Tiket Lotere - Suplai medis - Suplemen Nutrisi - Cat - Wewangian - Perlengkapan Jahit - Sewa Penyimpanan - Tembakau - Perlengkapan Perdagangan - Jam tangan - Toko Grosir Olahraga Sepak Bola Amerika Panahan diff --git a/android/res/values-it/strings.xml b/android/res/values-it/strings.xml index cc121735c0..ad5dcfceab 100644 --- a/android/res/values-it/strings.xml +++ b/android/res/values-it/strings.xml @@ -1282,28 +1282,22 @@ Minimarket Copisteria Cosmetici - Negozio di specialità gastronomiche Grandi magazzini Ferramenta Lavaggio a secco Negozio di elettronica Sexy Shop Negozio - Negozio di prodotti alimentari della fattoria Fiorista Pompe funebri Negozio di mobili Vivaio Negozio di regali Fruttivendolo - Drogheria Parrucchiera - Negozio hardware - Negozio di alimenti naturali - Negozio di casalinghi + Ferramenta Gioielleria Chiosco - Negozio di cucina Lavanderia Il centro commerciale Centro massaggi @@ -1315,12 +1309,10 @@ Edicola Ottico Attrezzatura sportiva - Pasticcino Pegni Negozio di animali Negozio di fotografia Pescivendolo - Negozio di articoli usati Negozio di scarpe Negozio sportivo Cartoleria @@ -1335,29 +1327,6 @@ Videoteca Negozio di videogiochi Negozio di alcolici - Oggetti d\'antiquariato - Negozio d\'arte - Negozio per bambini - Negozio di borse - Boutique - Negozio di beneficenza - Negozio di formaggi - Arti e mestieri - Latticini - Negozio di articoli elettrici - Negozio di pesca - Decorazioni per interni - Biglietti della lotteria - Forniture mediche - Integratori Alimentari - Vernici - Profumeria - Forniture per il cucito - Noleggio deposito - Tabacco - Forniture commerciali - Orologi - Negozio all\'ingrosso Sport Football americano Tiro con l\'arco diff --git a/android/res/values-iw/strings.xml b/android/res/values-iw/strings.xml index 5b9aa6fa81..108dc967e9 100644 --- a/android/res/values-iw/strings.xml +++ b/android/res/values-iw/strings.xml @@ -447,38 +447,6 @@ ביצה ביצת כבול ביצת עשב - תוינדעמ תונח - הווחל ןוזמ תונח - תלֶוֹכּמַ - ןיינב ירמוחל תונח - תואירב ןוזמ תונח - תיב ילכל תונח - םיחבטמ תונח - הפאמ - היינש די תונח - תוֹקיתִעַ - תויונמוא תונח - םידליל תונח - םיקית תונח - קיטוב - הקדצ תונח - תוניבג תונח - הריציו תונמוא - בלח ירצומ - למשח תונח - גייד תונח - םינפ יטושיק - הלרגה יסיטרכ - יאופר דויצ - הנוזת יפסות - םיעבצ - תמַשְׂבָּ - הריפת דויצ - ןוסחא תרכשה - קבָּטַ - הקפסאב רחוס - םינועש - תיאנוטיס תונח ספורט כדורגל אמריקאי קַשׁתוּת diff --git a/android/res/values-ja/strings.xml b/android/res/values-ja/strings.xml index c00aa772be..5f87ff3f3b 100644 --- a/android/res/values-ja/strings.xml +++ b/android/res/values-ja/strings.xml @@ -1389,28 +1389,22 @@ コンビニエンスストア コピーショップ 化粧品 - デリカテッセンショップ デパート 工具店 クリーニング屋 電気店 アダルトショップ 生地屋 - ファームフードショップ フローリスト/花屋 葬儀屋 家具店 ガーデンセンター ギフトショップ 八百屋 - 買い物 美容院/理容店 - ホームセンター - 健康食品店 - 家庭用品店 + 工具店 宝石店 キオスク - キッチンストア ランドリー モール マッサージ店 @@ -1422,12 +1416,10 @@ 新聞販売店 眼鏡店 アウトドア用品店 - ペストリー 質屋 ペットショップ 写真屋 魚屋 - 古物商 靴屋 スポーツ用品店 文房具店 @@ -1442,29 +1434,6 @@ ビデオショップ ゲームショップ ワイン店 - 骨董品 - アートショップ - キッズストア - バッグストア - ブティック - チャリティーショップ - チーズ店 - 美術工芸 - 乳製品 - 電気店 - フィッシングストア - 室内装飾 - 宝くじ - 医療用品 - 栄養補助食品 - 塗料 - 香水 - ミシン用品 - ストレージレンタル - タバコ - 貿易用品 - 時計 - 問屋 スポーツ アメリカンフットボール アーチェリー diff --git a/android/res/values-ko/strings.xml b/android/res/values-ko/strings.xml index 9658e0ead5..d1307f7acf 100644 --- a/android/res/values-ko/strings.xml +++ b/android/res/values-ko/strings.xml @@ -1248,28 +1248,22 @@ 편의점 복사가게 화장품 - 델리카트슨 숍 백화점 철물점 드라이 클리닝 전자제품 성인용품 가게 가게 - \"농장 식품 가게\" 꽃가게 장의사 가구 상점 식물 상점 선물 가게 청과상 - \"식료품점\" 이발사 철물점 - \"건강식품 가게\" - \"가정용품 가게\" 보석류 정자 - \"주방용품점\" 세탁소 몰 마사지샵 @@ -1281,12 +1275,10 @@ 신문 가판대 안경점 의 아웃도어 장비 - 패스트리 전당포 펫샵 사진 가게 생선가게 - 중고 판매점 신발 가게 스포츠 용품 문방구 @@ -1301,29 +1293,6 @@ 비디오 가게 비디오 게임 가게 와인 샵 - 고물 - 아트샵 - 어린이 가게 - 가방 판매점 - 부티크 - 자선 상점 - 치즈 가게 - 예술과 공예 - \"유제품\" - \"전기용품점\" - 낚시점 - 실내 장식 - 복권 - \"의료용품\" - 영양 보조제 - 그림 물감 - \"향료 제조업\" - \"재봉용품\" - 스토리지 렌탈 - 담배 - \"거래 용품\" - 시계 - 도매점 스포츠 미식 축구 양궁 diff --git a/android/res/values-mr/strings.xml b/android/res/values-mr/strings.xml index 2f518ee749..9c92de0282 100644 --- a/android/res/values-mr/strings.xml +++ b/android/res/values-mr/strings.xml @@ -1364,7 +1364,6 @@ भाजीवाला न्हावी हार्डवेअर दुकान - हार्डवेअर दुकान दागिने टपरी धुलाईघर @@ -1378,7 +1377,6 @@ वृत्तपत्र विक्री चष्मेविक्रेता भटकंतीचे साहित्य - बेकरी पाळीव प्राण्यांचे दुकान फोटोचे दुकान मासळी उपहारगृह diff --git a/android/res/values-nb/strings.xml b/android/res/values-nb/strings.xml index 5dcb4b7cef..672dbf3ad9 100644 --- a/android/res/values-nb/strings.xml +++ b/android/res/values-nb/strings.xml @@ -1240,28 +1240,22 @@ Nærbutikk Kopieringsbutikk Kosmetikk - Delikatessebutikk Varehus Jernvareforretning Renseri Elektronikk forhandler Erotisk butikk Butikk - Gårdsmatbutikk Blomsterhandler Begravelsebyrå Møbelbutikk Planteskole Gavebutikk Frukt- og grønnsakshandler - Dagligvare Frisør Jernvareforretning - Helsekostbutikk - Husholdningsbutikk Gullsmed Butikk - Kjøkkenbutikk Vaskeri Kjøpesenteret Massasjesalong @@ -1273,12 +1267,10 @@ Aviskiosk Optiker Fritidsutstyr - Kake Pantelåner Dyrebutikk Fotobutikk Fiskehandler - Bruktbutikk Skobutikk Sportsutstyr Bokhandel @@ -1293,29 +1285,6 @@ Videobutikken Videospillbutikken Alkoholutsalg - Antikviteter - Kunstbutikk - Barnebutikk - Veskerbutikk - Boutique - Veldedighetsbutikk - Ostebutikk - Kunst og Håndverk - Meieriprodukter - Elektronisk butikk - Fiskebutikk - Interiørdekorasjoner - Lotteribilletter - Medisinsk utstyr - Kosttilskudd - Maling - Parfymeri - Syutstyr - Utleie av lager - Tobakk - Handler rekvisita - Klokker - Engrosbutikk Sport Amerikansk fotball Bueskyting diff --git a/android/res/values-nl/strings.xml b/android/res/values-nl/strings.xml index 7ca218cb76..a651a18647 100644 --- a/android/res/values-nl/strings.xml +++ b/android/res/values-nl/strings.xml @@ -1244,27 +1244,21 @@ Banketbakker Buurtwinkel Schoonheidsmiddelen - Delicatessenwinkel Warenhuis Ijzerhandel Droogkuis Elektronicazaak Erotiekwinkel Winkel - Boerderijwinkel Bloemist Begrafenisondernemer Meubelzaak Tuincentrum Cadeauwinkel Groentenwinkel - Boodschap Kapper - Ijzerwaren - Natuurvoedingswinkel - Huishoudelijke winkel + Ijzerhandel Juwelier - Keukenwinkel Wasserette Het winkelcentrum Massagesalon @@ -1276,12 +1270,10 @@ Kiosk Opticien Outdooruitrusting - Gebakje Pandjesbaas Dierenwinkel Fotowinkel Visboer - Tweedehandswinkel Schoenenwinkel Sportartikelen Kantoorboekhandel @@ -1296,29 +1288,6 @@ Videowinkel Winkel voor videogames Wijn - Antiek - Kunstwinkel - Kinderwinkel - Tassenwinkel - Boetiek - Kringloopwinkel - Kaaswinkel - Kunst en ambacht - Zuivelproducten - Witgoed winkel - Viswinkel - Interieurdecoraties - Loten - Medische benodigdheden - Voedingssupplementen - Verven - Parfumerie - Naaibenodigdheden - Opslag verhuur - Tabak - Handelsbenodigdheden - Horloges - Groothandel winkel Sport Amerikaans voetbal Boogschieten diff --git a/android/res/values-pl/strings.xml b/android/res/values-pl/strings.xml index c6872f48cd..a6a2c2f02b 100644 --- a/android/res/values-pl/strings.xml +++ b/android/res/values-pl/strings.xml @@ -1369,27 +1369,21 @@ Sklep spożywczy Punkt ksero Kosmetyki - Sklep delikatesowy Dom towarowy Sklep narzędziowy Pralnia chemiczna Sklep ze sprzętem elektronicznym Sex shop Sklep - Sklep spożywczy dla gospodarstw rolnych Kwiaciarnia Celebranci pogrzebowi Sklep meblowy Sklep ogrodniczy Sklep z pamiątkami Warzywniak - Sklep spożywczy Fryzjer - Sklep z narzędziami - Sklep ze zdrową żywnością - Sklep AGD + Sklep narzędziowy Jubiler - Sklep kuchenny Pralnia samoobsługowa Centrum handlowe Salon masażu @@ -1401,12 +1395,10 @@ Stoisko z prasą Sklep optyczny Sprzęt turystyczny - Ciasto Lombard Sklep zoologiczny Fotograf Sklep rybny - Sklep z używaną ręką Sklep obuwniczy Sklep sportowy Artykuły papiernicze @@ -1420,29 +1412,6 @@ Wypożyczalnia wideo Sklep z grami wideo Sklep monopolowy - Antyki - Sklep artystyczny - Sklep dla dzieci - Sklep z torbami - Butik - Sklep charytatywny - Sklep z serami - Sztuka i rzemiosło - Nabiał - Sklep elektryczny - Sklep wędkarski - Dekoracje wnętrz - Bilety na loterię - Produkty medyczne - Suplementy diety - Malatura - Perfumeria - Przybory do szycia - Wynajem magazynu - Tytoń - Zaopatrzenie handlowe - Zegarki - Hurtownia Sport Futbol amerykański Łucznictwo diff --git a/android/res/values-pt-rBR/strings.xml b/android/res/values-pt-rBR/strings.xml index 7bb2b4f926..4bbaf70815 100644 --- a/android/res/values-pt-rBR/strings.xml +++ b/android/res/values-pt-rBR/strings.xml @@ -1412,28 +1412,22 @@ Loja de conveniência Copiadora Loja de cosméticos - Loja Delicatessen Loja de departamentos Loja de ferramentas e materiais de bricolage Lavagem a seco Loja de eletrônicos Loja de artigos eróticos Loja de aviamentos - Loja de alimentos agrícolas Florista Funerária Loja de móveis Loja de jardinagem ou viveiro Loja de presentes Quitanda - Mercearia Cabeleireiro(a) Loja de ferragens - Loja de alimentos saudáveis - Loja de utilidades domésticas Joalheria Quiosque - Loja de cozinha Lavanderia Shopping center Salão de massagens @@ -1445,12 +1439,10 @@ Banca de jornais Ótica Artigos de atividades ao ar livre - Pastelaria Casa de penhores Loja de animais de estimação Loja de fotografia Peixaria - Loja de segunda mão Sapataria Loga de artigos esportivos Papelaria @@ -1465,29 +1457,6 @@ Video locadora Loja de jogos eletrônicos Loja de vinhos - Antiguidades - Loja de artes - Loja infantil - Loja de bolsas - Boutique - Loja de caridade - Loja de queijos - Artes e Ofícios - Lacticínios - Loja de materiais elétricos - Loja de pesca - Decorações de Interiores - Bilhete de loteria - Suprimentos médicos - Suplementos nutricionais - Tintas - Perfumaria - Materiais de costura - Aluguel de Armazenamento - Tabaco - Comércio de suprimentos - Relógios - Loja de atacado Esporte Futebol americano Tiro com arco diff --git a/android/res/values-pt/strings.xml b/android/res/values-pt/strings.xml index b8a0a1d8da..9ab42609c1 100644 --- a/android/res/values-pt/strings.xml +++ b/android/res/values-pt/strings.xml @@ -1426,28 +1426,22 @@ Loja de conveniência Loja de cópias e impressão Loja de cosméticos - Loja Delicatessen Grande armazém Loja de ferramentas e materiais de bricolage Lavagem a seco Loja de eletrónica de consumo Loja de artigos eróticos Loja de tecidos - Loja de comida agrícola Florista Funerária Loja de móveis Loja de jardinagem ou viveiro Loja de lembranças Loja de frutas e verduras - Mercearia Cabeleireiro(a) Loja de ferragens - Loja de alimentos saudáveis - Loja de utilidades domésticas Joalharia Quiosque - Loja de cozinha Lavandaria Centro comercial Salão de massagens @@ -1459,12 +1453,10 @@ Banca de jornais Ótica Artigos de atividades ao ar livre - Pastelaria Casa de penhores Loja de animais de estimação Loja de fotografia Peixaria - Loja de segunda mão Sapataria Loga de artigos desportivos Papelaria @@ -1479,29 +1471,6 @@ Vídeoclube Loja de jogos de vídeo Loja de vinhos - Antiguidades - Loja de artes - Loja infantil - Loja de bolsas - Boutique - Loja de caridade - Loja de queijos - Artes e Ofícios - Lacticínios - Loja de materiais elétricos - Loja de pesca - Decorações de Interiores - Bilhete de loteria - Suprimentos médicos - Suplementos nutricionais - Tintas - Perfumaria - Materiais de costura - Aluguel de Armazenamento - Tabaco - Comércio de suprimentos - Relógios - Loja de atacado Desporto Futebol Americano Tiro com arco diff --git a/android/res/values-ro/strings.xml b/android/res/values-ro/strings.xml index 6fe525f736..e124d63239 100644 --- a/android/res/values-ro/strings.xml +++ b/android/res/values-ro/strings.xml @@ -1263,28 +1263,22 @@ Magazin mixt Centru copiere Cosmetică - Magazin de delicatese Magazin universal Magazin de bricolaj Curățătorie chimică Electronice Magazin erotic Magazin - Magazin alimentar la fermă Florărie Pompe funebre Magazin de mobilă Pepinieră Magazin de suveniruri Băcănie - Băcănie Coafor - Magazin de hardware - Magazin de alimente naturiste - Magazin de articole de uz casnic + Magazin de bricolaj Bijutier Magazin - Magazin de bucatarie Spălătorie Mall Salon de masaj @@ -1296,12 +1290,10 @@ Chioșc cu ziare Optică Echipament de exterior - Patiserie Amanet Pet shop Centru fotografii Pescărie - Magazin second-hand Magazin de încălțăminte Articole sportive Magazin de papetărie @@ -1315,29 +1307,6 @@ Magazin video Magazin de jocuri video Vinărie - Antichități - Magazin de arte - Magazin pentru copii - Magazin de genti - Butic - Magazin de caritate - Magazin de branzeturi - Arte și Meserii - Lactate - Magazin de electronice - Magazin de pescuit - Decoratiuni interioare - Bilete la loterie - Consumabile medicale - Suplimente nutritive - Vopsele - Parfumerie - Rechizite de cusut - Închiriere depozitare - Tutun - Comerțuri Rechizite - Priveste - Magazin cu ridicata Sport Fotbal american TIR cu arcul diff --git a/android/res/values-ru/strings.xml b/android/res/values-ru/strings.xml index daba2d42e5..83bd6c1528 100644 --- a/android/res/values-ru/strings.xml +++ b/android/res/values-ru/strings.xml @@ -1508,28 +1508,22 @@ Продуктовый магазин Копировальный центр Косметика - Магазин деликатесов Универмаг Хозяйственный Химчистка Электротехника Секс-шоп Магазин - Фермерский магазин Цветочный магазин Ритуальные услуги Магазин мебели Садовые товары Магазин сувениров Овощи и фрукты - Бакалея Парикмахерская - Хозяйственный магазин - Магазин здоровой еды - Магазин посуды + Хозяйственный Ювелирный магазин Киоск - Кухонный магазин Прачечная Торговый центр Массажный салон @@ -1541,12 +1535,10 @@ Газетный киоск Оптика Магазин снаряжения - Выпечка Ломбард Зоотовары Фототовары Рыбный магазин - Секонд-хенд магазин Магазин обуви Магазин спорттоваров Канцелярский магазин @@ -1561,29 +1553,6 @@ Магазин видео Магазин видеоигр Винный магазин - Антиквариат - Художественный магазин - Детский магазин - Магазин сумок - Бутик - Благотворительный магазин - Магазин сыра - Искусства и ремесла - Молочные продукты - Магазин электротоваров - Рыболовный магазин - Украшения для интерьера - Лотерейные билеты - Медикаменты - Пищевые добавки - Краски - Парфюмерия - Швейные принадлежности - Аренда склада - Табак - Торговые поставки - Часы - Оптовый магазин Спорт Американский футбол Стрельба из лука diff --git a/android/res/values-sk/strings.xml b/android/res/values-sk/strings.xml index e2c5da7470..5edf9997eb 100644 --- a/android/res/values-sk/strings.xml +++ b/android/res/values-sk/strings.xml @@ -1244,27 +1244,21 @@ Príležitostné potreby Kopírovacie služby Kozmetika - Predajňa lahôdok Obchodný dom Železiarstvo Čistiareň Elektronika Erotický obchod Obchod - Obchod s farmárskymi potravinami Kvety Pohrebníctvo Nábytok Škôlka Darčeky Zelovoc - Potraviny Kaderníctvo Železiarstvo - Obchod so zdravou výživou - Obchod s domácimi potrebami Klenotníctvo - Kuchynský obchod Práčovňa The Mall Masážny salón @@ -1276,12 +1270,10 @@ Novinový stánok Optika Outdoorové vybavenie - Pečivo Záložňa Obchod zo zvieratami Fotografické služby Obchodník s rybami - Obchod z druhej ruky Obuvníctvo Športové potreby Papiernictvo @@ -1295,29 +1287,6 @@ Predajňa s videami Predajňa s videohrami Vinotéka - Starožitnosti - Obchod s umením - Obchod pre deti - Obchod s taškami - Butik - Charitatívny obchod - Predajňa syrov - Umenie a remeslá - Mliečne výrobky - Predajňa elektro - Rybársky obchod - Interiérové dekorácie - Lístky do lotérie - Zdravotnícky materiál - Výživové doplnky - Farby - Parfuméria - Šijacie potreby - Prenájom skladu - Tabak - Živnostenské potreby - Hodinky - Veľkoobchod Šport Americký futbal Lukostreľba diff --git a/android/res/values-sv/strings.xml b/android/res/values-sv/strings.xml index ea1f3ad3cb..cfc1477307 100644 --- a/android/res/values-sv/strings.xml +++ b/android/res/values-sv/strings.xml @@ -1236,27 +1236,21 @@ Närbutik Kopieringsbutik Kosmetika - Delikatessbutik Varuhus Järnhandel Kemtvätt Elektronik Erotisk butik Butik - Gårdsmataffär Blomsteraffär Begravningsentreprenörer Möbelaffär Plantskola Presentaffär Grönsakshandlare - Livsmedel Frisör - Järnaffär - Hälsokostbutik - Husgerådsbutik + Järnhandel Smycken - Köksbutik Tvättstuga Galleria Massagesalong @@ -1268,12 +1262,10 @@ Tidningsstånd Optiker Fritidsutrustning - Bakverk Pantbank Djuraffär Fotoaffär Fiskhandlare - Andrahandsaffär Skobutik Sportaffär Pappershandel @@ -1288,29 +1280,6 @@ Video butik Videospel butik Vinhandel - Antikviteter - Konstaffär - Barnbutik - Väskor butik - Boutique - Välgörenhetsbutik - Ostaffär - Konst och hantverk - Mejeriprodukter - Elektronik affär - Fiskeaffär - Inredningsdekorationer - Lotter - Medicinska förnödenheter - Kosttillskott - Färger - Parfymer - Sytillbehör - Uthyrning av förråd - Tobak - Handlar förnödenheter - Klockor - Grossistbutik Sport Amerikansk fotboll Bågskytte diff --git a/android/res/values-sw/strings.xml b/android/res/values-sw/strings.xml index 77f3bfc2c4..06393f87ec 100644 --- a/android/res/values-sw/strings.xml +++ b/android/res/values-sw/strings.xml @@ -388,40 +388,8 @@ Mfumo wa reli moja Njia ya Reli Lango la kuingilia stesheni ya reli - Duka la Delicatessen - Duka la Chakula cha shambani - Chakula cha mboga - Duka la vifaa - Duka la Chakula cha Afya - Duka la Vifaa vya Nyumbani - Duka la Jikoni - Keki - Duka la Mitumba Duka la Video Duka la Video za Michezo - Mambo ya kale - Duka la Sanaa - Duka la watoto - Hifadhi ya Mifuko - Boutique - Duka la msaada - Duka la Jibini - Sanaa na Ufundi - Bidhaa za Maziwa - Duka la Umeme - Duka la Uvuvi - Mapambo ya Ndani - Tikiti za Bahati nasibu - Vifaa vya Matibabu - Virutubisho vya Lishe - Rangi - Perfumery - Vifaa vya kushona - Kukodisha Hifadhi - Tumbaku - Ugavi wa Biashara - Saa - Duka la Jumla Michezo Soka ya Marekani Upigaji mishale diff --git a/android/res/values-th/strings.xml b/android/res/values-th/strings.xml index bbb4f8fc53..9b41e50d74 100644 --- a/android/res/values-th/strings.xml +++ b/android/res/values-th/strings.xml @@ -1252,28 +1252,22 @@ ร้านสะดวกซื้อ ร้านถ่ายเอกสาร เครื่องสำอาง - ร้านขายอาหารสำเร็จรูป ห้างสรรพสินค้า ร้านขายฮาร์ดแวร์ ซักแห้ง ร้านขายอุปกรณ์อิเล็กทรอนิกส์ ร้านเฉพาะผู้ใหญ่ ร้านค้า - ฟาร์มฟู้ดช็อป ร้านดอกไม้ สัปเหร่อ ร้านเฟอร์นิเจอร์ สถานรับเลี้ยงเด็ก ร้านของขวัญ ร้านขายผัด - ร้านขายของชำ ช่างทำผม - ร้านฮาร์ดแวร์ - ร้านอาหารเพื่อสุขภาพ - ร้านของใช้ในบ้าน + ร้านขายฮาร์ดแวร์ ร้านขายเครื่องประดับ ร้าน - ร้านครัว ร้านซักรีด เดอะมอลล์ สถานอาบอบนวด @@ -1285,12 +1279,10 @@ แผงขายหนังสือพิมพ์ ร้านแว่น อุปกรณ์กลางแจ้ง - ขนมอบ ผู้รับจำนำ เพ็ทชอป ร้านถ่ายภาพ ร้านขายปลา - ร้านขายของมือสอง ร้านขายรองเท้า สินค้ากีฬา ร้านขายเครื่องเขียน @@ -1305,29 +1297,6 @@ ร้านขายดีวีดี ร้านขายวิดีโอเกม ร้านขายไวน์ - ของเก่า - ร้านศิลปะ - ร้านขายของสำหรับเด็ก - ร้านกระเป๋า - บูติก - ร้านการกุศล - ร้านชีส - ศิลปะและงานฝีมือ - ผลิตภัณฑ์นม - ร้านขายเครื่องใช้ไฟฟ้า - ร้านตกปลา - ตกแต่งภายใน - สลากกินแบ่ง - เวชภัณฑ์ - อาหารเสริม - สี - น้ำหอม - อุปกรณ์เย็บผ้า - ค่าเช่าห้องเก็บของ - ยาสูบ - อุปกรณ์การค้า - นาฬิกา - ร้านขายส่ง กีฬา อเมริกันฟุตบอล ยิงธนู diff --git a/android/res/values-tr/strings.xml b/android/res/values-tr/strings.xml index 6386e0b35a..1761cf97d4 100644 --- a/android/res/values-tr/strings.xml +++ b/android/res/values-tr/strings.xml @@ -1469,28 +1469,22 @@ Bakkal Kopyalama Merkezi Bakım ürünleri - Şarküteri Dükkanı Büyük Mağaza Hırdavatçı Kuru Temizleme Elektronik Mağazası Erotik Ürünler Mağazası Mağaza - Çiftlik Gıda Dükkanı Çiçekçi Cenaze Levazımcısı Mobilya Mağazası Bahçe Mağazası Hediyelik Eşya Mağazası Manav - Bakkal Kuaför - Donanım mağazası - Sağlık Gıda Mağazası - Ev Eşyaları Dükkanı + Hırdavatçı Kuyumcu Büfe - Mutfak Mağazası Çamaşırhane Alışveriş Merkezi Masaj Salonu @@ -1502,12 +1496,10 @@ Gazete Standı Gözlükçü Dış Mekan Ekipmanları - Hamur işi Tefeci Evcil Hayvan Mağazası Fotoğrafçı Deniz Ürünleri Mağazası - İkinci El Mağazası Ayakkabı Mağazası Spor Ürünleri Kırtasiye @@ -1522,29 +1514,6 @@ Video Mağazası Video Oyunları Mağazası Şarap Mağazası - Antikalar - Sanat Mağazası - Çocuk mağazası - Çanta Mağazası - Butik - Hayır Dükkanı - Peynir Dükkanı - Sanat ve El işi - Süt Ürünleri - Elektirikli eşya dükkanı - Balıkçı Dükkanı - İç Dekorasyon - Piyango bileti - Tıbbi malzemeler - Besin Takviyeleri - Boyalar - Parfümeri - Dikiş malzemeleri - Depolama Kiralama - Tütün - Esnaf Malzemeleri - Saatler - Toptan satış mağazası Spor Amerikan Futbolu Okçuluk diff --git a/android/res/values-uk/strings.xml b/android/res/values-uk/strings.xml index c00ec6c362..44feb24fe8 100644 --- a/android/res/values-uk/strings.xml +++ b/android/res/values-uk/strings.xml @@ -1464,28 +1464,22 @@ Міні-маркет Копіювальний центр Косметика - Делікатесний магазин Універмаг Господарськi товари Хімчистка Електротехнiка Секс-шоп Крамниця - Магазин фермерських продуктів Магазин квітів Ритуальні послуги Магазин меблів Товари для саду Магазин сувенірів Овочі та фрукти - Бакалія Перукарня - Магазин побутової техніки - Магазин здорового харчування - Магазин посуду + Будматеріали Ювелірний магазин Кіоск - Магазин кухні Пральня Торговий центр Масажний кабінет @@ -1497,12 +1491,10 @@ Газетний кіоск Оптика Спорядження - Тістечка Ломбард Зоотовари Фототовари Рибна лавка - Магазин секонд-хенду Магазин взуття Спортивні товари Канцелярськi товари @@ -1517,29 +1509,6 @@ Магазин відео Магазин відеоігор Винна крамниця - Антикваріат - Магазин мистецтв - Дитячий магазин - Магазин сумок - Бутік - Магазин благодійності - Магазин сиру - Мистецтво і ремесла - Молочні продукти - Магазин електротехніки - Рибальський магазин - Внутрішнє оздоблення - Лотерейні квитки - Медичні товари - Харчові добавки - Фарби - Парфумерія - Швейні приладдя - Оренда сховища - Тютюн - Торгівля припасами - Годинники - Оптовий магазин Спорт Американський футбол Стрільба з лука diff --git a/android/res/values-vi/strings.xml b/android/res/values-vi/strings.xml index fcc0131bcf..ddd7b1a99b 100644 --- a/android/res/values-vi/strings.xml +++ b/android/res/values-vi/strings.xml @@ -1247,28 +1247,22 @@ Cửa hàng tạp hóa Cửa hàng Copy Mỹ phẩm - Cửa hàng đồ ăn ngon Cửa hàng bách hóa Cửa hàng phần cứng Giặt Sấy Cửa hàng điện Cửa hàng người lớn Cửa hàng - Cửa hàng thực phẩm nông trại Cửa hàng hoa Tổ chức tang lễ Cửa hàng nội thất Nhà trẻ Cửa hàng quà tặng Cửa hàng rau củ - Cửa hàng tạp hóa Tiệm làm tóc Cửa hàng phần cứng - Cửa hàng thực phẩm sức khỏe - Cửa hàng đồ gia dụng Đồ trang sức Cửa hàng - Cửa hàng nhà bếp Giặt là Khu mua sắm Quán massage @@ -1280,12 +1274,10 @@ Quầy báo Cửa hàng mắt kính Thiết bị Ngoài trời - Bánh ngọt Cầm đồ Cửa Hàng Vật Nuôi Hiệu Ảnh Người bán cá - Cửa hàng bán đồ đã qua sử dụng Cửa hàng giày Đồ dùng thể thao Cửa hàng văn phòng phẩm @@ -1300,29 +1292,6 @@ Cửa hàng bán/cho thuê bằng đĩa Cửa hàng bán trò chơi điện tử Rượu - Đồ cổ - Cửa hàng nghệ thuật - Cửa hàng trẻ em - Cửa hàng túi xách - Cửa hàng - Cửa hàng từ thiện - Cửa hàng pho mát - Nghệ thuật và thủ công - Sản phẩm từ sữa - Cửa hàng điện tử - Cửa hàng câu cá - Đồ trang trí nội thất - Vé xổ số kiến thiết - Vật tư y tế - Bổ sung dinh dưỡng - Sơn - Nước hoa - Nguồn cung cấp may - Cho thuê kho lưu trữ - Thuốc lá - Nguồn cung cấp Giao dịch - Xem - Cửa hàng bán buôn Thể thao Bóng bầu dục Mỹ Bắn cung diff --git a/android/res/values-zh-rTW/strings.xml b/android/res/values-zh-rTW/strings.xml index 5ff94425f1..7572cbd83b 100644 --- a/android/res/values-zh-rTW/strings.xml +++ b/android/res/values-zh-rTW/strings.xml @@ -1300,28 +1300,22 @@ 便利商店 復印店 化妆品 - 熟食店 百貨公司 五金行 乾洗 電子產品 情趣用品店 購物 - 農場食品店 花店 葬儀社 家具店 園藝店 禮品店 蔬果零售店 - 雜貨店 理髮師 - 五金店 - 保健食品店 - 家居用品店 + 五金行 珠寶店 小舖 - 廚房用品店 洗衣店 商场 按摩館 @@ -1333,12 +1327,10 @@ 報攤 眼鏡店 室外設備 - 糕點 當舖 寵物店 照片店 魚販 - 二手店 鞋店 運動商品店 文具用品店 @@ -1353,29 +1345,6 @@ 視頻商城 電子遊戲商城 販酒處 - 古董 - 藝術商店 - 兒童商店 - 箱包店 - 精品店 - 慈善商店 - 奶酪店c - 美術和工藝 - 乳製品 - 電器商城 - 釣魚店 - 室內裝飾 - 彩票 - 醫療用品 - 營養補充劑 - 油漆 - 香水 - 縫紉用品 - 存儲租賃 - 煙草 - 貿易用品 - 手錶 - 批髮店 體育運動 美式足球 射箭 diff --git a/android/res/values-zh/strings.xml b/android/res/values-zh/strings.xml index cedad16330..b3d47df8f8 100644 --- a/android/res/values-zh/strings.xml +++ b/android/res/values-zh/strings.xml @@ -1394,28 +1394,22 @@ 便利店 复印店 化妝品店 - 熟食店 百货商场 家居用品店 干洗店 电子产品商店 成人用品店 商店 - 农场食品店 花店 殡仪馆 家具店 幼儿园 礼品店 蔬果零售店 - 杂货店 理发师 - 五金店 - 保健食品店 - 家居用品店 + 硬件店 珠宝店 商店 - 厨房用品店 洗衣店 商场 按摩院 @@ -1427,12 +1421,10 @@ 报刊亭 眼镜店 室外设备 - 糕点 典当商铺 宠物店 照片店 鱼商 - 二手店 鞋店 体育用品店 文具店 @@ -1447,29 +1439,6 @@ 影像店 电子游戏店 酒品商店 - 古董 - 艺术商店 - 儿童商店 - 箱包店 - 精品店 - 慈善商店 - 奶酪店 - 美术和工艺 - 乳制品 - 电器商城 - 钓鱼店 - 室内装饰 - 彩票 - 医疗用品 - 营养补充剂 - 油漆 - 香水 - 缝纫用品 - 存储租赁 - 烟草 - 贸易用品 - 手表 - 批发店 体育运动 美式足球 射箭 diff --git a/android/res/values/strings.xml b/android/res/values/strings.xml index bc72ed56c9..5353b5e0b4 100644 --- a/android/res/values/strings.xml +++ b/android/res/values/strings.xml @@ -1539,28 +1539,22 @@ Convenience Store Copy Shop Cosmetics - Delicatessen Shop Department Store Hardware Store Dry Cleaning Electronics Erotic Shop Shop - Farm Food Shop Florist’s Funeral Directors Furniture Store Garden Store Gift Shop Greengrocer\'s - Grocery Hairdresser Hardware Store - Health Food Shop - Houseware Jewelry Kiosk - Kitchen Store Laundry Mall Massage Salon @@ -1572,12 +1566,10 @@ Newspaper Stand Optician’s Outdoor Equipment - Pastry Pawnbroker Petshop Photo Shop Seafood Shop - Second Hand Shoe Store Sports Goods Stationery Shop @@ -1592,29 +1584,6 @@ Video Shop Video Games Shop Wine Shop - Antiques - Arts Shop - Baby Goods - Bags Store - Boutique - Charity Shop - Cheese Store - Arts and Crafts - Dairy Products - Electrical Store - Fishing Store - Interior Decorations - Lottery Tickets - Medical Supplies - Nutrition Supplements - Paints - Perfumery - Sewing Supplies - Storage Rental - Tobacco - Trades Supplies - Watches - Wholesale Store Sport American Football Archery diff --git a/data/categories.txt b/data/categories.txt index 5dce60af9b..36802c38e6 100644 --- a/data/categories.txt +++ b/data/categories.txt @@ -875,7 +875,7 @@ sk:3Benzínová pumpa sw:mafuta fa:جایگاه سوخت -shop-bakery|shop-pastry|@eat +shop-bakery|@eat en:3Bakery|U+1F35E ru:3Булочная|3пекарня bg:3Пекарна @@ -1021,14 +1021,6 @@ sk:Príležitostné potreby sw:Duka fa:بقالی -shop-deli|@food -en:4Delicatessen -ru:4Деликатесы - -shop-farm|@food -en:Farm food -ru:Фермерская еда - shop-garden_centre en:4Garden Centre|U+1F3EC|U+1F3EA|U+1F3E1 en-US:4Garden Center @@ -1064,14 +1056,6 @@ el:Κατάστημα ειδών κήπου|κατάστημα sk:Škôlka|materská škôlka fa:فروشگاه تجهیزات باغبانی -shop-grocery|@food -en:Grocery -ru:Бакалея - -shop-health_food|@food -en:Health food -ru:Здоровая еда - shop-mobile_phone en:4Cell Phones|4Mobile Phones|6smartphones|electronics store|U+1F3EC|U+1F3EA|U+1F4F1|U+1F4F2 ru:4Сотовые телефоны|4Мобильные телефоны|5телефоны|5смартфоны|электроника|салон связи @@ -1178,7 +1162,7 @@ el:Κρεοπωλείο|κατάστημα sk:Mäsiar fa:قصابی -shop-furniture|shop-kitchen +shop-furniture en:4Furniture Store ru:Магазин мебели|4мебель bg:Магазин за мебели @@ -1356,7 +1340,7 @@ el:Ηλεκτρονικά|κατάστημα sk:4Elektronika fa:فروشگاه تجهیزات الکترونیکی -shop-hardware|shop-houseware|shop-doityourself +shop-hardware|shop-doityourself en:4Hardware Store|DIY|do it yourself|U+1F3EC|U+1F3EA|U+1F50B|U+1F50C|U+1F4A1|U+1F526|U+1F529|U+1F528|U+2614 ru:3Хозяйственный|Стройтовары|хозтовары|сделай сам bg:НСС|направи си сам|строителни материали @@ -9549,10 +9533,6 @@ sk:Obchodník s rybami fa:فروشگاه غذای دریایی mr:सीफूड शॉप -shop-second_hand -en:4Second Hand -ru:4Подержанные товары - shop-ticket en:4Ticket Shop|tickets|ticket hub|ticket office|ticket center|booking office|box office|ticket agency|ticket booth|pay box ru:4Билетная касса|билет|театральная касса|билетный центр|городская касса|продажа билетов|бронирование билетов diff --git a/data/classificator.txt b/data/classificator.txt index c87159a1f2..3b2fb41d00 100644 --- a/data/classificator.txt +++ b/data/classificator.txt @@ -853,17 +853,12 @@ world + {} shop + alcohol - - antiques - - art - - baby_goods - - bag - bakery - beauty - beverages - bicycle - bookmaker - books - - boutique - butcher - car - car_parts - @@ -871,8 +866,6 @@ world + tyres - {} caravan - - charity - - cheese - chemist - chocolate - clothes - @@ -882,74 +875,50 @@ world + convenience - copyshop - cosmetics - - craft - - dairy - - deli - department_store - doityourself - dry_cleaning - - electrical - electronics - erotic - fabric - - farm - - fishing - florist - funeral_directors - furniture - garden_centre - gift - greengrocer - - grocery - hairdresser - hardware - - health_food - - houseware - - interior_decoration - jewelry - kiosk - - kitchen - laundry - - lottery - mall - massage - - medical_supply - mobile_phone - money_lender - motorcycle - music - musical_instrument - newsagent - - nutrition_supplements - optician - outdoor - - paint - - pastry - pawnbroker - - perfumery - pet - photo - seafood - - second_hand - - sewing - shoes - sports - stationery - - storage_rental - supermarket - tattoo - tea - ticket - - tobacco - toys - - trade - travel_agency - tyres - variety_store - video - video_games - - watches - - wholesale - wine - {} sport + diff --git a/data/drules_proto.bin b/data/drules_proto.bin index 8f98409986..7a4caaa050 100644 Binary files a/data/drules_proto.bin and b/data/drules_proto.bin differ diff --git a/data/drules_proto.txt b/data/drules_proto.txt index 73cba6a779..886e20b562 100644 --- a/data/drules_proto.txt +++ b/data/drules_proto.txt @@ -60969,274 +60969,6 @@ cont { } } } -cont { - name: "shop-antiques" - element { - scale: 16 - symbol { - name: "shop-m" - priority: 16605 - min_distance: 10 - } - caption { - primary { - height: 10 - color: 4473924 - offset_y: 1 - } - priority: 15605 - } - } - element { - scale: 17 - symbol { - name: "shop-m" - priority: 16605 - min_distance: 10 - } - caption { - primary { - height: 10 - color: 4473924 - offset_y: 1 - } - priority: 15605 - } - } - element { - scale: 18 - symbol { - name: "shop-m" - priority: 16605 - min_distance: 10 - } - caption { - primary { - height: 10 - color: 4473924 - offset_y: 1 - } - priority: 15605 - } - } - element { - scale: 19 - symbol { - name: "shop-m" - priority: 16605 - min_distance: 10 - } - caption { - primary { - height: 10 - color: 4473924 - offset_y: 1 - } - priority: 15605 - } - } -} -cont { - name: "shop-art" - element { - scale: 16 - symbol { - name: "shop-m" - priority: 16605 - min_distance: 10 - } - caption { - primary { - height: 10 - color: 4473924 - offset_y: 1 - } - priority: 15605 - } - } - element { - scale: 17 - symbol { - name: "shop-m" - priority: 16605 - min_distance: 10 - } - caption { - primary { - height: 10 - color: 4473924 - offset_y: 1 - } - priority: 15605 - } - } - element { - scale: 18 - symbol { - name: "shop-m" - priority: 16605 - min_distance: 10 - } - caption { - primary { - height: 10 - color: 4473924 - offset_y: 1 - } - priority: 15605 - } - } - element { - scale: 19 - symbol { - name: "shop-m" - priority: 16605 - min_distance: 10 - } - caption { - primary { - height: 10 - color: 4473924 - offset_y: 1 - } - priority: 15605 - } - } -} -cont { - name: "shop-baby_goods" - element { - scale: 16 - symbol { - name: "shop-m" - priority: 16605 - min_distance: 10 - } - caption { - primary { - height: 10 - color: 4473924 - offset_y: 1 - } - priority: 15605 - } - } - element { - scale: 17 - symbol { - name: "shop-m" - priority: 16605 - min_distance: 10 - } - caption { - primary { - height: 10 - color: 4473924 - offset_y: 1 - } - priority: 15605 - } - } - element { - scale: 18 - symbol { - name: "shop-m" - priority: 16605 - min_distance: 10 - } - caption { - primary { - height: 10 - color: 4473924 - offset_y: 1 - } - priority: 15605 - } - } - element { - scale: 19 - symbol { - name: "shop-m" - priority: 16605 - min_distance: 10 - } - caption { - primary { - height: 10 - color: 4473924 - offset_y: 1 - } - priority: 15605 - } - } -} -cont { - name: "shop-bag" - element { - scale: 16 - symbol { - name: "shop-m" - priority: 16605 - min_distance: 10 - } - caption { - primary { - height: 10 - color: 4473924 - offset_y: 1 - } - priority: 15605 - } - } - element { - scale: 17 - symbol { - name: "shop-m" - priority: 16605 - min_distance: 10 - } - caption { - primary { - height: 10 - color: 4473924 - offset_y: 1 - } - priority: 15605 - } - } - element { - scale: 18 - symbol { - name: "shop-m" - priority: 16605 - min_distance: 10 - } - caption { - primary { - height: 10 - color: 4473924 - offset_y: 1 - } - priority: 15605 - } - } - element { - scale: 19 - symbol { - name: "shop-m" - priority: 16605 - min_distance: 10 - } - caption { - primary { - height: 10 - color: 4473924 - offset_y: 1 - } - priority: 15605 - } - } -} cont { name: "shop-bakery" element { @@ -61657,73 +61389,6 @@ cont { } } } -cont { - name: "shop-boutique" - element { - scale: 16 - symbol { - name: "shop-m" - priority: 16605 - min_distance: 10 - } - caption { - primary { - height: 10 - color: 4473924 - offset_y: 1 - } - priority: 15605 - } - } - element { - scale: 17 - symbol { - name: "shop-m" - priority: 16605 - min_distance: 10 - } - caption { - primary { - height: 10 - color: 4473924 - offset_y: 1 - } - priority: 15605 - } - } - element { - scale: 18 - symbol { - name: "shop-m" - priority: 16605 - min_distance: 10 - } - caption { - primary { - height: 10 - color: 4473924 - offset_y: 1 - } - priority: 15605 - } - } - element { - scale: 19 - symbol { - name: "shop-m" - priority: 16605 - min_distance: 10 - } - caption { - primary { - height: 10 - color: 4473924 - offset_y: 1 - } - priority: 15605 - } - } -} cont { name: "shop-butcher" element { @@ -62160,140 +61825,6 @@ cont { } } } -cont { - name: "shop-charity" - element { - scale: 16 - symbol { - name: "shop-m" - priority: 16605 - min_distance: 10 - } - caption { - primary { - height: 10 - color: 4473924 - offset_y: 1 - } - priority: 15605 - } - } - element { - scale: 17 - symbol { - name: "shop-m" - priority: 16605 - min_distance: 10 - } - caption { - primary { - height: 10 - color: 4473924 - offset_y: 1 - } - priority: 15605 - } - } - element { - scale: 18 - symbol { - name: "shop-m" - priority: 16605 - min_distance: 10 - } - caption { - primary { - height: 10 - color: 4473924 - offset_y: 1 - } - priority: 15605 - } - } - element { - scale: 19 - symbol { - name: "shop-m" - priority: 16605 - min_distance: 10 - } - caption { - primary { - height: 10 - color: 4473924 - offset_y: 1 - } - priority: 15605 - } - } -} -cont { - name: "shop-cheese" - element { - scale: 16 - symbol { - name: "shop-m" - priority: 16605 - min_distance: 10 - } - caption { - primary { - height: 10 - color: 4473924 - offset_y: 1 - } - priority: 15605 - } - } - element { - scale: 17 - symbol { - name: "shop-m" - priority: 16605 - min_distance: 10 - } - caption { - primary { - height: 10 - color: 4473924 - offset_y: 1 - } - priority: 15605 - } - } - element { - scale: 18 - symbol { - name: "shop-m" - priority: 16605 - min_distance: 10 - } - caption { - primary { - height: 10 - color: 4473924 - offset_y: 1 - } - priority: 15605 - } - } - element { - scale: 19 - symbol { - name: "shop-m" - priority: 16605 - min_distance: 10 - } - caption { - primary { - height: 10 - color: 4473924 - offset_y: 1 - } - priority: 15605 - } - } -} cont { name: "shop-chemist" element { @@ -62921,210 +62452,6 @@ cont { } } } -cont { - name: "shop-craft" - element { - scale: 16 - symbol { - name: "shop-m" - priority: 16605 - min_distance: 10 - } - caption { - primary { - height: 10 - color: 4473924 - offset_y: 1 - } - priority: 15605 - } - } - element { - scale: 17 - symbol { - name: "shop-m" - priority: 16605 - min_distance: 10 - } - caption { - primary { - height: 10 - color: 4473924 - offset_y: 1 - } - priority: 15605 - } - } - element { - scale: 18 - symbol { - name: "shop-m" - priority: 16605 - min_distance: 10 - } - caption { - primary { - height: 10 - color: 4473924 - offset_y: 1 - } - priority: 15605 - } - } - element { - scale: 19 - symbol { - name: "shop-m" - priority: 16605 - min_distance: 10 - } - caption { - primary { - height: 10 - color: 4473924 - offset_y: 1 - } - priority: 15605 - } - } -} -cont { - name: "shop-dairy" - element { - scale: 16 - symbol { - name: "shop-m" - priority: 16605 - min_distance: 10 - } - caption { - primary { - height: 10 - color: 4473924 - offset_y: 1 - } - priority: 15605 - } - } - element { - scale: 17 - symbol { - name: "shop-m" - priority: 16605 - min_distance: 10 - } - caption { - primary { - height: 10 - color: 4473924 - offset_y: 1 - } - priority: 15605 - } - } - element { - scale: 18 - symbol { - name: "shop-m" - priority: 16605 - min_distance: 10 - } - caption { - primary { - height: 10 - color: 4473924 - offset_y: 1 - } - priority: 15605 - } - } - element { - scale: 19 - symbol { - name: "shop-m" - priority: 16605 - min_distance: 10 - } - caption { - primary { - height: 10 - color: 4473924 - offset_y: 1 - } - priority: 15605 - } - } -} -cont { - name: "shop-deli" - element { - scale: 16 - symbol { - name: "grocery-m" - priority: 16605 - min_distance: 10 - } - caption { - primary { - height: 10 - color: 4473924 - offset_y: 1 - } - priority: 15605 - } - } - element { - scale: 17 - symbol { - name: "grocery-m" - priority: 16605 - min_distance: 24 - } - caption { - primary { - height: 10 - color: 4473924 - offset_y: 1 - is_optional: true - } - priority: 15605 - } - } - element { - scale: 18 - symbol { - name: "grocery-m" - priority: 16605 - min_distance: 24 - } - caption { - primary { - height: 10 - color: 4473924 - offset_y: 1 - is_optional: true - } - priority: 15605 - } - } - element { - scale: 19 - symbol { - name: "grocery-m" - priority: 16605 - min_distance: 24 - } - caption { - primary { - height: 10 - color: 4473924 - offset_y: 1 - is_optional: true - } - priority: 15605 - } - } -} cont { name: "shop-department_store" element { @@ -63335,73 +62662,6 @@ cont { } } } -cont { - name: "shop-electrical" - element { - scale: 16 - symbol { - name: "shop-m" - priority: 16605 - min_distance: 10 - } - caption { - primary { - height: 10 - color: 4473924 - offset_y: 1 - } - priority: 15605 - } - } - element { - scale: 17 - symbol { - name: "shop-m" - priority: 16605 - min_distance: 10 - } - caption { - primary { - height: 10 - color: 4473924 - offset_y: 1 - } - priority: 15605 - } - } - element { - scale: 18 - symbol { - name: "shop-m" - priority: 16605 - min_distance: 10 - } - caption { - primary { - height: 10 - color: 4473924 - offset_y: 1 - } - priority: 15605 - } - } - element { - scale: 19 - symbol { - name: "shop-m" - priority: 16605 - min_distance: 10 - } - caption { - primary { - height: 10 - color: 4473924 - offset_y: 1 - } - priority: 15605 - } - } -} cont { name: "shop-electronics" element { @@ -63609,143 +62869,6 @@ cont { } } } -cont { - name: "shop-farm" - element { - scale: 16 - symbol { - name: "grocery-m" - priority: 16605 - min_distance: 10 - } - caption { - primary { - height: 10 - color: 4473924 - offset_y: 1 - } - priority: 15605 - } - } - element { - scale: 17 - symbol { - name: "grocery-m" - priority: 16605 - min_distance: 24 - } - caption { - primary { - height: 10 - color: 4473924 - offset_y: 1 - is_optional: true - } - priority: 15605 - } - } - element { - scale: 18 - symbol { - name: "grocery-m" - priority: 16605 - min_distance: 24 - } - caption { - primary { - height: 10 - color: 4473924 - offset_y: 1 - is_optional: true - } - priority: 15605 - } - } - element { - scale: 19 - symbol { - name: "grocery-m" - priority: 16605 - min_distance: 24 - } - caption { - primary { - height: 10 - color: 4473924 - offset_y: 1 - is_optional: true - } - priority: 15605 - } - } -} -cont { - name: "shop-fishing" - element { - scale: 16 - symbol { - name: "shop-m" - priority: 16605 - min_distance: 10 - } - caption { - primary { - height: 10 - color: 4473924 - offset_y: 1 - } - priority: 15605 - } - } - element { - scale: 17 - symbol { - name: "shop-m" - priority: 16605 - min_distance: 10 - } - caption { - primary { - height: 10 - color: 4473924 - offset_y: 1 - } - priority: 15605 - } - } - element { - scale: 18 - symbol { - name: "shop-m" - priority: 16605 - min_distance: 10 - } - caption { - primary { - height: 10 - color: 4473924 - offset_y: 1 - } - priority: 15605 - } - } - element { - scale: 19 - symbol { - name: "shop-m" - priority: 16605 - min_distance: 10 - } - caption { - primary { - height: 10 - color: 4473924 - offset_y: 1 - } - priority: 15605 - } - } -} cont { name: "shop-florist" element { @@ -64166,76 +63289,6 @@ cont { } } } -cont { - name: "shop-grocery" - element { - scale: 16 - symbol { - name: "grocery-m" - priority: 16605 - min_distance: 10 - } - caption { - primary { - height: 10 - color: 4473924 - offset_y: 1 - } - priority: 15605 - } - } - element { - scale: 17 - symbol { - name: "grocery-m" - priority: 16605 - min_distance: 24 - } - caption { - primary { - height: 10 - color: 4473924 - offset_y: 1 - is_optional: true - } - priority: 15605 - } - } - element { - scale: 18 - symbol { - name: "grocery-m" - priority: 16605 - min_distance: 24 - } - caption { - primary { - height: 10 - color: 4473924 - offset_y: 1 - is_optional: true - } - priority: 15605 - } - } - element { - scale: 19 - symbol { - name: "grocery-m" - priority: 16605 - min_distance: 24 - } - caption { - primary { - height: 10 - color: 4473924 - offset_y: 1 - is_optional: true - } - priority: 15605 - } - } -} cont { name: "shop-hairdresser" element { @@ -64376,213 +63429,6 @@ cont { } } } -cont { - name: "shop-health_food" - element { - scale: 16 - symbol { - name: "grocery-m" - priority: 16605 - min_distance: 10 - } - caption { - primary { - height: 10 - color: 4473924 - offset_y: 1 - } - priority: 15605 - } - } - element { - scale: 17 - symbol { - name: "grocery-m" - priority: 16605 - min_distance: 24 - } - caption { - primary { - height: 10 - color: 4473924 - offset_y: 1 - is_optional: true - } - priority: 15605 - } - } - element { - scale: 18 - symbol { - name: "grocery-m" - priority: 16605 - min_distance: 24 - } - caption { - primary { - height: 10 - color: 4473924 - offset_y: 1 - is_optional: true - } - priority: 15605 - } - } - element { - scale: 19 - symbol { - name: "grocery-m" - priority: 16605 - min_distance: 24 - } - caption { - primary { - height: 10 - color: 4473924 - offset_y: 1 - is_optional: true - } - priority: 15605 - } - } -} -cont { - name: "shop-houseware" - element { - scale: 16 - symbol { - name: "doityourself-m" - priority: 16605 - min_distance: 10 - } - caption { - primary { - height: 10 - color: 4473924 - offset_y: 1 - } - priority: 15605 - } - } - element { - scale: 17 - symbol { - name: "doityourself-m" - priority: 16605 - min_distance: 24 - } - caption { - primary { - height: 10 - color: 4473924 - offset_y: 1 - is_optional: true - } - priority: 15605 - } - } - element { - scale: 18 - symbol { - name: "doityourself-m" - priority: 16605 - min_distance: 24 - } - caption { - primary { - height: 10 - color: 4473924 - offset_y: 1 - is_optional: true - } - priority: 15605 - } - } - element { - scale: 19 - symbol { - name: "doityourself-m" - priority: 16605 - min_distance: 24 - } - caption { - primary { - height: 10 - color: 4473924 - offset_y: 1 - is_optional: true - } - priority: 15605 - } - } -} -cont { - name: "shop-interior_decoration" - element { - scale: 16 - symbol { - name: "shop-m" - priority: 16605 - min_distance: 10 - } - caption { - primary { - height: 10 - color: 4473924 - offset_y: 1 - } - priority: 15605 - } - } - element { - scale: 17 - symbol { - name: "shop-m" - priority: 16605 - min_distance: 10 - } - caption { - primary { - height: 10 - color: 4473924 - offset_y: 1 - } - priority: 15605 - } - } - element { - scale: 18 - symbol { - name: "shop-m" - priority: 16605 - min_distance: 10 - } - caption { - primary { - height: 10 - color: 4473924 - offset_y: 1 - } - priority: 15605 - } - } - element { - scale: 19 - symbol { - name: "shop-m" - priority: 16605 - min_distance: 10 - } - caption { - primary { - height: 10 - color: 4473924 - offset_y: 1 - } - priority: 15605 - } - } -} cont { name: "shop-jewelry" element { @@ -64723,76 +63569,6 @@ cont { } } } -cont { - name: "shop-kitchen" - element { - scale: 16 - symbol { - name: "furniture-m" - priority: 16605 - min_distance: 10 - } - caption { - primary { - height: 10 - color: 4473924 - offset_y: 1 - } - priority: 15605 - } - } - element { - scale: 17 - symbol { - name: "furniture-m" - priority: 16605 - min_distance: 24 - } - caption { - primary { - height: 10 - color: 4473924 - offset_y: 1 - is_optional: true - } - priority: 15605 - } - } - element { - scale: 18 - symbol { - name: "furniture-m" - priority: 16605 - min_distance: 24 - } - caption { - primary { - height: 10 - color: 4473924 - offset_y: 1 - is_optional: true - } - priority: 15605 - } - } - element { - scale: 19 - symbol { - name: "furniture-m" - priority: 16605 - min_distance: 24 - } - caption { - primary { - height: 10 - color: 4473924 - offset_y: 1 - is_optional: true - } - priority: 15605 - } - } -} cont { name: "shop-laundry" element { @@ -64863,73 +63639,6 @@ cont { } } } -cont { - name: "shop-lottery" - element { - scale: 16 - symbol { - name: "shop-m" - priority: 16605 - min_distance: 10 - } - caption { - primary { - height: 10 - color: 4473924 - offset_y: 1 - } - priority: 15605 - } - } - element { - scale: 17 - symbol { - name: "shop-m" - priority: 16605 - min_distance: 10 - } - caption { - primary { - height: 10 - color: 4473924 - offset_y: 1 - } - priority: 15605 - } - } - element { - scale: 18 - symbol { - name: "shop-m" - priority: 16605 - min_distance: 10 - } - caption { - primary { - height: 10 - color: 4473924 - offset_y: 1 - } - priority: 15605 - } - } - element { - scale: 19 - symbol { - name: "shop-m" - priority: 16605 - min_distance: 10 - } - caption { - primary { - height: 10 - color: 4473924 - offset_y: 1 - } - priority: 15605 - } - } -} cont { name: "shop-mall" element { @@ -65098,73 +63807,6 @@ cont { } } } -cont { - name: "shop-medical_supply" - element { - scale: 16 - symbol { - name: "shop-m" - priority: 16605 - min_distance: 10 - } - caption { - primary { - height: 10 - color: 4473924 - offset_y: 1 - } - priority: 15605 - } - } - element { - scale: 17 - symbol { - name: "shop-m" - priority: 16605 - min_distance: 10 - } - caption { - primary { - height: 10 - color: 4473924 - offset_y: 1 - } - priority: 15605 - } - } - element { - scale: 18 - symbol { - name: "shop-m" - priority: 16605 - min_distance: 10 - } - caption { - primary { - height: 10 - color: 4473924 - offset_y: 1 - } - priority: 15605 - } - } - element { - scale: 19 - symbol { - name: "shop-m" - priority: 16605 - min_distance: 10 - } - caption { - primary { - height: 10 - color: 4473924 - offset_y: 1 - } - priority: 15605 - } - } -} cont { name: "shop-mobile_phone" element { @@ -65585,73 +64227,6 @@ cont { } } } -cont { - name: "shop-nutrition_supplements" - element { - scale: 16 - symbol { - name: "shop-m" - priority: 16605 - min_distance: 10 - } - caption { - primary { - height: 10 - color: 4473924 - offset_y: 1 - } - priority: 15605 - } - } - element { - scale: 17 - symbol { - name: "shop-m" - priority: 16605 - min_distance: 10 - } - caption { - primary { - height: 10 - color: 4473924 - offset_y: 1 - } - priority: 15605 - } - } - element { - scale: 18 - symbol { - name: "shop-m" - priority: 16605 - min_distance: 10 - } - caption { - primary { - height: 10 - color: 4473924 - offset_y: 1 - } - priority: 15605 - } - } - element { - scale: 19 - symbol { - name: "shop-m" - priority: 16605 - min_distance: 10 - } - caption { - primary { - height: 10 - color: 4473924 - offset_y: 1 - } - priority: 15605 - } - } -} cont { name: "shop-optician" element { @@ -65792,143 +64367,6 @@ cont { } } } -cont { - name: "shop-paint" - element { - scale: 16 - symbol { - name: "shop-m" - priority: 16605 - min_distance: 10 - } - caption { - primary { - height: 10 - color: 4473924 - offset_y: 1 - } - priority: 15605 - } - } - element { - scale: 17 - symbol { - name: "shop-m" - priority: 16605 - min_distance: 10 - } - caption { - primary { - height: 10 - color: 4473924 - offset_y: 1 - } - priority: 15605 - } - } - element { - scale: 18 - symbol { - name: "shop-m" - priority: 16605 - min_distance: 10 - } - caption { - primary { - height: 10 - color: 4473924 - offset_y: 1 - } - priority: 15605 - } - } - element { - scale: 19 - symbol { - name: "shop-m" - priority: 16605 - min_distance: 10 - } - caption { - primary { - height: 10 - color: 4473924 - offset_y: 1 - } - priority: 15605 - } - } -} -cont { - name: "shop-pastry" - element { - scale: 16 - symbol { - name: "bakery-m" - priority: 16605 - min_distance: 10 - } - caption { - primary { - height: 10 - color: 4473924 - offset_y: 1 - } - priority: 15605 - } - } - element { - scale: 17 - symbol { - name: "bakery-m" - priority: 16605 - min_distance: 24 - } - caption { - primary { - height: 10 - color: 4473924 - offset_y: 1 - is_optional: true - } - priority: 15605 - } - } - element { - scale: 18 - symbol { - name: "bakery-m" - priority: 16605 - min_distance: 24 - } - caption { - primary { - height: 10 - color: 4473924 - offset_y: 1 - is_optional: true - } - priority: 15605 - } - } - element { - scale: 19 - symbol { - name: "bakery-m" - priority: 16605 - min_distance: 24 - } - caption { - primary { - height: 10 - color: 4473924 - offset_y: 1 - is_optional: true - } - priority: 15605 - } - } -} cont { name: "shop-pawnbroker" element { @@ -65999,73 +64437,6 @@ cont { } } } -cont { - name: "shop-perfumery" - element { - scale: 16 - symbol { - name: "shop-m" - priority: 16605 - min_distance: 10 - } - caption { - primary { - height: 10 - color: 4473924 - offset_y: 1 - } - priority: 15605 - } - } - element { - scale: 17 - symbol { - name: "shop-m" - priority: 16605 - min_distance: 10 - } - caption { - primary { - height: 10 - color: 4473924 - offset_y: 1 - } - priority: 15605 - } - } - element { - scale: 18 - symbol { - name: "shop-m" - priority: 16605 - min_distance: 10 - } - caption { - primary { - height: 10 - color: 4473924 - offset_y: 1 - } - priority: 15605 - } - } - element { - scale: 19 - symbol { - name: "shop-m" - priority: 16605 - min_distance: 10 - } - caption { - primary { - height: 10 - color: 4473924 - offset_y: 1 - } - priority: 15605 - } - } -} cont { name: "shop-pet" element { @@ -66276,140 +64647,6 @@ cont { } } } -cont { - name: "shop-second_hand" - element { - scale: 16 - symbol { - name: "shop-m" - priority: 16605 - min_distance: 10 - } - caption { - primary { - height: 10 - color: 4473924 - offset_y: 1 - } - priority: 15605 - } - } - element { - scale: 17 - symbol { - name: "shop-m" - priority: 16605 - min_distance: 10 - } - caption { - primary { - height: 10 - color: 4473924 - offset_y: 1 - } - priority: 15605 - } - } - element { - scale: 18 - symbol { - name: "shop-m" - priority: 16605 - min_distance: 10 - } - caption { - primary { - height: 10 - color: 4473924 - offset_y: 1 - } - priority: 15605 - } - } - element { - scale: 19 - symbol { - name: "shop-m" - priority: 16605 - min_distance: 10 - } - caption { - primary { - height: 10 - color: 4473924 - offset_y: 1 - } - priority: 15605 - } - } -} -cont { - name: "shop-sewing" - element { - scale: 16 - symbol { - name: "shop-m" - priority: 16605 - min_distance: 10 - } - caption { - primary { - height: 10 - color: 4473924 - offset_y: 1 - } - priority: 15605 - } - } - element { - scale: 17 - symbol { - name: "shop-m" - priority: 16605 - min_distance: 10 - } - caption { - primary { - height: 10 - color: 4473924 - offset_y: 1 - } - priority: 15605 - } - } - element { - scale: 18 - symbol { - name: "shop-m" - priority: 16605 - min_distance: 10 - } - caption { - primary { - height: 10 - color: 4473924 - offset_y: 1 - } - priority: 15605 - } - } - element { - scale: 19 - symbol { - name: "shop-m" - priority: 16605 - min_distance: 10 - } - caption { - primary { - height: 10 - color: 4473924 - offset_y: 1 - } - priority: 15605 - } - } -} cont { name: "shop-shoes" element { @@ -66620,73 +64857,6 @@ cont { } } } -cont { - name: "shop-storage_rental" - element { - scale: 16 - symbol { - name: "shop-m" - priority: 16605 - min_distance: 10 - } - caption { - primary { - height: 10 - color: 4473924 - offset_y: 1 - } - priority: 15605 - } - } - element { - scale: 17 - symbol { - name: "shop-m" - priority: 16605 - min_distance: 10 - } - caption { - primary { - height: 10 - color: 4473924 - offset_y: 1 - } - priority: 15605 - } - } - element { - scale: 18 - symbol { - name: "shop-m" - priority: 16605 - min_distance: 10 - } - caption { - primary { - height: 10 - color: 4473924 - offset_y: 1 - } - priority: 15605 - } - } - element { - scale: 19 - symbol { - name: "shop-m" - priority: 16605 - min_distance: 10 - } - caption { - primary { - height: 10 - color: 4473924 - offset_y: 1 - } - priority: 15605 - } - } -} cont { name: "shop-supermarket" element { @@ -66993,73 +65163,6 @@ cont { } } } -cont { - name: "shop-tobacco" - element { - scale: 16 - symbol { - name: "shop-m" - priority: 16605 - min_distance: 10 - } - caption { - primary { - height: 10 - color: 4473924 - offset_y: 1 - } - priority: 15605 - } - } - element { - scale: 17 - symbol { - name: "shop-m" - priority: 16605 - min_distance: 10 - } - caption { - primary { - height: 10 - color: 4473924 - offset_y: 1 - } - priority: 15605 - } - } - element { - scale: 18 - symbol { - name: "shop-m" - priority: 16605 - min_distance: 10 - } - caption { - primary { - height: 10 - color: 4473924 - offset_y: 1 - } - priority: 15605 - } - } - element { - scale: 19 - symbol { - name: "shop-m" - priority: 16605 - min_distance: 10 - } - caption { - primary { - height: 10 - color: 4473924 - offset_y: 1 - } - priority: 15605 - } - } -} cont { name: "shop-toys" element { @@ -67130,73 +65233,6 @@ cont { } } } -cont { - name: "shop-trade" - element { - scale: 16 - symbol { - name: "shop-m" - priority: 16605 - min_distance: 10 - } - caption { - primary { - height: 10 - color: 4473924 - offset_y: 1 - } - priority: 15605 - } - } - element { - scale: 17 - symbol { - name: "shop-m" - priority: 16605 - min_distance: 10 - } - caption { - primary { - height: 10 - color: 4473924 - offset_y: 1 - } - priority: 15605 - } - } - element { - scale: 18 - symbol { - name: "shop-m" - priority: 16605 - min_distance: 10 - } - caption { - primary { - height: 10 - color: 4473924 - offset_y: 1 - } - priority: 15605 - } - } - element { - scale: 19 - symbol { - name: "shop-m" - priority: 16605 - min_distance: 10 - } - caption { - primary { - height: 10 - color: 4473924 - offset_y: 1 - } - priority: 15605 - } - } -} cont { name: "shop-travel_agency" element { @@ -67541,140 +65577,6 @@ cont { } } } -cont { - name: "shop-watches" - element { - scale: 16 - symbol { - name: "shop-m" - priority: 16605 - min_distance: 10 - } - caption { - primary { - height: 10 - color: 4473924 - offset_y: 1 - } - priority: 15605 - } - } - element { - scale: 17 - symbol { - name: "shop-m" - priority: 16605 - min_distance: 10 - } - caption { - primary { - height: 10 - color: 4473924 - offset_y: 1 - } - priority: 15605 - } - } - element { - scale: 18 - symbol { - name: "shop-m" - priority: 16605 - min_distance: 10 - } - caption { - primary { - height: 10 - color: 4473924 - offset_y: 1 - } - priority: 15605 - } - } - element { - scale: 19 - symbol { - name: "shop-m" - priority: 16605 - min_distance: 10 - } - caption { - primary { - height: 10 - color: 4473924 - offset_y: 1 - } - priority: 15605 - } - } -} -cont { - name: "shop-wholesale" - element { - scale: 16 - symbol { - name: "shop-m" - priority: 16605 - min_distance: 10 - } - caption { - primary { - height: 10 - color: 4473924 - offset_y: 1 - } - priority: 15605 - } - } - element { - scale: 17 - symbol { - name: "shop-m" - priority: 16605 - min_distance: 10 - } - caption { - primary { - height: 10 - color: 4473924 - offset_y: 1 - } - priority: 15605 - } - } - element { - scale: 18 - symbol { - name: "shop-m" - priority: 16605 - min_distance: 10 - } - caption { - primary { - height: 10 - color: 4473924 - offset_y: 1 - } - priority: 15605 - } - } - element { - scale: 19 - symbol { - name: "shop-m" - priority: 16605 - min_distance: 10 - } - caption { - primary { - height: 10 - color: 4473924 - offset_y: 1 - } - priority: 15605 - } - } -} cont { name: "shop-wine" element { diff --git a/data/drules_proto_clear.bin b/data/drules_proto_clear.bin index aa29c74199..a9455bd79a 100644 Binary files a/data/drules_proto_clear.bin and b/data/drules_proto_clear.bin differ diff --git a/data/drules_proto_clear.txt b/data/drules_proto_clear.txt index f0fd71c736..f94e6546c8 100644 --- a/data/drules_proto_clear.txt +++ b/data/drules_proto_clear.txt @@ -60495,274 +60495,6 @@ cont { } } } -cont { - name: "shop-antiques" - element { - scale: 16 - symbol { - name: "shop-m" - priority: 16605 - min_distance: 10 - } - caption { - primary { - height: 10 - color: 4473924 - offset_y: 1 - } - priority: 15605 - } - } - element { - scale: 17 - symbol { - name: "shop-m" - priority: 16605 - min_distance: 10 - } - caption { - primary { - height: 10 - color: 4473924 - offset_y: 1 - } - priority: 15605 - } - } - element { - scale: 18 - symbol { - name: "shop-m" - priority: 16605 - min_distance: 10 - } - caption { - primary { - height: 10 - color: 4473924 - offset_y: 1 - } - priority: 15605 - } - } - element { - scale: 19 - symbol { - name: "shop-m" - priority: 16605 - min_distance: 10 - } - caption { - primary { - height: 10 - color: 4473924 - offset_y: 1 - } - priority: 15605 - } - } -} -cont { - name: "shop-art" - element { - scale: 16 - symbol { - name: "shop-m" - priority: 16605 - min_distance: 10 - } - caption { - primary { - height: 10 - color: 4473924 - offset_y: 1 - } - priority: 15605 - } - } - element { - scale: 17 - symbol { - name: "shop-m" - priority: 16605 - min_distance: 10 - } - caption { - primary { - height: 10 - color: 4473924 - offset_y: 1 - } - priority: 15605 - } - } - element { - scale: 18 - symbol { - name: "shop-m" - priority: 16605 - min_distance: 10 - } - caption { - primary { - height: 10 - color: 4473924 - offset_y: 1 - } - priority: 15605 - } - } - element { - scale: 19 - symbol { - name: "shop-m" - priority: 16605 - min_distance: 10 - } - caption { - primary { - height: 10 - color: 4473924 - offset_y: 1 - } - priority: 15605 - } - } -} -cont { - name: "shop-baby_goods" - element { - scale: 16 - symbol { - name: "shop-m" - priority: 16605 - min_distance: 10 - } - caption { - primary { - height: 10 - color: 4473924 - offset_y: 1 - } - priority: 15605 - } - } - element { - scale: 17 - symbol { - name: "shop-m" - priority: 16605 - min_distance: 10 - } - caption { - primary { - height: 10 - color: 4473924 - offset_y: 1 - } - priority: 15605 - } - } - element { - scale: 18 - symbol { - name: "shop-m" - priority: 16605 - min_distance: 10 - } - caption { - primary { - height: 10 - color: 4473924 - offset_y: 1 - } - priority: 15605 - } - } - element { - scale: 19 - symbol { - name: "shop-m" - priority: 16605 - min_distance: 10 - } - caption { - primary { - height: 10 - color: 4473924 - offset_y: 1 - } - priority: 15605 - } - } -} -cont { - name: "shop-bag" - element { - scale: 16 - symbol { - name: "shop-m" - priority: 16605 - min_distance: 10 - } - caption { - primary { - height: 10 - color: 4473924 - offset_y: 1 - } - priority: 15605 - } - } - element { - scale: 17 - symbol { - name: "shop-m" - priority: 16605 - min_distance: 10 - } - caption { - primary { - height: 10 - color: 4473924 - offset_y: 1 - } - priority: 15605 - } - } - element { - scale: 18 - symbol { - name: "shop-m" - priority: 16605 - min_distance: 10 - } - caption { - primary { - height: 10 - color: 4473924 - offset_y: 1 - } - priority: 15605 - } - } - element { - scale: 19 - symbol { - name: "shop-m" - priority: 16605 - min_distance: 10 - } - caption { - primary { - height: 10 - color: 4473924 - offset_y: 1 - } - priority: 15605 - } - } -} cont { name: "shop-bakery" element { @@ -61183,73 +60915,6 @@ cont { } } } -cont { - name: "shop-boutique" - element { - scale: 16 - symbol { - name: "shop-m" - priority: 16605 - min_distance: 10 - } - caption { - primary { - height: 10 - color: 4473924 - offset_y: 1 - } - priority: 15605 - } - } - element { - scale: 17 - symbol { - name: "shop-m" - priority: 16605 - min_distance: 10 - } - caption { - primary { - height: 10 - color: 4473924 - offset_y: 1 - } - priority: 15605 - } - } - element { - scale: 18 - symbol { - name: "shop-m" - priority: 16605 - min_distance: 10 - } - caption { - primary { - height: 10 - color: 4473924 - offset_y: 1 - } - priority: 15605 - } - } - element { - scale: 19 - symbol { - name: "shop-m" - priority: 16605 - min_distance: 10 - } - caption { - primary { - height: 10 - color: 4473924 - offset_y: 1 - } - priority: 15605 - } - } -} cont { name: "shop-butcher" element { @@ -61686,140 +61351,6 @@ cont { } } } -cont { - name: "shop-charity" - element { - scale: 16 - symbol { - name: "shop-m" - priority: 16605 - min_distance: 10 - } - caption { - primary { - height: 10 - color: 4473924 - offset_y: 1 - } - priority: 15605 - } - } - element { - scale: 17 - symbol { - name: "shop-m" - priority: 16605 - min_distance: 10 - } - caption { - primary { - height: 10 - color: 4473924 - offset_y: 1 - } - priority: 15605 - } - } - element { - scale: 18 - symbol { - name: "shop-m" - priority: 16605 - min_distance: 10 - } - caption { - primary { - height: 10 - color: 4473924 - offset_y: 1 - } - priority: 15605 - } - } - element { - scale: 19 - symbol { - name: "shop-m" - priority: 16605 - min_distance: 10 - } - caption { - primary { - height: 10 - color: 4473924 - offset_y: 1 - } - priority: 15605 - } - } -} -cont { - name: "shop-cheese" - element { - scale: 16 - symbol { - name: "shop-m" - priority: 16605 - min_distance: 10 - } - caption { - primary { - height: 10 - color: 4473924 - offset_y: 1 - } - priority: 15605 - } - } - element { - scale: 17 - symbol { - name: "shop-m" - priority: 16605 - min_distance: 10 - } - caption { - primary { - height: 10 - color: 4473924 - offset_y: 1 - } - priority: 15605 - } - } - element { - scale: 18 - symbol { - name: "shop-m" - priority: 16605 - min_distance: 10 - } - caption { - primary { - height: 10 - color: 4473924 - offset_y: 1 - } - priority: 15605 - } - } - element { - scale: 19 - symbol { - name: "shop-m" - priority: 16605 - min_distance: 10 - } - caption { - primary { - height: 10 - color: 4473924 - offset_y: 1 - } - priority: 15605 - } - } -} cont { name: "shop-chemist" element { @@ -62447,210 +61978,6 @@ cont { } } } -cont { - name: "shop-craft" - element { - scale: 16 - symbol { - name: "shop-m" - priority: 16605 - min_distance: 10 - } - caption { - primary { - height: 10 - color: 4473924 - offset_y: 1 - } - priority: 15605 - } - } - element { - scale: 17 - symbol { - name: "shop-m" - priority: 16605 - min_distance: 10 - } - caption { - primary { - height: 10 - color: 4473924 - offset_y: 1 - } - priority: 15605 - } - } - element { - scale: 18 - symbol { - name: "shop-m" - priority: 16605 - min_distance: 10 - } - caption { - primary { - height: 10 - color: 4473924 - offset_y: 1 - } - priority: 15605 - } - } - element { - scale: 19 - symbol { - name: "shop-m" - priority: 16605 - min_distance: 10 - } - caption { - primary { - height: 10 - color: 4473924 - offset_y: 1 - } - priority: 15605 - } - } -} -cont { - name: "shop-dairy" - element { - scale: 16 - symbol { - name: "shop-m" - priority: 16605 - min_distance: 10 - } - caption { - primary { - height: 10 - color: 4473924 - offset_y: 1 - } - priority: 15605 - } - } - element { - scale: 17 - symbol { - name: "shop-m" - priority: 16605 - min_distance: 10 - } - caption { - primary { - height: 10 - color: 4473924 - offset_y: 1 - } - priority: 15605 - } - } - element { - scale: 18 - symbol { - name: "shop-m" - priority: 16605 - min_distance: 10 - } - caption { - primary { - height: 10 - color: 4473924 - offset_y: 1 - } - priority: 15605 - } - } - element { - scale: 19 - symbol { - name: "shop-m" - priority: 16605 - min_distance: 10 - } - caption { - primary { - height: 10 - color: 4473924 - offset_y: 1 - } - priority: 15605 - } - } -} -cont { - name: "shop-deli" - element { - scale: 16 - symbol { - name: "grocery-m" - priority: 16605 - min_distance: 10 - } - caption { - primary { - height: 10 - color: 4473924 - offset_y: 1 - } - priority: 15605 - } - } - element { - scale: 17 - symbol { - name: "grocery-m" - priority: 16605 - min_distance: 24 - } - caption { - primary { - height: 10 - color: 4473924 - offset_y: 1 - is_optional: true - } - priority: 15605 - } - } - element { - scale: 18 - symbol { - name: "grocery-m" - priority: 16605 - min_distance: 24 - } - caption { - primary { - height: 10 - color: 4473924 - offset_y: 1 - is_optional: true - } - priority: 15605 - } - } - element { - scale: 19 - symbol { - name: "grocery-m" - priority: 16605 - min_distance: 24 - } - caption { - primary { - height: 10 - color: 4473924 - offset_y: 1 - is_optional: true - } - priority: 15605 - } - } -} cont { name: "shop-department_store" element { @@ -62861,73 +62188,6 @@ cont { } } } -cont { - name: "shop-electrical" - element { - scale: 16 - symbol { - name: "shop-m" - priority: 16605 - min_distance: 10 - } - caption { - primary { - height: 10 - color: 4473924 - offset_y: 1 - } - priority: 15605 - } - } - element { - scale: 17 - symbol { - name: "shop-m" - priority: 16605 - min_distance: 10 - } - caption { - primary { - height: 10 - color: 4473924 - offset_y: 1 - } - priority: 15605 - } - } - element { - scale: 18 - symbol { - name: "shop-m" - priority: 16605 - min_distance: 10 - } - caption { - primary { - height: 10 - color: 4473924 - offset_y: 1 - } - priority: 15605 - } - } - element { - scale: 19 - symbol { - name: "shop-m" - priority: 16605 - min_distance: 10 - } - caption { - primary { - height: 10 - color: 4473924 - offset_y: 1 - } - priority: 15605 - } - } -} cont { name: "shop-electronics" element { @@ -63135,143 +62395,6 @@ cont { } } } -cont { - name: "shop-farm" - element { - scale: 16 - symbol { - name: "grocery-m" - priority: 16605 - min_distance: 10 - } - caption { - primary { - height: 10 - color: 4473924 - offset_y: 1 - } - priority: 15605 - } - } - element { - scale: 17 - symbol { - name: "grocery-m" - priority: 16605 - min_distance: 24 - } - caption { - primary { - height: 10 - color: 4473924 - offset_y: 1 - is_optional: true - } - priority: 15605 - } - } - element { - scale: 18 - symbol { - name: "grocery-m" - priority: 16605 - min_distance: 24 - } - caption { - primary { - height: 10 - color: 4473924 - offset_y: 1 - is_optional: true - } - priority: 15605 - } - } - element { - scale: 19 - symbol { - name: "grocery-m" - priority: 16605 - min_distance: 24 - } - caption { - primary { - height: 10 - color: 4473924 - offset_y: 1 - is_optional: true - } - priority: 15605 - } - } -} -cont { - name: "shop-fishing" - element { - scale: 16 - symbol { - name: "shop-m" - priority: 16605 - min_distance: 10 - } - caption { - primary { - height: 10 - color: 4473924 - offset_y: 1 - } - priority: 15605 - } - } - element { - scale: 17 - symbol { - name: "shop-m" - priority: 16605 - min_distance: 10 - } - caption { - primary { - height: 10 - color: 4473924 - offset_y: 1 - } - priority: 15605 - } - } - element { - scale: 18 - symbol { - name: "shop-m" - priority: 16605 - min_distance: 10 - } - caption { - primary { - height: 10 - color: 4473924 - offset_y: 1 - } - priority: 15605 - } - } - element { - scale: 19 - symbol { - name: "shop-m" - priority: 16605 - min_distance: 10 - } - caption { - primary { - height: 10 - color: 4473924 - offset_y: 1 - } - priority: 15605 - } - } -} cont { name: "shop-florist" element { @@ -63692,76 +62815,6 @@ cont { } } } -cont { - name: "shop-grocery" - element { - scale: 16 - symbol { - name: "grocery-m" - priority: 16605 - min_distance: 10 - } - caption { - primary { - height: 10 - color: 4473924 - offset_y: 1 - } - priority: 15605 - } - } - element { - scale: 17 - symbol { - name: "grocery-m" - priority: 16605 - min_distance: 24 - } - caption { - primary { - height: 10 - color: 4473924 - offset_y: 1 - is_optional: true - } - priority: 15605 - } - } - element { - scale: 18 - symbol { - name: "grocery-m" - priority: 16605 - min_distance: 24 - } - caption { - primary { - height: 10 - color: 4473924 - offset_y: 1 - is_optional: true - } - priority: 15605 - } - } - element { - scale: 19 - symbol { - name: "grocery-m" - priority: 16605 - min_distance: 24 - } - caption { - primary { - height: 10 - color: 4473924 - offset_y: 1 - is_optional: true - } - priority: 15605 - } - } -} cont { name: "shop-hairdresser" element { @@ -63902,213 +62955,6 @@ cont { } } } -cont { - name: "shop-health_food" - element { - scale: 16 - symbol { - name: "grocery-m" - priority: 16605 - min_distance: 10 - } - caption { - primary { - height: 10 - color: 4473924 - offset_y: 1 - } - priority: 15605 - } - } - element { - scale: 17 - symbol { - name: "grocery-m" - priority: 16605 - min_distance: 24 - } - caption { - primary { - height: 10 - color: 4473924 - offset_y: 1 - is_optional: true - } - priority: 15605 - } - } - element { - scale: 18 - symbol { - name: "grocery-m" - priority: 16605 - min_distance: 24 - } - caption { - primary { - height: 10 - color: 4473924 - offset_y: 1 - is_optional: true - } - priority: 15605 - } - } - element { - scale: 19 - symbol { - name: "grocery-m" - priority: 16605 - min_distance: 24 - } - caption { - primary { - height: 10 - color: 4473924 - offset_y: 1 - is_optional: true - } - priority: 15605 - } - } -} -cont { - name: "shop-houseware" - element { - scale: 16 - symbol { - name: "doityourself-m" - priority: 16605 - min_distance: 10 - } - caption { - primary { - height: 10 - color: 4473924 - offset_y: 1 - } - priority: 15605 - } - } - element { - scale: 17 - symbol { - name: "doityourself-m" - priority: 16605 - min_distance: 24 - } - caption { - primary { - height: 10 - color: 4473924 - offset_y: 1 - is_optional: true - } - priority: 15605 - } - } - element { - scale: 18 - symbol { - name: "doityourself-m" - priority: 16605 - min_distance: 24 - } - caption { - primary { - height: 10 - color: 4473924 - offset_y: 1 - is_optional: true - } - priority: 15605 - } - } - element { - scale: 19 - symbol { - name: "doityourself-m" - priority: 16605 - min_distance: 24 - } - caption { - primary { - height: 10 - color: 4473924 - offset_y: 1 - is_optional: true - } - priority: 15605 - } - } -} -cont { - name: "shop-interior_decoration" - element { - scale: 16 - symbol { - name: "shop-m" - priority: 16605 - min_distance: 10 - } - caption { - primary { - height: 10 - color: 4473924 - offset_y: 1 - } - priority: 15605 - } - } - element { - scale: 17 - symbol { - name: "shop-m" - priority: 16605 - min_distance: 10 - } - caption { - primary { - height: 10 - color: 4473924 - offset_y: 1 - } - priority: 15605 - } - } - element { - scale: 18 - symbol { - name: "shop-m" - priority: 16605 - min_distance: 10 - } - caption { - primary { - height: 10 - color: 4473924 - offset_y: 1 - } - priority: 15605 - } - } - element { - scale: 19 - symbol { - name: "shop-m" - priority: 16605 - min_distance: 10 - } - caption { - primary { - height: 10 - color: 4473924 - offset_y: 1 - } - priority: 15605 - } - } -} cont { name: "shop-jewelry" element { @@ -64249,76 +63095,6 @@ cont { } } } -cont { - name: "shop-kitchen" - element { - scale: 16 - symbol { - name: "furniture-m" - priority: 16605 - min_distance: 10 - } - caption { - primary { - height: 10 - color: 4473924 - offset_y: 1 - } - priority: 15605 - } - } - element { - scale: 17 - symbol { - name: "furniture-m" - priority: 16605 - min_distance: 24 - } - caption { - primary { - height: 10 - color: 4473924 - offset_y: 1 - is_optional: true - } - priority: 15605 - } - } - element { - scale: 18 - symbol { - name: "furniture-m" - priority: 16605 - min_distance: 24 - } - caption { - primary { - height: 10 - color: 4473924 - offset_y: 1 - is_optional: true - } - priority: 15605 - } - } - element { - scale: 19 - symbol { - name: "furniture-m" - priority: 16605 - min_distance: 24 - } - caption { - primary { - height: 10 - color: 4473924 - offset_y: 1 - is_optional: true - } - priority: 15605 - } - } -} cont { name: "shop-laundry" element { @@ -64389,73 +63165,6 @@ cont { } } } -cont { - name: "shop-lottery" - element { - scale: 16 - symbol { - name: "shop-m" - priority: 16605 - min_distance: 10 - } - caption { - primary { - height: 10 - color: 4473924 - offset_y: 1 - } - priority: 15605 - } - } - element { - scale: 17 - symbol { - name: "shop-m" - priority: 16605 - min_distance: 10 - } - caption { - primary { - height: 10 - color: 4473924 - offset_y: 1 - } - priority: 15605 - } - } - element { - scale: 18 - symbol { - name: "shop-m" - priority: 16605 - min_distance: 10 - } - caption { - primary { - height: 10 - color: 4473924 - offset_y: 1 - } - priority: 15605 - } - } - element { - scale: 19 - symbol { - name: "shop-m" - priority: 16605 - min_distance: 10 - } - caption { - primary { - height: 10 - color: 4473924 - offset_y: 1 - } - priority: 15605 - } - } -} cont { name: "shop-mall" element { @@ -64624,73 +63333,6 @@ cont { } } } -cont { - name: "shop-medical_supply" - element { - scale: 16 - symbol { - name: "shop-m" - priority: 16605 - min_distance: 10 - } - caption { - primary { - height: 10 - color: 4473924 - offset_y: 1 - } - priority: 15605 - } - } - element { - scale: 17 - symbol { - name: "shop-m" - priority: 16605 - min_distance: 10 - } - caption { - primary { - height: 10 - color: 4473924 - offset_y: 1 - } - priority: 15605 - } - } - element { - scale: 18 - symbol { - name: "shop-m" - priority: 16605 - min_distance: 10 - } - caption { - primary { - height: 10 - color: 4473924 - offset_y: 1 - } - priority: 15605 - } - } - element { - scale: 19 - symbol { - name: "shop-m" - priority: 16605 - min_distance: 10 - } - caption { - primary { - height: 10 - color: 4473924 - offset_y: 1 - } - priority: 15605 - } - } -} cont { name: "shop-mobile_phone" element { @@ -65111,73 +63753,6 @@ cont { } } } -cont { - name: "shop-nutrition_supplements" - element { - scale: 16 - symbol { - name: "shop-m" - priority: 16605 - min_distance: 10 - } - caption { - primary { - height: 10 - color: 4473924 - offset_y: 1 - } - priority: 15605 - } - } - element { - scale: 17 - symbol { - name: "shop-m" - priority: 16605 - min_distance: 10 - } - caption { - primary { - height: 10 - color: 4473924 - offset_y: 1 - } - priority: 15605 - } - } - element { - scale: 18 - symbol { - name: "shop-m" - priority: 16605 - min_distance: 10 - } - caption { - primary { - height: 10 - color: 4473924 - offset_y: 1 - } - priority: 15605 - } - } - element { - scale: 19 - symbol { - name: "shop-m" - priority: 16605 - min_distance: 10 - } - caption { - primary { - height: 10 - color: 4473924 - offset_y: 1 - } - priority: 15605 - } - } -} cont { name: "shop-optician" element { @@ -65318,143 +63893,6 @@ cont { } } } -cont { - name: "shop-paint" - element { - scale: 16 - symbol { - name: "shop-m" - priority: 16605 - min_distance: 10 - } - caption { - primary { - height: 10 - color: 4473924 - offset_y: 1 - } - priority: 15605 - } - } - element { - scale: 17 - symbol { - name: "shop-m" - priority: 16605 - min_distance: 10 - } - caption { - primary { - height: 10 - color: 4473924 - offset_y: 1 - } - priority: 15605 - } - } - element { - scale: 18 - symbol { - name: "shop-m" - priority: 16605 - min_distance: 10 - } - caption { - primary { - height: 10 - color: 4473924 - offset_y: 1 - } - priority: 15605 - } - } - element { - scale: 19 - symbol { - name: "shop-m" - priority: 16605 - min_distance: 10 - } - caption { - primary { - height: 10 - color: 4473924 - offset_y: 1 - } - priority: 15605 - } - } -} -cont { - name: "shop-pastry" - element { - scale: 16 - symbol { - name: "bakery-m" - priority: 16605 - min_distance: 10 - } - caption { - primary { - height: 10 - color: 4473924 - offset_y: 1 - } - priority: 15605 - } - } - element { - scale: 17 - symbol { - name: "bakery-m" - priority: 16605 - min_distance: 24 - } - caption { - primary { - height: 10 - color: 4473924 - offset_y: 1 - is_optional: true - } - priority: 15605 - } - } - element { - scale: 18 - symbol { - name: "bakery-m" - priority: 16605 - min_distance: 24 - } - caption { - primary { - height: 10 - color: 4473924 - offset_y: 1 - is_optional: true - } - priority: 15605 - } - } - element { - scale: 19 - symbol { - name: "bakery-m" - priority: 16605 - min_distance: 24 - } - caption { - primary { - height: 10 - color: 4473924 - offset_y: 1 - is_optional: true - } - priority: 15605 - } - } -} cont { name: "shop-pawnbroker" element { @@ -65525,73 +63963,6 @@ cont { } } } -cont { - name: "shop-perfumery" - element { - scale: 16 - symbol { - name: "shop-m" - priority: 16605 - min_distance: 10 - } - caption { - primary { - height: 10 - color: 4473924 - offset_y: 1 - } - priority: 15605 - } - } - element { - scale: 17 - symbol { - name: "shop-m" - priority: 16605 - min_distance: 10 - } - caption { - primary { - height: 10 - color: 4473924 - offset_y: 1 - } - priority: 15605 - } - } - element { - scale: 18 - symbol { - name: "shop-m" - priority: 16605 - min_distance: 10 - } - caption { - primary { - height: 10 - color: 4473924 - offset_y: 1 - } - priority: 15605 - } - } - element { - scale: 19 - symbol { - name: "shop-m" - priority: 16605 - min_distance: 10 - } - caption { - primary { - height: 10 - color: 4473924 - offset_y: 1 - } - priority: 15605 - } - } -} cont { name: "shop-pet" element { @@ -65802,140 +64173,6 @@ cont { } } } -cont { - name: "shop-second_hand" - element { - scale: 16 - symbol { - name: "shop-m" - priority: 16605 - min_distance: 10 - } - caption { - primary { - height: 10 - color: 4473924 - offset_y: 1 - } - priority: 15605 - } - } - element { - scale: 17 - symbol { - name: "shop-m" - priority: 16605 - min_distance: 10 - } - caption { - primary { - height: 10 - color: 4473924 - offset_y: 1 - } - priority: 15605 - } - } - element { - scale: 18 - symbol { - name: "shop-m" - priority: 16605 - min_distance: 10 - } - caption { - primary { - height: 10 - color: 4473924 - offset_y: 1 - } - priority: 15605 - } - } - element { - scale: 19 - symbol { - name: "shop-m" - priority: 16605 - min_distance: 10 - } - caption { - primary { - height: 10 - color: 4473924 - offset_y: 1 - } - priority: 15605 - } - } -} -cont { - name: "shop-sewing" - element { - scale: 16 - symbol { - name: "shop-m" - priority: 16605 - min_distance: 10 - } - caption { - primary { - height: 10 - color: 4473924 - offset_y: 1 - } - priority: 15605 - } - } - element { - scale: 17 - symbol { - name: "shop-m" - priority: 16605 - min_distance: 10 - } - caption { - primary { - height: 10 - color: 4473924 - offset_y: 1 - } - priority: 15605 - } - } - element { - scale: 18 - symbol { - name: "shop-m" - priority: 16605 - min_distance: 10 - } - caption { - primary { - height: 10 - color: 4473924 - offset_y: 1 - } - priority: 15605 - } - } - element { - scale: 19 - symbol { - name: "shop-m" - priority: 16605 - min_distance: 10 - } - caption { - primary { - height: 10 - color: 4473924 - offset_y: 1 - } - priority: 15605 - } - } -} cont { name: "shop-shoes" element { @@ -66146,73 +64383,6 @@ cont { } } } -cont { - name: "shop-storage_rental" - element { - scale: 16 - symbol { - name: "shop-m" - priority: 16605 - min_distance: 10 - } - caption { - primary { - height: 10 - color: 4473924 - offset_y: 1 - } - priority: 15605 - } - } - element { - scale: 17 - symbol { - name: "shop-m" - priority: 16605 - min_distance: 10 - } - caption { - primary { - height: 10 - color: 4473924 - offset_y: 1 - } - priority: 15605 - } - } - element { - scale: 18 - symbol { - name: "shop-m" - priority: 16605 - min_distance: 10 - } - caption { - primary { - height: 10 - color: 4473924 - offset_y: 1 - } - priority: 15605 - } - } - element { - scale: 19 - symbol { - name: "shop-m" - priority: 16605 - min_distance: 10 - } - caption { - primary { - height: 10 - color: 4473924 - offset_y: 1 - } - priority: 15605 - } - } -} cont { name: "shop-supermarket" element { @@ -66487,73 +64657,6 @@ cont { } } } -cont { - name: "shop-tobacco" - element { - scale: 16 - symbol { - name: "shop-m" - priority: 16605 - min_distance: 10 - } - caption { - primary { - height: 10 - color: 4473924 - offset_y: 1 - } - priority: 15605 - } - } - element { - scale: 17 - symbol { - name: "shop-m" - priority: 16605 - min_distance: 10 - } - caption { - primary { - height: 10 - color: 4473924 - offset_y: 1 - } - priority: 15605 - } - } - element { - scale: 18 - symbol { - name: "shop-m" - priority: 16605 - min_distance: 10 - } - caption { - primary { - height: 10 - color: 4473924 - offset_y: 1 - } - priority: 15605 - } - } - element { - scale: 19 - symbol { - name: "shop-m" - priority: 16605 - min_distance: 10 - } - caption { - primary { - height: 10 - color: 4473924 - offset_y: 1 - } - priority: 15605 - } - } -} cont { name: "shop-toys" element { @@ -66624,73 +64727,6 @@ cont { } } } -cont { - name: "shop-trade" - element { - scale: 16 - symbol { - name: "shop-m" - priority: 16605 - min_distance: 10 - } - caption { - primary { - height: 10 - color: 4473924 - offset_y: 1 - } - priority: 15605 - } - } - element { - scale: 17 - symbol { - name: "shop-m" - priority: 16605 - min_distance: 10 - } - caption { - primary { - height: 10 - color: 4473924 - offset_y: 1 - } - priority: 15605 - } - } - element { - scale: 18 - symbol { - name: "shop-m" - priority: 16605 - min_distance: 10 - } - caption { - primary { - height: 10 - color: 4473924 - offset_y: 1 - } - priority: 15605 - } - } - element { - scale: 19 - symbol { - name: "shop-m" - priority: 16605 - min_distance: 10 - } - caption { - primary { - height: 10 - color: 4473924 - offset_y: 1 - } - priority: 15605 - } - } -} cont { name: "shop-travel_agency" element { @@ -67035,140 +65071,6 @@ cont { } } } -cont { - name: "shop-watches" - element { - scale: 16 - symbol { - name: "shop-m" - priority: 16605 - min_distance: 10 - } - caption { - primary { - height: 10 - color: 4473924 - offset_y: 1 - } - priority: 15605 - } - } - element { - scale: 17 - symbol { - name: "shop-m" - priority: 16605 - min_distance: 10 - } - caption { - primary { - height: 10 - color: 4473924 - offset_y: 1 - } - priority: 15605 - } - } - element { - scale: 18 - symbol { - name: "shop-m" - priority: 16605 - min_distance: 10 - } - caption { - primary { - height: 10 - color: 4473924 - offset_y: 1 - } - priority: 15605 - } - } - element { - scale: 19 - symbol { - name: "shop-m" - priority: 16605 - min_distance: 10 - } - caption { - primary { - height: 10 - color: 4473924 - offset_y: 1 - } - priority: 15605 - } - } -} -cont { - name: "shop-wholesale" - element { - scale: 16 - symbol { - name: "shop-m" - priority: 16605 - min_distance: 10 - } - caption { - primary { - height: 10 - color: 4473924 - offset_y: 1 - } - priority: 15605 - } - } - element { - scale: 17 - symbol { - name: "shop-m" - priority: 16605 - min_distance: 10 - } - caption { - primary { - height: 10 - color: 4473924 - offset_y: 1 - } - priority: 15605 - } - } - element { - scale: 18 - symbol { - name: "shop-m" - priority: 16605 - min_distance: 10 - } - caption { - primary { - height: 10 - color: 4473924 - offset_y: 1 - } - priority: 15605 - } - } - element { - scale: 19 - symbol { - name: "shop-m" - priority: 16605 - min_distance: 10 - } - caption { - primary { - height: 10 - color: 4473924 - offset_y: 1 - } - priority: 15605 - } - } -} cont { name: "shop-wine" element { diff --git a/data/drules_proto_dark.bin b/data/drules_proto_dark.bin index 92a95340cd..b7ac6da227 100644 Binary files a/data/drules_proto_dark.bin and b/data/drules_proto_dark.bin differ diff --git a/data/drules_proto_dark.txt b/data/drules_proto_dark.txt index 13f6a4e501..60fee96993 100644 --- a/data/drules_proto_dark.txt +++ b/data/drules_proto_dark.txt @@ -60580,274 +60580,6 @@ cont { } } } -cont { - name: "shop-antiques" - element { - scale: 16 - symbol { - name: "shop-m" - priority: 16605 - min_distance: 10 - } - caption { - primary { - height: 10 - color: 5592405 - offset_y: 1 - } - priority: 15605 - } - } - element { - scale: 17 - symbol { - name: "shop-m" - priority: 16605 - min_distance: 10 - } - caption { - primary { - height: 10 - color: 5592405 - offset_y: 1 - } - priority: 15605 - } - } - element { - scale: 18 - symbol { - name: "shop-m" - priority: 16605 - min_distance: 10 - } - caption { - primary { - height: 10 - color: 5592405 - offset_y: 1 - } - priority: 15605 - } - } - element { - scale: 19 - symbol { - name: "shop-m" - priority: 16605 - min_distance: 10 - } - caption { - primary { - height: 10 - color: 5592405 - offset_y: 1 - } - priority: 15605 - } - } -} -cont { - name: "shop-art" - element { - scale: 16 - symbol { - name: "shop-m" - priority: 16605 - min_distance: 10 - } - caption { - primary { - height: 10 - color: 5592405 - offset_y: 1 - } - priority: 15605 - } - } - element { - scale: 17 - symbol { - name: "shop-m" - priority: 16605 - min_distance: 10 - } - caption { - primary { - height: 10 - color: 5592405 - offset_y: 1 - } - priority: 15605 - } - } - element { - scale: 18 - symbol { - name: "shop-m" - priority: 16605 - min_distance: 10 - } - caption { - primary { - height: 10 - color: 5592405 - offset_y: 1 - } - priority: 15605 - } - } - element { - scale: 19 - symbol { - name: "shop-m" - priority: 16605 - min_distance: 10 - } - caption { - primary { - height: 10 - color: 5592405 - offset_y: 1 - } - priority: 15605 - } - } -} -cont { - name: "shop-baby_goods" - element { - scale: 16 - symbol { - name: "shop-m" - priority: 16605 - min_distance: 10 - } - caption { - primary { - height: 10 - color: 5592405 - offset_y: 1 - } - priority: 15605 - } - } - element { - scale: 17 - symbol { - name: "shop-m" - priority: 16605 - min_distance: 10 - } - caption { - primary { - height: 10 - color: 5592405 - offset_y: 1 - } - priority: 15605 - } - } - element { - scale: 18 - symbol { - name: "shop-m" - priority: 16605 - min_distance: 10 - } - caption { - primary { - height: 10 - color: 5592405 - offset_y: 1 - } - priority: 15605 - } - } - element { - scale: 19 - symbol { - name: "shop-m" - priority: 16605 - min_distance: 10 - } - caption { - primary { - height: 10 - color: 5592405 - offset_y: 1 - } - priority: 15605 - } - } -} -cont { - name: "shop-bag" - element { - scale: 16 - symbol { - name: "shop-m" - priority: 16605 - min_distance: 10 - } - caption { - primary { - height: 10 - color: 5592405 - offset_y: 1 - } - priority: 15605 - } - } - element { - scale: 17 - symbol { - name: "shop-m" - priority: 16605 - min_distance: 10 - } - caption { - primary { - height: 10 - color: 5592405 - offset_y: 1 - } - priority: 15605 - } - } - element { - scale: 18 - symbol { - name: "shop-m" - priority: 16605 - min_distance: 10 - } - caption { - primary { - height: 10 - color: 5592405 - offset_y: 1 - } - priority: 15605 - } - } - element { - scale: 19 - symbol { - name: "shop-m" - priority: 16605 - min_distance: 10 - } - caption { - primary { - height: 10 - color: 5592405 - offset_y: 1 - } - priority: 15605 - } - } -} cont { name: "shop-bakery" element { @@ -61268,73 +61000,6 @@ cont { } } } -cont { - name: "shop-boutique" - element { - scale: 16 - symbol { - name: "shop-m" - priority: 16605 - min_distance: 10 - } - caption { - primary { - height: 10 - color: 5592405 - offset_y: 1 - } - priority: 15605 - } - } - element { - scale: 17 - symbol { - name: "shop-m" - priority: 16605 - min_distance: 10 - } - caption { - primary { - height: 10 - color: 5592405 - offset_y: 1 - } - priority: 15605 - } - } - element { - scale: 18 - symbol { - name: "shop-m" - priority: 16605 - min_distance: 10 - } - caption { - primary { - height: 10 - color: 5592405 - offset_y: 1 - } - priority: 15605 - } - } - element { - scale: 19 - symbol { - name: "shop-m" - priority: 16605 - min_distance: 10 - } - caption { - primary { - height: 10 - color: 5592405 - offset_y: 1 - } - priority: 15605 - } - } -} cont { name: "shop-butcher" element { @@ -61771,140 +61436,6 @@ cont { } } } -cont { - name: "shop-charity" - element { - scale: 16 - symbol { - name: "shop-m" - priority: 16605 - min_distance: 10 - } - caption { - primary { - height: 10 - color: 5592405 - offset_y: 1 - } - priority: 15605 - } - } - element { - scale: 17 - symbol { - name: "shop-m" - priority: 16605 - min_distance: 10 - } - caption { - primary { - height: 10 - color: 5592405 - offset_y: 1 - } - priority: 15605 - } - } - element { - scale: 18 - symbol { - name: "shop-m" - priority: 16605 - min_distance: 10 - } - caption { - primary { - height: 10 - color: 5592405 - offset_y: 1 - } - priority: 15605 - } - } - element { - scale: 19 - symbol { - name: "shop-m" - priority: 16605 - min_distance: 10 - } - caption { - primary { - height: 10 - color: 5592405 - offset_y: 1 - } - priority: 15605 - } - } -} -cont { - name: "shop-cheese" - element { - scale: 16 - symbol { - name: "shop-m" - priority: 16605 - min_distance: 10 - } - caption { - primary { - height: 10 - color: 5592405 - offset_y: 1 - } - priority: 15605 - } - } - element { - scale: 17 - symbol { - name: "shop-m" - priority: 16605 - min_distance: 10 - } - caption { - primary { - height: 10 - color: 5592405 - offset_y: 1 - } - priority: 15605 - } - } - element { - scale: 18 - symbol { - name: "shop-m" - priority: 16605 - min_distance: 10 - } - caption { - primary { - height: 10 - color: 5592405 - offset_y: 1 - } - priority: 15605 - } - } - element { - scale: 19 - symbol { - name: "shop-m" - priority: 16605 - min_distance: 10 - } - caption { - primary { - height: 10 - color: 5592405 - offset_y: 1 - } - priority: 15605 - } - } -} cont { name: "shop-chemist" element { @@ -62532,210 +62063,6 @@ cont { } } } -cont { - name: "shop-craft" - element { - scale: 16 - symbol { - name: "shop-m" - priority: 16605 - min_distance: 10 - } - caption { - primary { - height: 10 - color: 5592405 - offset_y: 1 - } - priority: 15605 - } - } - element { - scale: 17 - symbol { - name: "shop-m" - priority: 16605 - min_distance: 10 - } - caption { - primary { - height: 10 - color: 5592405 - offset_y: 1 - } - priority: 15605 - } - } - element { - scale: 18 - symbol { - name: "shop-m" - priority: 16605 - min_distance: 10 - } - caption { - primary { - height: 10 - color: 5592405 - offset_y: 1 - } - priority: 15605 - } - } - element { - scale: 19 - symbol { - name: "shop-m" - priority: 16605 - min_distance: 10 - } - caption { - primary { - height: 10 - color: 5592405 - offset_y: 1 - } - priority: 15605 - } - } -} -cont { - name: "shop-dairy" - element { - scale: 16 - symbol { - name: "shop-m" - priority: 16605 - min_distance: 10 - } - caption { - primary { - height: 10 - color: 5592405 - offset_y: 1 - } - priority: 15605 - } - } - element { - scale: 17 - symbol { - name: "shop-m" - priority: 16605 - min_distance: 10 - } - caption { - primary { - height: 10 - color: 5592405 - offset_y: 1 - } - priority: 15605 - } - } - element { - scale: 18 - symbol { - name: "shop-m" - priority: 16605 - min_distance: 10 - } - caption { - primary { - height: 10 - color: 5592405 - offset_y: 1 - } - priority: 15605 - } - } - element { - scale: 19 - symbol { - name: "shop-m" - priority: 16605 - min_distance: 10 - } - caption { - primary { - height: 10 - color: 5592405 - offset_y: 1 - } - priority: 15605 - } - } -} -cont { - name: "shop-deli" - element { - scale: 16 - symbol { - name: "grocery-m" - priority: 16605 - min_distance: 10 - } - caption { - primary { - height: 10 - color: 5592405 - offset_y: 1 - } - priority: 15605 - } - } - element { - scale: 17 - symbol { - name: "grocery-m" - priority: 16605 - min_distance: 24 - } - caption { - primary { - height: 10 - color: 5592405 - offset_y: 1 - is_optional: true - } - priority: 15605 - } - } - element { - scale: 18 - symbol { - name: "grocery-m" - priority: 16605 - min_distance: 24 - } - caption { - primary { - height: 10 - color: 5592405 - offset_y: 1 - is_optional: true - } - priority: 15605 - } - } - element { - scale: 19 - symbol { - name: "grocery-m" - priority: 16605 - min_distance: 24 - } - caption { - primary { - height: 10 - color: 5592405 - offset_y: 1 - is_optional: true - } - priority: 15605 - } - } -} cont { name: "shop-department_store" element { @@ -62946,73 +62273,6 @@ cont { } } } -cont { - name: "shop-electrical" - element { - scale: 16 - symbol { - name: "shop-m" - priority: 16605 - min_distance: 10 - } - caption { - primary { - height: 10 - color: 5592405 - offset_y: 1 - } - priority: 15605 - } - } - element { - scale: 17 - symbol { - name: "shop-m" - priority: 16605 - min_distance: 10 - } - caption { - primary { - height: 10 - color: 5592405 - offset_y: 1 - } - priority: 15605 - } - } - element { - scale: 18 - symbol { - name: "shop-m" - priority: 16605 - min_distance: 10 - } - caption { - primary { - height: 10 - color: 5592405 - offset_y: 1 - } - priority: 15605 - } - } - element { - scale: 19 - symbol { - name: "shop-m" - priority: 16605 - min_distance: 10 - } - caption { - primary { - height: 10 - color: 5592405 - offset_y: 1 - } - priority: 15605 - } - } -} cont { name: "shop-electronics" element { @@ -63220,143 +62480,6 @@ cont { } } } -cont { - name: "shop-farm" - element { - scale: 16 - symbol { - name: "grocery-m" - priority: 16605 - min_distance: 10 - } - caption { - primary { - height: 10 - color: 5592405 - offset_y: 1 - } - priority: 15605 - } - } - element { - scale: 17 - symbol { - name: "grocery-m" - priority: 16605 - min_distance: 24 - } - caption { - primary { - height: 10 - color: 5592405 - offset_y: 1 - is_optional: true - } - priority: 15605 - } - } - element { - scale: 18 - symbol { - name: "grocery-m" - priority: 16605 - min_distance: 24 - } - caption { - primary { - height: 10 - color: 5592405 - offset_y: 1 - is_optional: true - } - priority: 15605 - } - } - element { - scale: 19 - symbol { - name: "grocery-m" - priority: 16605 - min_distance: 24 - } - caption { - primary { - height: 10 - color: 5592405 - offset_y: 1 - is_optional: true - } - priority: 15605 - } - } -} -cont { - name: "shop-fishing" - element { - scale: 16 - symbol { - name: "shop-m" - priority: 16605 - min_distance: 10 - } - caption { - primary { - height: 10 - color: 5592405 - offset_y: 1 - } - priority: 15605 - } - } - element { - scale: 17 - symbol { - name: "shop-m" - priority: 16605 - min_distance: 10 - } - caption { - primary { - height: 10 - color: 5592405 - offset_y: 1 - } - priority: 15605 - } - } - element { - scale: 18 - symbol { - name: "shop-m" - priority: 16605 - min_distance: 10 - } - caption { - primary { - height: 10 - color: 5592405 - offset_y: 1 - } - priority: 15605 - } - } - element { - scale: 19 - symbol { - name: "shop-m" - priority: 16605 - min_distance: 10 - } - caption { - primary { - height: 10 - color: 5592405 - offset_y: 1 - } - priority: 15605 - } - } -} cont { name: "shop-florist" element { @@ -63777,76 +62900,6 @@ cont { } } } -cont { - name: "shop-grocery" - element { - scale: 16 - symbol { - name: "grocery-m" - priority: 16605 - min_distance: 10 - } - caption { - primary { - height: 10 - color: 5592405 - offset_y: 1 - } - priority: 15605 - } - } - element { - scale: 17 - symbol { - name: "grocery-m" - priority: 16605 - min_distance: 24 - } - caption { - primary { - height: 10 - color: 5592405 - offset_y: 1 - is_optional: true - } - priority: 15605 - } - } - element { - scale: 18 - symbol { - name: "grocery-m" - priority: 16605 - min_distance: 24 - } - caption { - primary { - height: 10 - color: 5592405 - offset_y: 1 - is_optional: true - } - priority: 15605 - } - } - element { - scale: 19 - symbol { - name: "grocery-m" - priority: 16605 - min_distance: 24 - } - caption { - primary { - height: 10 - color: 5592405 - offset_y: 1 - is_optional: true - } - priority: 15605 - } - } -} cont { name: "shop-hairdresser" element { @@ -63987,213 +63040,6 @@ cont { } } } -cont { - name: "shop-health_food" - element { - scale: 16 - symbol { - name: "grocery-m" - priority: 16605 - min_distance: 10 - } - caption { - primary { - height: 10 - color: 5592405 - offset_y: 1 - } - priority: 15605 - } - } - element { - scale: 17 - symbol { - name: "grocery-m" - priority: 16605 - min_distance: 24 - } - caption { - primary { - height: 10 - color: 5592405 - offset_y: 1 - is_optional: true - } - priority: 15605 - } - } - element { - scale: 18 - symbol { - name: "grocery-m" - priority: 16605 - min_distance: 24 - } - caption { - primary { - height: 10 - color: 5592405 - offset_y: 1 - is_optional: true - } - priority: 15605 - } - } - element { - scale: 19 - symbol { - name: "grocery-m" - priority: 16605 - min_distance: 24 - } - caption { - primary { - height: 10 - color: 5592405 - offset_y: 1 - is_optional: true - } - priority: 15605 - } - } -} -cont { - name: "shop-houseware" - element { - scale: 16 - symbol { - name: "doityourself-m" - priority: 16605 - min_distance: 10 - } - caption { - primary { - height: 10 - color: 5592405 - offset_y: 1 - } - priority: 15605 - } - } - element { - scale: 17 - symbol { - name: "doityourself-m" - priority: 16605 - min_distance: 24 - } - caption { - primary { - height: 10 - color: 5592405 - offset_y: 1 - is_optional: true - } - priority: 15605 - } - } - element { - scale: 18 - symbol { - name: "doityourself-m" - priority: 16605 - min_distance: 24 - } - caption { - primary { - height: 10 - color: 5592405 - offset_y: 1 - is_optional: true - } - priority: 15605 - } - } - element { - scale: 19 - symbol { - name: "doityourself-m" - priority: 16605 - min_distance: 24 - } - caption { - primary { - height: 10 - color: 5592405 - offset_y: 1 - is_optional: true - } - priority: 15605 - } - } -} -cont { - name: "shop-interior_decoration" - element { - scale: 16 - symbol { - name: "shop-m" - priority: 16605 - min_distance: 10 - } - caption { - primary { - height: 10 - color: 5592405 - offset_y: 1 - } - priority: 15605 - } - } - element { - scale: 17 - symbol { - name: "shop-m" - priority: 16605 - min_distance: 10 - } - caption { - primary { - height: 10 - color: 5592405 - offset_y: 1 - } - priority: 15605 - } - } - element { - scale: 18 - symbol { - name: "shop-m" - priority: 16605 - min_distance: 10 - } - caption { - primary { - height: 10 - color: 5592405 - offset_y: 1 - } - priority: 15605 - } - } - element { - scale: 19 - symbol { - name: "shop-m" - priority: 16605 - min_distance: 10 - } - caption { - primary { - height: 10 - color: 5592405 - offset_y: 1 - } - priority: 15605 - } - } -} cont { name: "shop-jewelry" element { @@ -64334,76 +63180,6 @@ cont { } } } -cont { - name: "shop-kitchen" - element { - scale: 16 - symbol { - name: "furniture-m" - priority: 16605 - min_distance: 10 - } - caption { - primary { - height: 10 - color: 5592405 - offset_y: 1 - } - priority: 15605 - } - } - element { - scale: 17 - symbol { - name: "furniture-m" - priority: 16605 - min_distance: 24 - } - caption { - primary { - height: 10 - color: 5592405 - offset_y: 1 - is_optional: true - } - priority: 15605 - } - } - element { - scale: 18 - symbol { - name: "furniture-m" - priority: 16605 - min_distance: 24 - } - caption { - primary { - height: 10 - color: 5592405 - offset_y: 1 - is_optional: true - } - priority: 15605 - } - } - element { - scale: 19 - symbol { - name: "furniture-m" - priority: 16605 - min_distance: 24 - } - caption { - primary { - height: 10 - color: 5592405 - offset_y: 1 - is_optional: true - } - priority: 15605 - } - } -} cont { name: "shop-laundry" element { @@ -64474,73 +63250,6 @@ cont { } } } -cont { - name: "shop-lottery" - element { - scale: 16 - symbol { - name: "shop-m" - priority: 16605 - min_distance: 10 - } - caption { - primary { - height: 10 - color: 5592405 - offset_y: 1 - } - priority: 15605 - } - } - element { - scale: 17 - symbol { - name: "shop-m" - priority: 16605 - min_distance: 10 - } - caption { - primary { - height: 10 - color: 5592405 - offset_y: 1 - } - priority: 15605 - } - } - element { - scale: 18 - symbol { - name: "shop-m" - priority: 16605 - min_distance: 10 - } - caption { - primary { - height: 10 - color: 5592405 - offset_y: 1 - } - priority: 15605 - } - } - element { - scale: 19 - symbol { - name: "shop-m" - priority: 16605 - min_distance: 10 - } - caption { - primary { - height: 10 - color: 5592405 - offset_y: 1 - } - priority: 15605 - } - } -} cont { name: "shop-mall" element { @@ -64709,73 +63418,6 @@ cont { } } } -cont { - name: "shop-medical_supply" - element { - scale: 16 - symbol { - name: "shop-m" - priority: 16605 - min_distance: 10 - } - caption { - primary { - height: 10 - color: 5592405 - offset_y: 1 - } - priority: 15605 - } - } - element { - scale: 17 - symbol { - name: "shop-m" - priority: 16605 - min_distance: 10 - } - caption { - primary { - height: 10 - color: 5592405 - offset_y: 1 - } - priority: 15605 - } - } - element { - scale: 18 - symbol { - name: "shop-m" - priority: 16605 - min_distance: 10 - } - caption { - primary { - height: 10 - color: 5592405 - offset_y: 1 - } - priority: 15605 - } - } - element { - scale: 19 - symbol { - name: "shop-m" - priority: 16605 - min_distance: 10 - } - caption { - primary { - height: 10 - color: 5592405 - offset_y: 1 - } - priority: 15605 - } - } -} cont { name: "shop-mobile_phone" element { @@ -65196,73 +63838,6 @@ cont { } } } -cont { - name: "shop-nutrition_supplements" - element { - scale: 16 - symbol { - name: "shop-m" - priority: 16605 - min_distance: 10 - } - caption { - primary { - height: 10 - color: 5592405 - offset_y: 1 - } - priority: 15605 - } - } - element { - scale: 17 - symbol { - name: "shop-m" - priority: 16605 - min_distance: 10 - } - caption { - primary { - height: 10 - color: 5592405 - offset_y: 1 - } - priority: 15605 - } - } - element { - scale: 18 - symbol { - name: "shop-m" - priority: 16605 - min_distance: 10 - } - caption { - primary { - height: 10 - color: 5592405 - offset_y: 1 - } - priority: 15605 - } - } - element { - scale: 19 - symbol { - name: "shop-m" - priority: 16605 - min_distance: 10 - } - caption { - primary { - height: 10 - color: 5592405 - offset_y: 1 - } - priority: 15605 - } - } -} cont { name: "shop-optician" element { @@ -65403,143 +63978,6 @@ cont { } } } -cont { - name: "shop-paint" - element { - scale: 16 - symbol { - name: "shop-m" - priority: 16605 - min_distance: 10 - } - caption { - primary { - height: 10 - color: 5592405 - offset_y: 1 - } - priority: 15605 - } - } - element { - scale: 17 - symbol { - name: "shop-m" - priority: 16605 - min_distance: 10 - } - caption { - primary { - height: 10 - color: 5592405 - offset_y: 1 - } - priority: 15605 - } - } - element { - scale: 18 - symbol { - name: "shop-m" - priority: 16605 - min_distance: 10 - } - caption { - primary { - height: 10 - color: 5592405 - offset_y: 1 - } - priority: 15605 - } - } - element { - scale: 19 - symbol { - name: "shop-m" - priority: 16605 - min_distance: 10 - } - caption { - primary { - height: 10 - color: 5592405 - offset_y: 1 - } - priority: 15605 - } - } -} -cont { - name: "shop-pastry" - element { - scale: 16 - symbol { - name: "bakery-m" - priority: 16605 - min_distance: 10 - } - caption { - primary { - height: 10 - color: 5592405 - offset_y: 1 - } - priority: 15605 - } - } - element { - scale: 17 - symbol { - name: "bakery-m" - priority: 16605 - min_distance: 24 - } - caption { - primary { - height: 10 - color: 5592405 - offset_y: 1 - is_optional: true - } - priority: 15605 - } - } - element { - scale: 18 - symbol { - name: "bakery-m" - priority: 16605 - min_distance: 24 - } - caption { - primary { - height: 10 - color: 5592405 - offset_y: 1 - is_optional: true - } - priority: 15605 - } - } - element { - scale: 19 - symbol { - name: "bakery-m" - priority: 16605 - min_distance: 24 - } - caption { - primary { - height: 10 - color: 5592405 - offset_y: 1 - is_optional: true - } - priority: 15605 - } - } -} cont { name: "shop-pawnbroker" element { @@ -65610,73 +64048,6 @@ cont { } } } -cont { - name: "shop-perfumery" - element { - scale: 16 - symbol { - name: "shop-m" - priority: 16605 - min_distance: 10 - } - caption { - primary { - height: 10 - color: 5592405 - offset_y: 1 - } - priority: 15605 - } - } - element { - scale: 17 - symbol { - name: "shop-m" - priority: 16605 - min_distance: 10 - } - caption { - primary { - height: 10 - color: 5592405 - offset_y: 1 - } - priority: 15605 - } - } - element { - scale: 18 - symbol { - name: "shop-m" - priority: 16605 - min_distance: 10 - } - caption { - primary { - height: 10 - color: 5592405 - offset_y: 1 - } - priority: 15605 - } - } - element { - scale: 19 - symbol { - name: "shop-m" - priority: 16605 - min_distance: 10 - } - caption { - primary { - height: 10 - color: 5592405 - offset_y: 1 - } - priority: 15605 - } - } -} cont { name: "shop-pet" element { @@ -65887,140 +64258,6 @@ cont { } } } -cont { - name: "shop-second_hand" - element { - scale: 16 - symbol { - name: "shop-m" - priority: 16605 - min_distance: 10 - } - caption { - primary { - height: 10 - color: 5592405 - offset_y: 1 - } - priority: 15605 - } - } - element { - scale: 17 - symbol { - name: "shop-m" - priority: 16605 - min_distance: 10 - } - caption { - primary { - height: 10 - color: 5592405 - offset_y: 1 - } - priority: 15605 - } - } - element { - scale: 18 - symbol { - name: "shop-m" - priority: 16605 - min_distance: 10 - } - caption { - primary { - height: 10 - color: 5592405 - offset_y: 1 - } - priority: 15605 - } - } - element { - scale: 19 - symbol { - name: "shop-m" - priority: 16605 - min_distance: 10 - } - caption { - primary { - height: 10 - color: 5592405 - offset_y: 1 - } - priority: 15605 - } - } -} -cont { - name: "shop-sewing" - element { - scale: 16 - symbol { - name: "shop-m" - priority: 16605 - min_distance: 10 - } - caption { - primary { - height: 10 - color: 5592405 - offset_y: 1 - } - priority: 15605 - } - } - element { - scale: 17 - symbol { - name: "shop-m" - priority: 16605 - min_distance: 10 - } - caption { - primary { - height: 10 - color: 5592405 - offset_y: 1 - } - priority: 15605 - } - } - element { - scale: 18 - symbol { - name: "shop-m" - priority: 16605 - min_distance: 10 - } - caption { - primary { - height: 10 - color: 5592405 - offset_y: 1 - } - priority: 15605 - } - } - element { - scale: 19 - symbol { - name: "shop-m" - priority: 16605 - min_distance: 10 - } - caption { - primary { - height: 10 - color: 5592405 - offset_y: 1 - } - priority: 15605 - } - } -} cont { name: "shop-shoes" element { @@ -66231,73 +64468,6 @@ cont { } } } -cont { - name: "shop-storage_rental" - element { - scale: 16 - symbol { - name: "shop-m" - priority: 16605 - min_distance: 10 - } - caption { - primary { - height: 10 - color: 5592405 - offset_y: 1 - } - priority: 15605 - } - } - element { - scale: 17 - symbol { - name: "shop-m" - priority: 16605 - min_distance: 10 - } - caption { - primary { - height: 10 - color: 5592405 - offset_y: 1 - } - priority: 15605 - } - } - element { - scale: 18 - symbol { - name: "shop-m" - priority: 16605 - min_distance: 10 - } - caption { - primary { - height: 10 - color: 5592405 - offset_y: 1 - } - priority: 15605 - } - } - element { - scale: 19 - symbol { - name: "shop-m" - priority: 16605 - min_distance: 10 - } - caption { - primary { - height: 10 - color: 5592405 - offset_y: 1 - } - priority: 15605 - } - } -} cont { name: "shop-supermarket" element { @@ -66572,73 +64742,6 @@ cont { } } } -cont { - name: "shop-tobacco" - element { - scale: 16 - symbol { - name: "shop-m" - priority: 16605 - min_distance: 10 - } - caption { - primary { - height: 10 - color: 5592405 - offset_y: 1 - } - priority: 15605 - } - } - element { - scale: 17 - symbol { - name: "shop-m" - priority: 16605 - min_distance: 10 - } - caption { - primary { - height: 10 - color: 5592405 - offset_y: 1 - } - priority: 15605 - } - } - element { - scale: 18 - symbol { - name: "shop-m" - priority: 16605 - min_distance: 10 - } - caption { - primary { - height: 10 - color: 5592405 - offset_y: 1 - } - priority: 15605 - } - } - element { - scale: 19 - symbol { - name: "shop-m" - priority: 16605 - min_distance: 10 - } - caption { - primary { - height: 10 - color: 5592405 - offset_y: 1 - } - priority: 15605 - } - } -} cont { name: "shop-toys" element { @@ -66709,73 +64812,6 @@ cont { } } } -cont { - name: "shop-trade" - element { - scale: 16 - symbol { - name: "shop-m" - priority: 16605 - min_distance: 10 - } - caption { - primary { - height: 10 - color: 5592405 - offset_y: 1 - } - priority: 15605 - } - } - element { - scale: 17 - symbol { - name: "shop-m" - priority: 16605 - min_distance: 10 - } - caption { - primary { - height: 10 - color: 5592405 - offset_y: 1 - } - priority: 15605 - } - } - element { - scale: 18 - symbol { - name: "shop-m" - priority: 16605 - min_distance: 10 - } - caption { - primary { - height: 10 - color: 5592405 - offset_y: 1 - } - priority: 15605 - } - } - element { - scale: 19 - symbol { - name: "shop-m" - priority: 16605 - min_distance: 10 - } - caption { - primary { - height: 10 - color: 5592405 - offset_y: 1 - } - priority: 15605 - } - } -} cont { name: "shop-travel_agency" element { @@ -67120,140 +65156,6 @@ cont { } } } -cont { - name: "shop-watches" - element { - scale: 16 - symbol { - name: "shop-m" - priority: 16605 - min_distance: 10 - } - caption { - primary { - height: 10 - color: 5592405 - offset_y: 1 - } - priority: 15605 - } - } - element { - scale: 17 - symbol { - name: "shop-m" - priority: 16605 - min_distance: 10 - } - caption { - primary { - height: 10 - color: 5592405 - offset_y: 1 - } - priority: 15605 - } - } - element { - scale: 18 - symbol { - name: "shop-m" - priority: 16605 - min_distance: 10 - } - caption { - primary { - height: 10 - color: 5592405 - offset_y: 1 - } - priority: 15605 - } - } - element { - scale: 19 - symbol { - name: "shop-m" - priority: 16605 - min_distance: 10 - } - caption { - primary { - height: 10 - color: 5592405 - offset_y: 1 - } - priority: 15605 - } - } -} -cont { - name: "shop-wholesale" - element { - scale: 16 - symbol { - name: "shop-m" - priority: 16605 - min_distance: 10 - } - caption { - primary { - height: 10 - color: 5592405 - offset_y: 1 - } - priority: 15605 - } - } - element { - scale: 17 - symbol { - name: "shop-m" - priority: 16605 - min_distance: 10 - } - caption { - primary { - height: 10 - color: 5592405 - offset_y: 1 - } - priority: 15605 - } - } - element { - scale: 18 - symbol { - name: "shop-m" - priority: 16605 - min_distance: 10 - } - caption { - primary { - height: 10 - color: 5592405 - offset_y: 1 - } - priority: 15605 - } - } - element { - scale: 19 - symbol { - name: "shop-m" - priority: 16605 - min_distance: 10 - } - caption { - primary { - height: 10 - color: 5592405 - offset_y: 1 - } - priority: 15605 - } - } -} cont { name: "shop-wine" element { diff --git a/data/editor.config b/data/editor.config index 2e5a423567..6d4b776b45 100644 --- a/data/editor.config +++ b/data/editor.config @@ -557,14 +557,6 @@ - - - - - - - - @@ -601,11 +593,8 @@ - - - - - + + @@ -629,18 +618,6 @@ - - - - - - - - - - - - @@ -649,22 +626,10 @@ - - - - - - - - - - - - @@ -685,10 +650,6 @@ - - - - @@ -697,10 +658,6 @@ - - - - @@ -709,10 +666,6 @@ - - - - @@ -725,26 +678,10 @@ - - - - - - - - - - - - - - - - @@ -757,11 +694,11 @@ - + - + @@ -772,13 +709,17 @@ - - - - + + + + + + + + diff --git a/data/mapcss-mapping.csv b/data/mapcss-mapping.csv index a5d4b1f0b7..d892a6ebe5 100644 --- a/data/mapcss-mapping.csv +++ b/data/mapcss-mapping.csv @@ -909,11 +909,11 @@ deprecated|deprecated;909;x railway|subway|grey;[railway=subway][colour=grey];x;name;int_name;910;railway|subway|tunnel deprecated|deprecated;911;x historic|ship;912; -shop|tobacco;913; -shop|farm;914; -shop|storage_rental;915; -shop|trade;916; -shop|deli;917; +deprecated|deprecated;913;x +deprecated|deprecated;914;x +deprecated|deprecated;915;x +deprecated|deprecated;916;x +deprecated|deprecated;917;x shop|mall;918; shop|doityourself;919; place|sea;920; @@ -1073,7 +1073,7 @@ amenity|vending_machine|cigarettes;[amenity=vending_machine][vending=cigarettes] amenity|vending_machine|drinks;[amenity=vending_machine][vending=drinks];;name;int_name;1075; amenity|waste_basket;1076; building|garage;[building=garage],[building=yes][garage],[building=garages],[amenity=garage],[amenity=garages];;addr:housenumber;name;1077; -shop|pastry;1078; +deprecated|deprecated;1078;x emergency|phone;1079; highway|rest_area;1080; highway|traffic_signals;1081; @@ -1096,7 +1096,7 @@ shop|wine;1097; tourism|chalet;1098; tourism|information|board;[tourism=information][information=board];;name;int_name;1099; tourism|information|map;[tourism=information][information=map];;name;int_name;1100; -shop|paint;1101; +deprecated|deprecated;1101;x traffic_calming|bump;1102; traffic_calming|hump;1103; shop|car_parts;1104; @@ -1107,8 +1107,8 @@ leisure|sports_centre|yoga;[leisure=sports_centre][sport=yoga];;name;int_name;11 amenity|public_bookcase;1109; tourism|apartment;1110; tourism|resort;[tourism=resort],[leisure=resort],[leisure=summer_camp];;name;int_name;1111; -shop|interior_decoration;1112; -shop|houseware;1113; +deprecated|deprecated;1112;x +deprecated|deprecated;1113;x hwtag|nobicycle;1114; hwtag|yesbicycle;1115; hwtag|bidir_bicycle;1116; @@ -1151,8 +1151,8 @@ tourism|gallery;1152; historic|fort;1153; shop|coffee;1154; shop|tea;1155; -shop|art;1156; -shop|charity;1157; +deprecated|deprecated;1156;x +deprecated|deprecated;1157;x hwtag|toll;1158; amenity|arts_centre;1159; amenity|biergarten;1160; @@ -1172,7 +1172,7 @@ highway|services;1173; leisure|fitness_station;1174; leisure|ice_rink;1175; leisure|marina;1176; -shop|medical_supply;1177; +deprecated|deprecated;1177;x man_made|surveillance;1178; man_made|water_tap;1179; man_made|works;1180; @@ -1180,7 +1180,7 @@ office|insurance;1181; office|ngo;1182; shop|chocolate;1183; shop|erotic;1184; -shop|kitchen;1185; +deprecated|deprecated;1185;x shop|fabric;1186; shop|funeral_directors;1187; shop|massage;1188; @@ -1195,25 +1195,25 @@ shop|variety_store;1196; shop|video;1197; tourism|theme_park;1198; tourism|wilderness_hut;1199; -shop|boutique;1200; -shop|lottery;1201; -shop|antiques;1202; -shop|wholesale;1203; -shop|perfumery;1204; -shop|baby_goods;1205; -shop|bag;1206; -shop|dairy;1207; -shop|electrical;1208; -shop|cheese;1209; +deprecated|deprecated;1200;x +deprecated|deprecated;1201;x +deprecated|deprecated;1202;x +deprecated|deprecated;1203;x +deprecated|deprecated;1204;x +deprecated|deprecated;1205;x +deprecated|deprecated;1206;x +deprecated|deprecated;1207;x +deprecated|deprecated;1208;x +deprecated|deprecated;1209;x shop|money_lender;1210; -shop|health_food;1211; -shop|fishing;1212; -shop|grocery;1213; -shop|nutrition_supplements;1214; -shop|watches;1215; -shop|second_hand;1216; -shop|craft;1217; -shop|sewing;1218; +deprecated|deprecated;1211;x +deprecated|deprecated;1212;x +deprecated|deprecated;1213;x +deprecated|deprecated;1214;x +deprecated|deprecated;1215;x +deprecated|deprecated;1216;x +deprecated|deprecated;1217;x +deprecated|deprecated;1218;x deprecated|deprecated;1219;x deprecated|deprecated;1220;x deprecated|deprecated;1221;x diff --git a/data/replaced_tags.txt b/data/replaced_tags.txt index 321838f12f..fa5cd21288 100644 --- a/data/replaced_tags.txt +++ b/data/replaced_tags.txt @@ -30,13 +30,8 @@ bench=yes : amenity=bench shelter=yes : amenity=shelter toilets=yes : amenity=toilets restaurant=yes : amenity=restaurant - -ice_cream=yes : amenity=ice_cream - shop=ice_cream : amenity=ice_cream -shop=e-cigarette : shop=tobacco -shop=food : shop=convenience -shop=haberdashery : shop=sewing +ice_cream=yes : amenity=ice_cream ford=boat : highway=ford ford=intermittent : highway=ford diff --git a/data/strings/types_strings.txt b/data/strings/types_strings.txt index ee35f5eab5..369b15883b 100644 --- a/data/strings/types_strings.txt +++ b/data/strings/types_strings.txt @@ -17395,43 +17395,6 @@ zh-Hans = 化妝品店 zh-Hant = 化妆品 - [type.shop.deli] - en = Delicatessen Shop - ar = ﺔﺒﻠﻌﻤﻟﺍ ﺔﻤﻌﻃﻷﺍ ﻊﻴﺒﻟ ﻞﺤﻣ - be = Дэлікатэсная крама - bg = Магазин за деликатеси - cs = Prodejna lahůdek - da = Delikatessebutik - de = Feinkostgeschäft - el = Κατάστημα Delicatessen - es = Tienda de delicatessen - eu = Delicatesen Denda - fa = ﯽﺷﻭﺮﻓ ﻪﯾﺬﻏﺍ ﻩﺎﮕﺷﻭﺮﻓ - fi = Herkkukauppa - fr = Épicerie fine - he = תוינדעמ תונח - hu = Csemegebolt - id = Toko Kue - it = Negozio di specialità gastronomiche - ja = デリカテッセンショップ - ko = 델리카트슨 숍 - nb = Delikatessebutikk - nl = Delicatessenwinkel - pl = Sklep delikatesowy - pt = Loja Delicatessen - pt-BR = Loja Delicatessen - ro = Magazin de delicatese - ru = Магазин деликатесов - sk = Predajňa lahôdok - sv = Delikatessbutik - sw = Duka la Delicatessen - th = ร้านขายอาหารสำเร็จรูป - tr = Şarküteri Dükkanı - uk = Делікатесний магазин - vi = Cửa hàng đồ ăn ngon - zh-Hans = 熟食店 - zh-Hant = 熟食店 - [type.shop.department_store] en = Department Store ar = متجر شامل @@ -17635,43 +17598,6 @@ zh-Hans = 商店 zh-Hant = 購物 - [type.shop.farm] - en = Farm Food Shop - ar = ﺔﻋﺭﺰﻤﻟﺍ ﺔﻳﺬﻏﺃ ﺮﺠﺘﻣ - be = Сельскагаспадарчыя прадукты - bg = Магазин за селскостопански храни - cs = Prodejna farmářských potravin - da = Farm Food Shop - de = Hoflebensmittelladen - el = Κατάστημα Αγροτικών Τροφίμων - es = Tienda de alimentos de granja - eu = Baserriko Janari Denda - fa = ﻪﻋﺭﺰﻣ ﯽﯾﺍﺬﻏ ﺩﺍﻮﻣ ﻩﺎﮕﺷﻭﺮﻓ - fi = Maatilaruokakauppa - fr = Magasin d'alimentation à la ferme - he = הווחל ןוזמ תונח - hu = Farm Food Shop - id = Toko Makanan Pertanian - it = Negozio di prodotti alimentari della fattoria - ja = ファームフードショップ - ko = "농장 식품 가게" - nb = Gårdsmatbutikk - nl = Boerderijwinkel - pl = Sklep spożywczy dla gospodarstw rolnych - pt = Loja de comida agrícola - pt-BR = Loja de alimentos agrícolas - ro = Magazin alimentar la fermă - ru = Фермерский магазин - sk = Obchod s farmárskymi potravinami - sv = Gårdsmataffär - sw = Duka la Chakula cha shambani - th = ฟาร์มฟู้ดช็อป - tr = Çiftlik Gıda Dükkanı - uk = Магазин фермерських продуктів - vi = Cửa hàng thực phẩm nông trại - zh-Hans = 农场食品店 - zh-Hant = 農場食品店 - [type.shop.florist] en = Florist’s ar = متجر زهور @@ -17877,43 +17803,6 @@ zh-Hans = 蔬果零售店 zh-Hant = 蔬果零售店 - [type.shop.grocery] - en = Grocery - ar = ﺕﺍﻭﺮﻀﺧ - be = Бакалея - bg = Хранителни стоки - cs = Potraviny - da = Købmand - de = Lebensmittelgeschäft - el = Παντοπωλείο - es = Tienda de comestibles - eu = Janariak - fa = ﺭﺎﺑﺭﺍﻮﺧ - fi = Päivittäistavarakauppa - fr = Épicerie - he = תלֶוֹכּמַ - hu = Élelmiszerbolt - id = Kebutuhan sehari-hari - it = Drogheria - ja = 買い物 - ko = "식료품점" - nb = Dagligvare - nl = Boodschap - pl = Sklep spożywczy - pt = Mercearia - pt-BR = Mercearia - ro = Băcănie - ru = Бакалея - sk = Potraviny - sv = Livsmedel - sw = Chakula cha mboga - th = ร้านขายของชำ - tr = Bakkal - uk = Бакалія - vi = Cửa hàng tạp hóa - zh-Hans = 杂货店 - zh-Hant = 雜貨店 - [type.shop.hairdresser] en = Hairdresser ar = مصفف شعر @@ -17949,105 +17838,38 @@ zh-Hant = 理髮師 [type.shop.hardware] - ref = type.shop.doityourself - ar = ﺕﺍﺪﻌﻣ ﻞﺤﻣ - be = Будаўнічы магазін - bg = Магазин за хардуер - el = Κατάστημα υλικού - eu = Hardware denda - fa = ﺭﺍﺰﻓﺍ ﺖﺨﺳ ﻩﺎﮕﺷﻭﺮﻓ + en = Hardware Store + ar = متجر عدد وأدوات + cs = Železářství + da = Isenkræmmer + de = Eisenwarengeschäft + el = Είδη κιγκαλερίας + es = Ferretería + eu = Burdindegia + fa = فروشگاه + fi = Rautakauppa fr = Quincaillerie - he = ןיינב ירמוחל תונח - hu = Hardver üzlet - it = Negozio hardware - ja = ホームセンター - nl = Ijzerwaren - pl = Sklep z narzędziami + hu = Vaskereskedés + id = Toko perangkat keras + it = Ferramenta + ja = 工具店 + ko = 철물점 + mr = हार्डवेअर दुकान + nb = Jernvareforretning + nl = Ijzerhandel + pl = Sklep narzędziowy pt = Loja de ferragens pt-BR = Loja de ferragens - ro = Magazin de hardware - ru = Хозяйственный магазин - sv = Järnaffär - sw = Duka la vifaa - th = ร้านฮาร์ดแวร์ - tr = Donanım mağazası - uk = Магазин побутової техніки - zh-Hans = 五金店 - zh-Hant = 五金店 - - [type.shop.health_food] - en = Health Food Shop - ar = ﺔﻴﺤﺼﻟﺍ ﺔﻳﺬﻏﻼﻟ ﺮﺠﺘﻣ - be = Крама здаровай ежы - bg = Магазин за здравословни храни - cs = Prodejna zdravé výživy - da = Helsekostbutik - de = Reformhaus - el = Κατάστημα υγιεινής διατροφής - es = Tienda de comida saludable - eu = Osasuneko Elikagaien Denda - fa = ﯽﺘﺷﺍﺪﻬﺑ ﯽﯾﺍﺬﻏ ﺩﺍﻮﻣ ﻩﺎﮕﺷﻭﺮﻓ - fi = Terveysruokakauppa - fr = Magasin d'alimentation diététique - he = תואירב ןוזמ תונח - hu = Egészségügyi élelmiszerbolt - id = Toko Makanan Kesehatan - it = Negozio di alimenti naturali - ja = 健康食品店 - ko = "건강식품 가게" - nb = Helsekostbutikk - nl = Natuurvoedingswinkel - pl = Sklep ze zdrową żywnością - pt = Loja de alimentos saudáveis - pt-BR = Loja de alimentos saudáveis - ro = Magazin de alimente naturiste - ru = Магазин здоровой еды - sk = Obchod so zdravou výživou - sv = Hälsokostbutik - sw = Duka la Chakula cha Afya - th = ร้านอาหารเพื่อสุขภาพ - tr = Sağlık Gıda Mağazası - uk = Магазин здорового харчування - vi = Cửa hàng thực phẩm sức khỏe - zh-Hans = 保健食品店 - zh-Hant = 保健食品店 - - [type.shop.houseware] - ref = type.shop.doityourself - en = Houseware - ar = ﺔﻴﻟﺰﻨﻣ ﺕﺍﻭﺩﺃ ﻞﺤﻣ - be = Крама посуду - bg = Магазин за домакински принадлежности - cs = Obchod s domácími potřebami - da = Husholdningsartikler butik - de = Haushaltswarengeschäft - el = Κατάστημα οικιακών ειδών - es = Tienda de artículos para el hogar - eu = Etxeko tresneria denda - fa = ﯽﮕﻧﺎﺧ ﻡﺯﺍﻮﻟ ﻩﺎﮕﺷﻭﺮﻓ - fi = Taloustavarakauppa - fr = Magasin d'articles ménagers - he = תיב ילכל תונח - hu = Háztartási bolt - id = Toko Peralatan Rumah Tangga - it = Negozio di casalinghi - ja = 家庭用品店 - ko = "가정용품 가게" - nb = Husholdningsbutikk - nl = Huishoudelijke winkel - pl = Sklep AGD - pt = Loja de utilidades domésticas - pt-BR = Loja de utilidades domésticas - ro = Magazin de articole de uz casnic - ru = Магазин посуды - sk = Obchod s domácimi potrebami - sv = Husgerådsbutik - sw = Duka la Vifaa vya Nyumbani - th = ร้านของใช้ในบ้าน - tr = Ev Eşyaları Dükkanı - uk = Магазин посуду - vi = Cửa hàng đồ gia dụng - zh-Hant = 家居用品店 + ro = Magazin de bricolaj + ru = Хозяйственный + sk = Železiarstvo + sv = Järnhandel + th = ร้านขายฮาร์ดแวร์ + tr = Hırdavatçı + uk = Будматеріали + vi = Cửa hàng phần cứng + zh-Hans = 硬件店 + zh-Hant = 五金行 [type.shop.jewelry] en = Jewelry @@ -18110,43 +17932,6 @@ zh-Hans = 商店 zh-Hant = 小舖 - [type.shop.kitchen] - en = Kitchen Store - ar = ﺦﺒﻄﻤﻟﺍ ﺮﺠﺘﻣ - be = Крама для кухні - bg = Магазин за кухня - cs = Prodejna kuchyní - da = Køkkenforretning - de = Küchengeschäft - el = Κατάστημα κουζίνας - es = Tienda de cocina - eu = Sukalde-denda - fa = ﻪﻧﺎﺧﺰﭙﺷﺁ ﻩﺎﮕﺷﻭﺮﻓ - fi = Keittiökauppa - fr = Magasin de cuisine - he = םיחבטמ תונח - hu = Konyhabolt - id = Toko Dapur - it = Negozio di cucina - ja = キッチンストア - ko = "주방용품점" - nb = Kjøkkenbutikk - nl = Keukenwinkel - pl = Sklep kuchenny - pt = Loja de cozinha - pt-BR = Loja de cozinha - ro = Magazin de bucatarie - ru = Кухонный магазин - sk = Kuchynský obchod - sv = Köksbutik - sw = Duka la Jikoni - th = ร้านครัว - tr = Mutfak Mağazası - uk = Магазин кухні - vi = Cửa hàng nhà bếp - zh-Hans = 厨房用品店 - zh-Hant = 廚房用品店 - [type.shop.laundry] en = Laundry ar = مغسلة ملابس @@ -18521,44 +18306,6 @@ zh-Hans = 室外设备 zh-Hant = 室外設備 - [type.shop.pastry] - ref = type.shop.bakery - en = Pastry - ar = ﺕﺎﻨﺠﻌﻣ - be = Кандытарскія вырабы - bg = Тестени изделия - cs = Pečivo - da = Bagværk - de = Gebäck - el = Ζύμη - es = Pastelería - eu = Gozogintza - fa = ﯽﻨﯾﺮﯿﺷ - fi = Leivonnainen - fr = Pâtisserie - he = הפאמ - hu = Cukrászsütemény - id = Kue-kue - it = Pasticcino - ja = ペストリー - ko = 패스트리 - nb = Kake - nl = Gebakje - pl = Ciasto - pt = Pastelaria - pt-BR = Pastelaria - ro = Patiserie - ru = Выпечка - sk = Pečivo - sv = Bakverk - sw = Keki - th = ขนมอบ - tr = Hamur işi - uk = Тістечка - vi = Bánh ngọt - zh-Hans = 糕点 - zh-Hant = 糕點 - [type.shop.pawnbroker] en = Pawnbroker ar = سمسار تسليف @@ -18694,43 +18441,6 @@ zh-Hans = 鱼商 zh-Hant = 魚販 - [type.shop.second_hand] - en = Second Hand - ar = ﺔﻠﻤﻌﺘﺴﻣ ﺕﺍﻭﺩﺍ ﺮﺠﺘﻣ - be = Крама сэканд-хэнд - bg = Магазин втора употреба - cs = Obchod z druhé ruky - da = Genbrugsbutik - de = Second-Hand-Laden - el = Κατάστημα μεταχειρισμένων - es = Tienda de segunda mano - eu = Bigarren eskuko denda - fa = ﻡﻭﺩ ﺖﺳﺩ ﻩﺎﮕﺷﻭﺮﻓ - fi = Second Hand Store - fr = Boutique d'objets d'occasion - he = היינש די תונח - hu = Second Hand Store - id = Toko Barang bekas - it = Negozio di articoli usati - ja = 古物商 - ko = 중고 판매점 - nb = Bruktbutikk - nl = Tweedehandswinkel - pl = Sklep z używaną ręką - pt = Loja de segunda mão - pt-BR = Loja de segunda mão - ro = Magazin second-hand - ru = Секонд-хенд магазин - sk = Obchod z druhej ruky - sv = Andrahandsaffär - sw = Duka la Mitumba - th = ร้านขายของมือสอง - tr = İkinci El Mağazası - uk = Магазин секонд-хенду - vi = Cửa hàng bán đồ đã qua sử dụng - zh-Hans = 二手店 - zh-Hant = 二手店 - [type.shop.shoes] en = Shoe Store ar = متجر أحذية @@ -19206,857 +18916,6 @@ zh-Hans = 酒品商店 zh-Hant = 販酒處 - [type.shop.antiques] - en = Antiques - ar = ﻒﺤﺘﻟﺍ - be = Антыкварыят - bg = Антики - cs = Starožitnosti - da = Antikviteter - de = Antiquitäten - el = Αντίκες - es = Antigüedades - eu = Antigoalekoak - fa = ﺕﺎﺟ ﻪﻘﯿﺘﻋ - fi = Antiikkia - fr = Antiquités - he = תוֹקיתִעַ - hu = Régiségek - id = Barang antik - it = Oggetti d'antiquariato - ja = 骨董品 - ko = 고물 - nb = Antikviteter - nl = Antiek - pl = Antyki - pt = Antiguidades - pt-BR = Antiguidades - ro = Antichități - ru = Антиквариат - sk = Starožitnosti - sv = Antikviteter - sw = Mambo ya kale - th = ของเก่า - tr = Antikalar - uk = Антикваріат - vi = Đồ cổ - zh-Hans = 古董 - zh-Hant = 古董 - - [type.shop.art] - en = Arts Shop - ar = ﻥﻮﻨﻔﻟﺍ ﺮﺠﺘﻣ - be = Крама мастацтваў - bg = Магазин за изкуства - cs = Obchod s uměním - da = Kunstbutik - de = Kunstgeschäft - el = Κατάστημα Τεχνών - es = Tienda de artes - eu = Arte Denda - fa = ﺮﻨﻫ ﻩﺎﮕﺷﻭﺮﻓ - fi = Taidekauppa - fr = Boutique d'art - he = תויונמוא תונח - hu = Művészeti Bolt - id = Toko Seni - it = Negozio d'arte - ja = アートショップ - ko = 아트샵 - nb = Kunstbutikk - nl = Kunstwinkel - pl = Sklep artystyczny - pt = Loja de artes - pt-BR = Loja de artes - ro = Magazin de arte - ru = Художественный магазин - sk = Obchod s umením - sv = Konstaffär - sw = Duka la Sanaa - th = ร้านศิลปะ - tr = Sanat Mağazası - uk = Магазин мистецтв - vi = Cửa hàng nghệ thuật - zh-Hans = 艺术商店 - zh-Hant = 藝術商店 - - [type.shop.baby_goods] - en = Baby Goods - ar = ﻝﺎﻔﻃﻸﻟ ﺮﺠﺘﻣ - be = Дзіцячая крама - bg = Детски магазин - cs = Dětský obchod - da = Børnebutik - de = Kinderladen - el = Παιδικό κατάστημα - es = Tienda de niños - eu = Haurrentzako denda - fa = ﻥﺎﮐﺩﻮﮐ ﻩﺎﮕﺷﻭﺮﻓ - fi = Lasten kauppa - fr = Magasin pour enfants - he = םידליל תונח - hu = Gyermekbolt - id = Toko anak-anak - it = Negozio per bambini - ja = キッズストア - ko = 어린이 가게 - nb = Barnebutikk - nl = Kinderwinkel - pl = Sklep dla dzieci - pt = Loja infantil - pt-BR = Loja infantil - ro = Magazin pentru copii - ru = Детский магазин - sk = Obchod pre deti - sv = Barnbutik - sw = Duka la watoto - th = ร้านขายของสำหรับเด็ก - tr = Çocuk mağazası - uk = Дитячий магазин - vi = Cửa hàng trẻ em - zh-Hans = 儿童商店 - zh-Hant = 兒童商店 - - [type.shop.bag] - en = Bags Store - ar = ﺐﺋﺎﻘﺤﻟﺍ ﺮﺠﺘﻣ - be = Крама сумак - bg = Магазин за чанти - cs = Obchod s taškami - da = Tasker butik - de = Taschen Shop - el = Κατάστημα τσαντών - es = Tienda de bolsos - eu = Poltsen Denda - fa = ﻒﯿﮐ ﻩﺎﮕﺷﻭﺮﻓ - fi = Laukkukauppa - fr = Magasin de sacs - he = םיקית תונח - hu = Táskák bolt - id = Toko Tas - it = Negozio di borse - ja = バッグストア - ko = 가방 판매점 - nb = Veskerbutikk - nl = Tassenwinkel - pl = Sklep z torbami - pt = Loja de bolsas - pt-BR = Loja de bolsas - ro = Magazin de genti - ru = Магазин сумок - sk = Obchod s taškami - sv = Väskor butik - sw = Hifadhi ya Mifuko - th = ร้านกระเป๋า - tr = Çanta Mağazası - uk = Магазин сумок - vi = Cửa hàng túi xách - zh-Hans = 箱包店 - zh-Hant = 箱包店 - - [type.shop.boutique] - en = Boutique - ar = ﺮﺠﺘﻣ - be = Буцік - bg = Бутик - cs = Butik - da = Boutique - de = Boutique - el = Μπουτίκ - es = Boutique - eu = Boutique - fa = ﮏﯿﺗﻮﺑ - fi = Boutique - fr = Boutique - he = קיטוב - hu = Butik - id = Butik - it = Boutique - ja = ブティック - ko = 부티크 - nb = Boutique - nl = Boetiek - pl = Butik - pt = Boutique - pt-BR = Boutique - ro = Butic - ru = Бутик - sk = Butik - sv = Boutique - sw = Boutique - th = บูติก - tr = Butik - uk = Бутік - vi = Cửa hàng - zh-Hans = 精品店 - zh-Hant = 精品店 - - [type.shop.charity] - en = Charity Shop - ar = ﻱﺮﻴﺧ ﺮﺠﺘﻣ - be = Дабрачынная крама - bg = Благотворителен магазин - cs = Charitativní obchod - da = Velgørenhedsbutik - de = Wohltätigkeitsladen - el = Φιλανθρωπικό κατάστημα - es = Tienda de caridad - eu = Ongintzazko Denda - fa = ﻪﯾﺮﯿﺧ ﻩﺎﮕﺷﻭﺮﻓ - fi = Hyväntekeväisyysmyymälä - fr = Magasin de charité - he = הקדצ תונח - hu = Jótékonysági Bolt - id = Toko Amal - it = Negozio di beneficenza - ja = チャリティーショップ - ko = 자선 상점 - nb = Veldedighetsbutikk - nl = Kringloopwinkel - pl = Sklep charytatywny - pt = Loja de caridade - pt-BR = Loja de caridade - ro = Magazin de caritate - ru = Благотворительный магазин - sk = Charitatívny obchod - sv = Välgörenhetsbutik - sw = Duka la msaada - th = ร้านการกุศล - tr = Hayır Dükkanı - uk = Магазин благодійності - vi = Cửa hàng từ thiện - zh-Hans = 慈善商店 - zh-Hant = 慈善商店 - - [type.shop.cheese] - en = Cheese Store - ar = ﻦﺒﺠﻟﺍ ﺮﺠﺘﻣ - be = Сырны магазін - bg = Магазин за сирене - cs = Prodejna sýrů - da = Ostebutik - de = Käseladen - el = Τυροκομείο - es = Tienda de queso - eu = Gazta Denda - fa = ﺮﯿﻨﭘ ﻩﺎﮕﺷﻭﺮﻓ - fi = Juustokauppa - fr = Fromagerie - he = תוניבג תונח - hu = Sajtbolt - id = Toko Keju - it = Negozio di formaggi - ja = チーズ店 - ko = 치즈 가게 - nb = Ostebutikk - nl = Kaaswinkel - pl = Sklep z serami - pt = Loja de queijos - pt-BR = Loja de queijos - ro = Magazin de branzeturi - ru = Магазин сыра - sk = Predajňa syrov - sv = Ostaffär - sw = Duka la Jibini - th = ร้านชีส - tr = Peynir Dükkanı - uk = Магазин сиру - vi = Cửa hàng pho mát - zh-Hans = 奶酪店 - zh-Hant = 奶酪店c - - [type.shop.craft] - en = Arts and Crafts - ar = ﺔﻳﻭﺪﻴﻟﺍ ﻑﺮﺤﻟﺍﻭ ﻥﻮﻨﻔﻟﺍ - be = Мастацтва і рамёствы - bg = Изкуства и занаяти - cs = Umění a řemesla - da = Kunst og kunsthåndværk - de = Kunst und Handwerk - el = Τέχνες και χειροτεχνήματα - es = Artes y manualidades - eu = Arteak eta Eskulanak - fa = ﯽﺘﺳﺩ ﻊﯾﺎﻨﺻ ﻭ ﺮﻨﻫ - fi = Käsityöt - fr = L'artisanat - he = הריציו תונמוא - hu = Művészetek és kézművesség - id = Seni dan kerajinan - it = Arti e mestieri - ja = 美術工芸 - ko = 예술과 공예 - nb = Kunst og Håndverk - nl = Kunst en ambacht - pl = Sztuka i rzemiosło - pt = Artes e Ofícios - pt-BR = Artes e Ofícios - ro = Arte și Meserii - ru = Искусства и ремесла - sk = Umenie a remeslá - sv = Konst och hantverk - sw = Sanaa na Ufundi - th = ศิลปะและงานฝีมือ - tr = Sanat ve El işi - uk = Мистецтво і ремесла - vi = Nghệ thuật và thủ công - zh-Hans = 美术和工艺 - zh-Hant = 美術和工藝 - - [type.shop.dairy] - en = Dairy Products - ar = ﻥﺎﺒﻟﻷﺍ ﺕﺎﺠﺘﻨﻣ - be = Малочныя прадукты - bg = Млечни продукти - cs = Mléčné výrobky - da = Mejeriprodukter - de = Milchprodukte - el = Γαλακτοκομικά προϊόντα - es = Productos lácteos - eu = Esnekiak - fa = ﯽﻨﺒﻟ ﺕﻻﻮﺼﺤﻣ - fi = Maitotuotteet - fr = Les produits laitiers - he = בלח ירצומ - hu = Tejtermékek - id = Produk susu - it = Latticini - ja = 乳製品 - ko = "유제품" - nb = Meieriprodukter - nl = Zuivelproducten - pl = Nabiał - pt = Lacticínios - pt-BR = Lacticínios - ro = Lactate - ru = Молочные продукты - sk = Mliečne výrobky - sv = Mejeriprodukter - sw = Bidhaa za Maziwa - th = ผลิตภัณฑ์นม - tr = Süt Ürünleri - uk = Молочні продукти - vi = Sản phẩm từ sữa - zh-Hans = 乳制品 - zh-Hant = 乳製品 - - [type.shop.electrical] - en = Electrical Store - ar = ﺔﻴﺋﺎﺑﺮﻬﻜﻟﺍ ﺕﺍﻭﺩﻷﺍ ﺮﺠﺘﻣ - be = Крама электратэхнікі - bg = Електрически магазин - cs = Elektro obchod - da = El-butik - de = Elektrogeschäft - el = Μαγαζί ηλεκτρικών ειδών - es = Tienda de electricidad - eu = Elektrizitate Denda - fa = ﯽﮑﯾﺮﺘﮑﻟﺍ ﻡﺯﺍﻮﻟ ﻩﺯﺎﻐﻣ - fi = Sähköliike - fr = Store électrique - he = למשח תונח - hu = Elektronikai üzlet - id = Toko elektronik - it = Negozio di articoli elettrici - ja = 電気店 - ko = "전기용품점" - nb = Elektronisk butikk - nl = Witgoed winkel - pl = Sklep elektryczny - pt = Loja de materiais elétricos - pt-BR = Loja de materiais elétricos - ro = Magazin de electronice - ru = Магазин электротоваров - sk = Predajňa elektro - sv = Elektronik affär - sw = Duka la Umeme - th = ร้านขายเครื่องใช้ไฟฟ้า - tr = Elektirikli eşya dükkanı - uk = Магазин електротехніки - vi = Cửa hàng điện tử - zh-Hans = 电器商城 - zh-Hant = 電器商城 - - [type.shop.fishing] - en = Fishing Store - ar = ﺪﻴﺻ ﺮﺠﺘﻣ - be = Рыбалоўны магазін - bg = Риболовен магазин - cs = Rybářský obchod - da = Fiskeri butik - de = Angelgeschäft - el = Κατάστημα ψαρέματος - es = Tienda de pesca - eu = Arrantza Denda - fa = ﯼﺮﯿﮕﯿﻫﺎﻣ ﻩﺎﮕﺷﻭﺮﻓ - fi = Kalastuskauppa - fr = Magasin de pêche - he = גייד תונח - hu = Horgászbolt - id = Toko Memancing - it = Negozio di pesca - ja = フィッシングストア - ko = 낚시점 - nb = Fiskebutikk - nl = Viswinkel - pl = Sklep wędkarski - pt = Loja de pesca - pt-BR = Loja de pesca - ro = Magazin de pescuit - ru = Рыболовный магазин - sk = Rybársky obchod - sv = Fiskeaffär - sw = Duka la Uvuvi - th = ร้านตกปลา - tr = Balıkçı Dükkanı - uk = Рибальський магазин - vi = Cửa hàng câu cá - zh-Hans = 钓鱼店 - zh-Hant = 釣魚店 - - [type.shop.interior_decoration] - en = Interior Decorations - ar = ﺔﻴﻠﺧﺍﺩ ﺕﺍﺭﻮﻜﻳﺩ - be = Ўпрыгажэнні інтэр'еру - bg = Вътрешни декорации - cs = Interiérové dekorace - da = Indvendige dekorationer - de = Innendekorationen - el = Διακοσμήσεις εσωτερικών χώρων - es = Decoraciones interiores - eu = Barruko Apaingarriak - fa = ﯽﻠﺧﺍﺩ ﻥﻮﯿﺳﺍﺭﻮﮐﺩ - fi = Sisustuskoristeet - fr = Décorations intérieures - he = םינפ יטושיק - hu = Belső dekorációk - id = Dekorasi Interior - it = Decorazioni per interni - ja = 室内装飾 - ko = 실내 장식 - nb = Interiørdekorasjoner - nl = Interieurdecoraties - pl = Dekoracje wnętrz - pt = Decorações de Interiores - pt-BR = Decorações de Interiores - ro = Decoratiuni interioare - ru = Украшения для интерьера - sk = Interiérové dekorácie - sv = Inredningsdekorationer - sw = Mapambo ya Ndani - th = ตกแต่งภายใน - tr = İç Dekorasyon - uk = Внутрішнє оздоблення - vi = Đồ trang trí nội thất - zh-Hans = 室内装饰 - zh-Hant = 室內裝飾 - - [type.shop.lottery] - en = Lottery Tickets - ar = ﺐﻴﺼﻧﺎﻴﻟﺍ ﺮﻛﺍﺬﺗ - be = Латарэйныя білеты - bg = Лотарийни билети - cs = Loterijní lístky - da = Lotterikuponer - de = Lotteriescheine - el = Λαχεία - es = Boletos de lotería - eu = Loteria Sarrerak - fa = ﯽﯾﺎﻣﺯﺁ ﺖﺨﺑ ﻂﯿﻠﺑ - fi = Lottoliput - fr = Tickets de loterie - he = הלרגה יסיטרכ - hu = Sorsjegyek - id = Tiket Lotere - it = Biglietti della lotteria - ja = 宝くじ - ko = 복권 - nb = Lotteribilletter - nl = Loten - pl = Bilety na loterię - pt = Bilhete de loteria - pt-BR = Bilhete de loteria - ro = Bilete la loterie - ru = Лотерейные билеты - sk = Lístky do lotérie - sv = Lotter - sw = Tikiti za Bahati nasibu - th = สลากกินแบ่ง - tr = Piyango bileti - uk = Лотерейні квитки - vi = Vé xổ số kiến thiết - zh-Hans = 彩票 - zh-Hant = 彩票 - - [type.shop.medical_supply] - en = Medical Supplies - ar = ﺔﻴﺒﻄﻟﺍ ﺕﺍﺩﺍﺪﻣﻹﺍ - be = Медыцынскія прыналежнасці - bg = Медицински изделия - cs = Zdravotní zásoby - da = Medicinske forsyninger - de = Medizinische Versorgung - el = Ιατρικά Είδη - es = Suministros médicos - eu = Medikuntza-hornidura - fa = ﯽﮑﺷﺰﭘ ﻡﺯﺍﻮﻟ - fi = Lääketieteellisiä tarvikkeita - fr = Materiel médical - he = יאופר דויצ - hu = Orvosi eszközök - id = Suplai medis - it = Forniture mediche - ja = 医療用品 - ko = "의료용품" - nb = Medisinsk utstyr - nl = Medische benodigdheden - pl = Produkty medyczne - pt = Suprimentos médicos - pt-BR = Suprimentos médicos - ro = Consumabile medicale - ru = Медикаменты - sk = Zdravotnícky materiál - sv = Medicinska förnödenheter - sw = Vifaa vya Matibabu - th = เวชภัณฑ์ - tr = Tıbbi malzemeler - uk = Медичні товари - vi = Vật tư y tế - zh-Hans = 医疗用品 - zh-Hant = 醫療用品 - - [type.shop.nutrition_supplements] - en = Nutrition Supplements - ar = ﺔﻴﺋﺍﺬﻏ ﺕﻼﻤﻜﻣ - be = Харчовыя дабаўкі - bg = Хранителни добавки - cs = Doplňky výživy - da = Kosttilskud - de = Nahrungsergänzungsmittel - el = Συμπληρώματα Διατροφής - es = Suplementos Nutricionales - eu = Nutrizio osagarriak - fa = ﯽﯾﺍﺬﻏ ﯼﺎﻫ ﻞﻤﮑﻣ - fi = Ravintolisät - fr = Suppléments nutritionnels - he = הנוזת יפסות - hu = Táplálékkiegészítők - id = Suplemen Nutrisi - it = Integratori Alimentari - ja = 栄養補助食品 - ko = 영양 보조제 - nb = Kosttilskudd - nl = Voedingssupplementen - pl = Suplementy diety - pt = Suplementos nutricionais - pt-BR = Suplementos nutricionais - ro = Suplimente nutritive - ru = Пищевые добавки - sk = Výživové doplnky - sv = Kosttillskott - sw = Virutubisho vya Lishe - th = อาหารเสริม - tr = Besin Takviyeleri - uk = Харчові добавки - vi = Bổ sung dinh dưỡng - zh-Hans = 营养补充剂 - zh-Hant = 營養補充劑 - - [type.shop.paint] - en = Paints - ar = ﺕﺎﻧﺎﻫﺪﻟﺍ - be = Фарбы - bg = Бои - cs = Barvy - da = Maling - de = Farben - el = Βαφές - es = Pinturas - eu = Margoak - fa = ﺪﻨﮐ ﯽﻣ ﮓﻧﺭ - fi = Maalit - fr = Des peintures - he = םיעבצ - hu = Festékek - id = Cat - it = Vernici - ja = 塗料 - ko = 그림 물감 - nb = Maling - nl = Verven - pl = Malatura - pt = Tintas - pt-BR = Tintas - ro = Vopsele - ru = Краски - sk = Farby - sv = Färger - sw = Rangi - th = สี - tr = Boyalar - uk = Фарби - vi = Sơn - zh-Hans = 油漆 - zh-Hant = 油漆 - - [type.shop.perfumery] - en = Perfumery - ar = ﺭﻮﻄﻌﻟﺍ - be = Парфумерыя - bg = Парфюмерия - cs = Parfumerie - da = Parfumeri - de = Parfümerie - el = Αρωματοποιία - es = Perfumería - eu = Lurringintza - fa = ﯼﺯﺎﺳﺮﻄﻋ - fi = Hajuvedet - fr = Parfumerie - he = תמַשְׂבָּ - hu = Illatszerek - id = Wewangian - it = Profumeria - ja = 香水 - ko = "향료 제조업" - nb = Parfymeri - nl = Parfumerie - pl = Perfumeria - pt = Perfumaria - pt-BR = Perfumaria - ro = Parfumerie - ru = Парфюмерия - sk = Parfuméria - sv = Parfymer - sw = Perfumery - th = น้ำหอม - tr = Parfümeri - uk = Парфумерія - vi = Nước hoa - zh-Hans = 香水 - zh-Hant = 香水 - - [type.shop.sewing] - en = Sewing Supplies - ar = ﺔﻃﺎﻴﺨﻟﺍ ﺕﺍﺪﻌﻣ - be = Швейныя прыналежнасці - bg = Шивашки консумативи - cs = Šicí potřeby - da = Syudstyr - de = Nähzubehör - el = Είδη Ραπτικής - es = Materiales de costura - eu = Josteko hornigaiak - fa = ﯽﻃﺎﯿﺧ ﻡﺯﺍﻮﻟ - fi = Ompelutarvikkeet - fr = Matériel de couture - he = הריפת דויצ - hu = Varrás kellékek - id = Perlengkapan Jahit - it = Forniture per il cucito - ja = ミシン用品 - ko = "재봉용품" - nb = Syutstyr - nl = Naaibenodigdheden - pl = Przybory do szycia - pt = Materiais de costura - pt-BR = Materiais de costura - ro = Rechizite de cusut - ru = Швейные принадлежности - sk = Šijacie potreby - sv = Sytillbehör - sw = Vifaa vya kushona - th = อุปกรณ์เย็บผ้า - tr = Dikiş malzemeleri - uk = Швейні приладдя - vi = Nguồn cung cấp may - zh-Hans = 缝纫用品 - zh-Hant = 縫紉用品 - - [type.shop.storage_rental] - en = Storage Rental - ar = ﻦﻳﺰﺨﺘﻟﺍ ﺕﺍﺪﺣﻭ ﺮﻴﺟﺄﺗ - be = Арэнда сховішчаў - bg = Склад под наем - cs = Pronájem skladu - da = Lagerudlejning - de = Speichermiete - el = Ενοικίαση αποθηκευτικού χώρου - es = Alquiler de almacenamiento - eu = Biltegiratzeko alokairua - fa = ﺭﺎﺒﻧﺍ ﻩﺭﺎﺟﺍ - fi = Varastoinnin vuokraus - fr = Location de stockage - he = ןוסחא תרכשה - hu = Tárhely bérlés - id = Sewa Penyimpanan - it = Noleggio deposito - ja = ストレージレンタル - ko = 스토리지 렌탈 - nb = Utleie av lager - nl = Opslag verhuur - pl = Wynajem magazynu - pt = Aluguel de Armazenamento - pt-BR = Aluguel de Armazenamento - ro = Închiriere depozitare - ru = Аренда склада - sk = Prenájom skladu - sv = Uthyrning av förråd - sw = Kukodisha Hifadhi - th = ค่าเช่าห้องเก็บของ - tr = Depolama Kiralama - uk = Оренда сховища - vi = Cho thuê kho lưu trữ - zh-Hans = 存储租赁 - zh-Hant = 存儲租賃 - - [type.shop.tobacco] - en = Tobacco - ar = ﻎﺒﺗ - be = Тытунь - bg = Тютюн - cs = Tabák - da = Tobak - de = Tabak - el = Καπνός - es = Tabaco - eu = Tabakoa - fa = ﻮﮐﺎﺒﻨﺗ - fi = Tupakka - fr = Le tabac - he = קבָּטַ - hu = Dohány - id = Tembakau - it = Tabacco - ja = タバコ - ko = 담배 - nb = Tobakk - nl = Tabak - pl = Tytoń - pt = Tabaco - pt-BR = Tabaco - ro = Tutun - ru = Табак - sk = Tabak - sv = Tobak - sw = Tumbaku - th = ยาสูบ - tr = Tütün - uk = Тютюн - vi = Thuốc lá - zh-Hans = 烟草 - zh-Hant = 煙草 - - [type.shop.trade] - en = Trades Supplies - ar = ﺔﻳﺭﺎﺠﺘﻟﺍ ﺕﺍﺪﻳﺭﻮﺘﻟﺍ - be = Гандлёвая прыналежнасць - bg = Търговия с консумативи - cs = Obchod se zásobami - da = Handler forsyninger - de = Handelsbedarf - el = Εμπόριο Προμήθειες - es = Suministros comerciales - eu = Lanbideen hornidurak - fa = ﻡﺯﺍﻮﻟ ﺕﺭﺎﺠﺗ - fi = Kauppa tarvikkeita - fr = Fournitures de métiers - he = הקפסאב רחוס - hu = Kellékekkel kereskedik - id = Perlengkapan Perdagangan - it = Forniture commerciali - ja = 貿易用品 - ko = "거래 용품" - nb = Handler rekvisita - nl = Handelsbenodigdheden - pl = Zaopatrzenie handlowe - pt = Comércio de suprimentos - pt-BR = Comércio de suprimentos - ro = Comerțuri Rechizite - ru = Торговые поставки - sk = Živnostenské potreby - sv = Handlar förnödenheter - sw = Ugavi wa Biashara - th = อุปกรณ์การค้า - tr = Esnaf Malzemeleri - uk = Торгівля припасами - vi = Nguồn cung cấp Giao dịch - zh-Hans = 贸易用品 - zh-Hant = 貿易用品 - - [type.shop.watches] - en = Watches - ar = ﺕﺎﻋﺎﺳ - be = Гадзіннік - bg = Часовници - cs = Hodinky - da = Ure - de = Uhren - el = Ρολόγια - es = Relojes - eu = Erlojuak - fa = ﺖﻋﺎﺳ - fi = Kellot - fr = Montres - he = םינועש - hu = Órák - id = Jam tangan - it = Orologi - ja = 時計 - ko = 시계 - nb = Klokker - nl = Horloges - pl = Zegarki - pt = Relógios - pt-BR = Relógios - ro = Priveste - ru = Часы - sk = Hodinky - sv = Klockor - sw = Saa - th = นาฬิกา - tr = Saatler - uk = Годинники - vi = Xem - zh-Hans = 手表 - zh-Hant = 手錶 - - [type.shop.wholesale] - en = Wholesale Store - ar = ﺔﻠﻤﺠﻟﺎﺑ ﺔﻴﺋﺍﺬﻐﻟﺍ ﺩﺍﻮﻤﻟﺍ ﺓﺭﺎﺠﺗ - be = Аптовая крама - bg = Магазин на едро - cs = Velkoobchodní prodejna - da = Engros butik - de = Großhandelsgeschäft - el = Κατάστημα χονδρικής - es = Almacén al por mayor - eu = Handizkako denda - fa = ﯽﺷﻭﺮﻓ ﻩﺪﻤﻋ ﻩﺎﮕﺷﻭﺮﻓ - fi = Tukkukauppa - fr = Magasin de gros - he = תיאנוטיס תונח - hu = Nagykereskedelmi üzlet - id = Toko Grosir - it = Negozio all'ingrosso - ja = 問屋 - ko = 도매점 - nb = Engrosbutikk - nl = Groothandel winkel - pl = Hurtownia - pt = Loja de atacado - pt-BR = Loja de atacado - ro = Magazin cu ridicata - ru = Оптовый магазин - sk = Veľkoobchod - sv = Grossistbutik - sw = Duka la Jumla - th = ร้านขายส่ง - tr = Toptan satış mağazası - uk = Оптовий магазин - vi = Cửa hàng bán buôn - zh-Hans = 批发店 - zh-Hant = 批髮店 - [type.sport] en = Sport ar = رياضة @@ -20843,7 +19702,7 @@ ar = مساكن جبلية cs = Ubytování v horách da = Bjerg logi - de = Berghütte + de = bewirtschaftete Schutzhütte el = Ορεινό καταφύγιο es = Cabaña eu = Kabina @@ -21698,7 +20557,7 @@ ar = كوخ برية cs = Chata v divočině da = Vildmarkshytte - de = Waldhütte + de = unbewirtschaftete Schutzhütte el = Καλύβα es = Cabaña eu = Kabina diff --git a/data/styles/clear/include/Icons.mapcss b/data/styles/clear/include/Icons.mapcss index cae03689e2..40450aac50 100644 --- a/data/styles/clear/include/Icons.mapcss +++ b/data/styles/clear/include/Icons.mapcss @@ -2153,9 +2153,7 @@ node|z16[shop=bookmaker], area|z16[shop=bookmaker] {icon-image: bookmaker-m.svg;} node|z16[shop=bakery], -area|z16[shop=bakery], -node|z16[shop=pastry], -area|z16[shop=pastry], +area|z16[shop=bakery] {icon-image: bakery-m.svg;} node|z16[shop=beauty], area|z16[shop=beauty] @@ -2219,15 +2217,7 @@ node|z16[amenity=ice_cream], area|z16[amenity=ice_cream] {icon-image: ice_cream-m.svg;} node|z16[shop=convenience], -area|z16[shop=convenience], -node|z16[shop=deli], -area|z16[shop=deli], -node|z16[shop=farm], -area|z16[shop=farm], -node|z16[shop=grocery], -area|z16[shop=grocery], -node|z16[shop=health_food], -area|z16[shop=health_food], +area|z16[shop=convenience] {icon-image: grocery-m.svg;} node|z16[shop=copyshop], area|z16[shop=copyshop] @@ -2251,9 +2241,7 @@ node|z16[shop=florist], area|z16[shop=florist] {icon-image: florist-m.svg;} node|z16[shop=furniture], -area|z16[shop=furniture], -node|z16[shop=kitchen], -area|z16[shop=kitchen], +area|z16[shop=furniture] {icon-image: furniture-m.svg;} node|z16[shop=garden_centre], area|z16[shop=garden_centre] @@ -2276,9 +2264,7 @@ node|z16[shop=hairdresser], area|z16[shop=hairdresser] {icon-image: hairdresser-m.svg;} node|z16[shop=hardware], -area|z16[shop=hardware], -node|z16[shop=houseware], -area|z16[shop=houseware], +area|z16[shop=hardware] {icon-image: doityourself-m.svg;} node|z16[shop=jewelry], area|z16[shop=jewelry] @@ -2333,9 +2319,7 @@ node|z17-[shop=bookmaker], area|z17-[shop=bookmaker] {icon-image: bookmaker-m.svg;icon-min-distance: 24;text-optional: true;} node|z17-[shop=bakery], -area|z17-[shop=bakery], -node|z17-[shop=pastry], -area|z17-[shop=pastry], +area|z17-[shop=bakery] {icon-image: bakery-m.svg;icon-min-distance: 24;text-optional: true;} node|z17-[shop=beauty], area|z17-[shop=beauty] @@ -2399,15 +2383,7 @@ node|z17-[amenity=ice_cream], area|z17-[amenity=ice_cream] {icon-image: ice_cream-m.svg;icon-min-distance: 24;text-optional: true;} node|z17-[shop=convenience], -area|z17-[shop=convenience], -node|z17-[shop=deli], -area|z17-[shop=deli], -node|z17-[shop=farm], -area|z17-[shop=farm], -node|z17-[shop=grocery], -area|z17-[shop=grocery], -node|z17-[shop=health_food], -area|z17-[shop=health_food], +area|z17-[shop=convenience] {icon-image: grocery-m.svg;icon-min-distance: 24;text-optional: true;} node|z17-[shop=copyshop], area|z17-[shop=copyshop] @@ -2431,9 +2407,7 @@ node|z17-[shop=florist], area|z17-[shop=florist] {icon-image: florist-m.svg;icon-min-distance: 24;text-optional: true;} node|z17-[shop=furniture], -area|z17-[shop=furniture], -node|z17-[shop=kitchen], -area|z17-[shop=kitchen], +area|z17-[shop=furniture] {icon-image: furniture-m.svg;icon-min-distance: 24;text-optional: true;} node|z17-[shop=garden_centre], area|z17-[shop=garden_centre] @@ -2456,9 +2430,7 @@ node|z17-[shop=hairdresser], area|z17-[shop=hairdresser] {icon-image: hairdresser-m.svg;icon-min-distance: 24;text-optional: true;} node|z17-[shop=hardware], -area|z17-[shop=hardware], -node|z17-[shop=houseware], -area|z17-[shop=houseware], +area|z17-[shop=hardware] {icon-image: doityourself-m.svg;icon-min-distance: 24;text-optional: true;} node|z17-[shop=jewelry], area|z17-[shop=jewelry] diff --git a/data/types.txt b/data/types.txt index abca8fb220..dc703da04f 100644 --- a/data/types.txt +++ b/data/types.txt @@ -910,11 +910,11 @@ mapswithme railway|subway|tunnel mapswithme *historic|ship -*shop|tobacco -*shop|farm -*shop|storage_rental -*shop|trade -*shop|deli +mapswithme +mapswithme +mapswithme +mapswithme +mapswithme *shop|mall *shop|doityourself *place|sea @@ -1075,7 +1075,7 @@ route|ferry *amenity|vending_machine|drinks *amenity|waste_basket *building|garage -*shop|pastry +mapswithme *emergency|phone *highway|rest_area *highway|traffic_signals @@ -1098,7 +1098,7 @@ route|ferry *tourism|chalet *tourism|information|board *tourism|information|map -*shop|paint +mapswithme *traffic_calming|bump *traffic_calming|hump *shop|car_parts @@ -1109,8 +1109,8 @@ route|ferry *amenity|public_bookcase *tourism|apartment *tourism|resort -*shop|interior_decoration -*shop|houseware +mapswithme +mapswithme *hwtag|nobicycle *hwtag|yesbicycle *hwtag|bidir_bicycle @@ -1153,8 +1153,8 @@ mapswithme *historic|fort *shop|coffee *shop|tea -*shop|art -*shop|charity +mapswithme +mapswithme *hwtag|toll *amenity|arts_centre *amenity|biergarten @@ -1174,7 +1174,7 @@ mapswithme *leisure|fitness_station *leisure|ice_rink *leisure|marina -*shop|medical_supply +mapswithme *man_made|surveillance *man_made|water_tap *man_made|works @@ -1182,7 +1182,7 @@ mapswithme *office|ngo *shop|chocolate *shop|erotic -*shop|kitchen +mapswithme *shop|fabric *shop|funeral_directors *shop|massage @@ -1197,25 +1197,25 @@ mapswithme *shop|video *tourism|theme_park *tourism|wilderness_hut -*shop|boutique -*shop|lottery -*shop|antiques -*shop|wholesale -*shop|perfumery -*shop|baby_goods -*shop|bag -*shop|dairy -*shop|electrical -*shop|cheese +mapswithme +mapswithme +mapswithme +mapswithme +mapswithme +mapswithme +mapswithme +mapswithme +mapswithme +mapswithme *shop|money_lender -*shop|health_food -*shop|fishing -*shop|grocery -*shop|nutrition_supplements -*shop|watches -*shop|second_hand -*shop|craft -*shop|sewing +mapswithme +mapswithme +mapswithme +mapswithme +mapswithme +mapswithme +mapswithme +mapswithme mapswithme mapswithme mapswithme diff --git a/data/visibility.txt b/data/visibility.txt index 6743794b9d..ba304b0dfc 100644 --- a/data/visibility.txt +++ b/data/visibility.txt @@ -853,17 +853,12 @@ world 00000000000000000000 + {} shop 00000000000000000000 + alcohol 00000000000000000000 - - antiques 00000000000000000000 - - art 00000000000000000000 - - baby_goods 00000000000000000000 - - bag 00000000000000000000 - bakery 00000000000000000000 - beauty 00000000000000000000 - beverages 00000000000000000000 - bicycle 00000000000000000000 - bookmaker 00000000000000000000 - books 00000000000000000000 - - boutique 00000000000000000000 - butcher 00000000000000000000 - car 00000000000000000111 - car_parts 00000000000000000111 - @@ -871,8 +866,6 @@ world 00000000000000000000 + tyres 00000000000000011111 - {} caravan 00000000000000000111 - - charity 00000000000000000000 - - cheese 00000000000000000000 - chemist 00000000000000000000 - chocolate 00000000000000000000 - clothes 00000000000000000000 - @@ -882,74 +875,50 @@ world 00000000000000000000 + convenience 00000000000000000000 - copyshop 00000000000000000000 - cosmetics 00000000000000000000 - - craft 00000000000000000000 - - dairy 00000000000000000000 - - deli 00000000000000000000 - department_store 00000000000000000000 - doityourself 00000000000000000000 - dry_cleaning 00000000000000000000 - - electrical 00000000000000000000 - electronics 00000000000000000000 - erotic 00000000000000000000 - fabric 00000000000000000000 - - farm 00000000000000000000 - - fishing 00000000000000000000 - florist 00000000000000000000 - funeral_directors 00000000000000000000 - furniture 00000000000000000000 - garden_centre 00000000000000000000 - gift 00000000000000000000 - greengrocer 00000000000000000000 - - grocery 00000000000000000000 - hairdresser 00000000000000000000 - hardware 00000000000000000000 - - health_food 00000000000000000000 - - houseware 00000000000000000000 - - interior_decoration 00000000000000000000 - jewelry 00000000000000000000 - kiosk 00000000000000000000 - - kitchen 00000000000000000000 - laundry 00000000000000000000 - - lottery 00000000000000000000 - mall 00000000000000111111 - massage 00000000000000000000 - - medical_supply 00000000000000000000 - mobile_phone 00000000000000000000 - money_lender 00000000000000000000 - motorcycle 00000000000000000111 - music 00000000000000000000 - musical_instrument 00000000000000000000 - newsagent 00000000000000000000 - - nutrition_supplements 00000000000000000000 - optician 00000000000000000000 - outdoor 00000000000000000000 - - paint 00000000000000000000 - - pastry 00000000000000000000 - pawnbroker 00000000000000000000 - - perfumery 00000000000000000000 - pet 00000000000000000000 - photo 00000000000000000000 - seafood 00000000000000000000 - - second_hand 00000000000000000000 - - sewing 00000000000000000000 - shoes 00000000000000000000 - sports 00000000000000000000 - stationery 00000000000000000000 - - storage_rental 00000000000000000000 - supermarket 00000000000000111111 - tattoo 00000000000000000000 - tea 00000000000000000000 - ticket 00000000000000000000 - - tobacco 00000000000000000000 - toys 00000000000000000000 - - trade 00000000000000000000 - travel_agency 00000000000000000000 - tyres 00000000000000000000 - variety_store 00000000000000000000 - video 00000000000000000000 - video_games 00000000000000000000 - - watches 00000000000000000000 - - wholesale 00000000000000000000 - wine 00000000000000000000 - {} sport 00000000000000000000 + diff --git a/drape/stipple_pen_resource.cpp b/drape/stipple_pen_resource.cpp index 59b7ea24b5..fb215b9adb 100644 --- a/drape/stipple_pen_resource.cpp +++ b/drape/stipple_pen_resource.cpp @@ -2,7 +2,6 @@ #include "drape/texture.hpp" -#include "base/logging.hpp" #include "base/shared_buffer_manager.hpp" #include @@ -186,12 +185,6 @@ void StipplePenIndex::UploadResources(ref_ptr context, ref_ m_pendingNodes.swap(pendingNodes); } - // Assume that all patterns are initialized when creating texture (ReserveResource) and uploaded once. - // Should provide additional logic like in ColorPalette::UploadResources, if we want multiple uploads. - if (m_uploadCalled) - LOG(LERROR, ("Multiple stipple pen texture uploads are not supported")); - m_uploadCalled = true; - uint32_t height = 0; for (auto const & n : pendingNodes) height += n.second.GetSize().y; diff --git a/drape/stipple_pen_resource.hpp b/drape/stipple_pen_resource.hpp index f02efa2a0b..4bb203345c 100644 --- a/drape/stipple_pen_resource.hpp +++ b/drape/stipple_pen_resource.hpp @@ -123,8 +123,6 @@ private: std::mutex m_lock; std::mutex m_mappingLock; - - bool m_uploadCalled = false; }; class StipplePenTexture : public DynamicTexture const kBannedConfigurations = { Configuration{"Adreno (TM) 506", {1, 0, 31}, {42, 264, 975}}, Configuration{"Adreno (TM) 506", {1, 1, 66}, {512, 313, 0}}, - Configuration{"Adreno (TM) 530", {1, 1, 66}, {512, 313, 0}}, - - /// @todo Dashed lines stopped drawing after updating LineShape::Construct. - /// Should obtain a device (Huawei P20) for better investigation. - Configuration{"Mali-G72", {1, 1, 97}, {18, 0, 0}}, + Configuration{"Adreno (TM) 530", {1, 1, 66}, {512, 313, 0}} }; for (auto const & d : kBannedDevices) @@ -145,15 +141,13 @@ bool SupportManager::IsVulkanForbidden(std::string const & deviceName, return false; } -// Finally, the result of this function is used in GraphicsContext::HasPartialTextureUpdates. bool SupportManager::IsVulkanTexturePartialUpdateBuggy(int sdkVersion, std::string const & deviceName, Version apiVersion, Version driverVersion) const { - /// @todo Assume that all Android 10+ (API 29) doesn't support Vulkan partial texture updates. - /// Can't say for sure is it right or not .. - if (sdkVersion >= 29) + int constexpr kMinSdkVersionForVulkan10 = 29; + if (sdkVersion >= kMinSdkVersionForVulkan10) return true; // For these configurations partial updates of texture clears whole texture except part updated diff --git a/drape/texture_of_colors.cpp b/drape/texture_of_colors.cpp index 4b98dd8f14..a0637efe75 100644 --- a/drape/texture_of_colors.cpp +++ b/drape/texture_of_colors.cpp @@ -5,7 +5,7 @@ #include -namespace dp +namespace dp { namespace @@ -73,28 +73,25 @@ ref_ptr ColorPalette::MapResource(ColorKey const & key, b void ColorPalette::UploadResources(ref_ptr context, ref_ptr texture) { ASSERT(texture->GetFormat() == dp::TextureFormat::RGBA8, ()); - bool const hasPartialTextureUpdate = context->HasPartialTextureUpdates(); - - std::vector pendingNodes; + buffer_vector pendingNodes; { std::lock_guard g(m_lock); if (m_pendingNodes.empty()) return; - if (hasPartialTextureUpdate) + if (context->HasPartialTextureUpdates()) { pendingNodes.swap(m_pendingNodes); } else { - // Store all colors in m_nodes, because we should update *whole* texture, if partial update is not available. m_nodes.insert(m_nodes.end(), m_pendingNodes.begin(), m_pendingNodes.end()); m_pendingNodes.clear(); pendingNodes = m_nodes; } } - if (!hasPartialTextureUpdate) + if (!context->HasPartialTextureUpdates()) { PendingColor lastPendingColor = pendingNodes.back(); lastPendingColor.m_color = Color::Transparent(); @@ -105,7 +102,7 @@ void ColorPalette::UploadResources(ref_ptr context, ref_ptr } } - buffer_vector ranges; + buffer_vector ranges; ranges.push_back(0); uint32_t minX = pendingNodes[0].m_rect.minX(); @@ -119,9 +116,10 @@ void ColorPalette::UploadResources(ref_ptr context, ref_ptr } } - ASSERT(hasPartialTextureUpdate || ranges.size() == 1, ()); + ASSERT(context->HasPartialTextureUpdates() || ranges.size() == 1, ()); ranges.push_back(pendingNodes.size()); + for (size_t i = 1; i < ranges.size(); ++i) { size_t startRange = ranges[i - 1]; diff --git a/drape/texture_of_colors.hpp b/drape/texture_of_colors.hpp index fe13d46770..4abe5192b3 100644 --- a/drape/texture_of_colors.hpp +++ b/drape/texture_of_colors.hpp @@ -49,9 +49,8 @@ private: TPalette m_palette; TPalette m_predefinedPalette; - // We have > 400 colors, no need to use buffer_vector here. - std::vector m_nodes; - std::vector m_pendingNodes; + buffer_vector m_nodes; + buffer_vector m_pendingNodes; m2::PointU m_textureSize; m2::PointU m_cursor; bool m_isDebug = false; diff --git a/generator/generator_tests/collector_building_parts_tests.cpp b/generator/generator_tests/collector_building_parts_tests.cpp index 3ff73efc73..3b75223f31 100644 --- a/generator/generator_tests/collector_building_parts_tests.cpp +++ b/generator/generator_tests/collector_building_parts_tests.cpp @@ -30,7 +30,7 @@ public: } // OSMElementCacheReaderInterface overrides: - [[noreturn]] bool Read(generator::cache::Key /* id */, WayElement & /* value */) override { + bool Read(generator::cache::Key /* id */, WayElement & /* value */) override { CHECK(false, ("Should not be called")); } diff --git a/generator/generator_tests/osm_type_test.cpp b/generator/generator_tests/osm_type_test.cpp index 26d9ec32ae..dfa17790da 100644 --- a/generator/generator_tests/osm_type_test.cpp +++ b/generator/generator_tests/osm_type_test.cpp @@ -557,7 +557,6 @@ UNIT_CLASS_TEST(TestWithClassificator, OsmType_Surface) TestSurfaceTypes("fine_gravel", "", "", "paved_bad"); TestSurfaceTypes("fine_gravel", "intermediate", "", "paved_bad"); - TestSurfaceTypes("cobblestone", "", "", "paved_bad"); // We definitely should store more than 4 surface options. // Gravel (widely used tag) always goes to unpaved_bad which is strange sometimes. @@ -1987,28 +1986,22 @@ UNIT_CLASS_TEST(TestWithClassificator, OsmType_SimpleTypesSmoke) {"shop", "convenience"}, {"shop", "copyshop"}, {"shop", "cosmetics"}, - {"shop", "deli"}, {"shop", "department_store"}, {"shop", "doityourself"}, {"shop", "dry_cleaning"}, {"shop", "electronics"}, {"shop", "erotic"}, {"shop", "fabric"}, - {"shop", "farm"}, {"shop", "florist"}, {"shop", "funeral_directors"}, {"shop", "furniture"}, {"shop", "garden_centre"}, {"shop", "gift"}, {"shop", "greengrocer"}, - {"shop", "grocery"}, {"shop", "hairdresser"}, {"shop", "hardware"}, - {"shop", "houseware"}, - {"shop", "health_food"}, {"shop", "jewelry"}, {"shop", "kiosk"}, - {"shop", "kitchen"}, {"shop", "laundry"}, {"shop", "mall"}, {"shop", "massage"}, @@ -2020,12 +2013,10 @@ UNIT_CLASS_TEST(TestWithClassificator, OsmType_SimpleTypesSmoke) {"shop", "newsagent"}, {"shop", "optician"}, {"shop", "outdoor"}, - {"shop", "pastry"}, {"shop", "pawnbroker"}, {"shop", "pet"}, {"shop", "photo"}, {"shop", "seafood"}, - {"shop", "second_hand"}, {"shop", "shoes"}, {"shop", "sports"}, {"shop", "stationery"}, diff --git a/generator/generator_tests/relation_tags_tests.cpp b/generator/generator_tests/relation_tags_tests.cpp index ca832d8b37..e360be9da1 100644 --- a/generator/generator_tests/relation_tags_tests.cpp +++ b/generator/generator_tests/relation_tags_tests.cpp @@ -22,7 +22,7 @@ public: } // OSMElementCacheReaderInterface overrides: - [[noreturn]] bool Read(Key /* id */, WayElement & /* value */) override { + bool Read(Key /* id */, WayElement & /* value */) override { CHECK(false, ("Should not be called")); } diff --git a/geometry/clipping.cpp b/geometry/clipping.cpp index 0ddf4a86f0..3382a88210 100644 --- a/geometry/clipping.cpp +++ b/geometry/clipping.cpp @@ -207,8 +207,6 @@ vector ClipSplineByRect(m2::RectD const & rect, m2::SharedSpli case RectCase::Outside: return {}; case RectCase::Intersect: return ClipPathByRectImpl(rect, spline->GetPath()); } - CHECK(false, ("Unreachable")); - return {}; } std::vector ClipPathByRect(m2::RectD const & rect, @@ -220,8 +218,6 @@ std::vector ClipPathByRect(m2::RectD const & rect, case RectCase::Outside: return {}; case RectCase::Intersect: return ClipPathByRectImpl(rect, path); } - CHECK(false, ("Unreachable")); - return {}; } void ClipPathByRectBeforeSmooth(m2::RectD const & rect, std::vector const & path, diff --git a/indexer/ftypes_matcher.cpp b/indexer/ftypes_matcher.cpp index 864e610aa6..938db943c9 100644 --- a/indexer/ftypes_matcher.cpp +++ b/indexer/ftypes_matcher.cpp @@ -683,7 +683,6 @@ IsWifiChecker::IsWifiChecker() IsEatChecker::IsEatChecker() { // The order should be the same as in "enum class Type" declaration. - /// @todo Should we include shops like: confectionery and pastry, because bakery is already present? base::StringIL const types[] = {{"amenity", "cafe"}, {"shop", "bakery"}, {"amenity", "fast_food"}, diff --git a/iphone/Maps/Classes/CustomViews/NavigationDashboard/MWMNavigationDashboardEntity.h b/iphone/Maps/Classes/CustomViews/NavigationDashboard/MWMNavigationDashboardEntity.h index e94e9e8159..ff5f507072 100644 --- a/iphone/Maps/Classes/CustomViews/NavigationDashboard/MWMNavigationDashboardEntity.h +++ b/iphone/Maps/Classes/CustomViews/NavigationDashboard/MWMNavigationDashboardEntity.h @@ -10,7 +10,6 @@ @property(copy, nonatomic, readonly) NSString * targetDistance; @property(copy, nonatomic, readonly) NSString * targetUnits; @property(copy, nonatomic, readonly) NSString * turnUnits; -@property(copy, nonatomic, readonly) NSString * speedLimit; @property(nonatomic, readonly) BOOL isValid; @property(nonatomic, readonly) CGFloat progress; @property(nonatomic, readonly) CLLocation * pedestrianDirectionPosition; diff --git a/iphone/Maps/Classes/CustomViews/NavigationDashboard/MWMNavigationDashboardEntity.mm b/iphone/Maps/Classes/CustomViews/NavigationDashboard/MWMNavigationDashboardEntity.mm index 46b5b5205d..9f18788c6e 100644 --- a/iphone/Maps/Classes/CustomViews/NavigationDashboard/MWMNavigationDashboardEntity.mm +++ b/iphone/Maps/Classes/CustomViews/NavigationDashboard/MWMNavigationDashboardEntity.mm @@ -21,7 +21,6 @@ @property(copy, nonatomic, readwrite) NSString * targetDistance; @property(copy, nonatomic, readwrite) NSString * targetUnits; @property(copy, nonatomic, readwrite) NSString * turnUnits; -@property(copy, nonatomic, readwrite) NSString * speedLimit; @property(nonatomic, readwrite) BOOL isValid; @property(nonatomic, readwrite) CGFloat progress; @property(nonatomic, readwrite) CLLocation * pedestrianDirectionPosition; diff --git a/iphone/Maps/Classes/CustomViews/NavigationDashboard/MWMNavigationDashboardManager+Entity.mm b/iphone/Maps/Classes/CustomViews/NavigationDashboard/MWMNavigationDashboardManager+Entity.mm index b6d1eb2f1d..782e119721 100644 --- a/iphone/Maps/Classes/CustomViews/NavigationDashboard/MWMNavigationDashboardManager+Entity.mm +++ b/iphone/Maps/Classes/CustomViews/NavigationDashboard/MWMNavigationDashboardManager+Entity.mm @@ -106,7 +106,6 @@ NSAttributedString *estimate(NSTimeInterval time, NSAttributedString *dot, NSStr @property(copy, nonatomic, readwrite) NSString *targetDistance; @property(copy, nonatomic, readwrite) NSString *targetUnits; @property(copy, nonatomic, readwrite) NSString *turnUnits; -@property(copy, nonatomic, readwrite) NSString *speedLimit; @property(nonatomic, readwrite) BOOL isValid; @property(nonatomic, readwrite) CGFloat progress; @property(nonatomic, readwrite) CLLocation *pedestrianDirectionPosition; @@ -151,7 +150,6 @@ NSAttributedString *estimate(NSTimeInterval time, NSAttributedString *dot, NSStr entity.distanceToTurn = @(info.m_distToTurn.c_str()); entity.turnUnits = [self localizedUnitLength:@(info.m_turnUnitsSuffix.c_str())]; entity.streetName = @(info.m_displayedStreetName.c_str()); - entity.speedLimit = @(info.m_speedLimit.c_str()); entity.estimate = estimate(entity.timeToTarget, entity.estimateDot, entity.targetDistance, entity.targetUnits, self.etaAttributes, self.etaSecondaryAttributes, NO); diff --git a/iphone/Maps/Classes/CustomViews/NavigationDashboard/Views/NavigationControlView.swift b/iphone/Maps/Classes/CustomViews/NavigationDashboard/Views/NavigationControlView.swift index 11d346856f..7795b06946 100644 --- a/iphone/Maps/Classes/CustomViews/NavigationDashboard/Views/NavigationControlView.swift +++ b/iphone/Maps/Classes/CustomViews/NavigationDashboard/Views/NavigationControlView.swift @@ -155,11 +155,7 @@ final class NavigationControlView: SolidTouchView, MWMTextToSpeechObserver, MapO } } - var speed = info.speed ?? "0" - if (info.speedLimit != "") { - speed += " / " + info.speedLimit; - } - + let speed = info.speed ?? "0" speedLabel.text = speed speedLegendLabel.text = info.speedUnits let speedWithLegend = NSMutableAttributedString(string: speed, attributes: routingNumberAttributes) diff --git a/iphone/Maps/LocalizedStrings/ar.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/ar.lproj/Localizable.strings index 11c1a32fbc..6611a2c513 100644 --- a/iphone/Maps/LocalizedStrings/ar.lproj/Localizable.strings +++ b/iphone/Maps/LocalizedStrings/ar.lproj/Localizable.strings @@ -2764,8 +2764,6 @@ "type.shop.cosmetics" = "مستحضرات تجميل"; -"type.shop.deli" = "ﺔﺒﻠﻌﻤﻟﺍ ﺔﻤﻌﻃﻷﺍ ﻊﻴﺒﻟ ﻞﺤﻣ"; - "type.shop.department_store" = "متجر شامل"; "type.shop.doityourself" = "متجر عدد وأدوات"; @@ -2778,8 +2776,6 @@ "type.shop.fabric" = "متجر"; -"type.shop.farm" = "ﺔﻋﺭﺰﻤﻟﺍ ﺔﻳﺬﻏﺃ ﺮﺠﺘﻣ"; - "type.shop.florist" = "متجر زهور"; "type.shop.funeral_directors" = "منظموا الجنازات"; @@ -2792,22 +2788,14 @@ "type.shop.greengrocer" = "متجر خضروات وفواكه"; -"type.shop.grocery" = "ﺕﺍﻭﺮﻀﺧ"; - "type.shop.hairdresser" = "مصفف شعر"; -"type.shop.hardware" = "ﺕﺍﺪﻌﻣ ﻞﺤﻣ"; - -"type.shop.health_food" = "ﺔﻴﺤﺼﻟﺍ ﺔﻳﺬﻏﻼﻟ ﺮﺠﺘﻣ"; - -"type.shop.houseware" = "ﺔﻴﻟﺰﻨﻣ ﺕﺍﻭﺩﺃ ﻞﺤﻣ"; +"type.shop.hardware" = "متجر عدد وأدوات"; "type.shop.jewelry" = "مجوهرات"; "type.shop.kiosk" = "كشك"; -"type.shop.kitchen" = "ﺦﺒﻄﻤﻟﺍ ﺮﺠﺘﻣ"; - "type.shop.laundry" = "مغسلة ملابس"; "type.shop.mall" = "مركز تسوق"; @@ -2830,8 +2818,6 @@ "type.shop.outdoor" = "معدات خارجية"; -"type.shop.pastry" = "ﺕﺎﻨﺠﻌﻣ"; - "type.shop.pawnbroker" = "سمسار تسليف"; "type.shop.pet" = "متجر للحيوانات الأليفة"; @@ -2840,8 +2826,6 @@ "type.shop.seafood" = "سماك"; -"type.shop.second_hand" = "ﺔﻠﻤﻌﺘﺴﻣ ﺕﺍﻭﺩﺍ ﺮﺠﺘﻣ"; - "type.shop.shoes" = "متجر أحذية"; "type.shop.sports" = "أدوات رياضية"; @@ -2870,52 +2854,6 @@ "type.shop.wine" = "متجر مشروبات روحية"; -"type.shop.antiques" = "ﻒﺤﺘﻟﺍ"; - -"type.shop.art" = "ﻥﻮﻨﻔﻟﺍ ﺮﺠﺘﻣ"; - -"type.shop.baby_goods" = "ﻝﺎﻔﻃﻸﻟ ﺮﺠﺘﻣ"; - -"type.shop.bag" = "ﺐﺋﺎﻘﺤﻟﺍ ﺮﺠﺘﻣ"; - -"type.shop.boutique" = "ﺮﺠﺘﻣ"; - -"type.shop.charity" = "ﻱﺮﻴﺧ ﺮﺠﺘﻣ"; - -"type.shop.cheese" = "ﻦﺒﺠﻟﺍ ﺮﺠﺘﻣ"; - -"type.shop.craft" = "ﺔﻳﻭﺪﻴﻟﺍ ﻑﺮﺤﻟﺍﻭ ﻥﻮﻨﻔﻟﺍ"; - -"type.shop.dairy" = "ﻥﺎﺒﻟﻷﺍ ﺕﺎﺠﺘﻨﻣ"; - -"type.shop.electrical" = "ﺔﻴﺋﺎﺑﺮﻬﻜﻟﺍ ﺕﺍﻭﺩﻷﺍ ﺮﺠﺘﻣ"; - -"type.shop.fishing" = "ﺪﻴﺻ ﺮﺠﺘﻣ"; - -"type.shop.interior_decoration" = "ﺔﻴﻠﺧﺍﺩ ﺕﺍﺭﻮﻜﻳﺩ"; - -"type.shop.lottery" = "ﺐﻴﺼﻧﺎﻴﻟﺍ ﺮﻛﺍﺬﺗ"; - -"type.shop.medical_supply" = "ﺔﻴﺒﻄﻟﺍ ﺕﺍﺩﺍﺪﻣﻹﺍ"; - -"type.shop.nutrition_supplements" = "ﺔﻴﺋﺍﺬﻏ ﺕﻼﻤﻜﻣ"; - -"type.shop.paint" = "ﺕﺎﻧﺎﻫﺪﻟﺍ"; - -"type.shop.perfumery" = "ﺭﻮﻄﻌﻟﺍ"; - -"type.shop.sewing" = "ﺔﻃﺎﻴﺨﻟﺍ ﺕﺍﺪﻌﻣ"; - -"type.shop.storage_rental" = "ﻦﻳﺰﺨﺘﻟﺍ ﺕﺍﺪﺣﻭ ﺮﻴﺟﺄﺗ"; - -"type.shop.tobacco" = "ﻎﺒﺗ"; - -"type.shop.trade" = "ﺔﻳﺭﺎﺠﺘﻟﺍ ﺕﺍﺪﻳﺭﻮﺘﻟﺍ"; - -"type.shop.watches" = "ﺕﺎﻋﺎﺳ"; - -"type.shop.wholesale" = "ﺔﻠﻤﺠﻟﺎﺑ ﺔﻴﺋﺍﺬﻐﻟﺍ ﺩﺍﻮﻤﻟﺍ ﺓﺭﺎﺠﺗ"; - "type.sport" = "رياضة"; "type.sport.american_football" = "كرة القدم الأمريكية"; diff --git a/iphone/Maps/LocalizedStrings/be.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/be.lproj/Localizable.strings index aee2e9090a..340f57362d 100644 --- a/iphone/Maps/LocalizedStrings/be.lproj/Localizable.strings +++ b/iphone/Maps/LocalizedStrings/be.lproj/Localizable.strings @@ -2764,8 +2764,6 @@ "type.shop.cosmetics" = "Касметыка"; -"type.shop.deli" = "Дэлікатэсная крама"; - "type.shop.department_store" = "Department Store"; "type.shop.doityourself" = "Hardware Store"; @@ -2778,8 +2776,6 @@ "type.shop.fabric" = "Shop"; -"type.shop.farm" = "Сельскагаспадарчыя прадукты"; - "type.shop.florist" = "Florist’s"; "type.shop.funeral_directors" = "Рытуальныя паслугі"; @@ -2792,22 +2788,14 @@ "type.shop.greengrocer" = "Greengrocer's"; -"type.shop.grocery" = "Бакалея"; - "type.shop.hairdresser" = "Hairdresser"; -"type.shop.hardware" = "Будаўнічы магазін"; - -"type.shop.health_food" = "Крама здаровай ежы"; - -"type.shop.houseware" = "Крама посуду"; +"type.shop.hardware" = "Hardware Store"; "type.shop.jewelry" = "Jewelry"; "type.shop.kiosk" = "Kiosk"; -"type.shop.kitchen" = "Крама для кухні"; - "type.shop.laundry" = "Laundry"; "type.shop.mall" = "Mall"; @@ -2830,8 +2818,6 @@ "type.shop.outdoor" = "Outdoor Equipment"; -"type.shop.pastry" = "Кандытарскія вырабы"; - "type.shop.pawnbroker" = "Pawnbroker"; "type.shop.pet" = "Petshop"; @@ -2840,8 +2826,6 @@ "type.shop.seafood" = "Seafood Shop"; -"type.shop.second_hand" = "Крама сэканд-хэнд"; - "type.shop.shoes" = "Shoe Store"; "type.shop.sports" = "Sports Goods"; @@ -2870,52 +2854,6 @@ "type.shop.wine" = "Wine Shop"; -"type.shop.antiques" = "Антыкварыят"; - -"type.shop.art" = "Крама мастацтваў"; - -"type.shop.baby_goods" = "Дзіцячая крама"; - -"type.shop.bag" = "Крама сумак"; - -"type.shop.boutique" = "Буцік"; - -"type.shop.charity" = "Дабрачынная крама"; - -"type.shop.cheese" = "Сырны магазін"; - -"type.shop.craft" = "Мастацтва і рамёствы"; - -"type.shop.dairy" = "Малочныя прадукты"; - -"type.shop.electrical" = "Крама электратэхнікі"; - -"type.shop.fishing" = "Рыбалоўны магазін"; - -"type.shop.interior_decoration" = "Ўпрыгажэнні інтэр'еру"; - -"type.shop.lottery" = "Латарэйныя білеты"; - -"type.shop.medical_supply" = "Медыцынскія прыналежнасці"; - -"type.shop.nutrition_supplements" = "Харчовыя дабаўкі"; - -"type.shop.paint" = "Фарбы"; - -"type.shop.perfumery" = "Парфумерыя"; - -"type.shop.sewing" = "Швейныя прыналежнасці"; - -"type.shop.storage_rental" = "Арэнда сховішчаў"; - -"type.shop.tobacco" = "Тытунь"; - -"type.shop.trade" = "Гандлёвая прыналежнасць"; - -"type.shop.watches" = "Гадзіннік"; - -"type.shop.wholesale" = "Аптовая крама"; - "type.sport" = "Спорт"; "type.sport.american_football" = "Амерыканскі футбол"; diff --git a/iphone/Maps/LocalizedStrings/bg.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/bg.lproj/Localizable.strings index 91cea83c28..bdb763d673 100644 --- a/iphone/Maps/LocalizedStrings/bg.lproj/Localizable.strings +++ b/iphone/Maps/LocalizedStrings/bg.lproj/Localizable.strings @@ -2764,8 +2764,6 @@ "type.shop.cosmetics" = "Cosmetics"; -"type.shop.deli" = "Магазин за деликатеси"; - "type.shop.department_store" = "Department Store"; "type.shop.doityourself" = "Hardware Store"; @@ -2778,8 +2776,6 @@ "type.shop.fabric" = "Shop"; -"type.shop.farm" = "Магазин за селскостопански храни"; - "type.shop.florist" = "Florist’s"; "type.shop.funeral_directors" = "Funeral Directors"; @@ -2792,22 +2788,14 @@ "type.shop.greengrocer" = "Greengrocer's"; -"type.shop.grocery" = "Хранителни стоки"; - "type.shop.hairdresser" = "Hairdresser"; -"type.shop.hardware" = "Магазин за хардуер"; - -"type.shop.health_food" = "Магазин за здравословни храни"; - -"type.shop.houseware" = "Магазин за домакински принадлежности"; +"type.shop.hardware" = "Hardware Store"; "type.shop.jewelry" = "Jewelry"; "type.shop.kiosk" = "Kiosk"; -"type.shop.kitchen" = "Магазин за кухня"; - "type.shop.laundry" = "Laundry"; "type.shop.mall" = "Mall"; @@ -2830,8 +2818,6 @@ "type.shop.outdoor" = "Outdoor Equipment"; -"type.shop.pastry" = "Тестени изделия"; - "type.shop.pawnbroker" = "Pawnbroker"; "type.shop.pet" = "Petshop"; @@ -2840,8 +2826,6 @@ "type.shop.seafood" = "Seafood Shop"; -"type.shop.second_hand" = "Магазин втора употреба"; - "type.shop.shoes" = "Shoe Store"; "type.shop.sports" = "Sports Goods"; @@ -2870,52 +2854,6 @@ "type.shop.wine" = "Wine Shop"; -"type.shop.antiques" = "Антики"; - -"type.shop.art" = "Магазин за изкуства"; - -"type.shop.baby_goods" = "Детски магазин"; - -"type.shop.bag" = "Магазин за чанти"; - -"type.shop.boutique" = "Бутик"; - -"type.shop.charity" = "Благотворителен магазин"; - -"type.shop.cheese" = "Магазин за сирене"; - -"type.shop.craft" = "Изкуства и занаяти"; - -"type.shop.dairy" = "Млечни продукти"; - -"type.shop.electrical" = "Електрически магазин"; - -"type.shop.fishing" = "Риболовен магазин"; - -"type.shop.interior_decoration" = "Вътрешни декорации"; - -"type.shop.lottery" = "Лотарийни билети"; - -"type.shop.medical_supply" = "Медицински изделия"; - -"type.shop.nutrition_supplements" = "Хранителни добавки"; - -"type.shop.paint" = "Бои"; - -"type.shop.perfumery" = "Парфюмерия"; - -"type.shop.sewing" = "Шивашки консумативи"; - -"type.shop.storage_rental" = "Склад под наем"; - -"type.shop.tobacco" = "Тютюн"; - -"type.shop.trade" = "Търговия с консумативи"; - -"type.shop.watches" = "Часовници"; - -"type.shop.wholesale" = "Магазин на едро"; - "type.sport" = "Спорт"; "type.sport.american_football" = "Американски футбол"; diff --git a/iphone/Maps/LocalizedStrings/cs.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/cs.lproj/Localizable.strings index 1f8e2ec269..dbd8515a44 100644 --- a/iphone/Maps/LocalizedStrings/cs.lproj/Localizable.strings +++ b/iphone/Maps/LocalizedStrings/cs.lproj/Localizable.strings @@ -2764,8 +2764,6 @@ "type.shop.cosmetics" = "Kosmetika"; -"type.shop.deli" = "Prodejna lahůdek"; - "type.shop.department_store" = "Obchodní dům"; "type.shop.doityourself" = "Železářství"; @@ -2778,8 +2776,6 @@ "type.shop.fabric" = "Obchod"; -"type.shop.farm" = "Prodejna farmářských potravin"; - "type.shop.florist" = "Květinářství"; "type.shop.funeral_directors" = "Pohřební služba"; @@ -2792,22 +2788,14 @@ "type.shop.greengrocer" = "Ovoce a zelenina"; -"type.shop.grocery" = "Potraviny"; - "type.shop.hairdresser" = "Kadeřnictví"; "type.shop.hardware" = "Železářství"; -"type.shop.health_food" = "Prodejna zdravé výživy"; - -"type.shop.houseware" = "Obchod s domácími potřebami"; - "type.shop.jewelry" = "Klenotnictví"; "type.shop.kiosk" = "Kiosk"; -"type.shop.kitchen" = "Prodejna kuchyní"; - "type.shop.laundry" = "Prádelna"; "type.shop.mall" = "Obchoďák"; @@ -2830,8 +2818,6 @@ "type.shop.outdoor" = "Venkovní vybavení"; -"type.shop.pastry" = "Pečivo"; - "type.shop.pawnbroker" = "Zastavárna"; "type.shop.pet" = "Zverimex"; @@ -2840,8 +2826,6 @@ "type.shop.seafood" = "Prodej ryb"; -"type.shop.second_hand" = "Obchod z druhé ruky"; - "type.shop.shoes" = "Obuv"; "type.shop.sports" = "Sportovní zboží"; @@ -2870,52 +2854,6 @@ "type.shop.wine" = "Vinařství"; -"type.shop.antiques" = "Starožitnosti"; - -"type.shop.art" = "Obchod s uměním"; - -"type.shop.baby_goods" = "Dětský obchod"; - -"type.shop.bag" = "Obchod s taškami"; - -"type.shop.boutique" = "Butik"; - -"type.shop.charity" = "Charitativní obchod"; - -"type.shop.cheese" = "Prodejna sýrů"; - -"type.shop.craft" = "Umění a řemesla"; - -"type.shop.dairy" = "Mléčné výrobky"; - -"type.shop.electrical" = "Elektro obchod"; - -"type.shop.fishing" = "Rybářský obchod"; - -"type.shop.interior_decoration" = "Interiérové dekorace"; - -"type.shop.lottery" = "Loterijní lístky"; - -"type.shop.medical_supply" = "Zdravotní zásoby"; - -"type.shop.nutrition_supplements" = "Doplňky výživy"; - -"type.shop.paint" = "Barvy"; - -"type.shop.perfumery" = "Parfumerie"; - -"type.shop.sewing" = "Šicí potřeby"; - -"type.shop.storage_rental" = "Pronájem skladu"; - -"type.shop.tobacco" = "Tabák"; - -"type.shop.trade" = "Obchod se zásobami"; - -"type.shop.watches" = "Hodinky"; - -"type.shop.wholesale" = "Velkoobchodní prodejna"; - "type.sport" = "Sport"; "type.sport.american_football" = "Americký fotbal"; diff --git a/iphone/Maps/LocalizedStrings/da.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/da.lproj/Localizable.strings index cf79e34926..eb3c330b6c 100644 --- a/iphone/Maps/LocalizedStrings/da.lproj/Localizable.strings +++ b/iphone/Maps/LocalizedStrings/da.lproj/Localizable.strings @@ -2764,8 +2764,6 @@ "type.shop.cosmetics" = "Kosmetik"; -"type.shop.deli" = "Delikatessebutik"; - "type.shop.department_store" = "Stormagasin"; "type.shop.doityourself" = "Isenkræmmer"; @@ -2778,8 +2776,6 @@ "type.shop.fabric" = "Butik"; -"type.shop.farm" = "Farm Food Shop"; - "type.shop.florist" = "Blomsterbutik"; "type.shop.funeral_directors" = "Bedemand"; @@ -2792,22 +2788,14 @@ "type.shop.greengrocer" = "Grønthandler"; -"type.shop.grocery" = "Købmand"; - "type.shop.hairdresser" = "Frisør"; "type.shop.hardware" = "Isenkræmmer"; -"type.shop.health_food" = "Helsekostbutik"; - -"type.shop.houseware" = "Husholdningsartikler butik"; - "type.shop.jewelry" = "Smykkebutik"; "type.shop.kiosk" = "Kiosk"; -"type.shop.kitchen" = "Køkkenforretning"; - "type.shop.laundry" = "Vaskeri"; "type.shop.mall" = "Indkøbscenter"; @@ -2830,8 +2818,6 @@ "type.shop.outdoor" = "Fritidsudstyr"; -"type.shop.pastry" = "Bagværk"; - "type.shop.pawnbroker" = "Pantelåner"; "type.shop.pet" = "Dyrehandel"; @@ -2840,8 +2826,6 @@ "type.shop.seafood" = "Fiskehandler"; -"type.shop.second_hand" = "Genbrugsbutik"; - "type.shop.shoes" = "Skobutik"; "type.shop.sports" = "Sportsudstyr"; @@ -2870,52 +2854,6 @@ "type.shop.wine" = "Vinhandel"; -"type.shop.antiques" = "Antikviteter"; - -"type.shop.art" = "Kunstbutik"; - -"type.shop.baby_goods" = "Børnebutik"; - -"type.shop.bag" = "Tasker butik"; - -"type.shop.boutique" = "Boutique"; - -"type.shop.charity" = "Velgørenhedsbutik"; - -"type.shop.cheese" = "Ostebutik"; - -"type.shop.craft" = "Kunst og kunsthåndværk"; - -"type.shop.dairy" = "Mejeriprodukter"; - -"type.shop.electrical" = "El-butik"; - -"type.shop.fishing" = "Fiskeri butik"; - -"type.shop.interior_decoration" = "Indvendige dekorationer"; - -"type.shop.lottery" = "Lotterikuponer"; - -"type.shop.medical_supply" = "Medicinske forsyninger"; - -"type.shop.nutrition_supplements" = "Kosttilskud"; - -"type.shop.paint" = "Maling"; - -"type.shop.perfumery" = "Parfumeri"; - -"type.shop.sewing" = "Syudstyr"; - -"type.shop.storage_rental" = "Lagerudlejning"; - -"type.shop.tobacco" = "Tobak"; - -"type.shop.trade" = "Handler forsyninger"; - -"type.shop.watches" = "Ure"; - -"type.shop.wholesale" = "Engros butik"; - "type.sport" = "Sport"; "type.sport.american_football" = "Amerikansk fodbold"; diff --git a/iphone/Maps/LocalizedStrings/de.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/de.lproj/Localizable.strings index 0414505bd3..ba7ef2cfd1 100644 --- a/iphone/Maps/LocalizedStrings/de.lproj/Localizable.strings +++ b/iphone/Maps/LocalizedStrings/de.lproj/Localizable.strings @@ -2764,8 +2764,6 @@ "type.shop.cosmetics" = "Kosmetikgeschäft"; -"type.shop.deli" = "Feinkostgeschäft"; - "type.shop.department_store" = "Kaufhaus"; "type.shop.doityourself" = "Baumarkt"; @@ -2778,8 +2776,6 @@ "type.shop.fabric" = "Textilgeschäft"; -"type.shop.farm" = "Hoflebensmittelladen"; - "type.shop.florist" = "Florist"; "type.shop.funeral_directors" = "Bestattungsinstitut"; @@ -2792,22 +2788,14 @@ "type.shop.greengrocer" = "Gemüseladen"; -"type.shop.grocery" = "Lebensmittelgeschäft"; - "type.shop.hairdresser" = "Friseur"; -"type.shop.hardware" = "Baumarkt"; - -"type.shop.health_food" = "Reformhaus"; - -"type.shop.houseware" = "Haushaltswarengeschäft"; +"type.shop.hardware" = "Eisenwarengeschäft"; "type.shop.jewelry" = "Juweliergeschäft"; "type.shop.kiosk" = "Kiosk"; -"type.shop.kitchen" = "Küchengeschäft"; - "type.shop.laundry" = "Wäscherei"; "type.shop.mall" = "Einkaufszentrum"; @@ -2830,8 +2818,6 @@ "type.shop.outdoor" = "Outdoor-Ausrüstung"; -"type.shop.pastry" = "Gebäck"; - "type.shop.pawnbroker" = "Pfandleihe"; "type.shop.pet" = "Tierhandlung"; @@ -2840,8 +2826,6 @@ "type.shop.seafood" = "Fischhändler"; -"type.shop.second_hand" = "Second-Hand-Laden"; - "type.shop.shoes" = "Schuhgeschäft"; "type.shop.sports" = "Sportartikel"; @@ -2870,52 +2854,6 @@ "type.shop.wine" = "Wein- und Spirituosengeschäft"; -"type.shop.antiques" = "Antiquitäten"; - -"type.shop.art" = "Kunstgeschäft"; - -"type.shop.baby_goods" = "Kinderladen"; - -"type.shop.bag" = "Taschen Shop"; - -"type.shop.boutique" = "Boutique"; - -"type.shop.charity" = "Wohltätigkeitsladen"; - -"type.shop.cheese" = "Käseladen"; - -"type.shop.craft" = "Kunst und Handwerk"; - -"type.shop.dairy" = "Milchprodukte"; - -"type.shop.electrical" = "Elektrogeschäft"; - -"type.shop.fishing" = "Angelgeschäft"; - -"type.shop.interior_decoration" = "Innendekorationen"; - -"type.shop.lottery" = "Lotteriescheine"; - -"type.shop.medical_supply" = "Medizinische Versorgung"; - -"type.shop.nutrition_supplements" = "Nahrungsergänzungsmittel"; - -"type.shop.paint" = "Farben"; - -"type.shop.perfumery" = "Parfümerie"; - -"type.shop.sewing" = "Nähzubehör"; - -"type.shop.storage_rental" = "Speichermiete"; - -"type.shop.tobacco" = "Tabak"; - -"type.shop.trade" = "Handelsbedarf"; - -"type.shop.watches" = "Uhren"; - -"type.shop.wholesale" = "Großhandelsgeschäft"; - "type.sport" = "Sport"; "type.sport.american_football" = "American Football"; diff --git a/iphone/Maps/LocalizedStrings/el.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/el.lproj/Localizable.strings index 099cebe796..625000b6ce 100644 --- a/iphone/Maps/LocalizedStrings/el.lproj/Localizable.strings +++ b/iphone/Maps/LocalizedStrings/el.lproj/Localizable.strings @@ -2764,8 +2764,6 @@ "type.shop.cosmetics" = "Καλλυντικά"; -"type.shop.deli" = "Κατάστημα Delicatessen"; - "type.shop.department_store" = "Πολυκατάστημα"; "type.shop.doityourself" = "Είδη κιγκαλερίας"; @@ -2778,8 +2776,6 @@ "type.shop.fabric" = "Κατάστημα"; -"type.shop.farm" = "Κατάστημα Αγροτικών Τροφίμων"; - "type.shop.florist" = "Ανθοπωλείο"; "type.shop.funeral_directors" = "Γραφεία τελετών"; @@ -2792,22 +2788,14 @@ "type.shop.greengrocer" = "Μανάβικο"; -"type.shop.grocery" = "Παντοπωλείο"; - "type.shop.hairdresser" = "Κομμωτής"; -"type.shop.hardware" = "Κατάστημα υλικού"; - -"type.shop.health_food" = "Κατάστημα υγιεινής διατροφής"; - -"type.shop.houseware" = "Κατάστημα οικιακών ειδών"; +"type.shop.hardware" = "Είδη κιγκαλερίας"; "type.shop.jewelry" = "Κοσμηματοπωλείο"; "type.shop.kiosk" = "Περίπτερο"; -"type.shop.kitchen" = "Κατάστημα κουζίνας"; - "type.shop.laundry" = "Άπλυτα"; "type.shop.mall" = "Εμπορικό κέντρο"; @@ -2830,8 +2818,6 @@ "type.shop.outdoor" = "Εξοπλισμός υπαίθρου"; -"type.shop.pastry" = "Ζύμη"; - "type.shop.pawnbroker" = "Ενεχυροδανειστήριο"; "type.shop.pet" = "Κατάστημα για κατοικίδια"; @@ -2840,8 +2826,6 @@ "type.shop.seafood" = "Κατάστημα με θαλασσινά"; -"type.shop.second_hand" = "Κατάστημα μεταχειρισμένων"; - "type.shop.shoes" = "Υποδηματοπωλείο"; "type.shop.sports" = "Αθλητικά είδη"; @@ -2870,52 +2854,6 @@ "type.shop.wine" = "Οινοπωλείο"; -"type.shop.antiques" = "Αντίκες"; - -"type.shop.art" = "Κατάστημα Τεχνών"; - -"type.shop.baby_goods" = "Παιδικό κατάστημα"; - -"type.shop.bag" = "Κατάστημα τσαντών"; - -"type.shop.boutique" = "Μπουτίκ"; - -"type.shop.charity" = "Φιλανθρωπικό κατάστημα"; - -"type.shop.cheese" = "Τυροκομείο"; - -"type.shop.craft" = "Τέχνες και χειροτεχνήματα"; - -"type.shop.dairy" = "Γαλακτοκομικά προϊόντα"; - -"type.shop.electrical" = "Μαγαζί ηλεκτρικών ειδών"; - -"type.shop.fishing" = "Κατάστημα ψαρέματος"; - -"type.shop.interior_decoration" = "Διακοσμήσεις εσωτερικών χώρων"; - -"type.shop.lottery" = "Λαχεία"; - -"type.shop.medical_supply" = "Ιατρικά Είδη"; - -"type.shop.nutrition_supplements" = "Συμπληρώματα Διατροφής"; - -"type.shop.paint" = "Βαφές"; - -"type.shop.perfumery" = "Αρωματοποιία"; - -"type.shop.sewing" = "Είδη Ραπτικής"; - -"type.shop.storage_rental" = "Ενοικίαση αποθηκευτικού χώρου"; - -"type.shop.tobacco" = "Καπνός"; - -"type.shop.trade" = "Εμπόριο Προμήθειες"; - -"type.shop.watches" = "Ρολόγια"; - -"type.shop.wholesale" = "Κατάστημα χονδρικής"; - "type.sport" = "Αθλητισμός"; "type.sport.american_football" = "αμερικάνικο ποδόσφαιρο"; diff --git a/iphone/Maps/LocalizedStrings/en-GB.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/en-GB.lproj/Localizable.strings index b6f1a68288..ef2c119c70 100644 --- a/iphone/Maps/LocalizedStrings/en-GB.lproj/Localizable.strings +++ b/iphone/Maps/LocalizedStrings/en-GB.lproj/Localizable.strings @@ -2764,8 +2764,6 @@ "type.shop.cosmetics" = "Cosmetics"; -"type.shop.deli" = "Delicatessen Shop"; - "type.shop.department_store" = "Department Store"; "type.shop.doityourself" = "Hardware Store"; @@ -2778,8 +2776,6 @@ "type.shop.fabric" = "Shop"; -"type.shop.farm" = "Farm Food Shop"; - "type.shop.florist" = "Florist’s"; "type.shop.funeral_directors" = "Funeral Directors"; @@ -2792,22 +2788,14 @@ "type.shop.greengrocer" = "Greengrocer's"; -"type.shop.grocery" = "Grocery"; - "type.shop.hairdresser" = "Hairdresser"; "type.shop.hardware" = "Hardware Store"; -"type.shop.health_food" = "Health Food Shop"; - -"type.shop.houseware" = "Hardware Store"; - "type.shop.jewelry" = "Jewelry"; "type.shop.kiosk" = "Kiosk"; -"type.shop.kitchen" = "Kitchen Store"; - "type.shop.laundry" = "Laundry"; "type.shop.mall" = "Mall"; @@ -2830,8 +2818,6 @@ "type.shop.outdoor" = "Outdoor Equipment"; -"type.shop.pastry" = "Bakery"; - "type.shop.pawnbroker" = "Pawnbroker"; "type.shop.pet" = "Petshop"; @@ -2840,8 +2826,6 @@ "type.shop.seafood" = "Seafood Shop"; -"type.shop.second_hand" = "Second Hand"; - "type.shop.shoes" = "Shoe Store"; "type.shop.sports" = "Sports Goods"; @@ -2870,52 +2854,6 @@ "type.shop.wine" = "Wine Shop"; -"type.shop.antiques" = "Antiques"; - -"type.shop.art" = "Arts Shop"; - -"type.shop.baby_goods" = "Baby Goods"; - -"type.shop.bag" = "Bags Store"; - -"type.shop.boutique" = "Boutique"; - -"type.shop.charity" = "Charity Shop"; - -"type.shop.cheese" = "Cheese Store"; - -"type.shop.craft" = "Arts and Crafts"; - -"type.shop.dairy" = "Dairy Products"; - -"type.shop.electrical" = "Electrical Store"; - -"type.shop.fishing" = "Fishing Store"; - -"type.shop.interior_decoration" = "Interior Decorations"; - -"type.shop.lottery" = "Lottery Tickets"; - -"type.shop.medical_supply" = "Medical Supplies"; - -"type.shop.nutrition_supplements" = "Nutrition Supplements"; - -"type.shop.paint" = "Paints"; - -"type.shop.perfumery" = "Perfumery"; - -"type.shop.sewing" = "Sewing Supplies"; - -"type.shop.storage_rental" = "Storage Rental"; - -"type.shop.tobacco" = "Tobacco"; - -"type.shop.trade" = "Trades Supplies"; - -"type.shop.watches" = "Watches"; - -"type.shop.wholesale" = "Wholesale Store"; - "type.sport" = "Sport"; "type.sport.american_football" = "American Football"; diff --git a/iphone/Maps/LocalizedStrings/en.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/en.lproj/Localizable.strings index d2f9e92967..764c9bde70 100644 --- a/iphone/Maps/LocalizedStrings/en.lproj/Localizable.strings +++ b/iphone/Maps/LocalizedStrings/en.lproj/Localizable.strings @@ -2764,8 +2764,6 @@ "type.shop.cosmetics" = "Cosmetics"; -"type.shop.deli" = "Delicatessen Shop"; - "type.shop.department_store" = "Department Store"; "type.shop.doityourself" = "Hardware Store"; @@ -2778,8 +2776,6 @@ "type.shop.fabric" = "Shop"; -"type.shop.farm" = "Farm Food Shop"; - "type.shop.florist" = "Florist’s"; "type.shop.funeral_directors" = "Funeral Directors"; @@ -2792,22 +2788,14 @@ "type.shop.greengrocer" = "Greengrocer's"; -"type.shop.grocery" = "Grocery"; - "type.shop.hairdresser" = "Hairdresser"; "type.shop.hardware" = "Hardware Store"; -"type.shop.health_food" = "Health Food Shop"; - -"type.shop.houseware" = "Houseware"; - "type.shop.jewelry" = "Jewelry"; "type.shop.kiosk" = "Kiosk"; -"type.shop.kitchen" = "Kitchen Store"; - "type.shop.laundry" = "Laundry"; "type.shop.mall" = "Mall"; @@ -2830,8 +2818,6 @@ "type.shop.outdoor" = "Outdoor Equipment"; -"type.shop.pastry" = "Pastry"; - "type.shop.pawnbroker" = "Pawnbroker"; "type.shop.pet" = "Petshop"; @@ -2840,8 +2826,6 @@ "type.shop.seafood" = "Seafood Shop"; -"type.shop.second_hand" = "Second Hand"; - "type.shop.shoes" = "Shoe Store"; "type.shop.sports" = "Sports Goods"; @@ -2870,52 +2854,6 @@ "type.shop.wine" = "Wine Shop"; -"type.shop.antiques" = "Antiques"; - -"type.shop.art" = "Arts Shop"; - -"type.shop.baby_goods" = "Baby Goods"; - -"type.shop.bag" = "Bags Store"; - -"type.shop.boutique" = "Boutique"; - -"type.shop.charity" = "Charity Shop"; - -"type.shop.cheese" = "Cheese Store"; - -"type.shop.craft" = "Arts and Crafts"; - -"type.shop.dairy" = "Dairy Products"; - -"type.shop.electrical" = "Electrical Store"; - -"type.shop.fishing" = "Fishing Store"; - -"type.shop.interior_decoration" = "Interior Decorations"; - -"type.shop.lottery" = "Lottery Tickets"; - -"type.shop.medical_supply" = "Medical Supplies"; - -"type.shop.nutrition_supplements" = "Nutrition Supplements"; - -"type.shop.paint" = "Paints"; - -"type.shop.perfumery" = "Perfumery"; - -"type.shop.sewing" = "Sewing Supplies"; - -"type.shop.storage_rental" = "Storage Rental"; - -"type.shop.tobacco" = "Tobacco"; - -"type.shop.trade" = "Trades Supplies"; - -"type.shop.watches" = "Watches"; - -"type.shop.wholesale" = "Wholesale Store"; - "type.sport" = "Sport"; "type.sport.american_football" = "American Football"; diff --git a/iphone/Maps/LocalizedStrings/es-MX.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/es-MX.lproj/Localizable.strings index d6922789ea..5e65b88cbd 100644 --- a/iphone/Maps/LocalizedStrings/es-MX.lproj/Localizable.strings +++ b/iphone/Maps/LocalizedStrings/es-MX.lproj/Localizable.strings @@ -2764,8 +2764,6 @@ "type.shop.cosmetics" = "Productos cosméticos"; -"type.shop.deli" = "Tienda de delicatessen"; - "type.shop.department_store" = "Grandes almacenes"; "type.shop.doityourself" = "Ferretería"; @@ -2778,8 +2776,6 @@ "type.shop.fabric" = "Tienda"; -"type.shop.farm" = "Tienda de alimentos de granja"; - "type.shop.florist" = "Floristería"; "type.shop.funeral_directors" = "Funeraria"; @@ -2792,22 +2788,14 @@ "type.shop.greengrocer" = "Frutería"; -"type.shop.grocery" = "Tienda de comestibles"; - "type.shop.hairdresser" = "Peluquería"; "type.shop.hardware" = "Ferretería"; -"type.shop.health_food" = "Tienda de comida saludable"; - -"type.shop.houseware" = "Ferretería"; - "type.shop.jewelry" = "Joyería"; "type.shop.kiosk" = "Quiosco"; -"type.shop.kitchen" = "Tienda de cocina"; - "type.shop.laundry" = "Lavandería"; "type.shop.mall" = "Centro comercial"; @@ -2830,8 +2818,6 @@ "type.shop.outdoor" = "Equipamiento"; -"type.shop.pastry" = "Panadería"; - "type.shop.pawnbroker" = "Casa de empeños"; "type.shop.pet" = "Tienda de mascotas"; @@ -2840,8 +2826,6 @@ "type.shop.seafood" = "Pescadería"; -"type.shop.second_hand" = "Tienda de segunda mano"; - "type.shop.shoes" = "Zapatería"; "type.shop.sports" = "Artículos de deporte"; @@ -2870,52 +2854,6 @@ "type.shop.wine" = "Tienda de vinos"; -"type.shop.antiques" = "Antigüedades"; - -"type.shop.art" = "Tienda de artes"; - -"type.shop.baby_goods" = "Tienda de niños"; - -"type.shop.bag" = "Tienda de bolsos"; - -"type.shop.boutique" = "Boutique"; - -"type.shop.charity" = "Tienda de caridad"; - -"type.shop.cheese" = "Tienda de queso"; - -"type.shop.craft" = "Artes y manualidades"; - -"type.shop.dairy" = "Productos lácteos"; - -"type.shop.electrical" = "Tienda de electricidad"; - -"type.shop.fishing" = "Tienda de pesca"; - -"type.shop.interior_decoration" = "Decoraciones interiores"; - -"type.shop.lottery" = "Boletos de lotería"; - -"type.shop.medical_supply" = "Suministros médicos"; - -"type.shop.nutrition_supplements" = "Suplementos Nutricionales"; - -"type.shop.paint" = "Pinturas"; - -"type.shop.perfumery" = "Perfumería"; - -"type.shop.sewing" = "Materiales de costura"; - -"type.shop.storage_rental" = "Alquiler de almacenamiento"; - -"type.shop.tobacco" = "Tabaco"; - -"type.shop.trade" = "Suministros comerciales"; - -"type.shop.watches" = "Relojes"; - -"type.shop.wholesale" = "Almacén al por mayor"; - "type.sport" = "Deporte"; "type.sport.american_football" = "Fútbol americano"; diff --git a/iphone/Maps/LocalizedStrings/es.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/es.lproj/Localizable.strings index f1eb91a14f..cab6524fbc 100644 --- a/iphone/Maps/LocalizedStrings/es.lproj/Localizable.strings +++ b/iphone/Maps/LocalizedStrings/es.lproj/Localizable.strings @@ -2764,8 +2764,6 @@ "type.shop.cosmetics" = "Productos cosméticos"; -"type.shop.deli" = "Tienda de delicatessen"; - "type.shop.department_store" = "Grandes almacenes"; "type.shop.doityourself" = "Ferretería"; @@ -2778,8 +2776,6 @@ "type.shop.fabric" = "Tienda"; -"type.shop.farm" = "Tienda de alimentos de granja"; - "type.shop.florist" = "Floristería"; "type.shop.funeral_directors" = "Funeraria"; @@ -2792,22 +2788,14 @@ "type.shop.greengrocer" = "Frutería"; -"type.shop.grocery" = "Tienda de comestibles"; - "type.shop.hairdresser" = "Peluquería"; "type.shop.hardware" = "Ferretería"; -"type.shop.health_food" = "Tienda de comida saludable"; - -"type.shop.houseware" = "Tienda de artículos para el hogar"; - "type.shop.jewelry" = "Joyería"; "type.shop.kiosk" = "Quiosco"; -"type.shop.kitchen" = "Tienda de cocina"; - "type.shop.laundry" = "Lavandería"; "type.shop.mall" = "Centro comercial"; @@ -2830,8 +2818,6 @@ "type.shop.outdoor" = "Equipamiento"; -"type.shop.pastry" = "Pastelería"; - "type.shop.pawnbroker" = "Casa de empeños"; "type.shop.pet" = "Tienda de mascotas"; @@ -2840,8 +2826,6 @@ "type.shop.seafood" = "Pescadería"; -"type.shop.second_hand" = "Tienda de segunda mano"; - "type.shop.shoes" = "Zapatería"; "type.shop.sports" = "Artículos de deporte"; @@ -2870,52 +2854,6 @@ "type.shop.wine" = "Tienda de vinos"; -"type.shop.antiques" = "Antigüedades"; - -"type.shop.art" = "Tienda de artes"; - -"type.shop.baby_goods" = "Tienda de niños"; - -"type.shop.bag" = "Tienda de bolsos"; - -"type.shop.boutique" = "Boutique"; - -"type.shop.charity" = "Tienda de caridad"; - -"type.shop.cheese" = "Tienda de queso"; - -"type.shop.craft" = "Artes y manualidades"; - -"type.shop.dairy" = "Productos lácteos"; - -"type.shop.electrical" = "Tienda de electricidad"; - -"type.shop.fishing" = "Tienda de pesca"; - -"type.shop.interior_decoration" = "Decoraciones interiores"; - -"type.shop.lottery" = "Boletos de lotería"; - -"type.shop.medical_supply" = "Suministros médicos"; - -"type.shop.nutrition_supplements" = "Suplementos Nutricionales"; - -"type.shop.paint" = "Pinturas"; - -"type.shop.perfumery" = "Perfumería"; - -"type.shop.sewing" = "Materiales de costura"; - -"type.shop.storage_rental" = "Alquiler de almacenamiento"; - -"type.shop.tobacco" = "Tabaco"; - -"type.shop.trade" = "Suministros comerciales"; - -"type.shop.watches" = "Relojes"; - -"type.shop.wholesale" = "Almacén al por mayor"; - "type.sport" = "Deporte"; "type.sport.american_football" = "Fútbol americano"; diff --git a/iphone/Maps/LocalizedStrings/eu.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/eu.lproj/Localizable.strings index 2cb50a7048..c9c4449e98 100644 --- a/iphone/Maps/LocalizedStrings/eu.lproj/Localizable.strings +++ b/iphone/Maps/LocalizedStrings/eu.lproj/Localizable.strings @@ -2764,8 +2764,6 @@ "type.shop.cosmetics" = "Produktu kosmetikoak"; -"type.shop.deli" = "Delicatesen Denda"; - "type.shop.department_store" = "Denda handiak"; "type.shop.doityourself" = "Burdindegia"; @@ -2778,8 +2776,6 @@ "type.shop.fabric" = "Denda"; -"type.shop.farm" = "Baserriko Janari Denda"; - "type.shop.florist" = "Loradenda"; "type.shop.funeral_directors" = "Tanatorioa"; @@ -2792,22 +2788,14 @@ "type.shop.greengrocer" = "Fruta denda"; -"type.shop.grocery" = "Janariak"; - "type.shop.hairdresser" = "Barber-denda"; -"type.shop.hardware" = "Hardware denda"; - -"type.shop.health_food" = "Osasuneko Elikagaien Denda"; - -"type.shop.houseware" = "Etxeko tresneria denda"; +"type.shop.hardware" = "Burdindegia"; "type.shop.jewelry" = "Bitxiak"; "type.shop.kiosk" = "Kioskoa"; -"type.shop.kitchen" = "Sukalde-denda"; - "type.shop.laundry" = "Garbitegia"; "type.shop.mall" = "Merkataritza-gune"; @@ -2830,8 +2818,6 @@ "type.shop.outdoor" = "Ekipamendua"; -"type.shop.pastry" = "Gozogintza"; - "type.shop.pawnbroker" = "Peoia"; "type.shop.pet" = "Animali denda"; @@ -2840,8 +2826,6 @@ "type.shop.seafood" = "Arrain-denda"; -"type.shop.second_hand" = "Bigarren eskuko denda"; - "type.shop.shoes" = "Zapata-denda"; "type.shop.sports" = "Kirol artikuluak"; @@ -2870,52 +2854,6 @@ "type.shop.wine" = "Ardo-denda"; -"type.shop.antiques" = "Antigoalekoak"; - -"type.shop.art" = "Arte Denda"; - -"type.shop.baby_goods" = "Haurrentzako denda"; - -"type.shop.bag" = "Poltsen Denda"; - -"type.shop.boutique" = "Boutique"; - -"type.shop.charity" = "Ongintzazko Denda"; - -"type.shop.cheese" = "Gazta Denda"; - -"type.shop.craft" = "Arteak eta Eskulanak"; - -"type.shop.dairy" = "Esnekiak"; - -"type.shop.electrical" = "Elektrizitate Denda"; - -"type.shop.fishing" = "Arrantza Denda"; - -"type.shop.interior_decoration" = "Barruko Apaingarriak"; - -"type.shop.lottery" = "Loteria Sarrerak"; - -"type.shop.medical_supply" = "Medikuntza-hornidura"; - -"type.shop.nutrition_supplements" = "Nutrizio osagarriak"; - -"type.shop.paint" = "Margoak"; - -"type.shop.perfumery" = "Lurringintza"; - -"type.shop.sewing" = "Josteko hornigaiak"; - -"type.shop.storage_rental" = "Biltegiratzeko alokairua"; - -"type.shop.tobacco" = "Tabakoa"; - -"type.shop.trade" = "Lanbideen hornidurak"; - -"type.shop.watches" = "Erlojuak"; - -"type.shop.wholesale" = "Handizkako denda"; - "type.sport" = "Kirola"; "type.sport.american_football" = "Futbola"; diff --git a/iphone/Maps/LocalizedStrings/fa.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/fa.lproj/Localizable.strings index 4f707c289d..dd5922144b 100644 --- a/iphone/Maps/LocalizedStrings/fa.lproj/Localizable.strings +++ b/iphone/Maps/LocalizedStrings/fa.lproj/Localizable.strings @@ -2764,8 +2764,6 @@ "type.shop.cosmetics" = "فروشگاه"; -"type.shop.deli" = "ﯽﺷﻭﺮﻓ ﻪﯾﺬﻏﺍ ﻩﺎﮕﺷﻭﺮﻓ"; - "type.shop.department_store" = "مرکز خرید"; "type.shop.doityourself" = "فروشگاه"; @@ -2778,8 +2776,6 @@ "type.shop.fabric" = "فروشگاه"; -"type.shop.farm" = "ﻪﻋﺭﺰﻣ ﯽﯾﺍﺬﻏ ﺩﺍﻮﻣ ﻩﺎﮕﺷﻭﺮﻓ"; - "type.shop.florist" = "فروشگاه"; "type.shop.funeral_directors" = "مسئول تشییع جنازه"; @@ -2792,22 +2788,14 @@ "type.shop.greengrocer" = "فروشگاه"; -"type.shop.grocery" = "ﺭﺎﺑﺭﺍﻮﺧ"; - "type.shop.hairdresser" = "ارایشگاه"; -"type.shop.hardware" = "ﺭﺍﺰﻓﺍ ﺖﺨﺳ ﻩﺎﮕﺷﻭﺮﻓ"; - -"type.shop.health_food" = "ﯽﺘﺷﺍﺪﻬﺑ ﯽﯾﺍﺬﻏ ﺩﺍﻮﻣ ﻩﺎﮕﺷﻭﺮﻓ"; - -"type.shop.houseware" = "ﯽﮕﻧﺎﺧ ﻡﺯﺍﻮﻟ ﻩﺎﮕﺷﻭﺮﻓ"; +"type.shop.hardware" = "فروشگاه"; "type.shop.jewelry" = "طلا فروشی"; "type.shop.kiosk" = "دَکهِ"; -"type.shop.kitchen" = "ﻪﻧﺎﺧﺰﭙﺷﺁ ﻩﺎﮕﺷﻭﺮﻓ"; - "type.shop.laundry" = "لباس شویی"; "type.shop.mall" = "فروشگاه"; @@ -2830,8 +2818,6 @@ "type.shop.outdoor" = "فروشگاه"; -"type.shop.pastry" = "ﯽﻨﯾﺮﯿﺷ"; - "type.shop.pawnbroker" = "عتیقه فروشی"; "type.shop.pet" = "فروشگاه"; @@ -2840,8 +2826,6 @@ "type.shop.seafood" = "فروشگاه"; -"type.shop.second_hand" = "ﻡﻭﺩ ﺖﺳﺩ ﻩﺎﮕﺷﻭﺮﻓ"; - "type.shop.shoes" = "فروشگاه"; "type.shop.sports" = "فروشگاه"; @@ -2870,52 +2854,6 @@ "type.shop.wine" = "فروشگاه"; -"type.shop.antiques" = "ﺕﺎﺟ ﻪﻘﯿﺘﻋ"; - -"type.shop.art" = "ﺮﻨﻫ ﻩﺎﮕﺷﻭﺮﻓ"; - -"type.shop.baby_goods" = "ﻥﺎﮐﺩﻮﮐ ﻩﺎﮕﺷﻭﺮﻓ"; - -"type.shop.bag" = "ﻒﯿﮐ ﻩﺎﮕﺷﻭﺮﻓ"; - -"type.shop.boutique" = "ﮏﯿﺗﻮﺑ"; - -"type.shop.charity" = "ﻪﯾﺮﯿﺧ ﻩﺎﮕﺷﻭﺮﻓ"; - -"type.shop.cheese" = "ﺮﯿﻨﭘ ﻩﺎﮕﺷﻭﺮﻓ"; - -"type.shop.craft" = "ﯽﺘﺳﺩ ﻊﯾﺎﻨﺻ ﻭ ﺮﻨﻫ"; - -"type.shop.dairy" = "ﯽﻨﺒﻟ ﺕﻻﻮﺼﺤﻣ"; - -"type.shop.electrical" = "ﯽﮑﯾﺮﺘﮑﻟﺍ ﻡﺯﺍﻮﻟ ﻩﺯﺎﻐﻣ"; - -"type.shop.fishing" = "ﯼﺮﯿﮕﯿﻫﺎﻣ ﻩﺎﮕﺷﻭﺮﻓ"; - -"type.shop.interior_decoration" = "ﯽﻠﺧﺍﺩ ﻥﻮﯿﺳﺍﺭﻮﮐﺩ"; - -"type.shop.lottery" = "ﯽﯾﺎﻣﺯﺁ ﺖﺨﺑ ﻂﯿﻠﺑ"; - -"type.shop.medical_supply" = "ﯽﮑﺷﺰﭘ ﻡﺯﺍﻮﻟ"; - -"type.shop.nutrition_supplements" = "ﯽﯾﺍﺬﻏ ﯼﺎﻫ ﻞﻤﮑﻣ"; - -"type.shop.paint" = "ﺪﻨﮐ ﯽﻣ ﮓﻧﺭ"; - -"type.shop.perfumery" = "ﯼﺯﺎﺳﺮﻄﻋ"; - -"type.shop.sewing" = "ﯽﻃﺎﯿﺧ ﻡﺯﺍﻮﻟ"; - -"type.shop.storage_rental" = "ﺭﺎﺒﻧﺍ ﻩﺭﺎﺟﺍ"; - -"type.shop.tobacco" = "ﻮﮐﺎﺒﻨﺗ"; - -"type.shop.trade" = "ﻡﺯﺍﻮﻟ ﺕﺭﺎﺠﺗ"; - -"type.shop.watches" = "ﺖﻋﺎﺳ"; - -"type.shop.wholesale" = "ﯽﺷﻭﺮﻓ ﻩﺪﻤﻋ ﻩﺎﮕﺷﻭﺮﻓ"; - "type.sport" = "ورزش"; "type.sport.american_football" = "فوتبال آمریکایی"; diff --git a/iphone/Maps/LocalizedStrings/fi.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/fi.lproj/Localizable.strings index 13bfda606b..7acb51afa8 100644 --- a/iphone/Maps/LocalizedStrings/fi.lproj/Localizable.strings +++ b/iphone/Maps/LocalizedStrings/fi.lproj/Localizable.strings @@ -2764,8 +2764,6 @@ "type.shop.cosmetics" = "Kosmetiikka"; -"type.shop.deli" = "Herkkukauppa"; - "type.shop.department_store" = "Tavaratalo"; "type.shop.doityourself" = "Rautakauppa"; @@ -2778,8 +2776,6 @@ "type.shop.fabric" = "Kauppa"; -"type.shop.farm" = "Maatilaruokakauppa"; - "type.shop.florist" = "Floristi"; "type.shop.funeral_directors" = "Hautaustoimisto"; @@ -2792,22 +2788,14 @@ "type.shop.greengrocer" = "Vihanneskauppias"; -"type.shop.grocery" = "Päivittäistavarakauppa"; - "type.shop.hairdresser" = "Kampaamo"; "type.shop.hardware" = "Rautakauppa"; -"type.shop.health_food" = "Terveysruokakauppa"; - -"type.shop.houseware" = "Taloustavarakauppa"; - "type.shop.jewelry" = "Korukauppa"; "type.shop.kiosk" = "Kioski"; -"type.shop.kitchen" = "Keittiökauppa"; - "type.shop.laundry" = "Pesula"; "type.shop.mall" = "Ostoskeskus"; @@ -2830,8 +2818,6 @@ "type.shop.outdoor" = "Ulkoiluvarusteet"; -"type.shop.pastry" = "Leivonnainen"; - "type.shop.pawnbroker" = "Panttilainaamo"; "type.shop.pet" = "Eläinkauppa"; @@ -2840,8 +2826,6 @@ "type.shop.seafood" = "Kalakauppias"; -"type.shop.second_hand" = "Second Hand Store"; - "type.shop.shoes" = "Kenkäkauppa"; "type.shop.sports" = "Urheilukauppa"; @@ -2870,52 +2854,6 @@ "type.shop.wine" = "Alkoholimyymälä"; -"type.shop.antiques" = "Antiikkia"; - -"type.shop.art" = "Taidekauppa"; - -"type.shop.baby_goods" = "Lasten kauppa"; - -"type.shop.bag" = "Laukkukauppa"; - -"type.shop.boutique" = "Boutique"; - -"type.shop.charity" = "Hyväntekeväisyysmyymälä"; - -"type.shop.cheese" = "Juustokauppa"; - -"type.shop.craft" = "Käsityöt"; - -"type.shop.dairy" = "Maitotuotteet"; - -"type.shop.electrical" = "Sähköliike"; - -"type.shop.fishing" = "Kalastuskauppa"; - -"type.shop.interior_decoration" = "Sisustuskoristeet"; - -"type.shop.lottery" = "Lottoliput"; - -"type.shop.medical_supply" = "Lääketieteellisiä tarvikkeita"; - -"type.shop.nutrition_supplements" = "Ravintolisät"; - -"type.shop.paint" = "Maalit"; - -"type.shop.perfumery" = "Hajuvedet"; - -"type.shop.sewing" = "Ompelutarvikkeet"; - -"type.shop.storage_rental" = "Varastoinnin vuokraus"; - -"type.shop.tobacco" = "Tupakka"; - -"type.shop.trade" = "Kauppa tarvikkeita"; - -"type.shop.watches" = "Kellot"; - -"type.shop.wholesale" = "Tukkukauppa"; - "type.sport" = "Urheilu"; "type.sport.american_football" = "Amerikkalainen jalkapallo"; diff --git a/iphone/Maps/LocalizedStrings/fr.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/fr.lproj/Localizable.strings index f461784a65..a9ac7d964b 100644 --- a/iphone/Maps/LocalizedStrings/fr.lproj/Localizable.strings +++ b/iphone/Maps/LocalizedStrings/fr.lproj/Localizable.strings @@ -2764,8 +2764,6 @@ "type.shop.cosmetics" = "Produits de beauté"; -"type.shop.deli" = "Épicerie fine"; - "type.shop.department_store" = "Grand magasin"; "type.shop.doityourself" = "Magasin de bricolage"; @@ -2778,8 +2776,6 @@ "type.shop.fabric" = "Magasin de tissus"; -"type.shop.farm" = "Magasin d'alimentation à la ferme"; - "type.shop.florist" = "Fleuriste"; "type.shop.funeral_directors" = "Pompes funèbres"; @@ -2792,22 +2788,14 @@ "type.shop.greengrocer" = "Primeur"; -"type.shop.grocery" = "Épicerie"; - "type.shop.hairdresser" = "Coiffeur"; "type.shop.hardware" = "Quincaillerie"; -"type.shop.health_food" = "Magasin d'alimentation diététique"; - -"type.shop.houseware" = "Magasin d'articles ménagers"; - "type.shop.jewelry" = "Bijouterie"; "type.shop.kiosk" = "Kiosque"; -"type.shop.kitchen" = "Magasin de cuisine"; - "type.shop.laundry" = "Laverie"; "type.shop.mall" = "Centre commercial"; @@ -2830,8 +2818,6 @@ "type.shop.outdoor" = "Matériel de loisirs de plein air"; -"type.shop.pastry" = "Pâtisserie"; - "type.shop.pawnbroker" = "Prêteur sur gages"; "type.shop.pet" = "Animalerie"; @@ -2840,8 +2826,6 @@ "type.shop.seafood" = "Poissonnier"; -"type.shop.second_hand" = "Boutique d'objets d'occasion"; - "type.shop.shoes" = "Magasin de chaussures"; "type.shop.sports" = "Articles de sport"; @@ -2870,52 +2854,6 @@ "type.shop.wine" = "Caviste"; -"type.shop.antiques" = "Antiquités"; - -"type.shop.art" = "Boutique d'art"; - -"type.shop.baby_goods" = "Magasin pour enfants"; - -"type.shop.bag" = "Magasin de sacs"; - -"type.shop.boutique" = "Boutique"; - -"type.shop.charity" = "Magasin de charité"; - -"type.shop.cheese" = "Fromagerie"; - -"type.shop.craft" = "L'artisanat"; - -"type.shop.dairy" = "Les produits laitiers"; - -"type.shop.electrical" = "Store électrique"; - -"type.shop.fishing" = "Magasin de pêche"; - -"type.shop.interior_decoration" = "Décorations intérieures"; - -"type.shop.lottery" = "Tickets de loterie"; - -"type.shop.medical_supply" = "Materiel médical"; - -"type.shop.nutrition_supplements" = "Suppléments nutritionnels"; - -"type.shop.paint" = "Des peintures"; - -"type.shop.perfumery" = "Parfumerie"; - -"type.shop.sewing" = "Matériel de couture"; - -"type.shop.storage_rental" = "Location de stockage"; - -"type.shop.tobacco" = "Le tabac"; - -"type.shop.trade" = "Fournitures de métiers"; - -"type.shop.watches" = "Montres"; - -"type.shop.wholesale" = "Magasin de gros"; - "type.sport" = "Sport"; "type.sport.american_football" = "Football américain"; diff --git a/iphone/Maps/LocalizedStrings/he.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/he.lproj/Localizable.strings index 2f6bf35bc9..8beb264e3b 100644 --- a/iphone/Maps/LocalizedStrings/he.lproj/Localizable.strings +++ b/iphone/Maps/LocalizedStrings/he.lproj/Localizable.strings @@ -2764,8 +2764,6 @@ "type.shop.cosmetics" = "Cosmetics"; -"type.shop.deli" = "תוינדעמ תונח"; - "type.shop.department_store" = "Department Store"; "type.shop.doityourself" = "Hardware Store"; @@ -2778,8 +2776,6 @@ "type.shop.fabric" = "Shop"; -"type.shop.farm" = "הווחל ןוזמ תונח"; - "type.shop.florist" = "Florist’s"; "type.shop.funeral_directors" = "Funeral Directors"; @@ -2792,22 +2788,14 @@ "type.shop.greengrocer" = "Greengrocer's"; -"type.shop.grocery" = "תלֶוֹכּמַ"; - "type.shop.hairdresser" = "Hairdresser"; -"type.shop.hardware" = "ןיינב ירמוחל תונח"; - -"type.shop.health_food" = "תואירב ןוזמ תונח"; - -"type.shop.houseware" = "תיב ילכל תונח"; +"type.shop.hardware" = "Hardware Store"; "type.shop.jewelry" = "Jewelry"; "type.shop.kiosk" = "Kiosk"; -"type.shop.kitchen" = "םיחבטמ תונח"; - "type.shop.laundry" = "Laundry"; "type.shop.mall" = "Mall"; @@ -2830,8 +2818,6 @@ "type.shop.outdoor" = "Outdoor Equipment"; -"type.shop.pastry" = "הפאמ"; - "type.shop.pawnbroker" = "Pawnbroker"; "type.shop.pet" = "Petshop"; @@ -2840,8 +2826,6 @@ "type.shop.seafood" = "Seafood Shop"; -"type.shop.second_hand" = "היינש די תונח"; - "type.shop.shoes" = "Shoe Store"; "type.shop.sports" = "Sports Goods"; @@ -2870,52 +2854,6 @@ "type.shop.wine" = "Wine Shop"; -"type.shop.antiques" = "תוֹקיתִעַ"; - -"type.shop.art" = "תויונמוא תונח"; - -"type.shop.baby_goods" = "םידליל תונח"; - -"type.shop.bag" = "םיקית תונח"; - -"type.shop.boutique" = "קיטוב"; - -"type.shop.charity" = "הקדצ תונח"; - -"type.shop.cheese" = "תוניבג תונח"; - -"type.shop.craft" = "הריציו תונמוא"; - -"type.shop.dairy" = "בלח ירצומ"; - -"type.shop.electrical" = "למשח תונח"; - -"type.shop.fishing" = "גייד תונח"; - -"type.shop.interior_decoration" = "םינפ יטושיק"; - -"type.shop.lottery" = "הלרגה יסיטרכ"; - -"type.shop.medical_supply" = "יאופר דויצ"; - -"type.shop.nutrition_supplements" = "הנוזת יפסות"; - -"type.shop.paint" = "םיעבצ"; - -"type.shop.perfumery" = "תמַשְׂבָּ"; - -"type.shop.sewing" = "הריפת דויצ"; - -"type.shop.storage_rental" = "ןוסחא תרכשה"; - -"type.shop.tobacco" = "קבָּטַ"; - -"type.shop.trade" = "הקפסאב רחוס"; - -"type.shop.watches" = "םינועש"; - -"type.shop.wholesale" = "תיאנוטיס תונח"; - "type.sport" = "ספורט"; "type.sport.american_football" = "כדורגל אמריקאי"; diff --git a/iphone/Maps/LocalizedStrings/hu.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/hu.lproj/Localizable.strings index 57adf237d8..9f58d4d6e9 100644 --- a/iphone/Maps/LocalizedStrings/hu.lproj/Localizable.strings +++ b/iphone/Maps/LocalizedStrings/hu.lproj/Localizable.strings @@ -2764,8 +2764,6 @@ "type.shop.cosmetics" = "Kozmetikum"; -"type.shop.deli" = "Csemegebolt"; - "type.shop.department_store" = "Áruház"; "type.shop.doityourself" = "Vaskereskedés"; @@ -2778,8 +2776,6 @@ "type.shop.fabric" = "Bolt"; -"type.shop.farm" = "Farm Food Shop"; - "type.shop.florist" = "Virágos"; "type.shop.funeral_directors" = "Temetkezési vállalkozó"; @@ -2792,22 +2788,14 @@ "type.shop.greengrocer" = "Zöldséges"; -"type.shop.grocery" = "Élelmiszerbolt"; - "type.shop.hairdresser" = "Fodrász"; -"type.shop.hardware" = "Hardver üzlet"; - -"type.shop.health_food" = "Egészségügyi élelmiszerbolt"; - -"type.shop.houseware" = "Háztartási bolt"; +"type.shop.hardware" = "Vaskereskedés"; "type.shop.jewelry" = "Ékszer"; "type.shop.kiosk" = "Trafik"; -"type.shop.kitchen" = "Konyhabolt"; - "type.shop.laundry" = "Mosoda"; "type.shop.mall" = "A pláza"; @@ -2830,8 +2818,6 @@ "type.shop.outdoor" = "Kültéri felszerelés"; -"type.shop.pastry" = "Cukrászsütemény"; - "type.shop.pawnbroker" = "Zálogház"; "type.shop.pet" = "Házikedvenc-üzlet"; @@ -2840,8 +2826,6 @@ "type.shop.seafood" = "Halüzlet"; -"type.shop.second_hand" = "Second Hand Store"; - "type.shop.shoes" = "Cipőbolt"; "type.shop.sports" = "Sporteszközök"; @@ -2870,52 +2854,6 @@ "type.shop.wine" = "Szeszesital-üzlet"; -"type.shop.antiques" = "Régiségek"; - -"type.shop.art" = "Művészeti Bolt"; - -"type.shop.baby_goods" = "Gyermekbolt"; - -"type.shop.bag" = "Táskák bolt"; - -"type.shop.boutique" = "Butik"; - -"type.shop.charity" = "Jótékonysági Bolt"; - -"type.shop.cheese" = "Sajtbolt"; - -"type.shop.craft" = "Művészetek és kézművesség"; - -"type.shop.dairy" = "Tejtermékek"; - -"type.shop.electrical" = "Elektronikai üzlet"; - -"type.shop.fishing" = "Horgászbolt"; - -"type.shop.interior_decoration" = "Belső dekorációk"; - -"type.shop.lottery" = "Sorsjegyek"; - -"type.shop.medical_supply" = "Orvosi eszközök"; - -"type.shop.nutrition_supplements" = "Táplálékkiegészítők"; - -"type.shop.paint" = "Festékek"; - -"type.shop.perfumery" = "Illatszerek"; - -"type.shop.sewing" = "Varrás kellékek"; - -"type.shop.storage_rental" = "Tárhely bérlés"; - -"type.shop.tobacco" = "Dohány"; - -"type.shop.trade" = "Kellékekkel kereskedik"; - -"type.shop.watches" = "Órák"; - -"type.shop.wholesale" = "Nagykereskedelmi üzlet"; - "type.sport" = "Sport"; "type.sport.american_football" = "Amerikai foci"; diff --git a/iphone/Maps/LocalizedStrings/id.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/id.lproj/Localizable.strings index 1c3c925e24..4dadc20235 100644 --- a/iphone/Maps/LocalizedStrings/id.lproj/Localizable.strings +++ b/iphone/Maps/LocalizedStrings/id.lproj/Localizable.strings @@ -2764,8 +2764,6 @@ "type.shop.cosmetics" = "Kosmetik"; -"type.shop.deli" = "Toko Kue"; - "type.shop.department_store" = "Toko serba ada"; "type.shop.doityourself" = "Toko perangkat keras"; @@ -2778,8 +2776,6 @@ "type.shop.fabric" = "Toko"; -"type.shop.farm" = "Toko Makanan Pertanian"; - "type.shop.florist" = "Tukang bunga"; "type.shop.funeral_directors" = "Direktur Pemakaman"; @@ -2792,22 +2788,14 @@ "type.shop.greengrocer" = "Penjual sayuran"; -"type.shop.grocery" = "Kebutuhan sehari-hari"; - "type.shop.hairdresser" = "Penata rambut"; "type.shop.hardware" = "Toko perangkat keras"; -"type.shop.health_food" = "Toko Makanan Kesehatan"; - -"type.shop.houseware" = "Toko Peralatan Rumah Tangga"; - "type.shop.jewelry" = "Perhiasan"; "type.shop.kiosk" = "Toko"; -"type.shop.kitchen" = "Toko Dapur"; - "type.shop.laundry" = "Londri"; "type.shop.mall" = "Mall"; @@ -2830,8 +2818,6 @@ "type.shop.outdoor" = "Peralatan Outdoor"; -"type.shop.pastry" = "Kue-kue"; - "type.shop.pawnbroker" = "Rumah Gadai"; "type.shop.pet" = "Toko hewan"; @@ -2840,8 +2826,6 @@ "type.shop.seafood" = "Penjual Ikan"; -"type.shop.second_hand" = "Toko Barang bekas"; - "type.shop.shoes" = "Toko sepatu"; "type.shop.sports" = "Barang olahraga"; @@ -2870,52 +2854,6 @@ "type.shop.wine" = "Toko anggur"; -"type.shop.antiques" = "Barang antik"; - -"type.shop.art" = "Toko Seni"; - -"type.shop.baby_goods" = "Toko anak-anak"; - -"type.shop.bag" = "Toko Tas"; - -"type.shop.boutique" = "Butik"; - -"type.shop.charity" = "Toko Amal"; - -"type.shop.cheese" = "Toko Keju"; - -"type.shop.craft" = "Seni dan kerajinan"; - -"type.shop.dairy" = "Produk susu"; - -"type.shop.electrical" = "Toko elektronik"; - -"type.shop.fishing" = "Toko Memancing"; - -"type.shop.interior_decoration" = "Dekorasi Interior"; - -"type.shop.lottery" = "Tiket Lotere"; - -"type.shop.medical_supply" = "Suplai medis"; - -"type.shop.nutrition_supplements" = "Suplemen Nutrisi"; - -"type.shop.paint" = "Cat"; - -"type.shop.perfumery" = "Wewangian"; - -"type.shop.sewing" = "Perlengkapan Jahit"; - -"type.shop.storage_rental" = "Sewa Penyimpanan"; - -"type.shop.tobacco" = "Tembakau"; - -"type.shop.trade" = "Perlengkapan Perdagangan"; - -"type.shop.watches" = "Jam tangan"; - -"type.shop.wholesale" = "Toko Grosir"; - "type.sport" = "Olahraga"; "type.sport.american_football" = "Sepak Bola Amerika"; diff --git a/iphone/Maps/LocalizedStrings/it.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/it.lproj/Localizable.strings index 74afa597de..3d270fa348 100644 --- a/iphone/Maps/LocalizedStrings/it.lproj/Localizable.strings +++ b/iphone/Maps/LocalizedStrings/it.lproj/Localizable.strings @@ -2764,8 +2764,6 @@ "type.shop.cosmetics" = "Cosmetici"; -"type.shop.deli" = "Negozio di specialità gastronomiche"; - "type.shop.department_store" = "Grandi magazzini"; "type.shop.doityourself" = "Ferramenta"; @@ -2778,8 +2776,6 @@ "type.shop.fabric" = "Negozio"; -"type.shop.farm" = "Negozio di prodotti alimentari della fattoria"; - "type.shop.florist" = "Fiorista"; "type.shop.funeral_directors" = "Pompe funebri"; @@ -2792,22 +2788,14 @@ "type.shop.greengrocer" = "Fruttivendolo"; -"type.shop.grocery" = "Drogheria"; - "type.shop.hairdresser" = "Parrucchiera"; -"type.shop.hardware" = "Negozio hardware"; - -"type.shop.health_food" = "Negozio di alimenti naturali"; - -"type.shop.houseware" = "Negozio di casalinghi"; +"type.shop.hardware" = "Ferramenta"; "type.shop.jewelry" = "Gioielleria"; "type.shop.kiosk" = "Chiosco"; -"type.shop.kitchen" = "Negozio di cucina"; - "type.shop.laundry" = "Lavanderia"; "type.shop.mall" = "Il centro commerciale"; @@ -2830,8 +2818,6 @@ "type.shop.outdoor" = "Attrezzatura sportiva"; -"type.shop.pastry" = "Pasticcino"; - "type.shop.pawnbroker" = "Pegni"; "type.shop.pet" = "Negozio di animali"; @@ -2840,8 +2826,6 @@ "type.shop.seafood" = "Pescivendolo"; -"type.shop.second_hand" = "Negozio di articoli usati"; - "type.shop.shoes" = "Negozio di scarpe"; "type.shop.sports" = "Negozio sportivo"; @@ -2870,52 +2854,6 @@ "type.shop.wine" = "Negozio di alcolici"; -"type.shop.antiques" = "Oggetti d'antiquariato"; - -"type.shop.art" = "Negozio d'arte"; - -"type.shop.baby_goods" = "Negozio per bambini"; - -"type.shop.bag" = "Negozio di borse"; - -"type.shop.boutique" = "Boutique"; - -"type.shop.charity" = "Negozio di beneficenza"; - -"type.shop.cheese" = "Negozio di formaggi"; - -"type.shop.craft" = "Arti e mestieri"; - -"type.shop.dairy" = "Latticini"; - -"type.shop.electrical" = "Negozio di articoli elettrici"; - -"type.shop.fishing" = "Negozio di pesca"; - -"type.shop.interior_decoration" = "Decorazioni per interni"; - -"type.shop.lottery" = "Biglietti della lotteria"; - -"type.shop.medical_supply" = "Forniture mediche"; - -"type.shop.nutrition_supplements" = "Integratori Alimentari"; - -"type.shop.paint" = "Vernici"; - -"type.shop.perfumery" = "Profumeria"; - -"type.shop.sewing" = "Forniture per il cucito"; - -"type.shop.storage_rental" = "Noleggio deposito"; - -"type.shop.tobacco" = "Tabacco"; - -"type.shop.trade" = "Forniture commerciali"; - -"type.shop.watches" = "Orologi"; - -"type.shop.wholesale" = "Negozio all'ingrosso"; - "type.sport" = "Sport"; "type.sport.american_football" = "Football americano"; diff --git a/iphone/Maps/LocalizedStrings/ja.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/ja.lproj/Localizable.strings index 68dc224305..00f88a10cc 100644 --- a/iphone/Maps/LocalizedStrings/ja.lproj/Localizable.strings +++ b/iphone/Maps/LocalizedStrings/ja.lproj/Localizable.strings @@ -2764,8 +2764,6 @@ "type.shop.cosmetics" = "化粧品"; -"type.shop.deli" = "デリカテッセンショップ"; - "type.shop.department_store" = "デパート"; "type.shop.doityourself" = "工具店"; @@ -2778,8 +2776,6 @@ "type.shop.fabric" = "生地屋"; -"type.shop.farm" = "ファームフードショップ"; - "type.shop.florist" = "フローリスト/花屋"; "type.shop.funeral_directors" = "葬儀屋"; @@ -2792,22 +2788,14 @@ "type.shop.greengrocer" = "八百屋"; -"type.shop.grocery" = "買い物"; - "type.shop.hairdresser" = "美容院/理容店"; -"type.shop.hardware" = "ホームセンター"; - -"type.shop.health_food" = "健康食品店"; - -"type.shop.houseware" = "家庭用品店"; +"type.shop.hardware" = "工具店"; "type.shop.jewelry" = "宝石店"; "type.shop.kiosk" = "キオスク"; -"type.shop.kitchen" = "キッチンストア"; - "type.shop.laundry" = "ランドリー"; "type.shop.mall" = "モール"; @@ -2830,8 +2818,6 @@ "type.shop.outdoor" = "アウトドア用品店"; -"type.shop.pastry" = "ペストリー"; - "type.shop.pawnbroker" = "質屋"; "type.shop.pet" = "ペットショップ"; @@ -2840,8 +2826,6 @@ "type.shop.seafood" = "魚屋"; -"type.shop.second_hand" = "古物商"; - "type.shop.shoes" = "靴屋"; "type.shop.sports" = "スポーツ用品店"; @@ -2870,52 +2854,6 @@ "type.shop.wine" = "ワイン店"; -"type.shop.antiques" = "骨董品"; - -"type.shop.art" = "アートショップ"; - -"type.shop.baby_goods" = "キッズストア"; - -"type.shop.bag" = "バッグストア"; - -"type.shop.boutique" = "ブティック"; - -"type.shop.charity" = "チャリティーショップ"; - -"type.shop.cheese" = "チーズ店"; - -"type.shop.craft" = "美術工芸"; - -"type.shop.dairy" = "乳製品"; - -"type.shop.electrical" = "電気店"; - -"type.shop.fishing" = "フィッシングストア"; - -"type.shop.interior_decoration" = "室内装飾"; - -"type.shop.lottery" = "宝くじ"; - -"type.shop.medical_supply" = "医療用品"; - -"type.shop.nutrition_supplements" = "栄養補助食品"; - -"type.shop.paint" = "塗料"; - -"type.shop.perfumery" = "香水"; - -"type.shop.sewing" = "ミシン用品"; - -"type.shop.storage_rental" = "ストレージレンタル"; - -"type.shop.tobacco" = "タバコ"; - -"type.shop.trade" = "貿易用品"; - -"type.shop.watches" = "時計"; - -"type.shop.wholesale" = "問屋"; - "type.sport" = "スポーツ"; "type.sport.american_football" = "アメリカンフットボール"; diff --git a/iphone/Maps/LocalizedStrings/ko.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/ko.lproj/Localizable.strings index c55823fd63..6a26491666 100644 --- a/iphone/Maps/LocalizedStrings/ko.lproj/Localizable.strings +++ b/iphone/Maps/LocalizedStrings/ko.lproj/Localizable.strings @@ -2764,8 +2764,6 @@ "type.shop.cosmetics" = "화장품"; -"type.shop.deli" = "델리카트슨 숍"; - "type.shop.department_store" = "백화점"; "type.shop.doityourself" = "철물점"; @@ -2778,8 +2776,6 @@ "type.shop.fabric" = "가게"; -"type.shop.farm" = "\"농장 식품 가게\""; - "type.shop.florist" = "꽃가게"; "type.shop.funeral_directors" = "장의사"; @@ -2792,22 +2788,14 @@ "type.shop.greengrocer" = "청과상"; -"type.shop.grocery" = "\"식료품점\""; - "type.shop.hairdresser" = "이발사"; "type.shop.hardware" = "철물점"; -"type.shop.health_food" = "\"건강식품 가게\""; - -"type.shop.houseware" = "\"가정용품 가게\""; - "type.shop.jewelry" = "보석류"; "type.shop.kiosk" = "정자"; -"type.shop.kitchen" = "\"주방용품점\""; - "type.shop.laundry" = "세탁소"; "type.shop.mall" = "몰"; @@ -2830,8 +2818,6 @@ "type.shop.outdoor" = "아웃도어 장비"; -"type.shop.pastry" = "패스트리"; - "type.shop.pawnbroker" = "전당포"; "type.shop.pet" = "펫샵"; @@ -2840,8 +2826,6 @@ "type.shop.seafood" = "생선가게"; -"type.shop.second_hand" = "중고 판매점"; - "type.shop.shoes" = "신발 가게"; "type.shop.sports" = "스포츠 용품"; @@ -2870,52 +2854,6 @@ "type.shop.wine" = "와인 샵"; -"type.shop.antiques" = "고물"; - -"type.shop.art" = "아트샵"; - -"type.shop.baby_goods" = "어린이 가게"; - -"type.shop.bag" = "가방 판매점"; - -"type.shop.boutique" = "부티크"; - -"type.shop.charity" = "자선 상점"; - -"type.shop.cheese" = "치즈 가게"; - -"type.shop.craft" = "예술과 공예"; - -"type.shop.dairy" = "\"유제품\""; - -"type.shop.electrical" = "\"전기용품점\""; - -"type.shop.fishing" = "낚시점"; - -"type.shop.interior_decoration" = "실내 장식"; - -"type.shop.lottery" = "복권"; - -"type.shop.medical_supply" = "\"의료용품\""; - -"type.shop.nutrition_supplements" = "영양 보조제"; - -"type.shop.paint" = "그림 물감"; - -"type.shop.perfumery" = "\"향료 제조업\""; - -"type.shop.sewing" = "\"재봉용품\""; - -"type.shop.storage_rental" = "스토리지 렌탈"; - -"type.shop.tobacco" = "담배"; - -"type.shop.trade" = "\"거래 용품\""; - -"type.shop.watches" = "시계"; - -"type.shop.wholesale" = "도매점"; - "type.sport" = "스포츠"; "type.sport.american_football" = "미식 축구"; diff --git a/iphone/Maps/LocalizedStrings/mr.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/mr.lproj/Localizable.strings index 8a4086fe1d..4bbce61372 100644 --- a/iphone/Maps/LocalizedStrings/mr.lproj/Localizable.strings +++ b/iphone/Maps/LocalizedStrings/mr.lproj/Localizable.strings @@ -2764,8 +2764,6 @@ "type.shop.cosmetics" = "सौंदर्य(कॉस्मेटिक)"; -"type.shop.deli" = "Delicatessen Shop"; - "type.shop.department_store" = "विभागीय भांडार"; "type.shop.doityourself" = "हार्डवेअर दुकान"; @@ -2778,8 +2776,6 @@ "type.shop.fabric" = "दुकान"; -"type.shop.farm" = "Farm Food Shop"; - "type.shop.florist" = "फुलवाला"; "type.shop.funeral_directors" = "अंत्यसंस्कार संचालक"; @@ -2792,22 +2788,14 @@ "type.shop.greengrocer" = "भाजीवाला"; -"type.shop.grocery" = "Grocery"; - "type.shop.hairdresser" = "न्हावी"; "type.shop.hardware" = "हार्डवेअर दुकान"; -"type.shop.health_food" = "Health Food Shop"; - -"type.shop.houseware" = "हार्डवेअर दुकान"; - "type.shop.jewelry" = "दागिने"; "type.shop.kiosk" = "टपरी"; -"type.shop.kitchen" = "Kitchen Store"; - "type.shop.laundry" = "धुलाईघर"; "type.shop.mall" = "मॉल"; @@ -2830,8 +2818,6 @@ "type.shop.outdoor" = "भटकंतीचे साहित्य"; -"type.shop.pastry" = "बेकरी"; - "type.shop.pawnbroker" = "Pawnbroker"; "type.shop.pet" = "पाळीव प्राण्यांचे दुकान"; @@ -2840,8 +2826,6 @@ "type.shop.seafood" = "मासळी उपहारगृह"; -"type.shop.second_hand" = "Second Hand"; - "type.shop.shoes" = "चपलाचे दूकान"; "type.shop.sports" = "क्रीडा साहित्य"; @@ -2870,52 +2854,6 @@ "type.shop.wine" = "वाईन विक्रेता"; -"type.shop.antiques" = "Antiques"; - -"type.shop.art" = "Arts Shop"; - -"type.shop.baby_goods" = "Baby Goods"; - -"type.shop.bag" = "Bags Store"; - -"type.shop.boutique" = "Boutique"; - -"type.shop.charity" = "Charity Shop"; - -"type.shop.cheese" = "Cheese Store"; - -"type.shop.craft" = "Arts and Crafts"; - -"type.shop.dairy" = "Dairy Products"; - -"type.shop.electrical" = "Electrical Store"; - -"type.shop.fishing" = "Fishing Store"; - -"type.shop.interior_decoration" = "Interior Decorations"; - -"type.shop.lottery" = "Lottery Tickets"; - -"type.shop.medical_supply" = "Medical Supplies"; - -"type.shop.nutrition_supplements" = "Nutrition Supplements"; - -"type.shop.paint" = "Paints"; - -"type.shop.perfumery" = "Perfumery"; - -"type.shop.sewing" = "Sewing Supplies"; - -"type.shop.storage_rental" = "Storage Rental"; - -"type.shop.tobacco" = "Tobacco"; - -"type.shop.trade" = "Trades Supplies"; - -"type.shop.watches" = "Watches"; - -"type.shop.wholesale" = "Wholesale Store"; - "type.sport" = "क्रीडा"; "type.sport.american_football" = "अमेरिकन फुटबॉल"; diff --git a/iphone/Maps/LocalizedStrings/nb.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/nb.lproj/Localizable.strings index 1afb0fdd54..ebe970fcf0 100644 --- a/iphone/Maps/LocalizedStrings/nb.lproj/Localizable.strings +++ b/iphone/Maps/LocalizedStrings/nb.lproj/Localizable.strings @@ -2764,8 +2764,6 @@ "type.shop.cosmetics" = "Kosmetikk"; -"type.shop.deli" = "Delikatessebutikk"; - "type.shop.department_store" = "Varehus"; "type.shop.doityourself" = "Jernvareforretning"; @@ -2778,8 +2776,6 @@ "type.shop.fabric" = "Butikk"; -"type.shop.farm" = "Gårdsmatbutikk"; - "type.shop.florist" = "Blomsterhandler"; "type.shop.funeral_directors" = "Begravelsebyrå"; @@ -2792,22 +2788,14 @@ "type.shop.greengrocer" = "Frukt- og grønnsakshandler"; -"type.shop.grocery" = "Dagligvare"; - "type.shop.hairdresser" = "Frisør"; "type.shop.hardware" = "Jernvareforretning"; -"type.shop.health_food" = "Helsekostbutikk"; - -"type.shop.houseware" = "Husholdningsbutikk"; - "type.shop.jewelry" = "Gullsmed"; "type.shop.kiosk" = "Butikk"; -"type.shop.kitchen" = "Kjøkkenbutikk"; - "type.shop.laundry" = "Vaskeri"; "type.shop.mall" = "Kjøpesenteret"; @@ -2830,8 +2818,6 @@ "type.shop.outdoor" = "Fritidsutstyr"; -"type.shop.pastry" = "Kake"; - "type.shop.pawnbroker" = "Pantelåner"; "type.shop.pet" = "Dyrebutikk"; @@ -2840,8 +2826,6 @@ "type.shop.seafood" = "Fiskehandler"; -"type.shop.second_hand" = "Bruktbutikk"; - "type.shop.shoes" = "Skobutikk"; "type.shop.sports" = "Sportsutstyr"; @@ -2870,52 +2854,6 @@ "type.shop.wine" = "Alkoholutsalg"; -"type.shop.antiques" = "Antikviteter"; - -"type.shop.art" = "Kunstbutikk"; - -"type.shop.baby_goods" = "Barnebutikk"; - -"type.shop.bag" = "Veskerbutikk"; - -"type.shop.boutique" = "Boutique"; - -"type.shop.charity" = "Veldedighetsbutikk"; - -"type.shop.cheese" = "Ostebutikk"; - -"type.shop.craft" = "Kunst og Håndverk"; - -"type.shop.dairy" = "Meieriprodukter"; - -"type.shop.electrical" = "Elektronisk butikk"; - -"type.shop.fishing" = "Fiskebutikk"; - -"type.shop.interior_decoration" = "Interiørdekorasjoner"; - -"type.shop.lottery" = "Lotteribilletter"; - -"type.shop.medical_supply" = "Medisinsk utstyr"; - -"type.shop.nutrition_supplements" = "Kosttilskudd"; - -"type.shop.paint" = "Maling"; - -"type.shop.perfumery" = "Parfymeri"; - -"type.shop.sewing" = "Syutstyr"; - -"type.shop.storage_rental" = "Utleie av lager"; - -"type.shop.tobacco" = "Tobakk"; - -"type.shop.trade" = "Handler rekvisita"; - -"type.shop.watches" = "Klokker"; - -"type.shop.wholesale" = "Engrosbutikk"; - "type.sport" = "Sport"; "type.sport.american_football" = "Amerikansk fotball"; diff --git a/iphone/Maps/LocalizedStrings/nl.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/nl.lproj/Localizable.strings index 8321945c59..a87ae4cb7d 100644 --- a/iphone/Maps/LocalizedStrings/nl.lproj/Localizable.strings +++ b/iphone/Maps/LocalizedStrings/nl.lproj/Localizable.strings @@ -2764,8 +2764,6 @@ "type.shop.cosmetics" = "Schoonheidsmiddelen"; -"type.shop.deli" = "Delicatessenwinkel"; - "type.shop.department_store" = "Warenhuis"; "type.shop.doityourself" = "Ijzerhandel"; @@ -2778,8 +2776,6 @@ "type.shop.fabric" = "Winkel"; -"type.shop.farm" = "Boerderijwinkel"; - "type.shop.florist" = "Bloemist"; "type.shop.funeral_directors" = "Begrafenisondernemer"; @@ -2792,22 +2788,14 @@ "type.shop.greengrocer" = "Groentenwinkel"; -"type.shop.grocery" = "Boodschap"; - "type.shop.hairdresser" = "Kapper"; -"type.shop.hardware" = "Ijzerwaren"; - -"type.shop.health_food" = "Natuurvoedingswinkel"; - -"type.shop.houseware" = "Huishoudelijke winkel"; +"type.shop.hardware" = "Ijzerhandel"; "type.shop.jewelry" = "Juwelier"; "type.shop.kiosk" = "Kiosk"; -"type.shop.kitchen" = "Keukenwinkel"; - "type.shop.laundry" = "Wasserette"; "type.shop.mall" = "Het winkelcentrum"; @@ -2830,8 +2818,6 @@ "type.shop.outdoor" = "Outdooruitrusting"; -"type.shop.pastry" = "Gebakje"; - "type.shop.pawnbroker" = "Pandjesbaas"; "type.shop.pet" = "Dierenwinkel"; @@ -2840,8 +2826,6 @@ "type.shop.seafood" = "Visboer"; -"type.shop.second_hand" = "Tweedehandswinkel"; - "type.shop.shoes" = "Schoenenwinkel"; "type.shop.sports" = "Sportartikelen"; @@ -2870,52 +2854,6 @@ "type.shop.wine" = "Wijn"; -"type.shop.antiques" = "Antiek"; - -"type.shop.art" = "Kunstwinkel"; - -"type.shop.baby_goods" = "Kinderwinkel"; - -"type.shop.bag" = "Tassenwinkel"; - -"type.shop.boutique" = "Boetiek"; - -"type.shop.charity" = "Kringloopwinkel"; - -"type.shop.cheese" = "Kaaswinkel"; - -"type.shop.craft" = "Kunst en ambacht"; - -"type.shop.dairy" = "Zuivelproducten"; - -"type.shop.electrical" = "Witgoed winkel"; - -"type.shop.fishing" = "Viswinkel"; - -"type.shop.interior_decoration" = "Interieurdecoraties"; - -"type.shop.lottery" = "Loten"; - -"type.shop.medical_supply" = "Medische benodigdheden"; - -"type.shop.nutrition_supplements" = "Voedingssupplementen"; - -"type.shop.paint" = "Verven"; - -"type.shop.perfumery" = "Parfumerie"; - -"type.shop.sewing" = "Naaibenodigdheden"; - -"type.shop.storage_rental" = "Opslag verhuur"; - -"type.shop.tobacco" = "Tabak"; - -"type.shop.trade" = "Handelsbenodigdheden"; - -"type.shop.watches" = "Horloges"; - -"type.shop.wholesale" = "Groothandel winkel"; - "type.sport" = "Sport"; "type.sport.american_football" = "Amerikaans voetbal"; diff --git a/iphone/Maps/LocalizedStrings/pl.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/pl.lproj/Localizable.strings index 008e631643..d5642341f4 100644 --- a/iphone/Maps/LocalizedStrings/pl.lproj/Localizable.strings +++ b/iphone/Maps/LocalizedStrings/pl.lproj/Localizable.strings @@ -2764,8 +2764,6 @@ "type.shop.cosmetics" = "Kosmetyki"; -"type.shop.deli" = "Sklep delikatesowy"; - "type.shop.department_store" = "Dom towarowy"; "type.shop.doityourself" = "Sklep narzędziowy"; @@ -2778,8 +2776,6 @@ "type.shop.fabric" = "Sklep"; -"type.shop.farm" = "Sklep spożywczy dla gospodarstw rolnych"; - "type.shop.florist" = "Kwiaciarnia"; "type.shop.funeral_directors" = "Celebranci pogrzebowi"; @@ -2792,22 +2788,14 @@ "type.shop.greengrocer" = "Warzywniak"; -"type.shop.grocery" = "Sklep spożywczy"; - "type.shop.hairdresser" = "Fryzjer"; -"type.shop.hardware" = "Sklep z narzędziami"; - -"type.shop.health_food" = "Sklep ze zdrową żywnością"; - -"type.shop.houseware" = "Sklep AGD"; +"type.shop.hardware" = "Sklep narzędziowy"; "type.shop.jewelry" = "Jubiler"; "type.shop.kiosk" = "Kiosk"; -"type.shop.kitchen" = "Sklep kuchenny"; - "type.shop.laundry" = "Pralnia samoobsługowa"; "type.shop.mall" = "Centrum handlowe"; @@ -2830,8 +2818,6 @@ "type.shop.outdoor" = "Sprzęt turystyczny"; -"type.shop.pastry" = "Ciasto"; - "type.shop.pawnbroker" = "Lombard"; "type.shop.pet" = "Sklep zoologiczny"; @@ -2840,8 +2826,6 @@ "type.shop.seafood" = "Sklep rybny"; -"type.shop.second_hand" = "Sklep z używaną ręką"; - "type.shop.shoes" = "Sklep obuwniczy"; "type.shop.sports" = "Sklep sportowy"; @@ -2870,52 +2854,6 @@ "type.shop.wine" = "Sklep monopolowy"; -"type.shop.antiques" = "Antyki"; - -"type.shop.art" = "Sklep artystyczny"; - -"type.shop.baby_goods" = "Sklep dla dzieci"; - -"type.shop.bag" = "Sklep z torbami"; - -"type.shop.boutique" = "Butik"; - -"type.shop.charity" = "Sklep charytatywny"; - -"type.shop.cheese" = "Sklep z serami"; - -"type.shop.craft" = "Sztuka i rzemiosło"; - -"type.shop.dairy" = "Nabiał"; - -"type.shop.electrical" = "Sklep elektryczny"; - -"type.shop.fishing" = "Sklep wędkarski"; - -"type.shop.interior_decoration" = "Dekoracje wnętrz"; - -"type.shop.lottery" = "Bilety na loterię"; - -"type.shop.medical_supply" = "Produkty medyczne"; - -"type.shop.nutrition_supplements" = "Suplementy diety"; - -"type.shop.paint" = "Malatura"; - -"type.shop.perfumery" = "Perfumeria"; - -"type.shop.sewing" = "Przybory do szycia"; - -"type.shop.storage_rental" = "Wynajem magazynu"; - -"type.shop.tobacco" = "Tytoń"; - -"type.shop.trade" = "Zaopatrzenie handlowe"; - -"type.shop.watches" = "Zegarki"; - -"type.shop.wholesale" = "Hurtownia"; - "type.sport" = "Sport"; "type.sport.american_football" = "Futbol amerykański"; diff --git a/iphone/Maps/LocalizedStrings/pt-BR.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/pt-BR.lproj/Localizable.strings index 31d77b8732..24c0515825 100644 --- a/iphone/Maps/LocalizedStrings/pt-BR.lproj/Localizable.strings +++ b/iphone/Maps/LocalizedStrings/pt-BR.lproj/Localizable.strings @@ -2764,8 +2764,6 @@ "type.shop.cosmetics" = "Loja de cosméticos"; -"type.shop.deli" = "Loja Delicatessen"; - "type.shop.department_store" = "Loja de departamentos"; "type.shop.doityourself" = "Loja de ferramentas e materiais de bricolage"; @@ -2778,8 +2776,6 @@ "type.shop.fabric" = "Loja de aviamentos"; -"type.shop.farm" = "Loja de alimentos agrícolas"; - "type.shop.florist" = "Florista"; "type.shop.funeral_directors" = "Funerária"; @@ -2792,22 +2788,14 @@ "type.shop.greengrocer" = "Quitanda"; -"type.shop.grocery" = "Mercearia"; - "type.shop.hairdresser" = "Cabeleireiro(a)"; "type.shop.hardware" = "Loja de ferragens"; -"type.shop.health_food" = "Loja de alimentos saudáveis"; - -"type.shop.houseware" = "Loja de utilidades domésticas"; - "type.shop.jewelry" = "Joalheria"; "type.shop.kiosk" = "Quiosque"; -"type.shop.kitchen" = "Loja de cozinha"; - "type.shop.laundry" = "Lavanderia"; "type.shop.mall" = "Shopping center"; @@ -2830,8 +2818,6 @@ "type.shop.outdoor" = "Artigos de atividades ao ar livre"; -"type.shop.pastry" = "Pastelaria"; - "type.shop.pawnbroker" = "Casa de penhores"; "type.shop.pet" = "Loja de animais de estimação"; @@ -2840,8 +2826,6 @@ "type.shop.seafood" = "Peixaria"; -"type.shop.second_hand" = "Loja de segunda mão"; - "type.shop.shoes" = "Sapataria"; "type.shop.sports" = "Loga de artigos esportivos"; @@ -2870,52 +2854,6 @@ "type.shop.wine" = "Loja de vinhos"; -"type.shop.antiques" = "Antiguidades"; - -"type.shop.art" = "Loja de artes"; - -"type.shop.baby_goods" = "Loja infantil"; - -"type.shop.bag" = "Loja de bolsas"; - -"type.shop.boutique" = "Boutique"; - -"type.shop.charity" = "Loja de caridade"; - -"type.shop.cheese" = "Loja de queijos"; - -"type.shop.craft" = "Artes e Ofícios"; - -"type.shop.dairy" = "Lacticínios"; - -"type.shop.electrical" = "Loja de materiais elétricos"; - -"type.shop.fishing" = "Loja de pesca"; - -"type.shop.interior_decoration" = "Decorações de Interiores"; - -"type.shop.lottery" = "Bilhete de loteria"; - -"type.shop.medical_supply" = "Suprimentos médicos"; - -"type.shop.nutrition_supplements" = "Suplementos nutricionais"; - -"type.shop.paint" = "Tintas"; - -"type.shop.perfumery" = "Perfumaria"; - -"type.shop.sewing" = "Materiais de costura"; - -"type.shop.storage_rental" = "Aluguel de Armazenamento"; - -"type.shop.tobacco" = "Tabaco"; - -"type.shop.trade" = "Comércio de suprimentos"; - -"type.shop.watches" = "Relógios"; - -"type.shop.wholesale" = "Loja de atacado"; - "type.sport" = "Esporte"; "type.sport.american_football" = "Futebol americano"; diff --git a/iphone/Maps/LocalizedStrings/pt.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/pt.lproj/Localizable.strings index 4d02cf7af5..f402c9894b 100644 --- a/iphone/Maps/LocalizedStrings/pt.lproj/Localizable.strings +++ b/iphone/Maps/LocalizedStrings/pt.lproj/Localizable.strings @@ -2764,8 +2764,6 @@ "type.shop.cosmetics" = "Loja de cosméticos"; -"type.shop.deli" = "Loja Delicatessen"; - "type.shop.department_store" = "Grande armazém"; "type.shop.doityourself" = "Loja de ferramentas e materiais de bricolage"; @@ -2778,8 +2776,6 @@ "type.shop.fabric" = "Loja de tecidos"; -"type.shop.farm" = "Loja de comida agrícola"; - "type.shop.florist" = "Florista"; "type.shop.funeral_directors" = "Funerária"; @@ -2792,22 +2788,14 @@ "type.shop.greengrocer" = "Loja de frutas e verduras"; -"type.shop.grocery" = "Mercearia"; - "type.shop.hairdresser" = "Cabeleireiro(a)"; "type.shop.hardware" = "Loja de ferragens"; -"type.shop.health_food" = "Loja de alimentos saudáveis"; - -"type.shop.houseware" = "Loja de utilidades domésticas"; - "type.shop.jewelry" = "Joalharia"; "type.shop.kiosk" = "Quiosque"; -"type.shop.kitchen" = "Loja de cozinha"; - "type.shop.laundry" = "Lavandaria"; "type.shop.mall" = "Centro comercial"; @@ -2830,8 +2818,6 @@ "type.shop.outdoor" = "Artigos de atividades ao ar livre"; -"type.shop.pastry" = "Pastelaria"; - "type.shop.pawnbroker" = "Casa de penhores"; "type.shop.pet" = "Loja de animais de estimação"; @@ -2840,8 +2826,6 @@ "type.shop.seafood" = "Peixaria"; -"type.shop.second_hand" = "Loja de segunda mão"; - "type.shop.shoes" = "Sapataria"; "type.shop.sports" = "Loga de artigos desportivos"; @@ -2870,52 +2854,6 @@ "type.shop.wine" = "Loja de vinhos"; -"type.shop.antiques" = "Antiguidades"; - -"type.shop.art" = "Loja de artes"; - -"type.shop.baby_goods" = "Loja infantil"; - -"type.shop.bag" = "Loja de bolsas"; - -"type.shop.boutique" = "Boutique"; - -"type.shop.charity" = "Loja de caridade"; - -"type.shop.cheese" = "Loja de queijos"; - -"type.shop.craft" = "Artes e Ofícios"; - -"type.shop.dairy" = "Lacticínios"; - -"type.shop.electrical" = "Loja de materiais elétricos"; - -"type.shop.fishing" = "Loja de pesca"; - -"type.shop.interior_decoration" = "Decorações de Interiores"; - -"type.shop.lottery" = "Bilhete de loteria"; - -"type.shop.medical_supply" = "Suprimentos médicos"; - -"type.shop.nutrition_supplements" = "Suplementos nutricionais"; - -"type.shop.paint" = "Tintas"; - -"type.shop.perfumery" = "Perfumaria"; - -"type.shop.sewing" = "Materiais de costura"; - -"type.shop.storage_rental" = "Aluguel de Armazenamento"; - -"type.shop.tobacco" = "Tabaco"; - -"type.shop.trade" = "Comércio de suprimentos"; - -"type.shop.watches" = "Relógios"; - -"type.shop.wholesale" = "Loja de atacado"; - "type.sport" = "Desporto"; "type.sport.american_football" = "Futebol Americano"; diff --git a/iphone/Maps/LocalizedStrings/ro.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/ro.lproj/Localizable.strings index 12bb197bc3..95ba0b21a2 100644 --- a/iphone/Maps/LocalizedStrings/ro.lproj/Localizable.strings +++ b/iphone/Maps/LocalizedStrings/ro.lproj/Localizable.strings @@ -2764,8 +2764,6 @@ "type.shop.cosmetics" = "Cosmetică"; -"type.shop.deli" = "Magazin de delicatese"; - "type.shop.department_store" = "Magazin universal"; "type.shop.doityourself" = "Magazin de bricolaj"; @@ -2778,8 +2776,6 @@ "type.shop.fabric" = "Magazin"; -"type.shop.farm" = "Magazin alimentar la fermă"; - "type.shop.florist" = "Florărie"; "type.shop.funeral_directors" = "Pompe funebre"; @@ -2792,22 +2788,14 @@ "type.shop.greengrocer" = "Băcănie"; -"type.shop.grocery" = "Băcănie"; - "type.shop.hairdresser" = "Coafor"; -"type.shop.hardware" = "Magazin de hardware"; - -"type.shop.health_food" = "Magazin de alimente naturiste"; - -"type.shop.houseware" = "Magazin de articole de uz casnic"; +"type.shop.hardware" = "Magazin de bricolaj"; "type.shop.jewelry" = "Bijutier"; "type.shop.kiosk" = "Magazin"; -"type.shop.kitchen" = "Magazin de bucatarie"; - "type.shop.laundry" = "Spălătorie"; "type.shop.mall" = "Mall"; @@ -2830,8 +2818,6 @@ "type.shop.outdoor" = "Echipament de exterior"; -"type.shop.pastry" = "Patiserie"; - "type.shop.pawnbroker" = "Amanet"; "type.shop.pet" = "Pet shop"; @@ -2840,8 +2826,6 @@ "type.shop.seafood" = "Pescărie"; -"type.shop.second_hand" = "Magazin second-hand"; - "type.shop.shoes" = "Magazin de încălțăminte"; "type.shop.sports" = "Articole sportive"; @@ -2870,52 +2854,6 @@ "type.shop.wine" = "Vinărie"; -"type.shop.antiques" = "Antichități"; - -"type.shop.art" = "Magazin de arte"; - -"type.shop.baby_goods" = "Magazin pentru copii"; - -"type.shop.bag" = "Magazin de genti"; - -"type.shop.boutique" = "Butic"; - -"type.shop.charity" = "Magazin de caritate"; - -"type.shop.cheese" = "Magazin de branzeturi"; - -"type.shop.craft" = "Arte și Meserii"; - -"type.shop.dairy" = "Lactate"; - -"type.shop.electrical" = "Magazin de electronice"; - -"type.shop.fishing" = "Magazin de pescuit"; - -"type.shop.interior_decoration" = "Decoratiuni interioare"; - -"type.shop.lottery" = "Bilete la loterie"; - -"type.shop.medical_supply" = "Consumabile medicale"; - -"type.shop.nutrition_supplements" = "Suplimente nutritive"; - -"type.shop.paint" = "Vopsele"; - -"type.shop.perfumery" = "Parfumerie"; - -"type.shop.sewing" = "Rechizite de cusut"; - -"type.shop.storage_rental" = "Închiriere depozitare"; - -"type.shop.tobacco" = "Tutun"; - -"type.shop.trade" = "Comerțuri Rechizite"; - -"type.shop.watches" = "Priveste"; - -"type.shop.wholesale" = "Magazin cu ridicata"; - "type.sport" = "Sport"; "type.sport.american_football" = "Fotbal american"; diff --git a/iphone/Maps/LocalizedStrings/ru.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/ru.lproj/Localizable.strings index ab7854b8d4..3502202155 100644 --- a/iphone/Maps/LocalizedStrings/ru.lproj/Localizable.strings +++ b/iphone/Maps/LocalizedStrings/ru.lproj/Localizable.strings @@ -2764,8 +2764,6 @@ "type.shop.cosmetics" = "Косметика"; -"type.shop.deli" = "Магазин деликатесов"; - "type.shop.department_store" = "Универмаг"; "type.shop.doityourself" = "Хозяйственный"; @@ -2778,8 +2776,6 @@ "type.shop.fabric" = "Магазин"; -"type.shop.farm" = "Фермерский магазин"; - "type.shop.florist" = "Цветочный магазин"; "type.shop.funeral_directors" = "Ритуальные услуги"; @@ -2792,22 +2788,14 @@ "type.shop.greengrocer" = "Овощи и фрукты"; -"type.shop.grocery" = "Бакалея"; - "type.shop.hairdresser" = "Парикмахерская"; -"type.shop.hardware" = "Хозяйственный магазин"; - -"type.shop.health_food" = "Магазин здоровой еды"; - -"type.shop.houseware" = "Магазин посуды"; +"type.shop.hardware" = "Хозяйственный"; "type.shop.jewelry" = "Ювелирный магазин"; "type.shop.kiosk" = "Киоск"; -"type.shop.kitchen" = "Кухонный магазин"; - "type.shop.laundry" = "Прачечная"; "type.shop.mall" = "Торговый центр"; @@ -2830,8 +2818,6 @@ "type.shop.outdoor" = "Магазин снаряжения"; -"type.shop.pastry" = "Выпечка"; - "type.shop.pawnbroker" = "Ломбард"; "type.shop.pet" = "Зоотовары"; @@ -2840,8 +2826,6 @@ "type.shop.seafood" = "Рыбный магазин"; -"type.shop.second_hand" = "Секонд-хенд магазин"; - "type.shop.shoes" = "Магазин обуви"; "type.shop.sports" = "Магазин спорттоваров"; @@ -2870,52 +2854,6 @@ "type.shop.wine" = "Винный магазин"; -"type.shop.antiques" = "Антиквариат"; - -"type.shop.art" = "Художественный магазин"; - -"type.shop.baby_goods" = "Детский магазин"; - -"type.shop.bag" = "Магазин сумок"; - -"type.shop.boutique" = "Бутик"; - -"type.shop.charity" = "Благотворительный магазин"; - -"type.shop.cheese" = "Магазин сыра"; - -"type.shop.craft" = "Искусства и ремесла"; - -"type.shop.dairy" = "Молочные продукты"; - -"type.shop.electrical" = "Магазин электротоваров"; - -"type.shop.fishing" = "Рыболовный магазин"; - -"type.shop.interior_decoration" = "Украшения для интерьера"; - -"type.shop.lottery" = "Лотерейные билеты"; - -"type.shop.medical_supply" = "Медикаменты"; - -"type.shop.nutrition_supplements" = "Пищевые добавки"; - -"type.shop.paint" = "Краски"; - -"type.shop.perfumery" = "Парфюмерия"; - -"type.shop.sewing" = "Швейные принадлежности"; - -"type.shop.storage_rental" = "Аренда склада"; - -"type.shop.tobacco" = "Табак"; - -"type.shop.trade" = "Торговые поставки"; - -"type.shop.watches" = "Часы"; - -"type.shop.wholesale" = "Оптовый магазин"; - "type.sport" = "Спорт"; "type.sport.american_football" = "Американский футбол"; diff --git a/iphone/Maps/LocalizedStrings/sk.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/sk.lproj/Localizable.strings index 52bad20e8f..a9776bace9 100644 --- a/iphone/Maps/LocalizedStrings/sk.lproj/Localizable.strings +++ b/iphone/Maps/LocalizedStrings/sk.lproj/Localizable.strings @@ -2764,8 +2764,6 @@ "type.shop.cosmetics" = "Kozmetika"; -"type.shop.deli" = "Predajňa lahôdok"; - "type.shop.department_store" = "Obchodný dom"; "type.shop.doityourself" = "Železiarstvo"; @@ -2778,8 +2776,6 @@ "type.shop.fabric" = "Obchod"; -"type.shop.farm" = "Obchod s farmárskymi potravinami"; - "type.shop.florist" = "Kvety"; "type.shop.funeral_directors" = "Pohrebníctvo"; @@ -2792,22 +2788,14 @@ "type.shop.greengrocer" = "Zelovoc"; -"type.shop.grocery" = "Potraviny"; - "type.shop.hairdresser" = "Kaderníctvo"; "type.shop.hardware" = "Železiarstvo"; -"type.shop.health_food" = "Obchod so zdravou výživou"; - -"type.shop.houseware" = "Obchod s domácimi potrebami"; - "type.shop.jewelry" = "Klenotníctvo"; "type.shop.kiosk" = "Kiosk"; -"type.shop.kitchen" = "Kuchynský obchod"; - "type.shop.laundry" = "Práčovňa"; "type.shop.mall" = "The Mall"; @@ -2830,8 +2818,6 @@ "type.shop.outdoor" = "Outdoorové vybavenie"; -"type.shop.pastry" = "Pečivo"; - "type.shop.pawnbroker" = "Záložňa"; "type.shop.pet" = "Obchod zo zvieratami"; @@ -2840,8 +2826,6 @@ "type.shop.seafood" = "Obchodník s rybami"; -"type.shop.second_hand" = "Obchod z druhej ruky"; - "type.shop.shoes" = "Obuvníctvo"; "type.shop.sports" = "Športové potreby"; @@ -2870,52 +2854,6 @@ "type.shop.wine" = "Vinotéka"; -"type.shop.antiques" = "Starožitnosti"; - -"type.shop.art" = "Obchod s umením"; - -"type.shop.baby_goods" = "Obchod pre deti"; - -"type.shop.bag" = "Obchod s taškami"; - -"type.shop.boutique" = "Butik"; - -"type.shop.charity" = "Charitatívny obchod"; - -"type.shop.cheese" = "Predajňa syrov"; - -"type.shop.craft" = "Umenie a remeslá"; - -"type.shop.dairy" = "Mliečne výrobky"; - -"type.shop.electrical" = "Predajňa elektro"; - -"type.shop.fishing" = "Rybársky obchod"; - -"type.shop.interior_decoration" = "Interiérové dekorácie"; - -"type.shop.lottery" = "Lístky do lotérie"; - -"type.shop.medical_supply" = "Zdravotnícky materiál"; - -"type.shop.nutrition_supplements" = "Výživové doplnky"; - -"type.shop.paint" = "Farby"; - -"type.shop.perfumery" = "Parfuméria"; - -"type.shop.sewing" = "Šijacie potreby"; - -"type.shop.storage_rental" = "Prenájom skladu"; - -"type.shop.tobacco" = "Tabak"; - -"type.shop.trade" = "Živnostenské potreby"; - -"type.shop.watches" = "Hodinky"; - -"type.shop.wholesale" = "Veľkoobchod"; - "type.sport" = "Šport"; "type.sport.american_football" = "Americký futbal"; diff --git a/iphone/Maps/LocalizedStrings/sv.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/sv.lproj/Localizable.strings index 76432cb907..33dfa029f3 100644 --- a/iphone/Maps/LocalizedStrings/sv.lproj/Localizable.strings +++ b/iphone/Maps/LocalizedStrings/sv.lproj/Localizable.strings @@ -2764,8 +2764,6 @@ "type.shop.cosmetics" = "Kosmetika"; -"type.shop.deli" = "Delikatessbutik"; - "type.shop.department_store" = "Varuhus"; "type.shop.doityourself" = "Järnhandel"; @@ -2778,8 +2776,6 @@ "type.shop.fabric" = "Butik"; -"type.shop.farm" = "Gårdsmataffär"; - "type.shop.florist" = "Blomsteraffär"; "type.shop.funeral_directors" = "Begravningsentreprenörer"; @@ -2792,22 +2788,14 @@ "type.shop.greengrocer" = "Grönsakshandlare"; -"type.shop.grocery" = "Livsmedel"; - "type.shop.hairdresser" = "Frisör"; -"type.shop.hardware" = "Järnaffär"; - -"type.shop.health_food" = "Hälsokostbutik"; - -"type.shop.houseware" = "Husgerådsbutik"; +"type.shop.hardware" = "Järnhandel"; "type.shop.jewelry" = "Smycken"; "type.shop.kiosk" = "Kiosk"; -"type.shop.kitchen" = "Köksbutik"; - "type.shop.laundry" = "Tvättstuga"; "type.shop.mall" = "Galleria"; @@ -2830,8 +2818,6 @@ "type.shop.outdoor" = "Fritidsutrustning"; -"type.shop.pastry" = "Bakverk"; - "type.shop.pawnbroker" = "Pantbank"; "type.shop.pet" = "Djuraffär"; @@ -2840,8 +2826,6 @@ "type.shop.seafood" = "Fiskhandlare"; -"type.shop.second_hand" = "Andrahandsaffär"; - "type.shop.shoes" = "Skobutik"; "type.shop.sports" = "Sportaffär"; @@ -2870,52 +2854,6 @@ "type.shop.wine" = "Vinhandel"; -"type.shop.antiques" = "Antikviteter"; - -"type.shop.art" = "Konstaffär"; - -"type.shop.baby_goods" = "Barnbutik"; - -"type.shop.bag" = "Väskor butik"; - -"type.shop.boutique" = "Boutique"; - -"type.shop.charity" = "Välgörenhetsbutik"; - -"type.shop.cheese" = "Ostaffär"; - -"type.shop.craft" = "Konst och hantverk"; - -"type.shop.dairy" = "Mejeriprodukter"; - -"type.shop.electrical" = "Elektronik affär"; - -"type.shop.fishing" = "Fiskeaffär"; - -"type.shop.interior_decoration" = "Inredningsdekorationer"; - -"type.shop.lottery" = "Lotter"; - -"type.shop.medical_supply" = "Medicinska förnödenheter"; - -"type.shop.nutrition_supplements" = "Kosttillskott"; - -"type.shop.paint" = "Färger"; - -"type.shop.perfumery" = "Parfymer"; - -"type.shop.sewing" = "Sytillbehör"; - -"type.shop.storage_rental" = "Uthyrning av förråd"; - -"type.shop.tobacco" = "Tobak"; - -"type.shop.trade" = "Handlar förnödenheter"; - -"type.shop.watches" = "Klockor"; - -"type.shop.wholesale" = "Grossistbutik"; - "type.sport" = "Sport"; "type.sport.american_football" = "Amerikansk fotboll"; diff --git a/iphone/Maps/LocalizedStrings/sw.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/sw.lproj/Localizable.strings index 382f3be295..96d5afdb5b 100644 --- a/iphone/Maps/LocalizedStrings/sw.lproj/Localizable.strings +++ b/iphone/Maps/LocalizedStrings/sw.lproj/Localizable.strings @@ -2764,8 +2764,6 @@ "type.shop.cosmetics" = "Cosmetics"; -"type.shop.deli" = "Duka la Delicatessen"; - "type.shop.department_store" = "Department Store"; "type.shop.doityourself" = "Hardware Store"; @@ -2778,8 +2776,6 @@ "type.shop.fabric" = "Shop"; -"type.shop.farm" = "Duka la Chakula cha shambani"; - "type.shop.florist" = "Florist’s"; "type.shop.funeral_directors" = "Funeral Directors"; @@ -2792,22 +2788,14 @@ "type.shop.greengrocer" = "Greengrocer's"; -"type.shop.grocery" = "Chakula cha mboga"; - "type.shop.hairdresser" = "Hairdresser"; -"type.shop.hardware" = "Duka la vifaa"; - -"type.shop.health_food" = "Duka la Chakula cha Afya"; - -"type.shop.houseware" = "Duka la Vifaa vya Nyumbani"; +"type.shop.hardware" = "Hardware Store"; "type.shop.jewelry" = "Jewelry"; "type.shop.kiosk" = "Kiosk"; -"type.shop.kitchen" = "Duka la Jikoni"; - "type.shop.laundry" = "Laundry"; "type.shop.mall" = "Mall"; @@ -2830,8 +2818,6 @@ "type.shop.outdoor" = "Outdoor Equipment"; -"type.shop.pastry" = "Keki"; - "type.shop.pawnbroker" = "Pawnbroker"; "type.shop.pet" = "Petshop"; @@ -2840,8 +2826,6 @@ "type.shop.seafood" = "Seafood Shop"; -"type.shop.second_hand" = "Duka la Mitumba"; - "type.shop.shoes" = "Shoe Store"; "type.shop.sports" = "Sports Goods"; @@ -2870,52 +2854,6 @@ "type.shop.wine" = "Wine Shop"; -"type.shop.antiques" = "Mambo ya kale"; - -"type.shop.art" = "Duka la Sanaa"; - -"type.shop.baby_goods" = "Duka la watoto"; - -"type.shop.bag" = "Hifadhi ya Mifuko"; - -"type.shop.boutique" = "Boutique"; - -"type.shop.charity" = "Duka la msaada"; - -"type.shop.cheese" = "Duka la Jibini"; - -"type.shop.craft" = "Sanaa na Ufundi"; - -"type.shop.dairy" = "Bidhaa za Maziwa"; - -"type.shop.electrical" = "Duka la Umeme"; - -"type.shop.fishing" = "Duka la Uvuvi"; - -"type.shop.interior_decoration" = "Mapambo ya Ndani"; - -"type.shop.lottery" = "Tikiti za Bahati nasibu"; - -"type.shop.medical_supply" = "Vifaa vya Matibabu"; - -"type.shop.nutrition_supplements" = "Virutubisho vya Lishe"; - -"type.shop.paint" = "Rangi"; - -"type.shop.perfumery" = "Perfumery"; - -"type.shop.sewing" = "Vifaa vya kushona"; - -"type.shop.storage_rental" = "Kukodisha Hifadhi"; - -"type.shop.tobacco" = "Tumbaku"; - -"type.shop.trade" = "Ugavi wa Biashara"; - -"type.shop.watches" = "Saa"; - -"type.shop.wholesale" = "Duka la Jumla"; - "type.sport" = "Michezo"; "type.sport.american_football" = "Soka ya Marekani"; diff --git a/iphone/Maps/LocalizedStrings/th.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/th.lproj/Localizable.strings index a72d310def..d75cb72dd1 100644 --- a/iphone/Maps/LocalizedStrings/th.lproj/Localizable.strings +++ b/iphone/Maps/LocalizedStrings/th.lproj/Localizable.strings @@ -2764,8 +2764,6 @@ "type.shop.cosmetics" = "เครื่องสำอาง"; -"type.shop.deli" = "ร้านขายอาหารสำเร็จรูป"; - "type.shop.department_store" = "ห้างสรรพสินค้า"; "type.shop.doityourself" = "ร้านขายฮาร์ดแวร์"; @@ -2778,8 +2776,6 @@ "type.shop.fabric" = "ร้านค้า"; -"type.shop.farm" = "ฟาร์มฟู้ดช็อป"; - "type.shop.florist" = "ร้านดอกไม้"; "type.shop.funeral_directors" = "สัปเหร่อ"; @@ -2792,22 +2788,14 @@ "type.shop.greengrocer" = "ร้านขายผัด"; -"type.shop.grocery" = "ร้านขายของชำ"; - "type.shop.hairdresser" = "ช่างทำผม"; -"type.shop.hardware" = "ร้านฮาร์ดแวร์"; - -"type.shop.health_food" = "ร้านอาหารเพื่อสุขภาพ"; - -"type.shop.houseware" = "ร้านของใช้ในบ้าน"; +"type.shop.hardware" = "ร้านขายฮาร์ดแวร์"; "type.shop.jewelry" = "ร้านขายเครื่องประดับ"; "type.shop.kiosk" = "ร้าน"; -"type.shop.kitchen" = "ร้านครัว"; - "type.shop.laundry" = "ร้านซักรีด"; "type.shop.mall" = "เดอะมอลล์"; @@ -2830,8 +2818,6 @@ "type.shop.outdoor" = "อุปกรณ์กลางแจ้ง"; -"type.shop.pastry" = "ขนมอบ"; - "type.shop.pawnbroker" = "ผู้รับจำนำ"; "type.shop.pet" = "เพ็ทชอป"; @@ -2840,8 +2826,6 @@ "type.shop.seafood" = "ร้านขายปลา"; -"type.shop.second_hand" = "ร้านขายของมือสอง"; - "type.shop.shoes" = "ร้านขายรองเท้า"; "type.shop.sports" = "สินค้ากีฬา"; @@ -2870,52 +2854,6 @@ "type.shop.wine" = "ร้านขายไวน์"; -"type.shop.antiques" = "ของเก่า"; - -"type.shop.art" = "ร้านศิลปะ"; - -"type.shop.baby_goods" = "ร้านขายของสำหรับเด็ก"; - -"type.shop.bag" = "ร้านกระเป๋า"; - -"type.shop.boutique" = "บูติก"; - -"type.shop.charity" = "ร้านการกุศล"; - -"type.shop.cheese" = "ร้านชีส"; - -"type.shop.craft" = "ศิลปะและงานฝีมือ"; - -"type.shop.dairy" = "ผลิตภัณฑ์นม"; - -"type.shop.electrical" = "ร้านขายเครื่องใช้ไฟฟ้า"; - -"type.shop.fishing" = "ร้านตกปลา"; - -"type.shop.interior_decoration" = "ตกแต่งภายใน"; - -"type.shop.lottery" = "สลากกินแบ่ง"; - -"type.shop.medical_supply" = "เวชภัณฑ์"; - -"type.shop.nutrition_supplements" = "อาหารเสริม"; - -"type.shop.paint" = "สี"; - -"type.shop.perfumery" = "น้ำหอม"; - -"type.shop.sewing" = "อุปกรณ์เย็บผ้า"; - -"type.shop.storage_rental" = "ค่าเช่าห้องเก็บของ"; - -"type.shop.tobacco" = "ยาสูบ"; - -"type.shop.trade" = "อุปกรณ์การค้า"; - -"type.shop.watches" = "นาฬิกา"; - -"type.shop.wholesale" = "ร้านขายส่ง"; - "type.sport" = "กีฬา"; "type.sport.american_football" = "อเมริกันฟุตบอล"; diff --git a/iphone/Maps/LocalizedStrings/tr.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/tr.lproj/Localizable.strings index d3577f3824..b8cc052813 100644 --- a/iphone/Maps/LocalizedStrings/tr.lproj/Localizable.strings +++ b/iphone/Maps/LocalizedStrings/tr.lproj/Localizable.strings @@ -2764,8 +2764,6 @@ "type.shop.cosmetics" = "Bakım ürünleri"; -"type.shop.deli" = "Şarküteri Dükkanı"; - "type.shop.department_store" = "Büyük Mağaza"; "type.shop.doityourself" = "Hırdavatçı"; @@ -2778,8 +2776,6 @@ "type.shop.fabric" = "Mağaza"; -"type.shop.farm" = "Çiftlik Gıda Dükkanı"; - "type.shop.florist" = "Çiçekçi"; "type.shop.funeral_directors" = "Cenaze Levazımcısı"; @@ -2792,22 +2788,14 @@ "type.shop.greengrocer" = "Manav"; -"type.shop.grocery" = "Bakkal"; - "type.shop.hairdresser" = "Kuaför"; -"type.shop.hardware" = "Donanım mağazası"; - -"type.shop.health_food" = "Sağlık Gıda Mağazası"; - -"type.shop.houseware" = "Ev Eşyaları Dükkanı"; +"type.shop.hardware" = "Hırdavatçı"; "type.shop.jewelry" = "Kuyumcu"; "type.shop.kiosk" = "Büfe"; -"type.shop.kitchen" = "Mutfak Mağazası"; - "type.shop.laundry" = "Çamaşırhane"; "type.shop.mall" = "Alışveriş Merkezi"; @@ -2830,8 +2818,6 @@ "type.shop.outdoor" = "Dış Mekan Ekipmanları"; -"type.shop.pastry" = "Hamur işi"; - "type.shop.pawnbroker" = "Tefeci"; "type.shop.pet" = "Evcil Hayvan Mağazası"; @@ -2840,8 +2826,6 @@ "type.shop.seafood" = "Deniz Ürünleri Mağazası"; -"type.shop.second_hand" = "İkinci El Mağazası"; - "type.shop.shoes" = "Ayakkabı Mağazası"; "type.shop.sports" = "Spor Ürünleri"; @@ -2870,52 +2854,6 @@ "type.shop.wine" = "Şarap Mağazası"; -"type.shop.antiques" = "Antikalar"; - -"type.shop.art" = "Sanat Mağazası"; - -"type.shop.baby_goods" = "Çocuk mağazası"; - -"type.shop.bag" = "Çanta Mağazası"; - -"type.shop.boutique" = "Butik"; - -"type.shop.charity" = "Hayır Dükkanı"; - -"type.shop.cheese" = "Peynir Dükkanı"; - -"type.shop.craft" = "Sanat ve El işi"; - -"type.shop.dairy" = "Süt Ürünleri"; - -"type.shop.electrical" = "Elektirikli eşya dükkanı"; - -"type.shop.fishing" = "Balıkçı Dükkanı"; - -"type.shop.interior_decoration" = "İç Dekorasyon"; - -"type.shop.lottery" = "Piyango bileti"; - -"type.shop.medical_supply" = "Tıbbi malzemeler"; - -"type.shop.nutrition_supplements" = "Besin Takviyeleri"; - -"type.shop.paint" = "Boyalar"; - -"type.shop.perfumery" = "Parfümeri"; - -"type.shop.sewing" = "Dikiş malzemeleri"; - -"type.shop.storage_rental" = "Depolama Kiralama"; - -"type.shop.tobacco" = "Tütün"; - -"type.shop.trade" = "Esnaf Malzemeleri"; - -"type.shop.watches" = "Saatler"; - -"type.shop.wholesale" = "Toptan satış mağazası"; - "type.sport" = "Spor"; "type.sport.american_football" = "Amerikan Futbolu"; diff --git a/iphone/Maps/LocalizedStrings/uk.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/uk.lproj/Localizable.strings index 926d761986..f9c388bf3c 100644 --- a/iphone/Maps/LocalizedStrings/uk.lproj/Localizable.strings +++ b/iphone/Maps/LocalizedStrings/uk.lproj/Localizable.strings @@ -2764,8 +2764,6 @@ "type.shop.cosmetics" = "Косметика"; -"type.shop.deli" = "Делікатесний магазин"; - "type.shop.department_store" = "Універмаг"; "type.shop.doityourself" = "Господарськi товари"; @@ -2778,8 +2776,6 @@ "type.shop.fabric" = "Крамниця"; -"type.shop.farm" = "Магазин фермерських продуктів"; - "type.shop.florist" = "Магазин квітів"; "type.shop.funeral_directors" = "Ритуальні послуги"; @@ -2792,22 +2788,14 @@ "type.shop.greengrocer" = "Овочі та фрукти"; -"type.shop.grocery" = "Бакалія"; - "type.shop.hairdresser" = "Перукарня"; -"type.shop.hardware" = "Магазин побутової техніки"; - -"type.shop.health_food" = "Магазин здорового харчування"; - -"type.shop.houseware" = "Магазин посуду"; +"type.shop.hardware" = "Будматеріали"; "type.shop.jewelry" = "Ювелірний магазин"; "type.shop.kiosk" = "Кіоск"; -"type.shop.kitchen" = "Магазин кухні"; - "type.shop.laundry" = "Пральня"; "type.shop.mall" = "Торговий центр"; @@ -2830,8 +2818,6 @@ "type.shop.outdoor" = "Спорядження"; -"type.shop.pastry" = "Тістечка"; - "type.shop.pawnbroker" = "Ломбард"; "type.shop.pet" = "Зоотовари"; @@ -2840,8 +2826,6 @@ "type.shop.seafood" = "Рибна лавка"; -"type.shop.second_hand" = "Магазин секонд-хенду"; - "type.shop.shoes" = "Магазин взуття"; "type.shop.sports" = "Спортивні товари"; @@ -2870,52 +2854,6 @@ "type.shop.wine" = "Винна крамниця"; -"type.shop.antiques" = "Антикваріат"; - -"type.shop.art" = "Магазин мистецтв"; - -"type.shop.baby_goods" = "Дитячий магазин"; - -"type.shop.bag" = "Магазин сумок"; - -"type.shop.boutique" = "Бутік"; - -"type.shop.charity" = "Магазин благодійності"; - -"type.shop.cheese" = "Магазин сиру"; - -"type.shop.craft" = "Мистецтво і ремесла"; - -"type.shop.dairy" = "Молочні продукти"; - -"type.shop.electrical" = "Магазин електротехніки"; - -"type.shop.fishing" = "Рибальський магазин"; - -"type.shop.interior_decoration" = "Внутрішнє оздоблення"; - -"type.shop.lottery" = "Лотерейні квитки"; - -"type.shop.medical_supply" = "Медичні товари"; - -"type.shop.nutrition_supplements" = "Харчові добавки"; - -"type.shop.paint" = "Фарби"; - -"type.shop.perfumery" = "Парфумерія"; - -"type.shop.sewing" = "Швейні приладдя"; - -"type.shop.storage_rental" = "Оренда сховища"; - -"type.shop.tobacco" = "Тютюн"; - -"type.shop.trade" = "Торгівля припасами"; - -"type.shop.watches" = "Годинники"; - -"type.shop.wholesale" = "Оптовий магазин"; - "type.sport" = "Спорт"; "type.sport.american_football" = "Американський футбол"; diff --git a/iphone/Maps/LocalizedStrings/vi.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/vi.lproj/Localizable.strings index ce92d559b4..848e08903f 100644 --- a/iphone/Maps/LocalizedStrings/vi.lproj/Localizable.strings +++ b/iphone/Maps/LocalizedStrings/vi.lproj/Localizable.strings @@ -2764,8 +2764,6 @@ "type.shop.cosmetics" = "Mỹ phẩm"; -"type.shop.deli" = "Cửa hàng đồ ăn ngon"; - "type.shop.department_store" = "Cửa hàng bách hóa"; "type.shop.doityourself" = "Cửa hàng phần cứng"; @@ -2778,8 +2776,6 @@ "type.shop.fabric" = "Cửa hàng"; -"type.shop.farm" = "Cửa hàng thực phẩm nông trại"; - "type.shop.florist" = "Cửa hàng hoa"; "type.shop.funeral_directors" = "Tổ chức tang lễ"; @@ -2792,22 +2788,14 @@ "type.shop.greengrocer" = "Cửa hàng rau củ"; -"type.shop.grocery" = "Cửa hàng tạp hóa"; - "type.shop.hairdresser" = "Tiệm làm tóc"; "type.shop.hardware" = "Cửa hàng phần cứng"; -"type.shop.health_food" = "Cửa hàng thực phẩm sức khỏe"; - -"type.shop.houseware" = "Cửa hàng đồ gia dụng"; - "type.shop.jewelry" = "Đồ trang sức"; "type.shop.kiosk" = "Cửa hàng"; -"type.shop.kitchen" = "Cửa hàng nhà bếp"; - "type.shop.laundry" = "Giặt là"; "type.shop.mall" = "Khu mua sắm"; @@ -2830,8 +2818,6 @@ "type.shop.outdoor" = "Thiết bị Ngoài trời"; -"type.shop.pastry" = "Bánh ngọt"; - "type.shop.pawnbroker" = "Cầm đồ"; "type.shop.pet" = "Cửa Hàng Vật Nuôi"; @@ -2840,8 +2826,6 @@ "type.shop.seafood" = "Người bán cá"; -"type.shop.second_hand" = "Cửa hàng bán đồ đã qua sử dụng"; - "type.shop.shoes" = "Cửa hàng giày"; "type.shop.sports" = "Đồ dùng thể thao"; @@ -2870,52 +2854,6 @@ "type.shop.wine" = "Rượu"; -"type.shop.antiques" = "Đồ cổ"; - -"type.shop.art" = "Cửa hàng nghệ thuật"; - -"type.shop.baby_goods" = "Cửa hàng trẻ em"; - -"type.shop.bag" = "Cửa hàng túi xách"; - -"type.shop.boutique" = "Cửa hàng"; - -"type.shop.charity" = "Cửa hàng từ thiện"; - -"type.shop.cheese" = "Cửa hàng pho mát"; - -"type.shop.craft" = "Nghệ thuật và thủ công"; - -"type.shop.dairy" = "Sản phẩm từ sữa"; - -"type.shop.electrical" = "Cửa hàng điện tử"; - -"type.shop.fishing" = "Cửa hàng câu cá"; - -"type.shop.interior_decoration" = "Đồ trang trí nội thất"; - -"type.shop.lottery" = "Vé xổ số kiến thiết"; - -"type.shop.medical_supply" = "Vật tư y tế"; - -"type.shop.nutrition_supplements" = "Bổ sung dinh dưỡng"; - -"type.shop.paint" = "Sơn"; - -"type.shop.perfumery" = "Nước hoa"; - -"type.shop.sewing" = "Nguồn cung cấp may"; - -"type.shop.storage_rental" = "Cho thuê kho lưu trữ"; - -"type.shop.tobacco" = "Thuốc lá"; - -"type.shop.trade" = "Nguồn cung cấp Giao dịch"; - -"type.shop.watches" = "Xem"; - -"type.shop.wholesale" = "Cửa hàng bán buôn"; - "type.sport" = "Thể thao"; "type.sport.american_football" = "Bóng bầu dục Mỹ"; diff --git a/iphone/Maps/LocalizedStrings/zh-Hans.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/zh-Hans.lproj/Localizable.strings index 05d008aab6..52d3d00be7 100644 --- a/iphone/Maps/LocalizedStrings/zh-Hans.lproj/Localizable.strings +++ b/iphone/Maps/LocalizedStrings/zh-Hans.lproj/Localizable.strings @@ -2764,8 +2764,6 @@ "type.shop.cosmetics" = "化妝品店"; -"type.shop.deli" = "熟食店"; - "type.shop.department_store" = "百货商场"; "type.shop.doityourself" = "家居用品店"; @@ -2778,8 +2776,6 @@ "type.shop.fabric" = "商店"; -"type.shop.farm" = "农场食品店"; - "type.shop.florist" = "花店"; "type.shop.funeral_directors" = "殡仪馆"; @@ -2792,22 +2788,14 @@ "type.shop.greengrocer" = "蔬果零售店"; -"type.shop.grocery" = "杂货店"; - "type.shop.hairdresser" = "理发师"; -"type.shop.hardware" = "五金店"; - -"type.shop.health_food" = "保健食品店"; - -"type.shop.houseware" = "家居用品店"; +"type.shop.hardware" = "硬件店"; "type.shop.jewelry" = "珠宝店"; "type.shop.kiosk" = "商店"; -"type.shop.kitchen" = "厨房用品店"; - "type.shop.laundry" = "洗衣店"; "type.shop.mall" = "商场"; @@ -2830,8 +2818,6 @@ "type.shop.outdoor" = "室外设备"; -"type.shop.pastry" = "糕点"; - "type.shop.pawnbroker" = "典当商铺"; "type.shop.pet" = "宠物店"; @@ -2840,8 +2826,6 @@ "type.shop.seafood" = "鱼商"; -"type.shop.second_hand" = "二手店"; - "type.shop.shoes" = "鞋店"; "type.shop.sports" = "体育用品店"; @@ -2870,52 +2854,6 @@ "type.shop.wine" = "酒品商店"; -"type.shop.antiques" = "古董"; - -"type.shop.art" = "艺术商店"; - -"type.shop.baby_goods" = "儿童商店"; - -"type.shop.bag" = "箱包店"; - -"type.shop.boutique" = "精品店"; - -"type.shop.charity" = "慈善商店"; - -"type.shop.cheese" = "奶酪店"; - -"type.shop.craft" = "美术和工艺"; - -"type.shop.dairy" = "乳制品"; - -"type.shop.electrical" = "电器商城"; - -"type.shop.fishing" = "钓鱼店"; - -"type.shop.interior_decoration" = "室内装饰"; - -"type.shop.lottery" = "彩票"; - -"type.shop.medical_supply" = "医疗用品"; - -"type.shop.nutrition_supplements" = "营养补充剂"; - -"type.shop.paint" = "油漆"; - -"type.shop.perfumery" = "香水"; - -"type.shop.sewing" = "缝纫用品"; - -"type.shop.storage_rental" = "存储租赁"; - -"type.shop.tobacco" = "烟草"; - -"type.shop.trade" = "贸易用品"; - -"type.shop.watches" = "手表"; - -"type.shop.wholesale" = "批发店"; - "type.sport" = "体育运动"; "type.sport.american_football" = "美式足球"; diff --git a/iphone/Maps/LocalizedStrings/zh-Hant.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/zh-Hant.lproj/Localizable.strings index 3200d36bb5..63a1460ba1 100644 --- a/iphone/Maps/LocalizedStrings/zh-Hant.lproj/Localizable.strings +++ b/iphone/Maps/LocalizedStrings/zh-Hant.lproj/Localizable.strings @@ -2764,8 +2764,6 @@ "type.shop.cosmetics" = "化妆品"; -"type.shop.deli" = "熟食店"; - "type.shop.department_store" = "百貨公司"; "type.shop.doityourself" = "五金行"; @@ -2778,8 +2776,6 @@ "type.shop.fabric" = "購物"; -"type.shop.farm" = "農場食品店"; - "type.shop.florist" = "花店"; "type.shop.funeral_directors" = "葬儀社"; @@ -2792,22 +2788,14 @@ "type.shop.greengrocer" = "蔬果零售店"; -"type.shop.grocery" = "雜貨店"; - "type.shop.hairdresser" = "理髮師"; -"type.shop.hardware" = "五金店"; - -"type.shop.health_food" = "保健食品店"; - -"type.shop.houseware" = "家居用品店"; +"type.shop.hardware" = "五金行"; "type.shop.jewelry" = "珠寶店"; "type.shop.kiosk" = "小舖"; -"type.shop.kitchen" = "廚房用品店"; - "type.shop.laundry" = "洗衣店"; "type.shop.mall" = "商场"; @@ -2830,8 +2818,6 @@ "type.shop.outdoor" = "室外設備"; -"type.shop.pastry" = "糕點"; - "type.shop.pawnbroker" = "當舖"; "type.shop.pet" = "寵物店"; @@ -2840,8 +2826,6 @@ "type.shop.seafood" = "魚販"; -"type.shop.second_hand" = "二手店"; - "type.shop.shoes" = "鞋店"; "type.shop.sports" = "運動商品店"; @@ -2870,52 +2854,6 @@ "type.shop.wine" = "販酒處"; -"type.shop.antiques" = "古董"; - -"type.shop.art" = "藝術商店"; - -"type.shop.baby_goods" = "兒童商店"; - -"type.shop.bag" = "箱包店"; - -"type.shop.boutique" = "精品店"; - -"type.shop.charity" = "慈善商店"; - -"type.shop.cheese" = "奶酪店c"; - -"type.shop.craft" = "美術和工藝"; - -"type.shop.dairy" = "乳製品"; - -"type.shop.electrical" = "電器商城"; - -"type.shop.fishing" = "釣魚店"; - -"type.shop.interior_decoration" = "室內裝飾"; - -"type.shop.lottery" = "彩票"; - -"type.shop.medical_supply" = "醫療用品"; - -"type.shop.nutrition_supplements" = "營養補充劑"; - -"type.shop.paint" = "油漆"; - -"type.shop.perfumery" = "香水"; - -"type.shop.sewing" = "縫紉用品"; - -"type.shop.storage_rental" = "存儲租賃"; - -"type.shop.tobacco" = "煙草"; - -"type.shop.trade" = "貿易用品"; - -"type.shop.watches" = "手錶"; - -"type.shop.wholesale" = "批髮店"; - "type.sport" = "體育運動"; "type.sport.american_football" = "美式足球"; diff --git a/platform/measurement_utils.cpp b/platform/measurement_utils.cpp index 1b019164a0..ec54295a67 100644 --- a/platform/measurement_utils.cpp +++ b/platform/measurement_utils.cpp @@ -249,7 +249,7 @@ string FormatSpeedUnits(Units units) string FormatOsmLink(double lat, double lon, int zoom) { - static constexpr char chars[] = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789_~"; + static char char_array[] = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789_~"; // Same as (lon + 180) / 360 * 1UL << 32, but without warnings. double constexpr factor = (1 << 30) / 90.0; @@ -260,9 +260,8 @@ string FormatOsmLink(double lat, double lon, int zoom) for (int i = 0; i < (zoom + 10) / 3; ++i) { - const uint64_t digit = (code >> (58 - 6 * i)) & 0x3f; - ASSERT_LESS(digit, ARRAY_SIZE(chars), ()); - osmUrl += chars[digit]; + int digit = (code >> (58 - 6 * i)) & 0x3f; + osmUrl += char_array[digit]; } for (int i = 0; i < (zoom + 8) % 3; ++i) diff --git a/platform/platform_tests/measurement_tests.cpp b/platform/platform_tests/measurement_tests.cpp index 5b6894277d..d158d6d3ce 100644 --- a/platform/platform_tests/measurement_tests.cpp +++ b/platform/platform_tests/measurement_tests.cpp @@ -138,18 +138,17 @@ UNIT_TEST(LatLonToDMS_NoRounding) UNIT_TEST(FormatOsmLink) { - // Zero point + //Zero point TEST_EQUAL(FormatOsmLink(0, 0, 5), "https://osm.org/go/wAAAA-?m=", ()); - // Eifel tower + //Eifel tower TEST_EQUAL(FormatOsmLink(48.85825, 2.29450, 15), "https://osm.org/go/0BOdUs9e--?m=", ()); - // Buenos Aires + //Buenos Aires TEST_EQUAL(FormatOsmLink(-34.6061, -58.4360, 10), "https://osm.org/go/Mnx6SB?m=", ()); // Formally, lat = -90 and lat = 90 are the same for OSM links, but Mercator is valid until 85. - auto link = FormatOsmLink(-90, -180, 10); - TEST(link == "https://osm.org/go/AAAAAA?m=" || link == "https://osm.org/go/~~~~~~?m=", (link)); - link = FormatOsmLink(90, 180, 10); - TEST(link == "https://osm.org/go/AAAAAA?m=" || link == "https://osm.org/go/~~~~~~?m=", (link)); + auto const link = FormatOsmLink(-90, -180, 10); + TEST_EQUAL(link, "https://osm.org/go/AAAAAA?m=", ()); + TEST_EQUAL(link, FormatOsmLink(90, 180, 10), ()); } UNIT_TEST(FormatAltitude) diff --git a/routing/cross_mwm_graph.cpp b/routing/cross_mwm_graph.cpp index 70f731ba33..71c4a5b50f 100644 --- a/routing/cross_mwm_graph.cpp +++ b/routing/cross_mwm_graph.cpp @@ -210,8 +210,6 @@ CrossMwmGraph::MwmStatus CrossMwmGraph::GetMwmStatus(NumMwmId numMwmId, string c case MwmDataSource::SectionExists: return MwmStatus::SectionExists; case MwmDataSource::NoSection: return MwmStatus::NoSection; } - CHECK(false, ("Unreachable")); - return MwmStatus::NoSection; } CrossMwmGraph::MwmStatus CrossMwmGraph::GetCrossMwmStatus(NumMwmId numMwmId) const diff --git a/routing/directions_engine.cpp b/routing/directions_engine.cpp index b1f92db981..12204a78db 100644 --- a/routing/directions_engine.cpp +++ b/routing/directions_engine.cpp @@ -246,8 +246,8 @@ bool DirectionsEngine::Generate(IndexRoadGraph const & graph, if (m_vehicleType == VehicleType::Transit) { auto const & segments = graph.GetRouteSegments(); - uint32_t const segsCount = base::asserted_cast(segments.size()); - for (uint32_t i = 0; i < segsCount; ++i) + size_t const segsCount = segments.size(); + for (size_t i = 0; i < segsCount; ++i) { TurnItem turn; if (i == segsCount - 1) @@ -350,7 +350,7 @@ void DirectionsEngine::MakeTurnAnnotation(IndexRoadGraph::EdgeVector const & rou TurnItem turnItem; if (skipTurnSegments == 0) { - turnItem.m_index = base::asserted_cast(routeSegments.size() + 1); + turnItem.m_index = routeSegments.size() + 1; skipTurnSegments = GetTurnDirection(result, idxLoadedSegment + 1, *m_numMwmIds, vehicleSettings, turnItem); } else diff --git a/routing/fake_vertex.hpp b/routing/fake_vertex.hpp index 72a1f65b76..ec81449aa6 100644 --- a/routing/fake_vertex.hpp +++ b/routing/fake_vertex.hpp @@ -71,7 +71,5 @@ inline std::string DebugPrint(FakeVertex::Type type) case FakeVertex::Type::PureFake: return "PureFake"; case FakeVertex::Type::PartOfReal: return "PartOfReal"; } - CHECK(false, ("Unreachable")); - return "UnknownFakeVertexType"; } } // namespace routing diff --git a/tools/python/ResponseProvider.py b/tools/python/ResponseProvider.py index dd7b8a5cc3..07b8483c4b 100644 --- a/tools/python/ResponseProvider.py +++ b/tools/python/ResponseProvider.py @@ -11,7 +11,7 @@ BIG_FILE_SIZE = 47684 class Payload: def __init__(self, message, response_code=200, headers={}): self.__response_code = response_code - self.__message = message + self.__message = message if type(message) is bytes else message.encode('utf8') self.__headers = headers @@ -155,8 +155,9 @@ class ResponseProvider: "/gallery/v2/map": self.guides_on_map_gallery, "/partners/get_supported_tariffs": self.citymobil_supported_tariffs, "/partners/calculate_price": self.citymobil_calculate_price, - }[url]() - except: + }.get(url, self.test_404)() + except Exception as e: + logging.error("test_server: Can't build server response", exc_info=e) return self.test_404() @@ -208,17 +209,17 @@ class ResponseProvider: self.check_byterange(BIG_FILE_SIZE) headers = self.chunked_response_header(BIG_FILE_SIZE) message = self.trim_message(self.message_for_47kb_file()) - + return Payload(message, self.response_code, headers) def message_for_47kb_file(self): message = [] for i in range(0, BIG_FILE_SIZE + 1): - message.append(chr(i / 256)) - message.append(chr(i % 256)) + message.append(i // 256) + message.append(i % 256) - return "".join(message) + return bytes(message) # Partners_api_tests diff --git a/tools/python/testserver.py b/tools/python/testserver.py index 7bfb3b2144..fe9be8d404 100644 --- a/tools/python/testserver.py +++ b/tools/python/testserver.py @@ -171,7 +171,7 @@ class PostHandler(BaseHTTPRequestHandler, ResponseProviderMixin): self.send_header(h, payload.headers()[h]) self.send_header("Content-Length", payload.length()) self.end_headers() - self.wfile.write(payload.message().encode('utf8')) + self.wfile.write(payload.message()) def init_vars(self): @@ -184,7 +184,7 @@ class PostHandler(BaseHTTPRequestHandler, ResponseProviderMixin): headers = self.prepare_headers() payload = self.response_provider.response_for_url_and_headers(self.path, headers) if payload.response_code() >= 300: - length = int(self.headers.getheader('content-length')) + length = int(self.headers.get('content-length')) self.dispatch_response(Payload(self.rfile.read(length))) else: self.dispatch_response(payload) @@ -199,7 +199,7 @@ class PostHandler(BaseHTTPRequestHandler, ResponseProviderMixin): def prepare_headers(self): ret = dict() for h in self.headers: - ret[h] = self.headers.get(h) + ret[h.lower()] = self.headers.get(h) return ret