diff --git a/assets/layers/bike_shop/bike_shop.json b/assets/layers/bike_shop/bike_shop.json
index 7f60ced897..11a98dc73e 100644
--- a/assets/layers/bike_shop/bike_shop.json
+++ b/assets/layers/bike_shop/bike_shop.json
@@ -610,7 +610,8 @@
"fr": "Magasin et réparateur de vélo",
"gl": "Tenda/arranxo de bicicletas",
"de": "Fahrradwerkstatt/geschäft",
- "it": "Negozio/riparatore di bici"
+ "it": "Negozio/riparatore di bici",
+ "ru": "Обслуживание велосипедов/магазин"
},
"tags": [
"shop=bicycle"
diff --git a/assets/layers/parking/parking.json b/assets/layers/parking/parking.json
index 56da2650a2..d4d1cab73e 100644
--- a/assets/layers/parking/parking.json
+++ b/assets/layers/parking/parking.json
@@ -1,7 +1,7 @@
{
"id": "parking",
"name": {
- "nl": "Parking"
+ "nl": "parking"
},
"minzoom": 12,
"source": {
@@ -25,13 +25,13 @@
{
"if": "amenity=parking",
"then": {
- "nl": "Auto Parking"
+ "nl": "{name:nl}"
}
},
{
"if": "amenity=motorcycle_parking",
"then": {
- "nl": "Motorfiets Parking"
+ "nl": "{name}"
}
},
{
diff --git a/assets/layers/viewpoint/viewpoint.json b/assets/layers/viewpoint/viewpoint.json
index c47aa23468..5c77ff8fd4 100644
--- a/assets/layers/viewpoint/viewpoint.json
+++ b/assets/layers/viewpoint/viewpoint.json
@@ -5,7 +5,8 @@
"nl": "Uitzicht",
"de": "Aussichtspunkt",
"fr": "Point de vue",
- "it": "Punto panoramico"
+ "it": "Punto panoramico",
+ "ru": "Смотровая площадка"
},
"description": {
"en": "A nice viewpoint or nice view. Ideal to add an image if no other category fits",
diff --git a/assets/layers/watermill/watermill.json b/assets/layers/watermill/watermill.json
index 1ff9b488df..ffa2f0dc9a 100644
--- a/assets/layers/watermill/watermill.json
+++ b/assets/layers/watermill/watermill.json
@@ -1,7 +1,7 @@
{
"id": "watermill",
"name": {
- "nl": "Watermolens"
+ "nl": "watermolens"
},
"minzoom": 12,
"source": {
diff --git a/assets/tagRenderings/questions.json b/assets/tagRenderings/questions.json
index 66d034cdc3..85cb3ebb28 100644
--- a/assets/tagRenderings/questions.json
+++ b/assets/tagRenderings/questions.json
@@ -18,7 +18,8 @@
"ru": "Какой номер телефона у {name}?",
"sv": "Vad är telefonnumret till {name}?",
"zh_Hant": "{name} 的電話號碼是什麼?",
- "it": "Qual è il numero di telefono di {name}?"
+ "it": "Qual è il numero di telefono di {name}?",
+ "pt_BR": "Qual o número de telefone de {name}?"
},
"render": "{phone}",
"freeform": {
@@ -49,7 +50,9 @@
"ru": "Какой адрес электронной почты у {name}?",
"id": "Apa alamat surel dari {name}?",
"zh_Hant": "{name} 的電子郵件地址是什麼?",
- "it": "Qual è l'indirizzo email di {name}?"
+ "it": "Qual è l'indirizzo email di {name}?",
+ "de": "Was ist die Mail-Adresse von {name}?",
+ "pt_BR": "Qual o endereço de e-mail de {name}?"
},
"freeform": {
"key": "email",
@@ -66,7 +69,9 @@
"ru": "Какой сайт у {name}?",
"id": "Apa situs web dari {name}?",
"zh_Hant": "{name} 網址是什麼?",
- "it": "Qual è il sito web di {name}?"
+ "it": "Qual è il sito web di {name}?",
+ "de": "Was ist die Website von {name}?",
+ "pt_BR": "Qual o site de {name}?"
},
"render": "{website}",
"freeform": {
@@ -82,7 +87,8 @@
"nb_NO": "Er det noe mer som er relevant du ikke kunne opplyse om i tidligere svar? Legg det til her.
Ikke gjenta fakta som allerede er nevnt",
"ru": "Есть ли еще что-то важное, о чем вы не смогли рассказать в предыдущих вопросах? Добавьте это здесь.
Не повторяйте уже изложенные факты",
"zh_Hant": "有什麼相關的資訊你無法在先前的問題回應的嗎?請加在這邊吧。
不要重覆答覆已經知道的事情",
- "it": "C'è ancora qualche informazione importante che non è stato possibile fornire nelle domande precedenti? Aggiungila qui.
Non ripetere informazioni già fornite"
+ "it": "C'è ancora qualche informazione importante che non è stato possibile fornire nelle domande precedenti? Aggiungila qui.
Non ripetere informazioni già fornite",
+ "de": "Gibt es noch etwas, das die vorhergehenden Fragen nicht abgedeckt haben? Hier wäre Platz dafür.
Bitte keine bereits erhobenen Informationen."
},
"render": "{description}",
"freeform": {
@@ -98,7 +104,8 @@
"nb_NO": "Hva er åpningstidene for {name})",
"ru": "Какое время работы у {name}?",
"zh_Hant": "{name} 的開放時間是什麼?",
- "it": "Quali sono gli orari di apertura di {name}?"
+ "it": "Quali sono gli orari di apertura di {name}?",
+ "pt_BR": "Qual o horário de funcionamento de {name}?"
},
"render": {
"de": "
Öffnungszeiten
{opening_hours_table(opening_hours)}",
@@ -127,11 +134,15 @@
"level": {
"question": {
"nl": "Op welke verdieping bevindt dit punt zich?",
- "en": "On what level is this feature located?"
+ "en": "On what level is this feature located?",
+ "de": "In welchem Stockwerk befindet sich dieses Objekt?"
},
"render": {
"en": "Located on the {level}th floor",
- "nl": "Bevindt zich op de {level}de verdieping"
+ "nl": "Bevindt zich op de {level}de verdieping",
+ "de": "Befindet sich im {level}ten Stock",
+ "pt_BR": "Localizado no {level}o andar",
+ "ru": "Расположено на {level}ом этаже"
},
"freeform": {
"key": "level",
@@ -142,7 +153,9 @@
"if": "location=underground",
"then": {
"en": "Located underground",
- "nl": "Bevindt zich ondergronds"
+ "nl": "Bevindt zich ondergronds",
+ "pt_BR": "Localizado no subsolo",
+ "ru": "Расположено под землей"
},
"hideInAnswer": true
},
@@ -150,14 +163,20 @@
"if": "level=0",
"then": {
"en": "Located on the ground floor",
- "nl": "Bevindt zich gelijkvloers"
+ "nl": "Bevindt zich gelijkvloers",
+ "de": "Ist im Erdgeschoss",
+ "pt_BR": "Localizado no térreo",
+ "ru": "Расположено на первом этаже"
}
},
{
"if": "level=1",
"then": {
"en": "Located on the first floor",
- "nl": "Bevindt zich op de eerste verdieping"
+ "nl": "Bevindt zich op de eerste verdieping",
+ "de": "Ist im ersten Stock",
+ "pt_BR": "Localizado no primeiro andar",
+ "ru": "Расположено на первом этаже"
}
}
]
diff --git a/assets/themes/widths/width.json b/assets/themes/widths/width.json
index 298b9a1281..f2a4262517 100644
--- a/assets/themes/widths/width.json
+++ b/assets/themes/widths/width.json
@@ -69,7 +69,10 @@
"freeform": {
"key": "width:carriageway",
"type": "length",
- "helperArgs": [21, "map"]
+ "helperArgs": [
+ 21,
+ "map"
+ ]
}
},
{
diff --git a/langs/layers/nl.json b/langs/layers/nl.json
index 016512e6d7..033ad5a51f 100644
--- a/langs/layers/nl.json
+++ b/langs/layers/nl.json
@@ -1185,6 +1185,9 @@
},
"1": {
"then": "{name}"
+ },
+ "2": {
+ "then": "Fietsenstalling"
}
}
},
diff --git a/langs/layers/ru.json b/langs/layers/ru.json
index c0f5353343..74a19a9ccb 100644
--- a/langs/layers/ru.json
+++ b/langs/layers/ru.json
@@ -1057,6 +1057,7 @@
}
},
"viewpoint": {
+ "name": "Смотровая площадка",
"presets": {
"0": {
"title": "Смотровая площадка"
@@ -1069,7 +1070,6 @@
"1": {
"question": "Вы хотите добавить описание?"
}
- },
- "name": "Смотровая площадка"
+ }
}
-}
+}
\ No newline at end of file
diff --git a/langs/shared-questions/de.json b/langs/shared-questions/de.json
index 6faff774e2..5d859a6940 100644
--- a/langs/shared-questions/de.json
+++ b/langs/shared-questions/de.json
@@ -3,30 +3,30 @@
"phone": {
"question": "Was ist die Telefonnummer von {name}?"
},
+ "email": {
+ "question": "Was ist die Mail-Adresse von {name}?"
+ },
+ "website": {
+ "question": "Was ist die Website von {name}?"
+ },
+ "description": {
+ "question": "Gibt es noch etwas, das die vorhergehenden Fragen nicht abgedeckt haben? Hier wäre Platz dafür.
Bitte keine bereits erhobenen Informationen."
+ },
"opening_hours": {
"question": "Was sind die Öffnungszeiten von {name}?",
"render": "Öffnungszeiten
{opening_hours_table(opening_hours)}"
},
"level": {
+ "question": "In welchem Stockwerk befindet sich dieses Objekt?",
+ "render": "Befindet sich im {level}ten Stock",
"mappings": {
- "2": {
- "then": "Ist im ersten Stock"
- },
"1": {
"then": "Ist im Erdgeschoss"
+ },
+ "2": {
+ "then": "Ist im ersten Stock"
}
- },
- "render": "Befindet sich im {level}ten Stock",
- "question": "In welchem Stockwerk befindet sich dieses Objekt?"
- },
- "description": {
- "question": "Gibt es noch etwas, das die vorhergehenden Fragen nicht abgedeckt haben? Hier wäre Platz dafür.
Bitte keine bereits erhobenen Informationen."
- },
- "website": {
- "question": "Was ist die Website von {name}?"
- },
- "email": {
- "question": "Was ist die Mail-Adresse von {name}?"
+ }
}
}
-}
+}
\ No newline at end of file
diff --git a/langs/shared-questions/pt_BR.json b/langs/shared-questions/pt_BR.json
index 9c577c3966..7016de7f0e 100644
--- a/langs/shared-questions/pt_BR.json
+++ b/langs/shared-questions/pt_BR.json
@@ -1,30 +1,30 @@
{
"undefined": {
- "level": {
- "render": "Localizado no {level}o andar",
- "mappings": {
- "2": {
- "then": "Localizado no primeiro andar"
- },
- "1": {
- "then": "Localizado no térreo"
- },
- "0": {
- "then": "Localizado no subsolo"
- }
- }
- },
- "opening_hours": {
- "question": "Qual o horário de funcionamento de {name}?"
- },
- "website": {
- "question": "Qual o site de {name}?"
+ "phone": {
+ "question": "Qual o número de telefone de {name}?"
},
"email": {
"question": "Qual o endereço de e-mail de {name}?"
},
- "phone": {
- "question": "Qual o número de telefone de {name}?"
+ "website": {
+ "question": "Qual o site de {name}?"
+ },
+ "opening_hours": {
+ "question": "Qual o horário de funcionamento de {name}?"
+ },
+ "level": {
+ "render": "Localizado no {level}o andar",
+ "mappings": {
+ "0": {
+ "then": "Localizado no subsolo"
+ },
+ "1": {
+ "then": "Localizado no térreo"
+ },
+ "2": {
+ "then": "Localizado no primeiro andar"
+ }
+ }
}
}
-}
+}
\ No newline at end of file
diff --git a/langs/shared-questions/ru.json b/langs/shared-questions/ru.json
index 93c56dc441..d1df15a6fc 100644
--- a/langs/shared-questions/ru.json
+++ b/langs/shared-questions/ru.json
@@ -17,18 +17,18 @@
"render": "Часы работы
{opening_hours_table(opening_hours)}"
},
"level": {
+ "render": "Расположено на {level}ом этаже",
"mappings": {
- "2": {
- "then": "Расположено на первом этаже"
+ "0": {
+ "then": "Расположено под землей"
},
"1": {
"then": "Расположено на первом этаже"
},
- "0": {
- "then": "Расположено под землей"
+ "2": {
+ "then": "Расположено на первом этаже"
}
- },
- "render": "Расположено на {level}ом этаже"
+ }
}
}
-}
+}
\ No newline at end of file