Merge branch 'waldyrious-patch-1'

administrative.json

@@ -11,6 +11,7 @@
         "hu": "Adminisztratív határok",
         "it": "Suddivisioni amministrative",
         "nl": "Administratieve gebieden",
+        "pt": "Regiões administrativas",
         "pt-br": "Divisão Político-Administrativa",
         "ro": "Zona administrativa",
         "ru": "Административные границы"

agriculture.json

@@ -12,6 +12,7 @@
         "it": "Agricoltura",
         "ja": "農業",
         "nl": "Landbouw",
+        "pt": "Agricultura",
         "pt-br": "Agricultura",
         "ro": "Agricultura",
         "ru": "Сельское хозяйство"

alternative_routes.json

@@ -8,6 +8,7 @@
         "it": "Itinerari segnalati",
         "ja": "ルート",
         "nl": "Alternatieve routes",
+        "pt": "Rotas",
         "pt-br": "Rotas",
         "ru": "Маршруты",
         "uk": "Маршрути"

buildings.json

@@ -4,6 +4,7 @@
         "de": "Gebäude",
         "en": "Buildings",
         "fr": "Bâtiments",
+        "pt": "Edifícios",
         "pt-br": "Edificações"
     },
     "query": {

car_furniture.json

@@ -9,6 +9,7 @@
         "ja": "街路設置公共物",
         "nl": "Straatmeubilair",
         "pl": "Elementy drogowe",
+        "pt": "Mobiliário urbano",
         "pt-br": "Mobiliário Urbano",
         "ru": "Элементы дороги",
         "uk": "Street Furniture"

car_maxspeed.json

@@ -4,6 +4,7 @@
         "de": "Höchstgeschwindigkeiten",
         "en": "Maxspeed",
         "fr": "Limites de vitesse",
+        "pt": "Velocidade máxima",
         "pt-br": "Velocidade Máxima"
     },
     "query": {

communication.json

@@ -13,6 +13,7 @@
         "it": "Communicazioni",
         "ja": "交流",
         "nl": "Communicatie",
+        "pt": "Comunicação",
         "pt-br": "Comunicação",
         "ro": "Comunicatii",
         "ru": "Услуги связи",

construction.json

@@ -9,7 +9,8 @@
         "it": "Cantieri",
         "ja": "工事中",
         "nl": "Bouwterrein",
-        "pt-br": "Canteiros de Obras",
+        "pt": "Locais de construção",
+        "pt-br": "Terrenos e Obras",
         "ru": "Места строительства"
     },
     "query": {

craft.json

@@ -3,7 +3,9 @@
     "name": {
         "de": "Handwerk",
         "en": "Craft",
-        "fr": "Artisanat"
+        "fr": "Artisanat",
+        "pt": "Artesanato",
+        "pt-br": "Ofícios"
     },
     "query": {
         "15": "(node[craft];way[craft];relation[craft];);"

culture.json

@@ -15,6 +15,7 @@
         "ja": "文化",
         "nl": "Cultuur",
         "pl": "Kultura",
+        "pt": "Cultura",
         "pt-br": "Cultura",
         "ro": "Cultura",
         "ru": "Культура",

culture_religion.json

@@ -15,6 +15,7 @@
         "ja": "文化",
         "nl": "Cultuur",
         "pl": "Kultura",
+        "pt": "Cultura e religião",
         "pt-br": "Cultura",
         "ro": "Cultura",
         "ru": "Культура",

cycle_amenities.json

@@ -59,7 +59,13 @@
             "",
             "{% if tags.capacity %}({{ tags.capacity }}){% endif %}"
         ],
-        "description": "{{ tagTrans(key, value) }}",
+        "description": [
+            "{% if tags.amenity == 'vending_machine' %}",
+            "{{ tagTransList('amenity=vending_machine vending', value) }}",
+            "{% else %}",
+            "{{ tagTrans(key, value) }}",
+            "{% endif %}"
+        ],
         "body": [
             "{% if tags.capacity %}",
             "  {{ keyTrans('capacity') }}: {{ tags.capacity }}",

cycle_routes.json

@@ -4,6 +4,7 @@
         "de": "Radrouten",
         "en": "Cycle Routes",
         "fr": "Itinéraires vélo",
+        "pt": "Ciclovias",
         "pt-br": "Ciclorrotas"
     },
     "query": {

education.json

@@ -12,6 +12,7 @@
         "ja": "教育サービス",
         "nl": "Onderwijs",
         "pl": "Edukacyjne",
+        "pt": "Educação",
         "pt-br": "Educação",
         "ro": "Servicii educatie",
         "ru": "Образование",

emergency.json

@@ -13,6 +13,7 @@
         "it": "Servizi d'emergenza",
         "ja": "緊急サービス",
         "nl": "Hulpdiensten",
+        "pt": "Emergência",
         "pt-br": "Emergência",
         "ro": "Servicii urgenta",
         "ru": "Экстренные службы",

financial.json

@@ -11,6 +11,7 @@
         "ja": "金融",
         "nl": "Financieel",
         "pl": "Finasowe",
+        "pt": "Finanças",
         "pt-br": "Finanças",
         "ro": "Financiar",
         "ru": "Финансы",

gastro-smoking.json

@@ -3,7 +3,9 @@
     "name": {
         "de": "Rauchfreie Gastronomie",
         "en": "Smokefree Gastronomy",
-        "fr": "Restauration sans tabac"
+        "fr": "Restauration sans tabac",
+        "pt": "Restauração livre de tabaco",
+        "pt-br": "Gastronomia sem fumo"
     },
     "query": {
         "16": "(node[amenity~'^(bar|biergarten|cafe|fast_food|ice_cream|pub|restaurant)$'];way[amenity~'^(bar|biergarten|cafe|fast_food|ice_cream|pub|restaurant)$'];relation[amenity~'^(bar|biergarten|cafe|fast_food|ice_cream|pub|restaurant)$'];);"

gastro.json

@@ -12,6 +12,7 @@
         "ja": "食べ物",
         "nl": "Gastronomie",
         "pl": "Gastronomia",
+        "pt": "Restauração",
         "pt-br": "Gastronomia",
         "ro": "Gastronomie",
         "ru": "Общепит",

health.json

@@ -11,6 +11,7 @@
         "ja": "健康",
         "nl": "Gezondheid",
         "pl": "Zdrowie",
+        "pt": "Saúde",
         "pt-br": "Saúde e Assistência",
         "ro": "Sanatate",
         "ru": "Медицина",

hiking_routes.json

@@ -4,6 +4,7 @@
         "de": "Wanderrouten",
         "en": "Hiking routes",
         "fr": "Itinéraires pédestres",
+        "pt": "Rotas de caminhada",
         "pt-br": "Rotas de Caminhada"
     },
     "query": {

historic.json

@@ -13,6 +13,7 @@
         "ja": "記念",
         "nl": "Historisch",
         "pl": "Miejsca Historyczne",
+        "pt": "Histórico",
         "pt-br": "Histórico",
         "ro": "Istoric",
         "ru": "Историческое",

index.json

@@ -22,7 +22,8 @@
                 "ro": "Timp liber, Sport si Cumparaturi",
                 "ru": "Досуг",
                 "uk": "Дозвілля",
-                "pt-br": "Lazer, Esportes e Compras"
+                "pt-br": "Lazer, Esportes e Compras",
+                "pt": "Lazer, desporto e compras"
             },
             "subCategories": [
                 {
@@ -66,7 +67,8 @@
                 "ro": "Servicii",
                 "ru": "Услуги",
                 "uk": "Послуги",
-                "pt-br": "Serviços"
+                "pt-br": "Serviços",
+                "pt": "Serviços"
             },
             "subCategories": [
                 {
@@ -114,7 +116,8 @@
                 "ro": "Transport",
                 "ru": "Транспорт",
                 "uk": "Транспорт",
-                "pt-br": "Transportes"
+                "pt-br": "Transportes",
+                "pt": "Transportes"
             },
             "subCategories": [
                 {
@@ -124,7 +127,8 @@
                         "de": "Zu Fuß gehen",
                         "en": "Walking",
                         "fr": "Marche à pied",
-                        "pt-br": "Pedestre"
+                        "pt-br": "Pedestre",
+                        "pt": "Pedestre"
                     },
                     "subCategories": [
                         {
@@ -142,7 +146,8 @@
                         "de": "Radfahren",
                         "en": "Cycling",
                         "fr": "Cyclisme",
-                        "pt-br": "Ciclismo"
+                        "pt-br": "Ciclismo",
+                        "pt": "Ciclismo"
                     },
                     "subCategories": [
                         {
@@ -172,7 +177,8 @@
                         "ro": "Transport public",
                         "ru": "Общественный транспорт",
                         "uk": "Громадський транспорт",
-                        "pt-br": "Transporte Público"
+                        "pt-br": "Transporte Público",
+                        "pt": "Transportes públicos"
                     },
                     "subCategories": [
                         {
@@ -202,7 +208,8 @@
                         "ro": "Trafic individual",
                         "ru": "Частный транспорт",
                         "uk": "Приватний транспорт",
-                        "pt-br": "Tráfego Individual"
+                        "pt-br": "Tráfego Individual",
+                        "pt": "Transporte individual"
                     },
                     "subCategories": [
                         {
@@ -222,7 +229,8 @@
                 "de": "Infrastruktur",
                 "en": "Infrastructure",
                 "fr": "Infrastructures",
-                "pt-br": "Infraestrutura"
+                "pt-br": "Infraestrutura",
+                "pt": "Infraestrutura"
             },
             "subCategories": [
                 {
@@ -252,7 +260,8 @@
                         "ja": "鉄道",
                         "nl": "Spoorwegen",
                         "ru": "Железные дороги",
-                        "pt-br": "Ferrovia"
+                        "pt-br": "Ferrovia",
+                        "pt": "Linhas ferroviárias"
                     },
                     "subCategories": [
                         {
@@ -287,7 +296,8 @@
                 "en": "Special",
                 "de": "Spezial",
                 "pt-br": "Especial",
-                "fr": "Catégories spéciales"
+                "fr": "Catégories spéciales",
+                "pt": "Especial"
             },
             "subCategories": [
                 {

internet.json

@@ -10,6 +10,7 @@
         "hu": "Internethozzáférés",
         "ja": "インターネット接続",
         "nl": "Internettoegang",
+        "pt": "Acesso à Internet",
         "pt-br": "Acesso à Internet",
         "ro": "Acces internet"
     }

lang/pt-br.json

@@ -9,8 +9,8 @@
     "category:car_maxspeed": "Velocidade Máxima",
     "category:children": "Equipamentos Infantis",
     "category:communication": "Comunicação",
-    "category:construction": "Canteiros de Obras",
-    "category:craft": "",
+    "category:construction": "Terrenos e Obras",
+    "category:craft": "Ofícios",
     "category:culture": "Cultura",
     "category:culture_religion": "Cultura",
     "category:cycle_amenities": "Equipamentos",
@@ -18,7 +18,7 @@
     "category:education": "Educação",
     "category:emergency": "Emergência",
     "category:financial": "Finanças",
-    "category:gastro-smoking": "",
+    "category:gastro-smoking": "Gastronomia sem fumo",
     "category:gastro": "Gastronomia",
     "category:health": "Saúde e Assistência",
     "category:hiking_routes": "Rotas de Caminhada",

lang/pt.json

@@ -0,0 +1,68 @@
+{
+    "category:administrative": "Regiões administrativas",
+    "category:agriculture": "Agricultura",
+    "category:alternative_amenities": "",
+    "category:alternative_routes": "Rotas",
+    "category:buildings": "Edifícios",
+    "category:car_amenities": "",
+    "category:car_furniture": "Mobiliário urbano",
+    "category:car_maxspeed": "Velocidade máxima",
+    "category:children": "",
+    "category:communication": "Comunicação",
+    "category:construction": "Locais de construção",
+    "category:craft": "Artesanato",
+    "category:culture": "Cultura",
+    "category:culture_religion": "Cultura e religião",
+    "category:cycle_amenities": "",
+    "category:cycle_routes": "Ciclovias",
+    "category:education": "Educação",
+    "category:emergency": "Emergência",
+    "category:financial": "Finanças",
+    "category:gastro-smoking": "Restauração livre de tabaco",
+    "category:gastro": "Restauração",
+    "category:health": "Saúde",
+    "category:hiking_routes": "Rotas de caminhada",
+    "category:historic": "Histórico",
+    "category:index": null,
+    "category:internet": "Acesso à Internet",
+    "category:leisure": "Lazer",
+    "category:military": "Militar",
+    "category:natural": "Formações naturais",
+    "category:other": "Outros",
+    "category:phone": "Telefone",
+    "category:places": "Lugares",
+    "category:places_geo": "Lugares",
+    "category:playgrounds": "Parques infantis",
+    "category:post": "Correios",
+    "category:power": "Eletricidade",
+    "category:pt_amenities": "",
+    "category:pt_routes": "Rotas",
+    "category:pt_stops": "Paragens e estações",
+    "category:public": "Serviços públicos",
+    "category:railway-electrification": "Eletrificação ferroviária",
+    "category:railway-infrastructure": "Infraestrutura ferroviária",
+    "category:religion": "Religião",
+    "category:residential": "Áreas residenciais",
+    "category:resources": "Extração de recursos",
+    "category:shop": "Compras",
+    "category:sport": "Desporto",
+    "category:tourism_attractions": "Turismo",
+    "category:tourism_services": "Turismo",
+    "category:transport_alternative": null,
+    "category:walk_amenities": "",
+    "category:waste": "Lixo",
+    "category:water": "Massas de água",
+    "category:wikipedia": "Wikipédia",
+    "category:works": "Fábricas",
+    "category:cycle_infrastructure": "Ciclovias",
+    "category:infrastructure": "Infraestrutura",
+    "category:leisure_sport_shopping": "Lazer, desporto e compras",
+    "category:railway": "Linhas ferroviárias",
+    "category:services": "Serviços",
+    "category:special": "Especial",
+    "category:transport": "Transportes",
+    "category:transport_car": "Transporte individual",
+    "category:transport_cycle": "Ciclismo",
+    "category:transport_pt": "Transportes públicos",
+    "category:transport_walk": "Pedestre"
+}

leisure.json

@@ -10,6 +10,7 @@
         "it": "Tempo libero",
         "ja": "レジャー",
         "nl": "Vrije tijd",
+        "pt": "Lazer",
         "pt-br": "Lazer",
         "ro": "Timp liber",
         "ru": "Досуг",

military.json

@@ -11,6 +11,7 @@
         "it": "Militare",
         "ja": "軍事",
         "nl": "Militair",
+        "pt": "Militar",
         "pt-br": "Militar",
         "ro": "Militar",
         "ru": "Вооружённые силы"

natural.json

@@ -11,6 +11,7 @@
         "it": "Natura",
         "ja": "自然地層",
         "nl": "Natuurlijke Formaties",
+        "pt": "Formações naturais",
         "pt-br": "Formações Naturais",
         "ru": "Природные образования",
         "uk": "Природне середовище"

other.json

@@ -10,6 +10,7 @@
         "it": "Altri",
         "ja": "その他",
         "nl": "Andere",
+        "pt": "Outros",
         "pt-br": "Outros",
         "ro": "Altele",
         "ru": "Прочее",

phone.json

@@ -9,6 +9,7 @@
         "hu": "Telefon",
         "ja": "電話",
         "nl": "Telefonie",
+        "pt": "Telefone",
         "pt-br": "Telefone",
         "ro": "Telefon"
     }

places.json

@@ -13,6 +13,7 @@
         "ja": "場所",
         "nl": "Plaatsen",
         "pl": "Miejsca",
+        "pt": "Lugares",
         "pt-br": "Lugares",
         "ro": "Locuri",
         "ru": "Места",

places_geo.json

@@ -13,6 +13,7 @@
         "ja": "場所",
         "nl": "Plaatsen",
         "pl": "Miejsca",
+        "pt": "Lugares",
         "pt-br": "Lugares",
         "ro": "Locuri",
         "ru": "Места",

playgrounds.json

@@ -6,6 +6,7 @@
         "en": "Playground",
         "et": "Mänguväljak",
         "fr": "Jeux pour enfants",
+        "pt": "Parques infantis",
         "pt-br": "Parquinhos",
         "ro": "Loc de joaca",
         "uk": "Дитячий майданчик"

post.json

@@ -7,6 +7,7 @@
         "hu": "Posta",
         "ja": "郵便",
         "nl": "Post",
+        "pt": "Correios",
         "pt-br": "Correios"
     }
 }

power.json

@@ -11,6 +11,7 @@
         "it": "Energia",
         "ja": "電力",
         "nl": "Stroomvoorziening",
+        "pt": "Eletricidade",
         "pt-br": "Energia",
         "ro": "Energie",
         "ru": "Энергетика"

pt_routes.json

@@ -4,6 +4,7 @@
         "de": "Routen",
         "en": "Routes",
         "fr": "Lignes",
+        "pt": "Rotas",
         "pt-br": "Rotas"
     },
     "query": {

pt_stops.json

@@ -13,6 +13,7 @@
         "ja": "停留所と駅",
         "nl": "Haltes en Stations",
         "pl": "Przystanki i Stacje",
+        "pt": "Paragens e estações",
         "pt-br": "Paradas e Estações",
         "ru": "Остановки и станции",
         "uk": "Зупинки та станції"

public.json

@@ -11,6 +11,7 @@
         "it": "Servizi pubblici",
         "ja": "公共サービス",
         "nl": "Openbare diensten",
+        "pt": "Serviços públicos",
         "pt-br": "Serviços Públicos",
         "ro": "Servicii publice",
         "ru": "Общественные места",

railway-electrification.json

@@ -4,6 +4,7 @@
         "de": "Eisenbahn Elektrifizierung",
         "en": "Railway electrification",
         "fr": "Puissance électrique ferroviaire",
+        "pt": "Eletrificação ferroviária",
         "pt-br": "Eletrificação Ferroviária"
     },
     "query": {

railway-infrastructure.json

@@ -4,6 +4,7 @@
         "de": "Eisenbahn Infrastruktur",
         "en": "Railway infrastructure",
         "fr": "Infrastructure ferroviaire",
+        "pt": "Infraestrutura ferroviária",
         "pt-br": "Infraestrutura Ferroviária"
     },
     "query": {

religion.json

@@ -12,6 +12,7 @@
         "it": "Religione",
         "ja": "宗教",
         "nl": "Religie",
+        "pt": "Religião",
         "pt-br": "Religião",
         "ro": "Religie",
         "ru": "Религия",
@@ -38,15 +39,29 @@
             "{% set value = tags.amenity %}",
             "{% endif %}"
         ],
-        "description": "{{ tagTrans(key, value) }}{% if tags.religion %}: {{ tagTransList('religion', tags.religion) }}{% endif %}",
+        "description": [
+            "{% if tags.building and tags.religion %}",
+            "  {% if isTranslated('tag:building=' ~ tags.building ~ ' religion=' ~ tags.religion) %}",
+            "    {{ trans('tag:building=' ~ tags.building ~ ' religion=' ~ tags.religion) }}",
+            "  {% elseif tags.building != 'yes' %}",
+            "    {{ trans('tag:building=' ~ tags.building) }}{% if tags.religion %}: {{ tagTransList('religion', tags.religion) }}{% endif %}",
+            "  {% else %}",
+            "    {{ tagTrans(key, value) }}: {{ tagTransList('religion', tags.religion) }}",
+            "  {% endif %}",
+            "{% else %}",
+            "  {{ tagTrans(key, value) }}{% if tags.religion %}: {{ tagTransList('religion', tags.religion) }}{% endif %}",
+            "{% endif %}"
+        ],
         "popupDescription": "{{ tagTrans(key, value) }}",
         "body": [
+            "{% if tags.building %}",
+            "  {{ keyTrans('building') }}: {{ tagTrans('building', tags.building) }}<br/>",
+            "{% endif %}",
             "{% if tags.religion %}",
-            "  {{ keyTrans('religion') }}: {{ tagTransList('religion', tags.religion) }}",
+            "  {{ keyTrans('religion') }}: {{ tagTransList('religion', tags.religion) }}<br/>",
             "{% endif %}",
             "{% if tags.denomination %}",
-            "  <br/>",
-            "  {{ keyTrans('denomination') }}: {{ tagTransList('denomination', tags.denomination) }}",
+            "  {{ keyTrans('denomination') }}: {{ tagTransList('denomination', tags.denomination) }}<br/>",
             "{% endif %}"
         ],
         "markerSign": [

residential.json

@@ -12,6 +12,7 @@
         "it": "Aree residenziali",
         "ja": "住居エリア",
         "nl": "Woongebieden",
+        "pt": "Áreas residenciais",
         "pt-br": "Áreas Residenciais",
         "ro": "Zona rezidentiala",
         "ru": "Жилые районы",

resources.json

@@ -8,6 +8,7 @@
         "fr": "Extraction des ressources",
         "it": "Areee estrattive",
         "nl": "Grondstoffenwinning",
+        "pt": "Extração de recursos",
         "pt-br": "Extração de Recursos",
         "ru": "Добыча ресурсов"
     },

shop.json

@@ -13,6 +13,7 @@
         "ja": "ショッピング",
         "nl": "Winkelen",
         "pl": "Zakupy",
+        "pt": "Compras",
         "pt-br": "Compras",
         "ro": "Cumpărături",
         "ru": "Покупки",

sport.json

@@ -11,6 +11,7 @@
         "it": "Sport",
         "ja": "スポーツ",
         "nl": "Sport",
+        "pt": "Desporto",
         "pt-br": "Esportes",
         "ru": "Спорт",
         "uk": "Спорт. Інше."

tourism_attractions.json

@@ -13,6 +13,7 @@
         "ja": "観光",
         "nl": "Toerisme",
         "pl": "Turystyka",
+        "pt": "Turismo",
         "pt-br": "Turismo",
         "ro": "Turism",
         "ru": "Туризм",

tourism_services.json

@@ -13,6 +13,7 @@
         "ja": "観光",
         "nl": "Toerisme",
         "pl": "Turystyka",
+        "pt": "Turismo",
         "pt-br": "Turismo",
         "ro": "Turism",
         "ru": "Туризм",

waste.json

@@ -9,6 +9,7 @@
         "it": "Smaltimento",
         "ja": "処理場",
         "nl": "Afvalverwijdering",
+        "pt": "Lixo",
         "pt-br": "Lixo",
         "ru": "Переработка отходов"
     },

water.json

@@ -4,6 +4,7 @@
         "de": "Gewässer",
         "en": "Waterbodies",
         "fr": "Hydrographie",
+        "pt": "Massas de água",
         "pt-br": "Hidrografia"
     },
     "query": {

wikipedia.json

@@ -4,6 +4,7 @@
         "de": "Wikipedia",
         "en": "Wikipedia",
         "fr": "Wikipédia",
+        "pt": "Wikipédia",
         "pt-br": "Wikipédia"
     },
     "query": {

works.json

@@ -9,6 +9,7 @@
         "it": "Fabbriche",
         "ja": "工場",
         "nl": "Fabrieken",
+        "pt": "Fábricas",
         "pt-br": "Fábricas",
         "ru": "Промышленность"
     },