diff --git a/android/sdk/src/main/res/values-af/types_strings.xml b/android/sdk/src/main/res/values-af/types_strings.xml index 49155ea05..0bdba516d 100644 --- a/android/sdk/src/main/res/values-af/types_strings.xml +++ b/android/sdk/src/main/res/values-af/types_strings.xml @@ -117,7 +117,6 @@ Boekekas Herwinningsentrum - Herwinningshouer Herwinningshouer Batterye Klere diff --git a/android/sdk/src/main/res/values-ar/types_strings.xml b/android/sdk/src/main/res/values-ar/types_strings.xml index b3fecccf5..c9f692ed5 100644 --- a/android/sdk/src/main/res/values-ar/types_strings.xml +++ b/android/sdk/src/main/res/values-ar/types_strings.xml @@ -130,7 +130,6 @@ مكتبة، تبادل كتب مركز إعادة تدوير - حاوية لإعادة التدوير حاوية لإعادة التدوير بطاريات ملابس diff --git a/android/sdk/src/main/res/values-az/types_strings.xml b/android/sdk/src/main/res/values-az/types_strings.xml index 1eb1d3696..2822860f3 100644 --- a/android/sdk/src/main/res/values-az/types_strings.xml +++ b/android/sdk/src/main/res/values-az/types_strings.xml @@ -131,7 +131,6 @@ Kitab mübadiləsi Təkrar Emal Mərkəzi - Təkrar emal konteyneri Təkrar emal konteyneri Batareyalar Geyim diff --git a/android/sdk/src/main/res/values-be/types_strings.xml b/android/sdk/src/main/res/values-be/types_strings.xml index cbbf9f61e..e3622ab3c 100644 --- a/android/sdk/src/main/res/values-be/types_strings.xml +++ b/android/sdk/src/main/res/values-be/types_strings.xml @@ -54,7 +54,6 @@ Турма Прыём другсыравіны - Кантэйнер для другаснай сыравіны Кантэйнер для другаснай сыравіны Батарэйкі Адзенне diff --git a/android/sdk/src/main/res/values-ca/types_strings.xml b/android/sdk/src/main/res/values-ca/types_strings.xml index 7dfc28194..0d8a90824 100644 --- a/android/sdk/src/main/res/values-ca/types_strings.xml +++ b/android/sdk/src/main/res/values-ca/types_strings.xml @@ -131,7 +131,6 @@ Intercanvi de llibres Centre de reciclatge - Contenidor de reciclatge Contenidor de reciclatge Bateries Roba diff --git a/android/sdk/src/main/res/values-cs/types_strings.xml b/android/sdk/src/main/res/values-cs/types_strings.xml index 2b4a77fe0..d923028c5 100644 --- a/android/sdk/src/main/res/values-cs/types_strings.xml +++ b/android/sdk/src/main/res/values-cs/types_strings.xml @@ -115,7 +115,6 @@ Výměna knih Recyklační středisko - Recyklační nádoba Recyklační nádoba Baterie Staré oblečení diff --git a/android/sdk/src/main/res/values-da/types_strings.xml b/android/sdk/src/main/res/values-da/types_strings.xml index 9ffed3fee..e43f4c1b9 100644 --- a/android/sdk/src/main/res/values-da/types_strings.xml +++ b/android/sdk/src/main/res/values-da/types_strings.xml @@ -114,7 +114,6 @@ Bogbytteskab Genbrugsplads - Genbrugscontainer Genbrugscontainer Batterier Tekstil diff --git a/android/sdk/src/main/res/values-de/types_strings.xml b/android/sdk/src/main/res/values-de/types_strings.xml index 1b1a4c8ce..490b797a8 100644 --- a/android/sdk/src/main/res/values-de/types_strings.xml +++ b/android/sdk/src/main/res/values-de/types_strings.xml @@ -131,7 +131,6 @@ Bücherschrank Recyclinghof - Wertstoffcontainer Wertstoffcontainer Batterien Altkleider diff --git a/android/sdk/src/main/res/values-el/types_strings.xml b/android/sdk/src/main/res/values-el/types_strings.xml index b5d0c3a8f..67d9118a3 100644 --- a/android/sdk/src/main/res/values-el/types_strings.xml +++ b/android/sdk/src/main/res/values-el/types_strings.xml @@ -122,7 +122,6 @@ Ανταλλαγή βιβλίων Κέντρο ανακύκλωσης - Κάδος ανακύκλωσης Κάδος ανακύκλωσης Μπαταρίες Ρούχα diff --git a/android/sdk/src/main/res/values-et/types_strings.xml b/android/sdk/src/main/res/values-et/types_strings.xml index f9bb51057..35c93cf1d 100644 --- a/android/sdk/src/main/res/values-et/types_strings.xml +++ b/android/sdk/src/main/res/values-et/types_strings.xml @@ -131,7 +131,6 @@ Avalik raamaturiiul Jäätmejaam - Taaskasutuskonteiner Taaskasutuskonteiner Patareid Rõivad diff --git a/android/sdk/src/main/res/values-eu/types_strings.xml b/android/sdk/src/main/res/values-eu/types_strings.xml index ef946faef..a3b3ac1e6 100644 --- a/android/sdk/src/main/res/values-eu/types_strings.xml +++ b/android/sdk/src/main/res/values-eu/types_strings.xml @@ -129,7 +129,6 @@ Liburu trukea Birziklapen zentroa - Birziklatzeko edukiontzia Birziklatzeko edukiontzia Bateriak Arropa diff --git a/android/sdk/src/main/res/values-fa/types_strings.xml b/android/sdk/src/main/res/values-fa/types_strings.xml index 9e531887a..5ff2035ee 100644 --- a/android/sdk/src/main/res/values-fa/types_strings.xml +++ b/android/sdk/src/main/res/values-fa/types_strings.xml @@ -115,7 +115,6 @@ میکده مرکز بازیافت - ظرف بازیافت ظرف بازیافت ﺎﻫ ﯼﺮﺗﺎﺑ لباسهای قدیمی diff --git a/android/sdk/src/main/res/values-fi/types_strings.xml b/android/sdk/src/main/res/values-fi/types_strings.xml index ec70fa785..415140d73 100644 --- a/android/sdk/src/main/res/values-fi/types_strings.xml +++ b/android/sdk/src/main/res/values-fi/types_strings.xml @@ -128,7 +128,6 @@ Kirjahylly Kierrätyskeskus - Kierrätysjäteastia Kierrätysjäteastia Paristot Vaatteet diff --git a/android/sdk/src/main/res/values-gl/types_strings.xml b/android/sdk/src/main/res/values-gl/types_strings.xml index 65e4200b7..724f995ed 100644 --- a/android/sdk/src/main/res/values-gl/types_strings.xml +++ b/android/sdk/src/main/res/values-gl/types_strings.xml @@ -138,7 +138,6 @@ Pub Intercambio de libros Centro de reciclaxe - Contedora de reciclaxe Contedora de reciclaxe Baterías Roupa diff --git a/android/sdk/src/main/res/values-gsw/types_strings.xml b/android/sdk/src/main/res/values-gsw/types_strings.xml index b3bba664d..c88a1a205 100644 --- a/android/sdk/src/main/res/values-gsw/types_strings.xml +++ b/android/sdk/src/main/res/values-gsw/types_strings.xml @@ -131,7 +131,6 @@ Beiz Büecherschrank Recyclinghof - Recyclingcontainer Recyclingcontainer Batterie Altchleider diff --git a/android/sdk/src/main/res/values-hi/types_strings.xml b/android/sdk/src/main/res/values-hi/types_strings.xml index 0eb91212f..13d2f14cf 100644 --- a/android/sdk/src/main/res/values-hi/types_strings.xml +++ b/android/sdk/src/main/res/values-hi/types_strings.xml @@ -97,7 +97,6 @@ सार्वजनिक किताबों की अलमारी रीसाइक्लिंग सेंटर - रीसाइक्लिंग कंटेनर रीसाइक्लिंग कंटेनर रेस्तरां सेनेटरी डंप स्टेशन diff --git a/android/sdk/src/main/res/values-hu/types_strings.xml b/android/sdk/src/main/res/values-hu/types_strings.xml index 8755cb49a..f7789877f 100644 --- a/android/sdk/src/main/res/values-hu/types_strings.xml +++ b/android/sdk/src/main/res/values-hu/types_strings.xml @@ -117,7 +117,6 @@ Nyilvános könyvespolc Hulladékudvar - Szelektív hulladékgyűjtés Szelektív hulladékgyűjtő konténer Elem, akkumulátor Ruha diff --git a/android/sdk/src/main/res/values-in/types_strings.xml b/android/sdk/src/main/res/values-in/types_strings.xml index 1e19f36f8..5740af666 100644 --- a/android/sdk/src/main/res/values-in/types_strings.xml +++ b/android/sdk/src/main/res/values-in/types_strings.xml @@ -112,7 +112,6 @@ Rak Buku TPA - Wadah daur ulang Wadah daur ulang Baterai Pakaian lama diff --git a/android/sdk/src/main/res/values-is/types_strings.xml b/android/sdk/src/main/res/values-is/types_strings.xml index 2bd816392..7a3eaa79d 100644 --- a/android/sdk/src/main/res/values-is/types_strings.xml +++ b/android/sdk/src/main/res/values-is/types_strings.xml @@ -35,7 +35,6 @@ Krá Bókaskipti Endurvinnslustöð - Endurvinnslugámur Plastflöskur Brotajárn Skóli diff --git a/android/sdk/src/main/res/values-iw/types_strings.xml b/android/sdk/src/main/res/values-iw/types_strings.xml index c7cb9a72f..d4580a0d5 100644 --- a/android/sdk/src/main/res/values-iw/types_strings.xml +++ b/android/sdk/src/main/res/values-iw/types_strings.xml @@ -129,7 +129,6 @@ כוננית ספרים ציבורית מרכז מיחזור - מיכל מיחזור מיכל מיחזור סוללות בגדים diff --git a/android/sdk/src/main/res/values-ko/types_strings.xml b/android/sdk/src/main/res/values-ko/types_strings.xml index 72ab27b09..c388283fc 100644 --- a/android/sdk/src/main/res/values-ko/types_strings.xml +++ b/android/sdk/src/main/res/values-ko/types_strings.xml @@ -117,7 +117,6 @@ 도서 교환 재활용센터 - 재활용 쓰레기통 재활용 쓰레기통 배터리 낡은 옷 diff --git a/android/sdk/src/main/res/values-mr/types_strings.xml b/android/sdk/src/main/res/values-mr/types_strings.xml index f74fe55fb..c346eaa3c 100644 --- a/android/sdk/src/main/res/values-mr/types_strings.xml +++ b/android/sdk/src/main/res/values-mr/types_strings.xml @@ -112,7 +112,6 @@ पब भंगार केंद्र - रीसायकलिंग कंटेनर रीसायकलिंग कंटेनर घरगुती बॅटरी कपडे diff --git a/android/sdk/src/main/res/values-nl/types_strings.xml b/android/sdk/src/main/res/values-nl/types_strings.xml index 4444dc287..f3092001c 100644 --- a/android/sdk/src/main/res/values-nl/types_strings.xml +++ b/android/sdk/src/main/res/values-nl/types_strings.xml @@ -130,7 +130,6 @@ Boekenkast Milieustraat - Recycling container Recycling container Batterijen Oude kleding diff --git a/android/sdk/src/main/res/values-pl/types_strings.xml b/android/sdk/src/main/res/values-pl/types_strings.xml index 5c6f5644a..d6bf050a1 100644 --- a/android/sdk/src/main/res/values-pl/types_strings.xml +++ b/android/sdk/src/main/res/values-pl/types_strings.xml @@ -131,7 +131,6 @@ Wymiana książek Centrum przetwórstwa odpadów - Pojemnik do recyklingu Pojemnik do recyklingu Baterie Stare ubrania diff --git a/android/sdk/src/main/res/values-pt-rBR/types_strings.xml b/android/sdk/src/main/res/values-pt-rBR/types_strings.xml index b50a9db88..9dc011ff1 100644 --- a/android/sdk/src/main/res/values-pt-rBR/types_strings.xml +++ b/android/sdk/src/main/res/values-pt-rBR/types_strings.xml @@ -110,7 +110,6 @@ Biblioteca livre Centro de reciclagem - Contêiner de reciclagem Contêiner de reciclagem Baterias Roupas velhas diff --git a/android/sdk/src/main/res/values-ro/types_strings.xml b/android/sdk/src/main/res/values-ro/types_strings.xml index 617e24218..92f5dc79a 100644 --- a/android/sdk/src/main/res/values-ro/types_strings.xml +++ b/android/sdk/src/main/res/values-ro/types_strings.xml @@ -110,7 +110,6 @@ Bibliotecă Centru de reciclare - Containere pentru reciclare Containere pentru reciclare Baterii Haine vechi diff --git a/android/sdk/src/main/res/values-ru/types_strings.xml b/android/sdk/src/main/res/values-ru/types_strings.xml index ac1c4e1dd..168382e53 100644 --- a/android/sdk/src/main/res/values-ru/types_strings.xml +++ b/android/sdk/src/main/res/values-ru/types_strings.xml @@ -131,7 +131,6 @@ Книгообмен Приём вторсырья - Контейнер для вторсырья Контейнер для вторсырья Батарейки Одежда diff --git a/android/sdk/src/main/res/values-sk/types_strings.xml b/android/sdk/src/main/res/values-sk/types_strings.xml index 39751e7bf..74dfb235b 100644 --- a/android/sdk/src/main/res/values-sk/types_strings.xml +++ b/android/sdk/src/main/res/values-sk/types_strings.xml @@ -125,7 +125,6 @@ Knižná búdka Zberné suroviny - Recyklačný kontajner Recyklačný kontajner Batérie Staré oblečenie diff --git a/android/sdk/src/main/res/values-sr/types_strings.xml b/android/sdk/src/main/res/values-sr/types_strings.xml index 276a8fbb6..4416d8f71 100644 --- a/android/sdk/src/main/res/values-sr/types_strings.xml +++ b/android/sdk/src/main/res/values-sr/types_strings.xml @@ -130,7 +130,6 @@ Размена књига Центар за рециклажу - Контејнер за рециклажу Контејнер за рециклажу Бетерије Стара одећа diff --git a/android/sdk/src/main/res/values-sv/types_strings.xml b/android/sdk/src/main/res/values-sv/types_strings.xml index 4578a1c41..64fd6541f 100644 --- a/android/sdk/src/main/res/values-sv/types_strings.xml +++ b/android/sdk/src/main/res/values-sv/types_strings.xml @@ -115,7 +115,6 @@ Bokskåp Återvinningscentral - Behållare för återvinningsbart avfall Behållare för återvinningsbart avfall Batterier Gamla kläder diff --git a/android/sdk/src/main/res/values-ta/types_strings.xml b/android/sdk/src/main/res/values-ta/types_strings.xml index 790ad6c07..a3d069069 100644 --- a/android/sdk/src/main/res/values-ta/types_strings.xml +++ b/android/sdk/src/main/res/values-ta/types_strings.xml @@ -146,7 +146,6 @@ பப் புத்தக பரிமாற்றம் மறுசுழற்சி நடுவண் - மறுசுழற்சி கொள்கலன் மறுசுழற்சி கொள்கலன் பேட்டரிகள் ஆடைகள் diff --git a/android/sdk/src/main/res/values-th/types_strings.xml b/android/sdk/src/main/res/values-th/types_strings.xml index cef4261ca..546cc0b9d 100644 --- a/android/sdk/src/main/res/values-th/types_strings.xml +++ b/android/sdk/src/main/res/values-th/types_strings.xml @@ -118,7 +118,6 @@ ตู้หนังสือ สถานที่แลกเปลี่ยนหนังสือ ศูนย์รีไซเคิล - บรรจุภัณฑ์รีไซเคิล บรรจุภัณฑ์รีไซเคิล แบตเตอรี่ เสื้อผ้าเก่า diff --git a/android/sdk/src/main/res/values-tr/types_strings.xml b/android/sdk/src/main/res/values-tr/types_strings.xml index a027abf63..ce516b67c 100644 --- a/android/sdk/src/main/res/values-tr/types_strings.xml +++ b/android/sdk/src/main/res/values-tr/types_strings.xml @@ -131,7 +131,6 @@ Kitap Değişimi Geri Dönüşüm Merkezi - Atık Toplama Merkezi Atık Toplama Merkezi Piller Kıyafet diff --git a/android/sdk/src/main/res/values-uk/types_strings.xml b/android/sdk/src/main/res/values-uk/types_strings.xml index 4936fd7f6..b0b5c32ed 100644 --- a/android/sdk/src/main/res/values-uk/types_strings.xml +++ b/android/sdk/src/main/res/values-uk/types_strings.xml @@ -131,7 +131,6 @@ Книгообмін Прийом вторсировини - Контейнер для вторсировини Контейнер для вторсировини Батарейки Одяг diff --git a/android/sdk/src/main/res/values-vi/types_strings.xml b/android/sdk/src/main/res/values-vi/types_strings.xml index 8327abcc2..6f79a9956 100644 --- a/android/sdk/src/main/res/values-vi/types_strings.xml +++ b/android/sdk/src/main/res/values-vi/types_strings.xml @@ -117,7 +117,6 @@ Kệ sách Trung tâm tái sinh - Thùng rác Thùng rác Ắc quy Quần áo cũ diff --git a/android/sdk/src/main/res/values/types_strings.xml b/android/sdk/src/main/res/values/types_strings.xml index 2c243496e..ae5d9424e 100644 --- a/android/sdk/src/main/res/values/types_strings.xml +++ b/android/sdk/src/main/res/values/types_strings.xml @@ -154,8 +154,7 @@ Pub Book Exchange - Recycling Center - Recycling Container + Recycling Centre Recycling Container Batteries Clothes diff --git a/data/categories-strings/ar.json/localize.json b/data/categories-strings/ar.json/localize.json index b0e744711..bbece6ce7 100644 --- a/data/categories-strings/ar.json/localize.json +++ b/data/categories-strings/ar.json/localize.json @@ -162,7 +162,7 @@ "amenity-vehicle_inspection": "فحص المركبة", "amenity-waste_disposal": "قمامة|مهملات|سلة مهملات|صندوق قمامة", "amenity-recycling-centre|@category_recycling": "مركز إعادة تدوير", -"amenity-recycling-container|amenity-recycling|@category_recycling": "حاوية لإعادة التدوير", +"amenity-recycling-container|@category_recycling": "حاوية لإعادة التدوير", "recycling-batteries|@category_recycling": "ﺕﺎﻳﺭﺎﻄﺑ|بطاريات", "recycling-clothes|@category_recycling": "إعادة تدوير الملابس القديم|ملابس قديمة|ملابس", "recycling-glass_bottles|@category_recycling": "زجاجات زجاجية", diff --git a/data/categories-strings/be.json/localize.json b/data/categories-strings/be.json/localize.json index 49e4f19db..040c58ac4 100644 --- a/data/categories-strings/be.json/localize.json +++ b/data/categories-strings/be.json/localize.json @@ -109,7 +109,7 @@ "amenity-post_office|post_office-post_partner|@category_post": "3Паштовае аддзяленне", "amenity-vehicle_inspection": "Тэхагляд аўтамабіля", "amenity-recycling-centre|@category_recycling": "5Пункт прыёму другаснай сыравіны", -"amenity-recycling-container|amenity-recycling|@category_recycling": "Кантэйнер для другаснай сыравіны", +"amenity-recycling-container|@category_recycling": "Кантэйнер для другаснай сыравіны", "recycling-batteries|@category_recycling": "5Прыём батарэек|Утылізацыя батарэек|5Перапрацоўка батарэек|5Здаць батарэйкі|4Збор батарэек|5Батарэйкі", "recycling-clothes|@category_recycling": "5Прыём адзення|Старае адзенне|Здаць непатрэбныя рэчы|Здаць рэчы|5Здаць адзенне", "recycling-glass_bottles|@category_recycling": "5Прыём шклатары|Прыём шкла|5Перапрацоўка шкла|5Здаць шклатару|Здаць бутэлькі|4Збор шклотары|5Шклатара|Шклабало|Шкляныя бутэлькі", diff --git a/data/categories-strings/bg.json/localize.json b/data/categories-strings/bg.json/localize.json index 3dfc4b176..78e79488b 100644 --- a/data/categories-strings/bg.json/localize.json +++ b/data/categories-strings/bg.json/localize.json @@ -159,7 +159,7 @@ "amenity-vehicle_inspection": "Проверка на автомобила", "amenity-waste_disposal": "Боклук|кош|контейнер|отпадък|бунище", "amenity-recycling-centre|@category_recycling": "Рециклиране|разделно събиране|Преработвателно средище", -"amenity-recycling-container|amenity-recycling|@category_recycling": "Контейнер|разделно|събиране|Кофи за преработваем отпадък", +"amenity-recycling-container|@category_recycling": "Контейнер|разделно|събиране|Кофи за преработваем отпадък", "recycling-batteries|@category_recycling": "Батерии", "recycling-clothes|@category_recycling": "Стари дрехи|рециклиране|", "recycling-glass_bottles|@category_recycling": "Стъкло|шише|рециклиране", diff --git a/data/categories-strings/cs.json/localize.json b/data/categories-strings/cs.json/localize.json index ee7e25afa..84ecf507d 100644 --- a/data/categories-strings/cs.json/localize.json +++ b/data/categories-strings/cs.json/localize.json @@ -159,7 +159,7 @@ "amenity-vehicle_inspection": "Kontrola vozidla", "amenity-waste_disposal": "Odpadky|koš|popelnice|uložiště odpadu", "amenity-recycling-centre|@category_recycling": "Recyklační středisko", -"amenity-recycling-container|amenity-recycling|@category_recycling": "Recyklační nádoba", +"amenity-recycling-container|@category_recycling": "Recyklační nádoba", "recycling-batteries|@category_recycling": "Baterie", "recycling-clothes|@category_recycling": "Staré oblečení|Recyklujte staré oblečení", "recycling-glass_bottles|@category_recycling": "Skleněné lahve", diff --git a/data/categories-strings/da.json/localize.json b/data/categories-strings/da.json/localize.json index 13882fbc0..37755728c 100644 --- a/data/categories-strings/da.json/localize.json +++ b/data/categories-strings/da.json/localize.json @@ -159,7 +159,7 @@ "amenity-vehicle_inspection": "Bilsyn", "amenity-waste_disposal": "Bortskaffelse af affald|skraldespand|skrald", "amenity-recycling-centre|@category_recycling": "Genbrugsplads", -"amenity-recycling-container|amenity-recycling|@category_recycling": "Genbrugscontainer", +"amenity-recycling-container|@category_recycling": "Genbrugscontainer", "recycling-batteries|@category_recycling": "Batterier", "recycling-clothes|@category_recycling": "Gammelt tøj|Genbrug gammelt tøj|Tekstil", "recycling-glass_bottles|@category_recycling": "Glasflasker", diff --git a/data/categories-strings/de.json/localize.json b/data/categories-strings/de.json/localize.json index 145c32f0d..fe4eb8279 100644 --- a/data/categories-strings/de.json/localize.json +++ b/data/categories-strings/de.json/localize.json @@ -172,7 +172,7 @@ "amenity-vehicle_inspection": "Fahrzeuginspektion", "amenity-waste_disposal": "4Müllcontainer|Mülltonne|Abfälle|Müll|Müllentsorgung", "amenity-recycling-centre|@category_recycling": "3Recyclinghof|3Recyclingzentrum|3Wertstoffhof|U+1F6AE|U+267B", -"amenity-recycling-container|amenity-recycling|@category_recycling": "3Wertstoffcontainer|3Recyclingbehälter|3Container|U+1F6AE|U+267B", +"amenity-recycling-container|@category_recycling": "3Wertstoffcontainer|3Recyclingbehälter|3Container|U+1F6AE|U+267B", "recycling-batteries|@category_recycling": "Batterien", "recycling-clothes|@category_recycling": "3Altkleider|3Alte Kleidung|3Kleiderspende|3Altkleidercontainer", "recycling-glass_bottles|@category_recycling": "4Glas-Container|3Glasflaschen|3Altglas", diff --git a/data/categories-strings/el.json/localize.json b/data/categories-strings/el.json/localize.json index 8a9730451..eac34bd1d 100644 --- a/data/categories-strings/el.json/localize.json +++ b/data/categories-strings/el.json/localize.json @@ -160,7 +160,7 @@ "amenity-vehicle_inspection": "Έλεγχος οχήματος", "amenity-waste_disposal": "Διαχείριση απορριμμάτων|σκουπίδια", "amenity-recycling-centre|@category_recycling": "Κέντρο ανακύκλωσης", -"amenity-recycling-container|amenity-recycling|@category_recycling": "Κάδος ανακύκλωσης", +"amenity-recycling-container|@category_recycling": "Κάδος ανακύκλωσης", "recycling-batteries|@category_recycling": "Μπαταρίες", "recycling-clothes|@category_recycling": "Παλιά ρούχα|Ανακύκλωση παλαιών ρούχων", "recycling-glass_bottles|@category_recycling": "Γυάλινα μπουκάλια", diff --git a/data/categories-strings/en.json/localize.json b/data/categories-strings/en.json/localize.json index eb8b42730..9d49b9616 100644 --- a/data/categories-strings/en.json/localize.json +++ b/data/categories-strings/en.json/localize.json @@ -182,7 +182,7 @@ "amenity-vehicle_inspection": "Vehicle Inspection", "amenity-waste_disposal": "4Dumpster|4Trash bin|4garbage bin|waste disposal|U+1F6AE", "amenity-recycling-centre|@category_recycling": "4Recycling Centre|Tip|Dump|U+1F6AE|U+267B", -"amenity-recycling-container|amenity-recycling|@category_recycling": "4Recycling Container|U+1F6AE|U+267B", +"amenity-recycling-container|@category_recycling": "4Recycling Container|U+1F6AE|U+267B", "recycling-batteries|@category_recycling": "4Recycling of Batteries|Household Batteries Disposal|Household Battery Disposal|4Batteries Disposal|Battery Disposal|Batteries Recycling|Battery Recycling|Batteries", "recycling-clothes|@category_recycling": "4Recycling of Clothes|Clothes Recycling|Textile Recycling|Donate Clothes|Clothes Collection Bin|Clothes", "recycling-glass_bottles|@category_recycling": "4Recycling of Glass Bottles|4Glass Bottles Recycling|Glass Waste", diff --git a/data/categories-strings/es-MX.json/localize.json b/data/categories-strings/es-MX.json/localize.json index d2e451fee..76f43742d 100644 --- a/data/categories-strings/es-MX.json/localize.json +++ b/data/categories-strings/es-MX.json/localize.json @@ -1,7 +1,7 @@ { "@category_recycling": "Reciclaje|Reciclaje de desechos|Eliminación de desechos|Materiales reciclables|Recogida separada de basura|Clasificación de desechos|Reutilización", "shop-houseware|@shop": "Enseres domésticos|Tienda de artículos para el hogar", -"amenity-recycling-container|amenity-recycling|@category_recycling": "Contenedor de reciclaje", +"amenity-recycling-container|@category_recycling": "Contenedor de reciclaje", "recycling-clothes|@category_recycling": "Ropa vieja|Reciclaje de cosas innecesarias|Ropa", "recycling-glass_bottles|@category_recycling": "Envase de vidrio", "recycling-paper|@category_recycling": "Desechos de papel|Papel", diff --git a/data/categories-strings/es.json/localize.json b/data/categories-strings/es.json/localize.json index f5e71dcbb..9ab6845db 100644 --- a/data/categories-strings/es.json/localize.json +++ b/data/categories-strings/es.json/localize.json @@ -169,7 +169,7 @@ "amenity-vehicle_inspection": "Inspección de vehículos|inspección vehicular|ITV", "amenity-waste_disposal": "Basura|Basurero|Cubo de basura|Contenedor de basura", "amenity-recycling-centre|@category_recycling": "Centro de reciclaje|punto limpio|punto verde|5Punto de reciclaje|ecoparque", -"amenity-recycling-container|amenity-recycling|@category_recycling": "Contenedor de reciclaje", +"amenity-recycling-container|@category_recycling": "Contenedor de reciclaje", "recycling-batteries|@category_recycling": "Baterías|Pilas|Reciclaje de baterías|10Reciclaje de pilas", "recycling-clothes|@category_recycling": "10Reciclaje de ropa|Reciclaje textil", "recycling-glass_bottles|@category_recycling": "Cascos de botellas|10Reciclaje de vidrio|Vidrio", diff --git a/data/categories-strings/et.json/localize.json b/data/categories-strings/et.json/localize.json index d8f02272f..6611f7b1e 100644 --- a/data/categories-strings/et.json/localize.json +++ b/data/categories-strings/et.json/localize.json @@ -166,7 +166,7 @@ "amenity-vehicle_inspection": "Sõiduki ülevaatus", "amenity-waste_disposal": "Prügikast", "amenity-recycling-centre|@category_recycling": "Taaskasutuskeskus|Jäätmejaam", -"amenity-recycling-container|amenity-recycling|@category_recycling": "Prügikonteiner", +"amenity-recycling-container|@category_recycling": "Prügikonteiner", "recycling-batteries|@category_recycling": "Patareid", "recycling-clothes|@category_recycling": "Rõivaste taaskasutus|Rõivad", "recycling-glass_bottles|@category_recycling": "Taarapunkt", diff --git a/data/categories-strings/eu.json/localize.json b/data/categories-strings/eu.json/localize.json index f599515f4..68123087b 100644 --- a/data/categories-strings/eu.json/localize.json +++ b/data/categories-strings/eu.json/localize.json @@ -159,7 +159,7 @@ "amenity-vehicle_inspection": "Ibilgailuen Ikuskapena", "amenity-waste_disposal": "Zaborrontzia", "amenity-recycling-centre|@category_recycling": "Birziklatze zentroa|garbigune|Birziklapen zentroa", -"amenity-recycling-container|amenity-recycling|@category_recycling": "Birziklatzeko edukiontzia", +"amenity-recycling-container|@category_recycling": "Birziklatzeko edukiontzia", "recycling-batteries|@category_recycling": "Bateriak", "recycling-clothes|@category_recycling": "Arropa zaharra|Alferrikako gauzak birziklatzea|Arropa", "recycling-glass_bottles|@category_recycling": "Botila kaskoak", diff --git a/data/categories-strings/fa.json/localize.json b/data/categories-strings/fa.json/localize.json index b133f076d..55acb1954 100644 --- a/data/categories-strings/fa.json/localize.json +++ b/data/categories-strings/fa.json/localize.json @@ -160,7 +160,7 @@ "amenity-vehicle_inspection": "بازرسی وسایل نقلیه", "amenity-waste_disposal": "زباله دانی", "amenity-recycling-centre|@category_recycling": "مرکز بازیافت", -"amenity-recycling-container|amenity-recycling|@category_recycling": "ظرف بازیافت", +"amenity-recycling-container|@category_recycling": "ظرف بازیافت", "recycling-batteries|@category_recycling": "ﺎﻫ ﯼﺮﺗﺎﺑ", "recycling-clothes|@category_recycling": "بازیافت لباسهای قدیمی|لباسهای قدیمی", "recycling-glass_bottles|@category_recycling": "بطریهای شیشهای", diff --git a/data/categories-strings/fi.json/localize.json b/data/categories-strings/fi.json/localize.json index 78fddee08..bbbc65ec4 100644 --- a/data/categories-strings/fi.json/localize.json +++ b/data/categories-strings/fi.json/localize.json @@ -158,7 +158,7 @@ "amenity-vehicle_inspection": "Ajoneuvon tarkastus", "amenity-waste_disposal": "Roska", "amenity-recycling-centre|@category_recycling": "Kierrätyskeskus", -"amenity-recycling-container|amenity-recycling|@category_recycling": "Kierrätysjäteastia", +"amenity-recycling-container|@category_recycling": "Kierrätysjäteastia", "recycling-batteries|@category_recycling": "Paristot", "recycling-clothes|@category_recycling": "Vanhat vaatteet|Jätä tarpeettomat tavarat tähän|Vaatteet", "recycling-glass_bottles|@category_recycling": "Lasipullot", diff --git a/data/categories-strings/fr.json/localize.json b/data/categories-strings/fr.json/localize.json index 2d9e07e66..c45f7542f 100644 --- a/data/categories-strings/fr.json/localize.json +++ b/data/categories-strings/fr.json/localize.json @@ -167,7 +167,7 @@ "amenity-vehicle_inspection": "Inspection de véhicule|Contrôle technique", "amenity-waste_disposal": "Déchets|poubelle|déchet", "amenity-recycling-centre|@category_recycling": "Centre de recyclage|Déchetterie|Déchèterie", -"amenity-recycling-container|amenity-recycling|@category_recycling": "Conteneur de recyclage|PAVE|Point d'apport volontaire", +"amenity-recycling-container|@category_recycling": "Conteneur de recyclage|PAVE|Point d'apport volontaire", "recycling-batteries|@category_recycling": "Batteries", "recycling-clothes|@category_recycling": "Vêtements usagés", "recycling-glass_bottles|@category_recycling": "Verre|bouteille|bocaux", diff --git a/data/categories-strings/hi.json/localize.json b/data/categories-strings/hi.json/localize.json index ae437fb59..0b8edd0f2 100644 --- a/data/categories-strings/hi.json/localize.json +++ b/data/categories-strings/hi.json/localize.json @@ -135,7 +135,7 @@ "amenity-post_office|post_office-post_partner|@category_post": "3डाकघर", "amenity-waste_disposal": "3कचरे के डिब्बे", "amenity-recycling-centre|@category_recycling": "4रीसाइक्लिंग सेंटर", -"amenity-recycling-container|amenity-recycling|@category_recycling": "रीसाइक्लिंग कंटेनर", +"amenity-recycling-container|@category_recycling": "रीसाइक्लिंग कंटेनर", "amenity-school": "4विदयालय|विद्यालय", "amenity-shelter": "4आश्रय", "amenity-shelter-basic_hut": "द्विवार्षिक झोपड़ी", diff --git a/data/categories-strings/hu.json/localize.json b/data/categories-strings/hu.json/localize.json index 37140f625..f1854aad6 100644 --- a/data/categories-strings/hu.json/localize.json +++ b/data/categories-strings/hu.json/localize.json @@ -159,7 +159,7 @@ "amenity-vehicle_inspection": "Gépjármű átvizsgálás", "amenity-waste_disposal": "Szemeteskonténer|Kuka|Hulladék|Szemét", "amenity-recycling-centre|@category_recycling": "Hulladékudvar|Újrahasznosító központ|hulladékgyűjtő központ", -"amenity-recycling-container|amenity-recycling|@category_recycling": "Újrahasznosító tartály|Szelektív hulladékgyűjtő konténer", +"amenity-recycling-container|@category_recycling": "Újrahasznosító tartály|Szelektív hulladékgyűjtő konténer", "recycling-batteries|@category_recycling": "Elemek|Elem, akkumulátor", "recycling-clothes|@category_recycling": "Régi ruhák|Régi ruhák újrahasznosítása|Ruha", "recycling-glass_bottles|@category_recycling": "Üveg palackok", diff --git a/data/categories-strings/id.json/localize.json b/data/categories-strings/id.json/localize.json index 2f8c25ce1..84782307d 100644 --- a/data/categories-strings/id.json/localize.json +++ b/data/categories-strings/id.json/localize.json @@ -154,7 +154,7 @@ "amenity-vehicle_inspection": "Pemeriksaan kendaraan", "amenity-waste_disposal": "Sampah", "amenity-recycling-centre|@category_recycling": "TPA", -"amenity-recycling-container|amenity-recycling|@category_recycling": "Wadah daur ulang", +"amenity-recycling-container|@category_recycling": "Wadah daur ulang", "recycling-batteries|@category_recycling": "Baterai", "recycling-clothes|@category_recycling": "Pakaian lama|Mendaur ulang pakaian lama", "recycling-glass_bottles|@category_recycling": "Botol kaca", diff --git a/data/categories-strings/it.json/localize.json b/data/categories-strings/it.json/localize.json index fe119fef2..91712c9f2 100644 --- a/data/categories-strings/it.json/localize.json +++ b/data/categories-strings/it.json/localize.json @@ -159,7 +159,7 @@ "amenity-vehicle_inspection": "Ispezione del veicolo", "amenity-waste_disposal": "Spazzatura", "amenity-recycling-centre|@category_recycling": "Centro di riciclaggio", -"amenity-recycling-container|amenity-recycling|@category_recycling": "Contenitore per materiali riciclabili", +"amenity-recycling-container|@category_recycling": "Contenitore per materiali riciclabili", "recycling-batteries|@category_recycling": "Batterie", "recycling-clothes|@category_recycling": "Vestiti usati|Riciclare vestiti usati|Raccolta indumenti", "recycling-glass_bottles|@category_recycling": "Contenitori in vetro", diff --git a/data/categories-strings/ja.json/localize.json b/data/categories-strings/ja.json/localize.json index acdc29279..0d51f88aa 100644 --- a/data/categories-strings/ja.json/localize.json +++ b/data/categories-strings/ja.json/localize.json @@ -162,7 +162,7 @@ "amenity-vehicle_inspection": "車検", "amenity-waste_disposal": "ゴミ|ごみ|リサイクル|再利用|ダストボックス", "amenity-recycling-centre|@category_recycling": "リサクルセンター", -"amenity-recycling-container|amenity-recycling|@category_recycling": "リサイクルボックス", +"amenity-recycling-container|@category_recycling": "リサイクルボックス", "recycling-batteries|@category_recycling": "バッテリー", "recycling-clothes|@category_recycling": "古着|古着のリサイクル", "recycling-glass_bottles|@category_recycling": "ガラス瓶", diff --git a/data/categories-strings/ko.json/localize.json b/data/categories-strings/ko.json/localize.json index fb2f527de..50b552722 100644 --- a/data/categories-strings/ko.json/localize.json +++ b/data/categories-strings/ko.json/localize.json @@ -157,7 +157,7 @@ "amenity-vehicle_inspection": "차량검사", "amenity-waste_disposal": "쓰레기|휴지통", "amenity-recycling-centre|@category_recycling": "재활용센터|재활용 센터", -"amenity-recycling-container|amenity-recycling|@category_recycling": "재활용 쓰레기통|재활용품통", +"amenity-recycling-container|@category_recycling": "재활용 쓰레기통|재활용품통", "recycling-batteries|@category_recycling": "배터리", "recycling-clothes|@category_recycling": "낡은 옷|낡은 옷 재활|낡은 옷 재활용", "recycling-glass_bottles|@category_recycling": "유리병", diff --git a/data/categories-strings/lv.json/localize.json b/data/categories-strings/lv.json/localize.json index ff3c5b1ee..f28bbc313 100644 --- a/data/categories-strings/lv.json/localize.json +++ b/data/categories-strings/lv.json/localize.json @@ -159,7 +159,7 @@ "amenity-vehicle_inspection": "Transportlīdzekļu tehniskā apskate|tehniskā apskate|4CSDD", "amenity-waste_disposal": "Atkritumu tvertne|atkritumu konteiners|miskaste|U+1F6AE", "amenity-recycling-centre|@category_recycling": "Atkritumu pārstrādes centrs|pārstrādes centrs|izgāztuve|U+1F6AE|U+267B", -"amenity-recycling-container|amenity-recycling|@category_recycling": "Pārstrādes konteiners|otrreizējas pārstrādes konteiners|U+1F6AE|U+267B", +"amenity-recycling-container|@category_recycling": "Pārstrādes konteiners|otrreizējas pārstrādes konteiners|U+1F6AE|U+267B", "recycling-batteries|@category_recycling": "Bateriju utilizācija|bateriju pārstrāde|bateriju nodošana", "recycling-clothes|@category_recycling": "Tekstila konteiners|apģērba pārstrāde|drēbju pārsrāde|apģērba nodošana|drēbju nodošana|apģērba ziedošana", "recycling-glass_bottles|@category_recycling": "Stikla pārstrāde|stikla nodošana|stikla atkritumi", diff --git a/data/categories-strings/mr.json/localize.json b/data/categories-strings/mr.json/localize.json index 22303ef20..5e1634b1b 100644 --- a/data/categories-strings/mr.json/localize.json +++ b/data/categories-strings/mr.json/localize.json @@ -154,7 +154,7 @@ "amenity-vehicle_inspection": "वाहन तपासणी", "amenity-waste_disposal": "कचरापेटी", "amenity-recycling-centre|@category_recycling": "भंगारवाला|पुनर्वापर केंद्र|रिसायकल सेंटर|भंगार केंद्र", -"amenity-recycling-container|amenity-recycling|@category_recycling": "रीसायकलिंग कंटेनर", +"amenity-recycling-container|@category_recycling": "रीसायकलिंग कंटेनर", "recycling-batteries|@category_recycling": "बॅटर भंगारवाला|घरगुती बॅटरी", "recycling-clothes|@category_recycling": "कपडे भंगारवाला|कपडे", "recycling-glass_bottles|@category_recycling": "काचेच्या बाटल्यांचे पुनर्वापर", diff --git a/data/categories-strings/nb.json/localize.json b/data/categories-strings/nb.json/localize.json index b848e1733..ff78e1dcf 100644 --- a/data/categories-strings/nb.json/localize.json +++ b/data/categories-strings/nb.json/localize.json @@ -156,7 +156,7 @@ "amenity-vehicle_inspection": "Inspeksjon av kjøretøy", "amenity-waste_disposal": "4Søppeldunk|4søppel", "amenity-recycling-centre|@category_recycling": "Resirkuleringssenter|innsamlingsstasjon", -"amenity-recycling-container|amenity-recycling|@category_recycling": "Gjenvinningsbeholder", +"amenity-recycling-container|@category_recycling": "Gjenvinningsbeholder", "recycling-batteries|@category_recycling": "Batterier", "recycling-clothes|@category_recycling": "Gamle klær|Levere gamle klær", "recycling-glass_bottles|@category_recycling": "Glassemballasje", diff --git a/data/categories-strings/nl.json/localize.json b/data/categories-strings/nl.json/localize.json index a6b4648ab..d3e867a81 100644 --- a/data/categories-strings/nl.json/localize.json +++ b/data/categories-strings/nl.json/localize.json @@ -164,7 +164,7 @@ "amenity-vehicle_inspection": "Voertuiginspectie", "amenity-waste_disposal": "4Afvalcontainer|afval|prullenbak|vuilnis", "amenity-recycling-centre|@category_recycling": "Milieustraat|recycling centrum|milieupark|gemeentewerf", -"amenity-recycling-container|amenity-recycling|@category_recycling": "Recycling container", +"amenity-recycling-container|@category_recycling": "Recycling container", "recycling-batteries|@category_recycling": "Batterijen", "recycling-clothes|@category_recycling": "Oude kleding|Oude kleding recyclen", "recycling-glass_bottles|@category_recycling": "4Recycling van glasflessen|4Glasrecycling|Glasafval|Glascontainer|Glasbak", diff --git a/data/categories-strings/pl.json/localize.json b/data/categories-strings/pl.json/localize.json index 5005f5600..629a8cb10 100644 --- a/data/categories-strings/pl.json/localize.json +++ b/data/categories-strings/pl.json/localize.json @@ -166,7 +166,7 @@ "amenity-vehicle_inspection": "Kontrola pojazdu", "amenity-waste_disposal": "Wysypisko|Śmieci|ponowne odtworzenie|odpady", "amenity-recycling-centre|@category_recycling": "Przetwarzanie odpadów|Centrum przetwórstwa odpadów", -"amenity-recycling-container|amenity-recycling|@category_recycling": "Pojemnik do recyklingu", +"amenity-recycling-container|@category_recycling": "Pojemnik do recyklingu", "recycling-batteries|@category_recycling": "Baterie", "recycling-clothes|@category_recycling": "Stare ubrania|Przekaż niepotrzebne rzeczy", "recycling-glass_bottles|@category_recycling": "Szkło", diff --git a/data/categories-strings/pt-BR.json/localize.json b/data/categories-strings/pt-BR.json/localize.json index 31d92e947..a6dfc8d00 100644 --- a/data/categories-strings/pt-BR.json/localize.json +++ b/data/categories-strings/pt-BR.json/localize.json @@ -137,7 +137,7 @@ "amenity-post_office|post_office-post_partner|@category_post": "3Correios", "amenity-waste_disposal": "Depósito de lixo|lixo", "amenity-recycling-centre|@category_recycling": "Reciclagem|descarte seletivo", -"amenity-recycling-container|amenity-recycling|@category_recycling": "Recipiente de reciclagem", +"amenity-recycling-container|@category_recycling": "Recipiente de reciclagem", "recycling-batteries|@category_recycling": "Baterias", "recycling-clothes|@category_recycling": "Roupas velhas|Reciclar roupas velhas", "recycling-glass_bottles|@category_recycling": "Garrafas de vidro", diff --git a/data/categories-strings/pt.json/localize.json b/data/categories-strings/pt.json/localize.json index 31213982b..aa5b4d467 100644 --- a/data/categories-strings/pt.json/localize.json +++ b/data/categories-strings/pt.json/localize.json @@ -163,7 +163,7 @@ "amenity-vehicle_inspection": "Inspeção veicular", "amenity-waste_disposal": "Contentor do lixo|Caixote do lixo|lixo", "amenity-recycling-centre|@category_recycling": "Centro de reciclagem|Ecocentro", -"amenity-recycling-container|amenity-recycling|@category_recycling": "Ecoponto|Contentor de reciclagem|Papelão|Vidrão|Embalão|Oleão|reciclagem", +"amenity-recycling-container|@category_recycling": "Ecoponto|Contentor de reciclagem|Papelão|Vidrão|Embalão|Oleão|reciclagem", "recycling-batteries|@category_recycling": "Baterias", "recycling-clothes|@category_recycling": "Reciclagem de roupas|Roupas velhas", "recycling-glass_bottles|@category_recycling": "Resíduos de vidro", diff --git a/data/categories-strings/ro.json/localize.json b/data/categories-strings/ro.json/localize.json index 6e4f35337..c300fcb58 100644 --- a/data/categories-strings/ro.json/localize.json +++ b/data/categories-strings/ro.json/localize.json @@ -155,7 +155,7 @@ "amenity-vehicle_inspection": "Inspecția vehiculului", "amenity-waste_disposal": "Gunoi", "amenity-recycling-centre|@category_recycling": "Centru de reciclare", -"amenity-recycling-container|amenity-recycling|@category_recycling": "Containere pentru reciclare", +"amenity-recycling-container|@category_recycling": "Containere pentru reciclare", "recycling-batteries|@category_recycling": "Baterii", "recycling-clothes|@category_recycling": "Haine vechi|Înmânarea lucrurilor inutile", "recycling-glass_bottles|@category_recycling": "Deșeuri de sticlă", diff --git a/data/categories-strings/ru.json/localize.json b/data/categories-strings/ru.json/localize.json index 17aa67c6d..b7806c11a 100644 --- a/data/categories-strings/ru.json/localize.json +++ b/data/categories-strings/ru.json/localize.json @@ -167,7 +167,7 @@ "amenity-vehicle_inspection": "Техосмотр автомобиля", "amenity-waste_disposal": "4Мусорный контейнер|мусорка", "amenity-recycling-centre|@category_recycling": "5Пункт приёма вторсырья", -"amenity-recycling-container|amenity-recycling|@category_recycling": "Контейнер для вторсырья", +"amenity-recycling-container|@category_recycling": "Контейнер для вторсырья", "recycling-batteries|@category_recycling": "5Приём батареек|Утилизация батареек|5Переработка батареек|5Сдать батарейки|4Сбор батареек|5Батарейки", "recycling-clothes|@category_recycling": "5Приём одежды|Старая одежда|Сдать ненужные вещи|Сдать вещи|5Сдать одежду|Одежда", "recycling-glass_bottles|@category_recycling": "5Приём стеклотары|Приём стекла|5Переработка стекла|5Сдать cтеклотару|Сдать бутылки|4Сбор стеклотары|5Стеклотара|Стеклобой|Стеклянные бутылки", diff --git a/data/categories-strings/sk.json/localize.json b/data/categories-strings/sk.json/localize.json index 3c856773a..a41a83efd 100644 --- a/data/categories-strings/sk.json/localize.json +++ b/data/categories-strings/sk.json/localize.json @@ -159,7 +159,7 @@ "amenity-vehicle_inspection": "Kontrola vozidla", "amenity-waste_disposal": "Odpadky|kôš", "amenity-recycling-centre|@category_recycling": "Zberné suroviny", -"amenity-recycling-container|amenity-recycling|@category_recycling": "Recyklačný odpad|Recyklačný kontajner", +"amenity-recycling-container|@category_recycling": "Recyklačný odpad|Recyklačný kontajner", "recycling-batteries|@category_recycling": "Batérie", "recycling-clothes|@category_recycling": "Staré oblečenie|Recyklácia starých šiat", "recycling-glass_bottles|@category_recycling": "Sklenené fľaše", diff --git a/data/categories-strings/sr.json/localize.json b/data/categories-strings/sr.json/localize.json index 42fe1cf38..8980d3812 100644 --- a/data/categories-strings/sr.json/localize.json +++ b/data/categories-strings/sr.json/localize.json @@ -128,7 +128,7 @@ "amenity-vehicle_inspection": "8Технички преглед возила|8Tehnički pregled vozila", "amenity-waste_disposal": "Контејнер за смеће|Kontejner za smeće", "amenity-recycling-centre|@category_recycling": "Рециклажни центар|Reciklažni centar", -"amenity-recycling-container|amenity-recycling|@category_recycling": "Рециклажни контејнер|Reciklažni kontejner", +"amenity-recycling-container|@category_recycling": "Рециклажни контејнер|Reciklažni kontejner", "recycling-batteries|@category_recycling": "Рециклажа батерија|Reciklaža baterija", "recycling-clothes|@category_recycling": "Рециклажа одеће|Reciklaža odeće", "recycling-glass_bottles|@category_recycling": "Рециклажа стакла|Reciklaža stakla", diff --git a/data/categories-strings/sv.json/localize.json b/data/categories-strings/sv.json/localize.json index 2170dd309..fd8316df0 100644 --- a/data/categories-strings/sv.json/localize.json +++ b/data/categories-strings/sv.json/localize.json @@ -161,7 +161,7 @@ "amenity-vehicle_inspection": "Fordonsinspektion", "amenity-waste_disposal": "4Avfallscontainer|Soptunna|skräp|avfall", "amenity-recycling-centre|@category_recycling": "Återvinningscentral", -"amenity-recycling-container|amenity-recycling|@category_recycling": "Behållare för återvinningsbart avfall", +"amenity-recycling-container|@category_recycling": "Behållare för återvinningsbart avfall", "recycling-batteries|@category_recycling": "Batterier", "recycling-clothes|@category_recycling": "Gamla kläder|Överlämna onödiga saker", "recycling-glass_bottles|@category_recycling": "Returglas", diff --git a/data/categories-strings/th.json/localize.json b/data/categories-strings/th.json/localize.json index fc2f1ef0d..05d8ecbc9 100644 --- a/data/categories-strings/th.json/localize.json +++ b/data/categories-strings/th.json/localize.json @@ -158,7 +158,7 @@ "amenity-vehicle_inspection": "การตรวจสอบยานพาหนะ", "amenity-waste_disposal": "ขยะ|ถังขยะ", "amenity-recycling-centre|@category_recycling": "ศูนย์รีไซเคิล", -"amenity-recycling-container|amenity-recycling|@category_recycling": "บรรจุภัณฑ์รีไซเคิล", +"amenity-recycling-container|@category_recycling": "บรรจุภัณฑ์รีไซเคิล", "recycling-batteries|@category_recycling": "แบตเตอรี่", "recycling-clothes|@category_recycling": "เสื้อผ้าเก่า|รีไซเคิลเสื้อผ้าเก่า", "recycling-glass_bottles|@category_recycling": "ขวดแก้ว", diff --git a/data/categories-strings/tr.json/localize.json b/data/categories-strings/tr.json/localize.json index 5ad6cc91f..ca7b36070 100644 --- a/data/categories-strings/tr.json/localize.json +++ b/data/categories-strings/tr.json/localize.json @@ -168,7 +168,7 @@ "amenity-vehicle_inspection": "Araç muayenesi", "amenity-waste_disposal": "Çöplük|Çöp kutusu|çöp", "amenity-recycling-centre|@category_recycling": "4Geri dönüşüm merkezi", -"amenity-recycling-container|amenity-recycling|@category_recycling": "4Geri Dönüşüm Kutusu|Atık Toplama Merkezi", +"amenity-recycling-container|@category_recycling": "4Geri Dönüşüm Kutusu|Atık Toplama Merkezi", "recycling-batteries|@category_recycling": "3Piller|Atık Pil Toplama|Atık pil kutusu", "recycling-clothes|@category_recycling": "4Eski kıyafetler|Eski kıyafetler geri dönüşümü|Kıyafet toplama kutusu|giysi toplama kutusu|Kıyafet", "recycling-glass_bottles|@category_recycling": "4Cam şişeler Geri Dönüşümü", diff --git a/data/categories-strings/uk.json/localize.json b/data/categories-strings/uk.json/localize.json index a709985fc..4394c2d71 100644 --- a/data/categories-strings/uk.json/localize.json +++ b/data/categories-strings/uk.json/localize.json @@ -164,7 +164,7 @@ "amenity-vehicle_inspection": "Техогляд автомобіля", "amenity-waste_disposal": "4Сміттєвий контейнер|сміття|смітник", "amenity-recycling-centre|@category_recycling": "5Пункт прийому вторинної сировини", -"amenity-recycling-container|amenity-recycling|@category_recycling": "Контейнер для вторсировини", +"amenity-recycling-container|@category_recycling": "Контейнер для вторсировини", "recycling-batteries|@category_recycling": "5Прийом батарейок|Утилізація батарей|5Переробка батарей|5Здати батареї|4Збір батарейок|5Батарейки", "recycling-clothes|@category_recycling": "5Прийом одягу|Старий одяг|Здати непотрібні речі|Здати речі|5Здати одяг|Одяг", "recycling-glass_bottles|@category_recycling": "5Прийом склотари|Прийом скла|5Переробка скла|5Здати склотару|Здати пляшки|4Збір склотари|5Склотара|Склобой|Скляні пляшки", diff --git a/data/categories-strings/vi.json/localize.json b/data/categories-strings/vi.json/localize.json index 48031efe3..4f4c636ee 100644 --- a/data/categories-strings/vi.json/localize.json +++ b/data/categories-strings/vi.json/localize.json @@ -155,7 +155,7 @@ "amenity-vehicle_inspection": "Kiểm tra xe", "amenity-waste_disposal": "Xử lý chất thải|Rác", "amenity-recycling-centre|@category_recycling": "Trung tâm tái sinh", -"amenity-recycling-container|amenity-recycling|@category_recycling": "Thùng rác", +"amenity-recycling-container|@category_recycling": "Thùng rác", "recycling-batteries|@category_recycling": "Ắc quy", "recycling-clothes|@category_recycling": "Quần áo cũ|Chuyển giao những thứ không cần thiết", "recycling-glass_bottles|@category_recycling": "Chai lọ thủy tinh", diff --git a/data/categories-strings/zh-Hans.json/localize.json b/data/categories-strings/zh-Hans.json/localize.json index 4f9e841a5..476bfc4f2 100644 --- a/data/categories-strings/zh-Hans.json/localize.json +++ b/data/categories-strings/zh-Hans.json/localize.json @@ -161,7 +161,7 @@ "amenity-vehicle_inspection": "车辆检验", "amenity-waste_disposal": "垃圾", "amenity-recycling-centre|@category_recycling": "回收中心", -"amenity-recycling-container|amenity-recycling|@category_recycling": "回收箱", +"amenity-recycling-container|@category_recycling": "回收箱", "recycling-batteries|@category_recycling": "电池", "recycling-clothes|@category_recycling": "旧衣物|回收旧衣物", "recycling-glass_bottles|@category_recycling": "玻璃瓶", diff --git a/data/categories-strings/zh-Hant.json/localize.json b/data/categories-strings/zh-Hant.json/localize.json index c3b0facee..a91ce66a2 100644 --- a/data/categories-strings/zh-Hant.json/localize.json +++ b/data/categories-strings/zh-Hant.json/localize.json @@ -162,7 +162,7 @@ "amenity-vehicle_inspection": "車輛檢驗", "amenity-waste_disposal": "垃圾|回收|回收場", "amenity-recycling-centre|@category_recycling": "回收中心|回收站", -"amenity-recycling-container|amenity-recycling|@category_recycling": "回收箱", +"amenity-recycling-container|@category_recycling": "回收箱", "recycling-batteries|@category_recycling": "電池", "recycling-clothes|@category_recycling": "舊衣物|回收舊衣物|衣服", "recycling-glass_bottles|@category_recycling": "玻璃瓶", diff --git a/data/mapcss-mapping.csv b/data/mapcss-mapping.csv index df2e78a0c..073405cc8 100644 --- a/data/mapcss-mapping.csv +++ b/data/mapcss-mapping.csv @@ -197,7 +197,8 @@ landuse|cemetery;105; sport|soccer;106; moved:boundary|administrative|4:05.2024;[boundary=administrative][admin_level=4];x;;;107;boundary|administrative|4 amenity|cafe;108; -amenity|recycling|container;[amenity=recycling][recycling_type=container];;name;int_name;109; +# Treat default type also as a container, see https://taginfo.openstreetmap.org/keys/recycling_type#values +amenity|recycling|container;[amenity=recycling][recycling_type=container],[amenity=recycling][!recycling_type];;name;int_name;109; leisure|garden;110; landuse|commercial;111; moved:railway|station:05.2024;112;railway|station @@ -341,7 +342,7 @@ amenity|parking|permissive;[amenity=parking][access=permissive];;name;int_name;2 deprecated:boundary|administrative|5:04.2024;[boundary=administrative][admin_level=5];x;name;int_name;234; highway|unclassified|tunnel;[highway=unclassified][tunnel?];;name;int_name;235; amenity|recycling|centre;[amenity=recycling][recycling_type=centre];;name;int_name;236; -amenity|recycling;237; +deprecated:amenity|recycling:01.2026;237;amenity|recycling|container highway|residential|tunnel;[highway=residential][tunnel?];;name;int_name;238; aeroway|helipad;239; deprecated:highway|path|permissive:12.2023;[highway=path][access=permissive];x;name;int_name;240;highway|path diff --git a/data/styles/default/include/priorities_4_overlays.prio.txt b/data/styles/default/include/priorities_4_overlays.prio.txt index 566d77704..1ca4a9f00 100644 --- a/data/styles/default/include/priorities_4_overlays.prio.txt +++ b/data/styles/default/include/priorities_4_overlays.prio.txt @@ -1144,7 +1144,6 @@ leisure-sports_hall # icon z17- (also has captio amenity-compressed_air # icon z18- (also has caption(optional) z19-) amenity-parcel_locker # icon z17- (also has caption(optional) z17-) amenity-payment_terminal # icon z17- (also has caption(optional) z17-) -amenity-recycling # icon z17- (also has caption(optional) z18-) amenity-vending_machine-fuel # icon z18- (also has caption(optional) z18-) amenity-vending_machine-parking_tickets # icon z17- (also has caption(optional) z17-) amenity-vending_machine-public_transport_tickets # icon z17- (also has caption(optional) z17-) @@ -2218,7 +2217,6 @@ leisure-swimming_pool-private # icon z17- (also has captio # amenity-compressed_air # caption(optional) z19- (also has icon z18-) # amenity-parcel_locker # caption(optional) z17- (also has icon z17-) # amenity-payment_terminal # caption(optional) z17- (also has icon z17-) -# amenity-recycling # caption(optional) z18- (also has icon z17-) # amenity-vending_machine-fuel # caption(optional) z18- (also has icon z18-) # amenity-vending_machine-parking_tickets # caption(optional) z17- (also has icon z17-) # amenity-vending_machine-public_transport_tickets # caption(optional) z17- (also has icon z17-) diff --git a/data/styles/outdoors/include/priorities_4_overlays.prio.txt b/data/styles/outdoors/include/priorities_4_overlays.prio.txt index 9df9bf7cd..65e216906 100644 --- a/data/styles/outdoors/include/priorities_4_overlays.prio.txt +++ b/data/styles/outdoors/include/priorities_4_overlays.prio.txt @@ -1144,7 +1144,6 @@ leisure-sports_hall # icon z17- (also has captio amenity-compressed_air # icon z18- (also has caption(optional) z19-) amenity-parcel_locker # icon z17- (also has caption(optional) z17-) amenity-payment_terminal # icon z17- (also has caption(optional) z17-) -amenity-recycling # icon z17- (also has caption(optional) z18-) amenity-vending_machine-fuel # icon z18- (also has caption(optional) z18-) amenity-vending_machine-parking_tickets # icon z17- (also has caption(optional) z17-) amenity-vending_machine-public_transport_tickets # icon z17- (also has caption(optional) z17-) @@ -2221,7 +2220,6 @@ leisure-swimming_pool-private # icon z17- (also has captio # amenity-compressed_air # caption(optional) z19- (also has icon z18-) # amenity-parcel_locker # caption(optional) z17- (also has icon z17-) # amenity-payment_terminal # caption(optional) z17- (also has icon z17-) -# amenity-recycling # caption(optional) z18- (also has icon z17-) # amenity-vending_machine-fuel # caption(optional) z18- (also has icon z18-) # amenity-vending_machine-parking_tickets # caption(optional) z17- (also has icon z17-) # amenity-vending_machine-public_transport_tickets # caption(optional) z17- (also has icon z17-) diff --git a/data/subtypes.csv b/data/subtypes.csv index db1e0e78c..9ee2d92bd 100644 --- a/data/subtypes.csv +++ b/data/subtypes.csv @@ -6,4 +6,5 @@ buoy|lateral|starboard,spherical_buoy|lateral|starboard,beacon|lateral|starboard buoy|cardinal|east,spherical_buoy|cardinal|east,beacon|cardinal|east;cardinal|east buoy|cardinal|west,spherical_buoy|cardinal|west,beacon|cardinal|west;cardinal|west buoy|cardinal|south,spherical_buoy|cardinal|south,beacon|cardinal|south;cardinal|south -buoy|cardinal|north,spherical_buoy|cardinal|north,beacon|cardinal|north;cardinal|north \ No newline at end of file +buoy|cardinal|north,spherical_buoy|cardinal|north,beacon|cardinal|north;cardinal|north +amenity|recycling|centre,amenity|recycling|container;recycling|clothes,recycling|shoes,recycling|small_appliances,recycling|batteries,recycling|scrap_metal,recycling|green_waste,recycling|glass_bottles,recycling|plastic_bottles,recycling|cans,recycling|cartons,recycling|cardboard,recycling|paper,recycling|plastic diff --git a/generator/osm2meta.cpp b/generator/osm2meta.cpp index 1c7f5876e..4c401e683 100644 --- a/generator/osm2meta.cpp +++ b/generator/osm2meta.cpp @@ -104,8 +104,7 @@ std::string MetadataTagProcessorImpl::ValidateAndFormat_operator(std::string con { using namespace ftypes; auto const & t = m_params.m_types; - if (IsATMChecker::Instance()(t) || IsRecyclingCentreChecker::Instance()(t) || - IsRecyclingContainerChecker::Instance()(t) || IsPostPoiChecker::Instance()(t) || + if (IsATMChecker::Instance()(t) || IsRecyclingChecker::Instance()(t) || IsPostPoiChecker::Instance()(t) || IsOperatorOthersPoiChecker::Instance()(t)) { return v; diff --git a/iphone/Maps/LocalizedStrings/af.lproj/LocalizableTypes.strings b/iphone/Maps/LocalizedStrings/af.lproj/LocalizableTypes.strings index f3f93ac6c..f3f8c1be1 100644 --- a/iphone/Maps/LocalizedStrings/af.lproj/LocalizableTypes.strings +++ b/iphone/Maps/LocalizedStrings/af.lproj/LocalizableTypes.strings @@ -129,7 +129,6 @@ "type.amenity.pub" = "Kroeg"; "type.amenity.public_bookcase" = "Boekekas"; "type.amenity.recycling.centre" = "Herwinningsentrum"; -"type.amenity.recycling" = "Herwinningshouer"; "type.amenity.recycling.container" = "Herwinningshouer"; "type.recycling.batteries" = "Batterye"; "type.recycling.clothes" = "Klere"; diff --git a/iphone/Maps/LocalizedStrings/ar.lproj/LocalizableTypes.strings b/iphone/Maps/LocalizedStrings/ar.lproj/LocalizableTypes.strings index 066731185..4a0b0ab05 100644 --- a/iphone/Maps/LocalizedStrings/ar.lproj/LocalizableTypes.strings +++ b/iphone/Maps/LocalizedStrings/ar.lproj/LocalizableTypes.strings @@ -129,7 +129,6 @@ "type.amenity.pub" = "حانة"; "type.amenity.public_bookcase" = "مكتبة، تبادل كتب"; "type.amenity.recycling.centre" = "مركز إعادة تدوير"; -"type.amenity.recycling" = "حاوية لإعادة التدوير"; "type.amenity.recycling.container" = "حاوية لإعادة التدوير"; "type.recycling.batteries" = "بطاريات"; "type.recycling.clothes" = "ملابس"; diff --git a/iphone/Maps/LocalizedStrings/az.lproj/LocalizableTypes.strings b/iphone/Maps/LocalizedStrings/az.lproj/LocalizableTypes.strings index 77ecf2032..64bd8f442 100644 --- a/iphone/Maps/LocalizedStrings/az.lproj/LocalizableTypes.strings +++ b/iphone/Maps/LocalizedStrings/az.lproj/LocalizableTypes.strings @@ -129,7 +129,6 @@ "type.amenity.pub" = "Pub"; "type.amenity.public_bookcase" = "Kitab mübadiləsi"; "type.amenity.recycling.centre" = "Təkrar Emal Mərkəzi"; -"type.amenity.recycling" = "Təkrar emal konteyneri"; "type.amenity.recycling.container" = "Təkrar emal konteyneri"; "type.recycling.batteries" = "Batareyalar"; "type.recycling.clothes" = "Geyim"; diff --git a/iphone/Maps/LocalizedStrings/be.lproj/LocalizableTypes.strings b/iphone/Maps/LocalizedStrings/be.lproj/LocalizableTypes.strings index 4b9591829..2d799e4df 100644 --- a/iphone/Maps/LocalizedStrings/be.lproj/LocalizableTypes.strings +++ b/iphone/Maps/LocalizedStrings/be.lproj/LocalizableTypes.strings @@ -129,7 +129,6 @@ "type.amenity.pub" = "Pub"; "type.amenity.public_bookcase" = "Book Exchange"; "type.amenity.recycling.centre" = "Прыём другсыравіны"; -"type.amenity.recycling" = "Кантэйнер для другаснай сыравіны"; "type.amenity.recycling.container" = "Кантэйнер для другаснай сыравіны"; "type.recycling.batteries" = "Батарэйкі"; "type.recycling.clothes" = "Адзенне"; diff --git a/iphone/Maps/LocalizedStrings/bg.lproj/LocalizableTypes.strings b/iphone/Maps/LocalizedStrings/bg.lproj/LocalizableTypes.strings index 1cfd50e85..03aa03025 100644 --- a/iphone/Maps/LocalizedStrings/bg.lproj/LocalizableTypes.strings +++ b/iphone/Maps/LocalizedStrings/bg.lproj/LocalizableTypes.strings @@ -128,7 +128,6 @@ "type.amenity.pub" = "Кръчма"; "type.amenity.public_bookcase" = "Книжен обмен"; "type.amenity.recycling.centre" = "Преработвателно средище"; -"type.amenity.recycling" = "Кофи за преработваем отпадък"; "type.amenity.recycling.container" = "Кофи за преработваем отпадък"; "type.recycling.batteries" = "Батерии"; "type.recycling.clothes" = "Дрехи"; diff --git a/iphone/Maps/LocalizedStrings/ca.lproj/LocalizableTypes.strings b/iphone/Maps/LocalizedStrings/ca.lproj/LocalizableTypes.strings index 044581aab..a1cc70c9b 100644 --- a/iphone/Maps/LocalizedStrings/ca.lproj/LocalizableTypes.strings +++ b/iphone/Maps/LocalizedStrings/ca.lproj/LocalizableTypes.strings @@ -129,7 +129,6 @@ "type.amenity.pub" = "Taverna"; "type.amenity.public_bookcase" = "Intercanvi de llibres"; "type.amenity.recycling.centre" = "Centre de reciclatge"; -"type.amenity.recycling" = "Contenidor de reciclatge"; "type.amenity.recycling.container" = "Contenidor de reciclatge"; "type.recycling.batteries" = "Bateries"; "type.recycling.clothes" = "Roba"; diff --git a/iphone/Maps/LocalizedStrings/cs.lproj/LocalizableTypes.strings b/iphone/Maps/LocalizedStrings/cs.lproj/LocalizableTypes.strings index 472d51f90..41b60a260 100644 --- a/iphone/Maps/LocalizedStrings/cs.lproj/LocalizableTypes.strings +++ b/iphone/Maps/LocalizedStrings/cs.lproj/LocalizableTypes.strings @@ -129,7 +129,6 @@ "type.amenity.pub" = "Hospoda"; "type.amenity.public_bookcase" = "Výměna knih"; "type.amenity.recycling.centre" = "Recyklační středisko"; -"type.amenity.recycling" = "Recyklační nádoba"; "type.amenity.recycling.container" = "Recyklační nádoba"; "type.recycling.batteries" = "Baterie"; "type.recycling.clothes" = "Staré oblečení"; diff --git a/iphone/Maps/LocalizedStrings/da.lproj/LocalizableTypes.strings b/iphone/Maps/LocalizedStrings/da.lproj/LocalizableTypes.strings index 846b7e89a..d4e49fd24 100644 --- a/iphone/Maps/LocalizedStrings/da.lproj/LocalizableTypes.strings +++ b/iphone/Maps/LocalizedStrings/da.lproj/LocalizableTypes.strings @@ -128,7 +128,6 @@ "type.amenity.pub" = "Værtshus"; "type.amenity.public_bookcase" = "Bogbytteskab"; "type.amenity.recycling.centre" = "Genbrugsplads"; -"type.amenity.recycling" = "Genbrugscontainer"; "type.amenity.recycling.container" = "Genbrugscontainer"; "type.recycling.batteries" = "Batterier"; "type.recycling.clothes" = "Tekstil"; diff --git a/iphone/Maps/LocalizedStrings/de.lproj/LocalizableTypes.strings b/iphone/Maps/LocalizedStrings/de.lproj/LocalizableTypes.strings index 4a65e3e19..0a348e4c2 100644 --- a/iphone/Maps/LocalizedStrings/de.lproj/LocalizableTypes.strings +++ b/iphone/Maps/LocalizedStrings/de.lproj/LocalizableTypes.strings @@ -134,7 +134,6 @@ "type.amenity.pub" = "Kneipe"; "type.amenity.public_bookcase" = "Bücherschrank"; "type.amenity.recycling.centre" = "Recyclinghof"; -"type.amenity.recycling" = "Wertstoffcontainer"; "type.amenity.recycling.container" = "Wertstoffcontainer"; "type.recycling.batteries" = "Batterien"; "type.recycling.clothes" = "Altkleider"; diff --git a/iphone/Maps/LocalizedStrings/el.lproj/LocalizableTypes.strings b/iphone/Maps/LocalizedStrings/el.lproj/LocalizableTypes.strings index 6a94bffe0..a254cc306 100644 --- a/iphone/Maps/LocalizedStrings/el.lproj/LocalizableTypes.strings +++ b/iphone/Maps/LocalizedStrings/el.lproj/LocalizableTypes.strings @@ -129,7 +129,6 @@ "type.amenity.pub" = "Παμπ"; "type.amenity.public_bookcase" = "Ανταλλαγή βιβλίων"; "type.amenity.recycling.centre" = "Κέντρο ανακύκλωσης"; -"type.amenity.recycling" = "Κάδος ανακύκλωσης"; "type.amenity.recycling.container" = "Κάδος ανακύκλωσης"; "type.recycling.batteries" = "Μπαταρίες"; "type.recycling.clothes" = "Ρούχα"; diff --git a/iphone/Maps/LocalizedStrings/en-GB.lproj/LocalizableTypes.strings b/iphone/Maps/LocalizedStrings/en-GB.lproj/LocalizableTypes.strings index 6e1cb34ba..e9a032dc3 100644 --- a/iphone/Maps/LocalizedStrings/en-GB.lproj/LocalizableTypes.strings +++ b/iphone/Maps/LocalizedStrings/en-GB.lproj/LocalizableTypes.strings @@ -145,7 +145,6 @@ "type.amenity.pub" = "Pub"; "type.amenity.public_bookcase" = "Book Exchange"; "type.amenity.recycling.centre" = "Recycling Centre"; -"type.amenity.recycling" = "Recycling Container"; "type.amenity.recycling.container" = "Recycling Container"; "type.recycling.batteries" = "Batteries"; "type.recycling.clothes" = "Clothes"; diff --git a/iphone/Maps/LocalizedStrings/en.lproj/LocalizableTypes.strings b/iphone/Maps/LocalizedStrings/en.lproj/LocalizableTypes.strings index 1c25d8f3f..40e2110bd 100644 --- a/iphone/Maps/LocalizedStrings/en.lproj/LocalizableTypes.strings +++ b/iphone/Maps/LocalizedStrings/en.lproj/LocalizableTypes.strings @@ -160,8 +160,7 @@ /********** Types: Recycling **********/ -"type.amenity.recycling.centre" = "Recycling Center"; -"type.amenity.recycling" = "Recycling Container"; +"type.amenity.recycling.centre" = "Recycling Centre"; "type.amenity.recycling.container" = "Recycling Container"; "type.recycling.batteries" = "Batteries"; "type.recycling.clothes" = "Clothes"; diff --git a/iphone/Maps/LocalizedStrings/es-MX.lproj/LocalizableTypes.strings b/iphone/Maps/LocalizedStrings/es-MX.lproj/LocalizableTypes.strings index 61b37dace..a3831aa8d 100644 --- a/iphone/Maps/LocalizedStrings/es-MX.lproj/LocalizableTypes.strings +++ b/iphone/Maps/LocalizedStrings/es-MX.lproj/LocalizableTypes.strings @@ -129,7 +129,6 @@ "type.amenity.pub" = "Pub"; "type.amenity.public_bookcase" = "Intercambio de libros"; "type.amenity.recycling.centre" = "Centro de reciclaje"; -"type.amenity.recycling" = "Contenedor de reciclaje"; "type.amenity.recycling.container" = "Contenedor de reciclaje"; "type.recycling.batteries" = "Baterías"; "type.recycling.clothes" = "Ropa"; diff --git a/iphone/Maps/LocalizedStrings/es.lproj/LocalizableTypes.strings b/iphone/Maps/LocalizedStrings/es.lproj/LocalizableTypes.strings index e5483cf3c..72c4c4651 100644 --- a/iphone/Maps/LocalizedStrings/es.lproj/LocalizableTypes.strings +++ b/iphone/Maps/LocalizedStrings/es.lproj/LocalizableTypes.strings @@ -129,7 +129,6 @@ "type.amenity.pub" = "Taberna"; "type.amenity.public_bookcase" = "Intercambio de libros"; "type.amenity.recycling.centre" = "Centro de reciclaje"; -"type.amenity.recycling" = "Contenedor de reciclaje"; "type.amenity.recycling.container" = "Contenedor de reciclaje"; "type.recycling.batteries" = "Baterías"; "type.recycling.clothes" = "Ropa"; diff --git a/iphone/Maps/LocalizedStrings/et.lproj/LocalizableTypes.strings b/iphone/Maps/LocalizedStrings/et.lproj/LocalizableTypes.strings index bc3bf34ec..dab68c070 100644 --- a/iphone/Maps/LocalizedStrings/et.lproj/LocalizableTypes.strings +++ b/iphone/Maps/LocalizedStrings/et.lproj/LocalizableTypes.strings @@ -129,7 +129,6 @@ "type.amenity.pub" = "Pubi"; "type.amenity.public_bookcase" = "Avalik raamaturiiul"; "type.amenity.recycling.centre" = "Jäätmejaam"; -"type.amenity.recycling" = "Taaskasutuskonteiner"; "type.amenity.recycling.container" = "Taaskasutuskonteiner"; "type.recycling.batteries" = "Patareid"; "type.recycling.clothes" = "Rõivad"; diff --git a/iphone/Maps/LocalizedStrings/eu.lproj/LocalizableTypes.strings b/iphone/Maps/LocalizedStrings/eu.lproj/LocalizableTypes.strings index 1f5083276..91aeffe3a 100644 --- a/iphone/Maps/LocalizedStrings/eu.lproj/LocalizableTypes.strings +++ b/iphone/Maps/LocalizedStrings/eu.lproj/LocalizableTypes.strings @@ -129,7 +129,6 @@ "type.amenity.pub" = "Taberna"; "type.amenity.public_bookcase" = "Liburu trukea"; "type.amenity.recycling.centre" = "Birziklapen zentroa"; -"type.amenity.recycling" = "Birziklatzeko edukiontzia"; "type.amenity.recycling.container" = "Birziklatzeko edukiontzia"; "type.recycling.batteries" = "Bateriak"; "type.recycling.clothes" = "Arropa"; diff --git a/iphone/Maps/LocalizedStrings/fa.lproj/LocalizableTypes.strings b/iphone/Maps/LocalizedStrings/fa.lproj/LocalizableTypes.strings index 4e7396f02..cc1200bcc 100644 --- a/iphone/Maps/LocalizedStrings/fa.lproj/LocalizableTypes.strings +++ b/iphone/Maps/LocalizedStrings/fa.lproj/LocalizableTypes.strings @@ -129,7 +129,6 @@ "type.amenity.pub" = "میکده"; "type.amenity.public_bookcase" = "Book Exchange"; "type.amenity.recycling.centre" = "مرکز بازیافت"; -"type.amenity.recycling" = "ظرف بازیافت"; "type.amenity.recycling.container" = "ظرف بازیافت"; "type.recycling.batteries" = "ﺎﻫ ﯼﺮﺗﺎﺑ"; "type.recycling.clothes" = "لباسهای قدیمی"; diff --git a/iphone/Maps/LocalizedStrings/fi.lproj/LocalizableTypes.strings b/iphone/Maps/LocalizedStrings/fi.lproj/LocalizableTypes.strings index 58f1feef9..37ce640f4 100644 --- a/iphone/Maps/LocalizedStrings/fi.lproj/LocalizableTypes.strings +++ b/iphone/Maps/LocalizedStrings/fi.lproj/LocalizableTypes.strings @@ -129,7 +129,6 @@ "type.amenity.pub" = "Pubi"; "type.amenity.public_bookcase" = "Kirjahylly"; "type.amenity.recycling.centre" = "Kierrätyskeskus"; -"type.amenity.recycling" = "Kierrätysjäteastia"; "type.amenity.recycling.container" = "Kierrätysjäteastia"; "type.recycling.batteries" = "Paristot"; "type.recycling.clothes" = "Vaatteet"; diff --git a/iphone/Maps/LocalizedStrings/fr.lproj/LocalizableTypes.strings b/iphone/Maps/LocalizedStrings/fr.lproj/LocalizableTypes.strings index 13cbd202d..9f1533ad4 100644 --- a/iphone/Maps/LocalizedStrings/fr.lproj/LocalizableTypes.strings +++ b/iphone/Maps/LocalizedStrings/fr.lproj/LocalizableTypes.strings @@ -129,7 +129,6 @@ "type.amenity.pub" = "Pub"; "type.amenity.public_bookcase" = "Microbibliothèque"; "type.amenity.recycling.centre" = "Centre de recyclage"; -"type.amenity.recycling" = "Conteneur de recyclage"; "type.amenity.recycling.container" = "Conteneur de recyclage"; "type.recycling.batteries" = "Batteries"; "type.recycling.clothes" = "Vêtements usagés"; diff --git a/iphone/Maps/LocalizedStrings/he.lproj/LocalizableTypes.strings b/iphone/Maps/LocalizedStrings/he.lproj/LocalizableTypes.strings index f3e6f0b40..b31cad1c2 100644 --- a/iphone/Maps/LocalizedStrings/he.lproj/LocalizableTypes.strings +++ b/iphone/Maps/LocalizedStrings/he.lproj/LocalizableTypes.strings @@ -129,7 +129,6 @@ "type.amenity.pub" = "פאב"; "type.amenity.public_bookcase" = "כוננית ספרים ציבורית"; "type.amenity.recycling.centre" = "מרכז מיחזור"; -"type.amenity.recycling" = "מיכל מיחזור"; "type.amenity.recycling.container" = "מיכל מיחזור"; "type.recycling.batteries" = "סוללות"; "type.recycling.clothes" = "בגדים"; diff --git a/iphone/Maps/LocalizedStrings/hi.lproj/LocalizableTypes.strings b/iphone/Maps/LocalizedStrings/hi.lproj/LocalizableTypes.strings index 85972fe76..fe7d40c6e 100644 --- a/iphone/Maps/LocalizedStrings/hi.lproj/LocalizableTypes.strings +++ b/iphone/Maps/LocalizedStrings/hi.lproj/LocalizableTypes.strings @@ -129,7 +129,6 @@ "type.amenity.pub" = "सराय"; "type.amenity.public_bookcase" = "सार्वजनिक किताबों की अलमारी"; "type.amenity.recycling.centre" = "रीसाइक्लिंग सेंटर"; -"type.amenity.recycling" = "रीसाइक्लिंग कंटेनर"; "type.amenity.recycling.container" = "रीसाइक्लिंग कंटेनर"; "type.recycling.batteries" = "Batteries"; "type.recycling.clothes" = "Clothes"; diff --git a/iphone/Maps/LocalizedStrings/hu.lproj/LocalizableTypes.strings b/iphone/Maps/LocalizedStrings/hu.lproj/LocalizableTypes.strings index c73fc41d0..073123260 100644 --- a/iphone/Maps/LocalizedStrings/hu.lproj/LocalizableTypes.strings +++ b/iphone/Maps/LocalizedStrings/hu.lproj/LocalizableTypes.strings @@ -127,7 +127,6 @@ "type.amenity.pub" = "Kocsma"; "type.amenity.public_bookcase" = "Nyilvános könyvespolc"; "type.amenity.recycling.centre" = "Hulladékudvar"; -"type.amenity.recycling" = "Szelektív hulladékgyűjtés"; "type.amenity.recycling.container" = "Szelektív hulladékgyűjtő konténer"; "type.recycling.batteries" = "Elem, akkumulátor"; "type.recycling.clothes" = "Ruha"; diff --git a/iphone/Maps/LocalizedStrings/id.lproj/LocalizableTypes.strings b/iphone/Maps/LocalizedStrings/id.lproj/LocalizableTypes.strings index c7b375ce2..943f7a45f 100644 --- a/iphone/Maps/LocalizedStrings/id.lproj/LocalizableTypes.strings +++ b/iphone/Maps/LocalizedStrings/id.lproj/LocalizableTypes.strings @@ -129,7 +129,6 @@ "type.amenity.pub" = "Pub"; "type.amenity.public_bookcase" = "Rak Buku"; "type.amenity.recycling.centre" = "TPA"; -"type.amenity.recycling" = "Wadah daur ulang"; "type.amenity.recycling.container" = "Wadah daur ulang"; "type.recycling.batteries" = "Baterai"; "type.recycling.clothes" = "Pakaian lama"; diff --git a/iphone/Maps/LocalizedStrings/it.lproj/LocalizableTypes.strings b/iphone/Maps/LocalizedStrings/it.lproj/LocalizableTypes.strings index 52ac223ac..9f2f546f2 100644 --- a/iphone/Maps/LocalizedStrings/it.lproj/LocalizableTypes.strings +++ b/iphone/Maps/LocalizedStrings/it.lproj/LocalizableTypes.strings @@ -129,7 +129,6 @@ "type.amenity.pub" = "Taverna"; "type.amenity.public_bookcase" = "Biblioteca di strada"; "type.amenity.recycling.centre" = "Centro di riciclaggio"; -"type.amenity.recycling" = "Contenitore per materiali riciclabili"; "type.amenity.recycling.container" = "Contenitore per materiali riciclabili"; "type.recycling.batteries" = "Batterie"; "type.recycling.clothes" = "Vestiti usati"; diff --git a/iphone/Maps/LocalizedStrings/ja.lproj/LocalizableTypes.strings b/iphone/Maps/LocalizedStrings/ja.lproj/LocalizableTypes.strings index c705841ff..8e93889ac 100644 --- a/iphone/Maps/LocalizedStrings/ja.lproj/LocalizableTypes.strings +++ b/iphone/Maps/LocalizedStrings/ja.lproj/LocalizableTypes.strings @@ -129,7 +129,6 @@ "type.amenity.pub" = "バー"; "type.amenity.public_bookcase" = "街角文庫"; "type.amenity.recycling.centre" = "リサイクルセンター"; -"type.amenity.recycling" = "リサイクルボックス"; "type.amenity.recycling.container" = "リサイクルボックス"; "type.recycling.batteries" = "バッテリー"; "type.recycling.clothes" = "古着"; diff --git a/iphone/Maps/LocalizedStrings/ko.lproj/LocalizableTypes.strings b/iphone/Maps/LocalizedStrings/ko.lproj/LocalizableTypes.strings index 459c75df7..a51fc02d8 100644 --- a/iphone/Maps/LocalizedStrings/ko.lproj/LocalizableTypes.strings +++ b/iphone/Maps/LocalizedStrings/ko.lproj/LocalizableTypes.strings @@ -129,7 +129,6 @@ "type.amenity.pub" = "술집"; "type.amenity.public_bookcase" = "도서 교환"; "type.amenity.recycling.centre" = "재활용센터"; -"type.amenity.recycling" = "재활용 쓰레기통"; "type.amenity.recycling.container" = "재활용 쓰레기통"; "type.recycling.batteries" = "배터리"; "type.recycling.clothes" = "낡은 옷"; diff --git a/iphone/Maps/LocalizedStrings/lt.lproj/LocalizableTypes.strings b/iphone/Maps/LocalizedStrings/lt.lproj/LocalizableTypes.strings index 9dd1f2ce2..89bd396e3 100644 --- a/iphone/Maps/LocalizedStrings/lt.lproj/LocalizableTypes.strings +++ b/iphone/Maps/LocalizedStrings/lt.lproj/LocalizableTypes.strings @@ -123,7 +123,6 @@ "type.amenity.pub" = "Aludė"; "type.amenity.public_bookcase" = "Knygų namelis"; "type.amenity.recycling.centre" = "Antrinių žaliavų surinkimo aikštelė"; -"type.amenity.recycling" = "Antrinių žaliavų konteineris"; "type.amenity.recycling.container" = "Antrinių žaliavų konteineris"; "type.recycling.batteries" = "Baterijos"; "type.recycling.clothes" = "Tekstilė"; diff --git a/iphone/Maps/LocalizedStrings/lv.lproj/LocalizableTypes.strings b/iphone/Maps/LocalizedStrings/lv.lproj/LocalizableTypes.strings index 5793cf1cd..1bcb53138 100644 --- a/iphone/Maps/LocalizedStrings/lv.lproj/LocalizableTypes.strings +++ b/iphone/Maps/LocalizedStrings/lv.lproj/LocalizableTypes.strings @@ -129,7 +129,6 @@ "type.amenity.pub" = "Krogs"; "type.amenity.public_bookcase" = "Book Exchange"; "type.amenity.recycling.centre" = "Recycling Center"; -"type.amenity.recycling" = "Recycling Container"; "type.amenity.recycling.container" = "Recycling Container"; "type.recycling.batteries" = "Batteries"; "type.recycling.clothes" = "Clothes"; diff --git a/iphone/Maps/LocalizedStrings/mr.lproj/LocalizableTypes.strings b/iphone/Maps/LocalizedStrings/mr.lproj/LocalizableTypes.strings index a5c6a9279..cd1d6313a 100644 --- a/iphone/Maps/LocalizedStrings/mr.lproj/LocalizableTypes.strings +++ b/iphone/Maps/LocalizedStrings/mr.lproj/LocalizableTypes.strings @@ -129,7 +129,6 @@ "type.amenity.pub" = "पब"; "type.amenity.public_bookcase" = "Book Exchange"; "type.amenity.recycling.centre" = "भंगार केंद्र"; -"type.amenity.recycling" = "रीसायकलिंग कंटेनर"; "type.amenity.recycling.container" = "रीसायकलिंग कंटेनर"; "type.recycling.batteries" = "घरगुती बॅटरी"; "type.recycling.clothes" = "कपडे"; diff --git a/iphone/Maps/LocalizedStrings/mt.lproj/LocalizableTypes.strings b/iphone/Maps/LocalizedStrings/mt.lproj/LocalizableTypes.strings index 06fb0dede..5575643e9 100644 --- a/iphone/Maps/LocalizedStrings/mt.lproj/LocalizableTypes.strings +++ b/iphone/Maps/LocalizedStrings/mt.lproj/LocalizableTypes.strings @@ -129,7 +129,6 @@ "type.amenity.pub" = "Pub"; "type.amenity.public_bookcase" = "Book Exchange"; "type.amenity.recycling.centre" = "Recycling Center"; -"type.amenity.recycling" = "Recycling Container"; "type.amenity.recycling.container" = "Recycling Container"; "type.recycling.batteries" = "Batteries"; "type.recycling.clothes" = "Clothes"; diff --git a/iphone/Maps/LocalizedStrings/nb.lproj/LocalizableTypes.strings b/iphone/Maps/LocalizedStrings/nb.lproj/LocalizableTypes.strings index 5bffdc5d3..6b1915fc3 100644 --- a/iphone/Maps/LocalizedStrings/nb.lproj/LocalizableTypes.strings +++ b/iphone/Maps/LocalizedStrings/nb.lproj/LocalizableTypes.strings @@ -129,7 +129,6 @@ "type.amenity.pub" = "Pub"; "type.amenity.public_bookcase" = "Bokhylle"; "type.amenity.recycling.centre" = "Resirkuleringssenter"; -"type.amenity.recycling" = "Gjenvinningsbeholder"; "type.amenity.recycling.container" = "Gjenvinningsbeholder"; "type.recycling.batteries" = "Batterier"; "type.recycling.clothes" = "Gamle klær"; diff --git a/iphone/Maps/LocalizedStrings/nl.lproj/LocalizableTypes.strings b/iphone/Maps/LocalizedStrings/nl.lproj/LocalizableTypes.strings index 4237e0aef..c83899ef4 100644 --- a/iphone/Maps/LocalizedStrings/nl.lproj/LocalizableTypes.strings +++ b/iphone/Maps/LocalizedStrings/nl.lproj/LocalizableTypes.strings @@ -129,7 +129,6 @@ "type.amenity.pub" = "Kroeg"; "type.amenity.public_bookcase" = "Boekenkast"; "type.amenity.recycling.centre" = "Milieustraat"; -"type.amenity.recycling" = "Recycling container"; "type.amenity.recycling.container" = "Recycling container"; "type.recycling.batteries" = "Batterijen"; "type.recycling.clothes" = "Oude kleding"; diff --git a/iphone/Maps/LocalizedStrings/pl.lproj/LocalizableTypes.strings b/iphone/Maps/LocalizedStrings/pl.lproj/LocalizableTypes.strings index d06d30a16..ec50cf0fb 100644 --- a/iphone/Maps/LocalizedStrings/pl.lproj/LocalizableTypes.strings +++ b/iphone/Maps/LocalizedStrings/pl.lproj/LocalizableTypes.strings @@ -129,7 +129,6 @@ "type.amenity.pub" = "Pub"; "type.amenity.public_bookcase" = "Wymiana książek"; "type.amenity.recycling.centre" = "Centrum przetwórstwa odpadów"; -"type.amenity.recycling" = "Pojemnik do recyklingu"; "type.amenity.recycling.container" = "Pojemnik do recyklingu"; "type.recycling.batteries" = "Baterie"; "type.recycling.clothes" = "Stare ubrania"; diff --git a/iphone/Maps/LocalizedStrings/pt-BR.lproj/LocalizableTypes.strings b/iphone/Maps/LocalizedStrings/pt-BR.lproj/LocalizableTypes.strings index 2d837f321..ecbbdab5c 100644 --- a/iphone/Maps/LocalizedStrings/pt-BR.lproj/LocalizableTypes.strings +++ b/iphone/Maps/LocalizedStrings/pt-BR.lproj/LocalizableTypes.strings @@ -129,7 +129,6 @@ "type.amenity.pub" = "Bar ou boteco"; "type.amenity.public_bookcase" = "Biblioteca livre"; "type.amenity.recycling.centre" = "Centro de reciclagem"; -"type.amenity.recycling" = "Contêiner de reciclagem"; "type.amenity.recycling.container" = "Contêiner de reciclagem"; "type.recycling.batteries" = "Baterias"; "type.recycling.clothes" = "Roupas velhas"; diff --git a/iphone/Maps/LocalizedStrings/pt.lproj/LocalizableTypes.strings b/iphone/Maps/LocalizedStrings/pt.lproj/LocalizableTypes.strings index c1a6a1299..eb888defd 100644 --- a/iphone/Maps/LocalizedStrings/pt.lproj/LocalizableTypes.strings +++ b/iphone/Maps/LocalizedStrings/pt.lproj/LocalizableTypes.strings @@ -129,7 +129,6 @@ "type.amenity.pub" = "Pub ou taberna"; "type.amenity.public_bookcase" = "Biblioteca livre"; "type.amenity.recycling.centre" = "Centro de reciclagem"; -"type.amenity.recycling" = "Contentor de reciclagem"; "type.amenity.recycling.container" = "Contentor de reciclagem"; "type.recycling.batteries" = "Baterias"; "type.recycling.clothes" = "Roupas velhas"; diff --git a/iphone/Maps/LocalizedStrings/ro.lproj/LocalizableTypes.strings b/iphone/Maps/LocalizedStrings/ro.lproj/LocalizableTypes.strings index a580cad66..bd1b44c17 100644 --- a/iphone/Maps/LocalizedStrings/ro.lproj/LocalizableTypes.strings +++ b/iphone/Maps/LocalizedStrings/ro.lproj/LocalizableTypes.strings @@ -129,7 +129,6 @@ "type.amenity.pub" = "Pub"; "type.amenity.public_bookcase" = "Bibliotecă"; "type.amenity.recycling.centre" = "Centru de reciclare"; -"type.amenity.recycling" = "Containere pentru reciclare"; "type.amenity.recycling.container" = "Containere pentru reciclare"; "type.recycling.batteries" = "Baterii"; "type.recycling.clothes" = "Haine vechi"; diff --git a/iphone/Maps/LocalizedStrings/ru.lproj/LocalizableTypes.strings b/iphone/Maps/LocalizedStrings/ru.lproj/LocalizableTypes.strings index d1637f97e..b0b9b55d4 100644 --- a/iphone/Maps/LocalizedStrings/ru.lproj/LocalizableTypes.strings +++ b/iphone/Maps/LocalizedStrings/ru.lproj/LocalizableTypes.strings @@ -129,7 +129,6 @@ "type.amenity.pub" = "Паб"; "type.amenity.public_bookcase" = "Книгообмен"; "type.amenity.recycling.centre" = "Приём вторсырья"; -"type.amenity.recycling" = "Контейнер для вторсырья"; "type.amenity.recycling.container" = "Контейнер для вторсырья"; "type.recycling.batteries" = "Батарейки"; "type.recycling.clothes" = "Одежда"; diff --git a/iphone/Maps/LocalizedStrings/sk.lproj/LocalizableTypes.strings b/iphone/Maps/LocalizedStrings/sk.lproj/LocalizableTypes.strings index 85185137b..ab950309a 100644 --- a/iphone/Maps/LocalizedStrings/sk.lproj/LocalizableTypes.strings +++ b/iphone/Maps/LocalizedStrings/sk.lproj/LocalizableTypes.strings @@ -129,7 +129,6 @@ "type.amenity.pub" = "Pohostinstvo"; "type.amenity.public_bookcase" = "Knižná búdka"; "type.amenity.recycling.centre" = "Zberné suroviny"; -"type.amenity.recycling" = "Recyklačný kontajner"; "type.amenity.recycling.container" = "Recyklačný kontajner"; "type.recycling.batteries" = "Batérie"; "type.recycling.clothes" = "Staré oblečenie"; diff --git a/iphone/Maps/LocalizedStrings/sr.lproj/LocalizableTypes.strings b/iphone/Maps/LocalizedStrings/sr.lproj/LocalizableTypes.strings index f3190f440..03010062a 100644 --- a/iphone/Maps/LocalizedStrings/sr.lproj/LocalizableTypes.strings +++ b/iphone/Maps/LocalizedStrings/sr.lproj/LocalizableTypes.strings @@ -129,7 +129,6 @@ "type.amenity.pub" = "Паб"; "type.amenity.public_bookcase" = "Размена књига"; "type.amenity.recycling.centre" = "Центар за рециклажу"; -"type.amenity.recycling" = "Контејнер за рециклажу"; "type.amenity.recycling.container" = "Контејнер за рециклажу"; "type.recycling.batteries" = "Бетерије"; "type.recycling.clothes" = "Стара одећа"; diff --git a/iphone/Maps/LocalizedStrings/sv.lproj/LocalizableTypes.strings b/iphone/Maps/LocalizedStrings/sv.lproj/LocalizableTypes.strings index 537ea9085..58e7a3c0f 100644 --- a/iphone/Maps/LocalizedStrings/sv.lproj/LocalizableTypes.strings +++ b/iphone/Maps/LocalizedStrings/sv.lproj/LocalizableTypes.strings @@ -129,7 +129,6 @@ "type.amenity.pub" = "Krog"; "type.amenity.public_bookcase" = "Bokskåp"; "type.amenity.recycling.centre" = "Återvinningscentral"; -"type.amenity.recycling" = "Behållare för återvinningsbart avfall"; "type.amenity.recycling.container" = "Behållare för återvinningsbart avfall"; "type.recycling.batteries" = "Batterier"; "type.recycling.clothes" = "Gamla kläder"; diff --git a/iphone/Maps/LocalizedStrings/sw.lproj/LocalizableTypes.strings b/iphone/Maps/LocalizedStrings/sw.lproj/LocalizableTypes.strings index 6d6054d85..5013f15fc 100644 --- a/iphone/Maps/LocalizedStrings/sw.lproj/LocalizableTypes.strings +++ b/iphone/Maps/LocalizedStrings/sw.lproj/LocalizableTypes.strings @@ -129,7 +129,6 @@ "type.amenity.pub" = "Pub"; "type.amenity.public_bookcase" = "Book Exchange"; "type.amenity.recycling.centre" = "Recycling Center"; -"type.amenity.recycling" = "Recycling Container"; "type.amenity.recycling.container" = "Recycling Container"; "type.recycling.batteries" = "Betri"; "type.recycling.clothes" = "Clothes"; diff --git a/iphone/Maps/LocalizedStrings/th.lproj/LocalizableTypes.strings b/iphone/Maps/LocalizedStrings/th.lproj/LocalizableTypes.strings index 997fa17bd..c414d83a1 100644 --- a/iphone/Maps/LocalizedStrings/th.lproj/LocalizableTypes.strings +++ b/iphone/Maps/LocalizedStrings/th.lproj/LocalizableTypes.strings @@ -129,7 +129,6 @@ "type.amenity.pub" = "ผับ"; "type.amenity.public_bookcase" = "ตู้หนังสือ สถานที่แลกเปลี่ยนหนังสือ"; "type.amenity.recycling.centre" = "ศูนย์รีไซเคิล"; -"type.amenity.recycling" = "บรรจุภัณฑ์รีไซเคิล"; "type.amenity.recycling.container" = "บรรจุภัณฑ์รีไซเคิล"; "type.recycling.batteries" = "แบตเตอรี่"; "type.recycling.clothes" = "เสื้อผ้าเก่า"; diff --git a/iphone/Maps/LocalizedStrings/tr.lproj/LocalizableTypes.strings b/iphone/Maps/LocalizedStrings/tr.lproj/LocalizableTypes.strings index 32c500b45..386283195 100644 --- a/iphone/Maps/LocalizedStrings/tr.lproj/LocalizableTypes.strings +++ b/iphone/Maps/LocalizedStrings/tr.lproj/LocalizableTypes.strings @@ -129,7 +129,6 @@ "type.amenity.pub" = "Meyhane"; "type.amenity.public_bookcase" = "Kitap Değişimi"; "type.amenity.recycling.centre" = "Geri Dönüşüm Merkezi"; -"type.amenity.recycling" = "Atık Toplama Merkezi"; "type.amenity.recycling.container" = "Atık Toplama Merkezi"; "type.recycling.batteries" = "Piller"; "type.recycling.clothes" = "Kıyafet"; diff --git a/iphone/Maps/LocalizedStrings/uk.lproj/LocalizableTypes.strings b/iphone/Maps/LocalizedStrings/uk.lproj/LocalizableTypes.strings index 1b5b0ae38..ddad5520d 100644 --- a/iphone/Maps/LocalizedStrings/uk.lproj/LocalizableTypes.strings +++ b/iphone/Maps/LocalizedStrings/uk.lproj/LocalizableTypes.strings @@ -129,7 +129,6 @@ "type.amenity.pub" = "Паб"; "type.amenity.public_bookcase" = "Книгообмін"; "type.amenity.recycling.centre" = "Прийом вторсировини"; -"type.amenity.recycling" = "Контейнер для вторсировини"; "type.amenity.recycling.container" = "Контейнер для вторсировини"; "type.recycling.batteries" = "Батарейки"; "type.recycling.clothes" = "Одяг"; diff --git a/iphone/Maps/LocalizedStrings/vi.lproj/LocalizableTypes.strings b/iphone/Maps/LocalizedStrings/vi.lproj/LocalizableTypes.strings index fb843c583..f9ae0faae 100644 --- a/iphone/Maps/LocalizedStrings/vi.lproj/LocalizableTypes.strings +++ b/iphone/Maps/LocalizedStrings/vi.lproj/LocalizableTypes.strings @@ -129,7 +129,6 @@ "type.amenity.pub" = "Quán rượu"; "type.amenity.public_bookcase" = "Kệ sách"; "type.amenity.recycling.centre" = "Trung tâm tái sinh"; -"type.amenity.recycling" = "Thùng rác"; "type.amenity.recycling.container" = "Thùng rác"; "type.recycling.batteries" = "Ắc quy"; "type.recycling.clothes" = "Quần áo cũ"; diff --git a/iphone/Maps/LocalizedStrings/zh-Hans.lproj/LocalizableTypes.strings b/iphone/Maps/LocalizedStrings/zh-Hans.lproj/LocalizableTypes.strings index f1b4f2ac9..6bdb9cfa6 100644 --- a/iphone/Maps/LocalizedStrings/zh-Hans.lproj/LocalizableTypes.strings +++ b/iphone/Maps/LocalizedStrings/zh-Hans.lproj/LocalizableTypes.strings @@ -129,7 +129,6 @@ "type.amenity.pub" = "酒馆"; "type.amenity.public_bookcase" = "公共书架"; "type.amenity.recycling.centre" = "资源回收设施"; -"type.amenity.recycling" = "回收容器"; "type.amenity.recycling.container" = "回收容器"; "type.recycling.batteries" = "电池"; "type.recycling.clothes" = "旧衣物"; diff --git a/iphone/Maps/LocalizedStrings/zh-Hant.lproj/LocalizableTypes.strings b/iphone/Maps/LocalizedStrings/zh-Hant.lproj/LocalizableTypes.strings index 73a62827b..05d8251a1 100644 --- a/iphone/Maps/LocalizedStrings/zh-Hant.lproj/LocalizableTypes.strings +++ b/iphone/Maps/LocalizedStrings/zh-Hant.lproj/LocalizableTypes.strings @@ -129,7 +129,6 @@ "type.amenity.pub" = "酒吧"; "type.amenity.public_bookcase" = "漂書站"; "type.amenity.recycling.centre" = "回收中心"; -"type.amenity.recycling" = "回收箱"; "type.amenity.recycling.container" = "回收箱"; "type.recycling.batteries" = "電池"; "type.recycling.clothes" = "衣服"; diff --git a/libs/indexer/feature_data.cpp b/libs/indexer/feature_data.cpp index 55f11d0fb..d58aedacd 100644 --- a/libs/indexer/feature_data.cpp +++ b/libs/indexer/feature_data.cpp @@ -121,7 +121,7 @@ private: base::StringIL const types1[] = { // 1-arity {"building:part"}, {"hwtag"}, {"psurface"}, {"internet_access"}, {"organic"}, - {"wheelchair"}, {"cuisine"}, {"recycling"}, {"area:highway"}, {"fee"}, + {"wheelchair"}, {"cuisine"}, {"area:highway"}, {"fee"}, }; Classificator const & c = classif(); diff --git a/libs/indexer/feature_utils.cpp b/libs/indexer/feature_utils.cpp index 8d2c28447..29ba1f858 100644 --- a/libs/indexer/feature_utils.cpp +++ b/libs/indexer/feature_utils.cpp @@ -452,18 +452,6 @@ vector GetLocalizedCuisines(TypesHolder const & types) return GetLocalizedTypes(isCuisine, types); } -vector GetRecyclingTypes(TypesHolder const & types) -{ - auto const & isRecyclingType = ftypes::IsRecyclingTypeChecker::Instance(); - return GetRawTypeSecond(isRecyclingType, types); -} - -vector GetLocalizedRecyclingTypes(TypesHolder const & types) -{ - auto const & isRecyclingType = ftypes::IsRecyclingTypeChecker::Instance(); - return GetLocalizedTypes(isRecyclingType, types); -} - string GetLocalizedFeeType(TypesHolder const & types) { auto const & isFeeType = ftypes::IsFeeTypeChecker::Instance(); diff --git a/libs/indexer/feature_utils.hpp b/libs/indexer/feature_utils.hpp index 17a832924..a0aacc313 100644 --- a/libs/indexer/feature_utils.hpp +++ b/libs/indexer/feature_utils.hpp @@ -155,12 +155,6 @@ std::vector GetCuisines(TypesHolder const & types); // Returns vector of cuisines names localized by platform. std::vector GetLocalizedCuisines(TypesHolder const & types); -// Returns vector of recycling types readable names from classificator. -std::vector GetRecyclingTypes(TypesHolder const & types); - -// Returns vector of recycling types localized by platform. -std::vector GetLocalizedRecyclingTypes(TypesHolder const & types); - // Returns fee type localized by platform. std::string GetLocalizedFeeType(TypesHolder const & types); diff --git a/libs/indexer/feature_visibility.cpp b/libs/indexer/feature_visibility.cpp index e8cad4d74..c3f144639 100644 --- a/libs/indexer/feature_visibility.cpp +++ b/libs/indexer/feature_visibility.cpp @@ -157,7 +157,6 @@ bool TypeAlwaysExists(uint32_t type, GeomType geomType = GeomType::Undefined) { static uint32_t const arrTypes[] = { cl.GetTypeByPath({"organic"}), - cl.GetTypeByPath({"recycling"}), cl.GetTypeByPath({"wheelchair"}), }; if (base::IsExist(arrTypes, type)) diff --git a/libs/indexer/ftypes_matcher.cpp b/libs/indexer/ftypes_matcher.cpp index 501e58d18..08a2336b0 100644 --- a/libs/indexer/ftypes_matcher.cpp +++ b/libs/indexer/ftypes_matcher.cpp @@ -219,28 +219,11 @@ IsOperatorOthersPoiChecker::IsOperatorOthersPoiChecker() m_types.push_back(c.GetTypeByPath({"amenity", val})); } -IsRecyclingCentreChecker::IsRecyclingCentreChecker() : BaseChecker(3 /* level */) +IsRecyclingChecker::IsRecyclingChecker() : BaseChecker(3 /* level */) { Classificator const & c = classif(); m_types.push_back(c.GetTypeByPath({"amenity", "recycling", "centre"})); -} - -uint32_t IsRecyclingCentreChecker::GetType() const -{ - return m_types[0]; -} - -IsRecyclingContainerChecker::IsRecyclingContainerChecker() : BaseChecker(3 /* level */) -{ - Classificator const & c = classif(); m_types.push_back(c.GetTypeByPath({"amenity", "recycling", "container"})); - // Treat default type also as a container, see https://taginfo.openstreetmap.org/keys/recycling_type#values - m_types.push_back(c.GetTypeByPath({"amenity", "recycling"})); -} - -uint32_t IsRecyclingContainerChecker::GetType() const -{ - return m_types[0]; } IsRailwayStationChecker::IsRailwayStationChecker() @@ -711,12 +694,6 @@ IsCuisineChecker::IsCuisineChecker() : BaseChecker(1 /* level */) m_types.push_back(c.GetTypeByPath({"cuisine"})); } -IsRecyclingTypeChecker::IsRecyclingTypeChecker() : BaseChecker(1 /* level */) -{ - Classificator const & c = classif(); - m_types.push_back(c.GetTypeByPath({"recycling"})); -} - IsFeeTypeChecker::IsFeeTypeChecker() : BaseChecker(1 /* level */) { Classificator const & c = classif(); diff --git a/libs/indexer/ftypes_matcher.hpp b/libs/indexer/ftypes_matcher.hpp index 25bf20103..19cc127c1 100644 --- a/libs/indexer/ftypes_matcher.hpp +++ b/libs/indexer/ftypes_matcher.hpp @@ -90,24 +90,12 @@ public: DECLARE_CHECKER_INSTANCE(IsOperatorOthersPoiChecker); }; -class IsRecyclingCentreChecker : public BaseChecker +class IsRecyclingChecker : public BaseChecker { - IsRecyclingCentreChecker(); + IsRecyclingChecker(); public: - DECLARE_CHECKER_INSTANCE(IsRecyclingCentreChecker); - - uint32_t GetType() const; -}; - -class IsRecyclingContainerChecker : public BaseChecker -{ - IsRecyclingContainerChecker(); - -public: - DECLARE_CHECKER_INSTANCE(IsRecyclingContainerChecker); - - uint32_t GetType() const; + DECLARE_CHECKER_INSTANCE(IsRecyclingChecker); }; class IsRailwayStationChecker : public BaseChecker @@ -471,14 +459,6 @@ public: DECLARE_CHECKER_INSTANCE(IsCuisineChecker); }; -class IsRecyclingTypeChecker : public BaseChecker -{ - IsRecyclingTypeChecker(); - -public: - DECLARE_CHECKER_INSTANCE(IsRecyclingTypeChecker); -}; - class IsFeeTypeChecker : public BaseChecker { IsFeeTypeChecker(); diff --git a/libs/indexer/map_object.cpp b/libs/indexer/map_object.cpp index d3012f426..838562fb2 100644 --- a/libs/indexer/map_object.cpp +++ b/libs/indexer/map_object.cpp @@ -201,16 +201,6 @@ vector MapObject::GetLocalizedCuisines() const return feature::GetLocalizedCuisines(m_types); } -vector MapObject::GetRecyclingTypes() const -{ - return feature::GetRecyclingTypes(m_types); -} - -vector MapObject::GetLocalizedRecyclingTypes() const -{ - return feature::GetLocalizedRecyclingTypes(m_types); -} - string MapObject::GetLocalizedFeeType() const { return feature::GetLocalizedFeeType(m_types); diff --git a/libs/indexer/map_object.hpp b/libs/indexer/map_object.hpp index 515c8d85e..83f59c547 100644 --- a/libs/indexer/map_object.hpp +++ b/libs/indexer/map_object.hpp @@ -70,10 +70,6 @@ public: std::vector GetCuisines() const; /// @returns translated cuisine(s). std::vector GetLocalizedCuisines() const; - /// @returns non-localized recycling type(s). - std::vector GetRecyclingTypes() const; - /// @returns translated recycling type(s). - std::vector GetLocalizedRecyclingTypes() const; /// @returns translated fee type. std::string GetLocalizedFeeType() const; /// @returns translated and formatted cuisines. diff --git a/libs/map/place_page_info.cpp b/libs/map/place_page_info.cpp index 2f1fd33e5..5f0b9c1e3 100644 --- a/libs/map/place_page_info.cpp +++ b/libs/map/place_page_info.cpp @@ -135,10 +135,6 @@ std::string Info::FormatSubtitle(bool withTypes, bool withMainType) const for (auto const & cuisine : GetLocalizedCuisines()) append(cuisine); - // Recycling types. - for (auto const & recycling : GetLocalizedRecyclingTypes()) - append(recycling); - // Airport IATA code. auto const iata = GetMetadata(feature::Metadata::FMD_AIRPORT_IATA); if (!iata.empty()) diff --git a/libs/search/intermediate_result.cpp b/libs/search/intermediate_result.cpp index bd87c447a..372c729ee 100644 --- a/libs/search/intermediate_result.cpp +++ b/libs/search/intermediate_result.cpp @@ -290,9 +290,6 @@ void FillDetails(FeatureType & ft, std::string const & name, Result::Details & d auto const cuisines = feature::GetLocalizedCuisines(typesHolder); auto const cuisine = strings::JoinStrings(cuisines, feature::kFieldsSeparator); - auto const recycling = - strings::JoinStrings(feature::GetLocalizedRecyclingTypes(typesHolder), feature::kFieldsSeparator); - auto const roadShields = ftypes::GetRoadShieldsNames(ft); auto const roadShield = strings::JoinStrings(roadShields, feature::kFieldsSeparator); @@ -317,7 +314,6 @@ void FillDetails(FeatureType & ft, std::string const & name, Result::Details & d append(brand); append(elevation); append(cuisine); - append(recycling); append(fee); details.m_description = std::move(description);