diff --git a/android/app/src/main/res/layout/elevation_profile_internal.xml b/android/app/src/main/res/layout/elevation_profile_internal.xml index 6ae665bb74..564b3ade8f 100644 --- a/android/app/src/main/res/layout/elevation_profile_internal.xml +++ b/android/app/src/main/res/layout/elevation_profile_internal.xml @@ -118,7 +118,7 @@ android:layout_marginTop="@dimen/margin_eighth" android:ellipsize="end" android:singleLine="true" - android:text="@string/elevation_profile_maxaltitude" + android:text="@string/elevation_profile_max_elevation" android:textAppearance="@style/MwmTextAppearance.Body5" /> + + - - diff --git a/android/app/src/main/res/layout/place_page_description_layout.xml b/android/app/src/main/res/layout/place_page_description_layout.xml index 9b0175b491..a593d01f7f 100644 --- a/android/app/src/main/res/layout/place_page_description_layout.xml +++ b/android/app/src/main/res/layout/place_page_description_layout.xml @@ -31,7 +31,6 @@ android:layout_gravity="start|bottom" android:layout_marginEnd="@dimen/margin_base" android:layout_marginStart="@dimen/margin_base" - android:layout_marginBottom="@dimen/margin_base" android:textAppearance="?android:attr/textAppearance" android:gravity="start|top" android:textColor="?attr/colorAccent" diff --git a/android/app/src/main/res/values-ar/strings.xml b/android/app/src/main/res/values-ar/strings.xml index 5d2a26f558..2a32161021 100644 --- a/android/app/src/main/res/values-ar/strings.xml +++ b/android/app/src/main/res/values-ar/strings.xml @@ -778,8 +778,8 @@ الطبقة الطبوغرافية ليست متاحة بعد في هذه المنطقة تصاعدي تنازلي - الحد الأدنى للارتفاع - الحد الأقصى للارتفاع + أقل ارتفاع + أعلى ارتفاع درجة الصعوبة المسافة: المدة: diff --git a/android/app/src/main/res/values-az/strings.xml b/android/app/src/main/res/values-az/strings.xml index 2f48295172..0b56f79761 100644 --- a/android/app/src/main/res/values-az/strings.xml +++ b/android/app/src/main/res/values-az/strings.xml @@ -763,8 +763,8 @@ Bu bölgədə relyef təbəqəsi hələ mövcud deyil Qalxmaq Eniş - Min. hündürlük - Maks. hündürlük + Min. hündürlük + Maks. hündürlük Çətinlik Məsafə: Müddət: diff --git a/android/app/src/main/res/values-be/strings.xml b/android/app/src/main/res/values-be/strings.xml index 918438fd12..9b4c0869c3 100644 --- a/android/app/src/main/res/values-be/strings.xml +++ b/android/app/src/main/res/values-be/strings.xml @@ -760,8 +760,8 @@ Мапы рэльефа для гэтай мясцовасці пакуль што няма Пад\'ём Спуск - Мін. вышыня - Макс. вышыня + Мін. вышыня + Макс. вышыня Складанасць Адл.: Час: diff --git a/android/app/src/main/res/values-bg/strings.xml b/android/app/src/main/res/values-bg/strings.xml index 1fe0279b73..77b056adcc 100644 --- a/android/app/src/main/res/values-bg/strings.xml +++ b/android/app/src/main/res/values-bg/strings.xml @@ -689,8 +689,8 @@ Топографският слой все още не е наличен в тази област Изкачване Спускане - Мин. надморска височина - Макс. надморска височина + Мин. височина + Макс. височина Трудност Разст.: Време: diff --git a/android/app/src/main/res/values-ca/strings.xml b/android/app/src/main/res/values-ca/strings.xml index 43f56d5b8d..9b17043711 100644 --- a/android/app/src/main/res/values-ca/strings.xml +++ b/android/app/src/main/res/values-ca/strings.xml @@ -768,8 +768,8 @@ La capa topogràfica encara no és disponible en aquesta àrea Ascens Descens - Altitud mín. - Altitud màx. + Min. elevació + Màx. elevació Dificultat Dist.: Temps: diff --git a/android/app/src/main/res/values-cs/strings.xml b/android/app/src/main/res/values-cs/strings.xml index 3184853a46..bc90000c24 100644 --- a/android/app/src/main/res/values-cs/strings.xml +++ b/android/app/src/main/res/values-cs/strings.xml @@ -736,8 +736,8 @@ Topografická vrstva není v této oblasti ještě dostupná Stoupání Klesání - Min. nadmořská výška - Max. nadmořská výška + Min. výška + Max. výška Obtížnost Vzdál.: Čas: diff --git a/android/app/src/main/res/values-da/strings.xml b/android/app/src/main/res/values-da/strings.xml index 89049e2114..5ffb6d48fe 100644 --- a/android/app/src/main/res/values-da/strings.xml +++ b/android/app/src/main/res/values-da/strings.xml @@ -726,8 +726,8 @@ Det topografiske lag er endnu ikke tilgængeligt i dette område Stige op Stige ned - Min. højde - Maks. højde + Min. højde + Maks. højde Vanskelighed Afs.: Tid: diff --git a/android/app/src/main/res/values-de/strings.xml b/android/app/src/main/res/values-de/strings.xml index 6e25a1e24c..b73fcccaf4 100644 --- a/android/app/src/main/res/values-de/strings.xml +++ b/android/app/src/main/res/values-de/strings.xml @@ -765,8 +765,8 @@ Topographieebene ist für dieses Gebiet noch nicht verfügbar Bergauf Bergab - Min. Höhe - Max. Höhe + Min. Höhe + Max. Höhe Schwierigkeitsgrad Entf.: Dauer: diff --git a/android/app/src/main/res/values-el/strings.xml b/android/app/src/main/res/values-el/strings.xml index e7cbe711de..d228b0dbe4 100644 --- a/android/app/src/main/res/values-el/strings.xml +++ b/android/app/src/main/res/values-el/strings.xml @@ -764,8 +764,8 @@ Οι υψομετρικές γραμμές δεν είναι ακόμα διαθέσιμες σε αυτή την περιοχή Ανάβαση Κατάβαση - Ελάχ. υψόμετρο - Μέγ. υψόμετρο + Ελάχ. υψόμετρο + Μέγ. υψόμετρο Δυσκολία Απόστ.: Διάρκ: diff --git a/android/app/src/main/res/values-es-rMX/strings.xml b/android/app/src/main/res/values-es-rMX/strings.xml index 6f5b0e484a..cadfbd2fe9 100644 --- a/android/app/src/main/res/values-es-rMX/strings.xml +++ b/android/app/src/main/res/values-es-rMX/strings.xml @@ -200,8 +200,8 @@ La altitud de relieve no está aún disponible en esta región Ascenso Descenso - Altura mínima - Altura máxima + Min. elevación + Máx. elevación Dificultad Distancia: Lapso: diff --git a/android/app/src/main/res/values-es/strings.xml b/android/app/src/main/res/values-es/strings.xml index 2297167129..238d1d9b43 100644 --- a/android/app/src/main/res/values-es/strings.xml +++ b/android/app/src/main/res/values-es/strings.xml @@ -763,8 +763,8 @@ La altitud de relieve aún no está disponible en esta región Ascenso Descenso - Altura mínima - Altura máxima + Min. elevación + Máx. elevación Dificultad Dist.: Tiempo: diff --git a/android/app/src/main/res/values-et/strings.xml b/android/app/src/main/res/values-et/strings.xml index b616c2a692..456e67a868 100644 --- a/android/app/src/main/res/values-et/strings.xml +++ b/android/app/src/main/res/values-et/strings.xml @@ -759,8 +759,8 @@ Topograafiline kiht ei ole selles piirkonnas veel saadaval Tõus Langus - Min. kõrgus - Maks. kõrgus + Min. kõrgus + Maks. kõrgus Raskusaste Kaugus: Aeg: diff --git a/android/app/src/main/res/values-eu/strings.xml b/android/app/src/main/res/values-eu/strings.xml index 0082c1ddf6..0b83092d19 100644 --- a/android/app/src/main/res/values-eu/strings.xml +++ b/android/app/src/main/res/values-eu/strings.xml @@ -763,8 +763,8 @@ Erliebearen altitudea oraindik ez dago eskuragarri eskualde honetan Maldan gora Maldan behera - Gutxieneko altuera - Gehieneko altuera + Min. altuera + Max. altuera Zailtasuna Distantzia: Denbora: diff --git a/android/app/src/main/res/values-fa/strings.xml b/android/app/src/main/res/values-fa/strings.xml index 3c120c617d..dcab7de4e0 100644 --- a/android/app/src/main/res/values-fa/strings.xml +++ b/android/app/src/main/res/values-fa/strings.xml @@ -724,8 +724,8 @@ لایه توپوگرافی هنوز برای این منطقه در دسترس نیست بالا رفتن پایین آمدن - کمینه ارتفاع - بیشینه ارتفاع + کم ارتفاع + بیش ارتفاع دشواری مسافت زمان: diff --git a/android/app/src/main/res/values-fi/strings.xml b/android/app/src/main/res/values-fi/strings.xml index c2ec85f61f..24a37a058d 100644 --- a/android/app/src/main/res/values-fi/strings.xml +++ b/android/app/src/main/res/values-fi/strings.xml @@ -764,8 +764,8 @@ Korkeuskäyrät eivät ole vielä saatavilla tällä alueella Nousua Laskua - Min. korkeus - Maks. korkeus + Min. korkeus + Max. korkeus Vaikeus Etäisyys: Aika: diff --git a/android/app/src/main/res/values-fr/strings.xml b/android/app/src/main/res/values-fr/strings.xml index 161553e5b2..289df247b9 100644 --- a/android/app/src/main/res/values-fr/strings.xml +++ b/android/app/src/main/res/values-fr/strings.xml @@ -770,8 +770,8 @@ Les lignes d\'élévation ne sont pas encore disponibles dans cette région Montée Descente - Hauteur minimale - Hauteur maximale + Min. élévation + Max. élévation Difficulté Distance : Temps : diff --git a/android/app/src/main/res/values-hu/strings.xml b/android/app/src/main/res/values-hu/strings.xml index 6adfbd2190..05f30702cb 100644 --- a/android/app/src/main/res/values-hu/strings.xml +++ b/android/app/src/main/res/values-hu/strings.xml @@ -741,8 +741,8 @@ Ezen a területen a topográfiai réteg még nem elérhető Felemelkedés Leereszkedés - Min. magasság - Max. magasság + Min. magasság + Max. magasság Nehézség Táv.: Idő diff --git a/android/app/src/main/res/values-in/strings.xml b/android/app/src/main/res/values-in/strings.xml index 1a56e1ba8d..fc43b1a49f 100644 --- a/android/app/src/main/res/values-in/strings.xml +++ b/android/app/src/main/res/values-in/strings.xml @@ -730,8 +730,8 @@ Lapisan topografi belum tersedia untuk wilayah ini Menanjak Menurun - Ketinggian Min. - Ketinggian Maks. + Min. tinggi + Maks. tinggi Kesulitan Jarak: Waktu: diff --git a/android/app/src/main/res/values-it/strings.xml b/android/app/src/main/res/values-it/strings.xml index 816ec7c04a..5e4851f778 100644 --- a/android/app/src/main/res/values-it/strings.xml +++ b/android/app/src/main/res/values-it/strings.xml @@ -752,8 +752,8 @@ La modalità topografica per questa regione non è ancora disponibile Salita Discesa - Altitudine minima - Altitudine massima + Min. elevazione + Max. elevazione Difficoltà Dist.: Tempo: diff --git a/android/app/src/main/res/values-iw/strings.xml b/android/app/src/main/res/values-iw/strings.xml index 0031b40c75..fd6fa1502e 100644 --- a/android/app/src/main/res/values-iw/strings.xml +++ b/android/app/src/main/res/values-iw/strings.xml @@ -760,8 +760,8 @@ קווי מתאר עוד לא זמינים לאזור זה עלייה ירידה - גובה מינימלי - גובה מקסימלי + מינ\' גובה + מקס\' גובה קושי מרחק: זמן: diff --git a/android/app/src/main/res/values-ja/strings.xml b/android/app/src/main/res/values-ja/strings.xml index 5339efff66..61a710c666 100644 --- a/android/app/src/main/res/values-ja/strings.xml +++ b/android/app/src/main/res/values-ja/strings.xml @@ -766,8 +766,8 @@ 地形レイヤーはこの地域ではまだ利用できません 上昇 下降 - 最小高度 - 最大高度 + 最小標高 + 最大標高 難易度 距離： 時間： diff --git a/android/app/src/main/res/values-ko/strings.xml b/android/app/src/main/res/values-ko/strings.xml index 6145b28a2f..9093bd7868 100644 --- a/android/app/src/main/res/values-ko/strings.xml +++ b/android/app/src/main/res/values-ko/strings.xml @@ -728,8 +728,8 @@ 이 지역의 지형 레이어는 아직 사용할 수 없습니다 올라가기 내려가기 - 산 최소 높이 - 산 최대 높이 + 최소 높이 + 최대 높이 난이도 거리: 소비 시간: diff --git a/android/app/src/main/res/values-lv/strings.xml b/android/app/src/main/res/values-lv/strings.xml index b56fbaf24f..f2d0e6f5d3 100644 --- a/android/app/src/main/res/values-lv/strings.xml +++ b/android/app/src/main/res/values-lv/strings.xml @@ -768,8 +768,8 @@ Topogrāfiskais slānis šim reģionam nav pieejams Kāpums Kritums - Zemākais punkts - Augstākais punkts + Zemākais punkts + Augstākais punkts Sarežģītība Attālums: Laiks: diff --git a/android/app/src/main/res/values-mr/strings.xml b/android/app/src/main/res/values-mr/strings.xml index 9c3868e40e..a8d821dd74 100644 --- a/android/app/src/main/res/values-mr/strings.xml +++ b/android/app/src/main/res/values-mr/strings.xml @@ -732,8 +732,8 @@ या भागात भूस्वरूप स्तर अद्याप उपलब्ध नाही चढण उतरण - किमान उच्चता - कमाल उच्चता + किमान उंची + कमाल उंची काठिण्य अंतर.: वेळ: diff --git a/android/app/src/main/res/values-nb/strings.xml b/android/app/src/main/res/values-nb/strings.xml index 099ab0352b..3b1afbc9cd 100644 --- a/android/app/src/main/res/values-nb/strings.xml +++ b/android/app/src/main/res/values-nb/strings.xml @@ -763,8 +763,8 @@ Høydekurver er ikke tilgjengelige i dette området ennå Stigning Nedstigning - Min. høyde - Maks. høyde + Min. høyde + Maks. høyde Vanskelighet Avstand: I rute diff --git a/android/app/src/main/res/values-nl/strings.xml b/android/app/src/main/res/values-nl/strings.xml index ddc44ac420..3d5cc3a0ca 100644 --- a/android/app/src/main/res/values-nl/strings.xml +++ b/android/app/src/main/res/values-nl/strings.xml @@ -763,8 +763,8 @@ Hoogtelijnen zijn nog niet beschikbaar in deze regio Stijging Daling - Min. hoogte - Max. hoogte + Min. hoogte + Max. hoogte Moeilijkheid Afst.: Tijd: diff --git a/android/app/src/main/res/values-pl/strings.xml b/android/app/src/main/res/values-pl/strings.xml index 083dac5181..5a7295ff56 100644 --- a/android/app/src/main/res/values-pl/strings.xml +++ b/android/app/src/main/res/values-pl/strings.xml @@ -769,8 +769,8 @@ Poziomice nie są jeszcze dostępne w tym regionie Wejście Zejście - Min. wysokość - Maks. wysokość + Min. wysokość + Maks. wysokość Trudność Odległ.: Trasa: diff --git a/android/app/src/main/res/values-pt-rBR/strings.xml b/android/app/src/main/res/values-pt-rBR/strings.xml index b8332d6e0a..fb539ad996 100644 --- a/android/app/src/main/res/values-pt-rBR/strings.xml +++ b/android/app/src/main/res/values-pt-rBR/strings.xml @@ -691,8 +691,8 @@ Relevo Para ativar e usar a camada Relevo, atualize ou baixe o mapa da região A camada Relevo ainda não está disponível para esta região - Altitude mínima - Altitude máxima + Min. elevação + Máx. elevação Dist.: Tempo: Use o zoom para explorar as isolinhas diff --git a/android/app/src/main/res/values-pt/strings.xml b/android/app/src/main/res/values-pt/strings.xml index 8c306ecdef..75b3a01f24 100644 --- a/android/app/src/main/res/values-pt/strings.xml +++ b/android/app/src/main/res/values-pt/strings.xml @@ -741,8 +741,8 @@ A camada Terreno ainda não está disponível nesta área Subida Descida - Altura mínima - Altura máxima + Min. elevação + Máx. elevação Dificuldade Distância: Tempo: diff --git a/android/app/src/main/res/values-ro/strings.xml b/android/app/src/main/res/values-ro/strings.xml index 141c7a0eb8..9af8f3fece 100644 --- a/android/app/src/main/res/values-ro/strings.xml +++ b/android/app/src/main/res/values-ro/strings.xml @@ -751,8 +751,8 @@ Stratul topografic nu este încă disponibil în această zonă Urcare Coborâre - Înălțime minimă - Înălțime maximă + Min. altitudine + Max. altitudine Dificultate Dist.: Timp: diff --git a/android/app/src/main/res/values-ru/strings.xml b/android/app/src/main/res/values-ru/strings.xml index d64671a258..a5d7efbd72 100644 --- a/android/app/src/main/res/values-ru/strings.xml +++ b/android/app/src/main/res/values-ru/strings.xml @@ -777,8 +777,8 @@ Линии высот пока не доступны в этом регионе Подъём Спуск - Мин. высота - Макс. высота + Мин. высота + Макс. высота Сложность Расст.: В пути: diff --git a/android/app/src/main/res/values-sk/strings.xml b/android/app/src/main/res/values-sk/strings.xml index a3159b83b4..a610fcb107 100644 --- a/android/app/src/main/res/values-sk/strings.xml +++ b/android/app/src/main/res/values-sk/strings.xml @@ -763,8 +763,8 @@ Topografická vrstva ešte nie je v tejto oblasti k dispozícii Stúpanie Klesanie - Min. nadmorská výška - Max. nadmorská výška + Min. výška + Max. výška Obtiažnosť Vzdial.: Čas: diff --git a/android/app/src/main/res/values-sr/strings.xml b/android/app/src/main/res/values-sr/strings.xml index 4dea0e58a0..ad22142033 100644 --- a/android/app/src/main/res/values-sr/strings.xml +++ b/android/app/src/main/res/values-sr/strings.xml @@ -767,8 +767,6 @@ Изолиније нису доступне за ову област Успон Спуст - Мин. висина - Макс. висина Тежина Удаљ.: Време: @@ -878,1348 +876,4 @@ Нема инсталираних апликација које могу да отворе локацију. Аутоматски у навигацији - - - Адресе/Блок - Адресе/Блок - Адресе/Блок - Гондола - Ваздушни трамвај - Ски лифт - Ски-лифт једносед - Гондола - Комбинована жичара - Станица жичаре - Ваздушна инфраструктура - Аеродром - Интернационални аеродром - Перон - Капија за укрцавање - Хелиодром - Писта - Рулна стаза - Терминал - Инфраструктурни објекти - Центар уметности - Банкомат - Банка - Бар - Грил - Клупа - Паркинг за бицикле - Рентирање бицикли - Станица за поправку бицикла - Пивска башта - Јавна кућа - Мењачница - Аутобуска станица - Кафе - Рента кар - Дељење аутомобила - Перионица - Казино - Коцкарница - Центар за игру одраслих - Играоница за одрасле - Станица за пуњење ЕВ - Станица за пуњење бицикла - Станица за пуњење аутомобила - Вртић - Биоскоп - Куглана - Поликлиника - Факултет - Дом културе - Компримовани ваздух - Конференцијски центар - Суд - Зубар - Доктор - Вода за пиће - Вода за пиће - Аутошкола - Изложбени центар - Трансфер новца - Музичка школа - Школа језика - Амбасада - Брза храна - Трајект - Ватрогасна станица - Ресторанска башта - Фонтана - Гасна станица - - Гробље - - Хришћанско гробље - Болница - Ловачка чека - Сладолед - Интернет кафе - Вртић - Библиотека - Утоварна станица - Маркет - Паркинг за мотоцикле - Ноћни клуб - Старачки дом - Паркинг - Паркинг - Вишеспратни паркинг - Вишеспратни паркинг - Приватни паркинг - Приватни паркинг - Приватни паркинг - Паркирај и вози паркинг - Подземни паркинг - Подземни паркинг - Приватни подземни паркинг - Паркинг поред пута - Паркинг поред пута - Приватни паркинг поред пута - Линијски паркинг - Линијски паркинг - Приватни линијски паркинг - Улаз на паркинг - Улаз на приватни паркинг - Улаз на паркинг - Паркинг место - Паркинг место - Паркинг место - Паркинг место - Паркинг место за инвалиде - Терминал за наплату - Апотека - Храм - Будистички храм - Црква - Црква Исуса Христа светаца последњих дана - Сала краљевства Јеховиних сведока - Хинду храм - Синагога - Џамија - Шинтоистички храм - Таоистички храм - Полиција - Поштанско сандуче - Пошта - Затвор - Паб - Размена књига - - - Центар за рециклажу - Контејнер за рециклажу - Контејнер за рециклажу - Бетерије - Стара одећа - Стаклене флаше - Папир - Пластика - Пластићне флаше - Старо гвожђе - Елекрто отпад - Картон - Конзерве - Ципеле - Биолошки отпад - Картон и папир - Ресторан - Станица за одлагање резервоара - Школа - - Склониште - - Склониште - - Колиба за ноћење - - Склониште типа шупе - Јавно купатило - Туш - Стриптиз клуб - Такси станица - Телефон - Позориште - Тоалет - Тоалет - Градска скупштина - Универзитет - Аутомат - Аутомат за цигаре - Аутомат за кафу - Аутомат за кондоме - Аутомат за пиће - Аутомат за храну - Аутомат за новине - Паркомат - Аутомат за продају карата - Аутомат за слаткише - Кесе за псећи измет - Пакетомат - Контрола возила - Пумпа за гориво - Ветеринар - Канте за смеће - Контејнер за смеће - Станица за прераду отпада - Чесма - Чесма - Баријера - Блок - Стуб - Гранична контрола - Ланац - Градски зид - Бедем - Канал - Шанац - Отпадна вода - Пролаз - Ограда - Капија - Жива ограда - Капија - Рампа - Подзида - Прелаз преко ограде - Окретна капија - Рампа - Наплатна рампа - Зид - Граница - Административна граница - - Гранични прелаз - - Регионална граница - - Регионална граница - Национални парк - Домородачка земља - Заштићено подручје - Заштићено подручје - Заштићено подручје - Заштићено подручје - Заштићено подручје - Заштићено подручје - Заштићено подручје - Зграда - - Адресе - Зграда - Зграда - Гаража - Станична зграда - Депо - Гробље - Занатлије - Пчелар - Ковач - Пивара - Угоститељ - Столар - Посластичарница - Електрика - Сервис електричних уређаја - Баштован - Млин - Занатска радионица - - Грејање, вентилација и климатизација - Нарезивање кључева - Бравар - Металне конструкције - Молер - Фотограф - Продавница фотоапарата - Водоинсталатер - Стругара - Обућар - Винарија - Атеље - Афричка - Америчка - Арапска - Аргентинска - Азијска - Аустријска - Багел - Балканска - Роштиљ - Баварска - Говедина - Бразилска - Доручак - Боба теа - Хамбургер - Таверна - Колачи - Карибска - Пилетина - Кинеска - Кафа - Палачинке - Хрватска - Кари - Деликатеси - Ресторан - Крофне - Етиопијска - Филипинска - Ексклузивни ресторан - Риба - Риба и помфрит - Француска - Пржена храна - Грусијска - Немачка - Грчка - Грил - Винска таверна - Hotdog - Мађарска - Сладолед - Индијска - Индонежанска - Интернационална - Ирска - Италијанска - Пица - Јапанска - Кебаб - Кореанска - Лаоска - Либанска - Локална - Мадагасарска - Малезијска - Медитеранска - Мексичка - Мароканска - Резанца - Оријентална - Палачинкарница - Паста - Персијска - Перуанска - Пица - Пољска - Португалска - Рамен (јапанска супа са резанцима) - Регионална - Руска - Сендвич - Кобасица - Слане палачинке - Морски плодови - Соба - Шпанска - Стек - Суши - Тапас - Чај - Тајландска - Турска - Веганска - Вегетаријанска - Вијетнамска - Хитна служба - Сабирно место за хитне случајеве - Дефибрилатор - Пожарни хидрант - Ургентни телефон - - Улаз - - Главни улаз - Излаз - Бесплатно - Медисинска лабораторија - Физиотерапеут - Алтернативна медицина - Аудиологија - Завод за трансфузију крви - Оптометрија - Педијатрија - Психотерапеут - Прикупљање анализа - Логопед - - - Аутопут - Коњска стаза - - Мост - Коњска стаза - - Тунел - Наменски аутобуски пут - - Мост - - Тунел - Аутобуска станица - Пут у изградњи - Бициклистичка стаза - - Мост - Бициклистичка стаза - - Тунел - Лифт - Пешачка стаза - Тротоар - Пешачки прелаз - Пешачка зона - - Пасарела - - Пешачки тунел - Брод - Улица у стамбеној зони - - Мост - - Тунел - Мото пут - - Мото пут мост - - Мото пут тунел - Излаз са аутопута - Излаз с мото пута - - Мост - - Тунел - Пут - - Тешка или слабо видљива стаза - - Веома тежак или нејасна стаза - Пут за бициклисте и пешаке - Пут за бициклисте и пешаке - - Мост - Коњска стаза - - Тунел - Пешачка улица - Пешачка зона - - Пешачки мост - - Пешачки тунел - Пут прве класе - - Мост - - Тунел - Пристипни пут - - Мост - - Тунел - Тркачка стаза - Стамбена улица - Стамбена улица - - Мост - - Тунел - Одмориште - Пут - - Мост - - Мост - - Тунел - Пут друге класе - - Мост - - Тунел - Излаз са пута - - Мост - - Тунел - Сервисни пут - Сервисни пут - - Мост - Прилаз - Пут на паркингу - - Тунел - Сервисна зона - Прекршајна камера - Мердевине - - Мост - - Тунел - Пут треће класе - - Мост - - Тунел - Пут треће класе - - Мост - - Тунел - Макадам - Макадам - - Мост - Макадам - Макадам - - Тунел - Семафор - Улица - - Мост - - Тунел - Улица - - Мост - - Тунел - Не класификовани пут - Не класификовани пут - - Мост - - Тунел - Бициклистичка стаза - Пешачка стаза - Улица у стамбеној зони - Мото пут - Пут - Пешачка улица - Пут прве класе - Стамбена улица - Пут друге класе - Сервисни пут - Пут треће класе - Мердевине - Макадам - Улица - Не класификовани пут - - - Историјски објект - Историјски авион - Историјско сидро - Археолошко налазиште - Историјско бојно поље - Гранични камен - Топ - Замак - Римска тврђава - Замак - Утврђена црква - Тврђава - Тврђава - Кремљ - Каштел - Палата - Јапански каштел - Замак - Градска капија - Градски зид - Хисар - Вешала - Историјска локомотива - Мемориал - Спомен крст - Спомен плоча - Скулптура - Статуа - Столперстеин - Историјски камен - Војни меморијал - Историјски рудник - Споменик - Стуб срама - Историјске рушевине - Лађа - Историјски тенк - Гробница - Крст на путу - Светилиште поред пута - Историјски бродолом - Интернет - Интернет - Раскрсница - Кружни ток - Кружни ток - Пољопривредно земљиште - Парцела - Резервоар - Грађевинско земљиште - - Гробље - - Хришћанско гробље - Црква двориште - Кмерцијална област - Градилиште - Образовне установе - Пољопривредно земљиште - Пољопривредно земљиште - Поље - Цветно острво - Шума - Четинарска шума - Листопадна шума - Шума - Гаража - Травњак - Грађевинско земљиште - Стакленици - Индустријска зона - Депонија - Ливада - Војна област - Воћњак - Каменолом - Железничке просторије - Простор за рекреацију - Вештачко језеро - Стамбена зона - Пословна зона - Слано језеро - Зеленило - Виноград - Слободно време - Јавно земљиште - Парк за псе - Фитнес центар - Фитнес станица - Плесна дворана - Башта - Врт у дворишту - Терен за голф - Мини голф - Клизалиште - Марина - Природни резерват - Седење на отвореном - Парк - Парк - Парк - Парк - Сто за пикник - Спортски терен - Игралиште - Сауна - Навоз - Спортски центар - Зид за пењање - Јога студио - Стадион - Базен - Приватни базен - Тркачка стаза - Тркачка стаза - Водени парк - Ресорт на плажи - Грађевинске структуре - Лукобран - Димњак - Шумски пут - Геодетска тачка - Јарбол са заставом - Светионик - Јарбол - Док - Цевовод - Подземни цевовод - Силос - Резервоар - Сигурносна камера - Торањ - Телекомуникациони торањ - Пречишћивач отпадних вода - Javna чесма - Javna чесма - Водоторањ - Бунар - Бунар - Ветрењача - Фабрика - Војска - Бункер - Планински превој - Природа - - Камењар - - Шљунак - - Камени крш - Залив - Плажа - Пешчана плажа - Шљунковита плажа - Рт - Пећина - Литица - Насип - Насип - Обала - Пустиња - Гејзир - Глечер - Пашњак - Пуста земља - Термални извор - Језеро - Преводница - Језерце - Резервоар - Природни базен - Река - Земљиште - Ливада - Воћњак - Гора - Планинско седло - Камен - Шикара - Извор - Извор - Теснац - Дрворед - Виноград - Вулкан - Вода - Мочвара - Тресет - Мочвара - Крај пута - Канцеларија - Компанија - Агент за некретнине - Владина канцеларија - Осигурање - Адвокат - НВО - Мобилни оператер - Еко - Еко - Град - Главни град - Град - Град - Главни град - Град - Град - Град - Град - Град - Град - Град - Континент - Држава - Округ - Фарма - Село - Острво - Острвце - Изолована кућа - Локалитет - Насеље - Океан - Регион - Море - Трг - Држава - Држава - Кварт - Град - Село - Енергетика - Генератор - Соларни генератор - Ветрогенератор - Гаснотурбинска електрана - Хидроелектрана - Далековод - Подземни далековод - Електрана - Термоелектрана - Гаснотурбинска електрана - Хидроелектрана - Соларна електрана - Ветропарк - Електрична станица - Подстаница - Далековод - Површина - Лош асфалт - Добар асфалт - Лош макадам - Добар макадам - Јавни превоз - Стајалиште јавног превоза - Железница - Напуштена пруга - Напуштен железнички мост - Напуштен железнички тунел - Пруга у изградњи - Пружни прелаз - Напуштена пруга - Успињача - Железничка станица - Пружни прелаз - Железнички семафор - Лака железница - Jednošinska pruga - Jednošinskи мост - Jednošinskи тунел - Пруга уског колосека - Железнички перон - Туристичка пруга - Пруга - Пруга велике брзине - Туристичка железница - Железница - - Секундарна железница - - Индустријска пруга - Железнички чвор - - Помоћна железничка пруга - Железнички мост - Железнички мост - Железнички мост - Железнички мост - Железнички мост - Железнички мост - Железнички мост - Железнички мост - Железнички тунел - Железнички тунел - Железнички тунел - Железнички тунел - Железнички тунел - Железнички тунел - Железнички тунел - Железнички тунел - Железничка станица - Успињача - Железничка станица - Железничка станица - Железничка станица - Железничка станица - Железничка станица - Метро станица - Метро станица - Метро станица - Метро станица - Метро станица - Метро станица - Метро станица - Метро станица - Метро станица - Метро станица - Метро станица - Метро станица - Метро станица - Метро станица - Метро станица - Метро станица - Метро станица - Метро станица - Метро станица - Метро станица - Метро станица - Метро станица - Метро станица - Метро станица - Метро станица - Метро станица - Метро станица - Метро станица - Метро станица - Метро станица - Метро станица - Метро станица - Метро станица - Метро станица - Метро станица - Метро станица - Метро станица - Метро станица - Метро станица - Метро станица - Метро станица - Метро станица - Метро станица - Метро станица - Метро станица - Метро станица - Метро станица - Метро станица - Метро станица - Метро станица - Метро станица - Метро станица - Метро станица - Метро станица - Метро станица - Метро станица - Метро станица - Метро станица - Метро станица - Метро станица - Метро станица - Метро станица - Метро станица - Метро станица - Метро станица - Метро станица - Метро станица - Метро станица - Метро станица - Метро станица - Метро станица - Метро станица - Метро станица - Метро станица - Метро станица - Метро станица - Метро станица - Метро станица - Метро станица - Метро станица - Метро станица - Метро станица - Метро станица - Метро станица - Метро станица - Метро станица - Метро станица - Метро станица - Метро станица - Метро станица - Метро станица - Метро станица - Метро станица - Метро станица - Метро станица - Метро станица - Метро станица - Метро станица - Метро станица - Метро станица - Метро станица - Метро станица - Метро станица - Метро станица - Метро станица - Метро станица - Метро станица - Метро станица - Метро станица - Метро станица - Метро станица - Метро станица - Метро станица - Метро станица - Метро - Метро мост - Метро тунел - Улаз у метро - Улаз у метро - Улаз у метро - Улаз у метро - Улаз у метро - Улаз у метро - Улаз у метро - Улаз у метро - Улаз у метро - Улаз у метро - Улаз у метро - Улаз у метро - Улаз у метро - Улаз у метро - Улаз у метро - Улаз у метро - Улаз у метро - Улаз у метро - Улаз у метро - Улаз у метро - Улаз у метро - Улаз у метро - Улаз у метро - Улаз у метро - Улаз у метро - Улаз у метро - Улаз у метро - Улаз у метро - Улаз у метро - Улаз у метро - Улаз у метро - Улаз у метро - Улаз у метро - Улаз у метро - Улаз у метро - Улаз у метро - Улаз у метро - Улаз у метро - Улаз у метро - Улаз у метро - Улаз у метро - Улаз у метро - Улаз у метро - Улаз у метро - Улаз у метро - Улаз у метро - Улаз у метро - Улаз у метро - Улаз у метро - Улаз у метро - Улаз у метро - Улаз у метро - Улаз у метро - Улаз у метро - Улаз у метро - Улаз у метро - Улаз у метро - Улаз у метро - Улаз у метро - Улаз у метро - Улаз у метро - Улаз у метро - Улаз у метро - Улаз у метро - Улаз у метро - Улаз у метро - Улаз у метро - Улаз у метро - Улаз у метро - Улаз у метро - Улаз у метро - Улаз у метро - Улаз у метро - Улаз у метро - Улаз у метро - Улаз у метро - Улаз у метро - Улаз у метро - Улаз у метро - Улаз у метро - Улаз у метро - Улаз у метро - Улаз у метро - Улаз у метро - Улаз у метро - Улаз у метро - Улаз у метро - Улаз у метро - Улаз у метро - Улаз у метро - Улаз у метро - Улаз у метро - Улаз у метро - Улаз у метро - Улаз у метро - Улаз у метро - Улаз у метро - Улаз у метро - Улаз у метро - Улаз у метро - Улаз у метро - Улаз у метро - Улаз у метро - Улаз у метро - Улаз у метро - Улаз у метро - Улаз у метро - Улаз у метро - Улаз у метро - Улаз у метро - Улаз у метро - Улаз у метро - Улаз у метро - Улаз у метро - Трамвај - Трамвајски мост - Трамвајски тунел - Трамвајска станица - Рута - Трајект - Продавница - Продавница пића - Пекара - Намештај за купатило - Козметички салон - Пића - Продавница бисикла - Кладионица - Књижара - Месара - Канабис шоп - Продаја аута - Ауто делови - Ауто сервис - Гуме - Продаја каравана - Продавница тепиха - Кућна хемија - Чоколада - Одећа - Кафа - Компјутери - Слаткиши - Мешовита роба - Копирница - Козметика - Завесе - Десликатеси - Тржни центар - Грађевинска радња - Хемијско чишћење - Електроника - Секс шоп - Текстил - Пиљара - Модни аксесоар - Цвећара - Погребна опрема - Намештај - Баштенски производи - Индустријски гасови - Даротека - Поврће и воће - Бакалница - Фризерска опрема - Гвожђара - Здрава храна - Продавница биља - HiFi аудио - Кућне потрепштине - Златара - Киоск - Пилетина - Перионица веша - Мол - Масажа - Мобилни телефони - Лихвар - Мотори - Сервис мотора - Музика - Музички инструменти - Новинарница - Оптика - Пешачење, пењање и камповање - Пакетамап - Тестенине - Посластичарница - Залагаоница - Пет шоп - Грумер - Фотограф - Центар за изнајмљивање - Изнајмљивање бицикла - Рибарница - Половна одећа - Обућа - Спорт - Књижара - Супермаркет - Тетоважа - Чајеви - Билетарница - Играчке - Туристичка агенција - Гуме - Мешовита роба - Видео клуб - Видео игре - Винарија - Пољопривредна опрема - Антикварница - Продавница апарата - - Уметнички радови - Беби опрема - Торбе - Постељина - Бутик - Добротворна радња - Сир - Уметност и занати - Млечни производи - Електро материјал - Рибарница - Унутрашње декорације - Лото - Фармацеутска компанија - Суплементи - Фарбара - Парфимерија - Материјали за шивење - Изнајмљивање складишта - Дуван - Занатске потрепштине - Сатови - Велепродаја - Спорт - Амерички фудбал - Стреличарство - Атлетика - Аустралијски фудбал - Бејзбол - Кошарка - Одбојка на песку - Куглање - Шах - Крикет - Карлинг - Коњички спорт - Голф - Гимнастика - Рукомет - Разни спортови - - Роњење - Стрељана - Скејтборд - Скијање - Фудбал - Пливање - Стони тенис - Тенис - Одбојка - Куглање - Куглање - Падел - Футсал - Хокеј - Хокеј на трави - Бадминтон - Баскијска пелота - Туризам - Акваријум - - Планинарска колиба - Апартман за одмор - Уметничка скулптура - Архитектонско уметничко дело - Уметничко дело - Скулптура - Статуа - Атракција - Забавни парк - Золошки врт - Аутићи на струју - Историјска атракција - Лавиринт - Ролеркостер - Тобоган - Атракција - Камп - Камп за караване - - Викендица - Уметничка галерија - Кућа духова - Хостел - Хотел - Туристичке информације - Информациона табла - Путоказ - Туристичка мапа - Туристички биро - Центар за посетиоце - Мотел - Музеј - Пикник - Ресорт хотел - Забавни парк - Видиковац - - Планинска кућа за туристе - Золошки врт - Контактни зоо-врт - Пешачки прелаз - Лежећи полицајац (грба) - Лежећи полицајац - Водени ток - Канал - Тунел у каналу - Рибљи пут - Брана - Јарак - Канал - Канал - Преводница - Канал - Канал - Канал - Капија - Река - Река - Поток - Повремени поток - Повремени поток - Поток - Водопад - Брана - Приступ инвалидским колицима - Лимитирани приступ инвалидским колицима - Није приступно инвалидским колицима - Пун приступ инвалидским колицима - Жичара са Ј пречком - Магични тепих - Жичара са тањир седиштем - Вучно уже - Жичара са Т седиштем - Спуст стаза - Спуст стаза - Скијање за напредне - Скијање за напредне - Скијање за почетнике - Скијање за почетнике - Скијање за професионалце - Скијање за професионалце - Бесплатно скијање - Средња ски стаза - Средња ски стаза - Скијање за потпуне почетнике - Скијање за потпуне почетнике - Стаза за нордијско скијање - Стаза за санкање - Стаза за санкање - Снежни парк - Снежна стаза за ходање - Веза између стаза - Ски-тур стаза - Место одржавања догађаја - Аукција - Колекционарство - Доступно самопослужење - Самопослуживање - Делимично самопослуживање - Нема самопослуживања - - Социјална установа - - Улаз у хитну помоћ - - Дојо - - Спортска хала diff --git a/android/app/src/main/res/values-sv/strings.xml b/android/app/src/main/res/values-sv/strings.xml index dcfe4e9e7f..ae2c5114b1 100644 --- a/android/app/src/main/res/values-sv/strings.xml +++ b/android/app/src/main/res/values-sv/strings.xml @@ -728,8 +728,8 @@ Höjningslinjer är ännu inte tillgängligt i den här regionen Stigning Backe - Min. höjd - Max. höjd + Min. höjd + Max. höjd Svårighet Avst.: Tid: diff --git a/android/app/src/main/res/values-sw/strings.xml b/android/app/src/main/res/values-sw/strings.xml index 97232af31e..3626e206b3 100644 --- a/android/app/src/main/res/values-sw/strings.xml +++ b/android/app/src/main/res/values-sw/strings.xml @@ -304,8 +304,8 @@ Tabaka la sura ya nchi bado haipatikani katika eneo hili Upandaji Ushukaji - Mwinuko wa chini kabisa - Mwinuko wa juu kabisa + Min. mwinuko + Max. mwinuko Ugumu Umbali: Muda: diff --git a/android/app/src/main/res/values-th/strings.xml b/android/app/src/main/res/values-th/strings.xml index 34bd6634b1..8b9050142b 100644 --- a/android/app/src/main/res/values-th/strings.xml +++ b/android/app/src/main/res/values-th/strings.xml @@ -731,8 +731,8 @@ เลเยอร์แผนที่ภูมิประเทศยังใช้งานไม่ได้ในพื้นที่นี้ การขึ้น การลง - ระดับความสูงต่ำสุด - ระดับความสูงสูงสุด + ต่ำสุด + สูงสุด ลำบาก ระยะทาง เวลา: diff --git a/android/app/src/main/res/values-tr/strings.xml b/android/app/src/main/res/values-tr/strings.xml index 4417065ffe..05e429e7b6 100644 --- a/android/app/src/main/res/values-tr/strings.xml +++ b/android/app/src/main/res/values-tr/strings.xml @@ -766,8 +766,8 @@ Arazi katmanı henüz bu bölgede mevcut değil Tırmanış İniş - Min. rakım - Maks. rakım + Min. yükselti + Maks. yükselti Zorluk Mesafe: Süre: diff --git a/android/app/src/main/res/values-uk/strings.xml b/android/app/src/main/res/values-uk/strings.xml index 7c16ba35b1..d30b1a2f0a 100644 --- a/android/app/src/main/res/values-uk/strings.xml +++ b/android/app/src/main/res/values-uk/strings.xml @@ -772,8 +772,8 @@ Лінії висот ще недоступні в цьому регіоні Підйом Спуск - Мін. висота - Макс. висота + Мін. висота + Макс. висота Складність Відст.: Шлях: diff --git a/android/app/src/main/res/values-vi/strings.xml b/android/app/src/main/res/values-vi/strings.xml index 8647fd9bf4..8c41caf898 100644 --- a/android/app/src/main/res/values-vi/strings.xml +++ b/android/app/src/main/res/values-vi/strings.xml @@ -729,8 +729,8 @@ Đường hiển thị độ cao hiện chưa khả dụng tại khu vực này Đi lên Đi xuống - Độ cao tối thiểu - Độ cao tối đa + Min. độ cao + Max. độ cao Độ khó Khoảng cách Giờ: diff --git a/android/app/src/main/res/values-zh-rTW/strings.xml b/android/app/src/main/res/values-zh-rTW/strings.xml index 362119f9c6..62565890c6 100644 --- a/android/app/src/main/res/values-zh-rTW/strings.xml +++ b/android/app/src/main/res/values-zh-rTW/strings.xml @@ -776,8 +776,8 @@ 暫時無法獲取該地區的等高線 上坡 下坡 - 最小高度 - 最大高度 + 最低高度 + 最高高度 難度 距離： 時間： diff --git a/android/app/src/main/res/values-zh/strings.xml b/android/app/src/main/res/values-zh/strings.xml index 277ff2a28c..5dc017e388 100644 --- a/android/app/src/main/res/values-zh/strings.xml +++ b/android/app/src/main/res/values-zh/strings.xml @@ -776,8 +776,8 @@ 暂时无法获取该地区的等高线 上坡 下坡 - 最小高度 - 最大高度 + 最低高度 + 最高高度 难度 距离： 时间： diff --git a/android/app/src/main/res/values/strings.xml b/android/app/src/main/res/values/strings.xml index 8653fc5337..a4abae65e8 100644 --- a/android/app/src/main/res/values/strings.xml +++ b/android/app/src/main/res/values/strings.xml @@ -796,8 +796,8 @@ Contour lines are not yet available in this area Ascent Descent - Min. altitude - Max. altitude + Min. elevation + Max. elevation Difficulty Dist.: Time: diff --git a/data/categories.txt b/data/categories.txt index c03f7f38e3..e3ff487ade 100644 --- a/data/categories.txt +++ b/data/categories.txt @@ -56,14 +56,14 @@ # ::= translation into corresponding language # ::= 'en'|'cs'|'sk'|'de'|'es'|'fr'|'it'|'ja' etc. # -# For all languages with nominative and gentive cases (e.g. Slavic languagues like Russian, +# For all languages with nominative and gentive cases (e.g. Slavic languagues like Russian, # Ukrainian, Belarus, Serbian), state _short_ nouns in nominative and genitive case, e.g.: # --- # shop-wine|@shop # ru:Вино|вина # --- # so that both (e.g. Russian) searches for "вино" and "магазин вина" returns wine shops. -# For longer nouns (6 letters or longer) this is not necessary, because error correction +# For longer nouns (6 letters or longer) this is not necessary, because error correction # can fix 1 or 2 letters, e.g: # --- # shop-furniture|@shop @@ -5638,6 +5638,7 @@ it:4Ospedale ja:病院 ko:병원|개인병원|클리닉|의사|의사가 lv:4Slimnīca + mr:रुग्णालय|हॉस्पिटल nb:5Sykehus pl:4Szpital @@ -12293,45 +12294,6 @@ uk:4Геодезичний пункт mr:सर्वेक्षण बिंदू|सर्व्हे पॉइंट es:punto geodésico -man_made-flagpole -en:Flagpole -ar:سارية علم -be:Флагшток -de:Fahnenmast -es:Mástil de bandera -et:Lipumast -fi:Lipputanko -fr:Mât de drapeau -he:עמוד דגל -it:Alza bandiera -mr:ध्वजस्तंभ -nl:Vlaggenpaal -pl:Maszt flagowy -ru:Флагшток -sk:Vlajkový stožiar -tr:Bayrak Direği -uk:Флагшток -zh-Hans:旗杆 -zh-Hant:旗桿 - -man_made-mast -en:Mast|pole -ar:عمود برج -be:Мачта|вышка -de:Mast -es:Mástil -et:Mast -fr:Mât -he:תורן -it:Pilone -mr:डोलकाठी -nl:Mast -pl:Maszt -ru:Мачта|вышка -sk:Stožiar -tr:Direk -uk:Щогла|вишка - man_made-tower-communication en:Communications Tower|cell tower|cellular tower ar:برج الاتصالات diff --git a/data/drules_proto.bin b/data/drules_proto.bin index c4edd00f59..2c7789e06d 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 7146c02d44..fd99f0d7fd 100644 --- a/data/drules_proto.txt +++ b/data/drules_proto.txt @@ -22723,7 +22723,7 @@ cont { lines { width: 5.0 color: 1307438043 - priority: 154 + priority: 50 cap: BUTTCAP } lines { @@ -22733,7 +22733,7 @@ cont { dd: 2.0 dd: 2.0 } - priority: 153 + priority: 40 cap: BUTTCAP } path_text { @@ -22759,7 +22759,7 @@ cont { lines { width: 7.0 color: 1307438043 - priority: 154 + priority: 50 cap: BUTTCAP } lines { @@ -22769,7 +22769,7 @@ cont { dd: 2.0 dd: 2.0 } - priority: 153 + priority: 40 cap: BUTTCAP } path_text { @@ -22795,7 +22795,7 @@ cont { lines { width: 9.0 color: 1307438043 - priority: 154 + priority: 50 cap: BUTTCAP } lines { @@ -22805,7 +22805,7 @@ cont { dd: 2.0 dd: 2.0 } - priority: 153 + priority: 40 cap: BUTTCAP } path_text { @@ -22831,7 +22831,7 @@ cont { lines { width: 9.0 color: 1307438043 - priority: 154 + priority: 50 cap: BUTTCAP } lines { @@ -22841,7 +22841,7 @@ cont { dd: 2.0 dd: 2.0 } - priority: 153 + priority: 40 cap: BUTTCAP } path_text { @@ -23825,7 +23825,7 @@ cont { lines { width: 4.8 color: 1307438043 - priority: 154 + priority: 50 cap: BUTTCAP } lines { @@ -23835,7 +23835,7 @@ cont { dd: 2.0 dd: 2.0 } - priority: 153 + priority: 40 cap: BUTTCAP } path_text { @@ -23857,7 +23857,7 @@ cont { lines { width: 7.2 color: 1307438043 - priority: 154 + priority: 50 cap: BUTTCAP } lines { @@ -23867,7 +23867,7 @@ cont { dd: 2.0 dd: 2.0 } - priority: 153 + priority: 40 cap: BUTTCAP } path_text { @@ -23889,7 +23889,7 @@ cont { lines { width: 8.6 color: 1307438043 - priority: 154 + priority: 50 cap: BUTTCAP } lines { @@ -23899,7 +23899,7 @@ cont { dd: 2.0 dd: 2.0 } - priority: 153 + priority: 40 cap: BUTTCAP } path_text { @@ -23921,7 +23921,7 @@ cont { lines { width: 8.6 color: 1307438043 - priority: 154 + priority: 50 cap: BUTTCAP } lines { @@ -23931,7 +23931,7 @@ cont { dd: 2.0 dd: 2.0 } - priority: 153 + priority: 40 cap: BUTTCAP } path_text { @@ -25181,7 +25181,7 @@ cont { lines { width: 5.8 color: 1307438043 - priority: 154 + priority: 50 cap: BUTTCAP } lines { @@ -25191,7 +25191,7 @@ cont { dd: 2.0 dd: 2.0 } - priority: 153 + priority: 40 cap: BUTTCAP } path_text { @@ -25217,7 +25217,7 @@ cont { lines { width: 7.4 color: 1307438043 - priority: 154 + priority: 50 cap: BUTTCAP } lines { @@ -25227,7 +25227,7 @@ cont { dd: 2.0 dd: 2.0 } - priority: 153 + priority: 40 cap: BUTTCAP } path_text { @@ -25253,7 +25253,7 @@ cont { lines { width: 9.4 color: 1307438043 - priority: 154 + priority: 50 cap: BUTTCAP } lines { @@ -25263,7 +25263,7 @@ cont { dd: 2.0 dd: 2.0 } - priority: 153 + priority: 40 cap: BUTTCAP } path_text { @@ -25289,7 +25289,7 @@ cont { lines { width: 9.4 color: 1307438043 - priority: 154 + priority: 50 cap: BUTTCAP } lines { @@ -25299,7 +25299,7 @@ cont { dd: 2.0 dd: 2.0 } - priority: 153 + priority: 40 cap: BUTTCAP } path_text { @@ -29269,7 +29269,7 @@ cont { lines { width: 5.0 color: 1307438043 - priority: 154 + priority: 50 cap: BUTTCAP } lines { @@ -29279,7 +29279,7 @@ cont { dd: 2.0 dd: 2.0 } - priority: 153 + priority: 40 cap: BUTTCAP } path_text { @@ -29305,7 +29305,7 @@ cont { lines { width: 6.6 color: 1307438043 - priority: 154 + priority: 50 cap: BUTTCAP } lines { @@ -29315,7 +29315,7 @@ cont { dd: 2.0 dd: 2.0 } - priority: 153 + priority: 40 cap: BUTTCAP } path_text { @@ -29341,7 +29341,7 @@ cont { lines { width: 8.4 color: 1307438043 - priority: 154 + priority: 50 cap: BUTTCAP } lines { @@ -29351,7 +29351,7 @@ cont { dd: 2.0 dd: 2.0 } - priority: 153 + priority: 40 cap: BUTTCAP } path_text { @@ -29377,7 +29377,7 @@ cont { lines { width: 8.4 color: 1307438043 - priority: 154 + priority: 50 cap: BUTTCAP } lines { @@ -29387,7 +29387,7 @@ cont { dd: 2.0 dd: 2.0 } - priority: 153 + priority: 40 cap: BUTTCAP } path_text { @@ -36270,7 +36270,7 @@ cont { lines { width: 7.0 color: 1307438043 - priority: 154 + priority: 50 cap: BUTTCAP } lines { @@ -36280,7 +36280,7 @@ cont { dd: 2.0 dd: 2.0 } - priority: 153 + priority: 40 cap: BUTTCAP } path_text { @@ -36306,7 +36306,7 @@ cont { lines { width: 9.0 color: 1307438043 - priority: 154 + priority: 50 cap: BUTTCAP } lines { @@ -36316,7 +36316,7 @@ cont { dd: 2.0 dd: 2.0 } - priority: 153 + priority: 40 cap: BUTTCAP } path_text { @@ -36342,7 +36342,7 @@ cont { lines { width: 11.0 color: 1307438043 - priority: 154 + priority: 50 cap: BUTTCAP } lines { @@ -36352,7 +36352,7 @@ cont { dd: 2.0 dd: 2.0 } - priority: 153 + priority: 40 cap: BUTTCAP } path_text { @@ -36378,7 +36378,7 @@ cont { lines { width: 11.0 color: 1307438043 - priority: 154 + priority: 50 cap: BUTTCAP } lines { @@ -36388,7 +36388,7 @@ cont { dd: 2.0 dd: 2.0 } - priority: 153 + priority: 40 cap: BUTTCAP } path_text { @@ -38427,7 +38427,7 @@ cont { lines { width: 6.0 color: 1307438043 - priority: 154 + priority: 50 cap: BUTTCAP } lines { @@ -38437,7 +38437,7 @@ cont { dd: 2.0 dd: 2.0 } - priority: 153 + priority: 40 cap: BUTTCAP } path_text { @@ -38463,7 +38463,7 @@ cont { lines { width: 7.6 color: 1307438043 - priority: 154 + priority: 50 cap: BUTTCAP } lines { @@ -38473,7 +38473,7 @@ cont { dd: 2.0 dd: 2.0 } - priority: 153 + priority: 40 cap: BUTTCAP } path_text { @@ -38499,7 +38499,7 @@ cont { lines { width: 9.4 color: 1307438043 - priority: 154 + priority: 50 cap: BUTTCAP } lines { @@ -38509,7 +38509,7 @@ cont { dd: 2.0 dd: 2.0 } - priority: 153 + priority: 40 cap: BUTTCAP } path_text { @@ -38535,7 +38535,7 @@ cont { lines { width: 9.4 color: 1307438043 - priority: 154 + priority: 50 cap: BUTTCAP } lines { @@ -38545,7 +38545,7 @@ cont { dd: 2.0 dd: 2.0 } - priority: 153 + priority: 40 cap: BUTTCAP } path_text { @@ -74480,7 +74480,7 @@ cont { lines { width: 4.0 color: 871230427 - priority: 150 + priority: 50 cap: BUTTCAP } lines { @@ -74495,7 +74495,7 @@ cont { lines { width: 4.4 color: 871230427 - priority: 150 + priority: 50 cap: BUTTCAP } lines { @@ -74510,7 +74510,7 @@ cont { lines { width: 4.8 color: 871230427 - priority: 150 + priority: 50 cap: BUTTCAP } lines { @@ -74525,13 +74525,13 @@ cont { lines { width: 7.0 color: 1300267136 - priority: 140 + priority: 40 cap: BUTTCAP } lines { width: 5.8 color: 871230427 - priority: 150 + priority: 50 cap: BUTTCAP } lines { @@ -74554,13 +74554,13 @@ cont { lines { width: 10.0 color: 1300267136 - priority: 140 + priority: 40 cap: BUTTCAP } lines { width: 8.6 color: 871230427 - priority: 150 + priority: 50 cap: BUTTCAP } lines { @@ -74583,13 +74583,13 @@ cont { lines { width: 12.8 color: 1300267136 - priority: 140 + priority: 40 cap: BUTTCAP } lines { width: 11.0 color: 871230427 - priority: 150 + priority: 50 cap: BUTTCAP } lines { @@ -74612,13 +74612,13 @@ cont { lines { width: 12.8 color: 1300267136 - priority: 140 + priority: 40 cap: BUTTCAP } lines { width: 11.0 color: 871230427 - priority: 150 + priority: 50 cap: BUTTCAP } lines { @@ -74641,13 +74641,13 @@ cont { lines { width: 12.8 color: 1300267136 - priority: 140 + priority: 40 cap: BUTTCAP } lines { width: 11.0 color: 871230427 - priority: 150 + priority: 50 cap: BUTTCAP } lines { @@ -80094,7 +80094,7 @@ cont { element { scale: 12 symbol { - name: "funicular-s" + name: "train-s" priority: 6250 } caption { @@ -80118,7 +80118,7 @@ cont { element { scale: 13 symbol { - name: "funicular-s" + name: "train-s" priority: 6250 } caption { @@ -80142,7 +80142,7 @@ cont { element { scale: 14 symbol { - name: "funicular-s" + name: "train-s" priority: 6250 } caption { diff --git a/data/drules_proto_default_dark.bin b/data/drules_proto_default_dark.bin index 506d6ad45e..36940196b1 100644 Binary files a/data/drules_proto_default_dark.bin and b/data/drules_proto_default_dark.bin differ diff --git a/data/drules_proto_default_dark.txt b/data/drules_proto_default_dark.txt index ee539287ed..34686d9207 100644 --- a/data/drules_proto_default_dark.txt +++ b/data/drules_proto_default_dark.txt @@ -21464,7 +21464,7 @@ cont { lines { width: 5.0 color: 1294740506 - priority: 154 + priority: 50 cap: BUTTCAP } lines { @@ -21474,7 +21474,7 @@ cont { dd: 2.0 dd: 2.0 } - priority: 153 + priority: 40 cap: BUTTCAP } path_text { @@ -21500,7 +21500,7 @@ cont { lines { width: 7.0 color: 1294740506 - priority: 154 + priority: 50 cap: BUTTCAP } lines { @@ -21510,7 +21510,7 @@ cont { dd: 2.0 dd: 2.0 } - priority: 153 + priority: 40 cap: BUTTCAP } path_text { @@ -21536,7 +21536,7 @@ cont { lines { width: 9.0 color: 1294740506 - priority: 154 + priority: 50 cap: BUTTCAP } lines { @@ -21546,7 +21546,7 @@ cont { dd: 2.0 dd: 2.0 } - priority: 153 + priority: 40 cap: BUTTCAP } path_text { @@ -21572,7 +21572,7 @@ cont { lines { width: 9.0 color: 1294740506 - priority: 154 + priority: 50 cap: BUTTCAP } lines { @@ -21582,7 +21582,7 @@ cont { dd: 2.0 dd: 2.0 } - priority: 153 + priority: 40 cap: BUTTCAP } path_text { @@ -22486,7 +22486,7 @@ cont { lines { width: 4.8 color: 1294740506 - priority: 154 + priority: 50 cap: BUTTCAP } lines { @@ -22496,7 +22496,7 @@ cont { dd: 2.0 dd: 2.0 } - priority: 153 + priority: 40 cap: BUTTCAP } path_text { @@ -22518,7 +22518,7 @@ cont { lines { width: 7.2 color: 1294740506 - priority: 154 + priority: 50 cap: BUTTCAP } lines { @@ -22528,7 +22528,7 @@ cont { dd: 2.0 dd: 2.0 } - priority: 153 + priority: 40 cap: BUTTCAP } path_text { @@ -22550,7 +22550,7 @@ cont { lines { width: 8.6 color: 1294740506 - priority: 154 + priority: 50 cap: BUTTCAP } lines { @@ -22560,7 +22560,7 @@ cont { dd: 2.0 dd: 2.0 } - priority: 153 + priority: 40 cap: BUTTCAP } path_text { @@ -22582,7 +22582,7 @@ cont { lines { width: 8.6 color: 1294740506 - priority: 154 + priority: 50 cap: BUTTCAP } lines { @@ -22592,7 +22592,7 @@ cont { dd: 2.0 dd: 2.0 } - priority: 153 + priority: 40 cap: BUTTCAP } path_text { @@ -23437,7 +23437,7 @@ cont { lines { width: 5.8 color: 1294740506 - priority: 154 + priority: 50 cap: BUTTCAP } lines { @@ -23447,7 +23447,7 @@ cont { dd: 2.0 dd: 2.0 } - priority: 153 + priority: 40 cap: BUTTCAP } path_text { @@ -23473,7 +23473,7 @@ cont { lines { width: 7.4 color: 1294740506 - priority: 154 + priority: 50 cap: BUTTCAP } lines { @@ -23483,7 +23483,7 @@ cont { dd: 2.0 dd: 2.0 } - priority: 153 + priority: 40 cap: BUTTCAP } path_text { @@ -23509,7 +23509,7 @@ cont { lines { width: 9.4 color: 1294740506 - priority: 154 + priority: 50 cap: BUTTCAP } lines { @@ -23519,7 +23519,7 @@ cont { dd: 2.0 dd: 2.0 } - priority: 153 + priority: 40 cap: BUTTCAP } path_text { @@ -23545,7 +23545,7 @@ cont { lines { width: 9.4 color: 1294740506 - priority: 154 + priority: 50 cap: BUTTCAP } lines { @@ -23555,7 +23555,7 @@ cont { dd: 2.0 dd: 2.0 } - priority: 153 + priority: 40 cap: BUTTCAP } path_text { @@ -27300,7 +27300,7 @@ cont { lines { width: 5.0 color: 1294740506 - priority: 154 + priority: 50 cap: BUTTCAP } lines { @@ -27310,7 +27310,7 @@ cont { dd: 2.0 dd: 2.0 } - priority: 153 + priority: 40 cap: BUTTCAP } path_text { @@ -27336,7 +27336,7 @@ cont { lines { width: 6.6 color: 1294740506 - priority: 154 + priority: 50 cap: BUTTCAP } lines { @@ -27346,7 +27346,7 @@ cont { dd: 2.0 dd: 2.0 } - priority: 153 + priority: 40 cap: BUTTCAP } path_text { @@ -27372,7 +27372,7 @@ cont { lines { width: 8.4 color: 1294740506 - priority: 154 + priority: 50 cap: BUTTCAP } lines { @@ -27382,7 +27382,7 @@ cont { dd: 2.0 dd: 2.0 } - priority: 153 + priority: 40 cap: BUTTCAP } path_text { @@ -27408,7 +27408,7 @@ cont { lines { width: 8.4 color: 1294740506 - priority: 154 + priority: 50 cap: BUTTCAP } lines { @@ -27418,7 +27418,7 @@ cont { dd: 2.0 dd: 2.0 } - priority: 153 + priority: 40 cap: BUTTCAP } path_text { @@ -34073,7 +34073,7 @@ cont { lines { width: 7.0 color: 1294740506 - priority: 154 + priority: 50 cap: BUTTCAP } lines { @@ -34083,7 +34083,7 @@ cont { dd: 2.0 dd: 2.0 } - priority: 153 + priority: 40 cap: BUTTCAP } path_text { @@ -34109,7 +34109,7 @@ cont { lines { width: 9.0 color: 1294740506 - priority: 154 + priority: 50 cap: BUTTCAP } lines { @@ -34119,7 +34119,7 @@ cont { dd: 2.0 dd: 2.0 } - priority: 153 + priority: 40 cap: BUTTCAP } path_text { @@ -34145,7 +34145,7 @@ cont { lines { width: 11.0 color: 1294740506 - priority: 154 + priority: 50 cap: BUTTCAP } lines { @@ -34155,7 +34155,7 @@ cont { dd: 2.0 dd: 2.0 } - priority: 153 + priority: 40 cap: BUTTCAP } path_text { @@ -34181,7 +34181,7 @@ cont { lines { width: 11.0 color: 1294740506 - priority: 154 + priority: 50 cap: BUTTCAP } lines { @@ -34191,7 +34191,7 @@ cont { dd: 2.0 dd: 2.0 } - priority: 153 + priority: 40 cap: BUTTCAP } path_text { @@ -36059,7 +36059,7 @@ cont { lines { width: 6.0 color: 1294740506 - priority: 154 + priority: 50 cap: BUTTCAP } lines { @@ -36069,7 +36069,7 @@ cont { dd: 2.0 dd: 2.0 } - priority: 153 + priority: 40 cap: BUTTCAP } path_text { @@ -36095,7 +36095,7 @@ cont { lines { width: 7.6 color: 1294740506 - priority: 154 + priority: 50 cap: BUTTCAP } lines { @@ -36105,7 +36105,7 @@ cont { dd: 2.0 dd: 2.0 } - priority: 153 + priority: 40 cap: BUTTCAP } path_text { @@ -36131,7 +36131,7 @@ cont { lines { width: 9.4 color: 1294740506 - priority: 154 + priority: 50 cap: BUTTCAP } lines { @@ -36141,7 +36141,7 @@ cont { dd: 2.0 dd: 2.0 } - priority: 153 + priority: 40 cap: BUTTCAP } path_text { @@ -36167,7 +36167,7 @@ cont { lines { width: 9.4 color: 1294740506 - priority: 154 + priority: 50 cap: BUTTCAP } lines { @@ -36177,7 +36177,7 @@ cont { dd: 2.0 dd: 2.0 } - priority: 153 + priority: 40 cap: BUTTCAP } path_text { @@ -70252,7 +70252,7 @@ cont { lines { width: 4.0 color: 858532890 - priority: 150 + priority: 50 cap: BUTTCAP } lines { @@ -70267,7 +70267,7 @@ cont { lines { width: 4.4 color: 858532890 - priority: 150 + priority: 50 cap: BUTTCAP } lines { @@ -70282,7 +70282,7 @@ cont { lines { width: 4.8 color: 858532890 - priority: 150 + priority: 50 cap: BUTTCAP } lines { @@ -70297,13 +70297,13 @@ cont { lines { width: 7.0 color: 1297109072 - priority: 140 + priority: 40 cap: BUTTCAP } lines { width: 5.8 color: 858532890 - priority: 150 + priority: 50 cap: BUTTCAP } lines { @@ -70326,13 +70326,13 @@ cont { lines { width: 10.0 color: 1297109072 - priority: 140 + priority: 40 cap: BUTTCAP } lines { width: 8.6 color: 858532890 - priority: 150 + priority: 50 cap: BUTTCAP } lines { @@ -70355,13 +70355,13 @@ cont { lines { width: 12.8 color: 1297109072 - priority: 140 + priority: 40 cap: BUTTCAP } lines { width: 11.0 color: 858532890 - priority: 150 + priority: 50 cap: BUTTCAP } lines { @@ -70384,13 +70384,13 @@ cont { lines { width: 12.8 color: 1297109072 - priority: 140 + priority: 40 cap: BUTTCAP } lines { width: 11.0 color: 858532890 - priority: 150 + priority: 50 cap: BUTTCAP } lines { @@ -70413,13 +70413,13 @@ cont { lines { width: 12.8 color: 1297109072 - priority: 140 + priority: 40 cap: BUTTCAP } lines { width: 11.0 color: 858532890 - priority: 150 + priority: 50 cap: BUTTCAP } lines { @@ -75594,7 +75594,7 @@ cont { element { scale: 12 symbol { - name: "funicular-s" + name: "train-s" priority: 6250 } caption { @@ -75618,7 +75618,7 @@ cont { element { scale: 13 symbol { - name: "funicular-s" + name: "train-s" priority: 6250 } caption { @@ -75642,7 +75642,7 @@ cont { element { scale: 14 symbol { - name: "funicular-s" + name: "train-s" priority: 6250 } caption { diff --git a/data/drules_proto_default_light.bin b/data/drules_proto_default_light.bin index c77aa6cfe1..830a7f03fd 100644 Binary files a/data/drules_proto_default_light.bin and b/data/drules_proto_default_light.bin differ diff --git a/data/drules_proto_default_light.txt b/data/drules_proto_default_light.txt index 32246d03ca..4ccaba5da7 100644 --- a/data/drules_proto_default_light.txt +++ b/data/drules_proto_default_light.txt @@ -21464,7 +21464,7 @@ cont { lines { width: 5.0 color: 1307438043 - priority: 154 + priority: 50 cap: BUTTCAP } lines { @@ -21474,7 +21474,7 @@ cont { dd: 2.0 dd: 2.0 } - priority: 153 + priority: 40 cap: BUTTCAP } path_text { @@ -21500,7 +21500,7 @@ cont { lines { width: 7.0 color: 1307438043 - priority: 154 + priority: 50 cap: BUTTCAP } lines { @@ -21510,7 +21510,7 @@ cont { dd: 2.0 dd: 2.0 } - priority: 153 + priority: 40 cap: BUTTCAP } path_text { @@ -21536,7 +21536,7 @@ cont { lines { width: 9.0 color: 1307438043 - priority: 154 + priority: 50 cap: BUTTCAP } lines { @@ -21546,7 +21546,7 @@ cont { dd: 2.0 dd: 2.0 } - priority: 153 + priority: 40 cap: BUTTCAP } path_text { @@ -21572,7 +21572,7 @@ cont { lines { width: 9.0 color: 1307438043 - priority: 154 + priority: 50 cap: BUTTCAP } lines { @@ -21582,7 +21582,7 @@ cont { dd: 2.0 dd: 2.0 } - priority: 153 + priority: 40 cap: BUTTCAP } path_text { @@ -22486,7 +22486,7 @@ cont { lines { width: 4.8 color: 1307438043 - priority: 154 + priority: 50 cap: BUTTCAP } lines { @@ -22496,7 +22496,7 @@ cont { dd: 2.0 dd: 2.0 } - priority: 153 + priority: 40 cap: BUTTCAP } path_text { @@ -22518,7 +22518,7 @@ cont { lines { width: 7.2 color: 1307438043 - priority: 154 + priority: 50 cap: BUTTCAP } lines { @@ -22528,7 +22528,7 @@ cont { dd: 2.0 dd: 2.0 } - priority: 153 + priority: 40 cap: BUTTCAP } path_text { @@ -22550,7 +22550,7 @@ cont { lines { width: 8.6 color: 1307438043 - priority: 154 + priority: 50 cap: BUTTCAP } lines { @@ -22560,7 +22560,7 @@ cont { dd: 2.0 dd: 2.0 } - priority: 153 + priority: 40 cap: BUTTCAP } path_text { @@ -22582,7 +22582,7 @@ cont { lines { width: 8.6 color: 1307438043 - priority: 154 + priority: 50 cap: BUTTCAP } lines { @@ -22592,7 +22592,7 @@ cont { dd: 2.0 dd: 2.0 } - priority: 153 + priority: 40 cap: BUTTCAP } path_text { @@ -23437,7 +23437,7 @@ cont { lines { width: 5.8 color: 1307438043 - priority: 154 + priority: 50 cap: BUTTCAP } lines { @@ -23447,7 +23447,7 @@ cont { dd: 2.0 dd: 2.0 } - priority: 153 + priority: 40 cap: BUTTCAP } path_text { @@ -23473,7 +23473,7 @@ cont { lines { width: 7.4 color: 1307438043 - priority: 154 + priority: 50 cap: BUTTCAP } lines { @@ -23483,7 +23483,7 @@ cont { dd: 2.0 dd: 2.0 } - priority: 153 + priority: 40 cap: BUTTCAP } path_text { @@ -23509,7 +23509,7 @@ cont { lines { width: 9.4 color: 1307438043 - priority: 154 + priority: 50 cap: BUTTCAP } lines { @@ -23519,7 +23519,7 @@ cont { dd: 2.0 dd: 2.0 } - priority: 153 + priority: 40 cap: BUTTCAP } path_text { @@ -23545,7 +23545,7 @@ cont { lines { width: 9.4 color: 1307438043 - priority: 154 + priority: 50 cap: BUTTCAP } lines { @@ -23555,7 +23555,7 @@ cont { dd: 2.0 dd: 2.0 } - priority: 153 + priority: 40 cap: BUTTCAP } path_text { @@ -27234,7 +27234,7 @@ cont { lines { width: 5.0 color: 1307438043 - priority: 154 + priority: 50 cap: BUTTCAP } lines { @@ -27244,7 +27244,7 @@ cont { dd: 2.0 dd: 2.0 } - priority: 153 + priority: 40 cap: BUTTCAP } path_text { @@ -27270,7 +27270,7 @@ cont { lines { width: 6.6 color: 1307438043 - priority: 154 + priority: 50 cap: BUTTCAP } lines { @@ -27280,7 +27280,7 @@ cont { dd: 2.0 dd: 2.0 } - priority: 153 + priority: 40 cap: BUTTCAP } path_text { @@ -27306,7 +27306,7 @@ cont { lines { width: 8.4 color: 1307438043 - priority: 154 + priority: 50 cap: BUTTCAP } lines { @@ -27316,7 +27316,7 @@ cont { dd: 2.0 dd: 2.0 } - priority: 153 + priority: 40 cap: BUTTCAP } path_text { @@ -27342,7 +27342,7 @@ cont { lines { width: 8.4 color: 1307438043 - priority: 154 + priority: 50 cap: BUTTCAP } lines { @@ -27352,7 +27352,7 @@ cont { dd: 2.0 dd: 2.0 } - priority: 153 + priority: 40 cap: BUTTCAP } path_text { @@ -33893,7 +33893,7 @@ cont { lines { width: 7.0 color: 1307438043 - priority: 154 + priority: 50 cap: BUTTCAP } lines { @@ -33903,7 +33903,7 @@ cont { dd: 2.0 dd: 2.0 } - priority: 153 + priority: 40 cap: BUTTCAP } path_text { @@ -33929,7 +33929,7 @@ cont { lines { width: 9.0 color: 1307438043 - priority: 154 + priority: 50 cap: BUTTCAP } lines { @@ -33939,7 +33939,7 @@ cont { dd: 2.0 dd: 2.0 } - priority: 153 + priority: 40 cap: BUTTCAP } path_text { @@ -33965,7 +33965,7 @@ cont { lines { width: 11.0 color: 1307438043 - priority: 154 + priority: 50 cap: BUTTCAP } lines { @@ -33975,7 +33975,7 @@ cont { dd: 2.0 dd: 2.0 } - priority: 153 + priority: 40 cap: BUTTCAP } path_text { @@ -34001,7 +34001,7 @@ cont { lines { width: 11.0 color: 1307438043 - priority: 154 + priority: 50 cap: BUTTCAP } lines { @@ -34011,7 +34011,7 @@ cont { dd: 2.0 dd: 2.0 } - priority: 153 + priority: 40 cap: BUTTCAP } path_text { @@ -35855,7 +35855,7 @@ cont { lines { width: 6.0 color: 1307438043 - priority: 154 + priority: 50 cap: BUTTCAP } lines { @@ -35865,7 +35865,7 @@ cont { dd: 2.0 dd: 2.0 } - priority: 153 + priority: 40 cap: BUTTCAP } path_text { @@ -35891,7 +35891,7 @@ cont { lines { width: 7.6 color: 1307438043 - priority: 154 + priority: 50 cap: BUTTCAP } lines { @@ -35901,7 +35901,7 @@ cont { dd: 2.0 dd: 2.0 } - priority: 153 + priority: 40 cap: BUTTCAP } path_text { @@ -35927,7 +35927,7 @@ cont { lines { width: 9.4 color: 1307438043 - priority: 154 + priority: 50 cap: BUTTCAP } lines { @@ -35937,7 +35937,7 @@ cont { dd: 2.0 dd: 2.0 } - priority: 153 + priority: 40 cap: BUTTCAP } path_text { @@ -35963,7 +35963,7 @@ cont { lines { width: 9.4 color: 1307438043 - priority: 154 + priority: 50 cap: BUTTCAP } lines { @@ -35973,7 +35973,7 @@ cont { dd: 2.0 dd: 2.0 } - priority: 153 + priority: 40 cap: BUTTCAP } path_text { @@ -70037,7 +70037,7 @@ cont { lines { width: 4.0 color: 871230427 - priority: 150 + priority: 50 cap: BUTTCAP } lines { @@ -70052,7 +70052,7 @@ cont { lines { width: 4.4 color: 871230427 - priority: 150 + priority: 50 cap: BUTTCAP } lines { @@ -70067,7 +70067,7 @@ cont { lines { width: 4.8 color: 871230427 - priority: 150 + priority: 50 cap: BUTTCAP } lines { @@ -70082,13 +70082,13 @@ cont { lines { width: 7.0 color: 1300267136 - priority: 140 + priority: 40 cap: BUTTCAP } lines { width: 5.8 color: 871230427 - priority: 150 + priority: 50 cap: BUTTCAP } lines { @@ -70111,13 +70111,13 @@ cont { lines { width: 10.0 color: 1300267136 - priority: 140 + priority: 40 cap: BUTTCAP } lines { width: 8.6 color: 871230427 - priority: 150 + priority: 50 cap: BUTTCAP } lines { @@ -70140,13 +70140,13 @@ cont { lines { width: 12.8 color: 1300267136 - priority: 140 + priority: 40 cap: BUTTCAP } lines { width: 11.0 color: 871230427 - priority: 150 + priority: 50 cap: BUTTCAP } lines { @@ -70169,13 +70169,13 @@ cont { lines { width: 12.8 color: 1300267136 - priority: 140 + priority: 40 cap: BUTTCAP } lines { width: 11.0 color: 871230427 - priority: 150 + priority: 50 cap: BUTTCAP } lines { @@ -70198,13 +70198,13 @@ cont { lines { width: 12.8 color: 1300267136 - priority: 140 + priority: 40 cap: BUTTCAP } lines { width: 11.0 color: 871230427 - priority: 150 + priority: 50 cap: BUTTCAP } lines { @@ -75379,7 +75379,7 @@ cont { element { scale: 12 symbol { - name: "funicular-s" + name: "train-s" priority: 6250 } caption { @@ -75403,7 +75403,7 @@ cont { element { scale: 13 symbol { - name: "funicular-s" + name: "train-s" priority: 6250 } caption { @@ -75427,7 +75427,7 @@ cont { element { scale: 14 symbol { - name: "funicular-s" + name: "train-s" priority: 6250 } caption { diff --git a/data/drules_proto_outdoors_dark.bin b/data/drules_proto_outdoors_dark.bin index 697962584c..8562ba6b09 100644 Binary files a/data/drules_proto_outdoors_dark.bin and b/data/drules_proto_outdoors_dark.bin differ diff --git a/data/drules_proto_outdoors_dark.txt b/data/drules_proto_outdoors_dark.txt index 90c414b474..ce6023a873 100644 --- a/data/drules_proto_outdoors_dark.txt +++ b/data/drules_proto_outdoors_dark.txt @@ -22274,7 +22274,7 @@ cont { lines { width: 7.6 color: 1294740506 - priority: 154 + priority: 50 cap: BUTTCAP } lines { @@ -22284,7 +22284,7 @@ cont { dd: 2.0 dd: 2.0 } - priority: 153 + priority: 40 cap: BUTTCAP } path_text { @@ -22310,7 +22310,7 @@ cont { lines { width: 9.0 color: 1294740506 - priority: 154 + priority: 50 cap: BUTTCAP } lines { @@ -22320,7 +22320,7 @@ cont { dd: 2.0 dd: 2.0 } - priority: 153 + priority: 40 cap: BUTTCAP } path_text { @@ -22346,7 +22346,7 @@ cont { lines { width: 9.0 color: 1294740506 - priority: 154 + priority: 50 cap: BUTTCAP } lines { @@ -22356,7 +22356,7 @@ cont { dd: 2.0 dd: 2.0 } - priority: 153 + priority: 40 cap: BUTTCAP } path_text { @@ -22382,7 +22382,7 @@ cont { lines { width: 9.0 color: 1294740506 - priority: 154 + priority: 50 cap: BUTTCAP } lines { @@ -22392,7 +22392,7 @@ cont { dd: 2.0 dd: 2.0 } - priority: 153 + priority: 40 cap: BUTTCAP } path_text { @@ -23432,7 +23432,7 @@ cont { lines { width: 6.0 color: 1294740506 - priority: 154 + priority: 50 cap: BUTTCAP } lines { @@ -23442,7 +23442,7 @@ cont { dd: 2.0 dd: 2.0 } - priority: 153 + priority: 40 cap: BUTTCAP } path_text { @@ -23464,7 +23464,7 @@ cont { lines { width: 8.8 color: 1294740506 - priority: 154 + priority: 50 cap: BUTTCAP } lines { @@ -23474,7 +23474,7 @@ cont { dd: 2.0 dd: 2.0 } - priority: 153 + priority: 40 cap: BUTTCAP } path_text { @@ -23496,7 +23496,7 @@ cont { lines { width: 9.8 color: 1294740506 - priority: 154 + priority: 50 cap: BUTTCAP } lines { @@ -23506,7 +23506,7 @@ cont { dd: 2.0 dd: 2.0 } - priority: 153 + priority: 40 cap: BUTTCAP } path_text { @@ -23528,7 +23528,7 @@ cont { lines { width: 9.8 color: 1294740506 - priority: 154 + priority: 50 cap: BUTTCAP } lines { @@ -23538,7 +23538,7 @@ cont { dd: 2.0 dd: 2.0 } - priority: 153 + priority: 40 cap: BUTTCAP } path_text { @@ -24742,7 +24742,7 @@ cont { lines { width: 7.6 color: 1294740506 - priority: 154 + priority: 50 cap: BUTTCAP } lines { @@ -24752,7 +24752,7 @@ cont { dd: 2.0 dd: 2.0 } - priority: 153 + priority: 40 cap: BUTTCAP } path_text { @@ -24778,7 +24778,7 @@ cont { lines { width: 9.0 color: 1294740506 - priority: 154 + priority: 50 cap: BUTTCAP } lines { @@ -24788,7 +24788,7 @@ cont { dd: 2.0 dd: 2.0 } - priority: 153 + priority: 40 cap: BUTTCAP } path_text { @@ -24814,7 +24814,7 @@ cont { lines { width: 9.0 color: 1294740506 - priority: 154 + priority: 50 cap: BUTTCAP } lines { @@ -24824,7 +24824,7 @@ cont { dd: 2.0 dd: 2.0 } - priority: 153 + priority: 40 cap: BUTTCAP } path_text { @@ -24850,7 +24850,7 @@ cont { lines { width: 9.0 color: 1294740506 - priority: 154 + priority: 50 cap: BUTTCAP } lines { @@ -24860,7 +24860,7 @@ cont { dd: 2.0 dd: 2.0 } - priority: 153 + priority: 40 cap: BUTTCAP } path_text { @@ -29025,7 +29025,7 @@ cont { lines { width: 7.6 color: 1294740506 - priority: 154 + priority: 50 cap: BUTTCAP } lines { @@ -29035,7 +29035,7 @@ cont { dd: 2.0 dd: 2.0 } - priority: 153 + priority: 40 cap: BUTTCAP } path_text { @@ -29061,7 +29061,7 @@ cont { lines { width: 9.0 color: 1294740506 - priority: 154 + priority: 50 cap: BUTTCAP } lines { @@ -29071,7 +29071,7 @@ cont { dd: 2.0 dd: 2.0 } - priority: 153 + priority: 40 cap: BUTTCAP } path_text { @@ -29097,7 +29097,7 @@ cont { lines { width: 9.0 color: 1294740506 - priority: 154 + priority: 50 cap: BUTTCAP } lines { @@ -29107,7 +29107,7 @@ cont { dd: 2.0 dd: 2.0 } - priority: 153 + priority: 40 cap: BUTTCAP } path_text { @@ -29133,7 +29133,7 @@ cont { lines { width: 9.0 color: 1294740506 - priority: 154 + priority: 50 cap: BUTTCAP } lines { @@ -29143,7 +29143,7 @@ cont { dd: 2.0 dd: 2.0 } - priority: 153 + priority: 40 cap: BUTTCAP } path_text { @@ -36069,7 +36069,7 @@ cont { lines { width: 7.0 color: 1294740506 - priority: 154 + priority: 50 cap: BUTTCAP } lines { @@ -36079,7 +36079,7 @@ cont { dd: 2.0 dd: 2.0 } - priority: 153 + priority: 40 cap: BUTTCAP } path_text { @@ -36105,7 +36105,7 @@ cont { lines { width: 9.0 color: 1294740506 - priority: 154 + priority: 50 cap: BUTTCAP } lines { @@ -36115,7 +36115,7 @@ cont { dd: 2.0 dd: 2.0 } - priority: 153 + priority: 40 cap: BUTTCAP } path_text { @@ -36141,7 +36141,7 @@ cont { lines { width: 11.0 color: 1294740506 - priority: 154 + priority: 50 cap: BUTTCAP } lines { @@ -36151,7 +36151,7 @@ cont { dd: 2.0 dd: 2.0 } - priority: 153 + priority: 40 cap: BUTTCAP } path_text { @@ -36177,7 +36177,7 @@ cont { lines { width: 11.0 color: 1294740506 - priority: 154 + priority: 50 cap: BUTTCAP } lines { @@ -36187,7 +36187,7 @@ cont { dd: 2.0 dd: 2.0 } - priority: 153 + priority: 40 cap: BUTTCAP } path_text { @@ -38340,7 +38340,7 @@ cont { lines { width: 9.0 color: 1294740506 - priority: 154 + priority: 50 cap: BUTTCAP } lines { @@ -38350,7 +38350,7 @@ cont { dd: 2.0 dd: 2.0 } - priority: 153 + priority: 40 cap: BUTTCAP } path_text { @@ -38376,7 +38376,7 @@ cont { lines { width: 11.0 color: 1294740506 - priority: 154 + priority: 50 cap: BUTTCAP } lines { @@ -38386,7 +38386,7 @@ cont { dd: 2.0 dd: 2.0 } - priority: 153 + priority: 40 cap: BUTTCAP } path_text { @@ -38412,7 +38412,7 @@ cont { lines { width: 11.0 color: 1294740506 - priority: 154 + priority: 50 cap: BUTTCAP } lines { @@ -38422,7 +38422,7 @@ cont { dd: 2.0 dd: 2.0 } - priority: 153 + priority: 40 cap: BUTTCAP } path_text { @@ -38448,7 +38448,7 @@ cont { lines { width: 11.0 color: 1294740506 - priority: 154 + priority: 50 cap: BUTTCAP } lines { @@ -38458,7 +38458,7 @@ cont { dd: 2.0 dd: 2.0 } - priority: 153 + priority: 40 cap: BUTTCAP } path_text { @@ -74775,7 +74775,7 @@ cont { lines { width: 4.0 color: 858532890 - priority: 150 + priority: 50 cap: BUTTCAP } lines { @@ -74790,7 +74790,7 @@ cont { lines { width: 4.4 color: 858532890 - priority: 150 + priority: 50 cap: BUTTCAP } lines { @@ -74805,7 +74805,7 @@ cont { lines { width: 4.8 color: 858532890 - priority: 150 + priority: 50 cap: BUTTCAP } lines { @@ -74820,13 +74820,13 @@ cont { lines { width: 7.0 color: 1297109072 - priority: 140 + priority: 40 cap: BUTTCAP } lines { width: 5.8 color: 858532890 - priority: 150 + priority: 50 cap: BUTTCAP } lines { @@ -74849,13 +74849,13 @@ cont { lines { width: 10.0 color: 1297109072 - priority: 140 + priority: 40 cap: BUTTCAP } lines { width: 8.6 color: 858532890 - priority: 150 + priority: 50 cap: BUTTCAP } lines { @@ -74878,13 +74878,13 @@ cont { lines { width: 12.8 color: 1297109072 - priority: 140 + priority: 40 cap: BUTTCAP } lines { width: 11.0 color: 858532890 - priority: 150 + priority: 50 cap: BUTTCAP } lines { @@ -74907,13 +74907,13 @@ cont { lines { width: 12.8 color: 1297109072 - priority: 140 + priority: 40 cap: BUTTCAP } lines { width: 11.0 color: 858532890 - priority: 150 + priority: 50 cap: BUTTCAP } lines { @@ -74936,13 +74936,13 @@ cont { lines { width: 12.8 color: 1297109072 - priority: 140 + priority: 40 cap: BUTTCAP } lines { width: 11.0 color: 858532890 - priority: 150 + priority: 50 cap: BUTTCAP } lines { @@ -80602,7 +80602,7 @@ cont { element { scale: 12 symbol { - name: "funicular-s" + name: "train-s" priority: 6250 } caption { @@ -80626,7 +80626,7 @@ cont { element { scale: 13 symbol { - name: "funicular-s" + name: "train-s" priority: 6250 } caption { @@ -80650,7 +80650,7 @@ cont { element { scale: 14 symbol { - name: "funicular-s" + name: "train-s" priority: 6250 } caption { diff --git a/data/drules_proto_outdoors_light.bin b/data/drules_proto_outdoors_light.bin index acf5f8f45c..3c33756bb5 100644 Binary files a/data/drules_proto_outdoors_light.bin and b/data/drules_proto_outdoors_light.bin differ diff --git a/data/drules_proto_outdoors_light.txt b/data/drules_proto_outdoors_light.txt index a4d1677a2f..bcf903b96a 100644 --- a/data/drules_proto_outdoors_light.txt +++ b/data/drules_proto_outdoors_light.txt @@ -22274,7 +22274,7 @@ cont { lines { width: 7.6 color: 1307438043 - priority: 154 + priority: 50 cap: BUTTCAP } lines { @@ -22284,7 +22284,7 @@ cont { dd: 2.0 dd: 2.0 } - priority: 153 + priority: 40 cap: BUTTCAP } path_text { @@ -22310,7 +22310,7 @@ cont { lines { width: 9.0 color: 1307438043 - priority: 154 + priority: 50 cap: BUTTCAP } lines { @@ -22320,7 +22320,7 @@ cont { dd: 2.0 dd: 2.0 } - priority: 153 + priority: 40 cap: BUTTCAP } path_text { @@ -22346,7 +22346,7 @@ cont { lines { width: 9.0 color: 1307438043 - priority: 154 + priority: 50 cap: BUTTCAP } lines { @@ -22356,7 +22356,7 @@ cont { dd: 2.0 dd: 2.0 } - priority: 153 + priority: 40 cap: BUTTCAP } path_text { @@ -22382,7 +22382,7 @@ cont { lines { width: 9.0 color: 1307438043 - priority: 154 + priority: 50 cap: BUTTCAP } lines { @@ -22392,7 +22392,7 @@ cont { dd: 2.0 dd: 2.0 } - priority: 153 + priority: 40 cap: BUTTCAP } path_text { @@ -23432,7 +23432,7 @@ cont { lines { width: 6.0 color: 1307438043 - priority: 154 + priority: 50 cap: BUTTCAP } lines { @@ -23442,7 +23442,7 @@ cont { dd: 2.0 dd: 2.0 } - priority: 153 + priority: 40 cap: BUTTCAP } path_text { @@ -23464,7 +23464,7 @@ cont { lines { width: 8.8 color: 1307438043 - priority: 154 + priority: 50 cap: BUTTCAP } lines { @@ -23474,7 +23474,7 @@ cont { dd: 2.0 dd: 2.0 } - priority: 153 + priority: 40 cap: BUTTCAP } path_text { @@ -23496,7 +23496,7 @@ cont { lines { width: 9.8 color: 1307438043 - priority: 154 + priority: 50 cap: BUTTCAP } lines { @@ -23506,7 +23506,7 @@ cont { dd: 2.0 dd: 2.0 } - priority: 153 + priority: 40 cap: BUTTCAP } path_text { @@ -23528,7 +23528,7 @@ cont { lines { width: 9.8 color: 1307438043 - priority: 154 + priority: 50 cap: BUTTCAP } lines { @@ -23538,7 +23538,7 @@ cont { dd: 2.0 dd: 2.0 } - priority: 153 + priority: 40 cap: BUTTCAP } path_text { @@ -24742,7 +24742,7 @@ cont { lines { width: 7.6 color: 1307438043 - priority: 154 + priority: 50 cap: BUTTCAP } lines { @@ -24752,7 +24752,7 @@ cont { dd: 2.0 dd: 2.0 } - priority: 153 + priority: 40 cap: BUTTCAP } path_text { @@ -24778,7 +24778,7 @@ cont { lines { width: 9.0 color: 1307438043 - priority: 154 + priority: 50 cap: BUTTCAP } lines { @@ -24788,7 +24788,7 @@ cont { dd: 2.0 dd: 2.0 } - priority: 153 + priority: 40 cap: BUTTCAP } path_text { @@ -24814,7 +24814,7 @@ cont { lines { width: 9.0 color: 1307438043 - priority: 154 + priority: 50 cap: BUTTCAP } lines { @@ -24824,7 +24824,7 @@ cont { dd: 2.0 dd: 2.0 } - priority: 153 + priority: 40 cap: BUTTCAP } path_text { @@ -24850,7 +24850,7 @@ cont { lines { width: 9.0 color: 1307438043 - priority: 154 + priority: 50 cap: BUTTCAP } lines { @@ -24860,7 +24860,7 @@ cont { dd: 2.0 dd: 2.0 } - priority: 153 + priority: 40 cap: BUTTCAP } path_text { @@ -28959,7 +28959,7 @@ cont { lines { width: 7.6 color: 1307438043 - priority: 154 + priority: 50 cap: BUTTCAP } lines { @@ -28969,7 +28969,7 @@ cont { dd: 2.0 dd: 2.0 } - priority: 153 + priority: 40 cap: BUTTCAP } path_text { @@ -28995,7 +28995,7 @@ cont { lines { width: 9.0 color: 1307438043 - priority: 154 + priority: 50 cap: BUTTCAP } lines { @@ -29005,7 +29005,7 @@ cont { dd: 2.0 dd: 2.0 } - priority: 153 + priority: 40 cap: BUTTCAP } path_text { @@ -29031,7 +29031,7 @@ cont { lines { width: 9.0 color: 1307438043 - priority: 154 + priority: 50 cap: BUTTCAP } lines { @@ -29041,7 +29041,7 @@ cont { dd: 2.0 dd: 2.0 } - priority: 153 + priority: 40 cap: BUTTCAP } path_text { @@ -29067,7 +29067,7 @@ cont { lines { width: 9.0 color: 1307438043 - priority: 154 + priority: 50 cap: BUTTCAP } lines { @@ -29077,7 +29077,7 @@ cont { dd: 2.0 dd: 2.0 } - priority: 153 + priority: 40 cap: BUTTCAP } path_text { @@ -35889,7 +35889,7 @@ cont { lines { width: 7.0 color: 1307438043 - priority: 154 + priority: 50 cap: BUTTCAP } lines { @@ -35899,7 +35899,7 @@ cont { dd: 2.0 dd: 2.0 } - priority: 153 + priority: 40 cap: BUTTCAP } path_text { @@ -35925,7 +35925,7 @@ cont { lines { width: 9.0 color: 1307438043 - priority: 154 + priority: 50 cap: BUTTCAP } lines { @@ -35935,7 +35935,7 @@ cont { dd: 2.0 dd: 2.0 } - priority: 153 + priority: 40 cap: BUTTCAP } path_text { @@ -35961,7 +35961,7 @@ cont { lines { width: 11.0 color: 1307438043 - priority: 154 + priority: 50 cap: BUTTCAP } lines { @@ -35971,7 +35971,7 @@ cont { dd: 2.0 dd: 2.0 } - priority: 153 + priority: 40 cap: BUTTCAP } path_text { @@ -35997,7 +35997,7 @@ cont { lines { width: 11.0 color: 1307438043 - priority: 154 + priority: 50 cap: BUTTCAP } lines { @@ -36007,7 +36007,7 @@ cont { dd: 2.0 dd: 2.0 } - priority: 153 + priority: 40 cap: BUTTCAP } path_text { @@ -38136,7 +38136,7 @@ cont { lines { width: 9.0 color: 1307438043 - priority: 154 + priority: 50 cap: BUTTCAP } lines { @@ -38146,7 +38146,7 @@ cont { dd: 2.0 dd: 2.0 } - priority: 153 + priority: 40 cap: BUTTCAP } path_text { @@ -38172,7 +38172,7 @@ cont { lines { width: 11.0 color: 1307438043 - priority: 154 + priority: 50 cap: BUTTCAP } lines { @@ -38182,7 +38182,7 @@ cont { dd: 2.0 dd: 2.0 } - priority: 153 + priority: 40 cap: BUTTCAP } path_text { @@ -38208,7 +38208,7 @@ cont { lines { width: 11.0 color: 1307438043 - priority: 154 + priority: 50 cap: BUTTCAP } lines { @@ -38218,7 +38218,7 @@ cont { dd: 2.0 dd: 2.0 } - priority: 153 + priority: 40 cap: BUTTCAP } path_text { @@ -38244,7 +38244,7 @@ cont { lines { width: 11.0 color: 1307438043 - priority: 154 + priority: 50 cap: BUTTCAP } lines { @@ -38254,7 +38254,7 @@ cont { dd: 2.0 dd: 2.0 } - priority: 153 + priority: 40 cap: BUTTCAP } path_text { @@ -74560,7 +74560,7 @@ cont { lines { width: 4.0 color: 871230427 - priority: 150 + priority: 50 cap: BUTTCAP } lines { @@ -74575,7 +74575,7 @@ cont { lines { width: 4.4 color: 871230427 - priority: 150 + priority: 50 cap: BUTTCAP } lines { @@ -74590,7 +74590,7 @@ cont { lines { width: 4.8 color: 871230427 - priority: 150 + priority: 50 cap: BUTTCAP } lines { @@ -74605,13 +74605,13 @@ cont { lines { width: 7.0 color: 1300267136 - priority: 140 + priority: 40 cap: BUTTCAP } lines { width: 5.8 color: 871230427 - priority: 150 + priority: 50 cap: BUTTCAP } lines { @@ -74634,13 +74634,13 @@ cont { lines { width: 10.0 color: 1300267136 - priority: 140 + priority: 40 cap: BUTTCAP } lines { width: 8.6 color: 871230427 - priority: 150 + priority: 50 cap: BUTTCAP } lines { @@ -74663,13 +74663,13 @@ cont { lines { width: 12.8 color: 1300267136 - priority: 140 + priority: 40 cap: BUTTCAP } lines { width: 11.0 color: 871230427 - priority: 150 + priority: 50 cap: BUTTCAP } lines { @@ -74692,13 +74692,13 @@ cont { lines { width: 12.8 color: 1300267136 - priority: 140 + priority: 40 cap: BUTTCAP } lines { width: 11.0 color: 871230427 - priority: 150 + priority: 50 cap: BUTTCAP } lines { @@ -74721,13 +74721,13 @@ cont { lines { width: 12.8 color: 1300267136 - priority: 140 + priority: 40 cap: BUTTCAP } lines { width: 11.0 color: 871230427 - priority: 150 + priority: 50 cap: BUTTCAP } lines { @@ -80387,7 +80387,7 @@ cont { element { scale: 12 symbol { - name: "funicular-s" + name: "train-s" priority: 6250 } caption { @@ -80411,7 +80411,7 @@ cont { element { scale: 13 symbol { - name: "funicular-s" + name: "train-s" priority: 6250 } caption { @@ -80435,7 +80435,7 @@ cont { element { scale: 14 symbol { - name: "funicular-s" + name: "train-s" priority: 6250 } caption { diff --git a/data/drules_proto_vehicle_dark.bin b/data/drules_proto_vehicle_dark.bin index a4d49c1ea6..f8cd4a8f2e 100644 Binary files a/data/drules_proto_vehicle_dark.bin and b/data/drules_proto_vehicle_dark.bin differ diff --git a/data/drules_proto_vehicle_dark.txt b/data/drules_proto_vehicle_dark.txt index 47188730a5..245d094dbf 100644 --- a/data/drules_proto_vehicle_dark.txt +++ b/data/drules_proto_vehicle_dark.txt @@ -43581,7 +43581,7 @@ cont { lines { width: 4.7 color: 1184274 - priority: 110 + priority: 40 cap: BUTTCAP } lines { @@ -43596,7 +43596,7 @@ cont { lines { width: 6.0 color: 1184274 - priority: 110 + priority: 40 cap: BUTTCAP } lines { @@ -43611,13 +43611,13 @@ cont { lines { width: 7.4 color: 855309 - priority: 100 + priority: 30 cap: BUTTCAP } lines { width: 6.2 color: 1184274 - priority: 110 + priority: 40 cap: BUTTCAP } lines { @@ -43640,13 +43640,13 @@ cont { lines { width: 10.8 color: 855309 - priority: 100 + priority: 30 cap: BUTTCAP } lines { width: 9.4 color: 1184274 - priority: 110 + priority: 40 cap: BUTTCAP } lines { @@ -43669,13 +43669,13 @@ cont { lines { width: 15.4 color: 855309 - priority: 100 + priority: 30 cap: BUTTCAP } lines { width: 13.6 color: 1184274 - priority: 110 + priority: 40 cap: BUTTCAP } lines { @@ -43698,13 +43698,13 @@ cont { lines { width: 18.8 color: 855309 - priority: 100 + priority: 30 cap: BUTTCAP } lines { width: 17.0 color: 1184274 - priority: 110 + priority: 40 cap: BUTTCAP } lines { @@ -43727,13 +43727,13 @@ cont { lines { width: 18.8 color: 855309 - priority: 100 + priority: 30 cap: BUTTCAP } lines { width: 17.0 color: 1184274 - priority: 110 + priority: 40 cap: BUTTCAP } lines { diff --git a/data/drules_proto_vehicle_light.bin b/data/drules_proto_vehicle_light.bin index b4d6aa5e6b..4d1f2855f5 100644 Binary files a/data/drules_proto_vehicle_light.bin and b/data/drules_proto_vehicle_light.bin differ diff --git a/data/drules_proto_vehicle_light.txt b/data/drules_proto_vehicle_light.txt index 75d426dd93..7ac4aa20bb 100644 --- a/data/drules_proto_vehicle_light.txt +++ b/data/drules_proto_vehicle_light.txt @@ -43041,7 +43041,7 @@ cont { lines { width: 4.7 color: 15066325 - priority: 110 + priority: 40 cap: BUTTCAP } lines { @@ -43056,7 +43056,7 @@ cont { lines { width: 6.0 color: 15066325 - priority: 110 + priority: 40 cap: BUTTCAP } lines { @@ -43071,13 +43071,13 @@ cont { lines { width: 7.4 color: 8421504 - priority: 100 + priority: 30 cap: BUTTCAP } lines { width: 6.2 color: 15066325 - priority: 110 + priority: 40 cap: BUTTCAP } lines { @@ -43100,13 +43100,13 @@ cont { lines { width: 10.8 color: 8421504 - priority: 100 + priority: 30 cap: BUTTCAP } lines { width: 9.4 color: 15066325 - priority: 110 + priority: 40 cap: BUTTCAP } lines { @@ -43129,13 +43129,13 @@ cont { lines { width: 15.4 color: 8421504 - priority: 100 + priority: 30 cap: BUTTCAP } lines { width: 13.6 color: 15066325 - priority: 110 + priority: 40 cap: BUTTCAP } lines { @@ -43158,13 +43158,13 @@ cont { lines { width: 18.8 color: 8421504 - priority: 100 + priority: 30 cap: BUTTCAP } lines { width: 17.0 color: 15066325 - priority: 110 + priority: 40 cap: BUTTCAP } lines { @@ -43187,13 +43187,13 @@ cont { lines { width: 18.8 color: 8421504 - priority: 100 + priority: 30 cap: BUTTCAP } lines { width: 17.0 color: 15066325 - priority: 110 + priority: 40 cap: BUTTCAP } lines { diff --git a/data/mapcss-mapping.csv b/data/mapcss-mapping.csv index 94134a3480..bb390e21df 100644 --- a/data/mapcss-mapping.csv +++ b/data/mapcss-mapping.csv @@ -687,7 +687,7 @@ deprecated|deprecated;573;x deprecated|deprecated;574;x aerialway|rope_tow;575; natural|pond;576;natural|water|pond -railway|station|funicular;[railway=station][station=funicular],[railway=halt][station=funicular];;name;int_name;577; +railway|station|funicular;[railway=station][station=funicular];;name;int_name;577; highway|secondary_link|tunnel;[highway=secondary_link][tunnel?];;name;int_name;578; deprecated|deprecated;579;x deprecated|deprecated;580;x diff --git a/data/resources-6plus_dark/symbols.png b/data/resources-6plus_dark/symbols.png index fdcae8fb56..ca4bd8925a 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 10ebd690a1..9fe70d2009 100644 --- a/data/resources-6plus_dark/symbols.sdf +++ b/data/resources-6plus_dark/symbols.sdf @@ -695,114 +695,113 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/data/resources-6plus_light/symbols.png b/data/resources-6plus_light/symbols.png index 67bd91783b..4e2d43db79 100644 Binary files a/data/resources-6plus_light/symbols.png and b/data/resources-6plus_light/symbols.png differ diff --git a/data/resources-6plus_light/symbols.sdf b/data/resources-6plus_light/symbols.sdf index dc4ae97d44..f97800103d 100644 --- a/data/resources-6plus_light/symbols.sdf +++ b/data/resources-6plus_light/symbols.sdf @@ -695,114 +695,113 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/data/resources-hdpi_dark/symbols.png b/data/resources-hdpi_dark/symbols.png index 8587fe1fb0..f1bb3c74b9 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 20425293d0..7225c3acdb 100644 --- a/data/resources-hdpi_dark/symbols.sdf +++ b/data/resources-hdpi_dark/symbols.sdf @@ -695,114 +695,113 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/data/resources-hdpi_light/symbols.png b/data/resources-hdpi_light/symbols.png index da977b8eaf..2a9b55d021 100644 Binary files a/data/resources-hdpi_light/symbols.png and b/data/resources-hdpi_light/symbols.png differ diff --git a/data/resources-hdpi_light/symbols.sdf b/data/resources-hdpi_light/symbols.sdf index 20425293d0..7225c3acdb 100644 --- a/data/resources-hdpi_light/symbols.sdf +++ b/data/resources-hdpi_light/symbols.sdf @@ -695,114 +695,113 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/data/resources-mdpi_dark/symbols.png b/data/resources-mdpi_dark/symbols.png index 58013eafc6..466f7a753c 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 1fb895734f..de7b054224 100644 --- a/data/resources-mdpi_dark/symbols.sdf +++ b/data/resources-mdpi_dark/symbols.sdf @@ -695,114 +695,113 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/data/resources-mdpi_light/symbols.png b/data/resources-mdpi_light/symbols.png index 91475067dc..c9179aed02 100644 Binary files a/data/resources-mdpi_light/symbols.png and b/data/resources-mdpi_light/symbols.png differ diff --git a/data/resources-mdpi_light/symbols.sdf b/data/resources-mdpi_light/symbols.sdf index 1fb895734f..de7b054224 100644 --- a/data/resources-mdpi_light/symbols.sdf +++ b/data/resources-mdpi_light/symbols.sdf @@ -695,114 +695,113 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/data/resources-xhdpi_dark/symbols.png b/data/resources-xhdpi_dark/symbols.png index b53fcbc301..727987d115 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 f7dadcf94b..eb496efd39 100644 --- a/data/resources-xhdpi_dark/symbols.sdf +++ b/data/resources-xhdpi_dark/symbols.sdf @@ -695,114 +695,113 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/data/resources-xhdpi_light/symbols.png b/data/resources-xhdpi_light/symbols.png index db03a481a5..5d8c7001ac 100644 Binary files a/data/resources-xhdpi_light/symbols.png and b/data/resources-xhdpi_light/symbols.png differ diff --git a/data/resources-xhdpi_light/symbols.sdf b/data/resources-xhdpi_light/symbols.sdf index f7dadcf94b..eb496efd39 100644 --- a/data/resources-xhdpi_light/symbols.sdf +++ b/data/resources-xhdpi_light/symbols.sdf @@ -695,114 +695,113 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/data/resources-xxhdpi_dark/symbols.png b/data/resources-xxhdpi_dark/symbols.png index 6433330454..fd731febd2 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 d19b89f77f..a29ed38031 100644 --- a/data/resources-xxhdpi_dark/symbols.sdf +++ b/data/resources-xxhdpi_dark/symbols.sdf @@ -695,114 +695,113 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/data/resources-xxhdpi_light/symbols.png b/data/resources-xxhdpi_light/symbols.png index f13c84940c..4ee0bea4c0 100644 Binary files a/data/resources-xxhdpi_light/symbols.png and b/data/resources-xxhdpi_light/symbols.png differ diff --git a/data/resources-xxhdpi_light/symbols.sdf b/data/resources-xxhdpi_light/symbols.sdf index d19b89f77f..a29ed38031 100644 --- a/data/resources-xxhdpi_light/symbols.sdf +++ b/data/resources-xxhdpi_light/symbols.sdf @@ -695,114 +695,113 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/data/resources-xxxhdpi_dark/symbols.png b/data/resources-xxxhdpi_dark/symbols.png index d440326e51..8411335331 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 9f19cd0513..4d48536f4d 100644 --- a/data/resources-xxxhdpi_dark/symbols.sdf +++ b/data/resources-xxxhdpi_dark/symbols.sdf @@ -695,114 +695,113 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/data/resources-xxxhdpi_light/symbols.png b/data/resources-xxxhdpi_light/symbols.png index 48de77b608..a9276bbc42 100644 Binary files a/data/resources-xxxhdpi_light/symbols.png and b/data/resources-xxxhdpi_light/symbols.png differ diff --git a/data/resources-xxxhdpi_light/symbols.sdf b/data/resources-xxxhdpi_light/symbols.sdf index 9f19cd0513..4d48536f4d 100644 --- a/data/resources-xxxhdpi_light/symbols.sdf +++ b/data/resources-xxxhdpi_light/symbols.sdf @@ -695,114 +695,113 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/data/strings/strings.txt b/data/strings/strings.txt index a7351ba0e3..4215952411 100644 --- a/data/strings/strings.txt +++ b/data/strings/strings.txt @@ -29411,99 +29411,97 @@ zh-Hans = 下坡 zh-Hant = 下坡 - [elevation_profile_minaltitude] + [elevation_profile_min_elevation] tags = android,ios - en = Min. altitude + en = Min. elevation af = Min. hoogte - ar = الحد الأدنى للارتفاع + ar = أقل ارتفاع az = Min. hündürlük be = Мін. вышыня - bg = Мин. надморска височина - ca = Altitud mín. - cs = Min. nadmořská výška + bg = Мин. височина + ca = Min. elevació + cs = Min. výška da = Min. højde de = Min. Höhe el = Ελάχ. υψόμετρο - es = Altura mínima - es-MX = Altura mínima + es = Min. elevación + es-MX = Min. elevación et = Min. kõrgus - eu = Gutxieneko altuera - fa = کمینه ارتفاع + eu = Min. altuera + fa = کم ارتفاع fi = Min. korkeus - fr = Hauteur minimale - he = גובה מינימלי + fr = Min. élévation + he = מינ' גובה hu = Min. magasság - id = Ketinggian Min. - it = Altitudine minima - ja = 最小高度 - ko = 산 최소 높이 - lt = Maž. aukštis + id = Min. tinggi + it = Min. elevazione + ja = 最小標高 + ko = 최소 높이 + lt = Min. aukštis lv = Zemākais punkts - mr = किमान उच्चता + mr = किमान उंची nb = Min. høyde nl = Min. hoogte pl = Min. wysokość - pt = Altura mínima - pt-BR = Altitude mínima - ro = Înălțime minimă + pt = Min. elevação + pt-BR = Min. elevação + ro = Min. altitudine ru = Мин. высота - sk = Min. nadmorská výška - sr = Мин. висина + sk = Min. výška sv = Min. höjd - sw = Mwinuko wa chini kabisa - th = ระดับความสูงต่ำสุด - tr = Min. rakım + sw = Min. mwinuko + th = ต่ำสุด + tr = Min. yükselti uk = Мін. висота - vi = Độ cao tối thiểu - zh-Hans = 最小高度 - zh-Hant = 最小高度 + vi = Min. độ cao + zh-Hans = 最低高度 + zh-Hant = 最低高度 - [elevation_profile_maxaltitude] + [elevation_profile_max_elevation] tags = android,ios - en = Max. altitude + en = Max. elevation af = Maks. hoogte - ar = الحد الأقصى للارتفاع + ar = أعلى ارتفاع az = Maks. hündürlük be = Макс. вышыня - bg = Макс. надморска височина - ca = Altitud màx. - cs = Max. nadmořská výška + bg = Макс. височина + ca = Màx. elevació + cs = Max. výška da = Maks. højde de = Max. Höhe el = Μέγ. υψόμετρο - es = Altura máxima - es-MX = Altura máxima + es = Máx. elevación + es-MX = Máx. elevación et = Maks. kõrgus - eu = Gehieneko altuera - fa = بیشینه ارتفاع - fi = Maks. korkeus - fr = Hauteur maximale - he = גובה מקסימלי + eu = Max. altuera + fa = بیش ارتفاع + fi = Max. korkeus + fr = Max. élévation + he = מקס' גובה hu = Max. magasság - id = Ketinggian Maks. - it = Altitudine massima - ja = 最大高度 - ko = 산 최대 높이 + id = Maks. tinggi + it = Max. elevazione + ja = 最大標高 + ko = 최대 높이 lt = Didž. aukštis lv = Augstākais punkts - mr = कमाल उच्चता + mr = कमाल उंची nb = Maks. høyde nl = Max. hoogte pl = Maks. wysokość - pt = Altura máxima - pt-BR = Altitude máxima - ro = Înălțime maximă + pt = Máx. elevação + pt-BR = Máx. elevação + ro = Max. altitudine ru = Макс. высота - sk = Max. nadmorská výška - sr = Макс. висина + sk = Max. výška sv = Max. höjd - sw = Mwinuko wa juu kabisa - th = ระดับความสูงสูงสุด - tr = Maks. rakım + sw = Max. mwinuko + th = สูงสุด + tr = Maks. yükselti uk = Макс. висота - vi = Độ cao tối đa - zh-Hans = 最大高度 - zh-Hant = 最大高度 + vi = Max. độ cao + zh-Hans = 最高高度 + zh-Hant = 最高高度 [elevation_profile_difficulty] tags = android,ios diff --git a/data/strings/types_strings.txt b/data/strings/types_strings.txt index 01c8f17f93..12d8affc88 100644 --- a/data/strings/types_strings.txt +++ b/data/strings/types_strings.txt @@ -33,7 +33,6 @@ ro = Adresă/Bloc ru = Адрес/Блок sk = Adresa/blok - sr = Адресе/Блок sv = Adress/Block sw = Anwani/Zuia th = ที่อยู่/บล็อค @@ -71,7 +70,6 @@ pt = Transporte aéreo pt-BR = Transporte aéreo ru = Канатная дорога - sr = Гондола tr = Teleferik uk = Канатна дорога zh-Hans = 缆车要素 @@ -102,7 +100,6 @@ pt-BR = Teleférico ru = Канатная дорога sk = Lanovka - sr = Ваздушни трамвај tr = Teleferik uk = Канатна дорога zh-Hans = 缆车 @@ -132,7 +129,6 @@ pt-BR = Telecadeira ru = Кресельная канатная дорога sk = Sedačková lanovka - sr = Ски лифт tr = Telesiyej uk = Канатна дорога zh-Hans = 缆车 @@ -162,7 +158,6 @@ pt-BR = Telesquis ru = Бугельная канатная дорога sk = Vlek - sr = Ски-лифт једносед tr = Teleferik hattı uk = Канатна дорога zh-Hans = 缆车要素 @@ -192,7 +187,6 @@ pt-BR = Telecabine ru = Канатная дорога sk = Kabínová lanovka - sr = Гондола tr = Teleferik uk = Канатна дорога zh-Hans = 循环式索道 @@ -220,7 +214,6 @@ pt = Teleférico híbrido pt-BR = Teleférico híbrido ru = Канатная дорога - sr = Комбинована жичара tr = Teleferik uk = Канатна дорога zh-Hans = 缆车 @@ -256,7 +249,6 @@ ro = Stație de teleferic ru = Канатная дорога sk = Lanovka - sr = Станица жичаре sv = Linbanestation th = สถานีกระเช้าลอยฟ้า tr = Havayolu İstasyonu @@ -284,7 +276,6 @@ pt = Via aérea pt-BR = Via aérea ru = Аэрокосмическая инфраструктура - sr = Ваздушна инфраструктура tr = Hava Sahası Altyapısı uk = Аерокосмічна інфраструктура zh-Hans = 机场要素 @@ -322,7 +313,6 @@ ro = Aeroport ru = Аэропорт sk = Letisko - sr = Аеродром sv = Flygplats th = สนามบิน tr = Havaalanı @@ -363,7 +353,6 @@ ro = Aeroport ru = Международный аэропорт sk = Medzinárodné letisko - sr = Интернационални аеродром sv = Flygplats th = สนามบิน tr = Uluslararası Havalimanı @@ -392,7 +381,6 @@ pt-BR = Plataforma de estacionamento de aviões ru = Перрон sk = Odbavovacia plocha - sr = Перон tr = Peron uk = Перон zh-Hans = 机场停机坪 @@ -419,7 +407,6 @@ pt-BR = Portão de embarque ru = Выход на посадку sk = Odletová brána - sr = Капија за укрцавање tr = Geçit uk = Вихід на посадку zh-Hans = 登机口 @@ -454,7 +441,6 @@ ro = Heliport ru = Вертолётная площадка sk = Pristávacia plocha pre vrtuľníky - sr = Хелиодром sv = Helikopterplatta th = ที่จอดเฮลิคอปเตอร์ tr = Helikopter pisti @@ -486,7 +472,6 @@ pt-BR = Pista de aeroporto ou aeródromo ru = Взлётно-посадочная полоса sk = Pristávacia dráha - sr = Писта tr = Pist uk = Злітно-посадкова смуга zh-Hans = 机场跑道 @@ -513,7 +498,6 @@ pt-BR = Pista de rolagem ru = Рулёжная дорожка sk = Rolovacia dráha - sr = Рулна стаза tr = Taksi yolu uk = Рульова дорiжка zh-Hans = 滑行道 @@ -540,7 +524,6 @@ pt-BR = Aerogare de passageiros ru = Терминал sk = Terminál - sr = Терминал tr = Terminal uk = Термінал zh-Hans = 航站楼 @@ -578,7 +561,6 @@ ro = Obiecte ale infrastructurii ru = Объекты инфраструктуры sk = Vybavenie - sr = Инфраструктурни објекти sv = Infrastrukturen sw = Kistawishi th = สถานที่หรือสิ่งก่อสร้างที่เป็นประโยชน์ @@ -621,7 +603,6 @@ ro = Centru de artă ru = Центр искусств sk = Centrum umenia - sr = Центар уметности sv = Kulturcenter sw = Kituo cha sanaa th = ศูนย์งานศิลปะ @@ -658,7 +639,6 @@ ro = Bancomat ru = Банкомат sk = Bankomat - sr = Банкомат sv = Bankomat th = เอทีเอ็ม tr = Bankamatik @@ -693,7 +673,6 @@ ro = Bancă ru = Банк sk = Banka - sr = Банка th = ธนาคาร tr = Banka uk = Банк @@ -725,7 +704,6 @@ pt = Bar pt-BR = Drinqueria ru = Бар - sr = Бар th = บาร์ tr = Bar uk = Бар @@ -768,7 +746,6 @@ ro = Grătar ru = Барбекю-гриль sk = Gril na grilovanie - sr = Грил sv = Grill för barbecue sw = Grill ya barbeque th = เตาย่างบาร์บีคิว @@ -810,7 +787,6 @@ ro = Banchetă ru = Скамейка sk = Lavička - sr = Клупа sv = Bänk th = ม้านั่ง tr = Bank @@ -853,7 +829,6 @@ ro = Parcare biciclete ru = Велопарковка sk = Stojan na bicykle - sr = Паркинг за бицикле sv = Cykelparkering th = ที่จอดจักรยาน tr = Bisiklet Park Yeri @@ -895,7 +870,6 @@ ro = Închiriere de biciclete ru = Велопрокат sk = Požičovňa bicyklov - sr = Рентирање бицикли sv = Cykeluthyrning th = จักรยานให้เช่า tr = Bisiklet Kiralama @@ -930,7 +904,6 @@ pt = Estação de conserto de bicicletas pt-BR = Oficina de conserto de bicicletas ru = Станция ремонта велосипедов - sr = Станица за поправку бицикла sw = Cykelreparationsstation th = สถานีซ่อมจักรยาน tr = Bisiklet tamir istasyonu @@ -964,7 +937,6 @@ ro = Berărie ru = Пивная под открытым небом sk = Piváreň - sr = Пивска башта sv = Ölservering th = ลานเบียร์ tr = Bira Bahçesi @@ -1005,7 +977,6 @@ ro = Bordel ru = Бордель sk = Nevestinec - sr = Јавна кућа sv = Bordell th = ซ่อง tr = Genelev @@ -1046,7 +1017,6 @@ ro = Schimb valutar ru = Обмен валюты sk = Zmenáreň - sr = Мењачница sv = Valutaväxling th = แลกเปลี่ยนเงินตรา tr = Döviz Bürosu @@ -1087,7 +1057,6 @@ ro = Gara de autobuz ru = Автовокзал sk = Autobusové nástupište - sr = Аутобуска станица sv = Busstation th = สถานีขนส่ง tr = Otogar @@ -1128,7 +1097,6 @@ ro = Cafenea ru = Кафе sk = Kaviareň - sr = Кафе sv = Café th = คาเฟ่ tr = Kafe @@ -1170,7 +1138,6 @@ ro = Închiriere mașini ru = Прокат авто sk = Autopožičovňa - sr = Рента кар sv = Biluthyrning th = รถยนต์ tr = Araç Kiralama @@ -1209,7 +1176,6 @@ pt-BR = Compartilhamento de carro ru = Каршеринг sk = Zdieľanie automobilov - sr = Дељење аутомобила sv = Samåkning th = การใช้รถร่วมกัน tr = Araç Paylaşımı @@ -1251,7 +1217,6 @@ ro = Spălătorie auto ru = Автомойка sk = Autoumývareň - sr = Перионица sv = Biltvätt th = ล้างรถ tr = Araba Yıkama @@ -1291,7 +1256,6 @@ ro = Divertisment ru = Казино sk = Kasíno - sr = Казино sv = Kasino th = คาสิโน tr = Kumarhane @@ -1332,7 +1296,6 @@ ro = Jocuri de noroc ru = Азартные игры sk = Hazardné hry - sr = Коцкарница sv = Spelande sw = Kamari th = การพนัน @@ -1374,7 +1337,6 @@ ro = Centru de jocuri pentru adulți ru = Игровой центр для взрослых sk = Centrum hier pre dospelých - sr = Центар за игру одраслих sv = Spelcenter för vuxna sw = Kituo cha Michezo ya Watu Wazima th = ศูนย์เกมสำหรับผู้ใหญ่ @@ -1416,7 +1378,6 @@ ro = Arcadă ru = Аркада sk = Arcade - sr = Играоница за одрасле sv = Arkad sw = Ukumbi wa michezo th = อาเขต @@ -1458,7 +1419,6 @@ ro = Stație încărcare ru = Зарядная станция sk = Dobíjacia stanica - sr = Станица за пуњење ЕВ sv = Laddstation th = สถานีชาร์จ tr = Şarj İstasyonu @@ -1500,7 +1460,6 @@ ro = Stație de încărcare pentru biciclete ru = Станция зарядки велосипедов sk = Nabíjacia stanica pre bicykle - sr = Станица за пуњење бицикла sv = Laddningsstation för cykel sw = Kituo cha Kuchaji Baiskeli th = สถานีชาร์จจักรยาน @@ -1543,7 +1502,6 @@ ro = Stație de încărcare autoturisme ru = Зарядная станция для автомобилей sk = Nabíjacia stanica pre motorové vozidlá - sr = Станица за пуњење аутомобила sv = Laddningsstation för bilar sw = Kituo cha Kuchaji Magari th = สถานีชาร์จรถยนต์ @@ -1585,7 +1543,6 @@ ro = De îngrijire a copilului ru = Детская комната sk = Jasle - sr = Вртић sv = Barnomsorg th = สถานรับเลี้ยงเด็ก tr = Kreş @@ -1625,7 +1582,6 @@ pt-BR = Cinema ru = Кинотеатр sk = Kino - sr = Биоскоп sv = Bio th = โรงภาพยนตร์ tr = Sinema @@ -1668,7 +1624,6 @@ ro = Popicărie ru = Боулинг sk = Bowlingová dráha - sr = Куглана sv = Bowlinghall sw = Njia ya Bowling th = ลานโบว์ลิ่ง @@ -1710,7 +1665,6 @@ ro = Clinică ru = Поликлиника sk = Poliklinika - sr = Поликлиника sv = Klinik th = คลินิก tr = Klinik @@ -1751,7 +1705,6 @@ ro = Colegiu ru = Колледж sk = Vysoká škola - sr = Факултет sv = Högskola th = วิทยาลัย tr = Kolej @@ -1792,7 +1745,6 @@ ro = Centru comunitar ru = Культурно-досуговый центр sk = Dom kultúry - sr = Дом културе sv = Stadshus th = ศูนย์ชุมชน tr = Toplum Merkezi @@ -1832,7 +1784,6 @@ ro = Aer comprimat ru = Сжатый воздух sk = Stlačený vzduch - sr = Компримовани ваздух sv = Tryckluft sw = Air compressed th = อากาศอัด @@ -1876,7 +1827,6 @@ ro = Centru de conferinte ru = Конференц-центр sk = Konferenčné centrum - sr = Конференцијски центар sv = Konferens Center sw = Kituo cha Mikutano th = ศูนย์ประชุม @@ -1918,7 +1868,6 @@ ro = Judecătorie ru = Суд sk = Súd - sr = Суд sv = Domstol th = ศาล tr = Adliye @@ -1958,7 +1907,6 @@ pt-BR = Dentista ru = Стоматология sk = Zubár - sr = Зубар sv = Tandläkare th = ทันตแพทย์ tr = Dişçi @@ -1998,7 +1946,6 @@ pt-BR = Consultório médico ru = Врач sk = Ambulancia - sr = Доктор sv = Läkarmottagning th = ห้องแพทย์ tr = Doktor @@ -2039,7 +1986,6 @@ ro = Apă de băut ru = Питьевая вода sk = Pitná voda - sr = Вода за пиће sv = Dricksvatten th = น้ำดื่ม tr = İçme Suyu @@ -2085,7 +2031,6 @@ ro = Școală de șoferi ru = Автошкола sk = Autoškola - sr = Аутошкола sv = Körskola th = โรงเรียนสอนขับรถ tr = Sürücü Kursu @@ -2128,7 +2073,6 @@ ro = Centru de expozitie ru = Выставочный центр sk = Výstavisko - sr = Изложбени центар sv = Mässa sw = Kituo cha Maonyesho th = ศูนย์นิทรรศการ @@ -2171,7 +2115,6 @@ ro = Transfer de bani ru = Денежные переводы sk = Prevod peňazí - sr = Трансфер новца sv = Pengaöverföring sw = Uhamisho wa pesa th = การโอนเงิน @@ -2213,7 +2156,6 @@ ro = Scoala de Muzica ru = Музыкальная школа sk = Hudobná škola - sr = Музичка школа sv = Musikskola sw = Shule ya Muziki th = โรงเรียนดนตรี @@ -2255,7 +2197,6 @@ ro = Școala de limbi străine ru = Языковая школа sk = Jazyková škola - sr = Школа језика sv = Språkskola sw = Shule ya Lugha th = โรงเรียนภาษา @@ -2297,7 +2238,6 @@ ro = Ambasadă ru = Посольство sk = Veľvyslanectvo - sr = Амбасада sv = Ambassad th = สถานทูต tr = Büyükelçilik @@ -2338,7 +2278,6 @@ ro = Fast food ru = Фастфуд sk = Rýchle občerstvenie - sr = Брза храна sv = Snabbmat th = อาหารจานด่วน tr = Hazır Yemek @@ -2379,7 +2318,6 @@ ro = Feribot ru = Паром sk = Trajekt - sr = Трајект sv = Färja th = เฟอร์รี่ tr = Feribot @@ -2421,7 +2359,6 @@ ro = Unitate de pompieri ru = Пожарная часть sk = Hasičská stanica - sr = Ватрогасна станица sv = Brandstation th = สถานีดับเพลิง tr = İtfaiye @@ -2450,7 +2387,6 @@ pt = Praça de alimentação pt-BR = Praça de alimentação ru = Ресторанный дворик - sr = Ресторанска башта tr = Yemek katı uk = Ресторанний двір zh-Hans = 美食广场 @@ -2488,7 +2424,6 @@ ro = Fântână ru = Фонтан sk = Fontána - sr = Фонтана sv = Fontän th = น้ำพุ tr = Çeşme @@ -2531,7 +2466,6 @@ ro = Benzinărie ru = АЗС sk = Benzínová pumpa - sr = Гасна станица sv = Bensinstation th = ปั๊มน้ำมัน tr = Benzinlik @@ -2574,7 +2508,6 @@ ro = Cimitir ru = Кладбище sk = Cintorín - sr = Гробље sv = Begravningsplats th = สุสาน tr = Mezarlık @@ -2606,7 +2539,6 @@ pt-BR = Cemitério cristão ru = Христианское кладбище sk = Kresťanský cintorín - sr = Хришћанско гробље tr = Hristiyan Mezarlığı uk = Християнський цвинтар zh-Hans = 基督教墓地 @@ -2643,7 +2575,6 @@ ro = Spital ru = Больница sk = Nemocnica - sr = Болница sv = Sjukhus th = คลินิก tr = Hastane @@ -2683,7 +2614,6 @@ ro = Stand de vânătoare ru = Охотничья вышка sk = Lovecké stanovisko - sr = Ловачка чека sv = Jakttorn th = จุดล่าสัตว์ tr = Avlanma Alanı @@ -2725,7 +2655,6 @@ ro = Chioșc cu înghețată ru = Мороженое sk = Zmrzlinový stánok - sr = Сладолед sv = Glasstånd th = แผงขายไอศกรีม tr = Dondurma Standı @@ -2765,7 +2694,6 @@ pt-BR = Cibercafé ru = Интернет-кафе sk = Internetová kaviareň - sr = Интернет кафе sv = Internetkafé th = อินเทอร์เน็ตคาเฟ่ tr = İnternet Kafe @@ -2806,7 +2734,6 @@ ro = Grădiniță ru = Детсад sk = Škôlka - sr = Вртић sv = Förskola th = โรงเรียนอนุบาล tr = Anaokulu @@ -2847,7 +2774,6 @@ ro = Bibliotecă ru = Библиотека sk = Knižnica - sr = Библиотека sv = Bibliotek th = ห้องสมุด tr = Kütüphane @@ -2890,7 +2816,6 @@ ro = Încărcare doc ru = Погрузочный док sk = Nakladacia rampa - sr = Утоварна станица sv = Lastkaj sw = Inapakia kituo th = แทนวางสนคา @@ -2932,7 +2857,6 @@ ro = Magazin ru = Рынок sk = Trhovisko - sr = Маркет sv = Marknadsplats th = ตลาดสินค้า tr = Pazaryeri @@ -2974,7 +2898,6 @@ ro = Parcare de motociclete ru = Мотопарковка sk = Parkovisko pre motocykle - sr = Паркинг за мотоцикле sv = Motorcykelparkering th = ที่จอดรถมอเตอร์ไซค์ tr = Motosiklet Parkı @@ -3015,7 +2938,6 @@ ro = Club de noapte ru = Ночной клуб sk = Nočný klub - sr = Ноћни клуб sv = Nattklubb th = ไนต์คลับ tr = Gece Kulübü @@ -3056,7 +2978,6 @@ ro = Centru de îngrijire ru = Дом престарелых sk = Ošetrovateľská služba - sr = Старачки дом sv = Vårdhem th = บ้านพักคนชรา tr = Huzurevi @@ -3099,7 +3020,6 @@ ro = Parcare ru = Парковка sk = Parkovisko - sr = Паркинг sv = Parkering sw = Maegesho th = ที่จอดรถ @@ -3146,7 +3066,6 @@ ro = Parcare cu mai multe etaje ru = Многоэтажная парковка sk = Viacposchodové parkovisko - sr = Вишеспратни паркинг sv = Flervånings parkering sw = Maegesho ya Hifadhi nyingi th = ที่จอดรถหลายชั้น @@ -3199,7 +3118,6 @@ ro = Parcare privată ru = Частная парковка sk = Súkromné parkovisko - sr = Приватни паркинг sv = Privat parkering sw = Maegesho ya Kibinafsi th = ที่จอดรถส่วนตัว @@ -3242,7 +3160,6 @@ ro = Parcare ru = Парковка sk = Parkovisko - sr = Паркирај и вози паркинг sv = Parkering th = ที่จอดรถ tr = Otopark @@ -3284,7 +3201,6 @@ ro = Parcare subterană ru = Подземный паркинг sk = Podzemné parkovisko - sr = Подземни паркинг sv = Underjordisk parkering sw = Maegesho ya chini ya ardhi th = ที่จอดรถใต้ดิน @@ -3331,7 +3247,6 @@ ro = Parcare subterană privată ru = Частная подземная парковка sk = Súkromné podzemné parkovisko - sr = Приватни подземни паркинг sv = Privat underjordisk parkering sw = Maegesho ya kibinafsi ya chini ya ardhi th = ที่จอดรถใต้ดินส่วนตัว @@ -3373,7 +3288,6 @@ ro = Parcare pe partea stradală ru = Придорожная парковка sk = Parkovanie na strane ulice - sr = Паркинг поред пута sv = Gata sida parkering sw = Maegesho ya upande wa mtaa th = ที่จอดรถริมถนน @@ -3419,7 +3333,6 @@ ro = Privat parcare laterală pe stradă ru = Частная придорожная парковка sk = Súkromné bočné parkovisko na ulici - sr = Приватни паркинг поред пута sv = Privat gata sidoparkering sw = Maegesho ya upande wa mtaa wa kibinafsi th = ที่จอดรถริมถนนส่วนตัว @@ -3462,7 +3375,6 @@ ro = Parcare pe bandă ru = Парковочная полоса sk = Parkovací pruh - sr = Линијски паркинг sv = Körfält parkering sw = Maegesho ya njia th = ที่จอดรถเลน @@ -3508,7 +3420,6 @@ ro = Parcare pe alee privată ru = Частная парковочная полоса sk = Súkromný parkovací pruh - sr = Приватни линијски паркинг sv = Privat körfält parkering sw = Maegesho ya njia ya kibinafsi th = ที่จอดรถเลนส่วนตัว @@ -3551,7 +3462,6 @@ ro = Intrare parcare ru = Въезд на парковку sk = Vstup na parkovisko - sr = Улаз на паркинг sv = Parkering entré sw = Mlango wa maegesho th = ทางเข้าที่จอดรถ @@ -3594,7 +3504,6 @@ ro = Intrare privată pentru parcare ru = Въезд на частную парковку sk = Súkromné parkovisko vstup - sr = Улаз на приватни паркинг sv = Privat parkeringsingång sw = Mlango wa maegesho ya kibinafsi th = ทางเข้าที่จอดรถส่วนตัว @@ -3639,7 +3548,6 @@ ro = Loc de parcare ru = Парковочное место sk = Parkovacie miesto - sr = Паркинг место sv = Parkeringsplats sw = Sehemu ya maegesho th = พื้นที่จอดรถ @@ -3691,7 +3599,6 @@ ro = Loc de parcare pentru persoane cu handicap ru = Парковочное место для инвалидов sk = Parkovacie miesto pre invalidov - sr = Паркинг место за инвалиде sv = Handikappparkeringsplats sw = Nafasi ya maegesho iliyozimwa th = ที่จอดรถสำหรับผู้พิการ @@ -3733,7 +3640,6 @@ ro = Terminal de plăți ru = Терминал оплаты sk = Platobný terminál - sr = Терминал за наплату sv = Betalningsterminal th = จุดชำระเงิน tr = Ödeme Noktası @@ -3774,7 +3680,6 @@ ro = Farmacie ru = Аптека sk = Lekáreň - sr = Апотека sv = Apotek th = ร้านขายยา tr = Eczane @@ -3815,7 +3720,6 @@ ro = Loc de cult ru = Храм sk = Svätyňa - sr = Храм sv = Plats för tillbedjan th = สถานที่ประกอบพิธีกรรม tr = İbadet Yerleri @@ -3855,7 +3759,6 @@ ro = Templu ru = Храм sk = Budhistický chrám - sr = Будистички храм sv = Tempel th = วัด tr = Tapınak @@ -3896,7 +3799,6 @@ ro = Biserică ru = Церковь sk = Kostol - sr = Црква sv = Kyrka th = โบสถ์ tr = Kilise @@ -3936,7 +3838,6 @@ ro = Biserica lui Isus Hristos a Sfinților din Zilele din Urmă ru = Церковь Иисуса Христа Святых последних дней sk = Cirkev Ježiša Krista Svätých neskorších dní - sr = Црква Исуса Христа светаца последњих дана sv = Jesu Kristi Kyrka av Sista Dagars Heliga sw = Kanisa la Yesu Kristo la Watakatifu wa Siku za Mwisho th = โบสถ์พระเยซูคริสต์แห่งวิสุทธิชนยุคสุดท้าย @@ -3978,7 +3879,6 @@ ro = Sala Împărăției Martorilor lui Iehova ru = Зала Царства Свидетелей Иеговы sk = Sála Kráľovstva Jehovových svedkov - sr = Сала краљевства Јеховиних сведока sv = Jehovas vittnen Rikets sal sw = Ukumbi wa Ufalme wa Mashahidi wa Yehova th = ห้องราชอาณาจักรของพยานเยโฮวา @@ -4019,7 +3919,6 @@ ro = Templu ru = Храм sk = Hinduistický chrám - sr = Хинду храм sv = Tempel th = วัด tr = Tapınak @@ -4059,7 +3958,6 @@ ro = Sinagogă ru = Синагога sk = Synagóga - sr = Синагога sv = Synagoga th = มัสยิดยิว tr = Sinagog @@ -4100,7 +3998,6 @@ ro = Moschee ru = Мечеть sk = Mešita - sr = Џамија sv = Moské th = มัสยิด tr = Cami @@ -4141,7 +4038,6 @@ ro = Sanctuar ru = Святилище sk = Šintoistická svätyňa - sr = Шинтоистички храм sv = Altare th = ศาลเจ้า tr = Mabet @@ -4182,7 +4078,6 @@ ro = Templu ru = Храм sk = Taoistická svätyňa - sr = Таоистички храм sv = Tempel th = วัด tr = Tapınak @@ -4222,7 +4117,6 @@ ro = Poliție ru = Полиция sk = Polícia - sr = Полиција sv = Polis th = ตำรวจ tr = Polis @@ -4265,7 +4159,6 @@ ro = Cutie poștală ru = Почтовый ящик sk = Poštová schránka - sr = Поштанско сандуче sv = Postlåda th = ตู้จดหมาย tr = Posta Kutusu @@ -4306,7 +4199,6 @@ ro = Oficiu poștal ru = Почта sk = Pošta - sr = Пошта sv = Postkontor sw = Ofisi ya posta th = ที่ทำการไปรษณีย์ @@ -4350,7 +4242,6 @@ ro = Închisoare ru = Тюрьма sk = Väznica - sr = Затвор sv = Fängelse sw = Jela th = คุก @@ -4389,7 +4280,6 @@ pt-BR = Bar ou boteco ru = Паб sk = Pohostinstvo - sr = Паб sv = Krog th = ผับ tr = Meyhane @@ -4428,7 +4318,6 @@ ro = Bibliotecă ru = Книгообмен sk = Knižná búdka - sr = Размена књига sv = Bokskåp th = ตู้หนังสือ สถานที่แลกเปลี่ยนหนังสือ tr = Kitap Değişimi @@ -4473,7 +4362,6 @@ ro = Centru de reciclare ru = Приём вторсырья sk = Zberné suroviny - sr = Центар за рециклажу sv = Återvinningscentral th = ศูนย์รีไซเคิล tr = Geri Dönüşüm Merkezi @@ -4515,7 +4403,6 @@ ro = Containere pentru reciclare ru = Контейнер для вторсырья sk = Recyklačný kontajner - sr = Контејнер за рециклажу sv = Behållare för återvinningsbart avfall th = บรรจุภัณฑ์รีไซเคิล tr = Atık Toplama Merkezi @@ -4560,7 +4447,6 @@ ro = Baterii ru = Батарейки sk = Batérie - sr = Бетерије sv = Batterier sw = Betri th = แบตเตอรี่ @@ -4602,7 +4488,6 @@ ro = Haine vechi ru = Одежда sk = Staré oblečenie - sr = Стара одећа sv = Gamla kläder th = เสื้อผ้าเก่า tr = Kıyafet @@ -4643,7 +4528,6 @@ ro = Deșeuri de sticlă ru = Стеклотара sk = Sklenené fľaše - sr = Стаклене флаше sv = Returglas th = ขวดแก้ว tr = Cam Şişeler @@ -4684,7 +4568,6 @@ ro = Deșeuri de hârtie ru = Бумага sk = Papierový odpad - sr = Папир sv = Returpapper th = ขยะกระดาษ tr = Kağıt Atıklar @@ -4725,7 +4608,6 @@ ro = Deșeuri de plastic ru = Пластик sk = Plastový odpad - sr = Пластика sv = Plastavfall th = ขยะพลาสติก tr = Plastik Atıklar @@ -4766,7 +4648,6 @@ ro = Sticle de plastic ru = Пластиковые бутылки sk = Plastové fľaše - sr = Пластићне флаше sv = Samling av plastflaskor th = ขวดพลาสติก tr = Plastik Şişeler @@ -4808,7 +4689,6 @@ ro = Resturi de metal ru = Металлолом sk = Kovový šrot - sr = Старо гвожђе sv = Metallskrap th = โลหะมีคม tr = Hurda Metaller @@ -4849,7 +4729,6 @@ ro = Deșeuri electrice ru = Электроотходы sk = Elektronický odpad - sr = Елекрто отпад sv = Elektriskt avfall th = ขยะอิเล็กทรอนิกส์ tr = Elektronik Atıklar @@ -4879,7 +4758,6 @@ pt-BR = Papelão ru = Картон sk = Kartóny - sr = Картон tr = Karton uk = Картон @@ -4904,7 +4782,6 @@ pt-BR = Latas ru = Жестяные и алюминиевые банки sk = Plechovky - sr = Конзерве tr = Teneke ve alüminyum kutular uk = Бляшані та алюмінієві банки @@ -4929,7 +4806,6 @@ pt-BR = Sapatos ru = Обувь sk = Obuv - sr = Ципеле tr = Ayakkabılar uk = Взуття @@ -4953,7 +4829,6 @@ pt-BR = Lixo verde/orgânico ru = Органика / Пищевые отходы sk = Biologický odpad - sr = Биолошки отпад tr = Yeşil/Organik Atık uk = Органіка / Харчові відходи @@ -4978,7 +4853,6 @@ pt-BR = Caixa de bebidas ru = Тетрапак и аналоги sk = Tetrapaky - sr = Картон и папир tr = İçecek Kartonları uk = Тетрапак та аналоги @@ -5009,7 +4883,6 @@ pt-BR = Restaurante ru = Ресторан sk = Reštaurácia - sr = Ресторан sv = Restaurang th = ร้านอาหาร tr = Restoran @@ -5036,7 +4909,6 @@ pl = Miejsce opróżniania toalety dla kamperów pt-BR = Estação de despejo de esgotos ru = Слив для туалетов транспортных средств - sr = Станица за одлагање резервоара tr = Tank Boşaltma İstasyonu uk = Злив для туалетів транспортних засобів zh-Hans = 储液池排泄站 @@ -5074,7 +4946,6 @@ ro = Școală ru = Школа sk = Škola - sr = Школа sv = Skola th = โรงเรียน tr = Okul @@ -5117,7 +4988,6 @@ ro = Adăpost ru = Навес sk = Prístrešok - sr = Склониште sv = Vindskydd th = ที่อยู่อาศัย tr = Barınak @@ -5166,7 +5036,6 @@ ro = Baracă de Bivuac ru = Хижина для ночлега sk = Bivaková Chata - sr = Колиба за ноћење sv = Bivack Hydda sw = Kibanda cha Bivouac th = กระท่อมพักแรม @@ -5190,7 +5059,6 @@ pt = Abrigo tipo telheiro pt-BR = Abrigo tipo alpendre ru = Бивачный навес - sr = Склониште типа шупе uk = Бівуачний навіс zh-Hans = 三面避难所 zh-Hant = 三面避難所 @@ -5226,7 +5094,6 @@ ro = Baie publică ru = Общественная баня sk = Verejné kúpele - sr = Јавно купатило sv = Offentligt bad sw = Bafu ya Umma th = ห้องอาบน้ำสาธารณะ @@ -5268,7 +5135,6 @@ ro = Duș ru = Душ sk = Sprcha - sr = Туш sv = Dusch th = ฝักบัวอาบน้ำ tr = Duş @@ -5308,7 +5174,6 @@ ro = Stripclub ru = Стриптиз-клуб sk = Stripclub - sr = Стриптиз клуб sv = Stripklubb sw = Klabu ya Strip th = สตริปคลับ @@ -5346,7 +5211,6 @@ pt-BR = Táxi ru = Такси sk = Taxík - sr = Такси станица th = แท็กซี่ tr = Taksi uk = Таксі @@ -5385,7 +5249,6 @@ ro = Telefon ru = Телефон sk = Telefón - sr = Телефон sv = Telefon th = โทรศัพท์ tr = Telefon @@ -5426,7 +5289,6 @@ ro = Teatru ru = Театр sk = Divadlo - sr = Позориште sv = Teater th = โรงละคร tr = Tiyatro @@ -5465,7 +5327,6 @@ ro = Toaletă ru = Туалет sk = Záchody - sr = Тоалет sv = Toalett th = ห้องน้ำ tr = Tuvalet @@ -5510,7 +5371,6 @@ ro = Primărie ru = Администрация sk = Radnica - sr = Градска скупштина sv = Rådhus th = ศาลากลางจังหวัด tr = Belediye Binası @@ -5551,7 +5411,6 @@ ro = Universitate ru = Университет sk = Univerzita - sr = Универзитет sv = Universitet th = มหาวิทยาลัย tr = Üniversite @@ -5583,7 +5442,6 @@ pt-BR = Máquina de venda automática ru = Торговый автомат sk = Výdajný automat - sr = Аутомат tr = Otomat uk = Торговий автомат zh-Hans = 自动售货机 @@ -5622,7 +5480,6 @@ ro = Automat de țigări ru = Автомат с сигаретами sk = Automat na cigarety - sr = Аутомат за цигаре sv = Cigarettmaskin th = เครื่องขายบุหรี่ tr = Sigara Dağıtıcı @@ -5652,7 +5509,6 @@ pt-BR = Máquina de café ru = Кофейный автомат sk = Automat na kávu - sr = Аутомат за кафу uk = Кавовий автомат zh-Hans = 咖啡售卖机 zh-Hant = 咖啡售賣機 @@ -5677,7 +5533,6 @@ pt-BR = Máquina de venda de preservativos ru = Автомат с презервативами sk = Automat na kondómy - sr = Аутомат за кондоме uk = Автомат з презервативами zh-Hans = 避孕套售卖机 zh-Hant = 避孕套售賣機 @@ -5714,7 +5569,6 @@ ro = Automat de băuturi ru = Автомат с напитками sk = Nápojový automat - sr = Аутомат за пиће sv = Läskautomat th = เครื่องขายเครื่องดื่มอัตโนมัติ tr = İçecek Dağıtıcı @@ -5744,7 +5598,6 @@ pt-BR = Máquina de venda de comidas ru = Автомат с едой sk = Automat s potravinami - sr = Аутомат за храну uk = Автомат з їжею zh-Hans = 食品售卖机 zh-Hant = 食品售賣機 @@ -5770,7 +5623,6 @@ pt-BR = Máquina de venda de jornais ru = Газетный автомат sk = Automat s novinami - sr = Аутомат за новине uk = Газетний автомат zh-Hans = 报纸售卖机 zh-Hant = 報紙售賣機 @@ -5808,7 +5660,6 @@ ro = Parcomat ru = Паркомат sk = Automat na výdaj parkovacích lístkov - sr = Паркомат sv = Parkeringsautomat th = เครื่องชำระค่าที่จอดรถอัตโนมัติ tr = Otopark Fişi @@ -5851,7 +5702,6 @@ ro = Automat de vânzare a biletelor pentru transportul public ru = Автомат по продаже билетов sk = Predajný automat na lístky verejnej dopravy - sr = Аутомат за продају карата sv = Biljettautomat sw = Mashine ya kuuzia tiketi za usafiri wa umma th = เครื่องขายของหรือตั๋วขนส่งมวลชนอัตโนมัติ @@ -5882,7 +5732,6 @@ pt-BR = Máquina de venda de doces ru = Автомат со сладостями sk = Automat na sladkosti - sr = Аутомат за слаткише uk = Автомат із солодощами zh-Hans = 糖果售卖机 zh-Hant = 糖果售賣機 @@ -5907,7 +5756,6 @@ pt-BR = Saquinhos de lixo ru = Пакеты для экскрементов sk = Sáčky na psie exkrementy - sr = Кесе за псећи измет tr = Dışkı Torbası Dağıtıcı uk = Мішки для екскрементів zh-Hans = 排泄物袋售卖机 @@ -5937,7 +5785,6 @@ pt-BR = Armário de encomendas ru = Почтомат sk = Balíkomat - sr = Пакетомат tr = Kilitlenebilen Kutu Dolaplar uk = Поштомат zh-Hans = 包裹储物柜 @@ -5974,7 +5821,6 @@ ro = Inspecția vehiculului ru = Техосмотр автомобиля sk = Kontrola vozidla - sr = Контрола возила sv = Fordonsinspektion sw = Ukaguzi wa Gari th = การตรวจสอบยานพาหนะ @@ -6003,7 +5849,6 @@ nl = Tankautomaat pt-BR = Bomba de combustível ru = Топливная колонка - sr = Пумпа за гориво tr = Yakıt Dağıtıcı uk = Паливна колонка zh-Hans = 燃油泵 @@ -6041,7 +5886,6 @@ ro = Cabinet veterinar ru = Ветеринарная клиника sk = Veterinár - sr = Ветеринар sv = Veterinär th = สัตวแพทย์ tr = Veteriner @@ -6083,7 +5927,6 @@ ro = Pubelă ru = Урна sk = Odpadkový kôš - sr = Канте за смеће sv = Papperskorg th = ถังขยะ tr = Çöp Kutusu @@ -6124,7 +5967,6 @@ ro = Gunoi ru = Мусорный контейнер sk = Odpadky - sr = Контејнер за смеће sv = Avfallscontainer th = ขยะ tr = Çöp Konteyneri @@ -6154,7 +5996,6 @@ pt-BR = Estação de transferência de resíduos ru = Станция перевалки отходов sk = Prekládková stanica odpadu - sr = Станица за прераду отпада tr = Atık Transfer İstasyonu uk = Станція передачі сміття zh-Hans = 垃圾转运站 @@ -6192,7 +6033,6 @@ ro = Punct de alimentare cu apă ru = Вода для автодомов sk = Voda - sr = Чесма sv = Vattenpost th = จุดเติมน้ำ tr = Karavanlar için Su Noktası @@ -6227,7 +6067,6 @@ pt-BR = Barreira ru = Преграда sk = Zábrana - sr = Баријера tr = Bariyer uk = Перешкода zh-Hans = 障碍物 @@ -6264,7 +6103,6 @@ ro = Bloc ru = Блок sk = Blok - sr = Блок sv = Blockering th = บล็อก tr = Blok @@ -6304,7 +6142,6 @@ ro = Stâlp ru = Столбик sk = Pilier - sr = Стуб sv = Stolpe th = เสา tr = Direk @@ -6344,7 +6181,6 @@ ro = Control vamal ru = Погранконтроль sk = Hraničná kontrola - sr = Гранична контрола sv = Gränskontroll th = ด่านตรวจคนเข้าเมือง tr = Sınır Kontrolü @@ -6373,7 +6209,6 @@ pl = Łańcuch ru = Цепь sk = Reťaz - sr = Ланац tr = Zincir uk = Ланцюг zh-Hans = 链条 @@ -6404,7 +6239,6 @@ pt-BR = Barreira de bicicletas ru = Велосипедный барьер sk = Cyklistická zábrana - sr = Бедем tr = Bisiklet Bariyeri uk = Велосипедна перешкода zh-Hans = 自行车障碍 @@ -6443,7 +6277,6 @@ ro = Șanț de drenaj ru = Дренажная канава sk = Drenážna priekopa - sr = Канал sv = Dräneringsdike sw = Mfereji wa mifereji ya maji th = คูระบายน้ำ @@ -6484,7 +6317,6 @@ ro = Şanţ ru = Оборонительный ров sk = Priekopa - sr = Шанац sv = Vallgrav sw = Moti th = คูเมือง @@ -6527,7 +6359,6 @@ ro = Ape uzate ru = Сточные воды sk = Odpadová voda - sr = Отпадна вода sv = Avloppsvatten sw = Maji machafu th = น้ำเสีย @@ -6568,7 +6399,6 @@ ro = Intrare ru = Проход sk = Vstup - sr = Пролаз sv = Ingång th = ทางเข้า tr = Giriş @@ -6600,7 +6430,6 @@ pt-BR = Cerca ru = Забор sk = Plot - sr = Ограда tr = Çit uk = Огорожа zh-Hans = 篱笆 @@ -6637,7 +6466,6 @@ ro = Poartă ru = Ворота sk = Brána - sr = Капија sv = Grind th = ประตู tr = Geçit @@ -6668,7 +6496,6 @@ pt-BR = Sebe ru = Живая изгородь sk = Živý plot - sr = Жива ограда tr = Çit zh-Hans = 灌木篱笆 zh-Hant = 灌木籬笆 @@ -6718,7 +6545,6 @@ ro = Barieră cu braț ru = Шлагбаум sk = Závora - sr = Рампа sv = Bom th = ไม้กั้น tr = Asansör Kapısı @@ -6749,7 +6575,6 @@ pt-BR = Muro de retenção ru = Поддерживающая стена sk = Oporná stena - sr = Подзида tr = İstinat duvarı zh-Hans = 挡土墙 zh-Hant = 擋土牆 @@ -6783,7 +6608,6 @@ ro = Barieră ru = Перелаз sk = Turniket - sr = Прелаз преко ограде sv = Stätta th = บันไดข้าม tr = Çit Merdiveni @@ -6826,7 +6650,6 @@ ro = Turnichet ru = Турникет sk = Turniket - sr = Окретна капија sv = Turnstile sw = Turnstile th = ประตูหมุน @@ -6867,7 +6690,6 @@ ro = Barieră cu braț ru = Шлагбаум sk = Závora - sr = Рампа sv = Bom th = ไม้กั้น tr = Salıncak Kapısı @@ -6906,7 +6728,6 @@ ro = Cabină de taxare ru = Пункт оплаты sk = Mýto - sr = Наплатна рампа sv = Tullhus th = ด่านเก็บเงิน tr = Gişe @@ -6937,7 +6758,6 @@ pt-BR = Muro ru = Стена sk = Múr - sr = Зид tr = Duvar uk = Стіна zh-Hans = 墙 @@ -6964,7 +6784,6 @@ pt-BR = Fronteira ru = Граница sk = Hranica - sr = Граница tr = Sınır uk = Кордон zh-Hans = 边界 @@ -6991,7 +6810,6 @@ pt-BR = Fronteira administrativa ru = Административная граница sk = Administratívna hranica - sr = Административна граница tr = İdari Sınır uk = Адміністративний поділ zh-Hans = 行政区域界线 @@ -7018,7 +6836,6 @@ pt-BR = Fronteira de país ru = Граница страны sk = Národná hranica - sr = Гранични прелаз tr = Ulusal Sınır uk = Кордон країни zh-Hans = 国家行政区域界线 @@ -7043,7 +6860,6 @@ pt-BR = Fronteira de região ru = Граница региона sk = Hranica regiónu - sr = Регионална граница tr = Bölgesel Sınır uk = Областний поділ zh-Hans = 行政区域边界 @@ -7083,7 +6899,6 @@ ro = Parcul național ru = Национальный парк sk = Národný park - sr = Национални парк sv = Nationalpark sw = Hifadhi ya taifa th = อุทยานแห่งชาติ @@ -7127,7 +6942,6 @@ ro = Terenuri indigene ru = Земли коренных народов sk = Domorodé krajiny - sr = Домородачка земља sv = Ursprungsbefolkningens marker sw = Ardhi za asilia th = ดินแดนพื้นเมือง @@ -7170,7 +6984,6 @@ ro = Zonă protejată ru = Заповедная зона sk = Chránené územie - sr = Заштићено подручје sv = Skyddat område sw = Eneo Lindwa th = พื้นที่คุ้มครอง @@ -7229,7 +7042,6 @@ ro = Clădire ru = Здание sk = Budova - sr = Зграда sv = Byggnad th = อาคาร tr = Bina @@ -7274,7 +7086,6 @@ ro = Adresă ru = Адрес sk = Adresa - sr = Адресе sv = Adress sw = Anwani th = ที่อยู่ @@ -7317,7 +7128,6 @@ ro = Garaj ru = Гараж sk = Garáž - sr = Гаража th = อาคารจอดรถ tr = Garaj uk = Гараж @@ -7359,7 +7169,6 @@ ro = Clădirea gării ru = Здание ж/д станции sk = Budova stanice - sr = Станична зграда sv = Stationsbyggnaden sw = Jengo la Kituo th = อาคารสถานี @@ -7390,7 +7199,6 @@ pt-BR = Armazém ru = Склад sk = Sklad - sr = Депо tr = Depo uk = Склад zh-Hans = 仓库 @@ -7428,7 +7236,6 @@ ro = Mormânt ru = Могила sk = Hrob - sr = Гробље sv = Grav sw = Kaburi th = หลุมฝังศพ @@ -7469,7 +7276,6 @@ ro = Meșteșuguri ru = Мастерская sk = Remeselník - sr = Занатлије sv = Hantverk sw = Ufundi th = งานฝีมือ @@ -7511,7 +7317,6 @@ ro = Apicultor ru = Пчеловод sk = Včelár - sr = Пчелар sv = Biodlare sw = Mfugaji nyuki th = คนเลี้ยงผึ้ง @@ -7553,7 +7358,6 @@ ro = Fierar ru = Кузница sk = Kováč - sr = Ковач sv = Smedja sw = Mhunzi th = ช่างตีเหล็ก @@ -7595,7 +7399,6 @@ ro = Berărie ru = Крафтовая пивоварня sk = Pivovar - sr = Пивара sv = Bryggeri sw = Kiwanda cha pombe th = โรงเบียร์ @@ -7637,7 +7440,6 @@ ro = Catering ru = Кейтеринг sk = Cateringová spoločnosť - sr = Угоститељ sv = Cateringfirma sw = Mpishi th = พนักงานจัดเลี้ยง @@ -7679,7 +7481,6 @@ ro = Tâmplar ru = Столяр sk = Tesár - sr = Столар sv = Snickare sw = Seremala th = ช่างไม้ @@ -7720,7 +7521,6 @@ ro = Cofetar ru = Кондитер sk = Cukráreň - sr = Посластичарница sv = Konditor sw = Confectioner th = ลูกกวาด @@ -7762,7 +7562,6 @@ ro = Electrician ru = Электрик sk = Elektrikár - sr = Електрика sv = Elektriker sw = Fundi umeme th = ช่างไฟฟ้า @@ -7805,7 +7604,6 @@ ro = Reparații electronice ru = Ремонт электроники sk = Oprava elektroniky - sr = Сервис електричних уређаја sv = Reparation av elektronik sw = Urekebishaji wa Elektroniki th = ซ่อมเครื่องใช้ไฟฟ้า @@ -7846,7 +7644,6 @@ ro = Peisagist ru = Садовник sk = Záhradník - sr = Баштован sv = Trädgårdsmästare sw = Mtunza bustani th = คนจัดสวน @@ -7888,7 +7685,6 @@ ro = Moara de măcinat ru = Мельница sk = Mlyn - sr = Млин sv = Kvarn för slipning sw = Kusaga kinu th = โรงบด @@ -7930,7 +7726,6 @@ ro = Tehnici de lucru manual ru = Ремесленная мастерская sk = Ručné práce - sr = Занатска радионица sv = Konsthantverk sw = Kazi za mikono th = หัตถกรรม @@ -7973,7 +7768,6 @@ ro = Încălzire, ventilație și aer condiționat ru = Отопление, вентиляция и кондиционирование sk = Vzduchotechnika - sr = Грејање, вентилација и климатизација sv = Vvs sw = Kiyoyozi th = ระบบปรับอากาศ @@ -8016,7 +7810,6 @@ ro = Tăierea cheilor ru = Изготовление ключей sk = Rezanie kľúčov - sr = Нарезивање кључева sv = Nyckelklippning sw = Kukata Muhimu th = ตัดกุญแจ @@ -8059,7 +7852,6 @@ ro = Lăcătuș ru = Слесарь sk = Zámočník - sr = Бравар sv = Låssmed sw = Fundi wa kufuli th = ช่างกุญแจ @@ -8100,7 +7892,6 @@ ro = Metalurgist ru = Металлоконструкции sk = Kovorobotník - sr = Металне конструкције sv = Metallarbetare sw = Mfanyikazi wa chuma th = ช่างเหล็ก @@ -8141,7 +7932,6 @@ ro = Pictor ru = Маляр sk = Maliar natierač - sr = Молер sv = Målare sw = Mchoraji th = ช่างทาสี @@ -8183,7 +7973,6 @@ ro = Fotograf ru = Фотограф sk = Fotograf - sr = Фотограф sv = Fotograf sw = Mpiga picha th = ช่างภาพ @@ -8227,7 +8016,6 @@ ro = Magazin de aparate foto ru = Магазин фотоаппаратов sk = Obchod s fotoaparátmi - sr = Продавница фотоапарата sv = Kameraaffär sw = Duka la Kamera th = ร้านกล้อง @@ -8270,7 +8058,6 @@ ro = Instalator ru = Сантехник sk = Inštalatér - sr = Водоинсталатер sv = Vvs-montör sw = Fundi bomba th = ช่างประปา @@ -8312,7 +8099,6 @@ ro = Fabrica de cherestea ru = Лесопилка sk = Píla - sr = Стругара sv = Sågverk sw = Sumel th = ซูเมล @@ -8354,7 +8140,6 @@ ro = Reparații încălțăminte ru = Ремонт обуви sk = Oprava obuvy - sr = Обућар sv = Skomakare sw = Mtengeneza viatu th = ช่างซ่อมรองเท้า @@ -8396,7 +8181,6 @@ ro = Vinărie ru = Винодельня sk = Vinárstvo - sr = Винарија sv = Vineri sw = Mvinyo th = โรงกลั่นเหล้าองุ่น @@ -8438,7 +8222,6 @@ ro = Croitor ru = Ателье sk = Krajčírstvo - sr = Атеље sv = Skräddare sw = Mshonaji nguo th = ช่างตัดเสื้อ @@ -8477,7 +8260,6 @@ ro = Bucătărie africană ru = Африканская кухня sk = Africká kuchyňa - sr = Афричка sv = Afrikansk mat th = อาหารแอฟริกัน tr = Afrika mutfağı @@ -8515,7 +8297,6 @@ ro = Bucătărie americană ru = Американская кухня sk = Americká kuchyňa - sr = Америчка sv = Amerikansk mat th = อาหารอเมริกัน tr = Amerikan mutfağı @@ -8553,7 +8334,6 @@ ro = Bucătărie arabă ru = Арабская кухня sk = Arabská kuchyňa - sr = Арапска sv = Arabisk mat th = อาหารอาหรับ tr = Arap mutfağı @@ -8591,7 +8371,6 @@ ro = Bucătărie argentiniană ru = Аргентинская кухня sk = Argentínska kuchyňa - sr = Аргентинска sv = Argentinsk mat th = อาหารอาเจนติน่า tr = Arjantin mutfağı @@ -8629,7 +8408,6 @@ ro = Bucătărie asiatică ru = Азиатская кухня sk = Ázijská kuchyňa - sr = Азијска sv = Asiatisk mat th = อาหารเอเชีย tr = Asya mutfağı @@ -8667,7 +8445,6 @@ ro = Bucătărie austriacă ru = Австрийская кухня sk = Rakúska kuchyňa - sr = Аустријска sv = Österrikisk mat th = อาหารออสเตรีย tr = Avusturya mutfağı @@ -8705,7 +8482,6 @@ ro = Bagel ru = Бeйглы sk = Bagely - sr = Багел sv = Bagel th = เบเกิล tr = Simit @@ -8743,7 +8519,6 @@ ro = Bucătărie balcanică ru = Балканская кухня sk = Balkánska kuchyňa - sr = Балканска sv = Balkansk mat th = อาหารบอลข่าน tr = Balkan mutfağı @@ -8782,7 +8557,6 @@ ro = Grătar ru = Барбекю sk = Gril - sr = Роштиљ sv = Grillat th = บาร์บีคิว tr = Mangal @@ -8820,7 +8594,6 @@ ro = Bucătărie bavareză ru = Баварская кухня sk = Bavorská kuchyňa - sr = Баварска sv = Bayersk mat th = อาหารบาวาเรีย tr = Bavyera mutfağı @@ -8857,7 +8630,6 @@ ro = Gyudon ru = Говядина sk = Misa hovädzieho - sr = Говедина sv = Biff donburi th = ชามเนื้อวัว tr = Biftek tabağı @@ -8895,7 +8667,6 @@ ro = Bucătărie braziliană ru = Бразильская кухня sk = Brazílska kuchyňa - sr = Бразилска sv = Brasiliansk mat th = อาหารบราซิล tr = Brezilya mutfağı @@ -8934,7 +8705,6 @@ ro = Mic dejun ru = Завтраки sk = Raňajky - sr = Доручак sv = Frukost th = อาหารเช้า tr = Kahvaltı @@ -8957,7 +8727,6 @@ ro = Ceai cu perle ru = Чай с шариками sk = Bublinkový čaj - sr = Боба теа uk = Бульбашковий чай zh-Hans = 珍珠奶茶 zh-Hant = 珍珠奶茶 @@ -8992,7 +8761,6 @@ ro = Burger ru = Бургеры sk = Hamburger - sr = Хамбургер sv = Hamburgare th = เบอร์เกอร์ tr = Hamburger @@ -9029,7 +8797,6 @@ ro = Tavernă ru = Домашняя таверна (бушеншанк) sk = Viecha - sr = Таверна sv = Vintaverna th = โรงเหล้า tr = Buschenschank @@ -9068,7 +8835,6 @@ ro = Tort ru = Кондитерская sk = Koláče - sr = Колачи sv = Tårta th = เค้ก tr = Pasta @@ -9106,7 +8872,6 @@ ro = Bucătărie caraibă ru = Карибская кухня sk = Karibská kuchyňa - sr = Карибска sv = Karibisk mat th = อาหารแคริบเบียน tr = Karayip mutfağı @@ -9145,7 +8910,6 @@ ro = Pui ru = Блюда из курицы sk = Hydina - sr = Пилетина sv = Kyckling th = ไก่ tr = Tavuk @@ -9184,7 +8948,6 @@ ro = Bucătărie chineză ru = Китайская кухня sk = Čína - sr = Кинеска sv = Kinesisk mat th = อาหารจีน tr = Çin mutfağı @@ -9223,7 +8986,6 @@ ro = Cafenea ru = Кофе sk = Káva - sr = Кафа sv = Kaffe sw = Kahawa th = กาแฟ @@ -9262,7 +9024,6 @@ ro = Clătite ru = Тонкие блинчики sk = Palacinky - sr = Палачинке sv = Crêpe th = เครป tr = Krep @@ -9300,7 +9061,6 @@ ro = Bucătărie croată ru = Хорватская кухня sk = Chorvátska kuchyňa - sr = Хрватска sv = Kroatisk mat th = อาหารโครเอเชีย tr = Hırvat mutfağı @@ -9339,7 +9099,6 @@ ro = Curry ru = Блюда карри sk = Kari - sr = Кари sv = Curry th = กะหรี่ tr = Köri @@ -9379,7 +9138,6 @@ ro = Deli ru = Деликатесы sk = Delikatesy - sr = Деликатеси sv = Deli th = อาหารพิเศษ tr = Şarküteri @@ -9417,7 +9175,6 @@ ro = Diner ru = Дайнер sk = Diner - sr = Ресторан sv = Matställe th = ร้านอาหาร tr = Vagon restoran @@ -9456,7 +9213,6 @@ ro = Gogoși ru = Пончики sk = Šišky - sr = Крофне sv = Munk th = โดนัท tr = Donut @@ -9494,7 +9250,6 @@ ro = Bucătărie etiopiană ru = Эфиопская кухня sk = Etiópska kuchyňa - sr = Етиопијска sv = Etiopisk mat th = อาหารเอธิโอเปีย tr = Etiyopya mutfağı @@ -9532,7 +9287,6 @@ ro = Bucătărie filipineză ru = Филиппинская кухня sk = Filipínska kuchyňa - sr = Филипинска sv = Filippinsk mat th = อาหารฟิลิปปินส์ tr = Filipin mutfağı @@ -9570,7 +9324,6 @@ ro = Restaurant elegant ru = Ресторан высокой кухни sk = Exkluzívna reštaurácia - sr = Ексклузивни ресторан sv = Lyxrestaurang th = อาหารหรูหรา tr = Birinci sınıf restoran @@ -9609,7 +9362,6 @@ ro = Pește ru = Рыбный ресторан sk = Ryby - sr = Риба sv = Fisk th = ปลา tr = Balık @@ -9642,7 +9394,6 @@ ro = Pește și cartofi pai ru = Рыба и картофель фри sk = Ryba s hranolkami - sr = Риба и помфрит sv = Friterad fisk och pommes frites th = ปลาและมันฝรั่งทอด tr = Balık ve patates cipsi @@ -9680,7 +9431,6 @@ ro = Bucătărie franceză ru = Французская кухня sk = Francúzska kuchyňa - sr = Француска sv = Fransk mat th = อาหารฝรั่งเศส tr = Fransız mutfağı @@ -9718,7 +9468,6 @@ ro = Cartofi prăjiți ru = Блюда во фритюре sk = Vyprážané jedlá - sr = Пржена храна sv = Friterat th = ปลาเล็กปลาน้อย tr = Kızartma @@ -9756,7 +9505,6 @@ ro = Bucătărie georgiană ru = Грузинская кухня sk = Gruzínska kuchyňa - sr = Грусијска sv = Georgisk mat th = อาหารจอร์เจีย tr = Gürcistan mutfağı @@ -9794,7 +9542,6 @@ ro = Bucătărie germană ru = Немецкая кухня sk = Nemecká kuchyňa - sr = Немачка sv = Tysk mat th = อาหารเยอรมัน tr = Alman mutfağı @@ -9832,7 +9579,6 @@ ro = Bucătărie grecească ru = Греческая кухня sk = Grécka kuchyňa - sr = Грчка sv = Grekisk mat th = อาหารกรีก tr = Yunan mutfağı @@ -9870,7 +9616,6 @@ ro = Grătar ru = Гриль sk = Gril - sr = Грил sv = Grill th = ย่าง tr = Izgara @@ -9906,7 +9651,6 @@ ro = Tavernă ru = Винная таверна (хойригер) sk = Viecha (Heuriger) - sr = Винска таверна sv = Vintaverna (heuriger) th = โรงเหล้า tr = Heuriger @@ -9944,7 +9688,6 @@ ro = Hot dog ru = Хот-доги sk = Párok v rožku - sr = Hotdog sv = Varmkorv th = ฮอทดอก tr = Sosisli @@ -9982,7 +9725,6 @@ ro = Bucătărie maghiară ru = Венгерская кухня sk = Maďarská kuchyňa - sr = Мађарска sv = Ungersk mat th = อาหารฮังการี tr = Macar mutfağı @@ -10021,7 +9763,6 @@ ro = Înghețată ru = Кафе-мороженое sk = Zmrzlina - sr = Сладолед sv = Glass th = ไอศกรีม tr = Dondurma @@ -10060,7 +9801,6 @@ ro = Bucătărie indiană ru = Индийская кухня sk = Indická kuchyňa - sr = Индијска sv = Indisk mat th = อาหารอินเดีย tr = Hint mutfağı @@ -10098,7 +9838,6 @@ ro = Bucătărie indoneziană ru = Индонезийская кухня sk = Indonézska kuchyňa - sr = Индонежанска sv = Indonesisk mat th = อาหารอินโดนีเซีย tr = Endonezya mutfağı @@ -10137,7 +9876,6 @@ ro = Bucătărie internațională ru = Международная кухня sk = Medzinárodné jedlá - sr = Интернационална sv = Internationell mat th = อาหารนานาชาติ tr = Uluslararası mutfak @@ -10175,7 +9913,6 @@ ro = Bucătărie irlandeză ru = Ирландская кухня sk = Írska kuchyňa - sr = Ирска sv = Irländsk mat th = อาหารไอริช tr = İrlanda mutfağı @@ -10214,7 +9951,6 @@ ro = Bucătărie italiană ru = Итальянская кухня sk = Talianska kuchyňa - sr = Италијанска sv = Italiensk mat th = อาหารอิตาเลียน tr = İtalyan mutfağı @@ -10253,7 +9989,6 @@ ro = Pizza ru = Итальянская, пиццерия sk = Talianska kuchyňa; pizza - sr = Пица sv = Italiensk, pizza th = อาหารอิตาเลียน; พิซซ่า tr = İtalyan, pizza @@ -10292,7 +10027,6 @@ ro = Bucătărie japoneză ru = Японская кухня sk = Japonská kuchyňa - sr = Јапанска sv = Japansk mat th = อาหารญี่ปุ่น tr = Japon mutfağı @@ -10330,7 +10064,6 @@ ro = Kebab ru = Кебабы sk = Kebab - sr = Кебаб sv = Kebab th = เคบับ tr = Kebap @@ -10368,7 +10101,6 @@ ro = Bucătărie coreană ru = Корейская sk = Kórejská kuchyňa - sr = Кореанска sv = Koreansk mat th = อาหารเกาหลี tr = Kore mutfağı @@ -10406,7 +10138,6 @@ ro = Bucătărie laoțiană ru = Лаосская кухня sk = Laoská kuchyňa - sr = Лаоска sv = Laotisk mat th = อาหารลาว tr = Lao mutfağı @@ -10444,7 +10175,6 @@ ro = Bucătărie libaneză ru = Ливанская кухня sk = Libanonská kuchyňa - sr = Либанска sv = Libanesisk mat th = อาหารเลบานอน tr = Lübnan mutfağı @@ -10483,7 +10213,6 @@ ro = Bucătărie locală ru = Местная кухня sk = Miestna kuchyňa - sr = Локална sv = Lokal mat th = อาหารท้องถิ่น tr = Yerel mutfak @@ -10521,7 +10250,6 @@ ro = Bucătărie malgașă ru = Мадагаскарская кухня sk = Madagaskarská kuchyňa - sr = Мадагасарска sv = Madagaskisk mat th = มาดากัสการ์ tr = Madagaskar mutfağı @@ -10559,7 +10287,6 @@ ro = Bucătărie malaysiană ru = Малазийская кухня sk = Malajzijská kuchyňa - sr = Малезијска sv = Malaysisk mat th = อาหารมาเลเซีย tr = Malezya mutfağı @@ -10597,7 +10324,6 @@ ro = Bucătărie mediteraneeană ru = Средиземноморская кухня sk = Stredomorská kuchyňa - sr = Медитеранска sv = Medelhavsmat th = อาหารเมดิเตอร์เรเนียน tr = Akdeniz mutfağı @@ -10635,7 +10361,6 @@ ro = Bucătărie mexicană ru = Мексиканская кухня sk = Mexická kuchyňa - sr = Мексичка sv = Mexikansk mat th = อาหารเม็กซิกัน tr = Meksika mutfağı @@ -10673,7 +10398,6 @@ ro = Bucătărie marocană ru = Марокканская кухня sk = Marocká kuchyňa - sr = Мароканска sv = Marockansk mat th = อาหารโมร็อกโก tr = Fas mutfağı @@ -10712,7 +10436,6 @@ ro = Tăiței ru = Лапшичная sk = Rezance - sr = Резанца sv = Nudlar th = บะหมี่ tr = Erişte @@ -10750,7 +10473,6 @@ ro = Bucătărie orientală ru = Восточная кухня sk = Orientálna kuchyňa - sr = Оријентална sv = Orientalisk mat th = อาหารโอเรียนทอล tr = Uzak Doğu mutfağı @@ -10788,7 +10510,6 @@ ro = Clătite americane ru = Блинная sk = Lievance - sr = Палачинкарница sv = Pannkaka th = แพนเค้ก tr = Gözleme @@ -10827,7 +10548,6 @@ ro = Paste ru = Паста sk = Cestoviny - sr = Паста sv = Pasta th = พาสต้า tr = Makarna @@ -10865,7 +10585,6 @@ ro = Bucătărie persană ru = Иранская кухня sk = Perzská kuchyňa - sr = Персијска sv = Persisk mat th = อาหารเปอร์เซีย tr = İran mutfağı @@ -10903,7 +10622,6 @@ ro = Bucătărie peruană ru = Перуанская кухня sk = Peruánska kuchyňa - sr = Перуанска sv = Peruansk mat th = อาหารเปรู tr = Peru mutfağı @@ -10942,7 +10660,6 @@ ro = Pizza ru = Пиццерия sk = Pizza - sr = Пица sv = Pizza th = พิซซ่า tr = Pizza @@ -10980,7 +10697,6 @@ ro = Bucătărie poloneză ru = Польская кухня sk = Poľská kuchyňa - sr = Пољска sv = Polsk mat th = อาหารโปแลนด์ tr = Polonya mutfağı @@ -11018,7 +10734,6 @@ ro = Bucătărie portugheză ru = Португальская кухня sk = Portugalská kuchyňa - sr = Португалска sv = Portugisisk mat th = อาหารโปรตุเกส tr = Portekiz mutfağı @@ -11055,7 +10770,6 @@ ro = Ramen ru = Рамен sk = Rámen (japonská rezancová polievka) - sr = Рамен (јапанска супа са резанцима) sv = Ramen th = ราเม็ง tr = Japon eriştesi @@ -11094,7 +10808,6 @@ ro = Bucătărie regională ru = Региональная кухня sk = Regionálna kuchyňa - sr = Регионална sv = Regional mat th = อาหารพื้นเมือง tr = Bölgesel mutfak @@ -11132,7 +10845,6 @@ ro = Bucătărie rusă ru = Русская кухня sk = Ruská kuchyňa - sr = Руска sv = Rysk mat th = อาหารรัสเซีย tr = Rus mutfağı @@ -11171,7 +10883,6 @@ ro = Sandwich ru = Сэндвичи sk = Sendvič - sr = Сендвич sv = Smörgås th = แซนด์วิช tr = Sandviç @@ -11209,7 +10920,6 @@ ro = Cârnați ru = Сосисочная sk = Klobása - sr = Кобасица sv = Korv th = ไส้กรอก tr = Sucuk @@ -11248,7 +10958,6 @@ ro = Clătite sărate ru = Несладкие блинчики sk = Palacinky na slano - sr = Слане палачинке sv = Fyllda pannkakor th = แพนเค้กแบบเค็ม tr = Açma @@ -11287,7 +10996,6 @@ ro = Fructe de mare ru = Морепродукты sk = Morské plody - sr = Морски плодови sv = Skaldjur th = อาหารทะเล tr = Deniz ürünleri @@ -11325,7 +11033,6 @@ ro = Soba ru = Соба sk = Soba - sr = Соба sv = Soba th = โซบะ tr = Erişte @@ -11363,7 +11070,6 @@ ro = Bucătărie spaniolă ru = Испанская кухня sk = Španielska kuchyňa - sr = Шпанска sv = Spansk mat th = อาหารสเปน tr = İspanyol mutfağı @@ -11401,7 +11107,6 @@ ro = Steakhouse ru = Стейк-хаус sk = Steak house - sr = Стек sv = Stekhus th = ร้านสเต๊ก tr = Biftekçi @@ -11439,7 +11144,6 @@ ro = Sushi ru = Суши sk = Suši - sr = Суши sv = Sushi th = ซูชิ tr = Suşi @@ -11477,7 +11181,6 @@ ro = Tapas ru = Тапас-бар sk = Tapas - sr = Тапас sv = Tapas th = ทาปาส tr = Tapas @@ -11516,7 +11219,6 @@ ro = Ceai ru = Чайная sk = Čaj - sr = Чај sv = Te th = ชา tr = Çay @@ -11554,7 +11256,6 @@ ro = Bucătărie tailandeză ru = Тайская кухня sk = Thajská kuchyňa - sr = Тајландска sv = Thailändsk mat th = อาหารไทย tr = Tayland mutfağı @@ -11592,7 +11293,6 @@ ro = Bucătărie turcă ru = Турецкая кухня sk = Turecká kuchyňa - sr = Турска sv = Turkisk mat th = ตุรกีอาหารตุรกี tr = Türk mutfağı @@ -11630,7 +11330,6 @@ ro = Bucătărie vegană ru = Веганская кухня sk = Vegánske jedlá - sr = Веганска sv = Vegansk mat th = อาหารมังสวิรัติ tr = Vegan mutfağı @@ -11669,7 +11368,6 @@ ro = Bucătărie vegetariană ru = Вегетарианская кухня sk = Vegetariánske jedlá - sr = Вегетаријанска sv = Vegetarisk mat th = อาหารมังสวิรัติ tr = Vejetaryen mutfağı @@ -11707,7 +11405,6 @@ ro = Bucătărie vietnameză ru = Вьетнамская кухня sk = Vietnamská kuchyňa - sr = Вијетнамска sv = Vietnamesisk mat th = อาหารเวียดนาม tr = Vietnam mutfağı @@ -11735,7 +11432,6 @@ pt-BR = Emergência ru = Экстренная служба sk = Pohotovosť - sr = Хитна служба tr = Acil zh-Hans = 紧急服务 zh-Hant = 緊急服務 @@ -11771,7 +11467,6 @@ ro = Punct de adunare de urgență ru = Пункт аварийного сбора sk = Núdzové zhromaždisko - sr = Сабирно место за хитне случајеве sv = Nöduppsamlingsplats sw = Sehemu ya Mkutano wa Dharura th = จุดรวมพลฉุกเฉิน @@ -11813,7 +11508,6 @@ ro = Defibrilator ru = Дефибриллятор sk = Defibrilátor - sr = Дефибрилатор th = เครื่องกระตุ้นหัวใจ tr = Defibrilatör uk = Дефібрилятор @@ -11853,7 +11547,6 @@ ro = Hidrant ru = Пожарный гидрант sk = Požiarny hydrant - sr = Пожарни хидрант sv = Brandpost th = หัวจ่ายน้ำดับเพลิง tr = Yangın Söndürme Musluğu @@ -11893,7 +11586,6 @@ ro = Telefon de urgență ru = Телефон для экстренных вызовов sk = Núdzový telefón - sr = Ургентни телефон sv = Nödtelefon th = โทรศัพท์ฉุกเฉิน tr = Acil Telefon @@ -11934,7 +11626,6 @@ ro = Intrare ru = Вход sk = Vstup - sr = Улаз sv = Entré th = ทางเข้า tr = Giriş @@ -11977,7 +11668,6 @@ ro = Intrarea principala ru = Главный вход sk = Hlavný vchod - sr = Главни улаз sv = Huvudentré sw = Mlango Mkuu th = ทางเข้าหลัก @@ -12021,7 +11711,6 @@ ro = Ieșire ru = Выход sk = Východ - sr = Излаз sv = Utgång sw = Utgång th = ทางออก @@ -12068,7 +11757,6 @@ ro = Gratuit ru = Бесплатно sk = Zadarmo - sr = Бесплатно sv = Gratis sw = Bila th = ฟรี @@ -12111,7 +11799,6 @@ ro = Laborator medical ru = Медицинская лаборатория sk = Lekárske laboratórium - sr = Медисинска лабораторија sv = Medicinskt laboratorium sw = Maabara ya Matibabu th = ห้องปฏิบัติการทางการแพทย์ @@ -12154,7 +11841,6 @@ ro = Fizioterapeut ru = Физиотерапевт sk = Fyzioterapeut - sr = Физиотерапеут sv = Fysioterapeut sw = Mtaalamu wa Physiotherapist th = นักกายภาพบำบัด @@ -12197,7 +11883,6 @@ ro = Medicină alternativă ru = Альтернативная медицина sk = Alternatívna medicína - sr = Алтернативна медицина sv = Alternativ medicin sw = Dawa mbadala th = การแพทย์ทางเลือก @@ -12240,7 +11925,6 @@ ro = Audiologie ru = Аудиология sk = Audiológia - sr = Аудиологија sv = Audiologi sw = Mtaalamu wa kusikia th = โสตวิทยา @@ -12284,7 +11968,6 @@ ro = Centrul de donare de sânge ru = Центр донорства крови sk = Centrum darcovstva krvi - sr = Завод за трансфузију крви sv = Centrum för blodgivning sw = Kituo cha Uchangiaji Damu th = ศูนย์รับบริจาคโลหิต @@ -12327,7 +12010,6 @@ ro = Optometrie ru = Оптометрия sk = Optometria - sr = Оптометрија sv = Optometri sw = Optometry th = ทัศนมาตรศาสตร์ @@ -12370,7 +12052,6 @@ ro = Podiatrie ru = Подиатрия sk = Podiatria - sr = Педијатрија sv = Fotvård sw = Matibabu ya miguu th = แก้โรคเท้า @@ -12413,7 +12094,6 @@ ro = Psihoterapie ru = Психотерапия sk = Psychoterapia - sr = Психотерапеут sv = Psykoterapi sw = Tiba ya kisaikolojia th = จิตบำบัด @@ -12456,7 +12136,6 @@ ro = Eșantionare ru = Сбор анализов sk = Odber vzoriek - sr = Прикупљање анализа sv = Provtagning sw = Sampuli th = การสุ่มตัวอย่าง @@ -12499,7 +12178,6 @@ ro = Logopedie ru = Логопедия sk = Logopédia - sr = Логопед sv = Logopedics sw = Tiba ya hotuba th = การบำบัดด้วยการพูด @@ -12531,7 +12209,6 @@ pt-BR = Rodovia ru = Дорога sk = Cesta - sr = Аутопут tr = Otoyol uk = Дорога zh-Hans = 道路 @@ -12557,7 +12234,6 @@ pt-BR = Caminho para cavaleiros ru = Конная дорожка sk = Cesta pre jazdca na zvierati - sr = Коњска стаза tr = Atlı Yolu uk = Кінна доріжка zh-Hans = 马道 @@ -12618,7 +12294,6 @@ ro = Drum dedicat autobuzului ru = Выделенная автобусная дорога sk = Cesta pre autobusy - sr = Наменски аутобуски пут sv = Dedikerad bussväg sw = Barabara ya basi iliyotengwa th = ถนนทางเดินรถโดยเฉพาะ @@ -12665,7 +12340,6 @@ ro = Stație de autobuz ru = Остановка sk = Autobusová zastávka - sr = Аутобуска станица sv = Busshållplats th = ป้ายรถเมล์ tr = Otobüs Durağı @@ -12706,7 +12380,6 @@ ro = Drum în construcție ru = Строящаяся дорога sk = Cesta vo výstavbe - sr = Пут у изградњи sv = Väg under uppförande sw = Barabara inatengenezwa th = ทางกำลังอยู่ในการก่อสร้าง @@ -12739,7 +12412,6 @@ pt-BR = Ciclovia ru = Велодорожка sk = Cyklocesta - sr = Бициклистичка стаза tr = Bisiklet Yolu uk = Велодоріжка zh-Hans = 自行车道 @@ -12794,7 +12466,6 @@ pt-BR = Elevador ru = Лифт sk = Výťah - sr = Лифт tr = Asansör uk = Ліфт zh-Hans = 电梯 @@ -12832,7 +12503,6 @@ ro = Cale ru = Пешеходная дорожка sk = Cesta pre chodcov - sr = Пешачка стаза sv = Gångväg th = เส้นทาง tr = Yaya Yolu @@ -12877,7 +12547,6 @@ ro = Trotuar ru = Тротуар sk = Chodník - sr = Тротоар sv = Trottoar sw = Njia ya kando th = ทางเท้า @@ -12923,7 +12592,6 @@ ro = Trecere de pietoni ru = Пешеходный переход sk = Priechod pre chodcov - sr = Пешачки прелаз sv = Övergångsställe för fotgängare sw = Kivuko cha Watembea kwa miguu th = ทางม้าลาย @@ -12949,7 +12617,6 @@ pt-BR = Área de pedestres ru = Пешеходная зона sk = Pešia zóna - sr = Пешачка зона tr = Yaya Alanı uk = Пішохідна зона @@ -12968,7 +12635,6 @@ pt-BR = Ponte para pedestres ru = Пешеходный мост sk = Most pre chodcov - sr = Пасарела zh-Hans = 行人过街天桥 zh-Hant = 行人過街天橋 @@ -12988,7 +12654,6 @@ pt-BR = Túnel para pedestres ru = Пешеходный тоннель sk = Tunel pre chodcov - sr = Пешачки тунел [type.highway.ford] en = Ford @@ -13020,7 +12685,6 @@ ro = Superficial ru = Брод sk = Brod - sr = Брод sv = Vadställe th = ที่ตื้นของทางน้ำ tr = Geçit @@ -13059,7 +12723,6 @@ ro = Stradă ru = Жилая зона sk = Obytná zóna - sr = Улица у стамбеној зони sv = Gata th = ถนน tr = Cadde @@ -13109,7 +12772,6 @@ ro = Stradă ru = Автомагистраль sk = Diaľnica - sr = Мото пут sv = Gata th = ถนน tr = Otoyol @@ -13132,7 +12794,6 @@ pl = Most drogowy pt-BR = Ponte rodoviária ru = Автомобильный мост - sr = Мото пут мост [type.highway.motorway.tunnel] ref = type.highway.road.tunnel @@ -13148,7 +12809,6 @@ pl = Tunel drogowy pt-BR = Túnel rodoviário ru = Автомобильный тоннель - sr = Мото пут тунел [type.highway.motorway_junction] en = Road Exit @@ -13179,7 +12839,6 @@ ro = Ieșire ru = Съезд sk = Dopravný uzol - sr = Излаз са аутопута sv = Avfart th = ทางออก tr = Çıkış @@ -13205,7 +12864,6 @@ pt = Ligação a autoestrada pt-BR = Acesso a rodovia ru = Съезд с автомагистрали - sr = Излаз с мото пута tr = Otoyol Rampası uk = З'їзд з автомагістралі zh-Hans = 高速公路连接路 @@ -13251,7 +12909,6 @@ ro = Cale ru = Тропа sk = Cesta - sr = Пут sv = Gångväg sw = Njia th = เส้นทาง @@ -13298,7 +12955,6 @@ ro = Traseu dificil sau puțin vizibil ru = Сложная или плохо видимая тропа sk = Náročná alebo zle viditeľná trasa - sr = Тешка или слабо видљива стаза sv = Svår eller dåligt synlig led sw = Njia ngumu au isiyoonekana vizuri th = เส้นทางที่ยากลำบากหรือมองเห็นได้ไม่ดี @@ -13345,7 +13001,6 @@ ro = Traseu foarte dificil sau imposibil de distins ru = Очень сложная или неразличимая тропа sk = Veľmi náročná alebo nezreteľná stopa - sr = Веома тежак или нејасна стаза sv = Mycket svår eller omöjlig att urskilja spår sw = Njia ngumu sana au isiyoweza kutofautishwa th = เส้นทางที่ยากมากหรือแยกไม่ออก @@ -13372,7 +13027,6 @@ pt-BR = Caminho para ciclistas ru = Велопешеходная дорожка sk = Cesta pre cyklistov a chodcov - sr = Пут за бициклисте и пешаке tr = Bisiklet ve Yürüyüş Yolu uk = Велопішохідна доріжка @@ -13396,7 +13050,6 @@ pt-BR = Caminho para cavaleiros ru = Конная тропа sk = Cesta pre jazdca na zvierati - sr = Коњска стаза tr = Atlı Yolu uk = Кінна стежка @@ -13434,7 +13087,6 @@ ro = Stradă ru = Пешеходная улица sk = Ulica - sr = Пешачка улица sv = Gata th = ถนน tr = Yayalar için Cadde @@ -13457,7 +13109,6 @@ pl = Obszar deptaka ru = Пешеходная зона sk = Pešia zóna - sr = Пешачка зона tr = Yaya Alanı uk = Пішохідна зона zh-Hans = 步行区域 @@ -13476,7 +13127,6 @@ pt-BR = Ponte para pedestres ru = Пешеходный мост sk = Most pre chodcov - sr = Пешачки мост [type.highway.pedestrian.tunnel] ref = type.highway.road.tunnel @@ -13493,7 +13143,6 @@ pt-BR = Túnel para pedestres ru = Пешеходный тоннель sk = Tunel pre chodcov - sr = Пешачки тунел [type.highway.primary] en = Primary Road @@ -13526,7 +13175,6 @@ ro = Stradă ru = Шоссе sk = Cesta I. triedy - sr = Пут прве класе sv = Gata th = ถนน tr = Ana Yol @@ -13555,7 +13203,6 @@ mr = प्राथमिक मार्ग उतार pt-BR = Saída de rodovia ru = Съезд с шоссе - sr = Пристипни пут uk = З'їзд з шосе zh-Hans = 主要道路连接路 zh-Hant = 主要道路連接路 @@ -13597,7 +13244,6 @@ ro = Pistă de curse ru = Гоночный трек sk = Pretekárska dráha - sr = Тркачка стаза sv = Racerbana th = สนามแข่ง tr = Yarış Pisti @@ -13636,7 +13282,6 @@ ro = Stradă ru = Улица sk = Miestna komunikácia - sr = Стамбена улица sv = Gata th = ถนน tr = Sokak @@ -13688,7 +13333,6 @@ ro = Zonă de odihnă ru = Зона отдыха sk = Odpočívadlo - sr = Одмориште sv = Viloplats th = บริเวณพักผ่อน tr = Dinlenme Alanı @@ -13728,7 +13372,6 @@ ro = Stradă ru = Дорога sk = Ulica - sr = Пут sv = Gata th = ถนน tr = Yol @@ -13771,7 +13414,6 @@ ro = Pod ru = Мост sk = Most - sr = Мост sv = Bro sw = Daraja th = สะพาน @@ -13819,7 +13461,6 @@ ro = Tunel ru = Тоннель sk = Tunel - sr = Тунел sv = Tunnel sw = Mtaro th = อุโมงค์ @@ -13860,7 +13501,6 @@ ro = Stradă ru = Автодорога sk = Cesta II. triedy - sr = Пут друге класе sv = Gata th = ถนน tr = Tali Yol @@ -13889,7 +13529,6 @@ mr = दुय्यम मार्ग उतार pt-BR = Saída de rodovia ru = Съезд с автодороги - sr = Излаз са пута uk = З'їзд з автодороги zh-Hans = 次要道路连接路 zh-Hant = 次要道路連接路 @@ -13935,7 +13574,6 @@ ro = Stradă ru = Проезд sk = Účelová cesta - sr = Сервисни пут sv = Gata th = ถนน tr = Servis Yolu @@ -13966,7 +13604,6 @@ pt-BR = Via de acesso ru = Подъезд sk = Príjazdová cesta - sr = Прилаз uk = Під'їзд zh-Hans = 车道 zh-Hant = 車道 @@ -13987,7 +13624,6 @@ pt-BR = Estrada de estacionamento ru = Парковочный проезд sk = Cesta na parkovisku - sr = Пут на паркингу tr = Park Koridoru uk = Паркувальний проїзд zh-Hans = 停车场通道 @@ -14021,7 +13657,6 @@ pt-BR = Área de serviços de estrada ru = Зона обслуживания sk = Účelová oblasť - sr = Сервисна зона tr = Servis Alanı uk = Зона обслуговування zh-Hans = 服务区 @@ -14058,7 +13693,6 @@ ro = Detector de viteză ru = Камера скорости sk = Rýchlostná kamera - sr = Прекршајна камера sv = Hastighetskamera th = กล้องตรวจจับความเร็ว tr = Hız Kamerası @@ -14097,7 +13731,6 @@ ro = Cale ru = Лестница sk = Schody - sr = Мердевине sv = Gångväg th = เส้นทาง tr = Merdiven @@ -14143,7 +13776,6 @@ ro = Stradă ru = Дорога sk = Cesta III. triedy - sr = Пут треће класе sv = Gata th = ถนน tr = Üçüncül Yol @@ -14215,7 +13847,6 @@ ro = Stradă ru = Грунтовка sk = Poľná cesta - sr = Макадам sv = Gata th = ถนน tr = Pist @@ -14274,7 +13905,6 @@ ro = Semafoare ru = Светофор sk = Semafor - sr = Семафор sv = Trafikljus th = สัญญาณไฟจราจร tr = Trafik Işıkları @@ -14316,7 +13946,6 @@ ro = Stradă ru = Трасса sk = Cesta - sr = Улица sv = Gata th = ถนน tr = Devlet Yolu @@ -14386,7 +14015,6 @@ ro = Stradă ru = Небольшая дорога sk = Cesta bez administratívneho zaradenia - sr = Не класификовани пут sv = Gata th = ถนน tr = Tali Yol @@ -14507,7 +14135,6 @@ ro = Obiect istoric ru = Исторический объект sk = Historický objekt - sr = Историјски објект sv = Historiskt objekt sw = Kitu cha kihistoria th = วัตถุประวัติศาสตร์ @@ -14550,7 +14177,6 @@ ro = Avioane istorice ru = Исторический самолет sk = Historické lietadlo - sr = Историјски авион sv = Historiska flygplan sw = Ndege ya kihistoria th = เครื่องบินประวัติศาสตร์ @@ -14593,7 +14219,6 @@ ro = Ancoră istorică ru = Исторический якорь sk = Historická kotva - sr = Историјско сидро sv = Historiskt ankare sw = Nanga ya kihistoria th = ผู้ประกาศข่าวประวัติศาสตร์ @@ -14636,7 +14261,6 @@ ro = Sit arheologic ru = Археологический памятник sk = Archeologické nálezisko - sr = Археолошко налазиште sv = Arkeologisk plats sw = Tovuti ya Akiolojia th = โบราณสถาน @@ -14679,7 +14303,6 @@ ro = Câmpul de luptă ru = Поле боя sk = Bojisko - sr = Историјско бојно поље sv = Stridsområde sw = Uwanja wa vita th = สนามรบ @@ -14722,7 +14345,6 @@ ro = Piatră de hotar ru = Пограничный камень sk = Hraničný kameň - sr = Гранични камен sv = Gränsmärke sw = Jiwe la mpaka th = ขอบหิน @@ -14765,7 +14387,6 @@ ro = Tun ru = Пушка sk = Delo - sr = Топ sv = Kanon sw = Kanuni th = ปืนใหญ่ @@ -14808,7 +14429,6 @@ ro = Castel ru = Замок sk = Zámok - sr = Замак sv = Borg sw = Ngome th = ปราสาท @@ -14849,7 +14469,6 @@ ro = Castru ru = Каструм sk = Kastrum - sr = Римска тврђава sv = Castrum sw = Ngome ya Kirumi th = ป้อมโรมัน @@ -14892,7 +14511,6 @@ ro = Castel ru = Замок sk = Hrad - sr = Замак sv = Borg sw = Ngome th = ปราสาท @@ -14934,7 +14552,6 @@ ro = Biserică fortificată ru = Укреплённая церковь sk = Opevnený kostol - sr = Утврђена црква sv = Försvarskyrka sw = Kanisa lililoimarishwa th = โบสถ์เสริมความแข็งแกร่ง @@ -14977,7 +14594,6 @@ ro = Cetate ru = Крепость sk = Pevnosť - sr = Тврђава sv = Fästning sw = Ngome th = ป้อม @@ -15019,7 +14635,6 @@ ro = Castrul de deal ru = Городище sk = Hradisko - sr = Тврђава sv = Fornborg sw = Hillfort th = ป้อมเนิน @@ -15060,7 +14675,6 @@ ro = Kremlin ru = Кремль sk = Kremeľ - sr = Кремљ sv = Kreml sw = Kremlin th = เครมลิน @@ -15102,7 +14716,6 @@ ro = Conac ru = Усадьба sk = Kaštieľ - sr = Каштел sv = Herrgård sw = Nyumba ya manor th = คฤหาสน์ @@ -15145,7 +14758,6 @@ ro = Palat ru = Дворец sk = Palác - sr = Палата sv = Palats sw = Ikulu th = วัง @@ -15187,7 +14799,6 @@ ro = Castelul japonez ru = Замки Японии sk = Japonský hrad - sr = Јапански каштел sv = Japanskt slott sw = Ngome ya Kijapani th = ปราสาทญี่ปุ่น @@ -15229,7 +14840,6 @@ ro = Castel ru = Шато sk = Zámok - sr = Замак sv = Slott sw = Ngome th = ปราสาท @@ -15270,7 +14880,6 @@ ro = Poarta orașului ru = Городские ворота sk = Mestská brána - sr = Градска капија sv = Stadsport sw = Lango la jiji th = ประตูเมือง @@ -15314,7 +14923,6 @@ ro = Zidurile orașului ru = Городская стена sk = Mestský múr - sr = Градски зид sv = Stadsmur sw = Ukuta wa jiji th = กำแพงเมือง @@ -15357,7 +14965,6 @@ ro = Fort ru = Форт sk = Pevnosť - sr = Хисар sv = Fort sw = Ngome th = ป้อม @@ -15400,7 +15007,6 @@ ro = Spânzurătoare ru = Виселица sk = Šibenica - sr = Вешала sv = Galge sw = Kunyongea tr = Darağacı @@ -15442,7 +15048,6 @@ ro = Locomotiva istorică ru = Исторический локомотив sk = Historická lokomotíva - sr = Историјска локомотива sv = Historiskt lok sw = Locomotive ya kihistoria th = หัวรถจักรประวัติศาสตร์ @@ -15484,7 +15089,6 @@ ro = Comemorare ru = Мемориал sk = Pomník - sr = Мемориал sv = Minnesmärke sw = Ukumbusho th = ที่ระลึก @@ -15527,7 +15131,6 @@ ro = Cruce comemorativă ru = Памятный крест sk = Pamätný kríž - sr = Спомен крст sv = Kors till minne sw = Msalaba wa kumbukumbu th = อนุสรณ์สถานข้าม @@ -15570,7 +15173,6 @@ ro = Comemorare ru = Памятная доска sk = Pamätná tabuľa - sr = Спомен плоча sv = Minnesmärke sw = Plaque th = ที่ระลึก @@ -15612,7 +15214,6 @@ ro = Comemorare ru = Скульптура sk = Plastika - sr = Скулптура sv = Minnesmärke sw = Uchongaji th = ที่ระลึก @@ -15655,7 +15256,6 @@ ro = Comemorare ru = Статуя sk = Socha - sr = Статуа sv = Minnesmärke sw = Sanamu th = ที่ระลึก @@ -15696,7 +15296,6 @@ ro = Blocaj de poticnire ru = Камни преткновения sk = Kameň zmiznutých - sr = Столперстеин sv = Snubbelsten sw = Kikwazo th = อุปสรรค์ @@ -15739,7 +15338,6 @@ ro = Piatra istorica ru = Исторический камень sk = Historický kameň - sr = Историјски камен sv = Historisk sten sw = Jiwe la Kihistoria th = หินประวัติศาสตร์ @@ -15782,7 +15380,6 @@ ro = Memorial de război ru = Военный мемориал sk = Vojnový pamätník - sr = Војни меморијал sv = Krigsmonument sw = Kumbukumbu ya vita th = อนุสรณ์สถานสงคราม @@ -15825,7 +15422,6 @@ ro = Mina istorică ru = Историческая шахта sk = Historická baňa - sr = Историјски рудник sv = Historisk gruva sw = Mgodi wa Kihistoria th = เหมืองประวัติศาสตร์ @@ -15867,7 +15463,6 @@ ro = Monument ru = Памятник sk = Pamiatka - sr = Споменик sv = Minnesmärke sw = Mnara th = อนุสาวรีย์ @@ -15908,7 +15503,6 @@ ro = Stâlpul infamiei ru = Позорный столб sk = Pranier - sr = Стуб срама sv = Skampåle sw = Pillory th = ประจาน @@ -15950,7 +15544,6 @@ ro = Ruine ru = Руины sk = Zrúcanina - sr = Историјске рушевине sv = Ruiner sw = Gofu th = ซากปรักหักพัง @@ -15992,7 +15585,6 @@ ro = Navă ru = Корабль sk = Loď - sr = Лађа sv = Fartyg sw = Meli th = สถานที่ท่องเที่ยว @@ -16035,7 +15627,6 @@ ro = Tanc istoric ru = Исторический танк sk = Historický tank - sr = Историјски тенк sv = Historisk tank sw = Tangi ya kihistoria th = รถถังประวัติศาสตร์ @@ -16077,7 +15668,6 @@ ro = Mormânt ru = Гробница sk = Hrobka - sr = Гробница sv = Grav sw = Kaburi th = สถานที่ท่องเที่ยว @@ -16118,7 +15708,6 @@ ro = Troiță ru = Христианский крест sk = Kríž pri ceste - sr = Крст на путу sv = Korset vid vägkanten sw = Msalaba wa njiani th = ทางข้าม @@ -16160,7 +15749,6 @@ ro = Altarul de la marginea drumului ru = Святыня sk = Svätyňa pri ceste - sr = Светилиште поред пута sv = Helgedom vid vägkanten sw = Kaburi la njia th = ศาลเจ้าข้างทาง @@ -16203,7 +15791,6 @@ ro = Naufragiu ru = Кораблекрушение sk = Trosky lode - sr = Историјски бродолом sv = Förlisning sw = Ajali ya meli th = ซากเรืออัปปาง @@ -16282,7 +15869,6 @@ pt = Internet pt-BR = Internet ru = Интернет - sr = Интернет th = อินเทอร์เน็ต tr = İnternet uk = Інтернет @@ -16307,7 +15893,6 @@ pt = Internet pt-BR = Internet ru = Интернет - sr = Интернет th = อินเทอร์เน็ต tr = İnternet uk = Інтернет @@ -16334,7 +15919,6 @@ pt-BR = Cruzamento ru = Перекрёсток sk = Križovatka - sr = Раскрсница tr = Kavşak noktası uk = Перехрестя zh-Hans = 交叉口 @@ -16364,7 +15948,6 @@ pt-BR = Rotatória ru = Кольцо sk = Kruhový objazd - sr = Кружни ток tr = Göbekli kavşak uk = Кільце zh-Hans = 环形交叉口 @@ -16393,7 +15976,6 @@ pt-BR = Uso do solo ru = Землепользование sk = Využitie pôdy - sr = Пољопривредно земљиште tr = Arazi Kullanımı uk = Землевикористання zh-Hans = 土地利用要素 @@ -16419,7 +16001,6 @@ pt-BR = Horta comunitária ru = Земельные участки sk = Záhradky - sr = Парцела tr = Tahsisler uk = Земельні ділянки zh-Hans = 市民农园 @@ -16457,7 +16038,6 @@ ro = Bazin de apă ru = Резервуар sk = Vodná nádrž - sr = Резервоар sv = Vattenbassäng sw = Bonde la Maji th = อ่างน้ำ @@ -16482,7 +16062,6 @@ pt = Terreno industrial devoluto pt-BR = Terreno industrial devoluto ru = Земля для застройки - sr = Грађевинско земљиште tr = Terkedilmiş Endüstri Bölgesi uk = Земля для будiвництва zh-Hans = 废弃的工业用地 @@ -16529,7 +16108,6 @@ ro = Curtea Bisericii ru = Церковный двор sk = Cintorín - sr = Црква двориште sv = Kyrkogård sw = Sehemu ya kanisa th = บริเวณโบสถ์ @@ -16560,7 +16138,6 @@ pt-BR = Área comercial ru = Коммерческая застройка sk = Komerčná oblasť - sr = Кмерцијална област tr = Ticari Alan uk = Комерційні ділянки zh-Hans = 商业区 @@ -16586,7 +16163,6 @@ pt-BR = Construção ru = Стройка sk = Stavenisko - sr = Градилиште tr = Yapı uk = Будівництво zh-Hans = 建设区域 @@ -16610,7 +16186,6 @@ pt-BR = Instituições educacionais ru = Образовательные учреждения sk = Vzdelávacia inštitúcia - sr = Образовне установе uk = Освітній заклади zh-Hans = 教育设施 zh-Hant = 教育設施 @@ -16646,7 +16221,6 @@ ro = Teren arabil ru = Сельскохозяйственная земля sk = Poľnohospodárska pôda - sr = Пољопривредно земљиште sv = Jordbruksmark sw = Shamba th = พื้นที่ทำการเกษตร @@ -16674,7 +16248,6 @@ pt-BR = Pátio de fazenda ru = Сельскохозяйственная земля sk = Poľnohospodárske budovy - sr = Пољопривредно земљиште tr = Çiftlik Bölgesi uk = Сільськогосподарська земля zh-Hans = 农家庭院 @@ -16699,7 +16272,6 @@ pt-BR = Campo ru = Поле sk = Pole - sr = Поље tr = Alan uk = Поле zh-Hans = 田地 @@ -16738,7 +16310,6 @@ ro = Pat de flori ru = Клумба sk = Záhon - sr = Цветно острво sv = Rabatt sw = Kitanda cha maua th = แปลงดอกไม้ @@ -16779,7 +16350,6 @@ ro = Pădure ru = Лес sk = Les - sr = Шума sv = Skog th = ป่า tr = Orman @@ -16818,7 +16388,6 @@ ro = Pădure ru = Хвойный лес sk = Ihličnatý les - sr = Четинарска шума sv = Skog th = ป่า tr = Çam Ormanı @@ -16857,7 +16426,6 @@ ro = Pădure ru = Лиственный лес sk = Listnatý les - sr = Листопадна шума sv = Skog th = ป่า tr = Orman @@ -16897,7 +16465,6 @@ ro = Pădure ru = Смешанный лес sk = Zmiešaný les - sr = Шума sv = Skog th = ป่า tr = Orman @@ -16924,7 +16491,6 @@ pt-BR = Garagens ru = Гаражи sk = Garáže - sr = Гаража tr = Garajlar uk = Гаражі zh-Hans = 车库 @@ -16962,7 +16528,6 @@ ro = Gazon ru = Газон sk = Trávnik - sr = Травњак sv = Gräsmattan sw = Bustani th = สนามหญ้า @@ -16989,7 +16554,6 @@ pt = Terreno com construção planeada pt-BR = Terreno com construção planeada ru = Земля для застройки - sr = Грађевинско земљиште tr = Yeşil Alan uk = Земля для будiвництва zh-Hans = 待开发荒地 @@ -17012,7 +16576,6 @@ pt-BR = Estufas ru = Теплицы sk = Skleník - sr = Стакленици tr = Kış Bahçesi uk = Теплиці zh-Hans = 温室 @@ -17038,7 +16601,6 @@ pt-BR = Terreno industrial ru = Промзона sk = Priemyselná zóna - sr = Индустријска зона tr = Sanayi Bölgesi uk = Промзона zh-Hans = 工业用地 @@ -17075,7 +16637,6 @@ ro = Gunoiște ru = Свалка sk = Skládka - sr = Депонија sv = Soptippen sw = Shamba la Taka th = พื้นที่ฝังกลบ @@ -17105,7 +16666,6 @@ pt-BR = Pradaria ru = Луг sk = Lúka - sr = Ливада tr = Çayır uk = Луг zh-Hans = 草地 @@ -17131,7 +16691,6 @@ pt-BR = Área militar ru = Военная зона sk = Vojenská oblasť - sr = Војна област tr = Askeri Alan uk = Військова зона zh-Hans = 军事用地 @@ -17157,7 +16716,6 @@ pt-BR = Pomar ru = Сад sk = Sad - sr = Воћњак tr = Meyve Bahçesi uk = Сад zh-Hans = 果园 @@ -17183,7 +16741,6 @@ pt-BR = Pedreira ru = Карьер sk = Lom - sr = Каменолом tr = Taş Ocağı uk = Кар'єр zh-Hans = 矿场 @@ -17220,7 +16777,6 @@ ro = Instalații feroviare ru = Железнодорожные сооружения sk = Priestory železnice - sr = Железничке просторије sv = Järnvägsfaciliteter sw = Eneo la njia ya reli th = ที่ก่อสร้างทางรถไฟ @@ -17250,7 +16806,6 @@ pt-BR = Área de lazer ru = База отдыха sk = Priestranstvo na rekreáciu - sr = Простор за рекреацију tr = Dinlenme Alanı uk = База вiдпочинку zh-Hans = 娱乐场地 @@ -17285,7 +16840,6 @@ ro = Apă ru = Водоём sk = Voda - sr = Вештачко језеро sv = Vatten th = น้ำ tr = Su @@ -17314,7 +16868,6 @@ pt-BR = Área residencial ru = Жилая зона sk = Obytná zóna - sr = Стамбена зона tr = Yerleşim Alanı uk = Житлова зона zh-Hans = 住宅区 @@ -17340,7 +16893,6 @@ pt-BR = Área de varejo ru = Зона торговли sk = Obchodná zóna - sr = Пословна зона tr = Perakende Satış Alanı uk = Зона торгівлі zh-Hans = 零售区 @@ -17366,7 +16918,6 @@ pt-BR = Salinas ru = Соляной пруд sk = Salina - sr = Слано језеро tr = Havuz uk = Соляний став zh-Hans = 盐田 @@ -17388,7 +16939,6 @@ pt-BR = Espaço verde de um vilarejo ru = Парк sk = Zeleň - sr = Зеленило tr = Arazi uk = Парк zh-Hans = 村庄绿地 @@ -17413,7 +16963,6 @@ pt-BR = Vinha ru = Виноградник sk = Vinohrad - sr = Виноград tr = Üzüm Bağı uk = Виноградник zh-Hans = 葡萄园 @@ -17437,7 +16986,6 @@ pt-BR = Lazer ru = Место для отдыха sk = Voľný čas - sr = Слободно време tr = Dinlenecek Yer uk = Місце відпочинку zh-Hans = 休闲要素 @@ -17457,7 +17005,6 @@ pt = Terreno baldio pt-BR = Terreno baldio ru = Общественная земля - sr = Јавно земљиште tr = Kamu Alanı uk = Громадська земля zh-Hans = 公共用地 @@ -17495,7 +17042,6 @@ ro = Loc de plimbare a câinilor ru = Место для выгула собак sk = Výbeh pre psy - sr = Парк за псе sv = Hundparken sw = Eneo la mbwa th = สถานที่พาสุนัขเดินเล่น @@ -17536,7 +17082,6 @@ ro = Centru fitness ru = Фитнес-клуб sk = Fitnescentrum - sr = Фитнес центар sv = Gym th = ฟิตเนสเซ็นเตอร์ tr = Fitness Merkezi @@ -17575,7 +17120,6 @@ ro = Sală de fitness ru = Спортивные снаряды sk = Fitness - sr = Фитнес станица sv = Fitnesstation th = ศูนย์ฟิตเนส tr = Açık Hava Spor Alanı @@ -17615,7 +17159,6 @@ ro = Sala de dans ru = Танцпол sk = Tančiareň - sr = Плесна дворана sv = Danshall sw = Ukumbi wa Ngoma th = แดนซ์ฮอลล์ @@ -17656,7 +17199,6 @@ ro = Sit arheologic ru = Сад sk = Záhrada - sr = Башта sv = Trädgård th = สวน tr = Bahçe @@ -17678,7 +17220,6 @@ pt = Jardim residencial pt-BR = Jardim residencial ru = Частный сад - sr = Врт у дворишту tr = Konut Bahçesi uk = Частный сад zh-Hans = 居民区花园 @@ -17713,7 +17254,6 @@ ro = Teren de golf ru = Площадка для гольфа sk = Golfové ihrisko - sr = Терен за голф sv = Golfbana th = สนามกอล์ฟ tr = Golf Sahası @@ -17750,7 +17290,6 @@ ro = Minigolf ru = Минигольф sk = Minigolf - sr = Мини голф sv = Minigolf sw = Minigofu th = มินิกอล์ฟ @@ -17797,7 +17336,6 @@ pt-BR = Rinque de patinação ru = Каток sk = Klzisko - sr = Клизалиште tr = Buz Pateni Pisti uk = Каток zh-Hans = 滑冰场 @@ -17822,7 +17360,6 @@ pt-BR = Marina ru = Причал sk = Marína - sr = Марина tr = Liman uk = Пристань zh-Hans = 游艇码头 @@ -17859,7 +17396,6 @@ ro = Rezervație naturală ru = Заповедник sk = Prírodná rezervácia - sr = Природни резерват sv = Naturreservat sw = Hifadhi th = เขตอนุรักษ์ธรรมชาติ @@ -17900,7 +17436,6 @@ ro = Scaune în aer liber ru = Сидения на открытом воздухе sk = Posedenie vonku - sr = Седење на отвореном sv = Sittplatser utomhus sw = Viti vya nje th = ที่นั่งกลางแจ้ง @@ -17942,7 +17477,6 @@ ro = Parc ru = Парк sk = Park - sr = Парк sv = Parken sw = Hifadhi th = สวนสาธารณะ @@ -17998,7 +17532,6 @@ ro = Masă de picnic ru = Стол для пикника sk = Piknikový stôl - sr = Сто за пикник sv = Picknickbord sw = Jedwali la Picnic th = โตีะปิกนิก @@ -18038,7 +17571,6 @@ ro = Teren de sport ru = Спортплощадка sk = Športovisko - sr = Спортски терен sv = Idrottsplats th = พื้นสนามกีฬา tr = Spor Sahası @@ -18078,7 +17610,6 @@ ro = Loc de joacă ru = Детская площадка sk = Ihrisko - sr = Игралиште sv = Lekplats th = สนามเด็กเล่น tr = Oyun Alanı @@ -18136,7 +17667,6 @@ ro = Saună ru = Сауна sk = Sauna - sr = Сауна sv = Sauna sw = Chumba cha mvuke th = เซาน่า @@ -18164,7 +17694,6 @@ pt-BR = Rampa de barcos ru = Лодочный спуск sk = Lodný sklz - sr = Навоз tr = Kızak uk = Шлюпковий спуск zh-Hans = 船台 @@ -18200,7 +17729,6 @@ ro = Sport ru = Спорткомплекс sk = Športové centrum - sr = Спортски центар sv = Sportcenter th = กีฬา tr = Spor Merkezi @@ -18241,7 +17769,6 @@ ro = Centru cățărare ru = Скалодром sk = Lezecké centrum - sr = Зид за пењање sv = Klättercentrum th = ศูนย์ปีนเขา tr = Tırmanma Merkezi @@ -18282,7 +17809,6 @@ ro = Studio yoga ru = Йога-центр sk = Štúdio jogy - sr = Јога студио sv = Yogastudio th = โยคะสตูดิโอ tr = Yoga Stüdyosu @@ -18321,7 +17847,6 @@ ro = Stadion ru = Стадион sk = Štadión - sr = Стадион sv = Stadion th = สนามกีฬา tr = Stadyum @@ -18362,7 +17887,6 @@ ro = Piscină ru = Плавательный бассейн sk = Kúpalisko - sr = Базен sv = Simbassäng th = สระว่ายน้ำ tr = Yüzme Havuzu @@ -18381,7 +17905,6 @@ it = Piscina privata nl = Privé zwembad sk = Súkromné kúpalisko - sr = Приватни базен [type.leisure.track] en = Track @@ -18399,7 +17922,6 @@ pt-BR = Pista para esportes não motorizados ru = Беговая дорожка sk = Pretekárska dráha - sr = Тркачка стаза tr = Pist uk = Бігова доріжка zh-Hans = 賽道 @@ -18438,7 +17960,6 @@ ro = Parc acvatic ru = Аквапарк sk = Vodný park - sr = Водени парк sv = Äventyrspark th = สวนน้ำ tr = Su Parkı @@ -18460,7 +17981,6 @@ nl = Strandresort ru = Пляжный курорт sk = Plážový rezort - sr = Ресорт на плажи tr = Sahil Tatil Yeri uk = Пляжний курорт zh-Hans = 海滨度假区 @@ -18482,7 +18002,6 @@ pt-BR = Construção humana ru = Искусственное сооружение sk = Vytvorené človekom - sr = Грађевинске структуре tr = İnsan Yapımı uk = Штучна споруда zh-Hans = 人造要素 @@ -18505,7 +18024,6 @@ pt-BR = Molhe ru = Волнорез sk = Vlnolam - sr = Лукобран tr = Dalgakıran uk = Хвилеріз zh-Hans = 防波堤 @@ -18559,7 +18077,6 @@ ro = Coș de fabrică ru = Заводская труба sk = Komín - sr = Димњак sv = Fabriksskorsten th = ปล่องควันโรงงาน tr = Fabrika Bacası @@ -18584,7 +18101,6 @@ pt-BR = Aceiro ru = Просека sk = Lesný priesek - sr = Шумски пут tr = Kesme Çizgisi uk = Просіка zh-Hans = 树林分界线 @@ -18607,7 +18123,6 @@ pl = Znak geodezyjny ru = Геодезический пункт sk = Geodetický bod - sr = Геодетска тачка uk = Геодезичний пункт [type.man_made.flagpole] @@ -18628,7 +18143,6 @@ pl = Maszt flagowy ru = Флагшток sk = Vlajkový stožiar - sr = Јарбол са заставом tr = Bayrak Direği uk = Флагшток zh-Hans = 旗杆 @@ -18665,7 +18179,6 @@ ro = Far ru = Маяк sk = Maják - sr = Светионик sv = Fyr th = ประภาคาร tr = Deniz Feneri @@ -18692,7 +18205,6 @@ pl = Maszt ru = Мачта/вышка sk = Stožiar - sr = Јарбол tr = Direk uk = Щогла/вишка @@ -18716,7 +18228,6 @@ pt-BR = Píer ru = Пирс sk = Mólo - sr = Док tr = İskele uk = Пірс zh-Hans = 码头 @@ -18738,7 +18249,6 @@ pt-BR = Pipeline ru = Трубопровод sk = Potrubie - sr = Цевовод tr = Boru uk = Трубопровід zh-Hans = 管道 @@ -18759,7 +18269,6 @@ pt-BR = Pipeline aéreo ru = Наземный трубопровод sk = Pozemné potrubie - sr = Подземни цевовод tr = Yerüstü Boru Hattı zh-Hans = 地面管道 @@ -18780,7 +18289,6 @@ pl = Silos pt-BR = Silo ru = Элеватор - sr = Силос tr = Ambar uk = Силос @@ -18801,7 +18309,6 @@ pt-BR = Tanque de armazenagem ru = Резервуар sk = Skladovacia nádrž - sr = Резервоар tr = Depolama Tankı uk = Резервуар @@ -18835,7 +18342,6 @@ ro = Cameră de supraveghere ru = Камера наблюдения sk = Bezpečnostná kamera - sr = Сигурносна камера sv = Övervakningskamera th = กล้องวงจรปิด tr = Güvenlik Kamerası @@ -18875,7 +18381,6 @@ ro = Turn ru = Башня sk = Veža - sr = Торањ sv = Torn th = หอคอย tr = Kule @@ -18917,7 +18422,6 @@ ro = Turnul de comunicații ru = Вышка связи sk = Komunikačná veža - sr = Телекомуникациони торањ sv = Kommunikationstorn sw = Mnara wa Mawasiliano th = หอสื่อสาร @@ -18946,7 +18450,6 @@ pt-BR = Estação de tratamento de esgoto ru = Очистные сооружения sk = Čistička odpadových vôd - sr = Пречишћивач отпадних вода tr = Atıksu Tesisi uk = Очистні споруди zh-Hans = 污水处理厂 @@ -18982,7 +18485,6 @@ ro = Robinet cu apă ru = Водопроводный кран sk = Vodovodný kohútik - sr = Javna чесма sv = Vattenkran th = ก๊อกน้ำ tr = Su Musluğu @@ -19025,7 +18527,6 @@ ro = Turn de apă ru = Водонапорная башня sk = Vodojem - sr = Водоторањ sv = Vattentorn th = อ่างเก็บน้ำ tr = Su Kulesi @@ -19065,7 +18566,6 @@ ro = Puț de apă ru = Колодец sk = Studňa - sr = Бунар sv = Brunn th = บ่อน้ำ tr = Su Kuyusu @@ -19108,7 +18608,6 @@ ro = Moară de vânt ru = Ветряная мельница sk = Veterný mlyn - sr = Ветрењача sv = Väderkvarn th = กังหันลม tr = Yel Değirmeni @@ -19134,7 +18633,6 @@ pt-BR = Fábrica ru = Промышленное производство sk = Továreň - sr = Фабрика tr = Sanayi İşleri uk = Промислове виробництво zh-Hans = 工厂 @@ -19162,7 +18660,6 @@ pt = Militar pt-BR = Militar ru = Военные объекты - sr = Војска tr = Askeri zh-Hans = 军事 @@ -19191,7 +18688,6 @@ ro = Buncăr ru = Бункер sk = Bunker - sr = Бункер th = บังเกอร์ tr = Sığınak uk = Бункер @@ -19214,7 +18710,6 @@ nl = Bergpas ru = Перевал sk = Horský priesmyk - sr = Планински превој tr = Boğaz uk = Перевал @@ -19250,7 +18745,6 @@ ro = Natură ru = Природа sk = Príroda - sr = Природа sv = Natur sw = Uasilia th = ธรรมชาติ @@ -19292,7 +18786,6 @@ ro = Piatră goală ru = Каменная порода sk = Holá skala - sr = Камењар sv = Kala stenar sw = Mwamba tupu th = เปลือยร็อค @@ -19337,7 +18830,6 @@ ro = Pietriș ru = Галька sk = Kamienky - sr = Шљунак sv = Småsten th = ก้อนกรวด tr = Çakıl Taşları @@ -19379,7 +18871,6 @@ ro = Grohotiș ru = Каменистая осыпь sk = Kamenisté sutiny - sr = Камени крш sv = Stenig rasbrant th = หินกรวด tr = Kayşat @@ -19420,7 +18911,6 @@ ro = Golf ru = Залив sk = Záliv - sr = Залив sv = Bukt sw = Hori th = อ่าว @@ -19462,7 +18952,6 @@ ro = Plajă ru = Пляж sk = Pláž - sr = Плажа sv = Strand sw = Pwani th = ชายหาด @@ -19504,7 +18993,6 @@ ro = Plaja nisipoasa ru = Песчаный пляж sk = Piesočná pláž - sr = Пешчана плажа sv = Sandig strand sw = Pwani ya mchanga th = หาดทราย @@ -19546,7 +19034,6 @@ ro = Plaja cu pietriș ru = Галечный пляж sk = Štrková pláž - sr = Шљунковита плажа sv = Grusstrand sw = Pwani ya Gravel th = หาดกรวด @@ -19588,7 +19075,6 @@ ro = Mantie ru = Мыс sk = Mys - sr = Рт sv = Udde sw = Rasi th = พื้นที่ยื่นเข้าไปในน้ำ @@ -19630,7 +19116,6 @@ ro = Peșteră ru = Пещера sk = Jaskyňa - sr = Пећина sv = Grotta sw = Pango th = ถ้ำ @@ -19671,7 +19156,6 @@ ro = Faleză ru = Утёс sk = Útes - sr = Литица sv = Klint sw = Mwamba th = หน้าผา @@ -19712,7 +19196,6 @@ ro = Faleza ru = Обрыв sk = Násyp - sr = Насип sv = Klippa sw = Mwamba th = หน้าผา @@ -19753,7 +19236,6 @@ ro = Rambleu ru = Насыпь sk = Násyp - sr = Насип sv = Vägbank sw = Tuta th = เขื่อน @@ -19795,7 +19277,6 @@ ro = Relief litoral ru = Береговая линия sk = Pobrežie - sr = Обала sv = Kust sw = Pwani th = ชายฝั่ง @@ -19834,7 +19315,6 @@ pt = Deserto ru = Пустыня sk = Púšť - sr = Пустиња uk = Пустиня [type.natural.geyser] @@ -19871,7 +19351,6 @@ ro = Gheizer ru = Гейзер sk = Gejzír - sr = Гејзир sv = Gejser sw = Chemchem ya maji moto th = นำ้พุร้อน @@ -19915,7 +19394,6 @@ ro = Ghețar ru = Ледник sk = Ľadovec - sr = Глечер sv = Glaciär sw = Mto barafu th = ธารน้ำแข็ง @@ -19957,7 +19435,6 @@ ro = Pajiști ru = Луг sk = Pasienky - sr = Пашњак sv = Gräsmarker sw = Nyasi th = ทุ่งหญ้า @@ -19998,7 +19475,6 @@ ro = Landă ru = Пустошь sk = Vresovisko - sr = Пуста земља sv = Hed sw = Afya th = เฮลธ์ @@ -20041,7 +19517,6 @@ ro = Izvor termal ru = Горячий источник sk = Termálny prameň - sr = Термални извор sv = Het källa sw = Majira ya joto th = บ่อน้ำร้อน @@ -20083,7 +19558,6 @@ ro = Lac ru = Озеро sk = Jazero - sr = Језеро sv = Sjö sw = Ziwa th = ทะเลสาบ @@ -20124,7 +19598,6 @@ ro = Camera de blocare ru = Шлюзовая камера sk = Plavebná komora - sr = Преводница sv = Låskammare sw = Chumba cha kufuli th = ห้องล็อค @@ -20166,7 +19639,6 @@ ro = Heleșteu ru = Пруд sk = Rybník - sr = Језерце sv = Damm sw = Bwawa th = บ่อ @@ -20207,7 +19679,6 @@ ro = Rezervor ru = Водохранилище sk = Nádrž - sr = Резервоар sv = Reservoar sw = Hifadhi th = อ่างเก็บน้ำ @@ -20248,7 +19719,6 @@ ro = Bazin de apă ru = Резервуар sk = Vodná nádrž - sr = Природни базен sv = Vattenbassäng sw = Bonde la Maji th = อ่างน้ำ @@ -20290,7 +19760,6 @@ ro = Râu ru = Река sk = Rieka - sr = Река sv = Flod sw = Mto th = แม่น้ำ @@ -20332,7 +19801,6 @@ ro = Teren ru = Суша sk = Pôda - sr = Земљиште sv = Landa sw = Nchi kavu th = พื้นดิน @@ -20374,7 +19842,6 @@ ro = Fâneață ru = Луг sk = Lúka - sr = Ливада sv = Äng sw = Meadow th = ทุ่งหญ้า @@ -20416,7 +19883,6 @@ ro = Livadă ru = Сад sk = Sad - sr = Воћњак sv = Fruktodling sw = Bustani th = สวนผลไม้ @@ -20458,7 +19924,6 @@ ro = Munte ru = Гора sk = Hora - sr = Гора sv = Bergstopp sw = Kilele th = จุดสูงสุด @@ -20499,7 +19964,6 @@ ro = Sela da Montanha ru = Седловина sk = Sedlo - sr = Планинско седло sv = Fjällsadel sw = Tandiko la mlima th = อานภูเขา @@ -20540,7 +20004,6 @@ ro = Rocă ru = Камень sk = Kameň - sr = Камен sv = Bergart sw = Mwamba th = หิน @@ -20583,7 +20046,6 @@ ro = Boschet ru = Заросли sk = Krovie - sr = Шикара sv = Ruggen sw = Eneo la Vichaka th = ป่าละเมาะ @@ -20625,7 +20087,6 @@ ro = Izvor ru = Родник sk = Prameň - sr = Извор sv = Vattenkälla sw = Chemchemi th = ฤดูใบไม้ผลิ @@ -20671,7 +20132,6 @@ ro = Strâmtoare ru = Пролив sk = Prieliv - sr = Теснац sv = Sund sw = Mlango Bahari th = ช่องแคบ @@ -20712,7 +20172,6 @@ ro = Rândul de copaci ru = Ряд деревьев sk = Stromoradie - sr = Дрворед sv = Trädrad sw = Safu ya mti th = แถวต้นไม้ @@ -20754,7 +20213,6 @@ ro = Vie ru = Виноградник sk = Vinohrad - sr = Виноград sv = Vingård sw = Shamba la mizabibu th = ไร่องุ่น @@ -20796,7 +20254,6 @@ ro = Vulcan ru = Вулкан sk = Sopka - sr = Вулкан sv = Vulkan sw = Volkeno th = ภูเขาไฟ @@ -20838,7 +20295,6 @@ ro = Apă ru = Водоём sk = Voda - sr = Вода sv = Vatten sw = Maji th = แหล่งน้ำ @@ -20881,7 +20337,6 @@ ro = Loc mlăștinos ru = Болотистая местность sk = Oblasť mokradí - sr = Мочвара sv = Sumpmarken sw = Maeneo yenye majimaji th = พื้นที่น้ำท่วมขัง @@ -20922,7 +20377,6 @@ ro = Turbărie ru = Торфяное болото sk = Rašelinisko - sr = Тресет sv = Myr sw = Bogi th = พรุ @@ -20964,7 +20418,6 @@ ro = Mlaştină ru = Болотистая местность sk = Močiar - sr = Мочвара sv = Kärr sw = Marsh th = ที่ลุ่มชื้นแฉะ @@ -20990,7 +20443,6 @@ pt-BR = Via sem saída ru = Тупик sk = Koniec cesty - sr = Крај пута tr = Çıkmaz uk = Тупик @@ -21025,7 +20477,6 @@ ro = Birou ru = Офис sk = Kancelária - sr = Канцеларија sv = Kontor th = สำนักงาน tr = Ofis @@ -21065,7 +20516,6 @@ ro = Sediu companei ru = Организация sk = Sídlo spoločnosti - sr = Компанија sv = Företagskontor th = สำนักงานบริษัท tr = Şirket Bürosu @@ -21105,7 +20555,6 @@ ro = Agent imobiliar ru = Агентство недвижимости sk = Realitný agent - sr = Агент за некретнине sv = Fastighetsmäklare th = นายหน้าอสังหาริมทรัพย์ tr = Emlakçı @@ -21146,7 +20595,6 @@ ro = Birou guvernamental ru = Госучреждение sk = Štátny úrad - sr = Владина канцеларија sv = Ämbetsverk th = หน่วยงานราชการ tr = Devlet Dairesi @@ -21186,7 +20634,6 @@ ro = Birou de asigurări ru = Страховая компания sk = Poisťovňa - sr = Осигурање sv = Försäkringskontor th = สำนักงานประกันภัย tr = Sigorta Acentesi @@ -21226,7 +20673,6 @@ ro = Firmă de avocatură ru = Адвокат sk = Advokátska kancelária - sr = Адвокат sv = Advokatkontor th = สำนักงานทนายความ tr = Avukatlık Bürosu @@ -21266,7 +20712,6 @@ ro = Birou ONG ru = Общественная организация sk = Sídlo mimovládnej organizácie - sr = НВО sv = Kontor för icke-statlig organisation th = สำนักงานองค์กรพัฒนาเอกชน tr = STK Binası @@ -21308,7 +20753,6 @@ ro = Operator de telefonie mobilă ru = Телекоммуникационная компания sk = Mobilný operátor - sr = Мобилни оператер sv = Mobiloperatör th = ผู้ให้บริการโทรศัพท์มือถือ tr = Cep Telefonu Operatörü @@ -21333,7 +20777,6 @@ pt = Orgânico pt-BR = Orgânico ru = Эко - sr = Еко uk = Еко [type.organic.yes] @@ -21371,7 +20814,6 @@ ro = Municipiu ru = Город sk = Mesto - sr = Град sv = Stad sw = Jiji th = เมือง @@ -21413,7 +20855,6 @@ ro = Capitală ru = Столица sk = Hlavné mesto - sr = Главни град sv = Huvudstad sw = Mji mkuu th = เมือง @@ -21485,7 +20926,6 @@ ro = Continent ru = Континент sk = Kontinent - sr = Континент sv = Kontinent sw = Bara th = ทวีป @@ -21527,7 +20967,6 @@ ro = Continent ru = Страна sk = Krajina - sr = Држава sv = Land sw = Nchi th = ประเทศ @@ -21569,7 +21008,6 @@ ro = Județ ru = Округ sk = Oblasť - sr = Округ sv = Län sw = Wilaya th = เขต @@ -21611,7 +21049,6 @@ ro = Fermă ru = Ферма sk = Farma - sr = Фарма sv = Bondgård sw = Shamba th = ฟาร์ม @@ -21654,7 +21091,6 @@ ro = Cătun ru = Посёлок sk = Dedina - sr = Село sv = By sw = Hamlet th = หมู่บ้านเล็ก ๆ @@ -21696,7 +21132,6 @@ ro = Insulă ru = Остров sk = Ostrov - sr = Острво sv = Ö sw = Kisiwa th = เกาะ @@ -21738,7 +21173,6 @@ ro = Insult ru = Остров sk = Ostrovček - sr = Острвце sv = Ö sw = Kisiwa th = เกาะ @@ -21779,7 +21213,6 @@ ro = Locuință izolată ru = Хутор sk = Samota - sr = Изолована кућа sv = Isolerade bostäder sw = Makao ya Pekee th = ที่อยู่อาศัยโดดเดี่ยว @@ -21820,7 +21253,6 @@ ro = Localitate ru = Местность sk = Lokalita - sr = Локалитет sv = Lokalitet sw = Eneo th = ท้องถิ่น @@ -21863,7 +21295,6 @@ ro = Cartier ru = Микрорайон sk = Štvrť - sr = Насеље sv = Grannskap sw = Mtaa th = ละแวกบ้าน @@ -21905,7 +21336,6 @@ ro = Ocean ru = Океан sk = Oceán - sr = Океан sv = Ocean sw = Bahari kuu th = มหาสมุทร @@ -21946,7 +21376,6 @@ ro = Regiune ru = Район sk = Región - sr = Регион sv = Region sw = Mkoa th = ภูมิภาค @@ -21988,7 +21417,6 @@ ro = Mare ru = Море sk = More - sr = Море sv = Hav sw = Bahari th = เห็น @@ -22030,7 +21458,6 @@ ro = Spațiu ru = Площадь sk = Námestie - sr = Трг sv = Torg sw = Nafasi th = ช่องว่าง @@ -22072,7 +21499,6 @@ ro = Stat ru = Штат sk = Štát - sr = Држава sv = Stat sw = Jimbo la Shirikisho th = รัฐ @@ -22113,7 +21539,6 @@ ro = Stat ru = Штат sk = Štát - sr = Држава sv = Stat sw = Jimbo th = รัฐ @@ -22155,7 +21580,6 @@ ro = Suburbie ru = Район sk = Predmestie - sr = Кварт sv = Förort sw = Pambizo th = ชานเมือง @@ -22196,7 +21620,6 @@ ro = Oraș ru = Город sk = Mesto - sr = Град sv = Stad sw = Mji th = เมือง @@ -22239,7 +21662,6 @@ ro = Sat ru = Деревня sk = Dedina - sr = Село sv = By sw = Kijiji th = หมู่บ้าน @@ -22264,7 +21686,6 @@ pt = Energia pt-BR = Energia ru = Энергетика - sr = Енергетика tr = Enerji uk = Енергія zh-Hans = 电力要素 @@ -22284,7 +21705,6 @@ pt = Gerador de energia pt-BR = Gerador de energia ru = Генератор - sr = Генератор tr = Jeneratör uk = Генератор zh-Hans = 发电机 @@ -22322,7 +21742,6 @@ ro = Generator solar ru = Солнечный генератор sk = Solárny generátor - sr = Соларни генератор sv = Solgenerator sw = Jenereta ya jua th = เครื่องกำเนิดพลังงานแสงอาทิตย์ @@ -22365,7 +21784,6 @@ ro = Generator eolian ru = Ветрогенератор sk = Veterný generátor - sr = Ветрогенератор sv = Vindgenerator sw = Jenereta ya upepo th = เครื่องกำเนิดลม @@ -22408,7 +21826,6 @@ ro = Centrala electrica cu turbina cu gaz ru = Газотурбинная электростанция sk = Elektráreň s plynovou turbínou - sr = Гаснотурбинска електрана sv = Gasturbinkraftverk sw = Kiwanda cha nguvu cha turbine ya gesi th = โรงไฟฟ้ากังหันก๊าซ @@ -22451,7 +21868,6 @@ ro = Centrală hidroelectrică ru = Гидроэлектростанция sk = Vodná elektráreň - sr = Хидроелектрана sv = Vattenkraftverk sw = Kiwanda cha umeme wa maji th = โรงไฟฟ้าพลังน้ำ @@ -22479,7 +21895,6 @@ pt-BR = Linha de transmissão de energia ru = Линия электропередач sk = Elektrické vedenie - sr = Далековод tr = Elektrik Hattı uk = Лінія електропередач zh-Hans = 超高压输电线 @@ -22501,7 +21916,6 @@ pt-BR = Linha de transmissão de energia subterrânea ru = Подземная линия электропередач sk = Podzemné elektrické vedenie - sr = Подземни далековод tr = Yeraltı Elektrik Hattı uk = Підземна лінія електропередач zh-Hans = 超高压输电线 @@ -22560,7 +21974,6 @@ ro = Centrală electrică ru = Электростанция sk = Elektráreň - sr = Електрана sv = Kraftverk sw = Kiwanda cha nguvu th = โรงไฟฟ้า @@ -22603,7 +22016,6 @@ ro = Centrală electrică pe cărbune ru = Угольная электростанция sk = Uhoľná elektráreň - sr = Термоелектрана sv = Kolkraftverk sw = Kiwanda cha nguvu cha makaa ya mawe th = โรงไฟฟ้าถ่านหิน @@ -22652,7 +22064,6 @@ ro = Centrală solară ru = Солнечная электростанция sk = Solárna elektráreň - sr = Соларна електрана sv = Solkraftverk sw = Kiwanda cha nishati ya jua th = โรงไฟฟ้าพลังงานแสงอาทิตย์ @@ -22695,7 +22106,6 @@ ro = Centrală eoliană ru = Ветряная электростанция sk = Veterná elektráreň - sr = Ветропарк sv = Vindkraftverk sw = Kiwanda cha nguvu cha upepo th = โรงไฟฟ้าพลังงานลม @@ -22722,7 +22132,6 @@ pt-BR = Subestação elétrica ru = Электростанция sk = Elektrická stanica - sr = Електрична станица tr = Elektrik Santrali uk = Електростанція @@ -22756,7 +22165,6 @@ ro = Stație subterană ru = Подстанция sk = Rozvodňa - sr = Подстаница sv = Ställverk th = สถานีไฟฟ้า tr = Trafo @@ -22796,7 +22204,6 @@ ro = Stâlp de electricitate ru = Опора ЛЭП sk = Stĺp elektrického vedenia - sr = Далековод sv = Elstolpe th = เสาไฟฟ้า tr = Elektrik Kulesi @@ -22813,7 +22220,6 @@ it = Superficie nl = Wegdek ru = Поверхность - sr = Површина [type.psurface.paved_bad] en = psurface-paved_bad @@ -22821,7 +22227,6 @@ he = אספלט במצב גרוע nl = Verhard ru = Плохая асфальтированная - sr = Лош асфалт [type.psurface.paved_good] en = psurface-paved_good @@ -22829,7 +22234,6 @@ he = אספלט במצב טוב nl = Verhard ru = Хорошая асфальтированная - sr = Добар асфалт [type.psurface.unpaved_bad] en = psurface-unpaved_bad @@ -22837,7 +22241,6 @@ he = לא סלול במצב גרוע nl = Onverhard ru = Плохая неасфальтированная - sr = Лош макадам [type.psurface.unpaved_good] en = psurface-unpaved_good @@ -22845,7 +22248,6 @@ he = לא סלול במצב טוב nl = Onverhard ru = Хорошая неасфальтированная - sr = Добар макадам [type.public_transport] en = Public Transport @@ -22866,7 +22268,6 @@ pt-BR = Transporte público ru = Общественный транспорт sk = Hromadná doprava - sr = Јавни превоз tr = Toplu Taşıma uk = Громадський транспорт zh-Hans = 公共交通要素 @@ -22888,7 +22289,6 @@ pt-BR = Plataforma de transporte público ru = Платформа sk = Nástupište - sr = Стајалиште јавног превоза tr = Platform zh-Hans = 公共交通站台 @@ -22912,7 +22312,6 @@ pt-BR = Ferrovia ru = Ж/Д sk = Železnica - sr = Железница tr = Demiryolu uk = Залізниця zh-Hans = 铁路要素 @@ -22933,7 +22332,6 @@ pt-BR = Ferrovia abandonada ru = Заброшенная железная дорога sk = Zrušená trať - sr = Напуштена пруга tr = Terk edilmiş demiryolu uk = Закинута залізниця zh-Hans = 铁路遗迹 @@ -22951,7 +22349,6 @@ pt = Ferrovia abandonada pt-BR = Ferrovia abandonada ru = Заброшенный железнодорожный мост - sr = Напуштен железнички мост tr = Terk edilmiş demiryolu uk = Закинутий залізничний міст zh-Hans = 铁路遗迹 @@ -22969,7 +22366,6 @@ pt = Ferrovia abandonada pt-BR = Ferrovia abandonada ru = Заброшенный железнодорожный туннель - sr = Напуштен железнички тунел tr = Terk Edilmiş Demiryolu uk = Закинутий залізничний тунель zh-Hans = 铁路遗迹 @@ -22991,7 +22387,6 @@ pt = Ferrovia em construção pt-BR = Ferrovia em construção ru = Строящаяся железная дорога - sr = Пруга у изградњи tr = Demiryolu İnşaatı uk = Будівництво залізниці zh-Hans = 在建铁路 @@ -23014,7 +22409,6 @@ pt-BR = Passagem pedestre ru = Пешеходный переход sk = Železničné priecestie - sr = Пружни прелаз tr = Demiryolu Geçişi uk = Пішохідний перехід @@ -23035,7 +22429,6 @@ pt-BR = Ferrovia em desuso ru = Неиспользуемая железная дорога sk = Nepoužívaná trať - sr = Напуштена пруга tr = Kullanılmayan demiryolu uk = Недійсна залізниця zh-Hans = 废弃铁路 @@ -23073,7 +22466,6 @@ ro = Funicular ru = Фуникулер sk = Lanovka - sr = Успињача sv = Linbana sw = Funicular th = รถกระเช้าไฟฟ้า @@ -23163,7 +22555,6 @@ ro = Trecere feroviară ru = Железнодорожный переезд sk = Železničné priecestie - sr = Пружни прелаз sv = Järnvägskorsning sw = Tambuka Reli th = ทางรถไฟตัดผ่านถนน @@ -23187,7 +22578,6 @@ pt-BR = Metrô de superfície ru = Скоростной трамвай sk = Rýchlodráha - sr = Железнички семафор tr = Hafif Raylı uk = Швидкістний трамвай zh-Hans = 轻轨轨道 @@ -23203,7 +22593,6 @@ pt = Metropolitano de superfície pt-BR = Metrô de superfície ru = Скоростной трамвай - sr = Лака железница tr = Hafif Raylı uk = Швидкістний трамвай zh-Hans = 轻轨轨道 @@ -23254,7 +22643,6 @@ ro = Cale ferată monoșină ru = Монорельсовая железная дорога sk = Jednokoľajnicová dráha - sr = Jednošinska pruga sv = Monorail sw = Mfumo wa reli moja th = รางรถไฟรางเดี่ยว @@ -23279,7 +22667,6 @@ pt = Monocarril pt-BR = Monotrilho ru = Монорельсовая железная дорога - sr = Jednošinskи мост tr = Monoray uk = Монорейкова залізниця zh-Hans = 单轨轨道 @@ -23300,7 +22687,6 @@ pt = Monocarril pt-BR = Monotrilho ru = Монорельсовая железная дорога - sr = Jednošinskи тунел tr = Monoray uk = Монорейкова залізниця zh-Hans = 单轨轨道 @@ -23323,7 +22709,6 @@ pt-BR = Caminho de ferro de via estreita ru = Узкоколейка sk = Úzkorozchodná železnica - sr = Пруга уског колосека tr = Dar Hat Rayı uk = Вузькоколійка zh-Hans = 窄轨铁路轨道 @@ -23383,7 +22768,6 @@ pt-BR = Plataforma ferroviária ru = Железнодорожная платформа sk = Nástupište - sr = Железнички перон tr = Demiryolu Platformu uk = Залізнична платформа zh-Hans = 火车站台 @@ -23402,7 +22786,6 @@ pt-BR = Ferrovia preservada ru = Законсервированная Ж/Д sk = Muzejná železnica - sr = Туристичка пруга tr = Korunmuş Ray uk = Законсервована залізниця @@ -23464,7 +22847,6 @@ ro = Cale ferată ru = Железнодорожный путь sk = Železnica - sr = Пруга sv = Järnväg sw = Njia ya Reli th = รถไฟ @@ -23505,7 +22887,6 @@ ro = Calea ferată de mare viteză ru = Высокоскоростная железная дорога sk = Vysokorýchlostná železnica - sr = Пруга велике брзине sv = Järnväg för höghastighetståg sw = Reli ya mwendo wa kasi th = รถไฟความเร็วสูง @@ -23546,7 +22927,6 @@ ro = Calea ferată turistică ru = Туристическая железная дорога sk = Turistická železnica - sr = Туристичка железница sv = Järnväg för turisttrafik sw = Reli ya kitalii th = รถไฟท่องเที่ยว @@ -23587,7 +22967,6 @@ ro = Calea ferată ru = Железная дорога sk = Železnice - sr = Железница sv = Järnväg sw = Reli th = รถไฟ @@ -23629,7 +23008,6 @@ ro = Calea ferată secundară ru = Второстепенная железная дорога sk = Sekundárna železnica - sr = Секундарна железница sv = Sekundär järnväg sw = Reli ya sekondari th = รถไฟสายรอง @@ -23671,7 +23049,6 @@ ro = Calea ferată utilitară ru = Служебная железная дорога sk = Úžitková železnica - sr = Индустријска пруга sv = Järnväg för allmännyttiga ändamål sw = Utility railway th = ยูทิลิตี้รถไฟ @@ -23714,7 +23091,6 @@ ro = Pinteni de cale ferată ru = Подъездной Ж/Д путь sk = Železničná odbočka - sr = Железнички чвор sv = Järnvägsspår sw = Railway spur th = เดือยรถไฟ @@ -23756,7 +23132,6 @@ ro = Calea ferată auxiliară ru = Вспомогательный Ж/Д путь sk = Pomocná železničná trať - sr = Помоћна железничка пруга sv = Extra järnvägsspår sw = Njia ya reli ya msaidizi th = รางรถไฟเสริม @@ -23798,7 +23173,6 @@ ro = Podul de cale ferată ru = Железнодорожный мост sk = Železničný most - sr = Железнички мост sv = Järnvägsbro sw = Daraja la reli th = สะพานรถไฟ @@ -23861,7 +23235,6 @@ ro = Tunel de cale ferată ru = Железнодорожный туннель sk = Železničný tunel - sr = Железнички тунел sv = Järnvägstunnel sw = Njia ya reli th = อุโมงค์รถไฟ @@ -23923,7 +23296,6 @@ ro = Gară ru = Ж/д станция sk = Železničná stanica - sr = Железничка станица sv = Tågstation th = สถานีรถไฟ tr = Tren İstasyonu @@ -23994,7 +23366,6 @@ ro = Metrou ru = Метро sk = Metro - sr = Метро станица sv = Tunnelbana th = รถไฟ tr = Metro @@ -24361,7 +23732,6 @@ pt-BR = Metrô ru = Ветка метро sk = Metro - sr = Метро tr = Metro Hattı uk = Лінія метро @@ -24381,7 +23751,6 @@ pt-BR = Ponte de metrô ru = Ветка метро sk = Most metra - sr = Метро мост tr = Metro Hattı uk = Лінія метро @@ -24401,7 +23770,6 @@ pt-BR = Tunel de metrô ru = Ветка метро sk = Tunel metra - sr = Метро тунел tr = Metro Hattı uk = Лінія метро @@ -24436,7 +23804,6 @@ ro = Intrare în metro ru = Вход в метро sk = Vstup do metra - sr = Улаз у метро sv = Tunnelbana entré sw = Lango la kuingilia stesheni ya reli th = ทางเข้ารถไฟใต้ดิน @@ -24804,7 +24171,6 @@ pt = Linha de elétrico pt-BR = Linha de bonde ru = Трамвай - sr = Трамвај tr = Tramvay Hattı uk = Трамвай zh-Hans = 电车轨道 @@ -24826,7 +24192,6 @@ pt-BR = Linha de bonde ru = Трамвай sk = Električka - sr = Трамвајски мост tr = Tramvay Hattı uk = Трамвай zh-Hans = 电车轨道 @@ -24848,7 +24213,6 @@ pt-BR = Linha de bonde ru = Трамвай sk = Tunel električky - sr = Трамвајски тунел tr = Tramvay Hattı uk = Трамвай zh-Hans = 电车轨道 @@ -24883,7 +24247,6 @@ ro = Stație de tramvai ru = Остановка трамвая sk = Zastávka električky - sr = Трамвајска станица sv = Spårvagnshållplats th = ป้ายรถราง tr = Tramvay Durağı @@ -24907,7 +24270,6 @@ pt-BR = Rota ru = Маршрут sk = Trasa - sr = Рута tr = Rota uk = Маршрут zh-Hans = 线路 @@ -24930,7 +24292,6 @@ pt-BR = Rota de balsa ru = Паромная переправа sk = Trajekt - sr = Трајект tr = Feribot uk = Паромна переправа zh-Hans = 航线 @@ -24967,7 +24328,6 @@ ro = Magazin ru = Магазин sk = Obchod - sr = Продавница sv = Butik th = ร้านค้า tr = Mağaza @@ -25006,7 +24366,6 @@ ro = Băuturi alcoolice ru = Магазин алкоголя sk = Liehoviny - sr = Продавница пића sv = Spritaffär th = ร้านขายเหล้า tr = İçki dükkanı @@ -25046,7 +24405,6 @@ ro = Brutărie ru = Булочная sk = Pekáreň - sr = Пекара sv = Bageri th = เบเกอรี่ tr = Fırın @@ -25088,7 +24446,6 @@ ro = Mobilier pentru baie ru = Мебель для ванной sk = Vybavenie do kúpeľne - sr = Намештај за купатило sv = Badrumsinredning sw = Vyombo vya Bafuni th = ตกแต่งห้องน้ำ @@ -25129,7 +24486,6 @@ ro = Salon de înfrumusețare ru = Салон красоты sk = Kozmetický salón - sr = Козметички салон sv = Skönhetssalong th = ร้านเสริมสวย tr = Güzellik Salonu @@ -25170,7 +24526,6 @@ ro = Băuturi ru = Напитки sk = Nápoje - sr = Пића sv = Drinkar th = เครื่องดื่ม tr = İçecekler @@ -25210,7 +24565,6 @@ ro = Bicicletă ru = Веломагазин sk = Cyklistický obchod - sr = Продавница бисикла sv = Cykelaffär th = จักรยาน tr = Bisikletçi @@ -25246,7 +24600,6 @@ ro = Casă de pariuri ru = Букмекерская контора sk = Stávková kancelária - sr = Кладионица th = ร้านรับแทงพนัน tr = Bahisçi uk = Букмекерська контора @@ -25286,7 +24639,6 @@ ro = Librărie ru = Книжный магазин sk = Kníhkupectvo - sr = Књижара sv = Bokaffär th = ร้านหนังสือ tr = Kitapçı @@ -25326,7 +24678,6 @@ ro = Măcelărie ru = Мясная лавка sk = Mäsiar - sr = Месара sv = Slaktare th = ร้านขายเนื้อ tr = Kasap @@ -25368,7 +24719,6 @@ ro = Magazin de canabis ru = Магазин каннабиса sk = Obchod s kanabisom - sr = Канабис шоп sv = Cannabisbutik sw = Duka la Bangi th = ร้านขายกัญชา @@ -25409,7 +24759,6 @@ ro = Magazin auto ru = Автосалон sk = Predajňa áut - sr = Продаја аута sv = Bilåterförsäljare th = ร้านค้ารถยนต์ tr = Otomobil Mağazası @@ -25448,7 +24797,6 @@ ro = Piese auto ru = Автомобильные запчасти sk = Autodiely - sr = Ауто делови sv = Bildelar th = อะไหล่รถยนต์ tr = Araba Parçaları @@ -25488,7 +24836,6 @@ ro = Atelier de reparații auto ru = СТО sk = Autoservis - sr = Ауто сервис sv = Bilreparatör th = ร้านซ่อมรถยนต์ tr = Oto Tamir @@ -25528,7 +24875,6 @@ ro = Vulcanizare ru = Шиномонтаж sk = Pneuservis - sr = Гуме sv = Däckverkstad th = ร้านปะยาง tr = Lastik Tamiri @@ -25556,7 +24902,6 @@ pl = Sklep z karawanami i kamperami ru = Продажа автодомов sk = Predajňa autokarov - sr = Продаја каравана tr = Karavan Bayiliği uk = Продаж автобудинків zh-Hans = 房车经销商 @@ -25595,7 +24940,6 @@ ro = Covoare ru = Ковры sk = Koberce - sr = Продавница тепиха sv = Mattor sw = Mazulia th = พรม @@ -25635,7 +24979,6 @@ ro = Mercerie ru = Бытовая химия sk = Drogéria - sr = Кућна хемија sv = Hushållskemikalier th = ร้านเคมีภัณฑ์ tr = Temizlik Ürünleri Mağazası @@ -25677,7 +25020,6 @@ ro = Magazin de ciocolată ru = Магазин шоколада sk = Obchod s čokoládou - sr = Чоколада sv = Chokladbutik th = ร้านช็อกโกแลต tr = Çikolata Dükkanı @@ -25718,7 +25060,6 @@ ro = Magazin de haine ru = Магазин одежды sk = Oblečenie - sr = Одећа sv = Klädbutik th = ร้านขายเสื้อผ้า tr = Giyim Mağazası @@ -25759,7 +25100,6 @@ ro = Magazin de cafea ru = Магазин кофе sk = Obchod s kávou - sr = Кафа sv = Kaffebutik th = ร้านขายกาแฟ tr = Kahve Dükkanı @@ -25800,7 +25140,6 @@ ro = Magazin de calculatoare ru = Компьютерный магазин sk = Obchod s výpočtovou technikou - sr = Компјутери sv = Datorbutik th = ร้านขายคอมพิวเตอร์ tr = Bilgisayar Mağazası @@ -25840,7 +25179,6 @@ ro = Cofetărie ru = Кондитерская sk = Cukrovinky - sr = Слаткиши sv = Konditori th = ร้านขายขนมหวาน tr = Şekerci @@ -25882,7 +25220,6 @@ ro = Magazin mixt ru = Продуктовый магазин sk = Zmiešaný tovar - sr = Мешовита роба sv = Närbutik th = ร้านสะดวกซื้อ tr = Bakkal @@ -25921,7 +25258,6 @@ ro = Centru copiere ru = Копировальный центр sk = Kopírovacie služby - sr = Копирница sv = Kopieringsbutik th = ร้านถ่ายเอกสาร tr = Kopyalama Merkezi @@ -25963,7 +25299,6 @@ ro = Cosmetică ru = Косметика sk = Obchod s kozmetikou - sr = Козметика sv = Kosmetika th = เครื่องสำอาง tr = Bakım ürünleri @@ -26005,7 +25340,6 @@ ro = Perdele ru = Шторы sk = Záclony - sr = Завесе sv = Gardiner sw = Mapazia th = ผ้าม่าน @@ -26047,7 +25381,6 @@ ro = Magazin de delicatese ru = Магазин деликатесов sk = Predajňa lahôdok - sr = Десликатеси sv = Delikatessbutik sw = Duka la Delicatessen th = ร้านขายอาหารสำเร็จรูป @@ -26088,7 +25421,6 @@ ro = Magazin universal ru = Универмаг sk = Obchodný dom - sr = Тржни центар sv = Varuhus th = ห้างสรรพสินค้า tr = Büyük Mağaza @@ -26131,7 +25463,6 @@ ro = Magazin de bricolaj ru = Строительный магазин sk = Potreby pre domácich majstrov - sr = Грађевинска радња sv = Järnhandel th = ร้านขายฮาร์ดแวร์ tr = Hırdavatçı @@ -26171,7 +25502,6 @@ ro = Curățătorie chimică ru = Химчистка sk = Čistiareň - sr = Хемијско чишћење sv = Kemtvätt th = ซักแห้ง tr = Kuru Temizleme @@ -26211,7 +25541,6 @@ ro = Electronice ru = Электротехника sk = Elektronika - sr = Електроника sv = Elektronik th = ร้านขายอุปกรณ์อิเล็กทรอนิกส์ tr = Elektronik Mağazası @@ -26250,7 +25579,6 @@ ro = Magazin erotic ru = Секс-шоп sk = Sex shop - sr = Секс шоп sv = Erotisk butik th = ร้านเฉพาะผู้ใหญ่ tr = Erotik Ürünler Mağazası @@ -26290,7 +25618,6 @@ ro = Magazin de țesături ru = Магазин тканей sk = Obchod s látkami - sr = Текстил sv = Tygbutik th = ร้านผ้า tr = Kumaş Mağazası @@ -26331,7 +25658,6 @@ ro = Magazin alimentar la fermă ru = Фермерский магазин sk = Obchod s farmárskymi potravinami - sr = Пиљара sv = Gårdsmataffär sw = Duka la Chakula cha shambani th = ฟาร์มฟู้ดช็อป @@ -26374,7 +25700,6 @@ ro = Acesorii de modă ru = Модные аксессуары sk = Módne doplnky - sr = Модни аксесоар sv = Modeaccessoarer sw = Vifaa vya Mtindo th = เครื่องประดับแฟชั่น @@ -26415,7 +25740,6 @@ ro = Florărie ru = Цветочный магазин sk = Kvetinárstvo - sr = Цвећара sv = Blomsteraffär th = ร้านดอกไม้ tr = Çiçekçi @@ -26456,7 +25780,6 @@ ro = Pompe funebre ru = Ритуальные услуги sk = Pohrebníctvo - sr = Погребна опрема sv = Begravningsentreprenörer th = สัปเหร่อ tr = Cenaze Levazımcısı @@ -26497,7 +25820,6 @@ ro = Magazin de mobilă ru = Магазин мебели sk = Nábytok - sr = Намештај sv = Möbelaffär th = ร้านเฟอร์นิเจอร์ tr = Mobilya Mağazası @@ -26537,7 +25859,6 @@ ro = Pepinieră ru = Садовые товары sk = Záhradkárske potreby - sr = Баштенски производи sv = Plantskola th = สถานรับเลี้ยงเด็ก tr = Bahçe Mağazası @@ -26579,7 +25900,6 @@ ro = Magazin de gaze ru = Газовый магазин sk = Obchod s plynom - sr = Индустријски гасови sv = Gasaffär sw = Duka la gesi th = ร้านแก๊ส @@ -26620,7 +25940,6 @@ ro = Magazin de suveniruri ru = Магазин сувениров sk = Darčeky - sr = Даротека sv = Presentaffär th = ร้านของขวัญ tr = Hediyelik Eşya Mağazası @@ -26660,7 +25979,6 @@ ro = Băcănie ru = Овощи и фрукты sk = Zelovoc - sr = Поврће и воће sv = Grönsakshandlare th = ร้านขายผัด tr = Manav @@ -26702,7 +26020,6 @@ ro = Băcănie ru = Бакалея sk = Potraviny - sr = Бакалница sv = Livsmedel sw = Chakula cha mboga th = ร้านขายของชำ @@ -26743,7 +26060,6 @@ ro = Coafor ru = Парикмахерская sk = Kaderníctvo - sr = Фризерска опрема sv = Frisör th = ช่างทำผม tr = Kuaför @@ -26779,7 +26095,6 @@ ro = Magazin de hardware ru = Хозяйственный магазин sk = Železiarstvo - sr = Гвожђара sv = Järnaffär sw = Duka la vifaa th = ร้านฮาร์ดแวร์ @@ -26820,7 +26135,6 @@ ro = Magazin de alimente naturiste ru = Магазин здоровой еды sk = Obchod so zdravou výživou - sr = Здрава храна sv = Hälsokostbutik sw = Duka la Chakula cha Afya th = ร้านอาหารเพื่อสุขภาพ @@ -26863,7 +26177,6 @@ ro = Magazin de ierburi ru = Магазин трав sk = Obchod s bylinkami - sr = Продавница биља sv = Örter butik sw = Duka la mimea th = ร้านสมุนไพร @@ -26906,7 +26219,6 @@ ro = Audio HiFi ru = Hi-Fi аудио sk = HiFi audio - sr = HiFi аудио sv = HiFi ljud sw = Sauti ya HiFi th = เครื่องเสียงไฮไฟ @@ -26949,7 +26261,6 @@ ro = Magazin de articole de uz casnic ru = Бытовые товары sk = Obchod s domácimi potrebami - sr = Кућне потрепштине sv = Husgerådsbutik sw = Duka la Vifaa vya Nyumbani th = ร้านของใช้ในบ้าน @@ -26991,7 +26302,6 @@ ro = Bijutier ru = Ювелирный магазин sk = Klenotníctvo - sr = Златара sv = Smycken th = ร้านขายเครื่องประดับ tr = Kuyumcu @@ -27028,7 +26338,6 @@ ro = Chioșc ru = Киоск sk = Stánok - sr = Киоск th = ร้าน tr = Büfe uk = Кіоск @@ -27069,7 +26378,6 @@ ro = Magazin de bucatarie ru = Кухонный магазин sk = Obchod s kuchynským vybavením - sr = Пилетина sv = Köksbutik sw = Duka la Jikoni th = ร้านครัว @@ -27111,7 +26419,6 @@ ro = Spălătorie ru = Прачечная sk = Práčovňa - sr = Перионица веша sv = Tvättstuga th = ร้านซักรีด tr = Çamaşırhane @@ -27151,7 +26458,6 @@ ro = Mall ru = Торговый центр sk = Nákupné centrum - sr = Мол sv = Galleria th = เดอะมอลล์ tr = Alışveriş Merkezi @@ -27191,7 +26497,6 @@ ro = Salon de masaj ru = Массажный салон sk = Masážny salón - sr = Масажа sv = Massagesalong th = สถานอาบอบนวด tr = Masaj Salonu @@ -27232,7 +26537,6 @@ ro = Magazin de telefoane mobile ru = Мобильные телефоны sk = Mobilné telefóny - sr = Мобилни телефони sv = Mobilbutik th = ร้านขายโทรศัพท์มือถือ tr = Cep Telefonu Mağazası @@ -27273,7 +26577,6 @@ ro = Credite ru = Ростовщик sk = Úžerník - sr = Лихвар sv = Pengar långivare th = ผู้ให้ยืมเงิน tr = Borç Para Veren @@ -27313,7 +26616,6 @@ ro = Magazin moto ru = Магазин мотоциклов sk = Obchod s motocyklami - sr = Мотори sv = Motorcykelaffär th = ร้านรถมอเตอร์ไซค์ tr = Motosiklet Dükkanı @@ -27355,7 +26657,6 @@ ro = Reparatie motociclete ru = Ремонт мотоциклов sk = Oprava motocyklov - sr = Сервис мотора sv = Motorcykel reparation sw = Ukarabati wa Pikipiki th = ซ่อมรถจักรยานยนต์ @@ -27398,7 +26699,6 @@ ro = Magazin de muzică ru = Музыкальный магазин sk = Hudobniny - sr = Музика sv = Musikaffär th = ร้านเพลง tr = Müzik Dükkanı @@ -27439,7 +26739,6 @@ ro = Magazin de instrumente muzicale ru = Музыкальные инструменты sk = Predajňa hudobných nástrojov - sr = Музички инструменти sv = Musikinstrumentbutik th = ร้านขายเครื่องดนตรี tr = Müzik Aletleri Mağazası @@ -27479,7 +26778,6 @@ ro = Chioșc cu ziare ru = Газетный киоск sk = Novinový stánok - sr = Новинарница sv = Tidningsstånd th = แผงขายหนังสือพิมพ์ tr = Gazete Standı @@ -27519,7 +26817,6 @@ ro = Optică ru = Оптика sk = Optika - sr = Оптика sv = Optiker th = ร้านแว่น tr = Gözlükçü @@ -27558,7 +26855,6 @@ ro = Echipament de exterior ru = Магазин снаряжения sk = Outdoorové vybavenie - sr = Пешачење, пењање и камповање sv = Fritidsutrustning th = อุปกรณ์กลางแจ้ง tr = Dış Mekan Ekipmanları @@ -27600,7 +26896,6 @@ ro = Punct de ridicare ru = Пункт выдачи заказов sk = Miesto odberu - sr = Пакетамап sv = Mötesplats sw = Sehemu ya kuchukua th = จุดรับของ @@ -27645,7 +26940,6 @@ ro = Magazin de paste ru = Магазин макаронных изделий sk = Obchod s cestovinami - sr = Тестенине sv = Pastabutik sw = Duka la Pasta th = ร้านพาสต้า @@ -27687,7 +26981,6 @@ ro = Patiserie ru = Выпечка sk = Pečivo - sr = Посластичарница sv = Bakverk sw = Keki th = ขนมอบ @@ -27727,7 +27020,6 @@ ro = Amanet ru = Ломбард sk = Záložňa - sr = Залагаоница sv = Pantbank th = ผู้รับจำนำ tr = Tefeci @@ -27768,7 +27060,6 @@ ro = Pet shop ru = Зоотовары sk = Chovateľské potreby - sr = Пет шоп sv = Djuraffär th = เพ็ทชอป tr = Evcil Hayvan Mağazası @@ -27810,7 +27101,6 @@ ro = Îngrijirea animalelor de companie ru = Груминг sk = Zvierací salón - sr = Грумер sv = Husdjursvård sw = Utunzaji wa Kipenzi th = กรูมมิ่งสัตว์เลี้ยง @@ -27851,7 +27141,6 @@ ro = Centru fotografii ru = Фототовары sk = Fotografické služby - sr = Фотограф sv = Fotoaffär th = ร้านถ่ายภาพ tr = Fotoğrafçı @@ -27893,7 +27182,6 @@ ro = Magazin de închiriere ru = Прокат sk = Požičovňa - sr = Центар за изнајмљивање sv = Uthyrningsbutik sw = Duka la Kukodisha th = ร้านเช่า @@ -27936,7 +27224,6 @@ ro = Magazin de închiriere de biciclete ru = Прокат велосипедов sk = Požičovňa bicyklov - sr = Изнајмљивање бицикла sv = Cykeluthyrningsbutik sw = Duka la Kukodisha Baiskeli th = ร้านเช่าจักรยาน @@ -27977,7 +27264,6 @@ ro = Pescărie ru = Рыбный магазин sk = Predajňa rýb - sr = Рибарница sv = Fiskhandlare th = ร้านขายปลา tr = Deniz Ürünleri Mağazası @@ -28018,7 +27304,6 @@ ro = Magazin second-hand ru = Секонд-хенд магазин sk = Second hand - sr = Половна одећа sv = Andrahandsaffär sw = Duka la Mitumba th = ร้านขายของมือสอง @@ -28059,7 +27344,6 @@ ro = Magazin de încălțăminte ru = Магазин обуви sk = Obuvníctvo - sr = Обућа sv = Skobutik th = ร้านขายรองเท้า tr = Ayakkabı Mağazası @@ -28098,7 +27382,6 @@ ro = Articole sportive ru = Магазин спорттоваров sk = Športové potreby - sr = Спорт sv = Sportaffär th = สินค้ากีฬา tr = Spor Ürünleri @@ -28138,7 +27421,6 @@ ro = Magazin de papetărie ru = Канцелярский магазин sk = Papiernictvo - sr = Књижара sv = Pappershandel th = ร้านขายเครื่องเขียน tr = Kırtasiye @@ -28174,7 +27456,6 @@ pt = Supermercado pt-BR = Supermercado ru = Супермаркет - sr = Супермаркет sv = Stormarknad th = ซูเปอร์มาร์เก็ต tr = Süpermarket @@ -28214,7 +27495,6 @@ ro = Salon de tatuaje ru = Тату-салон sk = Tetovací salón - sr = Тетоважа sv = Tatuerare th = ร้านสัก tr = Dövme Salonu @@ -28255,7 +27535,6 @@ ro = Magazin de ceai ru = Чайный магазин sk = Obchod s čajom - sr = Чајеви sv = Tebutik th = ร้านน้ำชา tr = Çay Dükkanı @@ -28295,7 +27574,6 @@ ro = Casă de bilete ru = Билетная касса sk = Predaj vstupeniek - sr = Билетарница sv = Biljettkontor th = จุดจำหน่ายตั๋ว tr = Bilet Satıcısı @@ -28336,7 +27614,6 @@ ro = Magazin de jucării ru = Магазин игрушек sk = Hračkárstvo - sr = Играчке sv = Leksaksaffär th = ร้านขายของเล่น tr = Oyuncakçı @@ -28376,7 +27653,6 @@ ro = Agenție de voiaj ru = Турагентство sk = Cestovná kancelária - sr = Туристичка агенција sv = Resebyrå th = สำนักงานการท่องเที่ยว tr = Seyahat Acentesi @@ -28416,7 +27692,6 @@ ro = Magazin anvelope ru = Магазин шин sk = Obchod s pneumatikami - sr = Гуме sv = Däckaffär th = ร้านยาง tr = Lastikçi @@ -28457,7 +27732,6 @@ ro = Magazin universal ru = Магазин полезных мелочей sk = Rozličný tovar - sr = Мешовита роба sv = Diverseaffär th = ร้านค้าปลีกอิสระ tr = Ucuz Ürünler Mağazası @@ -28497,7 +27771,6 @@ ro = Magazin video ru = Магазин видео sk = Videopožičovňa - sr = Видео клуб sv = Video butik sw = Duka la Video th = ร้านขายดีวีดี @@ -28538,7 +27811,6 @@ ro = Magazin de jocuri video ru = Магазин видеоигр sk = Predajňa s videohrami - sr = Видео игре sv = Videospel butik sw = Duka la Video za Michezo th = ร้านขายวิดีโอเกม @@ -28578,7 +27850,6 @@ ro = Vinărie ru = Винный магазин sk = Vinotéka - sr = Винарија sv = Vinhandel th = ร้านขายไวน์ tr = Şarap Mağazası @@ -28620,7 +27891,6 @@ ro = Magazin agricol ru = Сельскохозяйственный магазин sk = Farmárske potreby - sr = Пољопривредна опрема sv = Lantbruksbutik sw = Duka la kilimo th = ร้านเกษตร @@ -28662,7 +27932,6 @@ ro = Antichități ru = Антиквариат sk = Starožitnosti - sr = Антикварница sv = Antikviteter sw = Mambo ya kale th = ของเก่า @@ -28705,7 +27974,6 @@ ro = Magazin de electrocasnice ru = Магазин бытовой техники sk = Obchod so spotrebičmi - sr = Продавница апарата sv = Vitvarubutik sw = Duka la vifaa th = ร้านเครื่องใช้ไฟฟ้า @@ -28749,7 +28017,6 @@ ro = Magazin de arte ru = Художественный магазин sk = Obchod s umením - sr = Уметнички радови sv = Konstaffär sw = Duka la Sanaa th = ร้านศิลปะ @@ -28791,7 +28058,6 @@ ro = Magazin pentru copii ru = Детский магазин sk = Potreby pre deti - sr = Беби опрема sv = Barnbutik sw = Duka la watoto th = ร้านขายของสำหรับเด็ก @@ -28833,7 +28099,6 @@ ro = Magazin de genti ru = Магазин сумок sk = Obchod s taškami - sr = Торбе sv = Väskor butik sw = Hifadhi ya Mifuko th = ร้านกระเป๋า @@ -28876,7 +28141,6 @@ ro = Magazin de paturi ru = Магазин кроватей sk = Predajňa postelí - sr = Постељина sv = Sängbutik sw = Duka la vitanda th = ร้านขายเตียง @@ -28918,7 +28182,6 @@ ro = Butic ru = Бутик sk = Butik - sr = Бутик sv = Boutique sw = Boutique th = บูติก @@ -28960,7 +28223,6 @@ ro = Magazin de caritate ru = Благотворительный магазин sk = Charitatívny obchod - sr = Добротворна радња sv = Välgörenhetsbutik sw = Duka la msaada th = ร้านการกุศล @@ -29002,7 +28264,6 @@ ro = Magazin de branzeturi ru = Магазин сыра sk = Predajňa syrov - sr = Сир sv = Ostaffär sw = Duka la Jibini th = ร้านชีส @@ -29045,7 +28306,6 @@ ro = Arte și Meserii ru = Искусства и ремесла sk = Umelecké potreby - sr = Уметност и занати sv = Konst och hantverk sw = Sanaa na Ufundi th = ศิลปะและงานฝีมือ @@ -29087,7 +28347,6 @@ ro = Lactate ru = Молочные продукты sk = Mliečne výrobky - sr = Млечни производи sv = Mejeriprodukter sw = Bidhaa za Maziwa th = ผลิตภัณฑ์นม @@ -29130,7 +28389,6 @@ ro = Magazin de electronice ru = Магазин электротоваров sk = Predajňa elektro - sr = Електро материјал sv = Elektronik affär sw = Duka la Umeme th = ร้านขายเครื่องใช้ไฟฟ้า @@ -29173,7 +28431,6 @@ ro = Magazin de pescuit ru = Рыболовный магазин sk = Rybárske potreby - sr = Рибарница sv = Fiskeaffär sw = Duka la Uvuvi th = ร้านตกปลา @@ -29216,7 +28473,6 @@ ro = Decoratiuni interioare ru = Украшения для интерьера sk = Bytové doplnky - sr = Унутрашње декорације sv = Inredningsdekorationer sw = Mapambo ya Ndani th = ตกแต่งภายใน @@ -29258,7 +28514,6 @@ ro = Bilete la loterie ru = Лотерейные билеты sk = Lístky do lotérie - sr = Лото sv = Lotter sw = Tikiti za Bahati nasibu th = สลากกินแบ่ง @@ -29301,7 +28556,6 @@ ro = Consumabile medicale ru = Медикаменты sk = Zdravotnícke potreby - sr = Фармацеутска компанија sv = Medicinska förnödenheter sw = Vifaa vya Matibabu th = เวชภัณฑ์ @@ -29344,7 +28598,6 @@ ro = Suplimente nutritive ru = Пищевые добавки sk = Výživové doplnky - sr = Суплементи sv = Kosttillskott sw = Virutubisho vya Lishe th = อาหารเสริม @@ -29386,7 +28639,6 @@ ro = Vopsele ru = Краски sk = Farby - sr = Фарбара sv = Färger sw = Rangi th = สี @@ -29428,7 +28680,6 @@ ro = Parfumerie ru = Парфюмерия sk = Parfuméria - sr = Парфимерија sv = Parfymer sw = Perfumery th = น้ำหอม @@ -29470,7 +28721,6 @@ ro = Rechizite de cusut ru = Швейные принадлежности sk = Potreby na šitie - sr = Материјали за шивење sv = Sytillbehör sw = Vifaa vya kushona th = อุปกรณ์เย็บผ้า @@ -29512,7 +28762,6 @@ ro = Închiriere depozitare ru = Аренда склада sk = Úschovňa - sr = Изнајмљивање складишта sv = Uthyrning av förråd sw = Kukodisha Hifadhi th = ค่าเช่าห้องเก็บของ @@ -29555,7 +28804,6 @@ ro = Tutun ru = Табак sk = Tabak - sr = Дуван sv = Tobak sw = Tumbaku th = ยาสูบ @@ -29597,7 +28845,6 @@ ro = Comerțuri Rechizite ru = Торговые поставки sk = Remeselnícke potreby - sr = Занатске потрепштине sv = Handlar förnödenheter sw = Ugavi wa Biashara th = อุปกรณ์การค้า @@ -29640,7 +28887,6 @@ ro = Priveste ru = Часы sk = Hodinárstvo - sr = Сатови sv = Klockor sw = Saa th = นาฬิกา @@ -29683,7 +28929,6 @@ ro = Magazin cu ridicata ru = Оптовый магазин sk = Veľkoobchod - sr = Велепродаја sv = Grossistbutik sw = Duka la Jumla th = ร้านขายส่ง @@ -29726,7 +28971,6 @@ ro = Sport ru = Спорт sk = Šport - sr = Спорт sv = Sport sw = Michezo th = กีฬา @@ -29769,7 +29013,6 @@ ro = Fotbal american ru = Американский футбол sk = Americký futbal - sr = Амерички фудбал sv = Amerikansk fotboll sw = Soka ya Marekani th = อเมริกันฟุตบอล @@ -29813,7 +29056,6 @@ ro = TIR cu arcul ru = Стрельба из лука sk = Lukostreľba - sr = Стреличарство sv = Bågskytte sw = Upigaji mishale th = ยิงธนู @@ -29855,7 +29097,6 @@ ro = Atletica ușoară ru = Лёгкая атлетика sk = Atletika - sr = Атлетика sv = Friidrott sw = Riadha th = กรีฑา @@ -29898,7 +29139,6 @@ ro = Fotbal australian ru = Австралийский футбол sk = Austrálsky futbal - sr = Аустралијски фудбал tr = Avustralya futbolu uk = Австралійський футбол vi = Bóng bầu dục Úc @@ -29937,7 +29177,6 @@ ro = Baseball ru = Бейсбол sk = Bejzbal - sr = Бејзбол sv = Baseboll sw = Baseball th = เบสบอล @@ -29979,7 +29218,6 @@ ro = Baschetbal ru = Баскетбол sk = Basketbal - sr = Кошарка sv = Basket sw = Mpira wa kikapu th = บาสเก็ตบอล @@ -30021,7 +29259,6 @@ ro = Volei de plajă ru = Пляжный волейбол sk = Plážový volejbal - sr = Одбојка на песку sv = Beachvolleyboll sw = Mpira wa wavu wa pwani th = วอลเลย์บอลชายหาด @@ -30055,7 +29292,6 @@ pl = Kręgle pt = Lawn bowls ru = Боулз - sr = Куглање sv = Bowls tr = Kuka Oynu uk = Боулз @@ -30094,7 +29330,6 @@ ro = Șah ru = Шахматы sk = Šach - sr = Шах sv = Schack sw = Sataranji th = หมากรุกสากล @@ -30132,7 +29367,6 @@ pt = Críquete ru = Крикет sk = Kriket - sr = Крикет tr = Kriket uk = Крикет vi = Cricket @@ -30170,7 +29404,6 @@ ro = Curling ru = Кёрлинг sk = Curling - sr = Карлинг sv = Curling sw = Kukunja th = เคอร์ลิง @@ -30213,7 +29446,6 @@ ro = Sport ecvestru ru = Конный спорт sk = Jazdecké športy - sr = Коњички спорт sv = Ridsport sw = Michezo ya Farasi th = กีฬาแข่งม้า @@ -30255,7 +29487,6 @@ ro = Golf ru = Гольф sk = Golf - sr = Голф sv = Golf sw = Gofu th = กอล์ฟ @@ -30296,7 +29527,6 @@ ro = Gimnastică ru = Гимнастика sk = Gymnastika - sr = Гимнастика sv = Gymnastik sw = Gymnastics th = ยิมนาสติก @@ -30339,7 +29569,6 @@ ro = Handbal ru = Гандбол sk = Hádzaná - sr = Рукомет sv = Handboll sw = Mpira wa mikono th = แฮนด์บอล @@ -30382,7 +29611,6 @@ ro = Sporturi Diverse ru = Различные виды спорта sk = Rôzne športy - sr = Разни спортови sv = Olika sporter sw = Michezo Mbalimbali th = กีฬาต่างๆ @@ -30425,7 +29653,6 @@ ro = Scufundări ru = Место для дайвинга sk = Potápanie - sr = Роњење sv = Dykning sw = Upigaji mbizi wa Scuba th = ดำน้ำลึก @@ -30467,7 +29694,6 @@ ro = Filmare ru = Стрельба sk = Streľba - sr = Стрељана sv = Skytte sw = Kupiga risasi th = ยิงปืน @@ -30508,7 +29734,6 @@ ro = Skateboarding ru = Скейтбординг sk = Skejtbording - sr = Скејтборд sv = Skateboarding sw = Skateboarding th = สเกตบอร์ด @@ -30550,7 +29775,6 @@ ro = Schi ru = Лыжи sk = Lyžovanie - sr = Скијање sv = Skidåkning sw = Skii th = เล่นสกี @@ -30593,7 +29817,6 @@ ro = Fotbal ru = Футбол sk = Futbal - sr = Фудбал sv = Fotboll sw = Soka th = ฟุตบอล @@ -30635,7 +29858,6 @@ ro = Natație ru = Плавание sk = Plávanie - sr = Пливање sv = Simning sw = Kuogelea th = การว่ายน้ำ @@ -30678,7 +29900,6 @@ ro = Tenis de masă ru = Настольный теннис sk = Stolný tenis - sr = Стони тенис sv = Bordtennis sw = Tenisi ya meza th = เทเบิลเทนนิส @@ -30722,7 +29943,6 @@ ro = Teren de tenis ru = Теннисный корт sk = Tenisový kurt - sr = Тенис sv = Tennisbana sw = Wanja wa tenisi th = คอร์ทเทนนิส @@ -30764,7 +29984,6 @@ ro = Volei ru = Волейбол sk = Volejbal - sr = Одбојка sv = Volleyboll sw = Voliboli th = วอลเลย์บอล @@ -30805,7 +30024,6 @@ ro = Bowling ru = Боулинг sk = Bowling - sr = Куглање sv = Bowling sw = Bowling th = โบว์ลิ่ง @@ -30848,7 +30066,6 @@ ro = Padel ru = Падель sk = Padel - sr = Падел sv = Padel sw = Padel th = พาเดล @@ -30888,7 +30105,6 @@ ro = Futsal ru = Футзал sk = Futsal - sr = Футсал sv = Futsal sw = Futsal th = ฟุตซอล @@ -30929,7 +30145,6 @@ ro = Hochei pe gheata ru = Хоккей с шайбой sk = Ľadový hokej - sr = Хокеј sv = Ishockey sw = Hoki ya barafu th = ฮอคกี้น้ำแข็ง @@ -30970,7 +30185,6 @@ ro = Hochei pe iarbă ru = Хоккей на траве sk = Pozemný hokej - sr = Хокеј на трави sv = Landhockey sw = Hoki ya shamba th = กีฬาฮอกกี้ @@ -31011,7 +30225,6 @@ ro = Badminton ru = Бадминтон sk = Bedminton - sr = Бадминтон sv = Badminton sw = Badminton th = แบดมินตัน @@ -31051,7 +30264,6 @@ ro = Pilota bascilor ru = Баскская пелота sk = Baskická pelota - sr = Баскијска пелота sv = Baskisk pelota sw = Basque pelota th = Basque pelota @@ -31083,7 +30295,6 @@ pt-BR = Turismo ru = Туризм sk = Turistika - sr = Туризам tr = Turizm uk = Туризм zh-Hans = 旅游要素 @@ -31119,7 +30330,6 @@ ro = Acvariu ru = Аквариум sk = Akvárium - sr = Акваријум sv = Akvarium sw = Aquarium th = พิพิธภัณฑ์สัตว์น้ำ @@ -31165,7 +30375,6 @@ ro = Cabana de munte ru = Горный приют с обслуживанием sk = Horská chata - sr = Планинарска колиба sv = Fjällstuga sw = Mlima lodge th = บ้านพักบนภูเขา @@ -31210,7 +30419,6 @@ ro = Apartament de vacanță ru = Квартира для отдыха sk = Prázdninový apartmán - sr = Апартман за одмор sv = Semesterlägenhet sw = Ghorofa ya Likizo th = ฮอลิเดย์ อพาร์ตเมนต์ @@ -31251,7 +30459,6 @@ ro = Turism ru = Произведение искусства sk = Umelecké dielo - sr = Уметничка скулптура sv = Konstverk th = งานศิลปะ tr = Sanat @@ -31291,7 +30498,6 @@ ro = Turism ru = Произведение искусства sk = Architektonické dielo - sr = Архитектонско уметничко дело sv = Konstverk th = งานศิลปะ tr = Sanatsal Mimari @@ -31330,7 +30536,6 @@ ro = Turism ru = Произведение искусства sk = Maľba - sr = Уметничко дело sv = Konstverk th = งานศิลปะ tr = Sanat Eserleri @@ -31369,7 +30574,6 @@ ro = Turism ru = Произведение искусства sk = Plastika - sr = Скулптура sv = Konstverk th = งานศิลปะ tr = Heykel @@ -31409,7 +30613,6 @@ ro = Turism ru = Произведение искусства sk = Socha - sr = Статуа sv = Konstverk th = งานศิลปะ tr = Heykel @@ -31448,7 +30651,6 @@ ro = Punct de atracție ru = Достопримечательность sk = Atrakcia - sr = Атракција sv = Attraktion th = การท่องเที่ยว tr = Görülecek Yerler @@ -31492,7 +30694,6 @@ ro = Călătorie de distracție ru = Аттракцион sk = Zábavná jazda - sr = Забавни парк sv = Nöjesattraktion sw = Safari ya Burudani th = ขี่สนุก @@ -31536,7 +30737,6 @@ ro = Incintă pentru animale ru = Вольер для животных sk = Zvieracia ohrada - sr = Золошки врт sv = Inhägnad för djur sw = Hifadhi ya Wanyama th = สิ่งที่แนบมากับสัตว์ @@ -31600,7 +30800,6 @@ ro = Carusel ru = Карусель sk = Kolotoč - sr = Аутићи на струју sv = Karusell sw = Jukwaa th = ม้าหมุน @@ -31645,7 +30844,6 @@ ro = Atracție istorică ru = Исторический аттракцион sk = Historická atrakcia - sr = Историјска атракција sv = Historisk sevärdhet sw = Kivutio cha kihistoria th = แหล่งท่องเที่ยวทางประวัติศาสตร์ @@ -31690,7 +30888,6 @@ ro = Labirint ru = Лабиринт sk = Bludisko - sr = Лавиринт sv = Labyrint sw = Maze th = เขาวงกต @@ -31735,7 +30932,6 @@ ro = Rollercoaster ru = Американские горки sk = Horská dráha - sr = Ролеркостер sv = Berg- och dalbana sw = Roller Coaster th = รถไฟเหาะ @@ -31781,7 +30977,6 @@ ro = Tobogan de apă ru = Водная горка sk = Vodná šmýkačka - sr = Тобоган sv = Vattenrutschbana sw = Slaidi ya Maji th = สไลเดอร์น้ำ @@ -31824,7 +31019,6 @@ pt-BR = Local de camping ru = Кемпинг sk = Kemp - sr = Камп th = การตั้งแคมป์ tr = Kamp Alanı uk = Кемпінг @@ -31864,7 +31058,6 @@ ro = Teren pentru campare ru = Кемпинг для автодомов sk = Kemp pre karavany - sr = Камп за караване sv = Husvagnsplats th = ขบวนนักเดินทาง tr = Karavan Parkı @@ -31909,7 +31102,6 @@ ro = Cabană de vacanță ru = Коттедж для отдыха sk = Rekreačná chata - sr = Викендица sv = Semesterstuga sw = Nyumba ndogo ya Likizo th = กระท่อมวันหยุด @@ -31950,7 +31142,6 @@ ro = Galerie ru = Галерея sk = Umelecká galéria - sr = Уметничка галерија sv = Attraktion th = สถานที่ท่องเที่ยว tr = Galeri @@ -31991,7 +31182,6 @@ ro = Pensiune ru = Гостевой дом sk = Penzión - sr = Кућа духова sv = Gästhus th = เกสท์เฮ้าส์ tr = Misafirhane @@ -32024,7 +31214,6 @@ pl = Hostel pt = Hostel ru = Хостел - sr = Хостел sv = Vandrarhem th = หอพัก tr = Pansiyon @@ -32057,7 +31246,6 @@ pl = Hotel pt = Hotel ru = Гостиница - sr = Хотел sv = Hotell th = โรงแรม tr = Otel @@ -32100,7 +31288,6 @@ ro = Informații turistice ru = Туринформация sk = Infocentrum - sr = Туристичке информације sv = Turistinformation sw = Taarifa za Watalii th = ข้อมูลการท่องเที่ยว @@ -32142,7 +31329,6 @@ ro = Panou de informații ru = Информационный щит sk = Informačná tabuľa - sr = Информациона табла sv = Informationstavla sw = Bodi ya habari th = บอร์ดประชาสัมพันธ์ @@ -32183,7 +31369,6 @@ ro = Postul de ghidare ru = Указательный столб sk = Smerovník - sr = Путоказ sv = Vägledning sw = Chapisho la mwongozo th = ไกด์โพส @@ -32225,7 +31410,6 @@ ro = Hartă turistică ru = Карта sk = Turistická mapa - sr = Туристичка мапа sv = Turistkarta sw = Ramani ya Watalii th = แผนที่ท่องเที่ยว @@ -32268,7 +31452,6 @@ ro = Birou de informații turistice ru = Туристический офис sk = Turistické informačné centrum - sr = Туристички биро sv = Turistcenter sw = Ofisi ya watalii th = ศูนย์บริการนักท่องเที่ยว @@ -32310,7 +31493,6 @@ ro = Centrul pentru vizitatori ru = Центр для посетителей sk = Návštevnícke centrum - sr = Центар за посетиоце sv = Besökscentrum sw = Kituo cha Wageni th = ศูนย์นักท่องเที่ยว @@ -32340,7 +31522,6 @@ pl = Motel pt = Motel ru = Мотель - sr = Мотел sv = Motell th = โมเทล tr = Motel @@ -32377,7 +31558,6 @@ ro = Muzeu ru = Музей sk = Múzeum - sr = Музеј th = พิพิธภัณฑ์ tr = Müze uk = Музей @@ -32415,7 +31595,6 @@ ro = Locații picnic ru = Место для пикника sk = Piknik - sr = Пикник sv = Picknickplatser th = เว็บไซต์ปิกนิก tr = Piknik Alanı @@ -32451,7 +31630,6 @@ ro = Stațiuni ru = Дом отдыха sk = Rezort - sr = Ресорт хотел sv = Semesterort th = รีสอร์ต tr = Tatil Köyü @@ -32490,7 +31668,6 @@ ro = Parc de distracții ru = Парк развлечений sk = Zábavný park - sr = Забавни парк sv = Attraktion th = สถานที่ท่องเที่ยว tr = Tema Parkı @@ -32532,7 +31709,6 @@ ro = Punct de vedere ru = Обзорная площадка sk = Vyhliadka - sr = Видиковац sv = Utsiktsplats th = จุดชมวิว tr = Manzara @@ -32572,7 +31748,6 @@ ro = Cabană în pădure ru = Домик для туристов sk = Chata - sr = Планинска кућа за туристе sv = Vildmarksstuga th = กระท่อมกลางป่า tr = Vahşi Doğa Kulübesi @@ -32610,7 +31785,6 @@ ro = Grădină zoologică ru = Зоопарк sk = Zoologická záhrada - sr = Золошки врт th = สวนสัตว์ tr = Hayvanat Bahçesi uk = Зоопарк @@ -32651,7 +31825,6 @@ ro = Grădina Zoologică ru = Контактный зоопарк sk = Kontaktná zoo - sr = Контактни зоо-врт sv = Petting Zoo sw = Kufuga Zoo th = สวนสัตว์ลูบคลำ @@ -32677,7 +31850,6 @@ pt = Redutor de velocidade ru = Лежачий полицейский sk = Upokojovanie dopravy - sr = Пешачки прелаз tr = Hız Kesici (Kasis) uk = Лежачий полiцейський @@ -32700,7 +31872,6 @@ pt-BR = Quebra-molas ru = Лежачий полицейский sk = Spomaľovací prah - sr = Лежећи полицајац (грба) tr = Hız Kesici (Kasis) uk = Лежачий полiцейський @@ -32721,7 +31892,6 @@ pt-BR = Quebra-molas longo ru = Лежачий полицейский sk = Spomaľovací prah - sr = Лежећи полицајац tr = Hız Kesici (Kasis) uk = Лежачий полiцейський @@ -32741,7 +31911,6 @@ pt = Curso de água ru = Водный путь sk = Vodný tok - sr = Водени ток tr = Su Yolu uk = Водяний шлях zh-Hans = 航道要素 @@ -32774,7 +31943,6 @@ pt = Canal ru = Канал sk = Kanál - sr = Канал sv = Kanal th = คลอง tr = Kanal @@ -32811,7 +31979,6 @@ pt = Túnel de canal ru = Канал sk = Tunel v kanáli - sr = Тунел у каналу sv = Kanal th = คลอง tr = Kanal @@ -32852,7 +32019,6 @@ ro = Scară de pește ru = Рыбоход sk = Rybovod - sr = Рибљи пут sv = Fiskstege sw = Ngazi ya samaki th = บันไดปลา @@ -32883,7 +32049,6 @@ pt = Barragem ru = Дамба sk = Priehrada - sr = Брана tr = Baraj uk = Дамба zh-Hans = 水坝 @@ -32907,7 +32072,6 @@ pt = Vala ru = Ров sk = Priekopa - sr = Јарак tr = Hendek uk = Канава zh-Hans = 沟渠 @@ -32948,7 +32112,6 @@ ro = Canal de scurgere ru = Водопропускная труба sk = Priepust - sr = Канал sv = Kulvert sw = Culvert th = ท่อระบายน้ำ @@ -32977,7 +32140,6 @@ pt = Doca ru = Причал sk = Dok - sr = Преводница tr = Rıhtım uk = Причал zh-Hans = 船坞 @@ -32998,7 +32160,6 @@ pt = Valeta de drenagem ru = Водоотвод sk = Stoka - sr = Канал tr = Lağım uk = Водовiдвiд zh-Hans = 渠 @@ -33037,7 +32198,6 @@ ro = Ecluză ru = Шлюз sk = Stavidlo - sr = Капија sv = Slussport th = ประตูระบายน้ำ tr = Eklüz Kapağı @@ -33078,7 +32238,6 @@ ro = Râu ru = Река sk = Rieka - sr = Река sv = Flod th = แม่น้ำ tr = Nehir @@ -33121,7 +32280,6 @@ ro = Pârâu ru = Ручей sk = Potok - sr = Поток sv = Flod th = แม่น้ำ tr = Nehir @@ -33161,7 +32319,6 @@ ro = Pârâu ru = Ручей sk = Občasný potok - sr = Повремени поток sv = Flod th = แม่น้ำ tr = Nehir @@ -33201,7 +32358,6 @@ ro = Pârâu ru = Ручей sk = Občasný potok - sr = Повремени поток sv = Flod th = แม่น้ำ tr = Nehir @@ -33244,7 +32400,6 @@ ro = Cascadă ru = Водопад sk = Vodopád - sr = Водопад sv = Vattenfall th = น้ำตก tr = Şelale @@ -33270,7 +32425,6 @@ pt-BR = Açude ru = Плотина sk = Hať - sr = Брана tr = Su Bendi uk = Гребля zh-Hans = 堰 @@ -33295,7 +32449,6 @@ pt-BR = Cadeiras de rodas ru = Инвалидная коляска sk = Bezbariérový prístup - sr = Приступ инвалидским колицима tr = Tekerlekli sandalye uk = Iнвалiдний вiзок zh-Hans = 轮椅 @@ -33330,7 +32483,6 @@ ro = Parțial utilat pentru invalizi ru = Частично оборудовано для инвалидов sk = Obmedzený bezbariérový prístup - sr = Лимитирани приступ инвалидским колицима sv = Delvis utrustad för handikappade sw = Viti vya magurudumu vinaruhusiwa vichache th = พื้นที่จำกัดการใช้รถเข็นสำหรับผู้ป่วย/ผู้สูงอายุ @@ -33370,7 +32522,6 @@ ro = Nu este utilat pentru invalizi ru = Не оборудовано для инвалидов sk = Žiaden bezbariérový prístup - sr = Није приступно инвалидским колицима sv = Ej utrustad för handikappade sw = Viti vya magurudumu haviruhusiwi th = พื้นที่ไม่สามารถใช้รถเข็นสำหรับผู้ป่วย/ผู้สูงอายุ @@ -33410,7 +32561,6 @@ ro = Utilat pentru invalizi ru = Оборудовано для инвалидов sk = Úplný bezbariérový prístup - sr = Пун приступ инвалидским колицима sv = Utrustad för handikappade sw = Viti vya magurudumu vinaruhusiwa kabisa th = พื้นใช้รถเข็นสำหรับผู้ป่วย/ผู้สูงอายุได้ @@ -33433,7 +32583,6 @@ pt-BR = Telesqui de barra em J ru = Бугельный подъёмник sk = Vlek typu jednokotva - sr = Жичара са Ј пречком tr = Kayak Teleferiği uk = Бугельний витяг zh-Hans = J 型拖牵 @@ -33452,7 +32601,6 @@ pt-BR = Tapete deslizante ru = Ленточный конвейер sk = Zázračný koberec - sr = Магични тепих tr = Kayak Teleferiği uk = Стрiчковий конвеєр zh-Hans = 魔毯 @@ -33471,7 +32619,6 @@ pt-BR = Telesqui de disco ru = Бугельный подъёмник sk = Vlek typu poma - sr = Жичара са тањир седиштем tr = Tabak Asansörü uk = Бугельний витяг zh-Hans = 盘式拖牵 @@ -33490,7 +32637,6 @@ pt-BR = Telesqui de corda ru = Бугельный подъёмник sk = Kotvičkový vlek - sr = Вучно уже tr = Çekme Halatı uk = Бугельний витяг zh-Hans = 缆绳拖牵 @@ -33509,7 +32655,6 @@ pt-BR = Telesqui de barra em T ru = Бугельный подъёмник sk = Vlek typu kotva - sr = Жичара са Т седиштем tr = Kayakçı teleferiği uk = Бугельний витяг zh-Hans = T 型拖牵 @@ -33528,7 +32673,6 @@ pt-BR = Esqui alpino ru = Горнолыжная трасса sk = Zjazdové lyžovanie - sr = Спуст стаза tr = Yokuş Aşağı Kayak Pisti uk = Гірськолижна траса @@ -33547,7 +32691,6 @@ pt-BR = Esqui alpino avançado ru = Продвинутая горнолыжная трасса sk = Zjazdové lyžovanie pre pokročilých - sr = Скијање за напредне tr = Gelişmiş kayak pisti uk = Доповнена гірськолижна траса @@ -33566,7 +32709,6 @@ pt-BR = Esqui alpino fácil ru = Лёгкая горнолыжная трасса sk = Zjazdové lyžovanie pre začiatočníkov - sr = Скијање за почетнике tr = Basit kayak pisti uk = Легка гірськолижна траса @@ -33585,7 +32727,6 @@ pt-BR = Esqui alpino avançado ru = Горнолыжная трасса для экспертов sk = Zjazdové lyžovanie pre vysoko pokročilých - sr = Скијање за професионалце tr = Uzmanlar için kayak pisti uk = Гірськолижна траса для експертів @@ -33600,7 +32741,6 @@ pt-BR = Esqui alpino livre ru = Горнолыжная трасса для фрирайда sk = Freeride zjazdové lyžovanie - sr = Бесплатно скијање tr = Serbest sürüş kayak pisti uk = Гірськолижна траса вільного спуска @@ -33616,7 +32756,6 @@ pt-BR = Esqui alpino intermédio ru = Горнолыжная трасса средней сложности sk = Zjazdové lyžovanie pre mierne pokročilých - sr = Средња ски стаза tr = Orta zorlukta kayak pisti uk = Гірськолижна траса середнього рівня @@ -33635,7 +32774,6 @@ pt-BR = Esqui alpino iniciante ru = Горнолыжная трасса для новичков sk = Zjazdové lyžovanie pre úplných začiatočníkov - sr = Скијање за потпуне почетнике tr = Yeni başlayanlar için kayak pisti uk = Гірськолижна траса для новеньких @@ -33656,7 +32794,6 @@ pt-BR = Pista tipo nórdico ru = Лыжня sk = Bežkárska trať - sr = Стаза за нордијско скијање tr = İskandinav Kayak Pisti uk = Лижня @@ -33677,7 +32814,6 @@ pt-BR = Pista para trenós ru = Трасса для саней sk = Zjazdovka na sánkovanie - sr = Стаза за санкање tr = Kızak Pisti uk = Траса для санок @@ -33717,7 +32853,6 @@ ro = Snow Park ru = Снежный парк sk = Snow Park - sr = Снежни парк sv = Snöparken sw = Hifadhi ya theluji th = สโนว์พาร์ค @@ -33761,7 +32896,6 @@ ro = Zăpadă Hiking Trail ru = Зимняя тропа sk = Zimný turistický chodník - sr = Снежна стаза за ходање sv = Vandringsled i snö sw = Njia ya Kupanda theluji th = เส้นทางเดินป่าหิมะ @@ -33806,7 +32940,6 @@ ro = Conexiune Piste ru = Соединение между трассами sk = Pripojenie na zjazdovku - sr = Веза између стаза sv = Piste Anslutning sw = Uunganisho wa Piste th = การเชื่อมต่อทางสกี @@ -33851,7 +32984,6 @@ ro = Traseul Skitour ru = Маршрут для скитура sk = Trasa Skitour - sr = Ски-тур стаза sv = Skitourleden sw = Njia ya Skitour th = เส้นทางสกีทัวร์ @@ -33894,7 +33026,6 @@ ro = Locul de desfășurare a evenimentelor ru = Место проведения мероприятий sk = Miesto konania podujatí - sr = Место одржавања догађаја sv = Evenemangslokal sw = Ukumbi wa Matukio th = สถานที่จัดงาน @@ -33936,7 +33067,6 @@ ro = Licitație ru = Аукцион sk = Aukcia - sr = Аукција sv = Auktion sw = Mnada th = ประมูล @@ -33979,7 +33109,6 @@ ro = Colecții ru = Коллекции sk = Zberateľské predmety - sr = Колекционарство sv = Samlingsföremål sw = Mikusanyiko th = ของสะสม @@ -34024,7 +33153,6 @@ ro = Autoservire disponibilă ru = Самообслуживание доступно sk = K dispozícii je samoobsluha - sr = Доступно самопослужење sv = Självbetjäning tillgänglig sw = Huduma ya kibinafsi inapatikana th = มีบริการด้วยตนเอง @@ -34069,7 +33197,6 @@ ro = Numai autoservire ru = Только самообслуживание sk = Len samoobslužné služby - sr = Самопослуживање sv = Endast självbetjäning sw = Kujihudumia pekee th = บริการตนเองเท่านั้น @@ -34114,7 +33241,6 @@ ro = Autoservire parțială ru = Частичное самообслуживание sk = Čiastočná samoobsluha - sr = Делимично самопослуживање sv = Delvis självbetjäning sw = Kujihudumia kwa sehemu th = การบริการตนเองบางส่วน @@ -34159,7 +33285,6 @@ ro = Fără autoservire ru = Никакого самообслуживания sk = Žiadna samoobsluha - sr = Нема самопослуживања sv = Ingen självbetjäning sw = Hakuna huduma binafsi th = ไม่มีบริการตนเอง @@ -34205,7 +33330,6 @@ ro = Facilitate socială ru = Социальное учреждение sk = Sociálne zariadenie - sr = Социјална установа sv = Social anläggning sw = Kituo cha Kijamii th = สิ่งอำนวยความสะดวกทางสังคม @@ -34251,7 +33375,6 @@ ro = Intrarea secției de urgență ru = Вход в отделение неотложной помощи sk = Vchod do pohotovostného oddelenia - sr = Улаз у хитну помоћ sv = Ingång till akutmottagning sw = Mlango wa Wadi ya Dharura th = ทางเข้าแผนกฉุกเฉิน @@ -34296,7 +33419,6 @@ ro = Dojo ru = Додзё sk = Dojo - sr = Дојо sv = Dojo sw = Dojo th = โดโจ @@ -34342,7 +33464,6 @@ ro = Sală de sport ru = Спортивный зал sk = Športová hala - sr = Спортска хала sv = Idrottshall sw = Ukumbi wa michezo th = ห้องกีฬา diff --git a/data/styles/default/dark/symbols/funicular-s.svg b/data/styles/default/dark/symbols/funicular-s.svg deleted file mode 100644 index 8d249cb3c5..0000000000 --- a/data/styles/default/dark/symbols/funicular-s.svg +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - - - diff --git a/data/styles/default/include/Icons.mapcss b/data/styles/default/include/Icons.mapcss index 23345e8cde..4a5e442351 100644 --- a/data/styles/default/include/Icons.mapcss +++ b/data/styles/default/include/Icons.mapcss @@ -416,8 +416,6 @@ node|z17-[aerialway=station], node|z17-[railway=level_crossing] {icon-image: railway-crossing-m.svg;} -node|z12-14[railway=station][station=funicular], -{icon-image: funicular-s.svg;} node|z15-[railway=station][station=funicular], {icon-image: funicular-m.svg;text-offset: 1;font-size: 10;} node|z17-[aerialway=station], diff --git a/data/styles/default/include/priorities_3_FG.prio.txt b/data/styles/default/include/priorities_3_FG.prio.txt index 809bd68dc5..c61f4fce1b 100644 --- a/data/styles/default/include/priorities_3_FG.prio.txt +++ b/data/styles/default/include/priorities_3_FG.prio.txt @@ -306,22 +306,6 @@ highway-path-horse # line z14- (also has pathte highway-path-tunnel # line z14- (also has line::tunnelBackground z17-, line::tunnelCasing z17-, pathtext z15-) === 155 -highway-bridleway-tunnel::tunnelBackground # line::tunnelBackground z17- (also has line z14-, line::tunnelCasing z17-, pathtext z15-) -highway-cycleway-tunnel::tunnelBackground # line::tunnelBackground z17- (also has line z13-, line::tunnelCasing z17-, pathtext z15-) -highway-footway-tunnel::tunnelBackground # line::tunnelBackground z17- (also has line z15-, line::tunnelCasing z17-, pathtext z15-) -highway-path-tunnel::tunnelBackground # line::tunnelBackground z17- (also has line z14-, line::tunnelCasing z17-, pathtext z15-) -highway-steps-tunnel::tunnelBackground # line::tunnelBackground z17- (also has line z15-, line::tunnelCasing z17-, pathtext z16-) -highway-track-tunnel::tunnelBackground # line::tunnelBackground z17- (also has line z14-, line::tunnelCasing z17-, pathtext z15-) -=== 154 - -highway-bridleway-tunnel::tunnelCasing # line::tunnelCasing z17- (also has line z14-, line::tunnelBackground z17-, pathtext z15-) -highway-cycleway-tunnel::tunnelCasing # line::tunnelCasing z17- (also has line z13-, line::tunnelBackground z17-, pathtext z15-) -highway-footway-tunnel::tunnelCasing # line::tunnelCasing z17- (also has line z15-, line::tunnelBackground z17-, pathtext z15-) -highway-path-tunnel::tunnelCasing # line::tunnelCasing z17- (also has line z14-, line::tunnelBackground z17-, pathtext z15-) -highway-steps-tunnel::tunnelCasing # line::tunnelCasing z17- (also has line z15-, line::tunnelBackground z17-, pathtext z16-) -highway-track-tunnel::tunnelCasing # line::tunnelCasing z17- (also has line z14-, line::tunnelBackground z17-, pathtext z15-) -=== 153 - highway-bridleway-bridge::bridgewhite # line::bridgewhite z15- (also has line z14-, line::bridgeblack z17-, pathtext z15-) highway-cycleway-bridge::bridgewhite # line::bridgewhite z15- (also has line z13-, line::bridgeblack z17-, pathtext z15-) highway-footway-bridge::bridgewhite # line::bridgewhite z15- (also has line z15-, line::bridgeblack z17-, pathtext z15-) @@ -344,7 +328,6 @@ highway-trunk-bridge::bridgewhite # line::bridgewhite z13- (al highway-trunk_link-bridge::bridgewhite # line::bridgewhite z14- (also has line z10-, line::bridgeblack z14-, pathtext z10-, shield::shield z10-) highway-unclassified-bridge::bridgewhite # line::bridgewhite z14- (also has line z11-, line::bridgeblack z14-, pathtext z13-) railway-abandoned-bridge::bridgewhite # line::bridgewhite z16- (also has line z16-, line::bridgeblack z16-) -railway-light_rail-bridge::bridgewhite # line::bridgewhite z13- (also has line z13-, line::bridgeblack z16-, line::dash z16-) railway-preserved-bridge::bridgewhite # line::bridgewhite z15- (also has line z15-, line::bridgeblack z16-) railway-rail-branch-bridge::bridgewhite # line::bridgewhite z13- (also has line z11-, line::bridgeblack z16-, line::dash z16-) railway-rail-bridge::bridgewhite # line::bridgewhite z13- (also has line z11-, line::bridgeblack z16-, line::dash z16-) @@ -379,7 +362,6 @@ highway-trunk-bridge::bridgeblack # line::bridgeblack z13- (al highway-trunk_link-bridge::bridgeblack # line::bridgeblack z14- (also has line z10-, line::bridgewhite z14-, pathtext z10-, shield::shield z10-) highway-unclassified-bridge::bridgeblack # line::bridgeblack z14- (also has line z11-, line::bridgewhite z14-, pathtext z13-) railway-abandoned-bridge::bridgeblack # line::bridgeblack z16- (also has line z16-, line::bridgewhite z16-) -railway-light_rail-bridge::bridgeblack # line::bridgeblack z16- (also has line z13-, line::bridgewhite z13-, line::dash z16-) railway-preserved-bridge::bridgeblack # line::bridgeblack z16- (also has line z15-, line::bridgewhite z15-) railway-rail-branch-bridge::bridgeblack # line::bridgeblack z16- (also has line z11-, line::bridgewhite z13-, line::dash z16-) railway-rail-bridge::bridgeblack # line::bridgeblack z16- (also has line z11-, line::bridgewhite z13-, line::dash z16-) @@ -444,6 +426,24 @@ isoline-step_500 # line z11- (also has pathte isoline-zero # line z15- (also has pathtext z17-) === 60 +highway-bridleway-tunnel::tunnelBackground # line::tunnelBackground z17- (also has line z14-, line::tunnelCasing z17-, pathtext z15-) +highway-cycleway-tunnel::tunnelBackground # line::tunnelBackground z17- (also has line z13-, line::tunnelCasing z17-, pathtext z15-) +highway-footway-tunnel::tunnelBackground # line::tunnelBackground z17- (also has line z15-, line::tunnelCasing z17-, pathtext z15-) +highway-path-tunnel::tunnelBackground # line::tunnelBackground z17- (also has line z14-, line::tunnelCasing z17-, pathtext z15-) +highway-steps-tunnel::tunnelBackground # line::tunnelBackground z17- (also has line z15-, line::tunnelCasing z17-, pathtext z16-) +highway-track-tunnel::tunnelBackground # line::tunnelBackground z17- (also has line z14-, line::tunnelCasing z17-, pathtext z15-) +railway-light_rail-bridge::bridgewhite # line::bridgewhite z13- (also has line z13-, line::bridgeblack z16-, line::dash z16-) +=== 50 + +highway-bridleway-tunnel::tunnelCasing # line::tunnelCasing z17- (also has line z14-, line::tunnelBackground z17-, pathtext z15-) +highway-cycleway-tunnel::tunnelCasing # line::tunnelCasing z17- (also has line z13-, line::tunnelBackground z17-, pathtext z15-) +highway-footway-tunnel::tunnelCasing # line::tunnelCasing z17- (also has line z15-, line::tunnelBackground z17-, pathtext z15-) +highway-path-tunnel::tunnelCasing # line::tunnelCasing z17- (also has line z14-, line::tunnelBackground z17-, pathtext z15-) +highway-steps-tunnel::tunnelCasing # line::tunnelCasing z17- (also has line z15-, line::tunnelBackground z17-, pathtext z16-) +highway-track-tunnel::tunnelCasing # line::tunnelCasing z17- (also has line z14-, line::tunnelBackground z17-, pathtext z15-) +railway-light_rail-bridge::bridgeblack # line::bridgeblack z16- (also has line z13-, line::bridgewhite z13-, line::dash z16-) +=== 40 + man_made-breakwater # line z14- and area z12- (also has caption z17-) man_made-pier # line z14- and area z12- (also has caption z17-) waterway-dam # line z14- and area z14- (also has pathtext z15-) diff --git a/data/styles/default/light/symbols/funicular-s.svg b/data/styles/default/light/symbols/funicular-s.svg deleted file mode 100644 index edf4550a99..0000000000 --- a/data/styles/default/light/symbols/funicular-s.svg +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - - - diff --git a/data/styles/outdoors/include/priorities_3_FG.prio.txt b/data/styles/outdoors/include/priorities_3_FG.prio.txt index 441889b669..24ee35f0ca 100644 --- a/data/styles/outdoors/include/priorities_3_FG.prio.txt +++ b/data/styles/outdoors/include/priorities_3_FG.prio.txt @@ -306,22 +306,6 @@ highway-path-horse # line z11- (also has pathte highway-path-tunnel # line z11- (also has line::tunnelBackground z17-, line::tunnelCasing z17-, pathtext z13-) === 155 -highway-bridleway-tunnel::tunnelBackground # line::tunnelBackground z17- (also has line z11-, line::tunnelCasing z17-, pathtext z13-) -highway-cycleway-tunnel::tunnelBackground # line::tunnelBackground z17- (also has line z11-, line::tunnelCasing z17-, pathtext z13-) -highway-footway-tunnel::tunnelBackground # line::tunnelBackground z17- (also has line z11-, line::tunnelCasing z17-, pathtext z13-) -highway-path-tunnel::tunnelBackground # line::tunnelBackground z17- (also has line z11-, line::tunnelCasing z17-, pathtext z13-) -highway-steps-tunnel::tunnelBackground # line::tunnelBackground z17- (also has line z12-, line::tunnelCasing z17-, pathtext z13-) -highway-track-tunnel::tunnelBackground # line::tunnelBackground z17- (also has line z11-, line::tunnelCasing z17-, pathtext z13-) -=== 154 - -highway-bridleway-tunnel::tunnelCasing # line::tunnelCasing z17- (also has line z11-, line::tunnelBackground z17-, pathtext z13-) -highway-cycleway-tunnel::tunnelCasing # line::tunnelCasing z17- (also has line z11-, line::tunnelBackground z17-, pathtext z13-) -highway-footway-tunnel::tunnelCasing # line::tunnelCasing z17- (also has line z11-, line::tunnelBackground z17-, pathtext z13-) -highway-path-tunnel::tunnelCasing # line::tunnelCasing z17- (also has line z11-, line::tunnelBackground z17-, pathtext z13-) -highway-steps-tunnel::tunnelCasing # line::tunnelCasing z17- (also has line z12-, line::tunnelBackground z17-, pathtext z13-) -highway-track-tunnel::tunnelCasing # line::tunnelCasing z17- (also has line z11-, line::tunnelBackground z17-, pathtext z13-) -=== 153 - highway-bridleway-bridge::bridgewhite # line::bridgewhite z15- (also has line z11-, line::bridgeblack z17-, pathtext z13-) highway-cycleway-bridge::bridgewhite # line::bridgewhite z15- (also has line z11-, line::bridgeblack z17-, pathtext z13-) highway-footway-bridge::bridgewhite # line::bridgewhite z15- (also has line z11-, line::bridgeblack z17-, pathtext z13-) @@ -344,7 +328,6 @@ highway-trunk-bridge::bridgewhite # line::bridgewhite z13- (al highway-trunk_link-bridge::bridgewhite # line::bridgewhite z14- (also has line z10-, line::bridgeblack z14-, pathtext z10-, shield::shield z10-) highway-unclassified-bridge::bridgewhite # line::bridgewhite z14- (also has line z11-, line::bridgeblack z14-, pathtext z13-) railway-abandoned-bridge::bridgewhite # line::bridgewhite z16- (also has line z13-, line::bridgeblack z16-) -railway-light_rail-bridge::bridgewhite # line::bridgewhite z13- (also has line z13-, line::bridgeblack z16-, line::dash z16-) railway-preserved-bridge::bridgewhite # line::bridgewhite z15- (also has line z13-, line::bridgeblack z16-) railway-rail-branch-bridge::bridgewhite # line::bridgewhite z13- (also has line z10-, line::bridgeblack z16-, line::dash z15-) railway-rail-bridge::bridgewhite # line::bridgewhite z13- (also has line z10-, line::bridgeblack z16-, line::dash z15-) @@ -379,7 +362,6 @@ highway-trunk-bridge::bridgeblack # line::bridgeblack z13- (al highway-trunk_link-bridge::bridgeblack # line::bridgeblack z14- (also has line z10-, line::bridgewhite z14-, pathtext z10-, shield::shield z10-) highway-unclassified-bridge::bridgeblack # line::bridgeblack z14- (also has line z11-, line::bridgewhite z14-, pathtext z13-) railway-abandoned-bridge::bridgeblack # line::bridgeblack z16- (also has line z13-, line::bridgewhite z16-) -railway-light_rail-bridge::bridgeblack # line::bridgeblack z16- (also has line z13-, line::bridgewhite z13-, line::dash z16-) railway-preserved-bridge::bridgeblack # line::bridgeblack z16- (also has line z13-, line::bridgewhite z15-) railway-rail-branch-bridge::bridgeblack # line::bridgeblack z16- (also has line z10-, line::bridgewhite z13-, line::dash z15-) railway-rail-bridge::bridgeblack # line::bridgeblack z16- (also has line z10-, line::bridgewhite z13-, line::dash z15-) @@ -444,6 +426,24 @@ isoline-step_500 # line z10- (also has pathte isoline-zero # line z15- (also has pathtext z15-) === 60 +highway-bridleway-tunnel::tunnelBackground # line::tunnelBackground z17- (also has line z11-, line::tunnelCasing z17-, pathtext z13-) +highway-cycleway-tunnel::tunnelBackground # line::tunnelBackground z17- (also has line z11-, line::tunnelCasing z17-, pathtext z13-) +highway-footway-tunnel::tunnelBackground # line::tunnelBackground z17- (also has line z11-, line::tunnelCasing z17-, pathtext z13-) +highway-path-tunnel::tunnelBackground # line::tunnelBackground z17- (also has line z11-, line::tunnelCasing z17-, pathtext z13-) +highway-steps-tunnel::tunnelBackground # line::tunnelBackground z17- (also has line z12-, line::tunnelCasing z17-, pathtext z13-) +highway-track-tunnel::tunnelBackground # line::tunnelBackground z17- (also has line z11-, line::tunnelCasing z17-, pathtext z13-) +railway-light_rail-bridge::bridgewhite # line::bridgewhite z13- (also has line z13-, line::bridgeblack z16-, line::dash z16-) +=== 50 + +highway-bridleway-tunnel::tunnelCasing # line::tunnelCasing z17- (also has line z11-, line::tunnelBackground z17-, pathtext z13-) +highway-cycleway-tunnel::tunnelCasing # line::tunnelCasing z17- (also has line z11-, line::tunnelBackground z17-, pathtext z13-) +highway-footway-tunnel::tunnelCasing # line::tunnelCasing z17- (also has line z11-, line::tunnelBackground z17-, pathtext z13-) +highway-path-tunnel::tunnelCasing # line::tunnelCasing z17- (also has line z11-, line::tunnelBackground z17-, pathtext z13-) +highway-steps-tunnel::tunnelCasing # line::tunnelCasing z17- (also has line z12-, line::tunnelBackground z17-, pathtext z13-) +highway-track-tunnel::tunnelCasing # line::tunnelCasing z17- (also has line z11-, line::tunnelBackground z17-, pathtext z13-) +railway-light_rail-bridge::bridgeblack # line::bridgeblack z16- (also has line z13-, line::bridgewhite z13-, line::dash z16-) +=== 40 + man_made-breakwater # line z14- and area z12- (also has caption z17-) man_made-pier # line z14- and area z12- (also has caption z17-) waterway-dam # line z14- and area z14- (also has pathtext z15-) diff --git a/data/styles/vehicle/include/priorities_3_FG.prio.txt b/data/styles/vehicle/include/priorities_3_FG.prio.txt index 348d258813..5f8a41ba47 100644 --- a/data/styles/vehicle/include/priorities_3_FG.prio.txt +++ b/data/styles/vehicle/include/priorities_3_FG.prio.txt @@ -290,7 +290,6 @@ highway-trunk-bridge::bridgewhite # line::bridgewhite z13- (al highway-trunk_link-bridge::bridgewhite # line::bridgewhite z14- (also has line z10-, line::bridgeblack z14-, line(casing) z14-, pathtext z10-, shield::shield z10-) highway-unclassified-bridge::bridgewhite # line::bridgewhite z14- (also has line z11-, line::bridgeblack z14-, pathtext z14-) railway-abandoned-bridge::bridgewhite # line::bridgewhite z16- (also has line z16-, line::bridgeblack z16-) -railway-light_rail-bridge::bridgewhite # line::bridgewhite z14- (also has line z13-, line::bridgeblack z16-, line::dash z16-) railway-preserved-bridge::bridgewhite # line::bridgewhite z16- (also has line z16-, line::bridgeblack z16-) railway-rail-branch-bridge::bridgewhite # line::bridgewhite z14- (also has line z11-, line::bridgeblack z16-, line::dash z16-) railway-rail-bridge::bridgewhite # line::bridgewhite z14- (also has line z11-, line::bridgeblack z16-, line::dash z16-) @@ -316,7 +315,6 @@ highway-trunk-bridge::bridgeblack # line::bridgeblack z13- (al highway-trunk_link-bridge::bridgeblack # line::bridgeblack z14- (also has line z10-, line::bridgewhite z14-, line(casing) z14-, pathtext z10-, shield::shield z10-) highway-unclassified-bridge::bridgeblack # line::bridgeblack z14- (also has line z11-, line::bridgewhite z14-, pathtext z14-) railway-abandoned-bridge::bridgeblack # line::bridgeblack z16- (also has line z16-, line::bridgewhite z16-) -railway-light_rail-bridge::bridgeblack # line::bridgeblack z16- (also has line z13-, line::bridgewhite z14-, line::dash z16-) railway-preserved-bridge::bridgeblack # line::bridgeblack z16- (also has line z16-, line::bridgewhite z16-) railway-rail-branch-bridge::bridgeblack # line::bridgeblack z16- (also has line z11-, line::bridgewhite z14-, line::dash z16-) railway-rail-bridge::bridgeblack # line::bridgeblack z16- (also has line z11-, line::bridgewhite z14-, line::dash z16-) @@ -354,6 +352,12 @@ building-has_parts # area z15- (also has captio building-train_station # area z15- (also has caption z18-) === 50 +railway-light_rail-bridge::bridgewhite # line::bridgewhite z14- (also has line z13-, line::bridgeblack z16-, line::dash z16-) +=== 40 + +railway-light_rail-bridge::bridgeblack # line::bridgeblack z16- (also has line z13-, line::bridgewhite z14-, line::dash z16-) +=== 30 + man_made-breakwater # line z15- and area z13- man_made-pier # line z15- and area z13- waterway-dam # line z15- and area z15- diff --git a/indexer/ftypes_matcher.cpp b/indexer/ftypes_matcher.cpp index 1d254f5c56..5f65f0caec 100644 --- a/indexer/ftypes_matcher.cpp +++ b/indexer/ftypes_matcher.cpp @@ -353,11 +353,8 @@ IsStreetOrSquareChecker::IsStreetOrSquareChecker() m_types.push_back(t); } -// Used to determine for which features to display address in PP and in search results. -// If such a feature has a housenumber and a name then its enriched with a postcode (at the generation stage). IsAddressObjectChecker::IsAddressObjectChecker() : BaseChecker(1 /* level */) { - /// @todo(pastk): some objects in TwoLevelPOIChecker can have addresses also. m_types = OneLevelPOIChecker().GetTypes(); Classificator const & c = classif(); @@ -365,8 +362,6 @@ IsAddressObjectChecker::IsAddressObjectChecker() : BaseChecker(1 /* level */) m_types.push_back(c.GetTypeByPath({p})); } -// Used to insert exact address (street and house number) instead of -// an empty name in search results (see ranker.cpp) IsAddressChecker::IsAddressChecker() : BaseChecker(1 /* level */) { Classificator const & c = classif(); @@ -436,7 +431,6 @@ IsPisteChecker::IsPisteChecker() : BaseChecker(1 /* level */) } -// Used in IsPoiChecker and in IsAddressObjectChecker. OneLevelPOIChecker::OneLevelPOIChecker() : ftypes::BaseChecker(1 /* level */) { Classificator const & c = classif(); @@ -446,7 +440,6 @@ OneLevelPOIChecker::OneLevelPOIChecker() : ftypes::BaseChecker(1 /* level */) m_types.push_back(c.GetTypeByPath({path})); } -// Used in IsPoiChecker and also in TypesSkipper to keep types in the search index. TwoLevelPOIChecker::TwoLevelPOIChecker() : ftypes::BaseChecker(2 /* level */) { Classificator const & c = classif(); diff --git a/indexer/ftypes_matcher.hpp b/indexer/ftypes_matcher.hpp index b2d3e45e8f..655d2ca75f 100644 --- a/indexer/ftypes_matcher.hpp +++ b/indexer/ftypes_matcher.hpp @@ -291,10 +291,6 @@ public: TwoLevelPOIChecker(); }; -// Used in: -// - search ranking (POIs are ranked somewhat higher than "unclassified" features, see search/model.hpp) -// - add type's translation into complex PP subtitle (see GetLocalizedAllTypes()) -// - building lists of popular places (generator/popular_places_section_builder.cpp) class IsPoiChecker { public: diff --git a/indexer/map_style.cpp b/indexer/map_style.cpp index 6753f8a673..f44dd87807 100644 --- a/indexer/map_style.cpp +++ b/indexer/map_style.cpp @@ -64,41 +64,3 @@ bool MapStyleIsDark(MapStyle mapStyle) } return false; } - -MapStyle GetDarkMapStyleVariant(MapStyle mapStyle) -{ - if (MapStyleIsDark(mapStyle) || mapStyle == MapStyleMerged) - return mapStyle; - - switch (mapStyle) - { - case MapStyleDefaultLight: - return MapStyleDefaultDark; - case MapStyleVehicleLight: - return MapStyleVehicleDark; - case MapStyleOutdoorsLight: - return MapStyleOutdoorsDark; - default: - CHECK(false, ()); - return MapStyleDefaultDark; - } -} - -MapStyle GetLightMapStyleVariant(MapStyle mapStyle) -{ - if (!MapStyleIsDark(mapStyle)) - return mapStyle; - - switch (mapStyle) - { - case MapStyleDefaultDark: - return MapStyleDefaultLight; - case MapStyleVehicleDark: - return MapStyleVehicleLight; - case MapStyleOutdoorsDark: - return MapStyleOutdoorsLight; - default: - CHECK(false, ()); - return MapStyleDefaultLight; - } -} diff --git a/indexer/map_style.hpp b/indexer/map_style.hpp index 7971a2e8d0..9717367645 100644 --- a/indexer/map_style.hpp +++ b/indexer/map_style.hpp @@ -23,5 +23,3 @@ extern MapStyle MapStyleFromSettings(std::string const & str); extern std::string MapStyleToString(MapStyle mapStyle); extern std::string DebugPrint(MapStyle mapStyle); extern bool MapStyleIsDark(MapStyle mapStyle); -extern MapStyle GetDarkMapStyleVariant(MapStyle mapStyle); -extern MapStyle GetLightMapStyleVariant(MapStyle mapStyle); diff --git a/iphone/CoreApi/CoreApi/Common/MWMCommon.h b/iphone/CoreApi/CoreApi/Common/MWMCommon.h index ec5d985080..85ec85bdab 100644 --- a/iphone/CoreApi/CoreApi/Common/MWMCommon.h +++ b/iphone/CoreApi/CoreApi/Common/MWMCommon.h @@ -32,7 +32,7 @@ static inline BOOL isIOSVersionLessThan(NSUInteger version) return isIOSVersionLessThanString([NSString stringWithFormat:@"%@", @(version)]); } -static inline BOOL isInterfaceRightToLeft(void) +static inline BOOL isInterfaceRightToLeft(void) NS_EXTENSION_UNAVAILABLE_IOS("Not available in extensions") { return UIApplication.sharedApplication.userInterfaceLayoutDirection == UIUserInterfaceLayoutDirectionRightToLeft; @@ -50,7 +50,7 @@ static inline BOOL equalScreenDimensions(CGFloat left, CGFloat right) return fabs(left - right) < 0.5; } -static inline CGFloat statusBarHeight(void) +static inline CGFloat statusBarHeight(void) NS_EXTENSION_UNAVAILABLE_IOS("Not available in extensions") { CGSize const statusBarSize = UIApplication.sharedApplication.statusBarFrame.size; return MIN(statusBarSize.height, statusBarSize.width); diff --git a/iphone/CoreApi/CoreApi/TrackRecorder/TrackRecordingInfo.h b/iphone/CoreApi/CoreApi/TrackRecorder/TrackRecordingInfo.h index 6289e90c0b..eaf1adb902 100644 --- a/iphone/CoreApi/CoreApi/TrackRecorder/TrackRecordingInfo.h +++ b/iphone/CoreApi/CoreApi/TrackRecorder/TrackRecordingInfo.h @@ -11,6 +11,8 @@ NS_ASSUME_NONNULL_BEGIN @property (nonatomic, readonly) NSString * maxElevation; @property (nonatomic, readonly) NSString * minElevation; ++ (TrackRecordingInfo *)emptyInfo; + @end NS_ASSUME_NONNULL_END diff --git a/iphone/CoreApi/CoreApi/TrackRecorder/TrackRecordingInfo.mm b/iphone/CoreApi/CoreApi/TrackRecorder/TrackRecordingInfo.mm index 1cdc8f1d00..88fb0a2c4e 100644 --- a/iphone/CoreApi/CoreApi/TrackRecorder/TrackRecordingInfo.mm +++ b/iphone/CoreApi/CoreApi/TrackRecorder/TrackRecordingInfo.mm @@ -5,6 +5,10 @@ @implementation TrackRecordingInfo ++ (TrackRecordingInfo *)emptyInfo { + return [[TrackRecordingInfo alloc] initWithGpsTrackInfo:GpsTrackInfo()]; +} + @end @implementation TrackRecordingInfo (Core) diff --git a/iphone/Maps/Classes/CustomViews/MapViewControls/TrackRecordingViewController.swift b/iphone/Maps/Classes/CustomViews/MapViewControls/TrackRecordingViewController.swift index 5d7ae9fde3..ef42f69b4f 100644 --- a/iphone/Maps/Classes/CustomViews/MapViewControls/TrackRecordingViewController.swift +++ b/iphone/Maps/Classes/CustomViews/MapViewControls/TrackRecordingViewController.swift @@ -136,7 +136,7 @@ final class TrackRecordingViewController: MWMViewController { @objc private func onTrackRecordingButtonPressed(_ sender: Any) { switch trackRecordingManager.recordingState { - case .inactive, .error: + case .inactive: trackRecordingManager.processAction(.start) case .active: trackRecordingManager.processAction(.stop) diff --git a/iphone/Maps/Classes/MapsAppDelegate.mm b/iphone/Maps/Classes/MapsAppDelegate.mm index 5477689e49..3e5a7b7bb9 100644 --- a/iphone/Maps/Classes/MapsAppDelegate.mm +++ b/iphone/Maps/Classes/MapsAppDelegate.mm @@ -101,6 +101,7 @@ using namespace osm_auth_ios; NSTimeInterval const minimumBackgroundFetchIntervalInSeconds = 6 * 60 * 60; [UIApplication.sharedApplication setMinimumBackgroundFetchInterval:minimumBackgroundFetchIntervalInSeconds]; [self updateApplicationIconBadgeNumber]; + [TrackRecordingManager.shared setup]; } - (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(NSDictionary *)launchOptions { diff --git a/iphone/Maps/Core/TrackRecorder/TrackRecordingActivityManager.swift b/iphone/Maps/Core/TrackRecorder/TrackRecordingActivityManager.swift new file mode 100644 index 0000000000..954bf78c8e --- /dev/null +++ b/iphone/Maps/Core/TrackRecorder/TrackRecordingActivityManager.swift @@ -0,0 +1,60 @@ +import ActivityKit + +#if canImport(ActivityKit) + +protocol TrackRecordingActivityManager { + func start(with info: TrackRecordingInfo) throws + func update(_ info: TrackRecordingInfo) + func stop() +} + +@available(iOS 16.2, *) +final class TrackRecordingLiveActivityManager { + + static let shared = TrackRecordingLiveActivityManager() + + private var activity: Activity? + + private init() {} +} + +// MARK: - TrackRecordingActivityManager + +@available(iOS 16.2, *) +extension TrackRecordingLiveActivityManager: TrackRecordingActivityManager { + func start(with info: TrackRecordingInfo) throws { + guard activity == nil else { return } + let state = TrackRecordingLiveActivityAttributes.ContentState(trackInfo: info) + let content = ActivityContent(state: state, staleDate: nil) + let attributes = TrackRecordingLiveActivityAttributes() + activity = try LiveActivityManager.startActivity(attributes, content: content) + } + + func update(_ info: TrackRecordingInfo) { + guard let activity else { return } + let state = TrackRecordingLiveActivityAttributes.ContentState(trackInfo: info) + let content = ActivityContent(state: state, staleDate: nil) + LiveActivityManager.update(activity, content: content) + } + + func stop() { + guard let activity else { return } + LiveActivityManager.stop(activity) + self.activity = nil + } +} + +// MARK: - Wrap TrackRecordingInfo to TrackRecordingLiveActivityAttributes.ContentState + +private extension TrackRecordingLiveActivityAttributes.ContentState { + init(trackInfo: TrackRecordingInfo) { + self.distance = StatisticsViewModel(key: "", value: trackInfo.distance) + self.duration = StatisticsViewModel(key: "", value: trackInfo.duration) + self.maxElevation = StatisticsViewModel(key: L("elevation_profile_max_elevation"), value: trackInfo.maxElevation) + self.minElevation = StatisticsViewModel(key: L("elevation_profile_min_elevation"), value: trackInfo.minElevation) + self.ascent = StatisticsViewModel(key: L("elevation_profile_ascent"), value: trackInfo.ascent) + self.descent = StatisticsViewModel(key: L("elevation_profile_descent"), value: trackInfo.descent) + } +} + +#endif diff --git a/iphone/Maps/Core/TrackRecorder/TrackRecordingManager.swift b/iphone/Maps/Core/TrackRecorder/TrackRecordingManager.swift index c0be6daaec..007da151cb 100644 --- a/iphone/Maps/Core/TrackRecorder/TrackRecordingManager.swift +++ b/iphone/Maps/Core/TrackRecorder/TrackRecordingManager.swift @@ -1,10 +1,9 @@ enum TrackRecordingState: Equatable { case inactive case active - case error(TrackRecordingError) } -enum TrackRecordingAction { +enum TrackRecordingAction: String, CaseIterable { case start case stop } @@ -13,6 +12,11 @@ enum TrackRecordingError: Error { case locationIsProhibited } +protocol TrackRecordingObserver: AnyObject { + func addObserver(_ observer: AnyObject, recordingIsActiveDidChangeHandler: @escaping TrackRecordingStateHandler) + func removeObserver(_ observer: AnyObject) +} + typealias TrackRecordingStateHandler = (Bool) -> Void @objcMembers @@ -30,20 +34,48 @@ final class TrackRecordingManager: NSObject { var recordingStateDidChangeHandler: TrackRecordingStateHandler? } - static let shared: TrackRecordingManager = TrackRecordingManager(trackRecorder: FrameworkHelper.self) + static let shared: TrackRecordingManager = { + let trackRecorder = FrameworkHelper.self + var activityManager: TrackRecordingActivityManager? = nil + #if canImport(ActivityKit) + if #available(iOS 16.2, *) { + activityManager = TrackRecordingLiveActivityManager.shared + } + #endif + return TrackRecordingManager(trackRecorder: trackRecorder, activityManager: activityManager) + }() private let trackRecorder: TrackRecorder.Type + private var activityManager: TrackRecordingActivityManager? private var observations: [Observation] = [] - private(set) var recordingState: TrackRecordingState = .inactive { - didSet { - notifyObservers() - } + private var trackRecordingInfo: TrackRecordingInfo? + + var recordingState: TrackRecordingState { + trackRecorder.isTrackRecordingEnabled() ? .active : .inactive } - private init(trackRecorder: TrackRecorder.Type) { + private init(trackRecorder: TrackRecorder.Type, activityManager: TrackRecordingActivityManager?) { self.trackRecorder = trackRecorder + self.activityManager = activityManager super.init() - self.recordingState = getCurrentRecordingState() + subscribeOnAppLifecycleEvents() + } + + // MARK: - Public methods + + @objc + func setup() { + do { + try checkIsLocationEnabled() + switch recordingState { + case .inactive: + break + case .active: + subscribeOnTrackRecordingProgressUpdates() + } + } catch { + handleError(error) + } } @objc @@ -60,50 +92,73 @@ final class TrackRecordingManager: NSObject { } } - @objc - func addObserver(_ observer: AnyObject, recordingIsActiveDidChangeHandler: @escaping TrackRecordingStateHandler) { - let observation = Observation(observer: observer, recordingStateDidChangeHandler: recordingIsActiveDidChangeHandler) - observations.append(observation) - recordingIsActiveDidChangeHandler(recordingState == .active) - } + // MARK: - Private methods - @objc - func removeObserver(_ observer: AnyObject) { - observations.removeAll { $0.observer === observer } - } - - private func notifyObservers() { - observations = observations.filter { $0.observer != nil } - observations.forEach { $0.recordingStateDidChangeHandler?(recordingState == .active) } - } - - private func handleError(_ error: TrackRecordingError, completion: (CompletionHandler)? = nil) { - switch error { - case .locationIsProhibited: - // Show alert to enable location - LocationManager.checkLocationStatus() - } - stopRecording(.withoutSaving, completion: completion) - } - - private func getCurrentRecordingState() -> TrackRecordingState { + private func checkIsLocationEnabled() throws { guard !LocationManager.isLocationProhibited() else { - return .error(.locationIsProhibited) + throw TrackRecordingError.locationIsProhibited } - return trackRecorder.isTrackRecordingEnabled() ? .active : .inactive } + // MARK: - Handle lifecycle events + + private func subscribeOnAppLifecycleEvents() { + NotificationCenter.default.addObserver(self, selector: #selector(willResignActive), name: UIApplication.willResignActiveNotification, object: nil) + NotificationCenter.default.addObserver(self, selector: #selector(willEnterForeground), name: UIApplication.willEnterForegroundNotification, object: nil) + NotificationCenter.default.addObserver(self, selector: #selector(prepareForTermination), name: UIApplication.willTerminateNotification, object: nil) + } + + @objc + private func willResignActive() { + guard let activityManager, recordingState == .active else { return } + do { + try activityManager.start(with: trackRecordingInfo ?? .empty()) + } catch { + handleError(error) + } + } + + @objc + private func willEnterForeground() { + activityManager?.stop() + } + + @objc + private func prepareForTermination() { + activityManager?.stop() + } + + // MARK: - Handle track recording process + + private func subscribeOnTrackRecordingProgressUpdates() { + trackRecorder.setTrackRecordingUpdateHandler { [weak self] info in + guard let self else { return } + self.trackRecordingInfo = info + self.activityManager?.update(info) + } + } + + private func unsubscribeFromTrackRecordingProgressUpdates() { + trackRecorder.setTrackRecordingUpdateHandler(nil) + trackRecordingInfo = nil + } + + // MARK: - Handle Start/Stop event and Errors + private func start(completion: (CompletionHandler)? = nil) { - let state = getCurrentRecordingState() - switch state { - case .inactive: - trackRecorder.startTrackRecording() - recordingState = .active + do { + try checkIsLocationEnabled() + switch recordingState { + case .inactive: + subscribeOnTrackRecordingProgressUpdates() + trackRecorder.startTrackRecording() + notifyObservers() + case .active: + break + } completion?() - case .active: - completion?() - case .error(let trackRecordingError): - handleError(trackRecordingError, completion: completion) + } catch { + handleError(error, completion: completion) } } @@ -128,18 +183,32 @@ final class TrackRecordingManager: NSObject { } private func stopRecording(_ savingOption: SavingOption, completion: (CompletionHandler)? = nil) { + unsubscribeFromTrackRecordingProgressUpdates() trackRecorder.stopTrackRecording() + activityManager?.stop() + notifyObservers() switch savingOption { case .withoutSaving: break case .saveWithName(let name): trackRecorder.saveTrackRecording(withName: name) } - recordingState = .inactive completion?() } - - private static func showOnFinishRecordingAlert(onSave: @escaping CompletionHandler, + + private func handleError(_ error: Error, completion: (CompletionHandler)? = nil) { + LOG(.error, error.localizedDescription) + switch error { + case TrackRecordingError.locationIsProhibited: + // Show alert to enable location + LocationManager.checkLocationStatus() + default: + break + } + stopRecording(.withoutSaving, completion: completion) + } + + private static func showOnFinishRecordingAlert(onSave: @escaping CompletionHandler, onStop: @escaping CompletionHandler, onContinue: @escaping CompletionHandler) { let alert = UIAlertController(title: L("track_recording_alert_title"), message: nil, preferredStyle: .alert) @@ -149,3 +218,24 @@ final class TrackRecordingManager: NSObject { UIViewController.topViewController().present(alert, animated: true) } } + +// MARK: - TrackRecordingObserver + +extension TrackRecordingManager: TrackRecordingObserver { + @objc + func addObserver(_ observer: AnyObject, recordingIsActiveDidChangeHandler: @escaping TrackRecordingStateHandler) { + let observation = Observation(observer: observer, recordingStateDidChangeHandler: recordingIsActiveDidChangeHandler) + observations.append(observation) + recordingIsActiveDidChangeHandler(recordingState == .active) + } + + @objc + func removeObserver(_ observer: AnyObject) { + observations.removeAll { $0.observer === observer } + } + + private func notifyObservers() { + observations = observations.filter { $0.observer != nil } + observations.forEach { $0.recordingStateDidChangeHandler?(recordingState == .active) } + } +} diff --git a/iphone/Maps/LocalizedStrings/ar.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/ar.lproj/Localizable.strings index de9e81bc87..a1591ac03b 100644 --- a/iphone/Maps/LocalizedStrings/ar.lproj/Localizable.strings +++ b/iphone/Maps/LocalizedStrings/ar.lproj/Localizable.strings @@ -1228,9 +1228,9 @@ "elevation_profile_descent" = "تنازلي"; -"elevation_profile_minaltitude" = "الحد الأدنى للارتفاع"; +"elevation_profile_min_elevation" = "أقل ارتفاع"; -"elevation_profile_maxaltitude" = "الحد الأقصى للارتفاع"; +"elevation_profile_max_elevation" = "أعلى ارتفاع"; "elevation_profile_difficulty" = "درجة الصعوبة"; diff --git a/iphone/Maps/LocalizedStrings/az.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/az.lproj/Localizable.strings index b7c843e007..033f9332db 100644 --- a/iphone/Maps/LocalizedStrings/az.lproj/Localizable.strings +++ b/iphone/Maps/LocalizedStrings/az.lproj/Localizable.strings @@ -1228,9 +1228,9 @@ "elevation_profile_descent" = "Eniş"; -"elevation_profile_minaltitude" = "Min. hündürlük"; +"elevation_profile_min_elevation" = "Min. hündürlük"; -"elevation_profile_maxaltitude" = "Maks. hündürlük"; +"elevation_profile_max_elevation" = "Maks. hündürlük"; "elevation_profile_difficulty" = "Çətinlik"; diff --git a/iphone/Maps/LocalizedStrings/be.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/be.lproj/Localizable.strings index dfa0fdb385..2f454f0d38 100644 --- a/iphone/Maps/LocalizedStrings/be.lproj/Localizable.strings +++ b/iphone/Maps/LocalizedStrings/be.lproj/Localizable.strings @@ -1228,9 +1228,9 @@ "elevation_profile_descent" = "Спуск"; -"elevation_profile_minaltitude" = "Мін. вышыня"; +"elevation_profile_min_elevation" = "Мін. вышыня"; -"elevation_profile_maxaltitude" = "Макс. вышыня"; +"elevation_profile_max_elevation" = "Макс. вышыня"; "elevation_profile_difficulty" = "Складанасць"; diff --git a/iphone/Maps/LocalizedStrings/bg.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/bg.lproj/Localizable.strings index 66ed46d0fc..374790980c 100644 --- a/iphone/Maps/LocalizedStrings/bg.lproj/Localizable.strings +++ b/iphone/Maps/LocalizedStrings/bg.lproj/Localizable.strings @@ -1228,9 +1228,9 @@ "elevation_profile_descent" = "Спускане"; -"elevation_profile_minaltitude" = "Мин. надморска височина"; +"elevation_profile_min_elevation" = "Мин. височина"; -"elevation_profile_maxaltitude" = "Макс. надморска височина"; +"elevation_profile_max_elevation" = "Макс. височина"; "elevation_profile_difficulty" = "Трудност"; diff --git a/iphone/Maps/LocalizedStrings/ca.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/ca.lproj/Localizable.strings index 7ffe2ff473..6359dc8d57 100644 --- a/iphone/Maps/LocalizedStrings/ca.lproj/Localizable.strings +++ b/iphone/Maps/LocalizedStrings/ca.lproj/Localizable.strings @@ -1228,9 +1228,9 @@ "elevation_profile_descent" = "Descens"; -"elevation_profile_minaltitude" = "Altitud mín."; +"elevation_profile_min_elevation" = "Min. elevació"; -"elevation_profile_maxaltitude" = "Altitud màx."; +"elevation_profile_max_elevation" = "Màx. elevació"; "elevation_profile_difficulty" = "Dificultat"; diff --git a/iphone/Maps/LocalizedStrings/cs.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/cs.lproj/Localizable.strings index be4c234602..b466399505 100644 --- a/iphone/Maps/LocalizedStrings/cs.lproj/Localizable.strings +++ b/iphone/Maps/LocalizedStrings/cs.lproj/Localizable.strings @@ -1228,9 +1228,9 @@ "elevation_profile_descent" = "Klesání"; -"elevation_profile_minaltitude" = "Min. nadmořská výška"; +"elevation_profile_min_elevation" = "Min. výška"; -"elevation_profile_maxaltitude" = "Max. nadmořská výška"; +"elevation_profile_max_elevation" = "Max. výška"; "elevation_profile_difficulty" = "Obtížnost"; diff --git a/iphone/Maps/LocalizedStrings/da.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/da.lproj/Localizable.strings index b949a2d923..fe232afb59 100644 --- a/iphone/Maps/LocalizedStrings/da.lproj/Localizable.strings +++ b/iphone/Maps/LocalizedStrings/da.lproj/Localizable.strings @@ -1228,9 +1228,9 @@ "elevation_profile_descent" = "Stige ned"; -"elevation_profile_minaltitude" = "Min. højde"; +"elevation_profile_min_elevation" = "Min. højde"; -"elevation_profile_maxaltitude" = "Maks. højde"; +"elevation_profile_max_elevation" = "Maks. højde"; "elevation_profile_difficulty" = "Vanskelighed"; diff --git a/iphone/Maps/LocalizedStrings/de.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/de.lproj/Localizable.strings index f1cef5a6f4..1c488fda57 100644 --- a/iphone/Maps/LocalizedStrings/de.lproj/Localizable.strings +++ b/iphone/Maps/LocalizedStrings/de.lproj/Localizable.strings @@ -1228,9 +1228,9 @@ "elevation_profile_descent" = "Bergab"; -"elevation_profile_minaltitude" = "Min. Höhe"; +"elevation_profile_min_elevation" = "Min. Höhe"; -"elevation_profile_maxaltitude" = "Max. Höhe"; +"elevation_profile_max_elevation" = "Max. Höhe"; "elevation_profile_difficulty" = "Schwierigkeitsgrad"; diff --git a/iphone/Maps/LocalizedStrings/el.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/el.lproj/Localizable.strings index 1229eda83d..16792abd72 100644 --- a/iphone/Maps/LocalizedStrings/el.lproj/Localizable.strings +++ b/iphone/Maps/LocalizedStrings/el.lproj/Localizable.strings @@ -1228,9 +1228,9 @@ "elevation_profile_descent" = "Κατάβαση"; -"elevation_profile_minaltitude" = "Ελάχ. υψόμετρο"; +"elevation_profile_min_elevation" = "Ελάχ. υψόμετρο"; -"elevation_profile_maxaltitude" = "Μέγ. υψόμετρο"; +"elevation_profile_max_elevation" = "Μέγ. υψόμετρο"; "elevation_profile_difficulty" = "Δυσκολία"; diff --git a/iphone/Maps/LocalizedStrings/en-GB.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/en-GB.lproj/Localizable.strings index d698351718..2f933632ef 100644 --- a/iphone/Maps/LocalizedStrings/en-GB.lproj/Localizable.strings +++ b/iphone/Maps/LocalizedStrings/en-GB.lproj/Localizable.strings @@ -1228,9 +1228,9 @@ "elevation_profile_descent" = "Descent"; -"elevation_profile_minaltitude" = "Min. altitude"; +"elevation_profile_min_elevation" = "Min. elevation"; -"elevation_profile_maxaltitude" = "Max. altitude"; +"elevation_profile_max_elevation" = "Max. elevation"; "elevation_profile_difficulty" = "Difficulty"; diff --git a/iphone/Maps/LocalizedStrings/en.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/en.lproj/Localizable.strings index af82bd05c4..057b3bf653 100644 --- a/iphone/Maps/LocalizedStrings/en.lproj/Localizable.strings +++ b/iphone/Maps/LocalizedStrings/en.lproj/Localizable.strings @@ -1228,9 +1228,9 @@ "elevation_profile_descent" = "Descent"; -"elevation_profile_minaltitude" = "Min. altitude"; +"elevation_profile_min_elevation" = "Min. elevation"; -"elevation_profile_maxaltitude" = "Max. altitude"; +"elevation_profile_max_elevation" = "Max. elevation"; "elevation_profile_difficulty" = "Difficulty"; diff --git a/iphone/Maps/LocalizedStrings/es-MX.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/es-MX.lproj/Localizable.strings index 65e1c2e318..fa7d108bc3 100644 --- a/iphone/Maps/LocalizedStrings/es-MX.lproj/Localizable.strings +++ b/iphone/Maps/LocalizedStrings/es-MX.lproj/Localizable.strings @@ -1228,9 +1228,9 @@ "elevation_profile_descent" = "Descenso"; -"elevation_profile_minaltitude" = "Altura mínima"; +"elevation_profile_min_elevation" = "Min. elevación"; -"elevation_profile_maxaltitude" = "Altura máxima"; +"elevation_profile_max_elevation" = "Máx. elevación"; "elevation_profile_difficulty" = "Dificultad"; diff --git a/iphone/Maps/LocalizedStrings/es.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/es.lproj/Localizable.strings index f76c18eb5c..acbba995e1 100644 --- a/iphone/Maps/LocalizedStrings/es.lproj/Localizable.strings +++ b/iphone/Maps/LocalizedStrings/es.lproj/Localizable.strings @@ -1228,9 +1228,9 @@ "elevation_profile_descent" = "Descenso"; -"elevation_profile_minaltitude" = "Altura mínima"; +"elevation_profile_min_elevation" = "Min. elevación"; -"elevation_profile_maxaltitude" = "Altura máxima"; +"elevation_profile_max_elevation" = "Máx. elevación"; "elevation_profile_difficulty" = "Dificultad"; diff --git a/iphone/Maps/LocalizedStrings/et.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/et.lproj/Localizable.strings index 27d59e4b65..cf9f8e23ee 100644 --- a/iphone/Maps/LocalizedStrings/et.lproj/Localizable.strings +++ b/iphone/Maps/LocalizedStrings/et.lproj/Localizable.strings @@ -1228,9 +1228,9 @@ "elevation_profile_descent" = "Langus"; -"elevation_profile_minaltitude" = "Min. kõrgus"; +"elevation_profile_min_elevation" = "Min. kõrgus"; -"elevation_profile_maxaltitude" = "Maks. kõrgus"; +"elevation_profile_max_elevation" = "Maks. kõrgus"; "elevation_profile_difficulty" = "Raskusaste"; diff --git a/iphone/Maps/LocalizedStrings/eu.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/eu.lproj/Localizable.strings index 9ada238daa..a1a4ffac39 100644 --- a/iphone/Maps/LocalizedStrings/eu.lproj/Localizable.strings +++ b/iphone/Maps/LocalizedStrings/eu.lproj/Localizable.strings @@ -1228,9 +1228,9 @@ "elevation_profile_descent" = "Maldan behera"; -"elevation_profile_minaltitude" = "Gutxieneko altuera"; +"elevation_profile_min_elevation" = "Min. altuera"; -"elevation_profile_maxaltitude" = "Gehieneko altuera"; +"elevation_profile_max_elevation" = "Max. altuera"; "elevation_profile_difficulty" = "Zailtasuna"; diff --git a/iphone/Maps/LocalizedStrings/fa.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/fa.lproj/Localizable.strings index 784c9f6129..57e803061e 100644 --- a/iphone/Maps/LocalizedStrings/fa.lproj/Localizable.strings +++ b/iphone/Maps/LocalizedStrings/fa.lproj/Localizable.strings @@ -1228,9 +1228,9 @@ "elevation_profile_descent" = "پایین آمدن"; -"elevation_profile_minaltitude" = "کمینه ارتفاع"; +"elevation_profile_min_elevation" = "کم ارتفاع"; -"elevation_profile_maxaltitude" = "بیشینه ارتفاع"; +"elevation_profile_max_elevation" = "بیش ارتفاع"; "elevation_profile_difficulty" = "دشواری"; diff --git a/iphone/Maps/LocalizedStrings/fi.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/fi.lproj/Localizable.strings index 5df22b067a..18b3bd0d41 100644 --- a/iphone/Maps/LocalizedStrings/fi.lproj/Localizable.strings +++ b/iphone/Maps/LocalizedStrings/fi.lproj/Localizable.strings @@ -1228,9 +1228,9 @@ "elevation_profile_descent" = "Laskua"; -"elevation_profile_minaltitude" = "Min. korkeus"; +"elevation_profile_min_elevation" = "Min. korkeus"; -"elevation_profile_maxaltitude" = "Maks. korkeus"; +"elevation_profile_max_elevation" = "Max. korkeus"; "elevation_profile_difficulty" = "Vaikeus"; diff --git a/iphone/Maps/LocalizedStrings/fr.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/fr.lproj/Localizable.strings index 65f04b623d..4a6440575c 100644 --- a/iphone/Maps/LocalizedStrings/fr.lproj/Localizable.strings +++ b/iphone/Maps/LocalizedStrings/fr.lproj/Localizable.strings @@ -1228,9 +1228,9 @@ "elevation_profile_descent" = "Descente"; -"elevation_profile_minaltitude" = "Hauteur minimale"; +"elevation_profile_min_elevation" = "Min. élévation"; -"elevation_profile_maxaltitude" = "Hauteur maximale"; +"elevation_profile_max_elevation" = "Max. élévation"; "elevation_profile_difficulty" = "Difficulté"; diff --git a/iphone/Maps/LocalizedStrings/he.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/he.lproj/Localizable.strings index 07232cffe8..c36f4c6ca0 100644 --- a/iphone/Maps/LocalizedStrings/he.lproj/Localizable.strings +++ b/iphone/Maps/LocalizedStrings/he.lproj/Localizable.strings @@ -1228,9 +1228,9 @@ "elevation_profile_descent" = "ירידה"; -"elevation_profile_minaltitude" = "גובה מינימלי"; +"elevation_profile_min_elevation" = "מינ' גובה"; -"elevation_profile_maxaltitude" = "גובה מקסימלי"; +"elevation_profile_max_elevation" = "מקס' גובה"; "elevation_profile_difficulty" = "קושי"; diff --git a/iphone/Maps/LocalizedStrings/hi.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/hi.lproj/Localizable.strings index 4af2b1f308..0764af274f 100644 --- a/iphone/Maps/LocalizedStrings/hi.lproj/Localizable.strings +++ b/iphone/Maps/LocalizedStrings/hi.lproj/Localizable.strings @@ -1228,9 +1228,9 @@ "elevation_profile_descent" = "Descent"; -"elevation_profile_minaltitude" = "Min. altitude"; +"elevation_profile_min_elevation" = "Min. elevation"; -"elevation_profile_maxaltitude" = "Max. altitude"; +"elevation_profile_max_elevation" = "Max. elevation"; "elevation_profile_difficulty" = "Difficulty"; diff --git a/iphone/Maps/LocalizedStrings/hu.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/hu.lproj/Localizable.strings index eacc5f9874..a8783c4b22 100644 --- a/iphone/Maps/LocalizedStrings/hu.lproj/Localizable.strings +++ b/iphone/Maps/LocalizedStrings/hu.lproj/Localizable.strings @@ -1228,9 +1228,9 @@ "elevation_profile_descent" = "Leereszkedés"; -"elevation_profile_minaltitude" = "Min. magasság"; +"elevation_profile_min_elevation" = "Min. magasság"; -"elevation_profile_maxaltitude" = "Max. magasság"; +"elevation_profile_max_elevation" = "Max. magasság"; "elevation_profile_difficulty" = "Nehézség"; diff --git a/iphone/Maps/LocalizedStrings/id.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/id.lproj/Localizable.strings index 7418569157..9d6ca652b3 100644 --- a/iphone/Maps/LocalizedStrings/id.lproj/Localizable.strings +++ b/iphone/Maps/LocalizedStrings/id.lproj/Localizable.strings @@ -1228,9 +1228,9 @@ "elevation_profile_descent" = "Menurun"; -"elevation_profile_minaltitude" = "Ketinggian Min."; +"elevation_profile_min_elevation" = "Min. tinggi"; -"elevation_profile_maxaltitude" = "Ketinggian Maks."; +"elevation_profile_max_elevation" = "Maks. tinggi"; "elevation_profile_difficulty" = "Kesulitan"; diff --git a/iphone/Maps/LocalizedStrings/it.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/it.lproj/Localizable.strings index 962260d01a..b570a5c111 100644 --- a/iphone/Maps/LocalizedStrings/it.lproj/Localizable.strings +++ b/iphone/Maps/LocalizedStrings/it.lproj/Localizable.strings @@ -1228,9 +1228,9 @@ "elevation_profile_descent" = "Discesa"; -"elevation_profile_minaltitude" = "Altitudine minima"; +"elevation_profile_min_elevation" = "Min. elevazione"; -"elevation_profile_maxaltitude" = "Altitudine massima"; +"elevation_profile_max_elevation" = "Max. elevazione"; "elevation_profile_difficulty" = "Difficoltà"; diff --git a/iphone/Maps/LocalizedStrings/ja.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/ja.lproj/Localizable.strings index 4f01f40d02..00281bbd3e 100644 --- a/iphone/Maps/LocalizedStrings/ja.lproj/Localizable.strings +++ b/iphone/Maps/LocalizedStrings/ja.lproj/Localizable.strings @@ -1228,9 +1228,9 @@ "elevation_profile_descent" = "下降"; -"elevation_profile_minaltitude" = "最小高度"; +"elevation_profile_min_elevation" = "最小標高"; -"elevation_profile_maxaltitude" = "最大高度"; +"elevation_profile_max_elevation" = "最大標高"; "elevation_profile_difficulty" = "難易度"; diff --git a/iphone/Maps/LocalizedStrings/ko.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/ko.lproj/Localizable.strings index 66dc422c0e..3c88292bc9 100644 --- a/iphone/Maps/LocalizedStrings/ko.lproj/Localizable.strings +++ b/iphone/Maps/LocalizedStrings/ko.lproj/Localizable.strings @@ -1228,9 +1228,9 @@ "elevation_profile_descent" = "내려가기"; -"elevation_profile_minaltitude" = "산 최소 높이"; +"elevation_profile_min_elevation" = "최소 높이"; -"elevation_profile_maxaltitude" = "산 최대 높이"; +"elevation_profile_max_elevation" = "최대 높이"; "elevation_profile_difficulty" = "난이도"; diff --git a/iphone/Maps/LocalizedStrings/lv.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/lv.lproj/Localizable.strings index 4cfb230b06..63a7c22680 100644 --- a/iphone/Maps/LocalizedStrings/lv.lproj/Localizable.strings +++ b/iphone/Maps/LocalizedStrings/lv.lproj/Localizable.strings @@ -1228,9 +1228,9 @@ "elevation_profile_descent" = "Kritums"; -"elevation_profile_minaltitude" = "Zemākais punkts"; +"elevation_profile_min_elevation" = "Zemākais punkts"; -"elevation_profile_maxaltitude" = "Augstākais punkts"; +"elevation_profile_max_elevation" = "Augstākais punkts"; "elevation_profile_difficulty" = "Sarežģītība"; diff --git a/iphone/Maps/LocalizedStrings/mr.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/mr.lproj/Localizable.strings index 100c06bb1b..85c27cc2e4 100644 --- a/iphone/Maps/LocalizedStrings/mr.lproj/Localizable.strings +++ b/iphone/Maps/LocalizedStrings/mr.lproj/Localizable.strings @@ -1228,9 +1228,9 @@ "elevation_profile_descent" = "उतरण"; -"elevation_profile_minaltitude" = "किमान उच्चता"; +"elevation_profile_min_elevation" = "किमान उंची"; -"elevation_profile_maxaltitude" = "कमाल उच्चता"; +"elevation_profile_max_elevation" = "कमाल उंची"; "elevation_profile_difficulty" = "काठिण्य"; diff --git a/iphone/Maps/LocalizedStrings/nb.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/nb.lproj/Localizable.strings index 6ecd9caf13..ba74ad9b5e 100644 --- a/iphone/Maps/LocalizedStrings/nb.lproj/Localizable.strings +++ b/iphone/Maps/LocalizedStrings/nb.lproj/Localizable.strings @@ -1228,9 +1228,9 @@ "elevation_profile_descent" = "Nedstigning"; -"elevation_profile_minaltitude" = "Min. høyde"; +"elevation_profile_min_elevation" = "Min. høyde"; -"elevation_profile_maxaltitude" = "Maks. høyde"; +"elevation_profile_max_elevation" = "Maks. høyde"; "elevation_profile_difficulty" = "Vanskelighet"; diff --git a/iphone/Maps/LocalizedStrings/nl.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/nl.lproj/Localizable.strings index 433e0da596..325710078a 100644 --- a/iphone/Maps/LocalizedStrings/nl.lproj/Localizable.strings +++ b/iphone/Maps/LocalizedStrings/nl.lproj/Localizable.strings @@ -1228,9 +1228,9 @@ "elevation_profile_descent" = "Daling"; -"elevation_profile_minaltitude" = "Min. hoogte"; +"elevation_profile_min_elevation" = "Min. hoogte"; -"elevation_profile_maxaltitude" = "Max. hoogte"; +"elevation_profile_max_elevation" = "Max. hoogte"; "elevation_profile_difficulty" = "Moeilijkheid"; diff --git a/iphone/Maps/LocalizedStrings/pl.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/pl.lproj/Localizable.strings index 5820c31831..751fe4614e 100644 --- a/iphone/Maps/LocalizedStrings/pl.lproj/Localizable.strings +++ b/iphone/Maps/LocalizedStrings/pl.lproj/Localizable.strings @@ -1228,9 +1228,9 @@ "elevation_profile_descent" = "Zejście"; -"elevation_profile_minaltitude" = "Min. wysokość"; +"elevation_profile_min_elevation" = "Min. wysokość"; -"elevation_profile_maxaltitude" = "Maks. wysokość"; +"elevation_profile_max_elevation" = "Maks. wysokość"; "elevation_profile_difficulty" = "Trudność"; diff --git a/iphone/Maps/LocalizedStrings/pt-BR.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/pt-BR.lproj/Localizable.strings index c8033fc67c..906362544a 100644 --- a/iphone/Maps/LocalizedStrings/pt-BR.lproj/Localizable.strings +++ b/iphone/Maps/LocalizedStrings/pt-BR.lproj/Localizable.strings @@ -1228,9 +1228,9 @@ "elevation_profile_descent" = "Descida"; -"elevation_profile_minaltitude" = "Altitude mínima"; +"elevation_profile_min_elevation" = "Min. elevação"; -"elevation_profile_maxaltitude" = "Altitude máxima"; +"elevation_profile_max_elevation" = "Máx. elevação"; "elevation_profile_difficulty" = "Dificuldade"; diff --git a/iphone/Maps/LocalizedStrings/pt.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/pt.lproj/Localizable.strings index 3b71332529..3ce8ed24f4 100644 --- a/iphone/Maps/LocalizedStrings/pt.lproj/Localizable.strings +++ b/iphone/Maps/LocalizedStrings/pt.lproj/Localizable.strings @@ -1228,9 +1228,9 @@ "elevation_profile_descent" = "Descida"; -"elevation_profile_minaltitude" = "Altura mínima"; +"elevation_profile_min_elevation" = "Min. elevação"; -"elevation_profile_maxaltitude" = "Altura máxima"; +"elevation_profile_max_elevation" = "Máx. elevação"; "elevation_profile_difficulty" = "Dificuldade"; diff --git a/iphone/Maps/LocalizedStrings/ro.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/ro.lproj/Localizable.strings index 98ffb6153f..9497bf16c2 100644 --- a/iphone/Maps/LocalizedStrings/ro.lproj/Localizable.strings +++ b/iphone/Maps/LocalizedStrings/ro.lproj/Localizable.strings @@ -1228,9 +1228,9 @@ "elevation_profile_descent" = "Coborâre"; -"elevation_profile_minaltitude" = "Înălțime minimă"; +"elevation_profile_min_elevation" = "Min. altitudine"; -"elevation_profile_maxaltitude" = "Înălțime maximă"; +"elevation_profile_max_elevation" = "Max. altitudine"; "elevation_profile_difficulty" = "Dificultate"; diff --git a/iphone/Maps/LocalizedStrings/ru.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/ru.lproj/Localizable.strings index e1b9002b3e..c5fef5a533 100644 --- a/iphone/Maps/LocalizedStrings/ru.lproj/Localizable.strings +++ b/iphone/Maps/LocalizedStrings/ru.lproj/Localizable.strings @@ -1228,9 +1228,9 @@ "elevation_profile_descent" = "Спуск"; -"elevation_profile_minaltitude" = "Мин. высота"; +"elevation_profile_min_elevation" = "Мин. высота"; -"elevation_profile_maxaltitude" = "Макс. высота"; +"elevation_profile_max_elevation" = "Макс. высота"; "elevation_profile_difficulty" = "Сложность"; diff --git a/iphone/Maps/LocalizedStrings/sk.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/sk.lproj/Localizable.strings index 703caf8f14..1e6c3ee167 100644 --- a/iphone/Maps/LocalizedStrings/sk.lproj/Localizable.strings +++ b/iphone/Maps/LocalizedStrings/sk.lproj/Localizable.strings @@ -1228,9 +1228,9 @@ "elevation_profile_descent" = "Klesanie"; -"elevation_profile_minaltitude" = "Min. nadmorská výška"; +"elevation_profile_min_elevation" = "Min. výška"; -"elevation_profile_maxaltitude" = "Max. nadmorská výška"; +"elevation_profile_max_elevation" = "Max. výška"; "elevation_profile_difficulty" = "Obtiažnosť"; diff --git a/iphone/Maps/LocalizedStrings/sr.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/sr.lproj/Localizable.strings index 431b8371b3..629b087d8c 100644 --- a/iphone/Maps/LocalizedStrings/sr.lproj/Localizable.strings +++ b/iphone/Maps/LocalizedStrings/sr.lproj/Localizable.strings @@ -1228,9 +1228,9 @@ "elevation_profile_descent" = "Спуст"; -"elevation_profile_minaltitude" = "Мин. висина"; +"elevation_profile_min_elevation" = "Min. elevation"; -"elevation_profile_maxaltitude" = "Макс. висина"; +"elevation_profile_max_elevation" = "Max. elevation"; "elevation_profile_difficulty" = "Тежина"; @@ -1412,1007 +1412,1007 @@ /********** Types **********/ -"type.addr_interpolation" = "Адресе/Блок"; +"type.addr_interpolation" = "Address/Block"; -"type.addr_interpolation.even" = "Адресе/Блок"; +"type.addr_interpolation.even" = "Address/Block"; -"type.addr_interpolation.odd" = "Адресе/Блок"; +"type.addr_interpolation.odd" = "Address/Block"; -"type.aerialway" = "Гондола"; +"type.aerialway" = "Aerialway"; -"type.aerialway.cable_car" = "Ваздушни трамвај"; +"type.aerialway.cable_car" = "Cable Car"; -"type.aerialway.chair_lift" = "Ски лифт"; +"type.aerialway.chair_lift" = "Chair Lift"; -"type.aerialway.drag_lift" = "Ски-лифт једносед"; +"type.aerialway.drag_lift" = "Drag Lift"; -"type.aerialway.gondola" = "Гондола"; +"type.aerialway.gondola" = "Gondola"; -"type.aerialway.mixed_lift" = "Комбинована жичара"; +"type.aerialway.mixed_lift" = "Mixed Lift"; -"type.aerialway.station" = "Станица жичаре"; +"type.aerialway.station" = "Aerialway Station"; -"type.aeroway" = "Ваздушна инфраструктура"; +"type.aeroway" = "Airspace Infrastructure"; -"type.aeroway.aerodrome" = "Аеродром"; +"type.aeroway.aerodrome" = "Airport"; -"type.aeroway.aerodrome.international" = "Интернационални аеродром"; +"type.aeroway.aerodrome.international" = "International Airport"; -"type.aeroway.apron" = "Перон"; +"type.aeroway.apron" = "Apron"; -"type.aeroway.gate" = "Капија за укрцавање"; +"type.aeroway.gate" = "Gate"; -"type.aeroway.helipad" = "Хелиодром"; +"type.aeroway.helipad" = "Helipad"; -"type.aeroway.runway" = "Писта"; +"type.aeroway.runway" = "Runway"; -"type.aeroway.taxiway" = "Рулна стаза"; +"type.aeroway.taxiway" = "Taxiway"; -"type.aeroway.terminal" = "Терминал"; +"type.aeroway.terminal" = "Terminal"; -"type.amenity" = "Инфраструктурни објекти"; +"type.amenity" = "Amenity"; -"type.amenity.arts_centre" = "Центар уметности"; +"type.amenity.arts_centre" = "Arts Center"; -"type.amenity.atm" = "Банкомат"; +"type.amenity.atm" = "ATM"; -"type.amenity.bank" = "Банка"; +"type.amenity.bank" = "Bank"; -"type.amenity.bar" = "Бар"; +"type.amenity.bar" = "Bar"; -"type.amenity.bbq" = "Грил"; +"type.amenity.bbq" = "Barbecue Grill"; -"type.amenity.bench" = "Клупа"; +"type.amenity.bench" = "Bench"; -"type.amenity.bicycle_parking" = "Паркинг за бицикле"; +"type.amenity.bicycle_parking" = "Bicycle Parking"; -"type.amenity.bicycle_rental" = "Рентирање бицикли"; +"type.amenity.bicycle_rental" = "Bicycle Rental"; -"type.amenity.bicycle_repair_station" = "Станица за поправку бицикла"; +"type.amenity.bicycle_repair_station" = "Bicycle Repair Station"; -"type.amenity.biergarten" = "Пивска башта"; +"type.amenity.biergarten" = "Biergarten"; -"type.amenity.brothel" = "Јавна кућа"; +"type.amenity.brothel" = "Brothel"; -"type.amenity.bureau_de_change" = "Мењачница"; +"type.amenity.bureau_de_change" = "Currency Exchange"; -"type.amenity.bus_station" = "Аутобуска станица"; +"type.amenity.bus_station" = "Bus Station"; -"type.amenity.cafe" = "Кафе"; +"type.amenity.cafe" = "Cafe"; -"type.amenity.car_rental" = "Рента кар"; +"type.amenity.car_rental" = "Car Rental"; -"type.amenity.car_sharing" = "Дељење аутомобила"; +"type.amenity.car_sharing" = "Car Sharing"; -"type.amenity.car_wash" = "Перионица"; +"type.amenity.car_wash" = "Car Wash"; -"type.amenity.casino" = "Казино"; +"type.amenity.casino" = "Casino"; -"type.amenity.gambling" = "Коцкарница"; +"type.amenity.gambling" = "Gambling"; -"type.leisure.adult_gaming_centre" = "Центар за игру одраслих"; +"type.leisure.adult_gaming_centre" = "Adult Gaming Centre"; -"type.leisure.amusement_arcade" = "Играоница за одрасле"; +"type.leisure.amusement_arcade" = "Arcade"; -"type.amenity.charging_station" = "Станица за пуњење ЕВ"; +"type.amenity.charging_station" = "Charging Station"; -"type.amenity.charging_station.bicycle" = "Станица за пуњење бицикла"; +"type.amenity.charging_station.bicycle" = "Bicycle Charging Station"; -"type.amenity.charging_station.motorcar" = "Станица за пуњење аутомобила"; +"type.amenity.charging_station.motorcar" = "Car Charging Station"; -"type.amenity.childcare" = "Вртић"; +"type.amenity.childcare" = "Nursery"; -"type.amenity.cinema" = "Биоскоп"; +"type.amenity.cinema" = "Cinema"; -"type.leisure.bowling_alley" = "Куглана"; +"type.leisure.bowling_alley" = "Bowling Alley"; -"type.amenity.clinic" = "Поликлиника"; +"type.amenity.clinic" = "Clinic"; -"type.amenity.college" = "Факултет"; +"type.amenity.college" = "College"; -"type.amenity.community_centre" = "Дом културе"; +"type.amenity.community_centre" = "Community Centre"; -"type.amenity.compressed_air" = "Компримовани ваздух"; +"type.amenity.compressed_air" = "Compressed Air"; -"type.amenity.conference_centre" = "Конференцијски центар"; +"type.amenity.conference_centre" = "Conference Center"; -"type.amenity.courthouse" = "Суд"; +"type.amenity.courthouse" = "Courthouse"; -"type.amenity.dentist" = "Зубар"; +"type.amenity.dentist" = "Dentist"; -"type.amenity.doctors" = "Доктор"; +"type.amenity.doctors" = "Doctor"; -"type.amenity.drinking_water" = "Вода за пиће"; +"type.amenity.drinking_water" = "Drinking Water"; -"type.drinking_water.yes" = "Вода за пиће"; +"type.drinking_water.yes" = "Drinking Water"; -"type.amenity.driving_school" = "Аутошкола"; +"type.amenity.driving_school" = "Driving School"; -"type.amenity.exhibition_centre" = "Изложбени центар"; +"type.amenity.exhibition_centre" = "Exhibition Center"; -"type.amenity.money_transfer" = "Трансфер новца"; +"type.amenity.money_transfer" = "Money Transfer"; -"type.amenity.music_school" = "Музичка школа"; +"type.amenity.music_school" = "Music School"; -"type.amenity.language_school" = "Школа језика"; +"type.amenity.language_school" = "Language School"; -"type.office.diplomatic" = "Амбасада"; +"type.office.diplomatic" = "Embassy"; -"type.amenity.fast_food" = "Брза храна"; +"type.amenity.fast_food" = "Fast Food"; -"type.amenity.ferry_terminal" = "Трајект"; +"type.amenity.ferry_terminal" = "Ferry"; -"type.amenity.fire_station" = "Ватрогасна станица"; +"type.amenity.fire_station" = "Fire Station"; -"type.amenity.food_court" = "Ресторанска башта"; +"type.amenity.food_court" = "Food Court"; -"type.amenity.fountain" = "Фонтана"; +"type.amenity.fountain" = "Fountain"; -"type.amenity.fuel" = "Гасна станица"; +"type.amenity.fuel" = "Gas Station"; /* In most (European) countries, сemeteries are usually independent of places of worship (e.g. military cemeteries), while grave yards are usually the yard of a place of worship. */ -"type.amenity.grave_yard" = "Гробље"; +"type.amenity.grave_yard" = "Graveyard"; /* In most (European) countries, сemeteries are usually independent of places of worship (e.g. military cemeteries), while grave yards are usually the yard of a place of worship. */ -"type.amenity.grave_yard.christian" = "Хришћанско гробље"; +"type.amenity.grave_yard.christian" = "Graveyard"; -"type.amenity.hospital" = "Болница"; +"type.amenity.hospital" = "Hospital"; -"type.amenity.hunting_stand" = "Ловачка чека"; +"type.amenity.hunting_stand" = "Hunting Stand"; -"type.amenity.ice_cream" = "Сладолед"; +"type.amenity.ice_cream" = "Ice Cream"; -"type.amenity.internet_cafe" = "Интернет кафе"; +"type.amenity.internet_cafe" = "Internet Cafe"; -"type.amenity.kindergarten" = "Вртић"; +"type.amenity.kindergarten" = "Kindergarten"; -"type.amenity.library" = "Библиотека"; +"type.amenity.library" = "Library"; -"type.amenity.loading_dock" = "Утоварна станица"; +"type.amenity.loading_dock" = "Loading Dock"; -"type.amenity.marketplace" = "Маркет"; +"type.amenity.marketplace" = "Marketplace"; -"type.amenity.motorcycle_parking" = "Паркинг за мотоцикле"; +"type.amenity.motorcycle_parking" = "Motorcycle Parking"; -"type.amenity.nightclub" = "Ноћни клуб"; +"type.amenity.nightclub" = "Nightclub"; -"type.amenity.nursing_home" = "Старачки дом"; +"type.amenity.nursing_home" = "Nursing Home"; -"type.amenity.parking" = "Паркинг"; +"type.amenity.parking" = "Parking"; -"type.amenity.parking.fee" = "Паркинг"; +"type.amenity.parking.fee" = "Parking"; -"type.amenity.parking.multi.storey" = "Вишеспратни паркинг"; +"type.amenity.parking.multi.storey" = "Multi Storey Parking"; -"type.amenity.parking.multi.storey.fee" = "Вишеспратни паркинг"; +"type.amenity.parking.multi.storey.fee" = "Multi Storey Parking"; -"type.amenity.parking.no.access" = "Приватни паркинг"; +"type.amenity.parking.no.access" = "Private Parking"; -"type.amenity.parking.permissive" = "Приватни паркинг"; +"type.amenity.parking.permissive" = "Private Parking"; -"type.amenity.parking.private" = "Приватни паркинг"; +"type.amenity.parking.private" = "Private Parking"; -"type.amenity.parking.park_and_ride" = "Паркирај и вози паркинг"; +"type.amenity.parking.park_and_ride" = "Park And Ride Parking"; -"type.amenity.parking.underground" = "Подземни паркинг"; +"type.amenity.parking.underground" = "Underground Parking"; -"type.amenity.parking.underground.fee" = "Подземни паркинг"; +"type.amenity.parking.underground.fee" = "Underground Parking"; -"type.amenity.parking.underground.private" = "Приватни подземни паркинг"; +"type.amenity.parking.underground.private" = "Private Underground Parking"; -"type.amenity.parking.street_side" = "Паркинг поред пута"; +"type.amenity.parking.street_side" = "Street-Side Parking"; -"type.amenity.parking.street_side.fee" = "Паркинг поред пута"; +"type.amenity.parking.street_side.fee" = "Street-Side Parking"; -"type.amenity.parking.street_side.private" = "Приватни паркинг поред пута"; +"type.amenity.parking.street_side.private" = "Private Street-Side Parking"; -"type.amenity.parking.lane" = "Линијски паркинг"; +"type.amenity.parking.lane" = "Lane Parking"; -"type.amenity.parking.lane.fee" = "Линијски паркинг"; +"type.amenity.parking.lane.fee" = "Lane Parking"; -"type.amenity.parking.lane.private" = "Приватни линијски паркинг"; +"type.amenity.parking.lane.private" = "Private Lane Parking"; -"type.amenity.parking_entrance" = "Улаз на паркинг"; +"type.amenity.parking_entrance" = "Parking Entrance"; -"type.amenity.parking_entrance.private" = "Улаз на приватни паркинг"; +"type.amenity.parking_entrance.private" = "Private Parking Entrance"; -"type.amenity.parking_entrance.permissive" = "Улаз на паркинг"; +"type.amenity.parking_entrance.permissive" = "Parking Entrance"; -"type.amenity.parking_space" = "Паркинг место"; +"type.amenity.parking_space" = "Parking Space"; -"type.amenity.parking_space.permissive" = "Паркинг место"; +"type.amenity.parking_space.permissive" = "Parking Space"; -"type.amenity.parking_space.private" = "Паркинг место"; +"type.amenity.parking_space.private" = "Parking Space"; -"type.amenity.parking_space.underground" = "Паркинг место"; +"type.amenity.parking_space.underground" = "Parking Space"; -"type.amenity.parking_space.disabled" = "Паркинг место за инвалиде"; +"type.amenity.parking_space.disabled" = "Disabled Parking Space"; -"type.amenity.payment_terminal" = "Терминал за наплату"; +"type.amenity.payment_terminal" = "Payment Terminal"; -"type.amenity.pharmacy" = "Апотека"; +"type.amenity.pharmacy" = "Pharmacy"; -"type.amenity.place_of_worship" = "Храм"; +"type.amenity.place_of_worship" = "Place of Worship"; -"type.amenity.place_of_worship.buddhist" = "Будистички храм"; +"type.amenity.place_of_worship.buddhist" = "Buddhist Temple"; -"type.amenity.place_of_worship.christian" = "Црква"; +"type.amenity.place_of_worship.christian" = "Church"; -"type.amenity.place_of_worship.christian.mormon" = "Црква Исуса Христа светаца последњих дана"; +"type.amenity.place_of_worship.christian.mormon" = "Church of Jesus Christ of Latter Day Saints"; -"type.amenity.place_of_worship.christian.jehovahs_witness" = "Сала краљевства Јеховиних сведока"; +"type.amenity.place_of_worship.christian.jehovahs_witness" = "Jehovah's Witnesses Kingdom Hall"; -"type.amenity.place_of_worship.hindu" = "Хинду храм"; +"type.amenity.place_of_worship.hindu" = "Hindu Temple"; -"type.amenity.place_of_worship.jewish" = "Синагога"; +"type.amenity.place_of_worship.jewish" = "Synagogue"; -"type.amenity.place_of_worship.muslim" = "Џамија"; +"type.amenity.place_of_worship.muslim" = "Mosque"; -"type.amenity.place_of_worship.shinto" = "Шинтоистички храм"; +"type.amenity.place_of_worship.shinto" = "Shinto Shrine"; -"type.amenity.place_of_worship.taoist" = "Таоистички храм"; +"type.amenity.place_of_worship.taoist" = "Taoist Temple"; -"type.amenity.police" = "Полиција"; +"type.amenity.police" = "Police"; -"type.amenity.post_box" = "Поштанско сандуче"; +"type.amenity.post_box" = "Mailbox"; -"type.amenity.post_office" = "Пошта"; +"type.amenity.post_office" = "Post Office"; -"type.amenity.prison" = "Затвор"; +"type.amenity.prison" = "Prison"; -"type.amenity.pub" = "Паб"; +"type.amenity.pub" = "Pub"; -"type.amenity.public_bookcase" = "Размена књига"; +"type.amenity.public_bookcase" = "Book Exchange"; /********** Types: Recycling **********/ -"type.amenity.recycling.centre" = "Центар за рециклажу"; +"type.amenity.recycling.centre" = "Recycling Center"; -"type.amenity.recycling" = "Контејнер за рециклажу"; +"type.amenity.recycling" = "Recycling Container"; -"type.amenity.recycling.container" = "Контејнер за рециклажу"; +"type.amenity.recycling.container" = "Recycling Container"; -"type.recycling.batteries" = "Бетерије"; +"type.recycling.batteries" = "Batteries"; -"type.recycling.clothes" = "Стара одећа"; +"type.recycling.clothes" = "Clothes"; -"type.recycling.glass_bottles" = "Стаклене флаше"; +"type.recycling.glass_bottles" = "Glass Bottles"; -"type.recycling.paper" = "Папир"; +"type.recycling.paper" = "Paper"; -"type.recycling.plastic" = "Пластика"; +"type.recycling.plastic" = "Plastic"; -"type.recycling.plastic_bottles" = "Пластићне флаше"; +"type.recycling.plastic_bottles" = "Plastic Bottles"; -"type.recycling.scrap_metal" = "Старо гвожђе"; +"type.recycling.scrap_metal" = "Scrap Metal"; -"type.recycling.small_appliances" = "Елекрто отпад"; +"type.recycling.small_appliances" = "Electronic Waste"; -"type.recycling.cardboard" = "Картон"; +"type.recycling.cardboard" = "Cardboard"; -"type.recycling.cans" = "Конзерве"; +"type.recycling.cans" = "Cans"; -"type.recycling.shoes" = "Ципеле"; +"type.recycling.shoes" = "Shoes"; -"type.recycling.green_waste" = "Биолошки отпад"; +"type.recycling.green_waste" = "Green/Organic Waste"; -"type.recycling.cartons" = "Картон и папир"; +"type.recycling.cartons" = "Cartons"; -"type.amenity.restaurant" = "Ресторан"; +"type.amenity.restaurant" = "Restaurant"; -"type.amenity.sanitary_dump_station" = "Станица за одлагање резервоара"; +"type.amenity.sanitary_dump_station" = "Holding Tank Dump Station"; -"type.amenity.school" = "Школа"; +"type.amenity.school" = "School"; /* Weather shelter (including sun shelters and natural rock shelters). */ -"type.amenity.shelter" = "Склониште"; +"type.amenity.shelter" = "Shelter"; /* A weather shelter by the public transport stop. */ -"type.amenity.shelter.public_transport" = "Склониште"; +"type.amenity.shelter.public_transport" = "Shelter"; /* Compared to wilderness_hut its smaller and simpler, without a fireplace. */ -"type.amenity.shelter.basic_hut" = "Колиба за ноћење"; +"type.amenity.shelter.basic_hut" = "Bivouac Hut"; /* A traditional 3-walled shelter (one side open), suitable for overnight camping. */ -"type.amenity.shelter.lean_to" = "Склониште типа шупе"; +"type.amenity.shelter.lean_to" = "Lean-to Shelter"; -"type.amenity.public_bath" = "Јавно купатило"; +"type.amenity.public_bath" = "Public Bath"; -"type.amenity.shower" = "Туш"; +"type.amenity.shower" = "Shower"; -"type.amenity.stripclub" = "Стриптиз клуб"; +"type.amenity.stripclub" = "Stripclub"; -"type.amenity.taxi" = "Такси станица"; +"type.amenity.taxi" = "Taxi Stand"; -"type.amenity.telephone" = "Телефон"; +"type.amenity.telephone" = "Phone"; -"type.amenity.theatre" = "Позориште"; +"type.amenity.theatre" = "Theatre"; -"type.amenity.toilets" = "Тоалет"; +"type.amenity.toilets" = "Toilet"; -"type.toilets.yes" = "Тоалет"; +"type.toilets.yes" = "Toilet"; -"type.amenity.townhall" = "Градска скупштина"; +"type.amenity.townhall" = "Town Hall"; -"type.amenity.university" = "Универзитет"; +"type.amenity.university" = "University"; -"type.amenity.vending_machine" = "Аутомат"; +"type.amenity.vending_machine" = "Vending Machine"; -"type.amenity.vending_machine.cigarettes" = "Аутомат за цигаре"; +"type.amenity.vending_machine.cigarettes" = "Cigarette Dispenser"; -"type.amenity.vending_machine.coffee" = "Аутомат за кафу"; +"type.amenity.vending_machine.coffee" = "Coffee Dispenser"; -"type.amenity.vending_machine.condoms" = "Аутомат за кондоме"; +"type.amenity.vending_machine.condoms" = "Condoms Dispenser"; -"type.amenity.vending_machine.drinks" = "Аутомат за пиће"; +"type.amenity.vending_machine.drinks" = "Drinks Dispenser"; -"type.amenity.vending_machine.food" = "Аутомат за храну"; +"type.amenity.vending_machine.food" = "Food Dispenser"; -"type.amenity.vending_machine.newspapers" = "Аутомат за новине"; +"type.amenity.vending_machine.newspapers" = "Newspaper Dispenser"; -"type.amenity.vending_machine.parking_tickets" = "Паркомат"; +"type.amenity.vending_machine.parking_tickets" = "Parking Meter"; -"type.amenity.vending_machine.public_transport_tickets" = "Аутомат за продају карата"; +"type.amenity.vending_machine.public_transport_tickets" = "Ticket Machine"; -"type.amenity.vending_machine.sweets" = "Аутомат за слаткише"; +"type.amenity.vending_machine.sweets" = "Sweets Dispenser"; -"type.amenity.vending_machine.excrement_bags" = "Кесе за псећи измет"; +"type.amenity.vending_machine.excrement_bags" = "Excrement Bags Dispenser"; -"type.amenity.parcel_locker" = "Пакетомат"; +"type.amenity.parcel_locker" = "Parcel Locker"; -"type.amenity.vehicle_inspection" = "Контрола возила"; +"type.amenity.vehicle_inspection" = "Vehicle Inspection"; -"type.amenity.vending_machine.fuel" = "Пумпа за гориво"; +"type.amenity.vending_machine.fuel" = "Fuel Pump"; -"type.amenity.veterinary" = "Ветеринар"; +"type.amenity.veterinary" = "Veterinary Doctor"; -"type.amenity.waste_basket" = "Канте за смеће"; +"type.amenity.waste_basket" = "Trash Bin"; -"type.amenity.waste_disposal" = "Контејнер за смеће"; +"type.amenity.waste_disposal" = "Dumpster"; -"type.amenity.waste_transfer_station" = "Станица за прераду отпада"; +"type.amenity.waste_transfer_station" = "Waste Transfer Station"; -"type.amenity.water_point" = "Чесма"; +"type.amenity.water_point" = "Water Tank Refill Point"; -"type.amenity.water_point.drinking_water_no" = "Чесма"; +"type.amenity.water_point.drinking_water_no" = "Water Tank Refill Point"; -"type.barrier" = "Баријера"; +"type.barrier" = "Barrier"; -"type.barrier.block" = "Блок"; +"type.barrier.block" = "Block"; -"type.barrier.bollard" = "Стуб"; +"type.barrier.bollard" = "Bollard"; -"type.barrier.border_control" = "Гранична контрола"; +"type.barrier.border_control" = "Border Control"; -"type.barrier.chain" = "Ланац"; +"type.barrier.chain" = "Chain"; -"type.barrier.city_wall" = "Градски зид"; +"type.barrier.city_wall" = "City Wall"; -"type.barrier.cycle_barrier" = "Бедем"; +"type.barrier.cycle_barrier" = "Cycle Barrier"; -"type.waterway.ditch" = "Канал"; +"type.waterway.ditch" = "Drainage Ditch"; -"type.natural.water.moat" = "Шанац"; +"type.natural.water.moat" = "Moat"; -"type.natural.water.wastewater" = "Отпадна вода"; +"type.natural.water.wastewater" = "Wastewater"; -"type.barrier.entrance" = "Пролаз"; +"type.barrier.entrance" = "Entrance"; -"type.barrier.fence" = "Ограда"; +"type.barrier.fence" = "Fence"; -"type.barrier.gate" = "Капија"; +"type.barrier.gate" = "Gate"; -"type.barrier.hedge" = "Жива ограда"; +"type.barrier.hedge" = "Hedge"; -"type.barrier.kissing_gate" = "Капија"; +"type.barrier.kissing_gate" = "Gate"; -"type.barrier.lift_gate" = "Рампа"; +"type.barrier.lift_gate" = "Lift Gate"; -"type.barrier.retaining_wall" = "Подзида"; +"type.barrier.retaining_wall" = "Retaining Wall"; -"type.barrier.stile" = "Прелаз преко ограде"; +"type.barrier.stile" = "Stile"; -"type.barrier.turnstile" = "Окретна капија"; +"type.barrier.turnstile" = "Turnstile"; -"type.barrier.swing_gate" = "Рампа"; +"type.barrier.swing_gate" = "Swing Gate"; -"type.barrier.toll_booth" = "Наплатна рампа"; +"type.barrier.toll_booth" = "Toll Booth"; -"type.barrier.wall" = "Зид"; +"type.barrier.wall" = "Wall"; -"type.boundary" = "Граница"; +"type.boundary" = "Boundary"; -"type.boundary.administrative" = "Административна граница"; +"type.boundary.administrative" = "Administrative Boundary"; /* Borders between countries. */ -"type.boundary.administrative.2" = "Гранични прелаз"; +"type.boundary.administrative.2" = "National Border"; /* Country's primary subdivision borders, e.g. between regions, provinces, states.. */ -"type.boundary.administrative.3" = "Регионална граница"; +"type.boundary.administrative.3" = "Regional Boundary"; /* Country's primary subdivision borders, e.g. between regions, provinces, states.. */ -"type.boundary.administrative.4" = "Регионална граница"; +"type.boundary.administrative.4" = "Regional Boundary"; -"type.boundary.national_park" = "Национални парк"; +"type.boundary.national_park" = "National Park"; -"type.boundary.aboriginal_lands" = "Домородачка земља"; +"type.boundary.aboriginal_lands" = "Indigenous Lands"; -"type.boundary.protected_area" = "Заштићено подручје"; +"type.boundary.protected_area" = "Protected Area"; -"type.boundary.protected_area.1" = "Заштићено подручје"; +"type.boundary.protected_area.1" = "Protected Area"; -"type.boundary.protected_area.2" = "Заштићено подручје"; +"type.boundary.protected_area.2" = "Protected Area"; -"type.boundary.protected_area.3" = "Заштићено подручје"; +"type.boundary.protected_area.3" = "Protected Area"; -"type.boundary.protected_area.4" = "Заштићено подручје"; +"type.boundary.protected_area.4" = "Protected Area"; -"type.boundary.protected_area.5" = "Заштићено подручје"; +"type.boundary.protected_area.5" = "Protected Area"; -"type.boundary.protected_area.6" = "Заштићено подручје"; +"type.boundary.protected_area.6" = "Protected Area"; -"type.building" = "Зграда"; +"type.building" = "Building"; /* Duplicates [address] in strings.txt */ -"type.building.address" = "Адресе"; +"type.building.address" = "Address"; -"type.building.has_parts" = "Зграда"; +"type.building.has_parts" = "Building"; -"type.building_part" = "Зграда"; +"type.building_part" = "Building"; -"type.building.garage" = "Гаража"; +"type.building.garage" = "Garage"; -"type.building.train_station" = "Станична зграда"; +"type.building.train_station" = "Station Building"; -"type.building.warehouse" = "Депо"; +"type.building.warehouse" = "Warehouse"; -"type.cemetery.grave" = "Гробље"; +"type.cemetery.grave" = "Grave"; -"type.craft" = "Занатлије"; +"type.craft" = "Craft"; -"type.craft.beekeeper" = "Пчелар"; +"type.craft.beekeeper" = "Beekeeper"; -"type.craft.blacksmith" = "Ковач"; +"type.craft.blacksmith" = "Blacksmith"; -"type.craft.brewery" = "Пивара"; +"type.craft.brewery" = "Craft Brewery"; -"type.craft.caterer" = "Угоститељ"; +"type.craft.caterer" = "Caterer"; -"type.craft.carpenter" = "Столар"; +"type.craft.carpenter" = "Carpenter"; -"type.craft.confectionery" = "Посластичарница"; +"type.craft.confectionery" = "Confectioner"; -"type.craft.electrician" = "Електрика"; +"type.craft.electrician" = "Electrician"; -"type.craft.electronics_repair" = "Сервис електричних уређаја"; +"type.craft.electronics_repair" = "Electronics Repair"; -"type.craft.gardener" = "Баштован"; +"type.craft.gardener" = "Gardener"; -"type.craft.grinding_mill" = "Млин"; +"type.craft.grinding_mill" = "Grinding Mill"; -"type.craft.handicraft" = "Занатска радионица"; +"type.craft.handicraft" = "Handicraft"; /* Heating, Ventilation, and Air Conditioning */ -"type.craft.hvac" = "Грејање, вентилација и климатизација"; +"type.craft.hvac" = "HVAC"; -"type.craft.key_cutter" = "Нарезивање кључева"; +"type.craft.key_cutter" = "Key Cutting"; -"type.craft.locksmith" = "Бравар"; +"type.craft.locksmith" = "Locksmith"; -"type.craft.metal_construction" = "Металне конструкције"; +"type.craft.metal_construction" = "Metal Worker"; -"type.craft.painter" = "Молер"; +"type.craft.painter" = "House Painter"; -"type.craft.photographer" = "Фотограф"; +"type.craft.photographer" = "Photographer"; -"type.shop.camera" = "Продавница фотоапарата"; +"type.shop.camera" = "Camera Shop"; -"type.craft.plumber" = "Водоинсталатер"; +"type.craft.plumber" = "Plumber"; -"type.craft.sawmill" = "Стругара"; +"type.craft.sawmill" = "Sawmill"; -"type.craft.shoemaker" = "Обућар"; +"type.craft.shoemaker" = "Shoe Repair"; -"type.craft.winery" = "Винарија"; +"type.craft.winery" = "Winery"; -"type.craft.tailor" = "Атеље"; +"type.craft.tailor" = "Tailor"; -"type.cuisine.african" = "Афричка"; +"type.cuisine.african" = "African"; -"type.cuisine.american" = "Америчка"; +"type.cuisine.american" = "American"; -"type.cuisine.arab" = "Арапска"; +"type.cuisine.arab" = "Arab"; -"type.cuisine.argentinian" = "Аргентинска"; +"type.cuisine.argentinian" = "Argentinian"; -"type.cuisine.asian" = "Азијска"; +"type.cuisine.asian" = "Asian"; -"type.cuisine.austrian" = "Аустријска"; +"type.cuisine.austrian" = "Austrian"; -"type.cuisine.bagel" = "Багел"; +"type.cuisine.bagel" = "Bagel"; -"type.cuisine.balkan" = "Балканска"; +"type.cuisine.balkan" = "Balkan"; -"type.cuisine.barbecue" = "Роштиљ"; +"type.cuisine.barbecue" = "Barbecue"; -"type.cuisine.bavarian" = "Баварска"; +"type.cuisine.bavarian" = "Bavarian"; -"type.cuisine.beef_bowl" = "Говедина"; +"type.cuisine.beef_bowl" = "Beef Bowl"; -"type.cuisine.brazilian" = "Бразилска"; +"type.cuisine.brazilian" = "Brazilian"; -"type.cuisine.breakfast" = "Доручак"; +"type.cuisine.breakfast" = "Breakfast"; -"type.cuisine.bubble_tea" = "Боба теа"; +"type.cuisine.bubble_tea" = "Bubble Tea"; -"type.cuisine.burger" = "Хамбургер"; +"type.cuisine.burger" = "Burger"; -"type.cuisine.buschenschank" = "Таверна"; +"type.cuisine.buschenschank" = "Buschenschank"; -"type.cuisine.cake" = "Колачи"; +"type.cuisine.cake" = "Cake"; -"type.cuisine.caribbean" = "Карибска"; +"type.cuisine.caribbean" = "Caribbean"; -"type.cuisine.chicken" = "Пилетина"; +"type.cuisine.chicken" = "Chicken"; -"type.cuisine.chinese" = "Кинеска"; +"type.cuisine.chinese" = "Chinese"; -"type.cuisine.coffee_shop" = "Кафа"; +"type.cuisine.coffee_shop" = "Coffee"; -"type.cuisine.crepe" = "Палачинке"; +"type.cuisine.crepe" = "Crepe"; -"type.cuisine.croatian" = "Хрватска"; +"type.cuisine.croatian" = "Croatian"; -"type.cuisine.curry" = "Кари"; +"type.cuisine.curry" = "Curry"; -"type.cuisine.deli" = "Деликатеси"; +"type.cuisine.deli" = "Deli"; -"type.cuisine.diner" = "Ресторан"; +"type.cuisine.diner" = "Diner"; -"type.cuisine.donut" = "Крофне"; +"type.cuisine.donut" = "Donut"; -"type.cuisine.ethiopian" = "Етиопијска"; +"type.cuisine.ethiopian" = "Ethiopian"; -"type.cuisine.filipino" = "Филипинска"; +"type.cuisine.filipino" = "Filipino"; -"type.cuisine.fine_dining" = "Ексклузивни ресторан"; +"type.cuisine.fine_dining" = "Fine Dining"; -"type.cuisine.fish" = "Риба"; +"type.cuisine.fish" = "Fish"; -"type.cuisine.fish_and_chips" = "Риба и помфрит"; +"type.cuisine.fish_and_chips" = "Fish and Chips"; -"type.cuisine.french" = "Француска"; +"type.cuisine.french" = "French"; -"type.cuisine.friture" = "Пржена храна"; +"type.cuisine.friture" = "Friture"; -"type.cuisine.georgian" = "Грусијска"; +"type.cuisine.georgian" = "Georgian"; -"type.cuisine.german" = "Немачка"; +"type.cuisine.german" = "German"; -"type.cuisine.greek" = "Грчка"; +"type.cuisine.greek" = "Greek"; -"type.cuisine.grill" = "Грил"; +"type.cuisine.grill" = "Grill"; -"type.cuisine.heuriger" = "Винска таверна"; +"type.cuisine.heuriger" = "Heuriger"; "type.cuisine.hotdog" = "Hotdog"; -"type.cuisine.hungarian" = "Мађарска"; +"type.cuisine.hungarian" = "Hungarian"; -"type.cuisine.ice_cream" = "Сладолед"; +"type.cuisine.ice_cream" = "Ice Cream"; -"type.cuisine.indian" = "Индијска"; +"type.cuisine.indian" = "Indian"; -"type.cuisine.indonesian" = "Индонежанска"; +"type.cuisine.indonesian" = "Indonesian"; -"type.cuisine.international" = "Интернационална"; +"type.cuisine.international" = "International"; -"type.cuisine.irish" = "Ирска"; +"type.cuisine.irish" = "Irish"; -"type.cuisine.italian" = "Италијанска"; +"type.cuisine.italian" = "Italian"; -"type.cuisine.italian_pizza" = "Пица"; +"type.cuisine.italian_pizza" = "Italian, Pizza"; -"type.cuisine.japanese" = "Јапанска"; +"type.cuisine.japanese" = "Japanese"; -"type.cuisine.kebab" = "Кебаб"; +"type.cuisine.kebab" = "Kebab"; -"type.cuisine.korean" = "Кореанска"; +"type.cuisine.korean" = "Korean"; -"type.cuisine.lao" = "Лаоска"; +"type.cuisine.lao" = "Lao"; -"type.cuisine.lebanese" = "Либанска"; +"type.cuisine.lebanese" = "Lebanese"; -"type.cuisine.local" = "Локална"; +"type.cuisine.local" = "Local"; -"type.cuisine.malagasy" = "Мадагасарска"; +"type.cuisine.malagasy" = "Malagasy"; -"type.cuisine.malaysian" = "Малезијска"; +"type.cuisine.malaysian" = "Malaysian"; -"type.cuisine.mediterranean" = "Медитеранска"; +"type.cuisine.mediterranean" = "Mediterranean"; -"type.cuisine.mexican" = "Мексичка"; +"type.cuisine.mexican" = "Mexican"; -"type.cuisine.moroccan" = "Мароканска"; +"type.cuisine.moroccan" = "Moroccan"; -"type.cuisine.noodles" = "Резанца"; +"type.cuisine.noodles" = "Noodles"; -"type.cuisine.oriental" = "Оријентална"; +"type.cuisine.oriental" = "East Asian"; -"type.cuisine.pancake" = "Палачинкарница"; +"type.cuisine.pancake" = "Pancake"; -"type.cuisine.pasta" = "Паста"; +"type.cuisine.pasta" = "Pasta"; -"type.cuisine.persian" = "Персијска"; +"type.cuisine.persian" = "Persian"; -"type.cuisine.peruvian" = "Перуанска"; +"type.cuisine.peruvian" = "Peruvian"; -"type.cuisine.pizza" = "Пица"; +"type.cuisine.pizza" = "Pizza"; -"type.cuisine.polish" = "Пољска"; +"type.cuisine.polish" = "Polish"; -"type.cuisine.portuguese" = "Португалска"; +"type.cuisine.portuguese" = "Portuguese"; -"type.cuisine.ramen" = "Рамен (јапанска супа са резанцима)"; +"type.cuisine.ramen" = "Ramen"; -"type.cuisine.regional" = "Регионална"; +"type.cuisine.regional" = "Regional"; -"type.cuisine.russian" = "Руска"; +"type.cuisine.russian" = "Russian"; -"type.cuisine.sandwich" = "Сендвич"; +"type.cuisine.sandwich" = "Sandwich"; -"type.cuisine.sausage" = "Кобасица"; +"type.cuisine.sausage" = "Sausage"; -"type.cuisine.savory_pancakes" = "Слане палачинке"; +"type.cuisine.savory_pancakes" = "Savory Pancakes"; -"type.cuisine.seafood" = "Морски плодови"; +"type.cuisine.seafood" = "Seafood"; -"type.cuisine.soba" = "Соба"; +"type.cuisine.soba" = "Soba"; -"type.cuisine.spanish" = "Шпанска"; +"type.cuisine.spanish" = "Spanish"; -"type.cuisine.steak_house" = "Стек"; +"type.cuisine.steak_house" = "Steak House"; -"type.cuisine.sushi" = "Суши"; +"type.cuisine.sushi" = "Sushi"; -"type.cuisine.tapas" = "Тапас"; +"type.cuisine.tapas" = "Tapas"; -"type.cuisine.tea" = "Чај"; +"type.cuisine.tea" = "Tea"; -"type.cuisine.thai" = "Тајландска"; +"type.cuisine.thai" = "Thai"; -"type.cuisine.turkish" = "Турска"; +"type.cuisine.turkish" = "Turkish"; -"type.cuisine.vegan" = "Веганска"; +"type.cuisine.vegan" = "Vegan"; -"type.cuisine.vegetarian" = "Вегетаријанска"; +"type.cuisine.vegetarian" = "Vegetarian"; -"type.cuisine.vietnamese" = "Вијетнамска"; +"type.cuisine.vietnamese" = "Vietnamese"; -"type.emergency" = "Хитна служба"; +"type.emergency" = "Emergency"; -"type.emergency.assembly_point" = "Сабирно место за хитне случајеве"; +"type.emergency.assembly_point" = "Emergency Assembly Point"; -"type.emergency.defibrillator" = "Дефибрилатор"; +"type.emergency.defibrillator" = "Defibrillator"; -"type.emergency.fire_hydrant" = "Пожарни хидрант"; +"type.emergency.fire_hydrant" = "Fire Hydrant"; -"type.emergency.phone" = "Ургентни телефон"; +"type.emergency.phone" = "Emergency Phone"; /* This is for secondary entrances, for main entrances see type.entrance.main */ -"type.entrance" = "Улаз"; +"type.entrance" = "Entrance"; /* This is for main/primary entrances, for secondary entrances see type.entrance */ -"type.entrance.main" = "Главни улаз"; +"type.entrance.main" = "Main Entrance"; -"type.entrance.exit" = "Излаз"; +"type.entrance.exit" = "Exit"; "type.fee.yes" = "$"; -"type.fee.no" = "Бесплатно"; +"type.fee.no" = "Free"; -"type.healthcare.laboratory" = "Медисинска лабораторија"; +"type.healthcare.laboratory" = "Medical Laboratory"; -"type.healthcare.physiotherapist" = "Физиотерапеут"; +"type.healthcare.physiotherapist" = "Physiotherapist"; -"type.healthcare.alternative" = "Алтернативна медицина"; +"type.healthcare.alternative" = "Alternative Medicine"; -"type.healthcare.audiologist" = "Аудиологија"; +"type.healthcare.audiologist" = "Audiologist"; -"type.healthcare.blood_donation" = "Завод за трансфузију крви"; +"type.healthcare.blood_donation" = "Blood Donation Center"; -"type.healthcare.optometrist" = "Оптометрија"; +"type.healthcare.optometrist" = "Optometrist"; -"type.healthcare.podiatrist" = "Педијатрија"; +"type.healthcare.podiatrist" = "Podiatrist"; -"type.healthcare.psychotherapist" = "Психотерапеут"; +"type.healthcare.psychotherapist" = "Psychotherapist"; -"type.healthcare.sample_collection" = "Прикупљање анализа"; +"type.healthcare.sample_collection" = "Sample Collection Centre"; -"type.healthcare.speech_therapist" = "Логопед"; +"type.healthcare.speech_therapist" = "Logopedics"; /********** Types: Roads **********/ -"type.highway" = "Аутопут"; +"type.highway" = "Highway"; -"type.highway.bridleway" = "Коњска стаза"; +"type.highway.bridleway" = "Bridle Path"; /* These translations are used for all type.highway.*.bridge. */ -"type.highway.bridleway.bridge" = "Мост"; +"type.highway.bridleway.bridge" = "Bridge"; -"type.highway.bridleway.permissive" = "Коњска стаза"; +"type.highway.bridleway.permissive" = "Bridle Path"; /* These translations are used for all type.highway.*.tunnel. */ -"type.highway.bridleway.tunnel" = "Тунел"; +"type.highway.bridleway.tunnel" = "Tunnel"; -"type.highway.busway" = "Наменски аутобуски пут"; +"type.highway.busway" = "Dedicated Bus Road"; /* These translations are used for all type.highway.*.bridge. */ -"type.highway.busway.bridge" = "Мост"; +"type.highway.busway.bridge" = "Bridge"; /* These translations are used for all type.highway.*.tunnel. */ -"type.highway.busway.tunnel" = "Тунел"; +"type.highway.busway.tunnel" = "Tunnel"; -"type.highway.bus_stop" = "Аутобуска станица"; +"type.highway.bus_stop" = "Bus Stop"; -"type.highway.construction" = "Пут у изградњи"; +"type.highway.construction" = "Road Under Construction"; -"type.highway.cycleway" = "Бициклистичка стаза"; +"type.highway.cycleway" = "Cycle Path"; /* These translations are used for all type.highway.*.bridge. */ -"type.highway.cycleway.bridge" = "Мост"; +"type.highway.cycleway.bridge" = "Bridge"; -"type.highway.cycleway.permissive" = "Бициклистичка стаза"; +"type.highway.cycleway.permissive" = "Cycle Path"; /* These translations are used for all type.highway.*.tunnel. */ -"type.highway.cycleway.tunnel" = "Тунел"; +"type.highway.cycleway.tunnel" = "Tunnel"; -"type.highway.elevator" = "Лифт"; +"type.highway.elevator" = "Elevator"; -"type.highway.footway" = "Пешачка стаза"; +"type.highway.footway" = "Foot Path"; -"type.highway.footway.sidewalk" = "Тротоар"; +"type.highway.footway.sidewalk" = "Sidewalk"; -"type.highway.footway.crossing" = "Пешачки прелаз"; +"type.highway.footway.crossing" = "Pedestrian Crossing"; -"type.highway.footway.area" = "Пешачка зона"; +"type.highway.footway.area" = "Foot Path"; /* These translations are used for all type.highway.*.bridge. */ -"type.highway.footway.bridge" = "Пасарела"; +"type.highway.footway.bridge" = "Pedestrian Bridge"; /* These translations are used for all type.highway.*.tunnel. */ -"type.highway.footway.tunnel" = "Пешачки тунел"; +"type.highway.footway.tunnel" = "Pedestrian Tunnel"; -"type.highway.ford" = "Брод"; +"type.highway.ford" = "Ford"; -"type.highway.living_street" = "Улица у стамбеној зони"; +"type.highway.living_street" = "Living Street"; /* These translations are used for all type.highway.*.bridge. */ -"type.highway.living_street.bridge" = "Мост"; +"type.highway.living_street.bridge" = "Bridge"; /* These translations are used for all type.highway.*.tunnel. */ -"type.highway.living_street.tunnel" = "Тунел"; +"type.highway.living_street.tunnel" = "Tunnel"; -"type.highway.motorway" = "Мото пут"; +"type.highway.motorway" = "Motorway"; /* These translations are used for all type.highway.*.bridge. */ -"type.highway.motorway.bridge" = "Мото пут мост"; +"type.highway.motorway.bridge" = "Motorway Bridge"; /* These translations are used for all type.highway.*.tunnel. */ -"type.highway.motorway.tunnel" = "Мото пут тунел"; +"type.highway.motorway.tunnel" = "Motorway Tunnel"; -"type.highway.motorway_junction" = "Излаз са аутопута"; +"type.highway.motorway_junction" = "Road Exit"; -"type.highway.motorway_link" = "Излаз с мото пута"; +"type.highway.motorway_link" = "Motorway"; /* These translations are used for all type.highway.*.bridge. */ -"type.highway.motorway_link.bridge" = "Мост"; +"type.highway.motorway_link.bridge" = "Bridge"; /* These translations are used for all type.highway.*.tunnel. */ -"type.highway.motorway_link.tunnel" = "Тунел"; +"type.highway.motorway_link.tunnel" = "Tunnel"; -"type.highway.path" = "Пут"; +"type.highway.path" = "Path"; /* Hiking trail tagged as sac_scale=demanding_mountain_hiking (3 of 6) or trail_visibility=bad. */ -"type.highway.path.difficult" = "Тешка или слабо видљива стаза"; +"type.highway.path.difficult" = "Path"; /* Hiking trail tagged as sac_scale=alpine_hiking (4+ of 6) or trail_visibility=horrible or more extreme. */ -"type.highway.path.expert" = "Веома тежак или нејасна стаза"; +"type.highway.path.expert" = "Path"; -"type.highway.path.bicycle" = "Пут за бициклисте и пешаке"; +"type.highway.path.bicycle" = "Path"; -"type.highway.footway.bicycle" = "Пут за бициклисте и пешаке"; +"type.highway.footway.bicycle" = "Path"; /* These translations are used for all type.highway.*.bridge. */ -"type.highway.path.bridge" = "Мост"; +"type.highway.path.bridge" = "Bridge"; -"type.highway.path.horse" = "Коњска стаза"; +"type.highway.path.horse" = "Path"; /* These translations are used for all type.highway.*.tunnel. */ -"type.highway.path.tunnel" = "Тунел"; +"type.highway.path.tunnel" = "Tunnel"; -"type.highway.pedestrian" = "Пешачка улица"; +"type.highway.pedestrian" = "Pedestrian Street"; -"type.highway.pedestrian.area" = "Пешачка зона"; +"type.highway.pedestrian.area" = "Pedestrian Street"; /* These translations are used for all type.highway.*.bridge. */ -"type.highway.pedestrian.bridge" = "Пешачки мост"; +"type.highway.pedestrian.bridge" = "Pedestrian Bridge"; /* These translations are used for all type.highway.*.tunnel. */ -"type.highway.pedestrian.tunnel" = "Пешачки тунел"; +"type.highway.pedestrian.tunnel" = "Pedestrian Tunnel"; -"type.highway.primary" = "Пут прве класе"; +"type.highway.primary" = "Primary Road"; /* These translations are used for all type.highway.*.bridge. */ -"type.highway.primary.bridge" = "Мост"; +"type.highway.primary.bridge" = "Bridge"; /* These translations are used for all type.highway.*.tunnel. */ -"type.highway.primary.tunnel" = "Тунел"; +"type.highway.primary.tunnel" = "Tunnel"; -"type.highway.primary_link" = "Пристипни пут"; +"type.highway.primary_link" = "Primary Road"; /* These translations are used for all type.highway.*.bridge. */ -"type.highway.primary_link.bridge" = "Мост"; +"type.highway.primary_link.bridge" = "Bridge"; /* These translations are used for all type.highway.*.tunnel. */ -"type.highway.primary_link.tunnel" = "Тунел"; +"type.highway.primary_link.tunnel" = "Tunnel"; -"type.highway.raceway" = "Тркачка стаза"; +"type.highway.raceway" = "Racetrack"; -"type.highway.residential" = "Стамбена улица"; +"type.highway.residential" = "Residential Street"; -"type.highway.residential.area" = "Стамбена улица"; +"type.highway.residential.area" = "Residential Street"; /* These translations are used for all type.highway.*.bridge. */ -"type.highway.residential.bridge" = "Мост"; +"type.highway.residential.bridge" = "Bridge"; /* These translations are used for all type.highway.*.tunnel. */ -"type.highway.residential.tunnel" = "Тунел"; +"type.highway.residential.tunnel" = "Tunnel"; -"type.highway.rest_area" = "Одмориште"; +"type.highway.rest_area" = "Rest Area"; -"type.highway.road" = "Пут"; +"type.highway.road" = "Road"; /* These translations are used for all type.highway.*.bridge. */ -"type.highway.road.bridge" = "Мост"; +"type.highway.road.bridge" = "Bridge"; /* A bridge structure outline. */ -"type.man_made.bridge" = "Мост"; +"type.man_made.bridge" = "Bridge"; /* These translations are used for all type.highway.*.tunnel. */ -"type.highway.road.tunnel" = "Тунел"; +"type.highway.road.tunnel" = "Tunnel"; -"type.highway.secondary" = "Пут друге класе"; +"type.highway.secondary" = "Secondary Road"; /* These translations are used for all type.highway.*.bridge. */ -"type.highway.secondary.bridge" = "Мост"; +"type.highway.secondary.bridge" = "Bridge"; /* These translations are used for all type.highway.*.tunnel. */ -"type.highway.secondary.tunnel" = "Тунел"; +"type.highway.secondary.tunnel" = "Tunnel"; -"type.highway.secondary_link" = "Излаз са пута"; +"type.highway.secondary_link" = "Secondary Road"; /* These translations are used for all type.highway.*.bridge. */ -"type.highway.secondary_link.bridge" = "Мост"; +"type.highway.secondary_link.bridge" = "Bridge"; /* These translations are used for all type.highway.*.tunnel. */ -"type.highway.secondary_link.tunnel" = "Тунел"; +"type.highway.secondary_link.tunnel" = "Tunnel"; -"type.highway.service" = "Сервисни пут"; +"type.highway.service" = "Service Road"; -"type.highway.service.area" = "Сервисни пут"; +"type.highway.service.area" = "Service Road"; /* These translations are used for all type.highway.*.bridge. */ -"type.highway.service.bridge" = "Мост"; +"type.highway.service.bridge" = "Bridge"; -"type.highway.service.driveway" = "Прилаз"; +"type.highway.service.driveway" = "Service Road"; -"type.highway.service.parking_aisle" = "Пут на паркингу"; +"type.highway.service.parking_aisle" = "Service Road"; /* These translations are used for all type.highway.*.tunnel. */ -"type.highway.service.tunnel" = "Тунел"; +"type.highway.service.tunnel" = "Tunnel"; -"type.highway.services" = "Сервисна зона"; +"type.highway.services" = "Service Area"; -"type.highway.speed_camera" = "Прекршајна камера"; +"type.highway.speed_camera" = "Speed Camera"; -"type.highway.steps" = "Мердевине"; +"type.highway.steps" = "Stairs"; /* These translations are used for all type.highway.*.bridge. */ -"type.highway.steps.bridge" = "Мост"; +"type.highway.steps.bridge" = "Bridge"; /* These translations are used for all type.highway.*.tunnel. */ -"type.highway.steps.tunnel" = "Тунел"; +"type.highway.steps.tunnel" = "Tunnel"; -"type.highway.tertiary" = "Пут треће класе"; +"type.highway.tertiary" = "Tertiary Road"; /* These translations are used for all type.highway.*.bridge. */ -"type.highway.tertiary.bridge" = "Мост"; +"type.highway.tertiary.bridge" = "Bridge"; /* These translations are used for all type.highway.*.tunnel. */ -"type.highway.tertiary.tunnel" = "Тунел"; +"type.highway.tertiary.tunnel" = "Tunnel"; -"type.highway.tertiary_link" = "Пут треће класе"; +"type.highway.tertiary_link" = "Tertiary Road"; /* These translations are used for all type.highway.*.bridge. */ -"type.highway.tertiary_link.bridge" = "Мост"; +"type.highway.tertiary_link.bridge" = "Bridge"; /* These translations are used for all type.highway.*.tunnel. */ -"type.highway.tertiary_link.tunnel" = "Тунел"; +"type.highway.tertiary_link.tunnel" = "Tunnel"; -"type.highway.track" = "Макадам"; +"type.highway.track" = "Track"; -"type.highway.track.area" = "Макадам"; +"type.highway.track.area" = "Track"; /* These translations are used for all type.highway.*.bridge. */ -"type.highway.track.bridge" = "Мост"; +"type.highway.track.bridge" = "Bridge"; -"type.highway.track.grade1" = "Макадам"; +"type.highway.track.grade1" = "Track"; -"type.highway.track.no.access" = "Макадам"; +"type.highway.track.no.access" = "Track"; /* These translations are used for all type.highway.*.tunnel. */ -"type.highway.track.tunnel" = "Тунел"; +"type.highway.track.tunnel" = "Tunnel"; -"type.highway.traffic_signals" = "Семафор"; +"type.highway.traffic_signals" = "Traffic Lights"; -"type.highway.trunk" = "Улица"; +"type.highway.trunk" = "Trunk Road"; /* These translations are used for all type.highway.*.bridge. */ -"type.highway.trunk.bridge" = "Мост"; +"type.highway.trunk.bridge" = "Bridge"; /* These translations are used for all type.highway.*.tunnel. */ -"type.highway.trunk.tunnel" = "Тунел"; +"type.highway.trunk.tunnel" = "Tunnel"; -"type.highway.trunk_link" = "Улица"; +"type.highway.trunk_link" = "Trunk Road"; /* These translations are used for all type.highway.*.bridge. */ -"type.highway.trunk_link.bridge" = "Мост"; +"type.highway.trunk_link.bridge" = "Bridge"; /* These translations are used for all type.highway.*.tunnel. */ -"type.highway.trunk_link.tunnel" = "Тунел"; +"type.highway.trunk_link.tunnel" = "Tunnel"; -"type.highway.unclassified" = "Не класификовани пут"; +"type.highway.unclassified" = "Minor Road"; -"type.highway.unclassified.area" = "Не класификовани пут"; +"type.highway.unclassified.area" = "Minor Road"; /* These translations are used for all type.highway.*.bridge. */ -"type.highway.unclassified.bridge" = "Мост"; +"type.highway.unclassified.bridge" = "Bridge"; /* These translations are used for all type.highway.*.tunnel. */ -"type.highway.unclassified.tunnel" = "Тунел"; +"type.highway.unclassified.tunnel" = "Tunnel"; -"type.area_highway.cycleway" = "Бициклистичка стаза"; +"type.area_highway.cycleway" = "Cycle Path"; -"type.area_highway.footway" = "Пешачка стаза"; +"type.area_highway.footway" = "Foot Path"; -"type.area_highway.living_street" = "Улица у стамбеној зони"; +"type.area_highway.living_street" = "Living Street"; -"type.area_highway.motorway" = "Мото пут"; +"type.area_highway.motorway" = "Motorway"; -"type.area_highway.path" = "Пут"; +"type.area_highway.path" = "Path"; -"type.area_highway.pedestrian" = "Пешачка улица"; +"type.area_highway.pedestrian" = "Pedestrian Street"; -"type.area_highway.primary" = "Пут прве класе"; +"type.area_highway.primary" = "Primary Road"; -"type.area_highway.residential" = "Стамбена улица"; +"type.area_highway.residential" = "Residential Street"; -"type.area_highway.secondary" = "Пут друге класе"; +"type.area_highway.secondary" = "Secondary Road"; -"type.area_highway.service" = "Сервисни пут"; +"type.area_highway.service" = "Service Road"; -"type.area_highway.tertiary" = "Пут треће класе"; +"type.area_highway.tertiary" = "Tertiary Road"; -"type.area_highway.steps" = "Мердевине"; +"type.area_highway.steps" = "Stairs"; -"type.area_highway.track" = "Макадам"; +"type.area_highway.track" = "Track"; -"type.area_highway.trunk" = "Улица"; +"type.area_highway.trunk" = "Trunk Road"; -"type.area_highway.unclassified" = "Не класификовани пут"; +"type.area_highway.unclassified" = "Minor Road"; "type.highway.world_level" = "highway-world_level"; @@ -2421,87 +2421,87 @@ /********** Types: Historic **********/ -"type.historic" = "Историјски објект"; +"type.historic" = "Historic Object"; -"type.historic.aircraft" = "Историјски авион"; +"type.historic.aircraft" = "Historic Aircraft"; -"type.historic.anchor" = "Историјско сидро"; +"type.historic.anchor" = "Historic Anchor"; -"type.historic.archaeological_site" = "Археолошко налазиште"; +"type.historic.archaeological_site" = "Archaeological Site"; -"type.historic.battlefield" = "Историјско бојно поље"; +"type.historic.battlefield" = "Historic Battlefield"; -"type.historic.boundary_stone" = "Гранични камен"; +"type.historic.boundary_stone" = "Boundary Stone"; -"type.historic.cannon" = "Топ"; +"type.historic.cannon" = "Cannon"; -"type.historic.castle" = "Замак"; +"type.historic.castle" = "Castle"; -"type.historic.castle.castrum" = "Римска тврђава"; +"type.historic.castle.castrum" = "Roman Fort"; -"type.historic.castle.defensive" = "Замак"; +"type.historic.castle.defensive" = "Stronghold Castle"; -"type.historic.castle.fortified_church" = "Утврђена црква"; +"type.historic.castle.fortified_church" = "Fortified Church"; -"type.historic.castle.fortress" = "Тврђава"; +"type.historic.castle.fortress" = "Fortress"; -"type.historic.castle.hillfort" = "Тврђава"; +"type.historic.castle.hillfort" = "Hillfort"; -"type.historic.castle.kremlin" = "Кремљ"; +"type.historic.castle.kremlin" = "Kremlin"; -"type.historic.castle.manor" = "Каштел"; +"type.historic.castle.manor" = "Manor House"; -"type.historic.castle.palace" = "Палата"; +"type.historic.castle.palace" = "Palace"; -"type.historic.castle.shiro" = "Јапански каштел"; +"type.historic.castle.shiro" = "Japanese Castle"; -"type.historic.castle.stately" = "Замак"; +"type.historic.castle.stately" = "Stately Castle"; -"type.historic.city_gate" = "Градска капија"; +"type.historic.city_gate" = "City Gate"; -"type.historic.citywalls" = "Градски зид"; +"type.historic.citywalls" = "City Wall"; -"type.historic.fort" = "Хисар"; +"type.historic.fort" = "Fort"; -"type.historic.gallows" = "Вешала"; +"type.historic.gallows" = "Gallows"; -"type.historic.locomotive" = "Историјска локомотива"; +"type.historic.locomotive" = "Historic Locomotive"; -"type.historic.memorial" = "Мемориал"; +"type.historic.memorial" = "Memorial"; -"type.historic.memorial.cross" = "Спомен крст"; +"type.historic.memorial.cross" = "Memorial Cross"; -"type.historic.memorial.plaque" = "Спомен плоча"; +"type.historic.memorial.plaque" = "Commemorative Plaque"; -"type.historic.memorial.sculpture" = "Скулптура"; +"type.historic.memorial.sculpture" = "Sculpture"; -"type.historic.memorial.statue" = "Статуа"; +"type.historic.memorial.statue" = "Statue"; -"type.historic.memorial.stolperstein" = "Столперстеин"; +"type.historic.memorial.stolperstein" = "Stolperstein"; -"type.historic.stone" = "Историјски камен"; +"type.historic.stone" = "Historic Stone"; -"type.historic.memorial.war_memorial" = "Војни меморијал"; +"type.historic.memorial.war_memorial" = "War Memorial"; -"type.historic.mine" = "Историјски рудник"; +"type.historic.mine" = "Historic Mine"; -"type.historic.monument" = "Споменик"; +"type.historic.monument" = "Monument"; -"type.historic.pillory" = "Стуб срама"; +"type.historic.pillory" = "Pillory"; -"type.historic.ruins" = "Историјске рушевине"; +"type.historic.ruins" = "Historic Ruins"; -"type.historic.ship" = "Лађа"; +"type.historic.ship" = "Ship"; -"type.historic.tank" = "Историјски тенк"; +"type.historic.tank" = "Historic Tank"; -"type.historic.tomb" = "Гробница"; +"type.historic.tomb" = "Tomb"; -"type.historic.wayside_cross" = "Крст на путу"; +"type.historic.wayside_cross" = "Wayside Cross"; -"type.historic.wayside_shrine" = "Светилиште поред пута"; +"type.historic.wayside_shrine" = "Wayside Shrine"; -"type.historic.wreck" = "Историјски бродолом"; +"type.historic.wreck" = "Shipwreck"; "type.hwtag" = "hwtag"; @@ -2529,1551 +2529,1551 @@ "type.hwtag.yesfoot" = "hwtag-yesfoot"; -"type.internet_access" = "Интернет"; +"type.internet_access" = "Internet"; -"type.internet_access.wlan" = "Интернет"; +"type.internet_access.wlan" = "Internet"; -"type.junction" = "Раскрсница"; +"type.junction" = "Junction"; -"type.junction.circular" = "Кружни ток"; +"type.junction.circular" = "Roundabout"; -"type.junction.roundabout" = "Кружни ток"; +"type.junction.roundabout" = "Roundabout"; -"type.landuse" = "Пољопривредно земљиште"; +"type.landuse" = "Landuse"; -"type.landuse.allotments" = "Парцела"; +"type.landuse.allotments" = "Allotments"; -"type.landuse.basin" = "Резервоар"; +"type.landuse.basin" = "Basin"; -"type.landuse.brownfield" = "Грађевинско земљиште"; +"type.landuse.brownfield" = "Brownfield"; /* In most (European) countries, сemeteries are usually independent of places of worship (e.g. military cemeteries), while grave yards are usually the yard of a place of worship. */ -"type.landuse.cemetery" = "Гробље"; +"type.landuse.cemetery" = "Graveyard"; /* In most (European) countries, сemeteries are usually independent of places of worship (e.g. military cemeteries), while grave yards are usually the yard of a place of worship. */ -"type.landuse.cemetery.christian" = "Хришћанско гробље"; +"type.landuse.cemetery.christian" = "Graveyard"; -"type.landuse.churchyard" = "Црква двориште"; +"type.landuse.churchyard" = "Churchyard"; -"type.landuse.commercial" = "Кмерцијална област"; +"type.landuse.commercial" = "Commercial Area"; -"type.landuse.construction" = "Градилиште"; +"type.landuse.construction" = "Construction Area"; -"type.landuse.education" = "Образовне установе"; +"type.landuse.education" = "Educational Facility"; -"type.landuse.farmland" = "Пољопривредно земљиште"; +"type.landuse.farmland" = "Farmland"; -"type.landuse.farmyard" = "Пољопривредно земљиште"; +"type.landuse.farmyard" = "Farmyard"; -"type.landuse.field" = "Поље"; +"type.landuse.field" = "Field"; -"type.landuse.flowerbed" = "Цветно острво"; +"type.landuse.flowerbed" = "Flowerbed"; -"type.landuse.forest" = "Шума"; +"type.landuse.forest" = "Forest"; -"type.landuse.forest.coniferous" = "Четинарска шума"; +"type.landuse.forest.coniferous" = "Coniferous Forest"; -"type.landuse.forest.deciduous" = "Листопадна шума"; +"type.landuse.forest.deciduous" = "Deciduous Forest"; -"type.landuse.forest.mixed" = "Шума"; +"type.landuse.forest.mixed" = "Mixed-Leaf Forest"; -"type.landuse.garages" = "Гаража"; +"type.landuse.garages" = "Garages"; -"type.landuse.grass" = "Травњак"; +"type.landuse.grass" = "Grass"; -"type.landuse.greenfield" = "Грађевинско земљиште"; +"type.landuse.greenfield" = "Greenfield"; -"type.landuse.greenhouse_horticulture" = "Стакленици"; +"type.landuse.greenhouse_horticulture" = "Greenhouse"; -"type.landuse.industrial" = "Индустријска зона"; +"type.landuse.industrial" = "Industrial Area"; -"type.landuse.landfill" = "Депонија"; +"type.landuse.landfill" = "Landfill"; -"type.landuse.meadow" = "Ливада"; +"type.landuse.meadow" = "Meadow"; -"type.landuse.military" = "Војна област"; +"type.landuse.military" = "Military Area"; -"type.landuse.orchard" = "Воћњак"; +"type.landuse.orchard" = "Orchard"; -"type.landuse.quarry" = "Каменолом"; +"type.landuse.quarry" = "Quarry"; -"type.landuse.railway" = "Железничке просторије"; +"type.landuse.railway" = "Railway Premises"; -"type.landuse.recreation_ground" = "Простор за рекреацију"; +"type.landuse.recreation_ground" = "Recreation Ground"; -"type.landuse.reservoir" = "Вештачко језеро"; +"type.landuse.reservoir" = "Reservoir"; -"type.landuse.residential" = "Стамбена зона"; +"type.landuse.residential" = "Residential Area"; -"type.landuse.retail" = "Пословна зона"; +"type.landuse.retail" = "Retail Area"; -"type.landuse.salt_pond" = "Слано језеро"; +"type.landuse.salt_pond" = "Salt Pond"; -"type.landuse.village_green" = "Зеленило"; +"type.landuse.village_green" = "Land"; -"type.landuse.vineyard" = "Виноград"; +"type.landuse.vineyard" = "Vineyard"; -"type.leisure" = "Слободно време"; +"type.leisure" = "Leisure"; -"type.leisure.common" = "Јавно земљиште"; +"type.leisure.common" = "Public Land"; -"type.leisure.dog_park" = "Парк за псе"; +"type.leisure.dog_park" = "Dog Park"; -"type.leisure.fitness_centre" = "Фитнес центар"; +"type.leisure.fitness_centre" = "Fitness Centre"; -"type.leisure.fitness_station" = "Фитнес станица"; +"type.leisure.fitness_station" = "Fitness Station"; -"type.leisure.dance" = "Плесна дворана"; +"type.leisure.dance" = "Dance Hall"; -"type.leisure.garden" = "Башта"; +"type.leisure.garden" = "Garden"; -"type.leisure.garden.residential" = "Врт у дворишту"; +"type.leisure.garden.residential" = "Garden"; -"type.leisure.golf_course" = "Терен за голф"; +"type.leisure.golf_course" = "Golf Course"; -"type.leisure.miniature_golf" = "Мини голф"; +"type.leisure.miniature_golf" = "Minigolf"; "type.leisure.hackerspace" = "Hackerspace"; -"type.leisure.ice_rink" = "Клизалиште"; +"type.leisure.ice_rink" = "Ice Rink"; -"type.leisure.marina" = "Марина"; +"type.leisure.marina" = "Marina"; -"type.leisure.nature_reserve" = "Природни резерват"; +"type.leisure.nature_reserve" = "Nature Reserve"; -"type.leisure.outdoor_seating" = "Седење на отвореном"; +"type.leisure.outdoor_seating" = "Outdoor Seating"; -"type.leisure.park" = "Парк"; +"type.leisure.park" = "Park"; -"type.leisure.park.no.access" = "Парк"; +"type.leisure.park.no.access" = "Park"; -"type.leisure.park.permissive" = "Парк"; +"type.leisure.park.permissive" = "Park"; -"type.leisure.park.private" = "Парк"; +"type.leisure.park.private" = "Park"; -"type.leisure.picnic_table" = "Сто за пикник"; +"type.leisure.picnic_table" = "Picnic Table"; -"type.leisure.pitch" = "Спортски терен"; +"type.leisure.pitch" = "Sport Pitch"; -"type.leisure.playground" = "Игралиште"; +"type.leisure.playground" = "Playground"; "type.leisure.recreation_ground" = "Recreation Ground"; -"type.leisure.sauna" = "Сауна"; +"type.leisure.sauna" = "Sauna"; -"type.leisure.slipway" = "Навоз"; +"type.leisure.slipway" = "Slipway"; -"type.leisure.sports_centre" = "Спортски центар"; +"type.leisure.sports_centre" = "Sports Center"; -"type.sport.climbing" = "Зид за пењање"; +"type.sport.climbing" = "Climbing Centre"; -"type.sport.yoga" = "Јога студио"; +"type.sport.yoga" = "Yoga Studio"; -"type.leisure.stadium" = "Стадион"; +"type.leisure.stadium" = "Stadium"; -"type.leisure.swimming_pool" = "Базен"; +"type.leisure.swimming_pool" = "Swimming Pool"; -"type.leisure.swimming_pool.private" = "Приватни базен"; +"type.leisure.swimming_pool.private" = "Swimming Pool"; -"type.leisure.track" = "Тркачка стаза"; +"type.leisure.track" = "Track"; -"type.leisure.track.area" = "Тркачка стаза"; +"type.leisure.track.area" = "Track"; -"type.leisure.water_park" = "Водени парк"; +"type.leisure.water_park" = "Water Park"; -"type.leisure.beach_resort" = "Ресорт на плажи"; +"type.leisure.beach_resort" = "Beach Resort"; -"type.man_made" = "Грађевинске структуре"; +"type.man_made" = "Man Made"; -"type.man_made.breakwater" = "Лукобран"; +"type.man_made.breakwater" = "Breakwater"; "type.man_made.cairn" = "Cairn"; -"type.man_made.chimney" = "Димњак"; +"type.man_made.chimney" = "Chimney"; -"type.man_made.cutline" = "Шумски пут"; +"type.man_made.cutline" = "Cutline"; -"type.man_made.survey_point" = "Геодетска тачка"; +"type.man_made.survey_point" = "Survey Point"; -"type.man_made.flagpole" = "Јарбол са заставом"; +"type.man_made.flagpole" = "Flagpole"; -"type.man_made.lighthouse" = "Светионик"; +"type.man_made.lighthouse" = "Lighthouse"; -"type.man_made.mast" = "Јарбол"; +"type.man_made.mast" = "Mast"; -"type.man_made.pier" = "Док"; +"type.man_made.pier" = "Pier"; -"type.man_made.pipeline" = "Цевовод"; +"type.man_made.pipeline" = "Pipeline"; -"type.man_made.pipeline.overground" = "Подземни цевовод"; +"type.man_made.pipeline.overground" = "Overground Pipeline"; -"type.man_made.silo" = "Силос"; +"type.man_made.silo" = "Silo"; -"type.man_made.storage_tank" = "Резервоар"; +"type.man_made.storage_tank" = "Storage Tank"; -"type.man_made.surveillance" = "Сигурносна камера"; +"type.man_made.surveillance" = "Surveillance Camera"; -"type.man_made.tower" = "Торањ"; +"type.man_made.tower" = "Tower"; -"type.man_made.tower.communication" = "Телекомуникациони торањ"; +"type.man_made.tower.communication" = "Communications Tower"; -"type.man_made.wastewater_plant" = "Пречишћивач отпадних вода"; +"type.man_made.wastewater_plant" = "Wastewater Treatment Plant"; -"type.man_made.water_tap" = "Javna чесма"; +"type.man_made.water_tap" = "Water Tap"; -"type.man_made.water_tap.drinking_water_no" = "Javna чесма"; +"type.man_made.water_tap.drinking_water_no" = "Water Tap"; -"type.man_made.water_tower" = "Водоторањ"; +"type.man_made.water_tower" = "Water Tower"; -"type.man_made.water_well" = "Бунар"; +"type.man_made.water_well" = "Water Well"; -"type.man_made.water_well.drinking_water_no" = "Бунар"; +"type.man_made.water_well.drinking_water_no" = "Water Well"; -"type.man_made.windmill" = "Ветрењача"; +"type.man_made.windmill" = "Windmill"; -"type.man_made.works" = "Фабрика"; +"type.man_made.works" = "Industrial Works"; "type.mapswithme" = "mapswithme"; "type.mapswithme.grid" = "mapswithme-grid"; -"type.military" = "Војска"; +"type.military" = "Military"; -"type.military.bunker" = "Бункер"; +"type.military.bunker" = "Bunker"; -"type.mountain_pass" = "Планински превој"; +"type.mountain_pass" = "Mountain Pass"; -"type.natural" = "Природа"; +"type.natural" = "Nature"; /* A rocky land cover. */ -"type.natural.bare_rock" = "Камењар"; +"type.natural.bare_rock" = "Bare Rock"; /* A land cover consisting of rounded rock fragments (pebbles) on a beach or riverbed. */ -"type.natural.shingle" = "Шљунак"; +"type.natural.shingle" = "Shingle"; /* A loose surface consisting of angular, sharp stones. Usually on a mountain slope and prone to landslides. */ -"type.natural.scree" = "Камени крш"; +"type.natural.scree" = "Scree"; -"type.natural.bay" = "Залив"; +"type.natural.bay" = "Bay"; -"type.natural.beach" = "Плажа"; +"type.natural.beach" = "Beach"; -"type.natural.beach.sand" = "Пешчана плажа"; +"type.natural.beach.sand" = "Sandy Beach"; -"type.natural.beach.gravel" = "Шљунковита плажа"; +"type.natural.beach.gravel" = "Gravel Beach"; -"type.natural.cape" = "Рт"; +"type.natural.cape" = "Cape"; -"type.natural.cave_entrance" = "Пећина"; +"type.natural.cave_entrance" = "Cave Entrance"; -"type.natural.cliff" = "Литица"; +"type.natural.cliff" = "Cliff"; -"type.natural.earth_bank" = "Насип"; +"type.natural.earth_bank" = "Earth Bank"; -"type.man_made.embankment" = "Насип"; +"type.man_made.embankment" = "Embankment"; -"type.natural.coastline" = "Обала"; +"type.natural.coastline" = "Coastline"; -"type.natural.desert" = "Пустиња"; +"type.natural.desert" = "Desert"; -"type.natural.geyser" = "Гејзир"; +"type.natural.geyser" = "Geyser"; -"type.natural.glacier" = "Глечер"; +"type.natural.glacier" = "Glacier"; -"type.natural.grassland" = "Пашњак"; +"type.natural.grassland" = "Grassland"; -"type.natural.heath" = "Пуста земља"; +"type.natural.heath" = "Heath"; -"type.natural.hot_spring" = "Термални извор"; +"type.natural.hot_spring" = "Hot Spring"; -"type.natural.water.lake" = "Језеро"; +"type.natural.water.lake" = "Lake"; -"type.natural.water.lock" = "Преводница"; +"type.natural.water.lock" = "Lock Chamber"; -"type.natural.water.pond" = "Језерце"; +"type.natural.water.pond" = "Pond"; -"type.natural.water.reservoir" = "Резервоар"; +"type.natural.water.reservoir" = "Reservoir"; -"type.natural.water.basin" = "Природни базен"; +"type.natural.water.basin" = "Basin"; -"type.natural.water.river" = "Река"; +"type.natural.water.river" = "River"; -"type.natural.land" = "Земљиште"; +"type.natural.land" = "Land"; -"type.natural.meadow" = "Ливада"; +"type.natural.meadow" = "Meadow"; -"type.natural.orchard" = "Воћњак"; +"type.natural.orchard" = "Orchard"; -"type.natural.peak" = "Гора"; +"type.natural.peak" = "Peak"; -"type.natural.saddle" = "Планинско седло"; +"type.natural.saddle" = "Mountain Saddle"; -"type.natural.rock" = "Камен"; +"type.natural.rock" = "Rock"; -"type.natural.scrub" = "Шикара"; +"type.natural.scrub" = "Scrub"; -"type.natural.spring" = "Извор"; +"type.natural.spring" = "Natural Spring"; -"type.natural.spring.drinking_water_no" = "Извор"; +"type.natural.spring.drinking_water_no" = "Natural Spring"; -"type.natural.strait" = "Теснац"; +"type.natural.strait" = "Strait"; -"type.natural.tree_row" = "Дрворед"; +"type.natural.tree_row" = "Tree Row"; -"type.natural.vineyard" = "Виноград"; +"type.natural.vineyard" = "Vineyard"; -"type.natural.volcano" = "Вулкан"; +"type.natural.volcano" = "Volcano"; -"type.natural.water" = "Вода"; +"type.natural.water" = "Water"; -"type.natural.wetland" = "Мочвара"; +"type.natural.wetland" = "Wetland"; -"type.natural.wetland.bog" = "Тресет"; +"type.natural.wetland.bog" = "Bog"; -"type.natural.wetland.marsh" = "Мочвара"; +"type.natural.wetland.marsh" = "Marsh"; -"type.noexit" = "Крај пута"; +"type.noexit" = "Dead End"; -"type.office" = "Канцеларија"; +"type.office" = "Office"; -"type.office.company" = "Компанија"; +"type.office.company" = "Company Office"; -"type.office.estate_agent" = "Агент за некретнине"; +"type.office.estate_agent" = "Estate Agent"; -"type.office.government" = "Владина канцеларија"; +"type.office.government" = "Government Office"; -"type.office.insurance" = "Осигурање"; +"type.office.insurance" = "Insurance Office"; -"type.office.lawyer" = "Адвокат"; +"type.office.lawyer" = "Lawyer"; -"type.office.ngo" = "НВО"; +"type.office.ngo" = "Non-Governmental Organization"; -"type.office.telecommunication" = "Мобилни оператер"; +"type.office.telecommunication" = "Telecom Company"; -"type.organic.only" = "Еко"; +"type.organic.only" = "Organic"; -"type.organic.yes" = "Еко"; +"type.organic.yes" = "Organic"; -"type.place.city" = "Град"; +"type.place.city" = "City"; -"type.place.city.capital" = "Главни град"; +"type.place.city.capital" = "Capital"; -"type.place.city.capital.10" = "Град"; +"type.place.city.capital.10" = "City"; -"type.place.city.capital.11" = "Град"; +"type.place.city.capital.11" = "City"; -"type.place.city.capital.2" = "Главни град"; +"type.place.city.capital.2" = "Capital"; -"type.place.city.capital.3" = "Град"; +"type.place.city.capital.3" = "City"; -"type.place.city.capital.4" = "Град"; +"type.place.city.capital.4" = "City"; -"type.place.city.capital.5" = "Град"; +"type.place.city.capital.5" = "City"; -"type.place.city.capital.6" = "Град"; +"type.place.city.capital.6" = "City"; -"type.place.city.capital.7" = "Град"; +"type.place.city.capital.7" = "City"; -"type.place.city.capital.8" = "Град"; +"type.place.city.capital.8" = "City"; -"type.place.city.capital.9" = "Град"; +"type.place.city.capital.9" = "City"; -"type.place.continent" = "Континент"; +"type.place.continent" = "Continent"; -"type.place.country" = "Држава"; +"type.place.country" = "Country"; -"type.place.county" = "Округ"; +"type.place.county" = "County"; -"type.place.farm" = "Фарма"; +"type.place.farm" = "Farm"; -"type.place.hamlet" = "Село"; +"type.place.hamlet" = "Hamlet"; -"type.place.island" = "Острво"; +"type.place.island" = "Island"; -"type.place.islet" = "Острвце"; +"type.place.islet" = "Islet"; -"type.place.isolated_dwelling" = "Изолована кућа"; +"type.place.isolated_dwelling" = "Isolated Dwelling"; -"type.place.locality" = "Локалитет"; +"type.place.locality" = "Locality"; -"type.place.neighbourhood" = "Насеље"; +"type.place.neighbourhood" = "Neighbourhood"; -"type.place.ocean" = "Океан"; +"type.place.ocean" = "Ocean"; -"type.place.region" = "Регион"; +"type.place.region" = "Region"; -"type.place.sea" = "Море"; +"type.place.sea" = "Sea"; -"type.place.square" = "Трг"; +"type.place.square" = "Square"; -"type.place.state" = "Држава"; +"type.place.state" = "State"; -"type.place.state.USA" = "Држава"; +"type.place.state.USA" = "State"; -"type.place.suburb" = "Кварт"; +"type.place.suburb" = "Suburb"; -"type.place.town" = "Град"; +"type.place.town" = "Town"; -"type.place.village" = "Село"; +"type.place.village" = "Village"; -"type.power" = "Енергетика"; +"type.power" = "Power"; -"type.power.generator" = "Генератор"; +"type.power.generator" = "Power Generator"; -"type.power.generator.solar" = "Соларни генератор"; +"type.power.generator.solar" = "Solar Generator"; -"type.power.generator.wind" = "Ветрогенератор"; +"type.power.generator.wind" = "Wind Generator"; -"type.power.generator.gas" = "Гаснотурбинска електрана"; +"type.power.generator.gas" = "Gas Turbine Power Plant"; -"type.power.generator.hydro" = "Хидроелектрана"; +"type.power.generator.hydro" = "Hydroelectric Power Plant"; -"type.power.line" = "Далековод"; +"type.power.line" = "Power Line"; -"type.power.line.underground" = "Подземни далековод"; +"type.power.line.underground" = "Underground Power Line"; "type.power.minor_line" = "Minor Power Line"; -"type.power.plant" = "Електрана"; +"type.power.plant" = "Power Plant"; -"type.power.plant.coal" = "Термоелектрана"; +"type.power.plant.coal" = "Coal Power Plant"; -"type.power.plant.gas" = "Гаснотурбинска електрана"; +"type.power.plant.gas" = "Gas Turbine Power Plant"; -"type.power.plant.hydro" = "Хидроелектрана"; +"type.power.plant.hydro" = "Hydroelectric Power Plant"; -"type.power.plant.solar" = "Соларна електрана"; +"type.power.plant.solar" = "Solar Power Plant"; -"type.power.plant.wind" = "Ветропарк"; +"type.power.plant.wind" = "Wind Power Plant"; -"type.power.station" = "Електрична станица"; +"type.power.station" = "Power Station"; -"type.power.substation" = "Подстаница"; +"type.power.substation" = "Substation"; -"type.power.tower" = "Далековод"; +"type.power.tower" = "Power Tower"; -"type.psurface" = "Површина"; +"type.psurface" = "psurface"; -"type.psurface.paved_bad" = "Лош асфалт"; +"type.psurface.paved_bad" = "psurface-paved_bad"; -"type.psurface.paved_good" = "Добар асфалт"; +"type.psurface.paved_good" = "psurface-paved_good"; -"type.psurface.unpaved_bad" = "Лош макадам"; +"type.psurface.unpaved_bad" = "psurface-unpaved_bad"; -"type.psurface.unpaved_good" = "Добар макадам"; +"type.psurface.unpaved_good" = "psurface-unpaved_good"; -"type.public_transport" = "Јавни превоз"; +"type.public_transport" = "Public Transport"; -"type.public_transport.platform" = "Стајалиште јавног превоза"; +"type.public_transport.platform" = "Platform"; -"type.railway" = "Железница"; +"type.railway" = "Railway"; -"type.railway.abandoned" = "Напуштена пруга"; +"type.railway.abandoned" = "Abandoned Railway"; -"type.railway.abandoned.bridge" = "Напуштен железнички мост"; +"type.railway.abandoned.bridge" = "Abandoned Railway Bridge"; -"type.railway.abandoned.tunnel" = "Напуштен железнички тунел"; +"type.railway.abandoned.tunnel" = "Abandoned Railway Tunnel"; -"type.railway.construction" = "Пруга у изградњи"; +"type.railway.construction" = "Railway Construction"; -"type.railway.crossing" = "Пружни прелаз"; +"type.railway.crossing" = "Railway Crossing"; -"type.railway.disused" = "Напуштена пруга"; +"type.railway.disused" = "Disused Railway"; -"type.railway.funicular" = "Успињача"; +"type.railway.funicular" = "Funicular"; "type.railway.funicular.bridge" = "Funicular Bridge"; "type.railway.funicular.tunnel" = "Funicular Tunnel"; -"type.railway.halt" = "Железничка станица"; +"type.railway.halt" = "Rail Halt"; -"type.railway.level_crossing" = "Пружни прелаз"; +"type.railway.level_crossing" = "Level Crossing"; -"type.railway.light_rail" = "Железнички семафор"; +"type.railway.light_rail" = "Light Rail"; -"type.railway.light_rail.bridge" = "Лака железница"; +"type.railway.light_rail.bridge" = "Light Rail Bridge"; "type.railway.light_rail.tunnel" = "Light Rail Tunnel"; -"type.railway.monorail" = "Jednošinska pruga"; +"type.railway.monorail" = "Monorail"; -"type.railway.monorail.bridge" = "Jednošinskи мост"; +"type.railway.monorail.bridge" = "Monorail Bridge"; -"type.railway.monorail.tunnel" = "Jednošinskи тунел"; +"type.railway.monorail.tunnel" = "Monorail Tunnel"; -"type.railway.narrow_gauge" = "Пруга уског колосека"; +"type.railway.narrow_gauge" = "Narrow Gauge Rail"; "type.railway.narrow_gauge.bridge" = "Narrow Gauge Rail Bridge"; "type.railway.narrow_gauge.tunnel" = "Narrow Gauge Rail Tunnel"; -"type.railway.platform" = "Железнички перон"; +"type.railway.platform" = "Railway Platform"; -"type.railway.preserved" = "Туристичка пруга"; +"type.railway.preserved" = "Preserved Rail"; "type.railway.preserved.bridge" = "Preserved Rail Bridge"; "type.railway.preserved.tunnel" = "Preserved Rail Tunnel"; -"type.railway.rail" = "Пруга"; +"type.railway.rail" = "Railway"; -"type.railway.rail.highspeed" = "Пруга велике брзине"; +"type.railway.rail.highspeed" = "High-Speed Railway"; -"type.railway.rail.tourism" = "Туристичка железница"; +"type.railway.rail.tourism" = "Touristic Railway"; -"type.railway.rail.main" = "Железница"; +"type.railway.rail.main" = "Railway"; /* Includes ordinary railway=rail w/o more specific usage= and service= tags. */ -"type.railway.rail.branch" = "Секундарна железница"; +"type.railway.rail.branch" = "Railway Branch"; /* Non-passenger utility tracks: industrial, military, test. */ -"type.railway.rail.utility" = "Индустријска пруга"; +"type.railway.rail.utility" = "Utility Railway"; -"type.railway.rail.spur" = "Железнички чвор"; +"type.railway.rail.spur" = "Railway Spur"; /* Short service tracks: siding, yard, crossover. */ -"type.railway.rail.service" = "Помоћна железничка пруга"; +"type.railway.rail.service" = "Service Rail Track"; -"type.railway.rail.bridge" = "Железнички мост"; +"type.railway.rail.bridge" = "Railway Bridge"; -"type.railway.rail.highspeed.bridge" = "Железнички мост"; +"type.railway.rail.highspeed.bridge" = "Railway Bridge"; -"type.railway.rail.tourism.bridge" = "Железнички мост"; +"type.railway.rail.tourism.bridge" = "Railway Bridge"; -"type.railway.rail.main.bridge" = "Железнички мост"; +"type.railway.rail.main.bridge" = "Railway Bridge"; -"type.railway.rail.branch.bridge" = "Железнички мост"; +"type.railway.rail.branch.bridge" = "Railway Bridge"; -"type.railway.rail.utility.bridge" = "Железнички мост"; +"type.railway.rail.utility.bridge" = "Railway Bridge"; -"type.railway.rail.spur.bridge" = "Железнички мост"; +"type.railway.rail.spur.bridge" = "Railway Bridge"; -"type.railway.rail.service.bridge" = "Железнички мост"; +"type.railway.rail.service.bridge" = "Railway Bridge"; -"type.railway.rail.tunnel" = "Железнички тунел"; +"type.railway.rail.tunnel" = "Railway Tunnel"; -"type.railway.rail.highspeed.tunnel" = "Железнички тунел"; +"type.railway.rail.highspeed.tunnel" = "Railway Tunnel"; -"type.railway.rail.tourism.tunnel" = "Железнички тунел"; +"type.railway.rail.tourism.tunnel" = "Railway Tunnel"; -"type.railway.rail.main.tunnel" = "Железнички тунел"; +"type.railway.rail.main.tunnel" = "Railway Tunnel"; -"type.railway.rail.branch.tunnel" = "Железнички тунел"; +"type.railway.rail.branch.tunnel" = "Railway Tunnel"; -"type.railway.rail.utility.tunnel" = "Железнички тунел"; +"type.railway.rail.utility.tunnel" = "Railway Tunnel"; -"type.railway.rail.spur.tunnel" = "Железнички тунел"; +"type.railway.rail.spur.tunnel" = "Railway Tunnel"; -"type.railway.rail.service.tunnel" = "Железнички тунел"; +"type.railway.rail.service.tunnel" = "Railway Tunnel"; -"type.railway.station" = "Железничка станица"; +"type.railway.station" = "Train Station"; -"type.railway.station.funicular" = "Успињача"; +"type.railway.station.funicular" = "Funicular"; -"type.railway.station.light_rail" = "Железничка станица"; +"type.railway.station.light_rail" = "Train Station"; -"type.railway.station.light_rail.berlin" = "Железничка станица"; +"type.railway.station.light_rail.berlin" = "Train Station"; -"type.railway.station.light_rail.london" = "Железничка станица"; +"type.railway.station.light_rail.london" = "Train Station"; -"type.railway.station.light_rail.porto" = "Железничка станица"; +"type.railway.station.light_rail.porto" = "Train Station"; -"type.railway.station.monorail" = "Железничка станица"; +"type.railway.station.monorail" = "Train Station"; -"type.railway.station.subway" = "Метро станица"; +"type.railway.station.subway" = "Subway Station"; -"type.railway.station.subway.adana" = "Метро станица"; +"type.railway.station.subway.adana" = "Subway Station"; -"type.railway.station.subway.algiers" = "Метро станица"; +"type.railway.station.subway.algiers" = "Subway Station"; -"type.railway.station.subway.almaty" = "Метро станица"; +"type.railway.station.subway.almaty" = "Subway Station"; -"type.railway.station.subway.amsterdam" = "Метро станица"; +"type.railway.station.subway.amsterdam" = "Subway Station"; -"type.railway.station.subway.ankara" = "Метро станица"; +"type.railway.station.subway.ankara" = "Subway Station"; -"type.railway.station.subway.athens" = "Метро станица"; +"type.railway.station.subway.athens" = "Subway Station"; -"type.railway.station.subway.baku" = "Метро станица"; +"type.railway.station.subway.baku" = "Subway Station"; -"type.railway.station.subway.bangkok" = "Метро станица"; +"type.railway.station.subway.bangkok" = "Subway Station"; -"type.railway.station.subway.barcelona" = "Метро станица"; +"type.railway.station.subway.barcelona" = "Subway Station"; -"type.railway.station.subway.beijing" = "Метро станица"; +"type.railway.station.subway.beijing" = "Subway Station"; -"type.railway.station.subway.bengalore" = "Метро станица"; +"type.railway.station.subway.bengalore" = "Subway Station"; -"type.railway.station.subway.berlin" = "Метро станица"; +"type.railway.station.subway.berlin" = "Subway Station"; -"type.railway.station.subway.bilbao" = "Метро станица"; +"type.railway.station.subway.bilbao" = "Subway Station"; -"type.railway.station.subway.brasilia" = "Метро станица"; +"type.railway.station.subway.brasilia" = "Subway Station"; -"type.railway.station.subway.brescia" = "Метро станица"; +"type.railway.station.subway.brescia" = "Subway Station"; -"type.railway.station.subway.brussels" = "Метро станица"; +"type.railway.station.subway.brussels" = "Subway Station"; -"type.railway.station.subway.bucharest" = "Метро станица"; +"type.railway.station.subway.bucharest" = "Subway Station"; -"type.railway.station.subway.budapest" = "Метро станица"; +"type.railway.station.subway.budapest" = "Subway Station"; -"type.railway.station.subway.buenos_aires" = "Метро станица"; +"type.railway.station.subway.buenos_aires" = "Subway Station"; -"type.railway.station.subway.bursa" = "Метро станица"; +"type.railway.station.subway.bursa" = "Subway Station"; -"type.railway.station.subway.cairo" = "Метро станица"; +"type.railway.station.subway.cairo" = "Subway Station"; -"type.railway.station.subway.caracas" = "Метро станица"; +"type.railway.station.subway.caracas" = "Subway Station"; -"type.railway.station.subway.catania" = "Метро станица"; +"type.railway.station.subway.catania" = "Subway Station"; -"type.railway.station.subway.changchun" = "Метро станица"; +"type.railway.station.subway.changchun" = "Subway Station"; -"type.railway.station.subway.chengdu" = "Метро станица"; +"type.railway.station.subway.chengdu" = "Subway Station"; -"type.railway.station.subway.chicago" = "Метро станица"; +"type.railway.station.subway.chicago" = "Subway Station"; -"type.railway.station.subway.chongqing" = "Метро станица"; +"type.railway.station.subway.chongqing" = "Subway Station"; -"type.railway.station.subway.dalian" = "Метро станица"; +"type.railway.station.subway.dalian" = "Subway Station"; -"type.railway.station.subway.delhi" = "Метро станица"; +"type.railway.station.subway.delhi" = "Subway Station"; -"type.railway.station.subway.dnepro" = "Метро станица"; +"type.railway.station.subway.dnepro" = "Subway Station"; -"type.railway.station.subway.dubai" = "Метро станица"; +"type.railway.station.subway.dubai" = "Subway Station"; -"type.railway.station.subway.ekb" = "Метро станица"; +"type.railway.station.subway.ekb" = "Subway Station"; -"type.railway.station.subway.fukuoka" = "Метро станица"; +"type.railway.station.subway.fukuoka" = "Subway Station"; -"type.railway.station.subway.glasgow" = "Метро станица"; +"type.railway.station.subway.glasgow" = "Subway Station"; -"type.railway.station.subway.guangzhou" = "Метро станица"; +"type.railway.station.subway.guangzhou" = "Subway Station"; -"type.railway.station.subway.hamburg" = "Метро станица"; +"type.railway.station.subway.hamburg" = "Subway Station"; -"type.railway.station.subway.helsinki" = "Метро станица"; +"type.railway.station.subway.helsinki" = "Subway Station"; -"type.railway.station.subway.hiroshima" = "Метро станица"; +"type.railway.station.subway.hiroshima" = "Subway Station"; -"type.railway.station.subway.hongkong" = "Метро станица"; +"type.railway.station.subway.hongkong" = "Subway Station"; -"type.railway.station.subway.isfahan" = "Метро станица"; +"type.railway.station.subway.isfahan" = "Subway Station"; -"type.railway.station.subway.istanbul" = "Метро станица"; +"type.railway.station.subway.istanbul" = "Subway Station"; -"type.railway.station.subway.izmir" = "Метро станица"; +"type.railway.station.subway.izmir" = "Subway Station"; -"type.railway.station.subway.kazan" = "Метро станица"; +"type.railway.station.subway.kazan" = "Subway Station"; -"type.railway.station.subway.kharkiv" = "Метро станица"; +"type.railway.station.subway.kharkiv" = "Subway Station"; -"type.railway.station.subway.kiev" = "Метро станица"; +"type.railway.station.subway.kiev" = "Subway Station"; -"type.railway.station.subway.kobe" = "Метро станица"; +"type.railway.station.subway.kobe" = "Subway Station"; -"type.railway.station.subway.kolkata" = "Метро станица"; +"type.railway.station.subway.kolkata" = "Subway Station"; -"type.railway.station.subway.kunming" = "Метро станица"; +"type.railway.station.subway.kunming" = "Subway Station"; -"type.railway.station.subway.kyoto" = "Метро станица"; +"type.railway.station.subway.kyoto" = "Subway Station"; -"type.railway.station.subway.la" = "Метро станица"; +"type.railway.station.subway.la" = "Subway Station"; -"type.railway.station.subway.lausanne" = "Метро станица"; +"type.railway.station.subway.lausanne" = "Subway Station"; -"type.railway.station.subway.lille" = "Метро станица"; +"type.railway.station.subway.lille" = "Subway Station"; -"type.railway.station.subway.lima" = "Метро станица"; +"type.railway.station.subway.lima" = "Subway Station"; -"type.railway.station.subway.lisboa" = "Метро станица"; +"type.railway.station.subway.lisboa" = "Subway Station"; -"type.railway.station.subway.london" = "Метро станица"; +"type.railway.station.subway.london" = "Subway Station"; -"type.railway.station.subway.lyon" = "Метро станица"; +"type.railway.station.subway.lyon" = "Subway Station"; -"type.railway.station.subway.madrid" = "Метро станица"; +"type.railway.station.subway.madrid" = "Subway Station"; -"type.railway.station.subway.malaga" = "Метро станица"; +"type.railway.station.subway.malaga" = "Subway Station"; -"type.railway.station.subway.manila" = "Метро станица"; +"type.railway.station.subway.manila" = "Subway Station"; -"type.railway.station.subway.maracaibo" = "Метро станица"; +"type.railway.station.subway.maracaibo" = "Subway Station"; -"type.railway.station.subway.mashhad" = "Метро станица"; +"type.railway.station.subway.mashhad" = "Subway Station"; -"type.railway.station.subway.mecca" = "Метро станица"; +"type.railway.station.subway.mecca" = "Subway Station"; -"type.railway.station.subway.medellin" = "Метро станица"; +"type.railway.station.subway.medellin" = "Subway Station"; -"type.railway.station.subway.mexico" = "Метро станица"; +"type.railway.station.subway.mexico" = "Subway Station"; -"type.railway.station.subway.milan" = "Метро станица"; +"type.railway.station.subway.milan" = "Subway Station"; -"type.railway.station.subway.minsk" = "Метро станица"; +"type.railway.station.subway.minsk" = "Subway Station"; -"type.railway.station.subway.montreal" = "Метро станица"; +"type.railway.station.subway.montreal" = "Subway Station"; -"type.railway.station.subway.moscow" = "Метро станица"; +"type.railway.station.subway.moscow" = "Subway Station"; -"type.railway.station.subway.munchen" = "Метро станица"; +"type.railway.station.subway.munchen" = "Subway Station"; -"type.railway.station.subway.nagoya" = "Метро станица"; +"type.railway.station.subway.nagoya" = "Subway Station"; -"type.railway.station.subway.newyork" = "Метро станица"; +"type.railway.station.subway.newyork" = "Subway Station"; -"type.railway.station.subway.nnov" = "Метро станица"; +"type.railway.station.subway.nnov" = "Subway Station"; -"type.railway.station.subway.novosibirsk" = "Метро станица"; +"type.railway.station.subway.novosibirsk" = "Subway Station"; -"type.railway.station.subway.osaka" = "Метро станица"; +"type.railway.station.subway.osaka" = "Subway Station"; -"type.railway.station.subway.oslo" = "Метро станица"; +"type.railway.station.subway.oslo" = "Subway Station"; -"type.railway.station.subway.palma" = "Метро станица"; +"type.railway.station.subway.palma" = "Subway Station"; -"type.railway.station.subway.panama" = "Метро станица"; +"type.railway.station.subway.panama" = "Subway Station"; -"type.railway.station.subway.paris" = "Метро станица"; +"type.railway.station.subway.paris" = "Subway Station"; -"type.railway.station.subway.philadelphia" = "Метро станица"; +"type.railway.station.subway.philadelphia" = "Subway Station"; -"type.railway.station.subway.pyongyang" = "Метро станица"; +"type.railway.station.subway.pyongyang" = "Subway Station"; -"type.railway.station.subway.rennes" = "Метро станица"; +"type.railway.station.subway.rennes" = "Subway Station"; -"type.railway.station.subway.rio" = "Метро станица"; +"type.railway.station.subway.rio" = "Subway Station"; -"type.railway.station.subway.roma" = "Метро станица"; +"type.railway.station.subway.roma" = "Subway Station"; -"type.railway.station.subway.rotterdam" = "Метро станица"; +"type.railway.station.subway.rotterdam" = "Subway Station"; -"type.railway.station.subway.samara" = "Метро станица"; +"type.railway.station.subway.samara" = "Subway Station"; -"type.railway.station.subway.santiago" = "Метро станица"; +"type.railway.station.subway.santiago" = "Subway Station"; -"type.railway.station.subway.santo_domingo" = "Метро станица"; +"type.railway.station.subway.santo_domingo" = "Subway Station"; -"type.railway.station.subway.saopaulo" = "Метро станица"; +"type.railway.station.subway.saopaulo" = "Subway Station"; -"type.railway.station.subway.sapporo" = "Метро станица"; +"type.railway.station.subway.sapporo" = "Subway Station"; -"type.railway.station.subway.sendai" = "Метро станица"; +"type.railway.station.subway.sendai" = "Subway Station"; -"type.railway.station.subway.sf" = "Метро станица"; +"type.railway.station.subway.sf" = "Subway Station"; -"type.railway.station.subway.shanghai" = "Метро станица"; +"type.railway.station.subway.shanghai" = "Subway Station"; -"type.railway.station.subway.shenzhen" = "Метро станица"; +"type.railway.station.subway.shenzhen" = "Subway Station"; -"type.railway.station.subway.shiraz" = "Метро станица"; +"type.railway.station.subway.shiraz" = "Subway Station"; -"type.railway.station.subway.singapore" = "Метро станица"; +"type.railway.station.subway.singapore" = "Subway Station"; -"type.railway.station.subway.sofia" = "Метро станица"; +"type.railway.station.subway.sofia" = "Subway Station"; -"type.railway.station.subway.spb" = "Метро станица"; +"type.railway.station.subway.spb" = "Subway Station"; -"type.railway.station.subway.stockholm" = "Метро станица"; +"type.railway.station.subway.stockholm" = "Subway Station"; -"type.railway.station.subway.tabriz" = "Метро станица"; +"type.railway.station.subway.tabriz" = "Subway Station"; -"type.railway.station.subway.taipei" = "Метро станица"; +"type.railway.station.subway.taipei" = "Subway Station"; -"type.railway.station.subway.taoyuan" = "Метро станица"; +"type.railway.station.subway.taoyuan" = "Subway Station"; -"type.railway.station.subway.tashkent" = "Метро станица"; +"type.railway.station.subway.tashkent" = "Subway Station"; -"type.railway.station.subway.tbilisi" = "Метро станица"; +"type.railway.station.subway.tbilisi" = "Subway Station"; -"type.railway.station.subway.tehran" = "Метро станица"; +"type.railway.station.subway.tehran" = "Subway Station"; -"type.railway.station.subway.tianjin" = "Метро станица"; +"type.railway.station.subway.tianjin" = "Subway Station"; -"type.railway.station.subway.tokyo" = "Метро станица"; +"type.railway.station.subway.tokyo" = "Subway Station"; -"type.railway.station.subway.valencia" = "Метро станица"; +"type.railway.station.subway.valencia" = "Subway Station"; -"type.railway.station.subway.vienna" = "Метро станица"; +"type.railway.station.subway.vienna" = "Subway Station"; -"type.railway.station.subway.warszawa" = "Метро станица"; +"type.railway.station.subway.warszawa" = "Subway Station"; -"type.railway.station.subway.washington" = "Метро станица"; +"type.railway.station.subway.washington" = "Subway Station"; -"type.railway.station.subway.wuhan" = "Метро станица"; +"type.railway.station.subway.wuhan" = "Subway Station"; -"type.railway.station.subway.yerevan" = "Метро станица"; +"type.railway.station.subway.yerevan" = "Subway Station"; -"type.railway.station.subway.yokohama" = "Метро станица"; +"type.railway.station.subway.yokohama" = "Subway Station"; -"type.railway.subway" = "Метро"; +"type.railway.subway" = "Subway Line"; -"type.railway.subway.bridge" = "Метро мост"; +"type.railway.subway.bridge" = "Subway Line Bridge"; -"type.railway.subway.tunnel" = "Метро тунел"; +"type.railway.subway.tunnel" = "Subway Line Tunnel"; -"type.railway.subway_entrance" = "Улаз у метро"; +"type.railway.subway_entrance" = "Subway Entrance"; -"type.railway.subway_entrance.adana" = "Улаз у метро"; +"type.railway.subway_entrance.adana" = "Subway Entrance"; -"type.railway.subway_entrance.algiers" = "Улаз у метро"; +"type.railway.subway_entrance.algiers" = "Subway Entrance"; -"type.railway.subway_entrance.almaty" = "Улаз у метро"; +"type.railway.subway_entrance.almaty" = "Subway Entrance"; -"type.railway.subway_entrance.amsterdam" = "Улаз у метро"; +"type.railway.subway_entrance.amsterdam" = "Subway Entrance"; -"type.railway.subway_entrance.ankara" = "Улаз у метро"; +"type.railway.subway_entrance.ankara" = "Subway Entrance"; -"type.railway.subway_entrance.athens" = "Улаз у метро"; +"type.railway.subway_entrance.athens" = "Subway Entrance"; -"type.railway.subway_entrance.baku" = "Улаз у метро"; +"type.railway.subway_entrance.baku" = "Subway Entrance"; -"type.railway.subway_entrance.bangkok" = "Улаз у метро"; +"type.railway.subway_entrance.bangkok" = "Subway Entrance"; -"type.railway.subway_entrance.barcelona" = "Улаз у метро"; +"type.railway.subway_entrance.barcelona" = "Subway Entrance"; -"type.railway.subway_entrance.beijing" = "Улаз у метро"; +"type.railway.subway_entrance.beijing" = "Subway Entrance"; -"type.railway.subway_entrance.bengalore" = "Улаз у метро"; +"type.railway.subway_entrance.bengalore" = "Subway Entrance"; -"type.railway.subway_entrance.berlin" = "Улаз у метро"; +"type.railway.subway_entrance.berlin" = "Subway Entrance"; -"type.railway.subway_entrance.bilbao" = "Улаз у метро"; +"type.railway.subway_entrance.bilbao" = "Subway Entrance"; -"type.railway.subway_entrance.brasilia" = "Улаз у метро"; +"type.railway.subway_entrance.brasilia" = "Subway Entrance"; -"type.railway.subway_entrance.brescia" = "Улаз у метро"; +"type.railway.subway_entrance.brescia" = "Subway Entrance"; -"type.railway.subway_entrance.brussels" = "Улаз у метро"; +"type.railway.subway_entrance.brussels" = "Subway Entrance"; -"type.railway.subway_entrance.bucharest" = "Улаз у метро"; +"type.railway.subway_entrance.bucharest" = "Subway Entrance"; -"type.railway.subway_entrance.budapest" = "Улаз у метро"; +"type.railway.subway_entrance.budapest" = "Subway Entrance"; -"type.railway.subway_entrance.buenos_aires" = "Улаз у метро"; +"type.railway.subway_entrance.buenos_aires" = "Subway Entrance"; -"type.railway.subway_entrance.bursa" = "Улаз у метро"; +"type.railway.subway_entrance.bursa" = "Subway Entrance"; -"type.railway.subway_entrance.cairo" = "Улаз у метро"; +"type.railway.subway_entrance.cairo" = "Subway Entrance"; -"type.railway.subway_entrance.caracas" = "Улаз у метро"; +"type.railway.subway_entrance.caracas" = "Subway Entrance"; -"type.railway.subway_entrance.catania" = "Улаз у метро"; +"type.railway.subway_entrance.catania" = "Subway Entrance"; -"type.railway.subway_entrance.changchun" = "Улаз у метро"; +"type.railway.subway_entrance.changchun" = "Subway Entrance"; -"type.railway.subway_entrance.chengdu" = "Улаз у метро"; +"type.railway.subway_entrance.chengdu" = "Subway Entrance"; -"type.railway.subway_entrance.chicago" = "Улаз у метро"; +"type.railway.subway_entrance.chicago" = "Subway Entrance"; -"type.railway.subway_entrance.chongqing" = "Улаз у метро"; +"type.railway.subway_entrance.chongqing" = "Subway Entrance"; -"type.railway.subway_entrance.dalian" = "Улаз у метро"; +"type.railway.subway_entrance.dalian" = "Subway Entrance"; -"type.railway.subway_entrance.delhi" = "Улаз у метро"; +"type.railway.subway_entrance.delhi" = "Subway Entrance"; -"type.railway.subway_entrance.dnepro" = "Улаз у метро"; +"type.railway.subway_entrance.dnepro" = "Subway Entrance"; -"type.railway.subway_entrance.dubai" = "Улаз у метро"; +"type.railway.subway_entrance.dubai" = "Subway Entrance"; -"type.railway.subway_entrance.ekb" = "Улаз у метро"; +"type.railway.subway_entrance.ekb" = "Subway Entrance"; -"type.railway.subway_entrance.fukuoka" = "Улаз у метро"; +"type.railway.subway_entrance.fukuoka" = "Subway Entrance"; -"type.railway.subway_entrance.glasgow" = "Улаз у метро"; +"type.railway.subway_entrance.glasgow" = "Subway Entrance"; -"type.railway.subway_entrance.guangzhou" = "Улаз у метро"; +"type.railway.subway_entrance.guangzhou" = "Subway Entrance"; -"type.railway.subway_entrance.hamburg" = "Улаз у метро"; +"type.railway.subway_entrance.hamburg" = "Subway Entrance"; -"type.railway.subway_entrance.helsinki" = "Улаз у метро"; +"type.railway.subway_entrance.helsinki" = "Subway Entrance"; -"type.railway.subway_entrance.hiroshima" = "Улаз у метро"; +"type.railway.subway_entrance.hiroshima" = "Subway Entrance"; -"type.railway.subway_entrance.hongkong" = "Улаз у метро"; +"type.railway.subway_entrance.hongkong" = "Subway Entrance"; -"type.railway.subway_entrance.isfahan" = "Улаз у метро"; +"type.railway.subway_entrance.isfahan" = "Subway Entrance"; -"type.railway.subway_entrance.istanbul" = "Улаз у метро"; +"type.railway.subway_entrance.istanbul" = "Subway Entrance"; -"type.railway.subway_entrance.izmir" = "Улаз у метро"; +"type.railway.subway_entrance.izmir" = "Subway Entrance"; -"type.railway.subway_entrance.kazan" = "Улаз у метро"; +"type.railway.subway_entrance.kazan" = "Subway Entrance"; -"type.railway.subway_entrance.kharkiv" = "Улаз у метро"; +"type.railway.subway_entrance.kharkiv" = "Subway Entrance"; -"type.railway.subway_entrance.kiev" = "Улаз у метро"; +"type.railway.subway_entrance.kiev" = "Subway Entrance"; -"type.railway.subway_entrance.kobe" = "Улаз у метро"; +"type.railway.subway_entrance.kobe" = "Subway Entrance"; -"type.railway.subway_entrance.kolkata" = "Улаз у метро"; +"type.railway.subway_entrance.kolkata" = "Subway Entrance"; -"type.railway.subway_entrance.kunming" = "Улаз у метро"; +"type.railway.subway_entrance.kunming" = "Subway Entrance"; -"type.railway.subway_entrance.kyoto" = "Улаз у метро"; +"type.railway.subway_entrance.kyoto" = "Subway Entrance"; -"type.railway.subway_entrance.la" = "Улаз у метро"; +"type.railway.subway_entrance.la" = "Subway Entrance"; -"type.railway.subway_entrance.lausanne" = "Улаз у метро"; +"type.railway.subway_entrance.lausanne" = "Subway Entrance"; -"type.railway.subway_entrance.lille" = "Улаз у метро"; +"type.railway.subway_entrance.lille" = "Subway Entrance"; -"type.railway.subway_entrance.lima" = "Улаз у метро"; +"type.railway.subway_entrance.lima" = "Subway Entrance"; -"type.railway.subway_entrance.lisboa" = "Улаз у метро"; +"type.railway.subway_entrance.lisboa" = "Subway Entrance"; -"type.railway.subway_entrance.london" = "Улаз у метро"; +"type.railway.subway_entrance.london" = "Subway Entrance"; -"type.railway.subway_entrance.lyon" = "Улаз у метро"; +"type.railway.subway_entrance.lyon" = "Subway Entrance"; -"type.railway.subway_entrance.madrid" = "Улаз у метро"; +"type.railway.subway_entrance.madrid" = "Subway Entrance"; -"type.railway.subway_entrance.malaga" = "Улаз у метро"; +"type.railway.subway_entrance.malaga" = "Subway Entrance"; -"type.railway.subway_entrance.manila" = "Улаз у метро"; +"type.railway.subway_entrance.manila" = "Subway Entrance"; -"type.railway.subway_entrance.maracaibo" = "Улаз у метро"; +"type.railway.subway_entrance.maracaibo" = "Subway Entrance"; -"type.railway.subway_entrance.mashhad" = "Улаз у метро"; +"type.railway.subway_entrance.mashhad" = "Subway Entrance"; -"type.railway.subway_entrance.mecca" = "Улаз у метро"; +"type.railway.subway_entrance.mecca" = "Subway Entrance"; -"type.railway.subway_entrance.medellin" = "Улаз у метро"; +"type.railway.subway_entrance.medellin" = "Subway Entrance"; -"type.railway.subway_entrance.mexico" = "Улаз у метро"; +"type.railway.subway_entrance.mexico" = "Subway Entrance"; -"type.railway.subway_entrance.milan" = "Улаз у метро"; +"type.railway.subway_entrance.milan" = "Subway Entrance"; -"type.railway.subway_entrance.minsk" = "Улаз у метро"; +"type.railway.subway_entrance.minsk" = "Subway Entrance"; -"type.railway.subway_entrance.montreal" = "Улаз у метро"; +"type.railway.subway_entrance.montreal" = "Subway Entrance"; -"type.railway.subway_entrance.moscow" = "Улаз у метро"; +"type.railway.subway_entrance.moscow" = "Subway Entrance"; -"type.railway.subway_entrance.munchen" = "Улаз у метро"; +"type.railway.subway_entrance.munchen" = "Subway Entrance"; -"type.railway.subway_entrance.nagoya" = "Улаз у метро"; +"type.railway.subway_entrance.nagoya" = "Subway Entrance"; -"type.railway.subway_entrance.newyork" = "Улаз у метро"; +"type.railway.subway_entrance.newyork" = "Subway Entrance"; -"type.railway.subway_entrance.nnov" = "Улаз у метро"; +"type.railway.subway_entrance.nnov" = "Subway Entrance"; -"type.railway.subway_entrance.novosibirsk" = "Улаз у метро"; +"type.railway.subway_entrance.novosibirsk" = "Subway Entrance"; -"type.railway.subway_entrance.osaka" = "Улаз у метро"; +"type.railway.subway_entrance.osaka" = "Subway Entrance"; -"type.railway.subway_entrance.oslo" = "Улаз у метро"; +"type.railway.subway_entrance.oslo" = "Subway Entrance"; -"type.railway.subway_entrance.palma" = "Улаз у метро"; +"type.railway.subway_entrance.palma" = "Subway Entrance"; -"type.railway.subway_entrance.panama" = "Улаз у метро"; +"type.railway.subway_entrance.panama" = "Subway Entrance"; -"type.railway.subway_entrance.paris" = "Улаз у метро"; +"type.railway.subway_entrance.paris" = "Subway Entrance"; -"type.railway.subway_entrance.philadelphia" = "Улаз у метро"; +"type.railway.subway_entrance.philadelphia" = "Subway Entrance"; -"type.railway.subway_entrance.pyongyang" = "Улаз у метро"; +"type.railway.subway_entrance.pyongyang" = "Subway Entrance"; -"type.railway.subway_entrance.rennes" = "Улаз у метро"; +"type.railway.subway_entrance.rennes" = "Subway Entrance"; -"type.railway.subway_entrance.rio" = "Улаз у метро"; +"type.railway.subway_entrance.rio" = "Subway Entrance"; -"type.railway.subway_entrance.roma" = "Улаз у метро"; +"type.railway.subway_entrance.roma" = "Subway Entrance"; -"type.railway.subway_entrance.rotterdam" = "Улаз у метро"; +"type.railway.subway_entrance.rotterdam" = "Subway Entrance"; -"type.railway.subway_entrance.samara" = "Улаз у метро"; +"type.railway.subway_entrance.samara" = "Subway Entrance"; -"type.railway.subway_entrance.santiago" = "Улаз у метро"; +"type.railway.subway_entrance.santiago" = "Subway Entrance"; -"type.railway.subway_entrance.santo_domingo" = "Улаз у метро"; +"type.railway.subway_entrance.santo_domingo" = "Subway Entrance"; -"type.railway.subway_entrance.saopaulo" = "Улаз у метро"; +"type.railway.subway_entrance.saopaulo" = "Subway Entrance"; -"type.railway.subway_entrance.sapporo" = "Улаз у метро"; +"type.railway.subway_entrance.sapporo" = "Subway Entrance"; -"type.railway.subway_entrance.sendai" = "Улаз у метро"; +"type.railway.subway_entrance.sendai" = "Subway Entrance"; -"type.railway.subway_entrance.sf" = "Улаз у метро"; +"type.railway.subway_entrance.sf" = "Subway Entrance"; -"type.railway.subway_entrance.shanghai" = "Улаз у метро"; +"type.railway.subway_entrance.shanghai" = "Subway Entrance"; -"type.railway.subway_entrance.shenzhen" = "Улаз у метро"; +"type.railway.subway_entrance.shenzhen" = "Subway Entrance"; -"type.railway.subway_entrance.shiraz" = "Улаз у метро"; +"type.railway.subway_entrance.shiraz" = "Subway Entrance"; -"type.railway.subway_entrance.singapore" = "Улаз у метро"; +"type.railway.subway_entrance.singapore" = "Subway Entrance"; -"type.railway.subway_entrance.sofia" = "Улаз у метро"; +"type.railway.subway_entrance.sofia" = "Subway Entrance"; -"type.railway.subway_entrance.spb" = "Улаз у метро"; +"type.railway.subway_entrance.spb" = "Subway Entrance"; -"type.railway.subway_entrance.stockholm" = "Улаз у метро"; +"type.railway.subway_entrance.stockholm" = "Subway Entrance"; -"type.railway.subway_entrance.tabriz" = "Улаз у метро"; +"type.railway.subway_entrance.tabriz" = "Subway Entrance"; -"type.railway.subway_entrance.taipei" = "Улаз у метро"; +"type.railway.subway_entrance.taipei" = "Subway Entrance"; -"type.railway.subway_entrance.taoyuan" = "Улаз у метро"; +"type.railway.subway_entrance.taoyuan" = "Subway Entrance"; -"type.railway.subway_entrance.tashkent" = "Улаз у метро"; +"type.railway.subway_entrance.tashkent" = "Subway Entrance"; -"type.railway.subway_entrance.tbilisi" = "Улаз у метро"; +"type.railway.subway_entrance.tbilisi" = "Subway Entrance"; -"type.railway.subway_entrance.tehran" = "Улаз у метро"; +"type.railway.subway_entrance.tehran" = "Subway Entrance"; -"type.railway.subway_entrance.tianjin" = "Улаз у метро"; +"type.railway.subway_entrance.tianjin" = "Subway Entrance"; -"type.railway.subway_entrance.tokyo" = "Улаз у метро"; +"type.railway.subway_entrance.tokyo" = "Subway Entrance"; -"type.railway.subway_entrance.valencia" = "Улаз у метро"; +"type.railway.subway_entrance.valencia" = "Subway Entrance"; -"type.railway.subway_entrance.vienna" = "Улаз у метро"; +"type.railway.subway_entrance.vienna" = "Subway Entrance"; -"type.railway.subway_entrance.warszawa" = "Улаз у метро"; +"type.railway.subway_entrance.warszawa" = "Subway Entrance"; -"type.railway.subway_entrance.washington" = "Улаз у метро"; +"type.railway.subway_entrance.washington" = "Subway Entrance"; -"type.railway.subway_entrance.wuhan" = "Улаз у метро"; +"type.railway.subway_entrance.wuhan" = "Subway Entrance"; -"type.railway.subway_entrance.yerevan" = "Улаз у метро"; +"type.railway.subway_entrance.yerevan" = "Subway Entrance"; -"type.railway.subway_entrance.yokohama" = "Улаз у метро"; +"type.railway.subway_entrance.yokohama" = "Subway Entrance"; -"type.railway.tram" = "Трамвај"; +"type.railway.tram" = "Tram Line"; -"type.railway.tram.bridge" = "Трамвајски мост"; +"type.railway.tram.bridge" = "Tram Line Bridge"; -"type.railway.tram.tunnel" = "Трамвајски тунел"; +"type.railway.tram.tunnel" = "Tram Line Tunnel"; -"type.railway.tram_stop" = "Трамвајска станица"; +"type.railway.tram_stop" = "Tram Stop"; -"type.route" = "Рута"; +"type.route" = "Route"; -"type.route.ferry" = "Трајект"; +"type.route.ferry" = "Ferry"; "type.route.shuttle_train" = "route-shuttle_train"; -"type.shop" = "Продавница"; +"type.shop" = "Shop"; -"type.shop.alcohol" = "Продавница пића"; +"type.shop.alcohol" = "Liquor Shop"; -"type.shop.bakery" = "Пекара"; +"type.shop.bakery" = "Bakery"; -"type.shop.bathroom_furnishing" = "Намештај за купатило"; +"type.shop.bathroom_furnishing" = "Bathroom Furnishings"; -"type.shop.beauty" = "Козметички салон"; +"type.shop.beauty" = "Beauty Shop"; -"type.shop.beverages" = "Пића"; +"type.shop.beverages" = "Beverages"; -"type.shop.bicycle" = "Продавница бисикла"; +"type.shop.bicycle" = "Bicycle Shop"; -"type.shop.bookmaker" = "Кладионица"; +"type.shop.bookmaker" = "Bookmaker"; -"type.shop.books" = "Књижара"; +"type.shop.books" = "Bookstore"; -"type.shop.butcher" = "Месара"; +"type.shop.butcher" = "Butcher"; -"type.shop.cannabis" = "Канабис шоп"; +"type.shop.cannabis" = "Cannabis Shop"; -"type.shop.car" = "Продаја аута"; +"type.shop.car" = "Car Dealership"; -"type.shop.car_parts" = "Ауто делови"; +"type.shop.car_parts" = "Car Parts Shop"; -"type.shop.car_repair" = "Ауто сервис"; +"type.shop.car_repair" = "Car Repair Workshop"; -"type.shop.car_repair.tyres" = "Гуме"; +"type.shop.car_repair.tyres" = "Tyre Repair"; -"type.shop.caravan" = "Продаја каравана"; +"type.shop.caravan" = "RV Dealership"; -"type.shop.carpet" = "Продавница тепиха"; +"type.shop.carpet" = "Carpet Shop"; -"type.shop.chemist" = "Кућна хемија"; +"type.shop.chemist" = "Chemist"; -"type.shop.chocolate" = "Чоколада"; +"type.shop.chocolate" = "Chocolate Shop"; -"type.shop.clothes" = "Одећа"; +"type.shop.clothes" = "Clothes Shop"; -"type.shop.coffee" = "Кафа"; +"type.shop.coffee" = "Coffee Shop"; -"type.shop.computer" = "Компјутери"; +"type.shop.computer" = "Computer Store"; -"type.shop.confectionery" = "Слаткиши"; +"type.shop.confectionery" = "Candy Shop"; -"type.shop.convenience" = "Мешовита роба"; +"type.shop.convenience" = "Convenience Store"; -"type.shop.copyshop" = "Копирница"; +"type.shop.copyshop" = "Copyshop"; -"type.shop.cosmetics" = "Козметика"; +"type.shop.cosmetics" = "Cosmetics Shop"; -"type.shop.curtain" = "Завесе"; +"type.shop.curtain" = "Curtain Shop"; -"type.shop.deli" = "Десликатеси"; +"type.shop.deli" = "Delicatessen"; -"type.shop.department_store" = "Тржни центар"; +"type.shop.department_store" = "Department Store"; -"type.shop.doityourself" = "Грађевинска радња"; +"type.shop.doityourself" = "Home Improvement Store"; -"type.shop.dry_cleaning" = "Хемијско чишћење"; +"type.shop.dry_cleaning" = "Dry Cleaner"; -"type.shop.electronics" = "Електроника"; +"type.shop.electronics" = "Electronics Shop"; -"type.shop.erotic" = "Секс шоп"; +"type.shop.erotic" = "Erotic Shop"; -"type.shop.fabric" = "Текстил"; +"type.shop.fabric" = "Fabric Shop"; -"type.shop.farm" = "Пиљара"; +"type.shop.farm" = "Farm Food Shop"; -"type.shop.fashion_accessories" = "Модни аксесоар"; +"type.shop.fashion_accessories" = "Fashion Accessories"; -"type.shop.florist" = "Цвећара"; +"type.shop.florist" = "Florist"; -"type.shop.funeral_directors" = "Погребна опрема"; +"type.shop.funeral_directors" = "Funeral Directors"; -"type.shop.furniture" = "Намештај"; +"type.shop.furniture" = "Furniture Store"; -"type.shop.garden_centre" = "Баштенски производи"; +"type.shop.garden_centre" = "Garden Center"; -"type.shop.gas" = "Индустријски гасови"; +"type.shop.gas" = "Gas Store"; -"type.shop.gift" = "Даротека"; +"type.shop.gift" = "Gift Shop"; -"type.shop.greengrocer" = "Поврће и воће"; +"type.shop.greengrocer" = "Greengrocer"; -"type.shop.grocery" = "Бакалница"; +"type.shop.grocery" = "Grocery Store"; -"type.shop.hairdresser" = "Фризерска опрема"; +"type.shop.hairdresser" = "Hairdresser"; -"type.shop.hardware" = "Гвожђара"; +"type.shop.hardware" = "Hardware Store"; -"type.shop.health_food" = "Здрава храна"; +"type.shop.health_food" = "Health Food Shop"; -"type.shop.herbalist" = "Продавница биља"; +"type.shop.herbalist" = "Herbalist"; -"type.shop.hifi" = "HiFi аудио"; +"type.shop.hifi" = "HiFi Audio Shop"; -"type.shop.houseware" = "Кућне потрепштине"; +"type.shop.houseware" = "Housewares Store"; -"type.shop.jewelry" = "Златара"; +"type.shop.jewelry" = "Jewelry Store"; -"type.shop.kiosk" = "Киоск"; +"type.shop.kiosk" = "Kiosk"; -"type.shop.kitchen" = "Пилетина"; +"type.shop.kitchen" = "Kitchen Store"; -"type.shop.laundry" = "Перионица веша"; +"type.shop.laundry" = "Laundry"; -"type.shop.mall" = "Мол"; +"type.shop.mall" = "Mall"; -"type.shop.massage" = "Масажа"; +"type.shop.massage" = "Massage Salon"; -"type.shop.mobile_phone" = "Мобилни телефони"; +"type.shop.mobile_phone" = "Cell Phone Store"; -"type.shop.money_lender" = "Лихвар"; +"type.shop.money_lender" = "Money Lender"; -"type.shop.motorcycle" = "Мотори"; +"type.shop.motorcycle" = "Motorcycle Shop"; -"type.shop.motorcycle_repair" = "Сервис мотора"; +"type.shop.motorcycle_repair" = "Motorcycle Repair"; -"type.shop.music" = "Музика"; +"type.shop.music" = "Record Store"; -"type.shop.musical_instrument" = "Музички инструменти"; +"type.shop.musical_instrument" = "Musical Instrument Shop"; -"type.shop.newsagent" = "Новинарница"; +"type.shop.newsagent" = "Newspaper Stand"; -"type.shop.optician" = "Оптика"; +"type.shop.optician" = "Optician"; -"type.shop.outdoor" = "Пешачење, пењање и камповање"; +"type.shop.outdoor" = "Outdoor Equipment Shop"; -"type.shop.outpost" = "Пакетамап"; +"type.shop.outpost" = "Pickup Point"; -"type.shop.pasta" = "Тестенине"; +"type.shop.pasta" = "Pasta Shop"; -"type.shop.pastry" = "Посластичарница"; +"type.shop.pastry" = "Bakery"; -"type.shop.pawnbroker" = "Залагаоница"; +"type.shop.pawnbroker" = "Pawnbroker"; -"type.shop.pet" = "Пет шоп"; +"type.shop.pet" = "Pet Store"; -"type.shop.pet_grooming" = "Грумер"; +"type.shop.pet_grooming" = "Pet Grooming"; -"type.shop.photo" = "Фотограф"; +"type.shop.photo" = "Photo Shop"; -"type.shop.rental" = "Центар за изнајмљивање"; +"type.shop.rental" = "Rental Shop"; -"type.shop.rental.bicycle" = "Изнајмљивање бицикла"; +"type.shop.rental.bicycle" = "Bicycle Rental Shop"; -"type.shop.seafood" = "Рибарница"; +"type.shop.seafood" = "Fishmonger"; -"type.shop.second_hand" = "Половна одећа"; +"type.shop.second_hand" = "Second Hand Shop"; -"type.shop.shoes" = "Обућа"; +"type.shop.shoes" = "Shoe Shop"; -"type.shop.sports" = "Спорт"; +"type.shop.sports" = "Sports Shop"; -"type.shop.stationery" = "Књижара"; +"type.shop.stationery" = "Stationery Shop"; -"type.shop.supermarket" = "Супермаркет"; +"type.shop.supermarket" = "Supermarket"; -"type.shop.tattoo" = "Тетоважа"; +"type.shop.tattoo" = "Tattoo Parlour"; -"type.shop.tea" = "Чајеви"; +"type.shop.tea" = "Tea Shop"; -"type.shop.ticket" = "Билетарница"; +"type.shop.ticket" = "Ticket Shop"; -"type.shop.toys" = "Играчке"; +"type.shop.toys" = "Toy Store"; -"type.shop.travel_agency" = "Туристичка агенција"; +"type.shop.travel_agency" = "Travel Agency"; -"type.shop.tyres" = "Гуме"; +"type.shop.tyres" = "Tyre Shop"; -"type.shop.variety_store" = "Мешовита роба"; +"type.shop.variety_store" = "Variety Store"; -"type.shop.video" = "Видео клуб"; +"type.shop.video" = "Video Shop"; -"type.shop.video_games" = "Видео игре"; +"type.shop.video_games" = "Video Game Shop"; -"type.shop.wine" = "Винарија"; +"type.shop.wine" = "Wine Shop"; -"type.shop.agrarian" = "Пољопривредна опрема"; +"type.shop.agrarian" = "Agricultural Shop"; -"type.shop.antiques" = "Антикварница"; +"type.shop.antiques" = "Antiques Shop"; -"type.shop.appliance" = "Продавница апарата"; +"type.shop.appliance" = "Appliance Shop"; /* maybe change to Art Gallery for en-US when supported */ -"type.shop.art" = "Уметнички радови"; +"type.shop.art" = "Artwork Shop"; -"type.shop.baby_goods" = "Беби опрема"; +"type.shop.baby_goods" = "Baby Goods Shop"; -"type.shop.bag" = "Торбе"; +"type.shop.bag" = "Bag Shop"; -"type.shop.bed" = "Постељина"; +"type.shop.bed" = "Bed Shop"; -"type.shop.boutique" = "Бутик"; +"type.shop.boutique" = "Boutique"; -"type.shop.charity" = "Добротворна радња"; +"type.shop.charity" = "Charity Shop"; -"type.shop.cheese" = "Сир"; +"type.shop.cheese" = "Cheese Shop"; -"type.shop.craft" = "Уметност и занати"; +"type.shop.craft" = "Craft Supplies Store"; -"type.shop.dairy" = "Млечни производи"; +"type.shop.dairy" = "Dairy Shop"; -"type.shop.electrical" = "Електро материјал"; +"type.shop.electrical" = "Electrical Supplies Store"; -"type.shop.fishing" = "Рибарница"; +"type.shop.fishing" = "Fishing Store"; -"type.shop.interior_decoration" = "Унутрашње декорације"; +"type.shop.interior_decoration" = "Interior Decorations Store"; -"type.shop.lottery" = "Лото"; +"type.shop.lottery" = "Lottery Tickets"; -"type.shop.medical_supply" = "Фармацеутска компанија"; +"type.shop.medical_supply" = "Medical Supplies Store"; -"type.shop.nutrition_supplements" = "Суплементи"; +"type.shop.nutrition_supplements" = "Nutrition Supplement Store"; -"type.shop.paint" = "Фарбара"; +"type.shop.paint" = "Paint Shop"; -"type.shop.perfumery" = "Парфимерија"; +"type.shop.perfumery" = "Perfume Shop"; -"type.shop.sewing" = "Материјали за шивење"; +"type.shop.sewing" = "Sewing Supplies Shop"; -"type.shop.storage_rental" = "Изнајмљивање складишта"; +"type.shop.storage_rental" = "Storage Rental"; -"type.shop.tobacco" = "Дуван"; +"type.shop.tobacco" = "Smoke Shop"; -"type.shop.trade" = "Занатске потрепштине"; +"type.shop.trade" = "Trade Supplies"; -"type.shop.watches" = "Сатови"; +"type.shop.watches" = "Watch Store"; -"type.shop.wholesale" = "Велепродаја"; +"type.shop.wholesale" = "Wholesale Store"; -"type.sport" = "Спорт"; +"type.sport" = "Sport"; -"type.sport.american_football" = "Амерички фудбал"; +"type.sport.american_football" = "American Football"; -"type.sport.archery" = "Стреличарство"; +"type.sport.archery" = "Archery"; -"type.sport.athletics" = "Атлетика"; +"type.sport.athletics" = "Athletics"; -"type.sport.australian_football" = "Аустралијски фудбал"; +"type.sport.australian_football" = "Australian Football"; -"type.sport.baseball" = "Бејзбол"; +"type.sport.baseball" = "Baseball"; -"type.sport.basketball" = "Кошарка"; +"type.sport.basketball" = "Basketball"; -"type.sport.beachvolleyball" = "Одбојка на песку"; +"type.sport.beachvolleyball" = "Beach Volleyball"; -"type.sport.bowls" = "Куглање"; +"type.sport.bowls" = "Bowls"; -"type.sport.chess" = "Шах"; +"type.sport.chess" = "Chess"; -"type.sport.cricket" = "Крикет"; +"type.sport.cricket" = "Cricket"; -"type.sport.curling" = "Карлинг"; +"type.sport.curling" = "Curling"; -"type.sport.equestrian" = "Коњички спорт"; +"type.sport.equestrian" = "Equestrian Sports"; -"type.sport.golf" = "Голф"; +"type.sport.golf" = "Golf"; -"type.sport.gymnastics" = "Гимнастика"; +"type.sport.gymnastics" = "Gymnastics"; -"type.sport.handball" = "Рукомет"; +"type.sport.handball" = "Handball"; -"type.sport.multi" = "Разни спортови"; +"type.sport.multi" = "Various Sports"; /* Used to tag a scuba diving site. */ -"type.sport.scuba_diving" = "Роњење"; +"type.sport.scuba_diving" = "Scuba Diving Site"; -"type.sport.shooting" = "Стрељана"; +"type.sport.shooting" = "Shooting"; -"type.sport.skateboard" = "Скејтборд"; +"type.sport.skateboard" = "Skateboarding"; -"type.sport.skiing" = "Скијање"; +"type.sport.skiing" = "Skiing"; -"type.sport.soccer" = "Фудбал"; +"type.sport.soccer" = "Soccer"; -"type.sport.swimming" = "Пливање"; +"type.sport.swimming" = "Swimming"; -"type.sport.table_tennis" = "Стони тенис"; +"type.sport.table_tennis" = "Table Tennis"; -"type.sport.tennis" = "Тенис"; +"type.sport.tennis" = "Tennis Court"; -"type.sport.volleyball" = "Одбојка"; +"type.sport.volleyball" = "Volleyball"; -"type.sport.10pin" = "Куглање"; +"type.sport.10pin" = "Bowling"; -"type.sport.9pin" = "Куглање"; +"type.sport.9pin" = "Bowling"; -"type.sport.padel" = "Падел"; +"type.sport.padel" = "Padel"; -"type.sport.futsal" = "Футсал"; +"type.sport.futsal" = "Futsal"; -"type.sport.ice_hockey" = "Хокеј"; +"type.sport.ice_hockey" = "Ice Hockey"; -"type.sport.field_hockey" = "Хокеј на трави"; +"type.sport.field_hockey" = "Field Hockey"; -"type.sport.badminton" = "Бадминтон"; +"type.sport.badminton" = "Badminton"; -"type.sport.pelota" = "Баскијска пелота"; +"type.sport.pelota" = "Basque Pelota"; -"type.tourism" = "Туризам"; +"type.tourism" = "Tourism"; -"type.tourism.aquarium" = "Акваријум"; +"type.tourism.aquarium" = "Aquarium"; /* Typically serviced, staff is present and food is available (compared to wilderness_hut). */ -"type.tourism.alpine_hut" = "Планинарска колиба"; +"type.tourism.alpine_hut" = "Mountain Lodge"; -"type.tourism.apartment" = "Апартман за одмор"; +"type.tourism.apartment" = "Holiday Apartment"; -"type.tourism.artwork" = "Уметничка скулптура"; +"type.tourism.artwork" = "Artwork"; -"type.tourism.artwork.architecture" = "Архитектонско уметничко дело"; +"type.tourism.artwork.architecture" = "Architectural Artwork"; -"type.tourism.artwork.painting" = "Уметничко дело"; +"type.tourism.artwork.painting" = "Painting"; -"type.tourism.artwork.sculpture" = "Скулптура"; +"type.tourism.artwork.sculpture" = "Sculpture"; -"type.tourism.artwork.statue" = "Статуа"; +"type.tourism.artwork.statue" = "Statue"; -"type.tourism.attraction" = "Атракција"; +"type.tourism.attraction" = "Attraction"; -"type.attraction.amusement_ride" = "Забавни парк"; +"type.attraction.amusement_ride" = "Amusement Ride"; -"type.attraction.animal" = "Золошки врт"; +"type.attraction.animal" = "Animal Enclosure"; "type.attraction.bumper_car" = "Bumper Car"; "type.attraction.big_wheel" = "Big Wheel"; -"type.attraction.carousel" = "Аутићи на струју"; +"type.attraction.carousel" = "Carousel"; -"type.attraction.historic" = "Историјска атракција"; +"type.attraction.historic" = "Historic attraction"; -"type.attraction.maze" = "Лавиринт"; +"type.attraction.maze" = "Maze"; -"type.attraction.roller_coaster" = "Ролеркостер"; +"type.attraction.roller_coaster" = "Roller Coaster"; -"type.attraction.water_slide" = "Тобоган"; +"type.attraction.water_slide" = "Water Slide"; -"type.tourism.attraction.specified" = "Атракција"; +"type.tourism.attraction.specified" = "Attraction"; -"type.tourism.camp_site" = "Камп"; +"type.tourism.camp_site" = "Campground"; -"type.tourism.caravan_site" = "Камп за караване"; +"type.tourism.caravan_site" = "RV Park"; /* A rentable countryside vacation house. */ -"type.tourism.chalet" = "Викендица"; +"type.tourism.chalet" = "Holiday Cottage"; -"type.tourism.gallery" = "Уметничка галерија"; +"type.tourism.gallery" = "Art Gallery"; -"type.tourism.guest_house" = "Кућа духова"; +"type.tourism.guest_house" = "Guest House"; -"type.tourism.hostel" = "Хостел"; +"type.tourism.hostel" = "Hostel"; -"type.tourism.hotel" = "Хотел"; +"type.tourism.hotel" = "Hotel"; -"type.tourism.information" = "Туристичке информације"; +"type.tourism.information" = "Tourist Information"; -"type.tourism.information.board" = "Информациона табла"; +"type.tourism.information.board" = "Information Board"; -"type.tourism.information.guidepost" = "Путоказ"; +"type.tourism.information.guidepost" = "Guidepost"; -"type.tourism.information.map" = "Туристичка мапа"; +"type.tourism.information.map" = "Tourist Map"; -"type.tourism.information.office" = "Туристички биро"; +"type.tourism.information.office" = "Tourist Office"; -"type.tourism.information.visitor_centre" = "Центар за посетиоце"; +"type.tourism.information.visitor_centre" = "Visitor Centre"; -"type.tourism.motel" = "Мотел"; +"type.tourism.motel" = "Motel"; -"type.tourism.museum" = "Музеј"; +"type.tourism.museum" = "Museum"; -"type.tourism.picnic_site" = "Пикник"; +"type.tourism.picnic_site" = "Picnic Site"; -"type.leisure.resort" = "Ресорт хотел"; +"type.leisure.resort" = "Resort"; -"type.tourism.theme_park" = "Забавни парк"; +"type.tourism.theme_park" = "Theme Park"; -"type.tourism.viewpoint" = "Видиковац"; +"type.tourism.viewpoint" = "Viewpoint"; /* Typically more basic, not staffed and free (compared to alpine_hut). */ -"type.tourism.wilderness_hut" = "Планинска кућа за туристе"; +"type.tourism.wilderness_hut" = "Wilderness Hut"; -"type.tourism.zoo" = "Золошки врт"; +"type.tourism.zoo" = "Zoo"; -"type.tourism.zoo.petting" = "Контактни зоо-врт"; +"type.tourism.zoo.petting" = "Petting Zoo"; -"type.traffic_calming" = "Пешачки прелаз"; +"type.traffic_calming" = "Traffic Calming"; -"type.traffic_calming.bump" = "Лежећи полицајац (грба)"; +"type.traffic_calming.bump" = "Traffic Bump"; -"type.traffic_calming.hump" = "Лежећи полицајац"; +"type.traffic_calming.hump" = "Traffic Hump"; -"type.waterway" = "Водени ток"; +"type.waterway" = "Waterway"; -"type.waterway.canal" = "Канал"; +"type.waterway.canal" = "Canal"; -"type.waterway.canal.tunnel" = "Тунел у каналу"; +"type.waterway.canal.tunnel" = "Canal Tunnel"; -"type.waterway.fish_pass" = "Рибљи пут"; +"type.waterway.fish_pass" = "Fish Pass"; -"type.waterway.dam" = "Брана"; +"type.waterway.dam" = "Dam"; -"type.barrier.ditch" = "Јарак"; +"type.barrier.ditch" = "Ditch"; -"type.natural.water.ditch" = "Канал"; +"type.natural.water.ditch" = "Drainage Ditch"; -"type.waterway.ditch.tunnel" = "Канал"; +"type.waterway.ditch.tunnel" = "Culvert"; -"type.waterway.dock" = "Преводница"; +"type.waterway.dock" = "Waterway Dock"; -"type.waterway.drain" = "Канал"; +"type.waterway.drain" = "Drain"; -"type.natural.water.drain" = "Канал"; +"type.natural.water.drain" = "Drain"; -"type.waterway.drain.tunnel" = "Канал"; +"type.waterway.drain.tunnel" = "Culvert"; -"type.waterway.lock_gate" = "Капија"; +"type.waterway.lock_gate" = "Lock Gate"; -"type.waterway.river" = "Река"; +"type.waterway.river" = "River"; -"type.waterway.river.tunnel" = "Река"; +"type.waterway.river.tunnel" = "River"; -"type.waterway.stream" = "Поток"; +"type.waterway.stream" = "Stream"; -"type.waterway.stream.ephemeral" = "Повремени поток"; +"type.waterway.stream.ephemeral" = "Ephemeral Stream"; -"type.waterway.stream.intermittent" = "Повремени поток"; +"type.waterway.stream.intermittent" = "Intermittent Stream"; -"type.waterway.stream.tunnel" = "Поток"; +"type.waterway.stream.tunnel" = "Stream"; -"type.waterway.waterfall" = "Водопад"; +"type.waterway.waterfall" = "Waterfall"; -"type.waterway.weir" = "Брана"; +"type.waterway.weir" = "Weir"; -"type.wheelchair" = "Приступ инвалидским колицима"; +"type.wheelchair" = "Wheelchair"; -"type.wheelchair.limited" = "Лимитирани приступ инвалидским колицима"; +"type.wheelchair.limited" = "Limited Wheelchair Access"; -"type.wheelchair.no" = "Није приступно инвалидским колицима"; +"type.wheelchair.no" = "No Wheelchair Access"; -"type.wheelchair.yes" = "Пун приступ инвалидским колицима"; +"type.wheelchair.yes" = "Full Wheelchair Access"; -"type.aerialway.j.bar" = "Жичара са Ј пречком"; +"type.aerialway.j.bar" = "J-bar Lift"; -"type.aerialway.magic_carpet" = "Магични тепих"; +"type.aerialway.magic_carpet" = "Magic Carpet"; -"type.aerialway.platter" = "Жичара са тањир седиштем"; +"type.aerialway.platter" = "Platter Lift"; -"type.aerialway.rope_tow" = "Вучно уже"; +"type.aerialway.rope_tow" = "Rope Tow"; -"type.aerialway.t.bar" = "Жичара са Т седиштем"; +"type.aerialway.t.bar" = "T-bar Lift"; -"type.piste_type.downhill" = "Спуст стаза"; +"type.piste_type.downhill" = "Downhill Ski Run"; -"type.piste_type.downhill.area" = "Спуст стаза"; +"type.piste_type.downhill.area" = "Downhill Ski Run"; -"type.piste_type.downhill.advanced" = "Скијање за напредне"; +"type.piste_type.downhill.advanced" = "Downhill Ski Run"; -"type.piste_type.downhill.advanced.area" = "Скијање за напредне"; +"type.piste_type.downhill.advanced.area" = "Downhill Ski Run"; -"type.piste_type.downhill.easy" = "Скијање за почетнике"; +"type.piste_type.downhill.easy" = "Downhill Ski Run"; -"type.piste_type.downhill.easy.area" = "Скијање за почетнике"; +"type.piste_type.downhill.easy.area" = "Downhill Ski Run"; -"type.piste_type.downhill.expert" = "Скијање за професионалце"; +"type.piste_type.downhill.expert" = "Downhill Ski Run"; -"type.piste_type.downhill.expert.area" = "Скијање за професионалце"; +"type.piste_type.downhill.expert.area" = "Downhill Ski Run"; -"type.piste_type.downhill.freeride" = "Бесплатно скијање"; +"type.piste_type.downhill.freeride" = "Downhill Ski Run"; -"type.piste_type.downhill.intermediate" = "Средња ски стаза"; +"type.piste_type.downhill.intermediate" = "Downhill Ski Run"; -"type.piste_type.downhill.intermediate.area" = "Средња ски стаза"; +"type.piste_type.downhill.intermediate.area" = "Downhill Ski Run"; -"type.piste_type.downhill.novice" = "Скијање за потпуне почетнике"; +"type.piste_type.downhill.novice" = "Downhill Ski Run"; -"type.piste_type.downhill.novice.area" = "Скијање за потпуне почетнике"; +"type.piste_type.downhill.novice.area" = "Downhill Ski Run"; -"type.piste_type.nordic" = "Стаза за нордијско скијање"; +"type.piste_type.nordic" = "Nordic Ski Trail"; -"type.piste_type.sled" = "Стаза за санкање"; +"type.piste_type.sled" = "Sledding Piste"; -"type.piste_type.sled.area" = "Стаза за санкање"; +"type.piste_type.sled.area" = "Sledding Piste"; -"type.piste_type.snow_park" = "Снежни парк"; +"type.piste_type.snow_park" = "Snow Park"; -"type.piste_type.hike" = "Снежна стаза за ходање"; +"type.piste_type.hike" = "Snow Hiking Trail"; -"type.piste_type.connection" = "Веза између стаза"; +"type.piste_type.connection" = "Piste Connection"; -"type.piste_type.skitour" = "Ски-тур стаза"; +"type.piste_type.skitour" = "Skitour Trail"; -"type.amenity.events_venue" = "Место одржавања догађаја"; +"type.amenity.events_venue" = "Events Venue"; -"type.shop.auction" = "Аукција"; +"type.shop.auction" = "Auction"; -"type.shop.collector" = "Колекционарство"; +"type.shop.collector" = "Collectables"; -"type.self_service.yes" = "Доступно самопослужење"; +"type.self_service.yes" = "Self-service available"; -"type.self_service.only" = "Самопослуживање"; +"type.self_service.only" = "Self-service only"; -"type.self_service.partially" = "Делимично самопослуживање"; +"type.self_service.partially" = "Partial self-service"; -"type.self_service.no" = "Нема самопослуживања"; +"type.self_service.no" = "No self-service"; /* https://wiki.openstreetmap.org/wiki/Key:social_facility */ -"type.amenity.social_facility" = "Социјална установа"; +"type.amenity.social_facility" = "Social Facility"; /* https://wiki.openstreetmap.org/wiki/Tag:emergency=emergency_ward_entrance */ -"type.emergency.emergency_ward_entrance" = "Улаз у хитну помоћ"; +"type.emergency.emergency_ward_entrance" = "Emergency Ward Entrance"; /* https://wiki.openstreetmap.org/wiki/Tag:amenity=dojo */ -"type.amenity.dojo" = "Дојо"; +"type.amenity.dojo" = "Dojo"; /* https://wiki.openstreetmap.org/wiki/Tag:leisure=sports_hall */ -"type.leisure.sports_hall" = "Спортска хала"; +"type.leisure.sports_hall" = "Sports hall"; diff --git a/iphone/Maps/LocalizedStrings/sv.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/sv.lproj/Localizable.strings index 3e62a51252..ff29c0c55d 100644 --- a/iphone/Maps/LocalizedStrings/sv.lproj/Localizable.strings +++ b/iphone/Maps/LocalizedStrings/sv.lproj/Localizable.strings @@ -1228,9 +1228,9 @@ "elevation_profile_descent" = "Backe"; -"elevation_profile_minaltitude" = "Min. höjd"; +"elevation_profile_min_elevation" = "Min. höjd"; -"elevation_profile_maxaltitude" = "Max. höjd"; +"elevation_profile_max_elevation" = "Max. höjd"; "elevation_profile_difficulty" = "Svårighet"; diff --git a/iphone/Maps/LocalizedStrings/sw.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/sw.lproj/Localizable.strings index 0ebb19310b..1971633112 100644 --- a/iphone/Maps/LocalizedStrings/sw.lproj/Localizable.strings +++ b/iphone/Maps/LocalizedStrings/sw.lproj/Localizable.strings @@ -1228,9 +1228,9 @@ "elevation_profile_descent" = "Ushukaji"; -"elevation_profile_minaltitude" = "Mwinuko wa chini kabisa"; +"elevation_profile_min_elevation" = "Min. mwinuko"; -"elevation_profile_maxaltitude" = "Mwinuko wa juu kabisa"; +"elevation_profile_max_elevation" = "Max. mwinuko"; "elevation_profile_difficulty" = "Ugumu"; diff --git a/iphone/Maps/LocalizedStrings/th.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/th.lproj/Localizable.strings index 91a33f5ebb..ff8ea3441b 100644 --- a/iphone/Maps/LocalizedStrings/th.lproj/Localizable.strings +++ b/iphone/Maps/LocalizedStrings/th.lproj/Localizable.strings @@ -1228,9 +1228,9 @@ "elevation_profile_descent" = "การลง"; -"elevation_profile_minaltitude" = "ระดับความสูงต่ำสุด"; +"elevation_profile_min_elevation" = "ต่ำสุด"; -"elevation_profile_maxaltitude" = "ระดับความสูงสูงสุด"; +"elevation_profile_max_elevation" = "สูงสุด"; "elevation_profile_difficulty" = "ลำบาก"; diff --git a/iphone/Maps/LocalizedStrings/tr.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/tr.lproj/Localizable.strings index a0880bf9bb..dc1f7f7d9f 100644 --- a/iphone/Maps/LocalizedStrings/tr.lproj/Localizable.strings +++ b/iphone/Maps/LocalizedStrings/tr.lproj/Localizable.strings @@ -1228,9 +1228,9 @@ "elevation_profile_descent" = "İniş"; -"elevation_profile_minaltitude" = "Min. rakım"; +"elevation_profile_min_elevation" = "Min. yükselti"; -"elevation_profile_maxaltitude" = "Maks. rakım"; +"elevation_profile_max_elevation" = "Maks. yükselti"; "elevation_profile_difficulty" = "Zorluk"; diff --git a/iphone/Maps/LocalizedStrings/uk.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/uk.lproj/Localizable.strings index 6124b047f1..0e79f786d3 100644 --- a/iphone/Maps/LocalizedStrings/uk.lproj/Localizable.strings +++ b/iphone/Maps/LocalizedStrings/uk.lproj/Localizable.strings @@ -1228,9 +1228,9 @@ "elevation_profile_descent" = "Спуск"; -"elevation_profile_minaltitude" = "Мін. висота"; +"elevation_profile_min_elevation" = "Мін. висота"; -"elevation_profile_maxaltitude" = "Макс. висота"; +"elevation_profile_max_elevation" = "Макс. висота"; "elevation_profile_difficulty" = "Складність"; diff --git a/iphone/Maps/LocalizedStrings/vi.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/vi.lproj/Localizable.strings index cdab580cfd..c09677c832 100644 --- a/iphone/Maps/LocalizedStrings/vi.lproj/Localizable.strings +++ b/iphone/Maps/LocalizedStrings/vi.lproj/Localizable.strings @@ -1228,9 +1228,9 @@ "elevation_profile_descent" = "Đi xuống"; -"elevation_profile_minaltitude" = "Độ cao tối thiểu"; +"elevation_profile_min_elevation" = "Min. độ cao"; -"elevation_profile_maxaltitude" = "Độ cao tối đa"; +"elevation_profile_max_elevation" = "Max. độ cao"; "elevation_profile_difficulty" = "Độ khó"; diff --git a/iphone/Maps/LocalizedStrings/zh-Hans.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/zh-Hans.lproj/Localizable.strings index cc0c034001..eea954daf9 100644 --- a/iphone/Maps/LocalizedStrings/zh-Hans.lproj/Localizable.strings +++ b/iphone/Maps/LocalizedStrings/zh-Hans.lproj/Localizable.strings @@ -1228,9 +1228,9 @@ "elevation_profile_descent" = "下坡"; -"elevation_profile_minaltitude" = "最小高度"; +"elevation_profile_min_elevation" = "最低高度"; -"elevation_profile_maxaltitude" = "最大高度"; +"elevation_profile_max_elevation" = "最高高度"; "elevation_profile_difficulty" = "难度"; diff --git a/iphone/Maps/LocalizedStrings/zh-Hant.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/zh-Hant.lproj/Localizable.strings index 8135f8b1ac..87576f954e 100644 --- a/iphone/Maps/LocalizedStrings/zh-Hant.lproj/Localizable.strings +++ b/iphone/Maps/LocalizedStrings/zh-Hant.lproj/Localizable.strings @@ -1228,9 +1228,9 @@ "elevation_profile_descent" = "下坡"; -"elevation_profile_minaltitude" = "最小高度"; +"elevation_profile_min_elevation" = "最低高度"; -"elevation_profile_maxaltitude" = "最大高度"; +"elevation_profile_max_elevation" = "最高高度"; "elevation_profile_difficulty" = "難度"; diff --git a/iphone/Maps/Maps.xcodeproj/project.pbxproj b/iphone/Maps/Maps.xcodeproj/project.pbxproj index 626c8e6813..1bd7840f1b 100644 --- a/iphone/Maps/Maps.xcodeproj/project.pbxproj +++ b/iphone/Maps/Maps.xcodeproj/project.pbxproj @@ -475,10 +475,25 @@ ED1080A72B791CFE0023F27E /* SocialMediaCollectionViewHeader.swift in Sources */ = {isa = PBXBuildFile; fileRef = ED1080A62B791CFE0023F27E /* SocialMediaCollectionViewHeader.swift */; }; ED1263AB2B6F99F900AD99F3 /* UIView+AddSeparator.swift in Sources */ = {isa = PBXBuildFile; fileRef = ED1263AA2B6F99F900AD99F3 /* UIView+AddSeparator.swift */; }; ED1ADA332BC6B1B40029209F /* CarPlayServiceTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = ED1ADA322BC6B1B40029209F /* CarPlayServiceTests.swift */; }; + ED2D74382D14337500660FBF /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = ED2D74342D14337500660FBF /* Assets.xcassets */; }; + ED2D743A2D14337500660FBF /* AppLogo.swift in Sources */ = {isa = PBXBuildFile; fileRef = ED2D742C2D14337500660FBF /* AppLogo.swift */; }; + ED2D743B2D14337500660FBF /* LiveActivityManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = ED2D742D2D14337500660FBF /* LiveActivityManager.swift */; }; + ED2D743C2D14337500660FBF /* StatisticDetailView.swift in Sources */ = {isa = PBXBuildFile; fileRef = ED2D742E2D14337500660FBF /* StatisticDetailView.swift */; }; + ED2D743D2D14337500660FBF /* StatisticValueView.swift in Sources */ = {isa = PBXBuildFile; fileRef = ED2D742F2D14337500660FBF /* StatisticValueView.swift */; }; + ED2D743E2D14337500660FBF /* TrackRecordingLiveActivityAttributes.swift in Sources */ = {isa = PBXBuildFile; fileRef = ED2D74302D14337500660FBF /* TrackRecordingLiveActivityAttributes.swift */; }; + ED2D743F2D14337500660FBF /* TrackRecordingLiveActivityConfiguration.swift in Sources */ = {isa = PBXBuildFile; fileRef = ED2D74312D14337500660FBF /* TrackRecordingLiveActivityConfiguration.swift */; }; + ED2D74402D14337500660FBF /* TrackRecordingLiveActivityView.swift in Sources */ = {isa = PBXBuildFile; fileRef = ED2D74322D14337500660FBF /* TrackRecordingLiveActivityView.swift */; }; + ED2D74412D14337500660FBF /* OMapsWidgetExtensionBundle.swift in Sources */ = {isa = PBXBuildFile; fileRef = ED2D74362D14337500660FBF /* OMapsWidgetExtensionBundle.swift */; }; + ED2D745E2D1433DE00660FBF /* TrackRecordingActivityManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = ED2D745D2D1433DE00660FBF /* TrackRecordingActivityManager.swift */; }; + ED2D74652D14357F00660FBF /* TrackRecordingLiveActivityAttributes.swift in Sources */ = {isa = PBXBuildFile; fileRef = ED2D74302D14337500660FBF /* TrackRecordingLiveActivityAttributes.swift */; }; + ED2D74662D1435A600660FBF /* LiveActivityManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = ED2D742D2D14337500660FBF /* LiveActivityManager.swift */; }; ED2E328E2D10500900807A08 /* TrackRecordingButtonArea.swift in Sources */ = {isa = PBXBuildFile; fileRef = ED46DD922D06F804007CACD6 /* TrackRecordingButtonArea.swift */; }; ED2E32912D10501700807A08 /* TrackRecordingViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = ED49D76F2CF0E3A8004AF27E /* TrackRecordingViewController.swift */; }; ED3EAC202B03C88100220A4A /* BottomTabBarButton.swift in Sources */ = {isa = PBXBuildFile; fileRef = ED3EAC1F2B03C88100220A4A /* BottomTabBarButton.swift */; }; ED43B8BD2C12063500D07BAA /* DocumentPicker.swift in Sources */ = {isa = PBXBuildFile; fileRef = ED43B8BC2C12063500D07BAA /* DocumentPicker.swift */; }; + ED46DDCE2D098A0B007CACD6 /* WidgetKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = ED46DDCD2D098A0B007CACD6 /* WidgetKit.framework */; }; + ED46DDD02D098A0B007CACD6 /* SwiftUI.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = ED46DDCF2D098A0B007CACD6 /* SwiftUI.framework */; }; + ED46DDE12D098A0C007CACD6 /* OMapsWidgetExtensionExtension.appex in Embed Foundation Extensions */ = {isa = PBXBuildFile; fileRef = ED46DDCC2D098A0B007CACD6 /* OMapsWidgetExtensionExtension.appex */; settings = {ATTRIBUTES = (RemoveHeadersOnCopy, ); }; }; ED4DC7772CAEDECC0029B338 /* ProductsViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = ED4DC7752CAEDECC0029B338 /* ProductsViewModel.swift */; }; ED4DC7782CAEDECC0029B338 /* ProductButton.swift in Sources */ = {isa = PBXBuildFile; fileRef = ED4DC7732CAEDECC0029B338 /* ProductButton.swift */; }; ED4DC7792CAEDECC0029B338 /* ProductsViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = ED4DC7742CAEDECC0029B338 /* ProductsViewController.swift */; }; @@ -694,6 +709,13 @@ remoteGlobalIDString = 6741A93D1BF340DE002C974C; remoteInfo = OMaps; }; + ED46DDDF2D098A0C007CACD6 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 29B97313FDCFA39411CA2CEA /* Project object */; + proxyType = 1; + remoteGlobalIDString = ED46DDCB2D098A0B007CACD6; + remoteInfo = OMapsWidgetExtensionExtension; + }; FA456C4626BDCC8E00B83C20 /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; containerPortal = FA456C4026BDCC8E00B83C20 /* shaders.xcodeproj */; @@ -738,6 +760,17 @@ name = "Embed Frameworks"; runOnlyForDeploymentPostprocessing = 0; }; + ED46DDE22D098A0C007CACD6 /* Embed Foundation Extensions */ = { + isa = PBXCopyFilesBuildPhase; + buildActionMask = 2147483647; + dstPath = ""; + dstSubfolderSpec = 13; + files = ( + ED46DDE12D098A0C007CACD6 /* OMapsWidgetExtensionExtension.appex in Embed Foundation Extensions */, + ); + name = "Embed Foundation Extensions"; + runOnlyForDeploymentPostprocessing = 0; + }; FA456C4E26BDCCC300B83C20 /* CopyFiles */ = { isa = PBXCopyFilesBuildPhase; buildActionMask = 2147483647; @@ -1406,9 +1439,23 @@ ED1080A62B791CFE0023F27E /* SocialMediaCollectionViewHeader.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SocialMediaCollectionViewHeader.swift; sourceTree = ""; }; ED1263AA2B6F99F900AD99F3 /* UIView+AddSeparator.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "UIView+AddSeparator.swift"; sourceTree = ""; }; ED1ADA322BC6B1B40029209F /* CarPlayServiceTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CarPlayServiceTests.swift; sourceTree = ""; }; + ED2D742C2D14337500660FBF /* AppLogo.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppLogo.swift; sourceTree = ""; }; + ED2D742D2D14337500660FBF /* LiveActivityManager.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LiveActivityManager.swift; sourceTree = ""; }; + ED2D742E2D14337500660FBF /* StatisticDetailView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = StatisticDetailView.swift; sourceTree = ""; }; + ED2D742F2D14337500660FBF /* StatisticValueView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = StatisticValueView.swift; sourceTree = ""; }; + ED2D74302D14337500660FBF /* TrackRecordingLiveActivityAttributes.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TrackRecordingLiveActivityAttributes.swift; sourceTree = ""; }; + ED2D74312D14337500660FBF /* TrackRecordingLiveActivityConfiguration.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TrackRecordingLiveActivityConfiguration.swift; sourceTree = ""; }; + ED2D74322D14337500660FBF /* TrackRecordingLiveActivityView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TrackRecordingLiveActivityView.swift; sourceTree = ""; }; + ED2D74342D14337500660FBF /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = ""; }; + ED2D74352D14337500660FBF /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; + ED2D74362D14337500660FBF /* OMapsWidgetExtensionBundle.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = OMapsWidgetExtensionBundle.swift; sourceTree = ""; }; + ED2D745D2D1433DE00660FBF /* TrackRecordingActivityManager.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TrackRecordingActivityManager.swift; sourceTree = ""; }; ED3EAC1F2B03C88100220A4A /* BottomTabBarButton.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BottomTabBarButton.swift; sourceTree = ""; }; ED43B8BC2C12063500D07BAA /* DocumentPicker.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DocumentPicker.swift; sourceTree = ""; }; ED46DD922D06F804007CACD6 /* TrackRecordingButtonArea.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TrackRecordingButtonArea.swift; sourceTree = ""; }; + ED46DDCC2D098A0B007CACD6 /* OMapsWidgetExtensionExtension.appex */ = {isa = PBXFileReference; explicitFileType = "wrapper.app-extension"; includeInIndex = 0; path = OMapsWidgetExtensionExtension.appex; sourceTree = BUILT_PRODUCTS_DIR; }; + ED46DDCD2D098A0B007CACD6 /* WidgetKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = WidgetKit.framework; path = System/Library/Frameworks/WidgetKit.framework; sourceTree = SDKROOT; }; + ED46DDCF2D098A0B007CACD6 /* SwiftUI.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = SwiftUI.framework; path = System/Library/Frameworks/SwiftUI.framework; sourceTree = SDKROOT; }; ED48BBB817C2B1E2003E7E92 /* CircleView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CircleView.h; sourceTree = ""; }; ED48BBB917C2B1E2003E7E92 /* CircleView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CircleView.m; sourceTree = ""; }; ED49D76F2CF0E3A8004AF27E /* TrackRecordingViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TrackRecordingViewController.swift; sourceTree = ""; }; @@ -1823,6 +1870,15 @@ ); runOnlyForDeploymentPostprocessing = 0; }; + ED46DDC92D098A0B007CACD6 /* Frameworks */ = { + isa = PBXFrameworksBuildPhase; + buildActionMask = 2147483647; + files = ( + ED46DDD02D098A0B007CACD6 /* SwiftUI.framework in Frameworks */, + ED46DDCE2D098A0B007CACD6 /* WidgetKit.framework in Frameworks */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; /* End PBXFrameworksBuildPhase section */ /* Begin PBXGroup section */ @@ -1864,6 +1920,7 @@ children = ( 6741AA5D1BF340DE002C974C /* Organic Maps (Debug).app */, ED097E762BB80C320006ED01 /* OMapsTests.xctest */, + ED46DDCC2D098A0B007CACD6 /* OMapsWidgetExtensionExtension.appex */, ); name = Products; sourceTree = ""; @@ -1890,6 +1947,7 @@ 29B97317FDCFA39411CA2CEA /* Resources */, F6E2FBFB1E097B9F0083EBEC /* UI */, ED1ADA312BC6B19E0029209F /* Tests */, + ED2D74372D14337500660FBF /* OMapsWidgetExtension */, ); indentWidth = 2; name = Maps; @@ -1958,6 +2016,8 @@ FA853BD026BC3B8A0026D455 /* libsuccinct.a */, FA853BA626BC3ACE0026D455 /* CoreApi.framework */, FA14E683276014C10066E453 /* libz.1.tbd */, + ED46DDCD2D098A0B007CACD6 /* WidgetKit.framework */, + ED46DDCF2D098A0B007CACD6 /* SwiftUI.framework */, ); name = Frameworks; sourceTree = ""; @@ -3109,6 +3169,7 @@ ED0C54942C6E14CB00253A5F /* TrackRecorder */ = { isa = PBXGroup; children = ( + ED2D745D2D1433DE00660FBF /* TrackRecordingActivityManager.swift */, ED0C54972C6E14E800253A5F /* TrackRecordingManager.swift */, ); path = TrackRecorder; @@ -3124,6 +3185,31 @@ path = Tests; sourceTree = ""; }; + ED2D74332D14337500660FBF /* LiveActivity */ = { + isa = PBXGroup; + children = ( + ED2D742C2D14337500660FBF /* AppLogo.swift */, + ED2D742D2D14337500660FBF /* LiveActivityManager.swift */, + ED2D742E2D14337500660FBF /* StatisticDetailView.swift */, + ED2D742F2D14337500660FBF /* StatisticValueView.swift */, + ED2D74302D14337500660FBF /* TrackRecordingLiveActivityAttributes.swift */, + ED2D74312D14337500660FBF /* TrackRecordingLiveActivityConfiguration.swift */, + ED2D74322D14337500660FBF /* TrackRecordingLiveActivityView.swift */, + ); + path = LiveActivity; + sourceTree = ""; + }; + ED2D74372D14337500660FBF /* OMapsWidgetExtension */ = { + isa = PBXGroup; + children = ( + ED2D74332D14337500660FBF /* LiveActivity */, + ED2D74342D14337500660FBF /* Assets.xcassets */, + ED2D74352D14337500660FBF /* Info.plist */, + ED2D74362D14337500660FBF /* OMapsWidgetExtensionBundle.swift */, + ); + path = OMapsWidgetExtension; + sourceTree = ""; + }; ED43B8B92C12061600D07BAA /* DocumentPicker */ = { isa = PBXGroup; children = ( @@ -3972,11 +4058,13 @@ 6741A9A01BF340DE002C974C /* Sources */, 6741AA311BF340DE002C974C /* Frameworks */, 4740184523F5BDE900A93C81 /* Embed Frameworks */, + ED46DDE22D098A0C007CACD6 /* Embed Foundation Extensions */, ); buildRules = ( ); dependencies = ( FA456C4D26BDCC9400B83C20 /* PBXTargetDependency */, + ED46DDE02D098A0C007CACD6 /* PBXTargetDependency */, ); name = OMaps; productName = Maps; @@ -4001,6 +4089,25 @@ productReference = ED097E762BB80C320006ED01 /* OMapsTests.xctest */; productType = "com.apple.product-type.bundle.unit-test"; }; + ED46DDCB2D098A0B007CACD6 /* OMapsWidgetExtensionExtension */ = { + isa = PBXNativeTarget; + buildConfigurationList = ED46DDE62D098A0C007CACD6 /* Build configuration list for PBXNativeTarget "OMapsWidgetExtensionExtension" */; + buildPhases = ( + ED46DDC82D098A0B007CACD6 /* Sources */, + ED46DDC92D098A0B007CACD6 /* Frameworks */, + ED46DDCA2D098A0B007CACD6 /* Resources */, + ); + buildRules = ( + ); + dependencies = ( + ); + name = OMapsWidgetExtensionExtension; + packageProductDependencies = ( + ); + productName = OMapsWidgetExtensionExtension; + productReference = ED46DDCC2D098A0B007CACD6 /* OMapsWidgetExtensionExtension.appex */; + productType = "com.apple.product-type.app-extension"; + }; /* End PBXNativeTarget section */ /* Begin PBXProject section */ @@ -4023,6 +4130,9 @@ }; }; }; + ED46DDCB2D098A0B007CACD6 = { + CreatedOnToolsVersion = 16.0; + }; }; }; buildConfigurationList = C01FCF4E08A954540054247B /* Build configuration list for PBXProject "Maps" */; @@ -4089,6 +4199,7 @@ targets = ( 6741A93D1BF340DE002C974C /* OMaps */, ED097E752BB80C320006ED01 /* OMapsTests */, + ED46DDCB2D098A0B007CACD6 /* OMapsWidgetExtensionExtension */, ); }; /* End PBXProject section */ @@ -4294,6 +4405,14 @@ ); runOnlyForDeploymentPostprocessing = 0; }; + ED46DDCA2D098A0B007CACD6 /* Resources */ = { + isa = PBXResourcesBuildPhase; + buildActionMask = 2147483647; + files = ( + ED2D74382D14337500660FBF /* Assets.xcassets in Resources */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; /* End PBXResourcesBuildPhase section */ /* Begin PBXSourcesBuildPhase section */ @@ -4374,6 +4493,7 @@ 9989273C2449E60200260CE2 /* BottomMenuInteractor.swift in Sources */, 47DF72B922520CE20004AB10 /* MWMRoutingOptions.mm in Sources */, 999FC12023ABA9AD00B0E6F9 /* SearchStyleSheet.swift in Sources */, + ED2D745E2D1433DE00660FBF /* TrackRecordingActivityManager.swift in Sources */, 3D15ACEE2155117000F725D5 /* MWMObjectsCategorySelectorDataSource.mm in Sources */, 9977E6A32480F9BF0073780C /* BottomMenuLayerButtonRenderer.swift in Sources */, 3454D7D11E07F045004AF2AD /* UIImage+RGBAData.m in Sources */, @@ -4585,6 +4705,7 @@ F6E2FF3C1E097BA00083EBEC /* MWMSearchTableView.m in Sources */, F6E2FF661E097BA00083EBEC /* MWMTTSSettingsViewController.mm in Sources */, 3454D7C21E07F045004AF2AD /* NSString+Categories.m in Sources */, + ED2D74662D1435A600660FBF /* LiveActivityManager.swift in Sources */, 34E7761F1F14DB48003040B3 /* PlacePageArea.swift in Sources */, ED79A5D82BDF8D6100952D1F /* LocalDirectoryMonitor.swift in Sources */, EDC4E34B2C5D1BEF009286A2 /* RecentlyDeletedCategoriesViewController.swift in Sources */, @@ -4701,6 +4822,7 @@ 993DF10823F6BDB100AC231A /* IColors.swift in Sources */, 4707E4B12372FE860017DF6E /* PlacePageViewController.swift in Sources */, 34AB66441FC5AA330078E451 /* RouteManagerViewModelProtocol.swift in Sources */, + ED2D74652D14357F00660FBF /* TrackRecordingLiveActivityAttributes.swift in Sources */, 4701A93D243A917900B87683 /* TouchTransparentView.swift in Sources */, 991FCA2423B11E61009AD684 /* BookmarksStyleSheet.swift in Sources */, 993DF12823F6BDB100AC231A /* IStyleSheet.swift in Sources */, @@ -4783,6 +4905,21 @@ ); runOnlyForDeploymentPostprocessing = 0; }; + ED46DDC82D098A0B007CACD6 /* Sources */ = { + isa = PBXSourcesBuildPhase; + buildActionMask = 2147483647; + files = ( + ED2D743A2D14337500660FBF /* AppLogo.swift in Sources */, + ED2D743B2D14337500660FBF /* LiveActivityManager.swift in Sources */, + ED2D743C2D14337500660FBF /* StatisticDetailView.swift in Sources */, + ED2D743D2D14337500660FBF /* StatisticValueView.swift in Sources */, + ED2D743E2D14337500660FBF /* TrackRecordingLiveActivityAttributes.swift in Sources */, + ED2D743F2D14337500660FBF /* TrackRecordingLiveActivityConfiguration.swift in Sources */, + ED2D74402D14337500660FBF /* TrackRecordingLiveActivityView.swift in Sources */, + ED2D74412D14337500660FBF /* OMapsWidgetExtensionBundle.swift in Sources */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; /* End PBXSourcesBuildPhase section */ /* Begin PBXTargetDependency section */ @@ -4791,6 +4928,11 @@ target = 6741A93D1BF340DE002C974C /* OMaps */; targetProxy = ED097E7A2BB80C320006ED01 /* PBXContainerItemProxy */; }; + ED46DDE02D098A0C007CACD6 /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + target = ED46DDCB2D098A0B007CACD6 /* OMapsWidgetExtensionExtension */; + targetProxy = ED46DDDF2D098A0C007CACD6 /* PBXContainerItemProxy */; + }; FA456C4D26BDCC9400B83C20 /* PBXTargetDependency */ = { isa = PBXTargetDependency; name = shaders_metal; @@ -5027,6 +5169,62 @@ }; name = Release; }; + ED46DDE32D098A0C007CACD6 /* Debug */ = { + isa = XCBuildConfiguration; + buildSettings = { + CODE_SIGN_STYLE = Automatic; + CURRENT_PROJECT_VERSION = 1; + DEBUG_INFORMATION_FORMAT = dwarf; + DEVELOPMENT_TEAM = 9Z6432XD7L; + GCC_PREPROCESSOR_DEFINITIONS = ( + "DEBUG=1", + "$(inherited)", + ); + GENERATE_INFOPLIST_FILE = YES; + INFOPLIST_FILE = OMapsWidgetExtension/Info.plist; + INFOPLIST_KEY_CFBundleDisplayName = OMapsWidgetExtension; + INFOPLIST_KEY_NSHumanReadableCopyright = "Copyright © 2024 Organic Maps. All rights reserved."; + IPHONEOS_DEPLOYMENT_TARGET = 16.2; + LD_RUNPATH_SEARCH_PATHS = ( + "$(inherited)", + "@executable_path/Frameworks", + "@executable_path/../../Frameworks", + ); + MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE; + PRODUCT_BUNDLE_IDENTIFIER = app.organicmaps.debug.OMapsWidgetExtension; + PRODUCT_NAME = "$(TARGET_NAME)"; + SKIP_INSTALL = YES; + SWIFT_ACTIVE_COMPILATION_CONDITIONS = "DEBUG $(inherited)"; + TARGETED_DEVICE_FAMILY = "1,2"; + }; + name = Debug; + }; + ED46DDE42D098A0C007CACD6 /* Release */ = { + isa = XCBuildConfiguration; + buildSettings = { + CODE_SIGN_STYLE = Automatic; + CURRENT_PROJECT_VERSION = 1; + DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; + DEVELOPMENT_TEAM = 9Z6432XD7L; + GENERATE_INFOPLIST_FILE = YES; + INFOPLIST_FILE = OMapsWidgetExtension/Info.plist; + INFOPLIST_KEY_CFBundleDisplayName = OMapsWidgetExtension; + INFOPLIST_KEY_NSHumanReadableCopyright = "Copyright © 2024 Organic Maps. All rights reserved."; + IPHONEOS_DEPLOYMENT_TARGET = 16.2; + LD_RUNPATH_SEARCH_PATHS = ( + "$(inherited)", + "@executable_path/Frameworks", + "@executable_path/../../Frameworks", + ); + MARKETING_VERSION = 1.0; + PRODUCT_BUNDLE_IDENTIFIER = app.organicmaps.debug.OMapsWidgetExtension; + PRODUCT_NAME = "$(TARGET_NAME)"; + SKIP_INSTALL = YES; + TARGETED_DEVICE_FAMILY = "1,2"; + VALIDATE_PRODUCT = YES; + }; + name = Release; + }; FAAB411B149BA84700C245B1 /* Debug */ = { isa = XCBuildConfiguration; baseConfigurationReference = 347526FA1DC0B00F00918CF5 /* common-debug.xcconfig */; @@ -5135,6 +5333,15 @@ defaultConfigurationIsVisible = 0; defaultConfigurationName = Debug; }; + ED46DDE62D098A0C007CACD6 /* Build configuration list for PBXNativeTarget "OMapsWidgetExtensionExtension" */ = { + isa = XCConfigurationList; + buildConfigurations = ( + ED46DDE32D098A0C007CACD6 /* Debug */, + ED46DDE42D098A0C007CACD6 /* Release */, + ); + defaultConfigurationIsVisible = 0; + defaultConfigurationName = Debug; + }; /* End XCConfigurationList section */ }; rootObject = 29B97313FDCFA39411CA2CEA /* Project object */; diff --git a/iphone/Maps/OMaps.plist b/iphone/Maps/OMaps.plist index d4a84f0cee..e77e7de883 100644 --- a/iphone/Maps/OMaps.plist +++ b/iphone/Maps/OMaps.plist @@ -282,5 +282,7 @@ OrganicMapsDEBUG + NSSupportsLiveActivities + diff --git a/iphone/Maps/OMapsWidgetExtension/Assets.xcassets/AccentColor.colorset/Contents.json b/iphone/Maps/OMapsWidgetExtension/Assets.xcassets/AccentColor.colorset/Contents.json new file mode 100644 index 0000000000..eb87897008 --- /dev/null +++ b/iphone/Maps/OMapsWidgetExtension/Assets.xcassets/AccentColor.colorset/Contents.json @@ -0,0 +1,11 @@ +{ + "colors" : [ + { + "idiom" : "universal" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/iphone/Maps/OMapsWidgetExtension/Assets.xcassets/AppIcon.appiconset/Contents.json b/iphone/Maps/OMapsWidgetExtension/Assets.xcassets/AppIcon.appiconset/Contents.json new file mode 100644 index 0000000000..2305880107 --- /dev/null +++ b/iphone/Maps/OMapsWidgetExtension/Assets.xcassets/AppIcon.appiconset/Contents.json @@ -0,0 +1,35 @@ +{ + "images" : [ + { + "idiom" : "universal", + "platform" : "ios", + "size" : "1024x1024" + }, + { + "appearances" : [ + { + "appearance" : "luminosity", + "value" : "dark" + } + ], + "idiom" : "universal", + "platform" : "ios", + "size" : "1024x1024" + }, + { + "appearances" : [ + { + "appearance" : "luminosity", + "value" : "tinted" + } + ], + "idiom" : "universal", + "platform" : "ios", + "size" : "1024x1024" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/iphone/Maps/OMapsWidgetExtension/Assets.xcassets/Contents.json b/iphone/Maps/OMapsWidgetExtension/Assets.xcassets/Contents.json new file mode 100644 index 0000000000..73c00596a7 --- /dev/null +++ b/iphone/Maps/OMapsWidgetExtension/Assets.xcassets/Contents.json @@ -0,0 +1,6 @@ +{ + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/iphone/Maps/OMapsWidgetExtension/Assets.xcassets/WidgetBackground.colorset/Contents.json b/iphone/Maps/OMapsWidgetExtension/Assets.xcassets/WidgetBackground.colorset/Contents.json new file mode 100644 index 0000000000..eb87897008 --- /dev/null +++ b/iphone/Maps/OMapsWidgetExtension/Assets.xcassets/WidgetBackground.colorset/Contents.json @@ -0,0 +1,11 @@ +{ + "colors" : [ + { + "idiom" : "universal" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/iphone/Maps/OMapsWidgetExtension/Assets.xcassets/logo.imageset/Contents.json b/iphone/Maps/OMapsWidgetExtension/Assets.xcassets/logo.imageset/Contents.json new file mode 100644 index 0000000000..7c58c478f6 --- /dev/null +++ b/iphone/Maps/OMapsWidgetExtension/Assets.xcassets/logo.imageset/Contents.json @@ -0,0 +1,12 @@ +{ + "images" : [ + { + "filename" : "logo.png", + "idiom" : "universal" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/iphone/Maps/OMapsWidgetExtension/Assets.xcassets/logo.imageset/logo.png b/iphone/Maps/OMapsWidgetExtension/Assets.xcassets/logo.imageset/logo.png new file mode 100644 index 0000000000..5c17369efc Binary files /dev/null and b/iphone/Maps/OMapsWidgetExtension/Assets.xcassets/logo.imageset/logo.png differ diff --git a/iphone/Maps/OMapsWidgetExtension/Info.plist b/iphone/Maps/OMapsWidgetExtension/Info.plist new file mode 100644 index 0000000000..0f118fb75e --- /dev/null +++ b/iphone/Maps/OMapsWidgetExtension/Info.plist @@ -0,0 +1,11 @@ + + + + + NSExtension + + NSExtensionPointIdentifier + com.apple.widgetkit-extension + + + diff --git a/iphone/Maps/OMapsWidgetExtension/LiveActivity/AppLogo.swift b/iphone/Maps/OMapsWidgetExtension/LiveActivity/AppLogo.swift new file mode 100644 index 0000000000..bbd87296d4 --- /dev/null +++ b/iphone/Maps/OMapsWidgetExtension/LiveActivity/AppLogo.swift @@ -0,0 +1,9 @@ +import SwiftUI + +struct AppLogo: View { + var body: some View { + Image(.logo) + .resizable() + .aspectRatio(contentMode: .fit) + } +} diff --git a/iphone/Maps/OMapsWidgetExtension/LiveActivity/LiveActivityManager.swift b/iphone/Maps/OMapsWidgetExtension/LiveActivity/LiveActivityManager.swift new file mode 100644 index 0000000000..85d6e5f925 --- /dev/null +++ b/iphone/Maps/OMapsWidgetExtension/LiveActivity/LiveActivityManager.swift @@ -0,0 +1,26 @@ +import ActivityKit +import SwiftUI + +@available(iOS 16.2, *) +final class LiveActivityManager { + static func startActivity(_ attributes: T, content: ActivityContent) throws -> Activity { + return try Activity.request(attributes: attributes, content: content, pushType: nil) + } + + static func update(_ activity: Activity, content: ActivityContent) { + Task { + await activity.update(content) + } + } + + static func stop(_ activity: Activity) { + // semaphore is used for removing the activity during the app termination + let semaphore = DispatchSemaphore(value: 0) + Task { + await activity.end(nil, dismissalPolicy: .immediate) + semaphore.signal() + } + semaphore.wait() + } +} + diff --git a/iphone/Maps/OMapsWidgetExtension/LiveActivity/StatisticDetailView.swift b/iphone/Maps/OMapsWidgetExtension/LiveActivity/StatisticDetailView.swift new file mode 100644 index 0000000000..65731c6e00 --- /dev/null +++ b/iphone/Maps/OMapsWidgetExtension/LiveActivity/StatisticDetailView.swift @@ -0,0 +1,28 @@ +import SwiftUI + +struct StatisticDetailView: View { + private let title: String + private let subtitle: String + + init(title: String, subtitle: String) { + self.title = title + self.subtitle = subtitle + } + + var body: some View { + VStack(alignment: .leading) { + Text(title) + .contentTransition(.numericText()) + .font(.system(size: 14, weight: .bold).monospacedDigit()) + .minimumScaleFactor(0.5) + .lineLimit(1) + .foregroundStyle(.white) + Text(subtitle) + .font(.system(size: 10)) + .minimumScaleFactor(0.5) + .lineLimit(2) + .multilineTextAlignment(.center) + .foregroundStyle(.white) + } + } +} diff --git a/iphone/Maps/OMapsWidgetExtension/LiveActivity/StatisticValueView.swift b/iphone/Maps/OMapsWidgetExtension/LiveActivity/StatisticValueView.swift new file mode 100644 index 0000000000..17ce6c229c --- /dev/null +++ b/iphone/Maps/OMapsWidgetExtension/LiveActivity/StatisticValueView.swift @@ -0,0 +1,17 @@ +import SwiftUI + +struct StatisticValueView: View { + private let value: String + + init(_ value: String) { + self.value = value + } + + var body: some View { + Text(value) + .contentTransition(.numericText()) + .minimumScaleFactor(0.1) + .font(.title3.bold().monospacedDigit()) + .foregroundStyle(.white) + } +} diff --git a/iphone/Maps/OMapsWidgetExtension/LiveActivity/TrackRecordingLiveActivityAttributes.swift b/iphone/Maps/OMapsWidgetExtension/LiveActivity/TrackRecordingLiveActivityAttributes.swift new file mode 100644 index 0000000000..107365a653 --- /dev/null +++ b/iphone/Maps/OMapsWidgetExtension/LiveActivity/TrackRecordingLiveActivityAttributes.swift @@ -0,0 +1,17 @@ +import ActivityKit +import AppIntents + +struct TrackRecordingLiveActivityAttributes: ActivityAttributes { + struct ContentState: Codable, Hashable { + struct StatisticsViewModel: Codable, Hashable { + let key: String + let value: String + } + let duration: StatisticsViewModel + let distance: StatisticsViewModel + let ascent: StatisticsViewModel + let descent: StatisticsViewModel + let maxElevation: StatisticsViewModel + let minElevation: StatisticsViewModel + } +} diff --git a/iphone/Maps/OMapsWidgetExtension/LiveActivity/TrackRecordingLiveActivityConfiguration.swift b/iphone/Maps/OMapsWidgetExtension/LiveActivity/TrackRecordingLiveActivityConfiguration.swift new file mode 100644 index 0000000000..54fda890e1 --- /dev/null +++ b/iphone/Maps/OMapsWidgetExtension/LiveActivity/TrackRecordingLiveActivityConfiguration.swift @@ -0,0 +1,26 @@ +import WidgetKit +import SwiftUI + +struct TrackRecordingLiveActivityConfiguration: Widget { + @Environment(\.colorScheme) private var colorScheme + + var body: some WidgetConfiguration { + ActivityConfiguration(for: TrackRecordingLiveActivityAttributes.self) { context in + TrackRecordingLiveActivityView(state: context.state) + } dynamicIsland: { context in + DynamicIsland { + DynamicIslandExpandedRegion(.center) { + // TODO: Implement the expanded view + } + } compactLeading: { + AppLogo() + } compactTrailing: { + StatisticValueView(context.state.duration.value) + } minimal: { + // TODO: Implement the minimal view + } + } + } +} + + diff --git a/iphone/Maps/OMapsWidgetExtension/LiveActivity/TrackRecordingLiveActivityView.swift b/iphone/Maps/OMapsWidgetExtension/LiveActivity/TrackRecordingLiveActivityView.swift new file mode 100644 index 0000000000..e1d5bbaa08 --- /dev/null +++ b/iphone/Maps/OMapsWidgetExtension/LiveActivity/TrackRecordingLiveActivityView.swift @@ -0,0 +1,71 @@ +import SwiftUI +import WidgetKit + +#if canImport(ActivityKit) + +struct TrackRecordingLiveActivityView: View { + let state: TrackRecordingLiveActivityAttributes.ContentState + + var body: some View { + VStack(alignment: .leading, spacing: 12) { + HStack(alignment: .top, spacing: 24) { + StatisticValueView(state.duration.value) + StatisticValueView(state.distance.value) + Spacer() + AppLogo() + .frame(width: 20, height: 20) + } + .padding([.top, .leading, .trailing], 16) + HStack(alignment: .top, spacing: 20) { + StatisticDetailView(title: state.ascent.value, subtitle: state.ascent.key) + StatisticDetailView(title: state.descent.value, subtitle: state.descent.key) + StatisticDetailView(title: state.maxElevation.value, subtitle: state.maxElevation.key) + StatisticDetailView(title: state.minElevation.value, subtitle: state.minElevation.key) + } + .padding([.leading, .trailing, .bottom], 16) + } + .background(.primary.opacity(0.15)) + } +} + +#if DEBUG +struct TrackRecordingLiveActivityWidget_Previews: PreviewProvider { + static var previews: some View { + Group { + let activityAttributes = TrackRecordingLiveActivityAttributes() + let activityState = TrackRecordingLiveActivityAttributes.ContentState( + duration: .init( + key: "Duration", + value: "1h 12min" + ), + distance: .init( + key: "Distance", + value: "12 km" + ), + ascent: .init( + key: "Ascent", + value: "100 m" + ), + descent: .init( + key: "Descent", + value: "100 m" + ), + maxElevation: .init( + key: "Max Elevation", + value: "100 m" + ), + minElevation: .init( + key: "Min Elevation", + value: "10 m" + ) + ) + + activityAttributes + .previewContext(activityState, viewKind: .content) + .previewDisplayName("Notification") + } + } +} +#endif + +#endif diff --git a/iphone/Maps/OMapsWidgetExtension/OMapsWidgetExtensionBundle.swift b/iphone/Maps/OMapsWidgetExtension/OMapsWidgetExtensionBundle.swift new file mode 100644 index 0000000000..5f85ff1b13 --- /dev/null +++ b/iphone/Maps/OMapsWidgetExtension/OMapsWidgetExtensionBundle.swift @@ -0,0 +1,9 @@ +import WidgetKit +import SwiftUI + +@main +struct OMapsWidgetExtensionBundle: WidgetBundle { + var body: some Widget { + TrackRecordingLiveActivityConfiguration() + } +} diff --git a/iphone/Maps/UI/BottomMenu/Menu/BottomMenuPresenter.swift b/iphone/Maps/UI/BottomMenu/Menu/BottomMenuPresenter.swift index 114e938af6..f6d6c546e9 100644 --- a/iphone/Maps/UI/BottomMenu/Menu/BottomMenuPresenter.swift +++ b/iphone/Maps/UI/BottomMenu/Menu/BottomMenuPresenter.swift @@ -101,7 +101,7 @@ extension BottomMenuPresenter { enabled: enabled) case .recordTrack: switch trackRecorder.recordingState { - case .inactive, .error: + case .inactive: cell.configure(imageName: "track_recorder_inactive", title: L("start_track_recording")) case .active: cell.configure(imageName: "track_recorder_active", title: L("stop_track_recording")) diff --git a/iphone/Maps/UI/PlacePage/Components/ElevationProfile/ElevationProfilePresenter.swift b/iphone/Maps/UI/PlacePage/Components/ElevationProfile/ElevationProfilePresenter.swift index b2666267aa..c9723a961b 100644 --- a/iphone/Maps/UI/PlacePage/Components/ElevationProfile/ElevationProfilePresenter.swift +++ b/iphone/Maps/UI/PlacePage/Components/ElevationProfile/ElevationProfilePresenter.swift @@ -41,8 +41,8 @@ class ElevationProfilePresenter: NSObject { descriptionModels = [ DescriptionsViewModel(title: L("elevation_profile_ascent"), value: data.ascent, imageName: "ic_em_ascent_24"), DescriptionsViewModel(title: L("elevation_profile_descent"), value: data.descent, imageName: "ic_em_descent_24"), - DescriptionsViewModel(title: L("elevation_profile_maxaltitude"), value: data.maxAttitude, imageName: "ic_em_max_attitude_24"), - DescriptionsViewModel(title: L("elevation_profile_minaltitude"), value: data.minAttitude, imageName: "ic_em_min_attitude_24") + DescriptionsViewModel(title: L("elevation_profile_max_elevation"), value: data.maxAttitude, imageName: "ic_em_max_attitude_24"), + DescriptionsViewModel(title: L("elevation_profile_min_elevation"), value: data.minAttitude, imageName: "ic_em_min_attitude_24") ] } diff --git a/map/framework.cpp b/map/framework.cpp index 9c519027fc..734ea57059 100644 --- a/map/framework.cpp +++ b/map/framework.cpp @@ -2249,6 +2249,7 @@ place_page::Info Framework::BuildPlacePageInfo(place_page::BuildInfo const & bui if (buildInfo.m_trackId != kml::kInvalidTrackId) { auto const & track = *GetBookmarkManager().GetTrack(buildInfo.m_trackId); + auto rect = track.GetLimitRect(); track.UpdateSelectionInfo(track.GetLimitRect(), trackSelectionInfo); } else diff --git a/platform/settings.cpp b/platform/settings.cpp index 0036adc124..371b49bcba 100644 --- a/platform/settings.cpp +++ b/platform/settings.cpp @@ -24,7 +24,6 @@ std::string_view kMeasurementUnits = "Units"; std::string_view kMapLanguageCode = "MapLanguageCode"; std::string_view kDeveloperMode = "DeveloperMode"; std::string_view kDonateUrl = "DonateUrl"; -std::string_view kNightMode = "NightMode"; StringStorage::StringStorage() : StringStorageBase(GetPlatform().SettingsPathForFile(SETTINGS_FILE_NAME)) {} diff --git a/platform/settings.hpp b/platform/settings.hpp index 41f0a357b3..9a0e0457ac 100644 --- a/platform/settings.hpp +++ b/platform/settings.hpp @@ -13,7 +13,6 @@ extern std::string_view kMeasurementUnits; extern std::string_view kDeveloperMode; extern std::string_view kMapLanguageCode; extern std::string_view kDonateUrl; -extern std::string_view kNightMode; template bool FromString(std::string const & str, T & outValue); diff --git a/platform/style_utils.hpp b/platform/style_utils.hpp deleted file mode 100644 index 5e845e50a2..0000000000 --- a/platform/style_utils.hpp +++ /dev/null @@ -1,11 +0,0 @@ -#pragma once - -namespace style_utils -{ -enum class NightMode : uint8_t -{ - Off = 0, - On = 1, -}; - -} // namespace style_utils diff --git a/qt/preferences_dialog.cpp b/qt/preferences_dialog.cpp index acc0fa8276..c52c224086 100644 --- a/qt/preferences_dialog.cpp +++ b/qt/preferences_dialog.cpp @@ -1,13 +1,11 @@ #include "qt/preferences_dialog.hpp" -#include "indexer/map_style.hpp" #include "coding/string_utf8_multilang.hpp" #include "map/framework.hpp" #include "platform/measurement_utils.hpp" #include "platform/preferred_languages.hpp" #include "platform/settings.hpp" -#include "platform/style_utils.hpp" #include #include @@ -136,38 +134,6 @@ namespace qt }); } - QButtonGroup * nightModeGroup = new QButtonGroup(this); - QGroupBox * nightModeRadioBox = new QGroupBox("Night Mode"); - { - using namespace style_utils; - QHBoxLayout * layout = new QHBoxLayout(); - - QRadioButton * radioButton = new QRadioButton("Off"); - layout->addWidget(radioButton); - nightModeGroup->addButton(radioButton, static_cast(NightMode::Off)); - - radioButton = new QRadioButton("On"); - layout->addWidget(radioButton); - nightModeGroup->addButton(radioButton, static_cast(NightMode::On)); - - nightModeRadioBox->setLayout(layout); - - int i; - if (!settings::Get(settings::kNightMode, i)) - { - i = static_cast(MapStyleIsDark(framework.GetMapStyle()) ? NightMode::On : NightMode::Off); - settings::Set(settings::kNightMode, i); - } - nightModeGroup->button(i)->setChecked(true); - - void (QButtonGroup::* buttonClicked)(int) = &QButtonGroup::idClicked; - connect(nightModeGroup, buttonClicked, [&framework](int i) - { - NightMode nightMode = static_cast(i); - settings::Set(settings::kNightMode, i); - framework.SetMapStyle((nightMode == NightMode::Off) ? GetLightMapStyleVariant(framework.GetMapStyle()) : GetDarkMapStyleVariant(framework.GetMapStyle())); - }); - } #ifdef BUILD_DESIGNER QCheckBox * indexRegenCheckBox = new QCheckBox("Enable auto regeneration of geometry index"); @@ -202,7 +168,6 @@ namespace qt finalLayout->addWidget(developerModeCheckBox); finalLayout->addWidget(mapLanguageLabel); finalLayout->addWidget(mapLanguageComboBox); - finalLayout->addWidget(nightModeRadioBox); #ifdef BUILD_DESIGNER finalLayout->addWidget(indexRegenCheckBox); #endif diff --git a/search/search_integration_tests/smoke_test.cpp b/search/search_integration_tests/smoke_test.cpp index c766fe2fd9..6c793b7d4d 100644 --- a/search/search_integration_tests/smoke_test.cpp +++ b/search/search_integration_tests/smoke_test.cpp @@ -185,9 +185,6 @@ UNIT_CLASS_TEST(SmokeTest, TypesSkipperTest) UNIT_CLASS_TEST(SmokeTest, CategoriesTest) { - // Checks all types in categories.txt for their searchability, - // which also depends on point drawability and presence of a name. - auto const & cl = classif(); /// @todo Should rewrite test @@ -249,17 +246,13 @@ UNIT_CLASS_TEST(SmokeTest, CategoriesTest) {"highway", "motorway_junction"}, {"landuse"}, {"man_made", "chimney"}, - {"man_made", "flagpole"}, - {"man_made", "mast"}, - {"man_made", "tower"}, - {"man_made", "water_tower"}, {"natural"}, {"office"}, {"place"}, {"waterway"}, /// @todo Controversial here. - /// Don't have point drawing rules (a label only), hence type will be removed for an empty name Feature. + /// Don't have point drawing rules except text -> type will be removed for Feature with empty name. {"building", "train_station"}, {"leisure", "track"}, {"natural", "beach"}, diff --git a/search/types_skipper.cpp b/search/types_skipper.cpp index 832d2e1acf..dd03773b32 100644 --- a/search/types_skipper.cpp +++ b/search/types_skipper.cpp @@ -15,24 +15,16 @@ TypesSkipper::TypesSkipper() { Classificator const & c = classif(); - /// @todo(pastk): why "office-*" are skipped? - /// also could be unnamed (yet) place-hamlet/isolated_dwelling? - /// and natural-water-pond/lake? - // POIs like natural-spring, waterway-waterfall, highway-bus_stop are saved from skipping by the TwoLevelPOIChecker(). StringIL const arrSkipEmptyName1[] = { {"area:highway"}, {"building"}, {"highway"}, {"landuse"}, {"natural"}, {"office"}, {"place"}, {"waterway"}, }; for (auto const & e : arrSkipEmptyName1) m_skipIfEmptyName[0].push_back(c.GetTypeByPath(e)); - StringIL const arrSkipEmptyName2[] = { + StringIL const arrSkipEmptyNameExact[] = { {"man_made", "chimney"}, - {"man_made", "flagpole"}, - {"man_made", "mast"}, - {"man_made", "tower"}, - {"man_made", "water_tower"}, }; - for (auto const & e : arrSkipEmptyName2) + for (auto const & e : arrSkipEmptyNameExact) m_skipIfEmptyName[1].push_back(c.GetTypeByPath(e)); m_skipAlways[0].push_back(c.GetTypeByPath({"isoline"})); @@ -52,7 +44,6 @@ void TypesSkipper::SkipEmptyNameTypes(feature::TypesHolder & types) const if (m_isPoi(type)) return false; - ftype::TruncValue(type, 2); if (HasType(m_skipIfEmptyName[1], type)) return true; diff --git a/search/types_skipper.hpp b/search/types_skipper.hpp index 50de6fff48..b80b24b1b3 100644 --- a/search/types_skipper.hpp +++ b/search/types_skipper.hpp @@ -8,20 +8,18 @@ namespace search { -// Helper functions to determine if a feature should be indexed for search. +// Skips some feature's types when feature name is empty. class TypesSkipper { public: TypesSkipper(); - // Removes types which shouldn't be searchable in case there is no feature name. void SkipEmptyNameTypes(feature::TypesHolder & types) const; // Always skip feature for search index even it has name and other useful types. // Useful for mixed features, sponsored objects. bool SkipAlways(feature::TypesHolder const & types) const; - // Skip "entrance" only features if they have no name or a number ref only. bool SkipSpecialNames(feature::TypesHolder const & types, std::string_view defName) const; private: