diff --git a/android/res/values-ar/strings.xml b/android/res/values-ar/strings.xml index ba2f4695f5..05e206250f 100644 --- a/android/res/values-ar/strings.xml +++ b/android/res/values-ar/strings.xml @@ -962,7 +962,10 @@ مزيل الرجفان صنبور الإطفاء هاتف الطوارئ + مدخل + + ﻲﺴﻴﺋﺮﻟﺍ ﻞﺧﺪﻤﻟﺍ مختبر طبي اخصائي علاج طبيعي diff --git a/android/res/values-be/strings.xml b/android/res/values-be/strings.xml index 9962a18a8d..7888bf98ba 100644 --- a/android/res/values-be/strings.xml +++ b/android/res/values-be/strings.xml @@ -798,6 +798,8 @@ Дэлікатэсы Дэфібрылятар Пажарны гідрант + + Галоўны ўваход Медыцынская лабараторыя Фізіятэрапеўт diff --git a/android/res/values-bg/strings.xml b/android/res/values-bg/strings.xml index a84cd7a9da..b6aa66335f 100644 --- a/android/res/values-bg/strings.xml +++ b/android/res/values-bg/strings.xml @@ -684,6 +684,8 @@ Винарна Шивач Деликатеси + + Главния вход Медицинска лаборатория Физиотерапевт diff --git a/android/res/values-ca/strings.xml b/android/res/values-ca/strings.xml index 5e694217c7..8a82913e3c 100644 --- a/android/res/values-ca/strings.xml +++ b/android/res/values-ca/strings.xml @@ -717,4 +717,8 @@ Bolera + + + + Entrada principal diff --git a/android/res/values-cs/strings.xml b/android/res/values-cs/strings.xml index 856444e06f..bfa015fea7 100644 --- a/android/res/values-cs/strings.xml +++ b/android/res/values-cs/strings.xml @@ -924,7 +924,10 @@ Defibrilátor Požární hydrant Tísňového volání + Vchod + + Hlavní vchod Lékařská laboratoř Fyzioterapeut diff --git a/android/res/values-da/strings.xml b/android/res/values-da/strings.xml index 8acedf9b3d..2efa54898e 100644 --- a/android/res/values-da/strings.xml +++ b/android/res/values-da/strings.xml @@ -906,7 +906,10 @@ Hjertestarter Brandhane Nødtelefon + Indgang + + Hovedindgang Medicinsk laboratorium Fysioterapeut diff --git a/android/res/values-de/strings.xml b/android/res/values-de/strings.xml index 775863de6e..0979e2ec42 100644 --- a/android/res/values-de/strings.xml +++ b/android/res/values-de/strings.xml @@ -1000,7 +1000,10 @@ Defibrillator Hydrant Notruftelefon + Eingang + + Haupteingang Medizinisches Labor Physiotherapeut diff --git a/android/res/values-el/strings.xml b/android/res/values-el/strings.xml index e7b045e0ed..8c92e0fbee 100644 --- a/android/res/values-el/strings.xml +++ b/android/res/values-el/strings.xml @@ -911,7 +911,10 @@ Πρώτες βοήθειες Πυροσβεστικός κρουνός Τηλέφωνο έκτακτης ανάγκης + Είσοδος + + Κύρια είσοδος Ιατρικό Εργαστήριο Φυσικοθεραπευτής diff --git a/android/res/values-es/strings.xml b/android/res/values-es/strings.xml index d21cd7a468..b6f43764a3 100644 --- a/android/res/values-es/strings.xml +++ b/android/res/values-es/strings.xml @@ -1024,7 +1024,10 @@ Desfibrilador Boca de incendio Teléfono de emergencias + Entrada + + Entrada principal Laboratorio médico Fisioterapeuta diff --git a/android/res/values-et/strings.xml b/android/res/values-et/strings.xml index 7cffef595e..4b0b343e07 100644 --- a/android/res/values-et/strings.xml +++ b/android/res/values-et/strings.xml @@ -1021,7 +1021,10 @@ Defibrillaator Tuletõrjehüdrant Hädaabi telefon + Sissepääs + + Peasissekäik Meditsiinilabor Füsioterapeut diff --git a/android/res/values-eu/strings.xml b/android/res/values-eu/strings.xml index eab6a3e00a..50b9fc6065 100644 --- a/android/res/values-eu/strings.xml +++ b/android/res/values-eu/strings.xml @@ -972,7 +972,10 @@ Desfibriladorea Suteen hidrantea Larrialdi zenbakia + Sarrera + + Sarrera Nagusia Medikuntza laborategia Fisioterapeuta diff --git a/android/res/values-fa/strings.xml b/android/res/values-fa/strings.xml index cdf280176f..83d5a1426d 100644 --- a/android/res/values-fa/strings.xml +++ b/android/res/values-fa/strings.xml @@ -827,7 +827,10 @@ دستگاه شوک شیر آتش‌نشانی تلفن اضطراری + ورودی + + ﯽﻠﺻﺍ ﯼﺩﻭﺭﻭ ﯽﮑﺷﺰﭘ ﻩﺎﮕﺸﯾﺎﻣﺯﺁ فیزیوتراپیست diff --git a/android/res/values-fi/strings.xml b/android/res/values-fi/strings.xml index 69faeb6b9d..e3991e8b6b 100644 --- a/android/res/values-fi/strings.xml +++ b/android/res/values-fi/strings.xml @@ -966,7 +966,10 @@ Defibrillaattori Paloposti Hätäpuhelin + Sisäänkäynti + + Pääsisäänkäynti Lääketieteellinen laboratorio Fysioterapeutti diff --git a/android/res/values-fr/strings.xml b/android/res/values-fr/strings.xml index 54d591a156..971781374c 100644 --- a/android/res/values-fr/strings.xml +++ b/android/res/values-fr/strings.xml @@ -1006,7 +1006,10 @@ Défibrillateur Bouche d’incendie Téléphone d\'urgence + Entrée + + Entrée principale Laboratoire médical Physiothérapeute diff --git a/android/res/values-hu/strings.xml b/android/res/values-hu/strings.xml index 3f2d6515bf..92fcc95837 100644 --- a/android/res/values-hu/strings.xml +++ b/android/res/values-hu/strings.xml @@ -915,7 +915,10 @@ Defibrillátor Tűzcsap Sürgősségi telefon + Bejárat + + Főbejárat Orvosi laboratórium Fizioterapeuta diff --git a/android/res/values-in/strings.xml b/android/res/values-in/strings.xml index 201914513c..3a2dbed4b3 100644 --- a/android/res/values-in/strings.xml +++ b/android/res/values-in/strings.xml @@ -906,7 +906,10 @@ Defibrilator Keran Kebakaran Telepon darurat + Pintu masuk + + Pintu masuk utama Laboratorium medis Fisioterapis diff --git a/android/res/values-it/strings.xml b/android/res/values-it/strings.xml index 1f76a819dd..9b28322220 100644 --- a/android/res/values-it/strings.xml +++ b/android/res/values-it/strings.xml @@ -990,7 +990,10 @@ Defibrillatore Idrante Telefono di emergenza + Ingresso + + Entrata principale Laboratorio Medico Fisioterapista diff --git a/android/res/values-iw/strings.xml b/android/res/values-iw/strings.xml index 3374a6a61b..138c9c1c1b 100644 --- a/android/res/values-iw/strings.xml +++ b/android/res/values-iw/strings.xml @@ -358,6 +358,8 @@ מטבח טבעוני מטבח צמחוני מטבח וייטנאמי + + תישארה הסינכ תיאופר הדבעמ פיזיותרפיסט diff --git a/android/res/values-ja/strings.xml b/android/res/values-ja/strings.xml index 68fa51c15c..f857e222c0 100644 --- a/android/res/values-ja/strings.xml +++ b/android/res/values-ja/strings.xml @@ -941,7 +941,10 @@ 除細動器 消火栓 緊急電話 + エントランス + + 正面玄関 医療研究所 理学療法士 diff --git a/android/res/values-ko/strings.xml b/android/res/values-ko/strings.xml index ce22d386ea..d8663a6ab6 100644 --- a/android/res/values-ko/strings.xml +++ b/android/res/values-ko/strings.xml @@ -911,7 +911,10 @@ 제세동기 소화전 긴급 전화 + 입구 + + 정문 의료 연구실 물리치료사 diff --git a/android/res/values-mr/strings.xml b/android/res/values-mr/strings.xml index 3f2c162d18..c2681efa76 100644 --- a/android/res/values-mr/strings.xml +++ b/android/res/values-mr/strings.xml @@ -904,7 +904,10 @@ कंपनरोधक अग्निशामक नळ संकटकालीन फोन + प्रवेशद्वार + + मुख्य प्रवेशद्वार वैद्यकीय प्रयोगशाळा फिजिओथेरपिस्ट diff --git a/android/res/values-nb/strings.xml b/android/res/values-nb/strings.xml index 884c8d67a6..38b05672ea 100644 --- a/android/res/values-nb/strings.xml +++ b/android/res/values-nb/strings.xml @@ -916,7 +916,10 @@ Hjertestarter Brannhydrant Nødtelefon + Inngang + + Hovedinngang Medisinsk laboratorium Fysioterapeut diff --git a/android/res/values-nl/strings.xml b/android/res/values-nl/strings.xml index 59764b0103..287a5376ca 100644 --- a/android/res/values-nl/strings.xml +++ b/android/res/values-nl/strings.xml @@ -1013,7 +1013,10 @@ Defibrillator (AED) Brandkraan Praatpaal + Ingang + + Hoofdingang Medisch laboratorium Fysiotherapeut diff --git a/android/res/values-pl/strings.xml b/android/res/values-pl/strings.xml index 159c0eb5c3..41b234865e 100644 --- a/android/res/values-pl/strings.xml +++ b/android/res/values-pl/strings.xml @@ -1002,7 +1002,10 @@ Defibrylator Hydrant Telefon alarmowy + Wejście + + Główne wejście Laboratorium Medyczne Fizjoterapeuta diff --git a/android/res/values-pt-rBR/strings.xml b/android/res/values-pt-rBR/strings.xml index eca7549fb4..87de550e40 100644 --- a/android/res/values-pt-rBR/strings.xml +++ b/android/res/values-pt-rBR/strings.xml @@ -975,7 +975,10 @@ Desfibrilador Hidrante Telefone de emergência + Entrada + + Entrada principal Laboratório médico Fisioterapeuta diff --git a/android/res/values-pt/strings.xml b/android/res/values-pt/strings.xml index e62066bb97..ff1621f4b8 100644 --- a/android/res/values-pt/strings.xml +++ b/android/res/values-pt/strings.xml @@ -972,7 +972,10 @@ Desfibrilador Boca de incêndio Telefone de emergência + Entrada + + Entrada principal Laboratório médico Fisioterapeuta diff --git a/android/res/values-ro/strings.xml b/android/res/values-ro/strings.xml index ceb0b00b82..01114c9a9a 100644 --- a/android/res/values-ro/strings.xml +++ b/android/res/values-ro/strings.xml @@ -931,7 +931,10 @@ Defibrilator Hidrant Telefon de urgență + Intrare + + Intrarea principala Laborator medical Fizioterapeut diff --git a/android/res/values-ru/strings.xml b/android/res/values-ru/strings.xml index bf36c30463..9b0b0a5561 100644 --- a/android/res/values-ru/strings.xml +++ b/android/res/values-ru/strings.xml @@ -1035,7 +1035,10 @@ Дефибриллятор Пожарный гидрант Телефон для экстренных вызовов + Вход + + Главный вход Медицинская лаборатория Физиотерапевт diff --git a/android/res/values-sk/strings.xml b/android/res/values-sk/strings.xml index 900e13c353..1ba907205c 100644 --- a/android/res/values-sk/strings.xml +++ b/android/res/values-sk/strings.xml @@ -909,7 +909,10 @@ Defibrilátor Požiarny hydrant Tiesňového volania + Vstup + + Hlavný vchod Lekárske laboratórium Fyzioterapeut diff --git a/android/res/values-sv/strings.xml b/android/res/values-sv/strings.xml index 0fe1e46546..4ce5e441ac 100644 --- a/android/res/values-sv/strings.xml +++ b/android/res/values-sv/strings.xml @@ -905,7 +905,10 @@ Vietnamesisk mat Brandpost Nödtelefon + Entré + + Huvudentré Medicinskt laboratorium Fysioterapeut diff --git a/android/res/values-sw/strings.xml b/android/res/values-sw/strings.xml index 52d5c471a5..9c647be320 100644 --- a/android/res/values-sw/strings.xml +++ b/android/res/values-sw/strings.xml @@ -280,6 +280,8 @@ Mvinyo Mshonaji nguo Kahawa + + Mlango Mkuu Maabara ya Matibabu Mtaalamu wa Physiotherapist diff --git a/android/res/values-th/strings.xml b/android/res/values-th/strings.xml index e5faa3fa09..b5bbcb3b73 100644 --- a/android/res/values-th/strings.xml +++ b/android/res/values-th/strings.xml @@ -914,7 +914,10 @@ เครื่องกระตุ้นหัวใจ หัวจ่ายน้ำดับเพลิง โทรศัพท์ฉุกเฉิน + ทางเข้า + + ทางเข้าหลัก ห้องปฏิบัติการทางการแพทย์ นักกายภาพบำบัด diff --git a/android/res/values-tr/strings.xml b/android/res/values-tr/strings.xml index a6dc4c16e6..755c93182d 100644 --- a/android/res/values-tr/strings.xml +++ b/android/res/values-tr/strings.xml @@ -1020,7 +1020,10 @@ Defibrilatör Yangın Söndürme Musluğu Acil Telefon + Giriş + + Ana giriş Tıbbi Laboratuvar Fizyoterapist diff --git a/android/res/values-uk/strings.xml b/android/res/values-uk/strings.xml index 5dfd01fee2..9c95d8ee74 100644 --- a/android/res/values-uk/strings.xml +++ b/android/res/values-uk/strings.xml @@ -1001,7 +1001,10 @@ Дефібрилятор Пожежний гідрант Аварійний телефон + Вхід + + Головний вхід Медична лабораторія Фізіотерапевт diff --git a/android/res/values-vi/strings.xml b/android/res/values-vi/strings.xml index 100ff4bf7a..85550eeda1 100644 --- a/android/res/values-vi/strings.xml +++ b/android/res/values-vi/strings.xml @@ -911,7 +911,10 @@ Máy khử rung tim Vòi chữa cháy Điện thoại khẩn cấp + Lối vào + + Lối vào chính Phòng thí nghiệm y tế Nhà vật lý trị liệu diff --git a/android/res/values-zh-rTW/strings.xml b/android/res/values-zh-rTW/strings.xml index 21adb6b72e..8a20d74db3 100644 --- a/android/res/values-zh-rTW/strings.xml +++ b/android/res/values-zh-rTW/strings.xml @@ -946,7 +946,10 @@ 心臟電擊器 消防栓 緊急電話 + 入口 + + 主要入口 醫學實驗室 物理治療師 diff --git a/android/res/values-zh/strings.xml b/android/res/values-zh/strings.xml index bcaab208b3..2dc9c0f407 100644 --- a/android/res/values-zh/strings.xml +++ b/android/res/values-zh/strings.xml @@ -964,7 +964,10 @@ 除颤器 消防栓 紧急电话 + 入口 + + 主要入口 医学实验室 物理治疗师 diff --git a/android/res/values/strings.xml b/android/res/values/strings.xml index dc432faca9..1f20b239a3 100644 --- a/android/res/values/strings.xml +++ b/android/res/values/strings.xml @@ -1055,7 +1055,10 @@ Defibrillator Fire Hydrant Emergency Phone + Entrance + + Main Entrance Medical Laboratory Physiotherapist diff --git a/data/classificator.txt b/data/classificator.txt index b9b20aaea9..059878da9d 100644 --- a/data/classificator.txt +++ b/data/classificator.txt @@ -338,7 +338,9 @@ world + fire_hydrant - phone - {} - entrance - + entrance + + main - + {} healthcare + laboratory - physiotherapist - diff --git a/data/drules_proto.bin b/data/drules_proto.bin index 1dd5603061..ee265f3e4d 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 7e7b56e2c4..658bf48c49 100644 --- a/data/drules_proto.txt +++ b/data/drules_proto.txt @@ -14145,12 +14145,37 @@ cont { cont { name: "entrance" element { - scale: 18 + scale: 19 symbol { name: "entrance-s" apply_for_type: 1 priority: 16038 } + caption { + primary { + height: 10 + color: 6381914 + offset_x: 1 + text: "ref" + } + secondary { + height: 12 + offset_y: 10 + text: "addr:flats" + } + priority: 15038 + } + } +} +cont { + name: "entrance-main" + element { + scale: 18 + symbol { + name: "main_entrance-s" + apply_for_type: 1 + priority: 16038 + } caption { primary { height: 10 @@ -14164,7 +14189,7 @@ cont { element { scale: 19 symbol { - name: "entrance-s" + name: "main_entrance-s" apply_for_type: 1 priority: 16038 } diff --git a/data/drules_proto_clear.bin b/data/drules_proto_clear.bin index e80c954594..a548328b32 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 f1feefa1b5..dbb7d47297 100644 --- a/data/drules_proto_clear.txt +++ b/data/drules_proto_clear.txt @@ -13914,12 +13914,37 @@ cont { cont { name: "entrance" element { - scale: 18 + scale: 19 symbol { name: "entrance-s" apply_for_type: 1 priority: 16038 } + caption { + primary { + height: 10 + color: 6381914 + offset_x: 1 + text: "ref" + } + secondary { + height: 12 + offset_y: 10 + text: "addr:flats" + } + priority: 15038 + } + } +} +cont { + name: "entrance-main" + element { + scale: 18 + symbol { + name: "main_entrance-s" + apply_for_type: 1 + priority: 16038 + } caption { primary { height: 10 @@ -13933,7 +13958,7 @@ cont { element { scale: 19 symbol { - name: "entrance-s" + name: "main_entrance-s" apply_for_type: 1 priority: 16038 } diff --git a/data/drules_proto_dark.bin b/data/drules_proto_dark.bin index ddd51ccf0f..c326d036d4 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 aeb1014a9b..d2823d4336 100644 --- a/data/drules_proto_dark.txt +++ b/data/drules_proto_dark.txt @@ -13914,12 +13914,37 @@ cont { cont { name: "entrance" element { - scale: 18 + scale: 19 symbol { name: "entrance-s" apply_for_type: 1 priority: 16038 } + caption { + primary { + height: 10 + color: 5592405 + offset_x: 1 + text: "ref" + } + secondary { + height: 12 + offset_y: 10 + text: "addr:flats" + } + priority: 15038 + } + } +} +cont { + name: "entrance-main" + element { + scale: 18 + symbol { + name: "main_entrance-s" + apply_for_type: 1 + priority: 16038 + } caption { primary { height: 10 @@ -13933,7 +13958,7 @@ cont { element { scale: 19 symbol { - name: "entrance-s" + name: "main_entrance-s" apply_for_type: 1 priority: 16038 } diff --git a/data/resources-6plus_clear/symbols.png b/data/resources-6plus_clear/symbols.png index 302f0c6243..c5e1cc7ada 100644 Binary files a/data/resources-6plus_clear/symbols.png and b/data/resources-6plus_clear/symbols.png differ diff --git a/data/resources-6plus_clear/symbols.sdf b/data/resources-6plus_clear/symbols.sdf index be79affa02..386d6a8521 100644 --- a/data/resources-6plus_clear/symbols.sdf +++ b/data/resources-6plus_clear/symbols.sdf @@ -109,7 +109,7 @@ - + @@ -120,7 +120,7 @@ - + @@ -133,22 +133,22 @@ - + - + - + - + @@ -157,271 +157,271 @@ - - - + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - + + + + + + + + + - - - - - - + + + + + + @@ -429,258 +429,259 @@ - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + + - + - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/data/resources-6plus_dark/symbols.png b/data/resources-6plus_dark/symbols.png index ce7ed023e8..525a0323c8 100644 Binary files a/data/resources-6plus_dark/symbols.png and b/data/resources-6plus_dark/symbols.png differ diff --git a/data/resources-6plus_dark/symbols.sdf b/data/resources-6plus_dark/symbols.sdf index 7ea00020b8..573a855e1d 100644 --- a/data/resources-6plus_dark/symbols.sdf +++ b/data/resources-6plus_dark/symbols.sdf @@ -106,7 +106,7 @@ - + @@ -117,7 +117,7 @@ - + @@ -130,22 +130,22 @@ - + - + - + - + @@ -154,532 +154,533 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - + + + + + + - + - - - - - - - - - + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - + + + + + + + + + + + + + - - - - - - - - - - - - + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/data/resources-hdpi_clear/symbols.png b/data/resources-hdpi_clear/symbols.png index 3addf4c457..adc33796eb 100644 Binary files a/data/resources-hdpi_clear/symbols.png and b/data/resources-hdpi_clear/symbols.png differ diff --git a/data/resources-hdpi_clear/symbols.sdf b/data/resources-hdpi_clear/symbols.sdf index 3e5c4f314c..369bdeccd7 100644 --- a/data/resources-hdpi_clear/symbols.sdf +++ b/data/resources-hdpi_clear/symbols.sdf @@ -109,7 +109,7 @@ - + @@ -120,7 +120,7 @@ - + @@ -133,22 +133,22 @@ - + - + - + - + @@ -157,530 +157,531 @@ - - - + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/data/resources-hdpi_dark/symbols.png b/data/resources-hdpi_dark/symbols.png index 6aa18ee6d3..873090ac6e 100644 Binary files a/data/resources-hdpi_dark/symbols.png and b/data/resources-hdpi_dark/symbols.png differ diff --git a/data/resources-hdpi_dark/symbols.sdf b/data/resources-hdpi_dark/symbols.sdf index 30393b34dc..03f73b4931 100644 --- a/data/resources-hdpi_dark/symbols.sdf +++ b/data/resources-hdpi_dark/symbols.sdf @@ -155,531 +155,532 @@ - - + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/data/resources-mdpi_clear/symbols.png b/data/resources-mdpi_clear/symbols.png index e3486102ae..44ba86989a 100644 Binary files a/data/resources-mdpi_clear/symbols.png and b/data/resources-mdpi_clear/symbols.png differ diff --git a/data/resources-mdpi_clear/symbols.sdf b/data/resources-mdpi_clear/symbols.sdf index 3f2eee076b..0cf6d5e13e 100644 --- a/data/resources-mdpi_clear/symbols.sdf +++ b/data/resources-mdpi_clear/symbols.sdf @@ -109,7 +109,7 @@ - + @@ -120,7 +120,7 @@ - + @@ -133,22 +133,22 @@ - + - + - + - + @@ -157,253 +157,253 @@ - - - + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -411,276 +411,277 @@ - - - - - - - - - - - + + + + + + + + + + + - - - - + + + + - - - + + + - - + + - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + - - + + - - - - - - - - - - - + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/data/resources-mdpi_dark/symbols.png b/data/resources-mdpi_dark/symbols.png index f959f20584..8d10f4cd94 100644 Binary files a/data/resources-mdpi_dark/symbols.png and b/data/resources-mdpi_dark/symbols.png differ diff --git a/data/resources-mdpi_dark/symbols.sdf b/data/resources-mdpi_dark/symbols.sdf index 982cf54d92..212a2e6131 100644 --- a/data/resources-mdpi_dark/symbols.sdf +++ b/data/resources-mdpi_dark/symbols.sdf @@ -155,531 +155,532 @@ - - + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + - - + + - - - - + + + + - - - + + + - - - - - - - - - - + + + + + + + + + + - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + - + - + - - - - - - - - - - + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/data/resources-xhdpi_clear/symbols.png b/data/resources-xhdpi_clear/symbols.png index d956cb7910..b7d21a89d4 100644 Binary files a/data/resources-xhdpi_clear/symbols.png and b/data/resources-xhdpi_clear/symbols.png differ diff --git a/data/resources-xhdpi_clear/symbols.sdf b/data/resources-xhdpi_clear/symbols.sdf index f9daef1110..080e3797a1 100644 --- a/data/resources-xhdpi_clear/symbols.sdf +++ b/data/resources-xhdpi_clear/symbols.sdf @@ -109,7 +109,7 @@ - + @@ -120,7 +120,7 @@ - + @@ -133,22 +133,22 @@ - + - + - + - + @@ -157,530 +157,531 @@ - - - + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/data/resources-xhdpi_dark/symbols.png b/data/resources-xhdpi_dark/symbols.png index 620d265e6e..656ee3ddf7 100644 Binary files a/data/resources-xhdpi_dark/symbols.png and b/data/resources-xhdpi_dark/symbols.png differ diff --git a/data/resources-xhdpi_dark/symbols.sdf b/data/resources-xhdpi_dark/symbols.sdf index a21f031e72..6f5095fb8a 100644 --- a/data/resources-xhdpi_dark/symbols.sdf +++ b/data/resources-xhdpi_dark/symbols.sdf @@ -155,531 +155,532 @@ - - + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + diff --git a/data/resources-xxhdpi_clear/symbols.png b/data/resources-xxhdpi_clear/symbols.png index e26e587778..1f054873c0 100644 Binary files a/data/resources-xxhdpi_clear/symbols.png and b/data/resources-xxhdpi_clear/symbols.png differ diff --git a/data/resources-xxhdpi_clear/symbols.sdf b/data/resources-xxhdpi_clear/symbols.sdf index 3470ef1782..44b63100cf 100644 --- a/data/resources-xxhdpi_clear/symbols.sdf +++ b/data/resources-xxhdpi_clear/symbols.sdf @@ -109,7 +109,7 @@ - + @@ -120,7 +120,7 @@ - + @@ -133,22 +133,22 @@ - + - + - + - + @@ -157,253 +157,253 @@ - - - + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -413,274 +413,275 @@ - - - - - - + + + + + + - - - - + + + + - - + + - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/data/resources-xxhdpi_dark/symbols.png b/data/resources-xxhdpi_dark/symbols.png index 657413e3c0..3cc7a1c958 100644 Binary files a/data/resources-xxhdpi_dark/symbols.png and b/data/resources-xxhdpi_dark/symbols.png differ diff --git a/data/resources-xxhdpi_dark/symbols.sdf b/data/resources-xxhdpi_dark/symbols.sdf index 7640ffe7b8..bba07af37d 100644 --- a/data/resources-xxhdpi_dark/symbols.sdf +++ b/data/resources-xxhdpi_dark/symbols.sdf @@ -155,531 +155,532 @@ - - + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/data/resources-xxxhdpi_clear/symbols.png b/data/resources-xxxhdpi_clear/symbols.png index 59f36d8e6d..80dc32a0cd 100644 Binary files a/data/resources-xxxhdpi_clear/symbols.png and b/data/resources-xxxhdpi_clear/symbols.png differ diff --git a/data/resources-xxxhdpi_clear/symbols.sdf b/data/resources-xxxhdpi_clear/symbols.sdf index 42351955fd..e992c7c651 100644 --- a/data/resources-xxxhdpi_clear/symbols.sdf +++ b/data/resources-xxxhdpi_clear/symbols.sdf @@ -109,7 +109,7 @@ - + @@ -120,7 +120,7 @@ - + @@ -133,22 +133,22 @@ - + - + - + - + @@ -157,253 +157,253 @@ - - - + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -411,276 +411,277 @@ - - - - - - - - - - - - + + + + + + + + + + + + - + - - - + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/data/resources-xxxhdpi_dark/symbols.png b/data/resources-xxxhdpi_dark/symbols.png index aadee0d072..c2c49e98d8 100644 Binary files a/data/resources-xxxhdpi_dark/symbols.png and b/data/resources-xxxhdpi_dark/symbols.png differ diff --git a/data/resources-xxxhdpi_dark/symbols.sdf b/data/resources-xxxhdpi_dark/symbols.sdf index 60ef92e588..57fdeff69a 100644 --- a/data/resources-xxxhdpi_dark/symbols.sdf +++ b/data/resources-xxxhdpi_dark/symbols.sdf @@ -155,531 +155,532 @@ - - + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/data/types.txt b/data/types.txt index c9ca7facce..527c091977 100644 --- a/data/types.txt +++ b/data/types.txt @@ -880,7 +880,7 @@ mapswithme *area:highway|trunk mapswithme *entrance -mapswithme +*entrance|main mapswithme *tourism|artwork railway|subway|tunnel diff --git a/data/visibility.txt b/data/visibility.txt index 16864e4f38..20fa7e9c84 100644 --- a/data/visibility.txt +++ b/data/visibility.txt @@ -338,7 +338,9 @@ world 00000000000000000000 + fire_hydrant 00000000000000000000 - phone 00000000000000000000 - {} - entrance 00000000000000000000 - + entrance 00000000000000000000 + + main 00000000000000000000 - + {} healthcare 00000000000000000000 + laboratory 00000000000000000000 - physiotherapist 00000000000000000000 - diff --git a/iphone/Maps/LocalizedStrings/ar.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/ar.lproj/Localizable.strings index 2c27701f76..dedd509286 100644 --- a/iphone/Maps/LocalizedStrings/ar.lproj/Localizable.strings +++ b/iphone/Maps/LocalizedStrings/ar.lproj/Localizable.strings @@ -1849,8 +1849,12 @@ "type.emergency.phone" = "هاتف الطوارئ"; +/* This is for secondary entrances, for main entrances see type.entrance.main */ "type.entrance" = "مدخل"; +/* This is for main/primary entrances, for secondary entrances see type.entrance */ +"type.entrance.main" = "ﻲﺴﻴﺋﺮﻟﺍ ﻞﺧﺪﻤﻟﺍ"; + "type.healthcare.laboratory" = "مختبر طبي"; "type.healthcare.physiotherapist" = "اخصائي علاج طبيعي"; diff --git a/iphone/Maps/LocalizedStrings/be.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/be.lproj/Localizable.strings index bc4dd0516b..d6494f83f4 100644 --- a/iphone/Maps/LocalizedStrings/be.lproj/Localizable.strings +++ b/iphone/Maps/LocalizedStrings/be.lproj/Localizable.strings @@ -1849,8 +1849,12 @@ "type.emergency.phone" = "Emergency Phone"; +/* This is for secondary entrances, for main entrances see type.entrance.main */ "type.entrance" = "Entrance"; +/* This is for main/primary entrances, for secondary entrances see type.entrance */ +"type.entrance.main" = "Галоўны ўваход"; + "type.healthcare.laboratory" = "Медыцынская лабараторыя"; "type.healthcare.physiotherapist" = "Фізіятэрапеўт"; diff --git a/iphone/Maps/LocalizedStrings/bg.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/bg.lproj/Localizable.strings index 8b2d07c2ef..7ce7b38acc 100644 --- a/iphone/Maps/LocalizedStrings/bg.lproj/Localizable.strings +++ b/iphone/Maps/LocalizedStrings/bg.lproj/Localizable.strings @@ -1849,8 +1849,12 @@ "type.emergency.phone" = "Emergency Phone"; +/* This is for secondary entrances, for main entrances see type.entrance.main */ "type.entrance" = "Entrance"; +/* This is for main/primary entrances, for secondary entrances see type.entrance */ +"type.entrance.main" = "Главния вход"; + "type.healthcare.laboratory" = "Медицинска лаборатория"; "type.healthcare.physiotherapist" = "Физиотерапевт"; diff --git a/iphone/Maps/LocalizedStrings/ca.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/ca.lproj/Localizable.strings index e6302320b0..ee8d3ea12d 100644 --- a/iphone/Maps/LocalizedStrings/ca.lproj/Localizable.strings +++ b/iphone/Maps/LocalizedStrings/ca.lproj/Localizable.strings @@ -1849,8 +1849,12 @@ "type.emergency.phone" = "Emergency Phone"; +/* This is for secondary entrances, for main entrances see type.entrance.main */ "type.entrance" = "Entrance"; +/* This is for main/primary entrances, for secondary entrances see type.entrance */ +"type.entrance.main" = "Entrada principal"; + "type.healthcare.laboratory" = "Medical Laboratory"; "type.healthcare.physiotherapist" = "Physiotherapist"; diff --git a/iphone/Maps/LocalizedStrings/cs.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/cs.lproj/Localizable.strings index 5e48689a1a..d985490471 100644 --- a/iphone/Maps/LocalizedStrings/cs.lproj/Localizable.strings +++ b/iphone/Maps/LocalizedStrings/cs.lproj/Localizable.strings @@ -1849,8 +1849,12 @@ "type.emergency.phone" = "Tísňového volání"; +/* This is for secondary entrances, for main entrances see type.entrance.main */ "type.entrance" = "Vchod"; +/* This is for main/primary entrances, for secondary entrances see type.entrance */ +"type.entrance.main" = "Hlavní vchod"; + "type.healthcare.laboratory" = "Lékařská laboratoř"; "type.healthcare.physiotherapist" = "Fyzioterapeut"; diff --git a/iphone/Maps/LocalizedStrings/da.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/da.lproj/Localizable.strings index 2238e00248..36e2dd1f17 100644 --- a/iphone/Maps/LocalizedStrings/da.lproj/Localizable.strings +++ b/iphone/Maps/LocalizedStrings/da.lproj/Localizable.strings @@ -1849,8 +1849,12 @@ "type.emergency.phone" = "Nødtelefon"; +/* This is for secondary entrances, for main entrances see type.entrance.main */ "type.entrance" = "Indgang"; +/* This is for main/primary entrances, for secondary entrances see type.entrance */ +"type.entrance.main" = "Hovedindgang"; + "type.healthcare.laboratory" = "Medicinsk laboratorium"; "type.healthcare.physiotherapist" = "Fysioterapeut"; diff --git a/iphone/Maps/LocalizedStrings/de.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/de.lproj/Localizable.strings index bd19bcd738..d3076e7e79 100644 --- a/iphone/Maps/LocalizedStrings/de.lproj/Localizable.strings +++ b/iphone/Maps/LocalizedStrings/de.lproj/Localizable.strings @@ -1849,8 +1849,12 @@ "type.emergency.phone" = "Notruftelefon"; +/* This is for secondary entrances, for main entrances see type.entrance.main */ "type.entrance" = "Eingang"; +/* This is for main/primary entrances, for secondary entrances see type.entrance */ +"type.entrance.main" = "Haupteingang"; + "type.healthcare.laboratory" = "Medizinisches Labor"; "type.healthcare.physiotherapist" = "Physiotherapeut"; diff --git a/iphone/Maps/LocalizedStrings/el.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/el.lproj/Localizable.strings index 455a7ec8c7..03648804a7 100644 --- a/iphone/Maps/LocalizedStrings/el.lproj/Localizable.strings +++ b/iphone/Maps/LocalizedStrings/el.lproj/Localizable.strings @@ -1849,8 +1849,12 @@ "type.emergency.phone" = "Τηλέφωνο έκτακτης ανάγκης"; +/* This is for secondary entrances, for main entrances see type.entrance.main */ "type.entrance" = "Είσοδος"; +/* This is for main/primary entrances, for secondary entrances see type.entrance */ +"type.entrance.main" = "Κύρια είσοδος"; + "type.healthcare.laboratory" = "Ιατρικό Εργαστήριο"; "type.healthcare.physiotherapist" = "Φυσικοθεραπευτής"; diff --git a/iphone/Maps/LocalizedStrings/en-GB.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/en-GB.lproj/Localizable.strings index 1f01f3c464..aac3db26f7 100644 --- a/iphone/Maps/LocalizedStrings/en-GB.lproj/Localizable.strings +++ b/iphone/Maps/LocalizedStrings/en-GB.lproj/Localizable.strings @@ -1849,8 +1849,12 @@ "type.emergency.phone" = "Emergency Phone"; +/* This is for secondary entrances, for main entrances see type.entrance.main */ "type.entrance" = "Entrance"; +/* This is for main/primary entrances, for secondary entrances see type.entrance */ +"type.entrance.main" = "Main Entrance"; + "type.healthcare.laboratory" = "Medical Laboratory"; "type.healthcare.physiotherapist" = "Physiotherapist"; diff --git a/iphone/Maps/LocalizedStrings/en.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/en.lproj/Localizable.strings index 62ac24c891..f7e2e40fe4 100644 --- a/iphone/Maps/LocalizedStrings/en.lproj/Localizable.strings +++ b/iphone/Maps/LocalizedStrings/en.lproj/Localizable.strings @@ -1849,8 +1849,12 @@ "type.emergency.phone" = "Emergency Phone"; +/* This is for secondary entrances, for main entrances see type.entrance.main */ "type.entrance" = "Entrance"; +/* This is for main/primary entrances, for secondary entrances see type.entrance */ +"type.entrance.main" = "Main Entrance"; + "type.healthcare.laboratory" = "Medical Laboratory"; "type.healthcare.physiotherapist" = "Physiotherapist"; diff --git a/iphone/Maps/LocalizedStrings/es-MX.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/es-MX.lproj/Localizable.strings index ce1108bbd1..90781d7429 100644 --- a/iphone/Maps/LocalizedStrings/es-MX.lproj/Localizable.strings +++ b/iphone/Maps/LocalizedStrings/es-MX.lproj/Localizable.strings @@ -1849,8 +1849,12 @@ "type.emergency.phone" = "Teléfono de emergencias"; +/* This is for secondary entrances, for main entrances see type.entrance.main */ "type.entrance" = "Entrada"; +/* This is for main/primary entrances, for secondary entrances see type.entrance */ +"type.entrance.main" = "Entrada principal"; + "type.healthcare.laboratory" = "Laboratorio médico"; "type.healthcare.physiotherapist" = "Fisioterapeuta"; diff --git a/iphone/Maps/LocalizedStrings/es.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/es.lproj/Localizable.strings index 6c94662704..4bc762048b 100644 --- a/iphone/Maps/LocalizedStrings/es.lproj/Localizable.strings +++ b/iphone/Maps/LocalizedStrings/es.lproj/Localizable.strings @@ -1849,8 +1849,12 @@ "type.emergency.phone" = "Teléfono de emergencias"; +/* This is for secondary entrances, for main entrances see type.entrance.main */ "type.entrance" = "Entrada"; +/* This is for main/primary entrances, for secondary entrances see type.entrance */ +"type.entrance.main" = "Entrada principal"; + "type.healthcare.laboratory" = "Laboratorio médico"; "type.healthcare.physiotherapist" = "Fisioterapeuta"; diff --git a/iphone/Maps/LocalizedStrings/et.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/et.lproj/Localizable.strings index fe649d8f86..87a49c3b03 100644 --- a/iphone/Maps/LocalizedStrings/et.lproj/Localizable.strings +++ b/iphone/Maps/LocalizedStrings/et.lproj/Localizable.strings @@ -1849,8 +1849,12 @@ "type.emergency.phone" = "Hädaabi telefon"; +/* This is for secondary entrances, for main entrances see type.entrance.main */ "type.entrance" = "Sissepääs"; +/* This is for main/primary entrances, for secondary entrances see type.entrance */ +"type.entrance.main" = "Peasissekäik"; + "type.healthcare.laboratory" = "Meditsiinilabor"; "type.healthcare.physiotherapist" = "Füsioterapeut"; diff --git a/iphone/Maps/LocalizedStrings/eu.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/eu.lproj/Localizable.strings index 5d24824ff3..667521a7cb 100644 --- a/iphone/Maps/LocalizedStrings/eu.lproj/Localizable.strings +++ b/iphone/Maps/LocalizedStrings/eu.lproj/Localizable.strings @@ -1849,8 +1849,12 @@ "type.emergency.phone" = "Larrialdi zenbakia"; +/* This is for secondary entrances, for main entrances see type.entrance.main */ "type.entrance" = "Sarrera"; +/* This is for main/primary entrances, for secondary entrances see type.entrance */ +"type.entrance.main" = "Sarrera Nagusia"; + "type.healthcare.laboratory" = "Medikuntza laborategia"; "type.healthcare.physiotherapist" = "Fisioterapeuta"; diff --git a/iphone/Maps/LocalizedStrings/fa.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/fa.lproj/Localizable.strings index b76cb22634..d254a31ad1 100644 --- a/iphone/Maps/LocalizedStrings/fa.lproj/Localizable.strings +++ b/iphone/Maps/LocalizedStrings/fa.lproj/Localizable.strings @@ -1849,8 +1849,12 @@ "type.emergency.phone" = "تلفن اضطراری"; +/* This is for secondary entrances, for main entrances see type.entrance.main */ "type.entrance" = "ورودی"; +/* This is for main/primary entrances, for secondary entrances see type.entrance */ +"type.entrance.main" = "ﯽﻠﺻﺍ ﯼﺩﻭﺭﻭ"; + "type.healthcare.laboratory" = "ﯽﮑﺷﺰﭘ ﻩﺎﮕﺸﯾﺎﻣﺯﺁ"; "type.healthcare.physiotherapist" = "فیزیوتراپیست"; diff --git a/iphone/Maps/LocalizedStrings/fi.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/fi.lproj/Localizable.strings index a5dfd0033a..8f0049a51e 100644 --- a/iphone/Maps/LocalizedStrings/fi.lproj/Localizable.strings +++ b/iphone/Maps/LocalizedStrings/fi.lproj/Localizable.strings @@ -1849,8 +1849,12 @@ "type.emergency.phone" = "Hätäpuhelin"; +/* This is for secondary entrances, for main entrances see type.entrance.main */ "type.entrance" = "Sisäänkäynti"; +/* This is for main/primary entrances, for secondary entrances see type.entrance */ +"type.entrance.main" = "Pääsisäänkäynti"; + "type.healthcare.laboratory" = "Lääketieteellinen laboratorio"; "type.healthcare.physiotherapist" = "Fysioterapeutti"; diff --git a/iphone/Maps/LocalizedStrings/fr.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/fr.lproj/Localizable.strings index 9afb589419..4cbad8ee8a 100644 --- a/iphone/Maps/LocalizedStrings/fr.lproj/Localizable.strings +++ b/iphone/Maps/LocalizedStrings/fr.lproj/Localizable.strings @@ -1849,8 +1849,12 @@ "type.emergency.phone" = "Téléphone d'urgence"; +/* This is for secondary entrances, for main entrances see type.entrance.main */ "type.entrance" = "Entrée"; +/* This is for main/primary entrances, for secondary entrances see type.entrance */ +"type.entrance.main" = "Entrée principale"; + "type.healthcare.laboratory" = "Laboratoire médical"; "type.healthcare.physiotherapist" = "Physiothérapeute"; diff --git a/iphone/Maps/LocalizedStrings/he.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/he.lproj/Localizable.strings index ecb32efc93..ee2f208dd9 100644 --- a/iphone/Maps/LocalizedStrings/he.lproj/Localizable.strings +++ b/iphone/Maps/LocalizedStrings/he.lproj/Localizable.strings @@ -1849,8 +1849,12 @@ "type.emergency.phone" = "Emergency Phone"; +/* This is for secondary entrances, for main entrances see type.entrance.main */ "type.entrance" = "Entrance"; +/* This is for main/primary entrances, for secondary entrances see type.entrance */ +"type.entrance.main" = "תישארה הסינכ"; + "type.healthcare.laboratory" = "תיאופר הדבעמ"; "type.healthcare.physiotherapist" = "פיזיותרפיסט"; diff --git a/iphone/Maps/LocalizedStrings/hu.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/hu.lproj/Localizable.strings index 52be1c11cc..bc9e046f1d 100644 --- a/iphone/Maps/LocalizedStrings/hu.lproj/Localizable.strings +++ b/iphone/Maps/LocalizedStrings/hu.lproj/Localizable.strings @@ -1849,8 +1849,12 @@ "type.emergency.phone" = "Sürgősségi telefon"; +/* This is for secondary entrances, for main entrances see type.entrance.main */ "type.entrance" = "Bejárat"; +/* This is for main/primary entrances, for secondary entrances see type.entrance */ +"type.entrance.main" = "Főbejárat"; + "type.healthcare.laboratory" = "Orvosi laboratórium"; "type.healthcare.physiotherapist" = "Fizioterapeuta"; diff --git a/iphone/Maps/LocalizedStrings/id.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/id.lproj/Localizable.strings index 98f6059596..cc0f98744e 100644 --- a/iphone/Maps/LocalizedStrings/id.lproj/Localizable.strings +++ b/iphone/Maps/LocalizedStrings/id.lproj/Localizable.strings @@ -1849,8 +1849,12 @@ "type.emergency.phone" = "Telepon darurat"; +/* This is for secondary entrances, for main entrances see type.entrance.main */ "type.entrance" = "Pintu masuk"; +/* This is for main/primary entrances, for secondary entrances see type.entrance */ +"type.entrance.main" = "Pintu masuk utama"; + "type.healthcare.laboratory" = "Laboratorium medis"; "type.healthcare.physiotherapist" = "Fisioterapis"; diff --git a/iphone/Maps/LocalizedStrings/it.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/it.lproj/Localizable.strings index e6e3aac5a4..bfd74a613d 100644 --- a/iphone/Maps/LocalizedStrings/it.lproj/Localizable.strings +++ b/iphone/Maps/LocalizedStrings/it.lproj/Localizable.strings @@ -1849,8 +1849,12 @@ "type.emergency.phone" = "Telefono di emergenza"; +/* This is for secondary entrances, for main entrances see type.entrance.main */ "type.entrance" = "Ingresso"; +/* This is for main/primary entrances, for secondary entrances see type.entrance */ +"type.entrance.main" = "Entrata principale"; + "type.healthcare.laboratory" = "Laboratorio Medico"; "type.healthcare.physiotherapist" = "Fisioterapista"; diff --git a/iphone/Maps/LocalizedStrings/ja.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/ja.lproj/Localizable.strings index e37c3b2d70..9801cf1b5a 100644 --- a/iphone/Maps/LocalizedStrings/ja.lproj/Localizable.strings +++ b/iphone/Maps/LocalizedStrings/ja.lproj/Localizable.strings @@ -1849,8 +1849,12 @@ "type.emergency.phone" = "緊急電話"; +/* This is for secondary entrances, for main entrances see type.entrance.main */ "type.entrance" = "エントランス"; +/* This is for main/primary entrances, for secondary entrances see type.entrance */ +"type.entrance.main" = "正面玄関"; + "type.healthcare.laboratory" = "医療研究所"; "type.healthcare.physiotherapist" = "理学療法士"; diff --git a/iphone/Maps/LocalizedStrings/ko.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/ko.lproj/Localizable.strings index d1e1544171..e5edefe734 100644 --- a/iphone/Maps/LocalizedStrings/ko.lproj/Localizable.strings +++ b/iphone/Maps/LocalizedStrings/ko.lproj/Localizable.strings @@ -1849,8 +1849,12 @@ "type.emergency.phone" = "긴급 전화"; +/* This is for secondary entrances, for main entrances see type.entrance.main */ "type.entrance" = "입구"; +/* This is for main/primary entrances, for secondary entrances see type.entrance */ +"type.entrance.main" = "정문"; + "type.healthcare.laboratory" = "의료 연구실"; "type.healthcare.physiotherapist" = "물리치료사"; diff --git a/iphone/Maps/LocalizedStrings/mr.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/mr.lproj/Localizable.strings index 440e598620..b4c12c266c 100644 --- a/iphone/Maps/LocalizedStrings/mr.lproj/Localizable.strings +++ b/iphone/Maps/LocalizedStrings/mr.lproj/Localizable.strings @@ -1849,8 +1849,12 @@ "type.emergency.phone" = "संकटकालीन फोन"; +/* This is for secondary entrances, for main entrances see type.entrance.main */ "type.entrance" = "प्रवेशद्वार"; +/* This is for main/primary entrances, for secondary entrances see type.entrance */ +"type.entrance.main" = "मुख्य प्रवेशद्वार"; + "type.healthcare.laboratory" = "वैद्यकीय प्रयोगशाळा"; "type.healthcare.physiotherapist" = "फिजिओथेरपिस्ट"; diff --git a/iphone/Maps/LocalizedStrings/nb.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/nb.lproj/Localizable.strings index d757cad830..435f12f2ac 100644 --- a/iphone/Maps/LocalizedStrings/nb.lproj/Localizable.strings +++ b/iphone/Maps/LocalizedStrings/nb.lproj/Localizable.strings @@ -1849,8 +1849,12 @@ "type.emergency.phone" = "Nødtelefon"; +/* This is for secondary entrances, for main entrances see type.entrance.main */ "type.entrance" = "Inngang"; +/* This is for main/primary entrances, for secondary entrances see type.entrance */ +"type.entrance.main" = "Hovedinngang"; + "type.healthcare.laboratory" = "Medisinsk laboratorium"; "type.healthcare.physiotherapist" = "Fysioterapeut"; diff --git a/iphone/Maps/LocalizedStrings/nl.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/nl.lproj/Localizable.strings index aedbef4040..0e7e720274 100644 --- a/iphone/Maps/LocalizedStrings/nl.lproj/Localizable.strings +++ b/iphone/Maps/LocalizedStrings/nl.lproj/Localizable.strings @@ -1849,8 +1849,12 @@ "type.emergency.phone" = "Praatpaal"; +/* This is for secondary entrances, for main entrances see type.entrance.main */ "type.entrance" = "Ingang"; +/* This is for main/primary entrances, for secondary entrances see type.entrance */ +"type.entrance.main" = "Hoofdingang"; + "type.healthcare.laboratory" = "Medisch laboratorium"; "type.healthcare.physiotherapist" = "Fysiotherapeut"; diff --git a/iphone/Maps/LocalizedStrings/pl.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/pl.lproj/Localizable.strings index 97f7ac2769..9330c94c4a 100644 --- a/iphone/Maps/LocalizedStrings/pl.lproj/Localizable.strings +++ b/iphone/Maps/LocalizedStrings/pl.lproj/Localizable.strings @@ -1849,8 +1849,12 @@ "type.emergency.phone" = "Telefon alarmowy"; +/* This is for secondary entrances, for main entrances see type.entrance.main */ "type.entrance" = "Wejście"; +/* This is for main/primary entrances, for secondary entrances see type.entrance */ +"type.entrance.main" = "Główne wejście"; + "type.healthcare.laboratory" = "Laboratorium Medyczne"; "type.healthcare.physiotherapist" = "Fizjoterapeuta"; diff --git a/iphone/Maps/LocalizedStrings/pt-BR.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/pt-BR.lproj/Localizable.strings index ed1960067e..5ca737985a 100644 --- a/iphone/Maps/LocalizedStrings/pt-BR.lproj/Localizable.strings +++ b/iphone/Maps/LocalizedStrings/pt-BR.lproj/Localizable.strings @@ -1849,8 +1849,12 @@ "type.emergency.phone" = "Telefone de emergência"; +/* This is for secondary entrances, for main entrances see type.entrance.main */ "type.entrance" = "Entrada"; +/* This is for main/primary entrances, for secondary entrances see type.entrance */ +"type.entrance.main" = "Entrada principal"; + "type.healthcare.laboratory" = "Laboratório médico"; "type.healthcare.physiotherapist" = "Fisioterapeuta"; diff --git a/iphone/Maps/LocalizedStrings/pt.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/pt.lproj/Localizable.strings index 34a1725ac5..460f668864 100644 --- a/iphone/Maps/LocalizedStrings/pt.lproj/Localizable.strings +++ b/iphone/Maps/LocalizedStrings/pt.lproj/Localizable.strings @@ -1849,8 +1849,12 @@ "type.emergency.phone" = "Telefone de emergência"; +/* This is for secondary entrances, for main entrances see type.entrance.main */ "type.entrance" = "Entrada"; +/* This is for main/primary entrances, for secondary entrances see type.entrance */ +"type.entrance.main" = "Entrada principal"; + "type.healthcare.laboratory" = "Laboratório médico"; "type.healthcare.physiotherapist" = "Fisioterapeuta"; diff --git a/iphone/Maps/LocalizedStrings/ro.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/ro.lproj/Localizable.strings index a8a616b353..4cd793af76 100644 --- a/iphone/Maps/LocalizedStrings/ro.lproj/Localizable.strings +++ b/iphone/Maps/LocalizedStrings/ro.lproj/Localizable.strings @@ -1849,8 +1849,12 @@ "type.emergency.phone" = "Telefon de urgență"; +/* This is for secondary entrances, for main entrances see type.entrance.main */ "type.entrance" = "Intrare"; +/* This is for main/primary entrances, for secondary entrances see type.entrance */ +"type.entrance.main" = "Intrarea principala"; + "type.healthcare.laboratory" = "Laborator medical"; "type.healthcare.physiotherapist" = "Fizioterapeut"; diff --git a/iphone/Maps/LocalizedStrings/ru.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/ru.lproj/Localizable.strings index 7d3483a18b..ce1a3b7aa8 100644 --- a/iphone/Maps/LocalizedStrings/ru.lproj/Localizable.strings +++ b/iphone/Maps/LocalizedStrings/ru.lproj/Localizable.strings @@ -1849,8 +1849,12 @@ "type.emergency.phone" = "Телефон для экстренных вызовов"; +/* This is for secondary entrances, for main entrances see type.entrance.main */ "type.entrance" = "Вход"; +/* This is for main/primary entrances, for secondary entrances see type.entrance */ +"type.entrance.main" = "Главный вход"; + "type.healthcare.laboratory" = "Медицинская лаборатория"; "type.healthcare.physiotherapist" = "Физиотерапевт"; diff --git a/iphone/Maps/LocalizedStrings/sk.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/sk.lproj/Localizable.strings index dbc440edf8..155dfba8cf 100644 --- a/iphone/Maps/LocalizedStrings/sk.lproj/Localizable.strings +++ b/iphone/Maps/LocalizedStrings/sk.lproj/Localizable.strings @@ -1849,8 +1849,12 @@ "type.emergency.phone" = "Tiesňového volania"; +/* This is for secondary entrances, for main entrances see type.entrance.main */ "type.entrance" = "Vstup"; +/* This is for main/primary entrances, for secondary entrances see type.entrance */ +"type.entrance.main" = "Hlavný vchod"; + "type.healthcare.laboratory" = "Lekárske laboratórium"; "type.healthcare.physiotherapist" = "Fyzioterapeut"; diff --git a/iphone/Maps/LocalizedStrings/sv.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/sv.lproj/Localizable.strings index cbaf9930c8..3539a9eb6d 100644 --- a/iphone/Maps/LocalizedStrings/sv.lproj/Localizable.strings +++ b/iphone/Maps/LocalizedStrings/sv.lproj/Localizable.strings @@ -1849,8 +1849,12 @@ "type.emergency.phone" = "Nödtelefon"; +/* This is for secondary entrances, for main entrances see type.entrance.main */ "type.entrance" = "Entré"; +/* This is for main/primary entrances, for secondary entrances see type.entrance */ +"type.entrance.main" = "Huvudentré"; + "type.healthcare.laboratory" = "Medicinskt laboratorium"; "type.healthcare.physiotherapist" = "Fysioterapeut"; diff --git a/iphone/Maps/LocalizedStrings/sw.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/sw.lproj/Localizable.strings index 29069dc633..f81f54ee44 100644 --- a/iphone/Maps/LocalizedStrings/sw.lproj/Localizable.strings +++ b/iphone/Maps/LocalizedStrings/sw.lproj/Localizable.strings @@ -1849,8 +1849,12 @@ "type.emergency.phone" = "Emergency Phone"; +/* This is for secondary entrances, for main entrances see type.entrance.main */ "type.entrance" = "Entrance"; +/* This is for main/primary entrances, for secondary entrances see type.entrance */ +"type.entrance.main" = "Mlango Mkuu"; + "type.healthcare.laboratory" = "Maabara ya Matibabu"; "type.healthcare.physiotherapist" = "Mtaalamu wa Physiotherapist"; diff --git a/iphone/Maps/LocalizedStrings/th.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/th.lproj/Localizable.strings index 6a87be4064..9c45767a4c 100644 --- a/iphone/Maps/LocalizedStrings/th.lproj/Localizable.strings +++ b/iphone/Maps/LocalizedStrings/th.lproj/Localizable.strings @@ -1849,8 +1849,12 @@ "type.emergency.phone" = "โทรศัพท์ฉุกเฉิน"; +/* This is for secondary entrances, for main entrances see type.entrance.main */ "type.entrance" = "ทางเข้า"; +/* This is for main/primary entrances, for secondary entrances see type.entrance */ +"type.entrance.main" = "ทางเข้าหลัก"; + "type.healthcare.laboratory" = "ห้องปฏิบัติการทางการแพทย์"; "type.healthcare.physiotherapist" = "นักกายภาพบำบัด"; diff --git a/iphone/Maps/LocalizedStrings/tr.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/tr.lproj/Localizable.strings index 3db05ebedf..5772d6d29c 100644 --- a/iphone/Maps/LocalizedStrings/tr.lproj/Localizable.strings +++ b/iphone/Maps/LocalizedStrings/tr.lproj/Localizable.strings @@ -1849,8 +1849,12 @@ "type.emergency.phone" = "Acil Telefon"; +/* This is for secondary entrances, for main entrances see type.entrance.main */ "type.entrance" = "Giriş"; +/* This is for main/primary entrances, for secondary entrances see type.entrance */ +"type.entrance.main" = "Ana giriş"; + "type.healthcare.laboratory" = "Tıbbi Laboratuvar"; "type.healthcare.physiotherapist" = "Fizyoterapist"; diff --git a/iphone/Maps/LocalizedStrings/uk.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/uk.lproj/Localizable.strings index cb0bcbfd95..26c12ca60f 100644 --- a/iphone/Maps/LocalizedStrings/uk.lproj/Localizable.strings +++ b/iphone/Maps/LocalizedStrings/uk.lproj/Localizable.strings @@ -1849,8 +1849,12 @@ "type.emergency.phone" = "Аварійний телефон"; +/* This is for secondary entrances, for main entrances see type.entrance.main */ "type.entrance" = "Вхід"; +/* This is for main/primary entrances, for secondary entrances see type.entrance */ +"type.entrance.main" = "Головний вхід"; + "type.healthcare.laboratory" = "Медична лабораторія"; "type.healthcare.physiotherapist" = "Фізіотерапевт"; diff --git a/iphone/Maps/LocalizedStrings/vi.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/vi.lproj/Localizable.strings index df589956ef..7b7a4bf0cb 100644 --- a/iphone/Maps/LocalizedStrings/vi.lproj/Localizable.strings +++ b/iphone/Maps/LocalizedStrings/vi.lproj/Localizable.strings @@ -1849,8 +1849,12 @@ "type.emergency.phone" = "Điện thoại khẩn cấp"; +/* This is for secondary entrances, for main entrances see type.entrance.main */ "type.entrance" = "Lối vào"; +/* This is for main/primary entrances, for secondary entrances see type.entrance */ +"type.entrance.main" = "Lối vào chính"; + "type.healthcare.laboratory" = "Phòng thí nghiệm y tế"; "type.healthcare.physiotherapist" = "Nhà vật lý trị liệu"; diff --git a/iphone/Maps/LocalizedStrings/zh-Hans.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/zh-Hans.lproj/Localizable.strings index cb5d570222..4c459bbe1a 100644 --- a/iphone/Maps/LocalizedStrings/zh-Hans.lproj/Localizable.strings +++ b/iphone/Maps/LocalizedStrings/zh-Hans.lproj/Localizable.strings @@ -1849,8 +1849,12 @@ "type.emergency.phone" = "紧急电话"; +/* This is for secondary entrances, for main entrances see type.entrance.main */ "type.entrance" = "入口"; +/* This is for main/primary entrances, for secondary entrances see type.entrance */ +"type.entrance.main" = "主要入口"; + "type.healthcare.laboratory" = "医学实验室"; "type.healthcare.physiotherapist" = "物理治疗师"; diff --git a/iphone/Maps/LocalizedStrings/zh-Hant.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/zh-Hant.lproj/Localizable.strings index 38da37ec01..ca0dfb5f2c 100644 --- a/iphone/Maps/LocalizedStrings/zh-Hant.lproj/Localizable.strings +++ b/iphone/Maps/LocalizedStrings/zh-Hant.lproj/Localizable.strings @@ -1849,8 +1849,12 @@ "type.emergency.phone" = "緊急電話"; +/* This is for secondary entrances, for main entrances see type.entrance.main */ "type.entrance" = "入口"; +/* This is for main/primary entrances, for secondary entrances see type.entrance */ +"type.entrance.main" = "主要入口"; + "type.healthcare.laboratory" = "醫學實驗室"; "type.healthcare.physiotherapist" = "物理治療師";