From 60233fb46bd9f34641dc6a47891daa9f1eb09073 Mon Sep 17 00:00:00 2001 From: Tobias Zwick Date: Fri, 6 Nov 2020 19:30:17 +0100 Subject: [PATCH] version up and update translations --- app/build.gradle.kts | 4 +- app/src/main/assets/country_metadata/AR.yml | 20 +- app/src/main/assets/country_metadata/AT.yml | 15 +- app/src/main/assets/country_metadata/AZ.yml | 8 +- app/src/main/assets/country_metadata/BE.yml | 2 +- app/src/main/assets/country_metadata/BR.yml | 2 +- app/src/main/assets/country_metadata/BY.yml | 16 +- .../main/assets/country_metadata/CA-QC.yml | 5 +- app/src/main/assets/country_metadata/CZ.yml | 6 +- app/src/main/assets/country_metadata/DE.yml | 83 +++---- app/src/main/assets/country_metadata/EC.yml | 2 +- app/src/main/assets/country_metadata/ES.yml | 4 +- app/src/main/assets/country_metadata/FX.yml | 17 +- app/src/main/assets/country_metadata/GB.yml | 14 +- .../main/assets/country_metadata/IN-RJ.yml | 4 +- app/src/main/assets/country_metadata/IR.yml | 2 +- app/src/main/assets/country_metadata/IT.yml | 10 +- app/src/main/assets/country_metadata/JP.yml | 8 +- app/src/main/assets/country_metadata/NL.yml | 4 +- app/src/main/assets/country_metadata/NO.yml | 20 +- app/src/main/assets/country_metadata/PT.yml | 8 +- app/src/main/assets/country_metadata/RU.yml | 4 +- app/src/main/assets/country_metadata/TR.yml | 10 +- app/src/main/assets/country_metadata/UA.yml | 10 +- .../main/assets/country_metadata/US-MI.yml | 4 +- .../main/assets/country_metadata/US-OH.yml | 6 +- .../assets/map_theme/jawg/layers/labels.yaml | 2 +- app/src/main/assets/osmfeatures/de.json | 6 +- app/src/main/assets/osmfeatures/el.json | 16 +- app/src/main/assets/osmfeatures/fr.json | 16 +- app/src/main/assets/osmfeatures/gl.json | 130 +++++++++-- app/src/main/assets/osmfeatures/it.json | 9 +- app/src/main/assets/osmfeatures/pl.json | 4 +- app/src/main/assets/osmfeatures/presets.json | 6 +- app/src/main/assets/osmfeatures/pt.json | 2 +- app/src/main/assets/osmfeatures/sk.json | 207 ++++++++++++++++++ app/src/main/assets/osmfeatures/zh-CN.json | 15 +- app/src/main/res/raw/changelog.yml | 27 +-- app/src/main/res/values-cs/strings.xml | 2 + app/src/main/res/values-de/strings.xml | 14 +- app/src/main/res/values-el/strings.xml | 14 ++ .../main/res/values-el/translation_info.xml | 2 +- app/src/main/res/values-es/strings.xml | 2 + app/src/main/res/values-fa/strings.xml | 16 ++ .../main/res/values-fa/translation_info.xml | 2 +- app/src/main/res/values-fi/strings.xml | 14 ++ .../main/res/values-fi/translation_info.xml | 2 +- app/src/main/res/values-fr/strings.xml | 2 + app/src/main/res/values-hr/strings.xml | 199 ++++++----------- .../main/res/values-hr/translation_info.xml | 2 +- app/src/main/res/values-it/strings.xml | 14 +- .../main/res/values-it/translation_info.xml | 2 +- app/src/main/res/values-nl/strings.xml | 2 + app/src/main/res/values-pl/strings.xml | 16 ++ .../main/res/values-pl/translation_info.xml | 2 +- app/src/main/res/values-pt-rBR/strings.xml | 14 ++ .../res/values-pt-rBR/translation_info.xml | 2 +- res/country_metadata/atmOperators.yml | 182 +++++++-------- .../chargingStationOperators.yml | 109 ++++----- .../clothesContainerOperators.yml | 38 ++-- 60 files changed, 876 insertions(+), 504 deletions(-) diff --git a/app/build.gradle.kts b/app/build.gradle.kts index 2a761216bb..0d0d42d138 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -35,8 +35,8 @@ android { applicationId = "de.westnordost.streetcomplete" minSdkVersion(17) targetSdkVersion(29) - versionCode = 2602 - versionName = "26.0-beta3" + versionCode = 2603 + versionName = "26.0" testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner" } diff --git a/app/src/main/assets/country_metadata/AR.yml b/app/src/main/assets/country_metadata/AR.yml index 56299d8dd6..f0c13d94bd 100644 --- a/app/src/main/assets/country_metadata/AR.yml +++ b/app/src/main/assets/country_metadata/AR.yml @@ -1,21 +1,21 @@ # Do not edit. Source files are in /res/country_metadata atmOperators: [Banco Macro, Banco de la Nación Argentina, Banco Nación, Macro, Banco Provincia, Banco Santa Fe, Banco - Patagonia, Santander Río, Banco de Córdoba, Galicia, Banco Galicia, Santander, Banco Ciudad, NUEVO - BANCO DE SANTA FE S.A., HSBC, Banco San Juan, Banco de Corrientes, Banco Credicoop, Nuevo Banco - del Chaco, Banco Formosa, Credicoop, Banco de Santiago del Estero, Banco de Formosa, Nuevo Banco - de Entre Ríos S.A., ICBC, Supervielle, Banco del Chubut, Banco Santiago del Estero, Banco Provincia - de Buenos Aires, Banco Hipotecario, CABAL COOP. LTDA., Banco Supervielle, BBVA, Patagonia Cajero, + Patagonia, Santander Río, Banco de Córdoba, Galicia, Banco Galicia, Santander, Banco San Juan, Banco + Ciudad, NUEVO BANCO DE SANTA FE S.A., HSBC, Banco de Corrientes, Banco Credicoop, Nuevo Banco del + Chaco, Banco Formosa, Credicoop, Banco de Santiago del Estero, Banco de Formosa, Nuevo Banco de + Entre Ríos S.A., ICBC, Supervielle, Banco Santiago del Estero, Banco Provincia de Buenos Aires, + Banco Hipotecario, CABAL COOP. LTDA., Banco del Chubut, Banco Supervielle, BBVA, Patagonia Cajero, Banelco, Banco de la Nacion Argentina, BBVA Francés, Patagonia, Nación, BANCO MACRO, Cajero Express, Banco de la Provincia de Buenos Aires, Banco Santa Cruz, Banco Provincia de La Pampa S.A., Banco Itaú, BPN Cajero, Red Link - Punto efectivo, Link, Citibank, Banco de Tierra del Fuego, Banco de Entre Ríos, Banco Nación de la República Argentina, Banco Nacion Argentina, Banco Municipal, Banco HSBC, Athena Bitcoin Inc., Athena Bitcoin Argentina, ATM BPN Link, macro, link, bancor link, UBM La Pampa, Superville, Red Link, Planta Baldissera, Nuevo Banco del Chaco SA, Link Banco Provincia, Hipotecario, Galicia Cajero, - Credicoop Cajero, Cajero Macro, Bancor, Banco del Chubut S.A., Banco de la Provincia del Neuquén S.A., - Banco de la Provincia del Neuquén S.A, Banco de la Nation, Banco de Santa Fe, Banco de La Pampa, Banco - Superville, Banco Santander, Banco Rioja, Banco Provincia del Neuquén S.A., Banco Provincia de La - Rioja, Banco Piano, Banco Nacion, Banco Hipotecario S.A., Banco Francés, Banco Corrientes, Banco - Comafi, BPN, BERSA, BBVA Banco Francés] + Credicoop Cajero, Chubut, Cajero Macro, Bancor, Banco del Chubut S.A., Banco de la Provincia del Neuquén + S.A., Banco de la Provincia del Neuquén S.A, Banco de la Nation, Banco de Santa Fe, Banco de La + Pampa, Banco Superville, Banco Santander, Banco Rioja, Banco Provincia del Neuquén S.A., Banco Provincia + de La Rioja, Banco Piano, Banco Nacion, Banco Hipotecario S.A., Banco Francés, Banco Corrientes, + Banco Comafi, BPN, BERSA, BBVA Banco Francés] chargingStationOperators: [Empresa Provincial de la Energía Santa Fe] clothesContainerOperators: [Municipalidad de Posadas] mobileCountryCode: 722 diff --git a/app/src/main/assets/country_metadata/AT.yml b/app/src/main/assets/country_metadata/AT.yml index 2268626102..06e2c4911f 100644 --- a/app/src/main/assets/country_metadata/AT.yml +++ b/app/src/main/assets/country_metadata/AT.yml @@ -15,14 +15,13 @@ chargingStationOperators: [Wien Energie GmbH, SMATRICS, Energie AG, EVN, Energie illwerke, VKW Mobilität, Lidl Österreich GmbH, IONITY, Hotel Der Stubaierhof, HGL, Envesta, EVN AG, E-Werke Bad Radkersburg, ÖBB-Infrastruktur, ÖAMTC, smatrics, VLOTTE P&C, VKW Vlotte, Stadtwerke Trofaiach 22 kW, Stadtgemeinde Zell am See, Keba, Ionity, IAM – Institut für Technologie und alternative - Mobilität, IAM, Gigasport, Gemeinde Podersdorf, EnergieAG, Energie Burgenland AG, ÖBB, vlotte, vkw - vlotte, tim, huma eleven, everynear, elektrodrive-tirol.at, da emobil GmbH, Weiss GmbH Kompetent - bei Holz, Vlotte-VKW, Turmöl, Turmstrom, Tiwag- Tiroler Wasserkraftwerke AG, Tiwag, Tesla, TU Wien - - Enio, TIWAG-Tiroler Wasserkraft AG, Swarovski, Stadtwerke Mürzzuschlag, Stadtwerke Judenburg, - Stadtwerke Hartberg, Stadtgemeinde Mank, Stadtgemeinde Friedberg, Stadtgemeinde Ebreichsdorf, Spar, - Linz Strom AG, Linz AG Strom, Gemeinde Kreuzstetten, Gemeinde Kirchdorf in Tirol, Gemeinde Eben, Energie - Steiermark AG, Energie Graz GmbH & Co KG, ElectroDrive, ELLA, Direkt Holidays GmbH, DEZ, BH Melk, - A1] + Mobilität, IAM, Gigasport, Gemeinde Podersdorf, EnergieAG, Energie Graz GmbH & Co KG, Energie Burgenland + AG, ÖBB, vlotte, vkw vlotte, tim, huma eleven, everynear, elektrodrive-tirol.at, da emobil GmbH, + Weiss GmbH Kompetent bei Holz, Vlotte-VKW, Turmöl, Turmstrom, Tiwag- Tiroler Wasserkraftwerke AG, Tiwag, + Tesla, TU Wien - Enio, TIWAG-Tiroler Wasserkraft AG, Swarovski, Stadtwerke Mürzzuschlag, Stadtwerke + Judenburg, Stadtwerke Hartberg, Stadtgemeinde Mank, Stadtgemeinde Friedberg, Stadtgemeinde Ebreichsdorf, + Spar, Linz Strom AG, Linz AG Strom, Gemeinde Kreuzstetten, Gemeinde Kirchdorf in Tirol, Gemeinde Eben, + Energie Steiermark AG, ElectroDrive, ELLA, Direkt Holidays GmbH, DEZ, BH Melk, A1] clothesContainerOperators: [Humana, Holding Graz, Kolping, Rotes Kreuz, MA 48, Caritas, Linz AG Abfall, MA48, Graz Holding, humana, WAMS, Stadtbetriebe Steyr, Stadt Graz, HUMANA, GVA Baden] isAdvisorySpeedLimitKnown: false diff --git a/app/src/main/assets/country_metadata/AZ.yml b/app/src/main/assets/country_metadata/AZ.yml index a8bb380a0e..1e591a47e3 100644 --- a/app/src/main/assets/country_metadata/AZ.yml +++ b/app/src/main/assets/country_metadata/AZ.yml @@ -1,8 +1,8 @@ # Do not edit. Source files are in /res/country_metadata -atmOperators: [Azərbaycan Beynəlxalq Bankı, Kapital Bank, YuniBank, Bank Standart, Texnikabank, Ata Bank, Bank Respublika, - Xalq Bank, Dəmirbank, Bankomat, Unibank, Azəriqazbank, Bank of Baku, RabitəBank, MuğanBank, Nikoyl - Bank, International Bank of Azerbaijan, AFB Bank, Royal Bank, Beynəlxalq Bank, Access Bank, Kredo - Bank, KapitalBank, Kapital bank, Azərbaycan Sənaye Bankı, Zaminbank, Yunayted Kredit Bank, Turan +atmOperators: [Azərbaycan Beynəlxalq Bankı, Kapital Bank, YuniBank, Bank Standart, Texnikabank, Bank Respublika, Ata + Bank, Xalq Bank, Dəmirbank, Bankomat, Unibank, Azəriqazbank, Bank of Baku, RabitəBank, MuğanBank, + Nikoyl Bank, International Bank of Azerbaijan, AFB Bank, Royal Bank, Beynəlxalq Bank, Access Bank, + Kredo Bank, KapitalBank, Kapital bank, Azərbaycan Sənaye Bankı, Zaminbank, Yunayted Kredit Bank, Turan Bank, Parabank, Kapital Bank ATM, Bank of Azerbaijan, Bank Avrasiya, Azerbaijan International Bank, Atrabank, Əmrahbank, The International Bank of Azerbaijan, Pasha Bank, Express Bank, Artsakhbank, Капитал банк, «Kapital Bank» ASC, expressbank, ZaminBank, Yapı Kredi Bank Azərbaycan, SilkWay Bank, SW Bank, diff --git a/app/src/main/assets/country_metadata/BE.yml b/app/src/main/assets/country_metadata/BE.yml index d03655200d..a5bab1263e 100644 --- a/app/src/main/assets/country_metadata/BE.yml +++ b/app/src/main/assets/country_metadata/BE.yml @@ -2,7 +2,7 @@ atmOperators: [BNP Paribas Fortis, KBC, Argenta, BeoBank, ING, Belfius, BNP Paribas, bpost, Bpost, Fortis, AXA, Dexia, De Post, Crelan, Beobank, BNP Parisbas Fortis, bpost bank, Record Bank, Record, Europabank, BNP-Paribas Fortis, Axa, AXA Bank] -chargingStationOperators: [Allego, Blue Corner, Ionity, allego, Smoov Allego, Luminus, The Plugin Company, Tesla, Smoov, PitPoint, +chargingStationOperators: [Allego, Blue Corner, Ionity, allego, Smoov Allego, Luminus, PitPoint, The Plugin Company, Tesla, Smoov, Colruyt, Bluecorner, smoov allego, Lidl, BlueCorner, smoov, charge.brussels, bluecorner, allegro / smoov, Pitpoint Brussels, Partago, ORES, Eoly, EV-Box, De Lijn, BlueConnect, Audi, Allegro] clothesContainerOperators: [Vlaams Inzamel Centrum Textiel, Wereld Missie Hulp, Les Petits Riens - Spullenhulp, Terre, Vlaams Internationaal diff --git a/app/src/main/assets/country_metadata/BR.yml b/app/src/main/assets/country_metadata/BR.yml index 009642db73..14cf31fade 100644 --- a/app/src/main/assets/country_metadata/BR.yml +++ b/app/src/main/assets/country_metadata/BR.yml @@ -1,7 +1,7 @@ # Do not edit. Source files are in /res/country_metadata atmOperators: [Banco do Brasil, Banco 24 Horas, Banco24Horas, Bradesco, Caixa, Itaú, Caixa Econômica Federal, Banco 24 horas, Santander, Banrisul, Tecnologia Bancária S.A., Banco 24H, Banrisul S.A., Banco24horas, - 24 Horas, Banco 24h, Banco 24Horas, Banco do Brasil S.A., banco24horas, Saque e Pague, Multibanco, + 24 Horas, Banco 24h, Banco 24Horas, Banco do Brasil S.A., Saque e Pague, banco24horas, Multibanco, HSBC, 24 horas, BRB, TecBan, Caixa 24h, Caixa 24 Horas, banco 24h, Itau, Caixa Econômica, Caixa Economica Federal, Banese, Banco24h, Banco24, Banco Bradesco, BDN BRADESCO, caixa 24h, Dinho, Caixas eletrônicos da Caixa Econômica Federal, Banco24H, Banco Santander, Banco 24Hrs] diff --git a/app/src/main/assets/country_metadata/BY.yml b/app/src/main/assets/country_metadata/BY.yml index 04ca0e90e8..5646c79d78 100644 --- a/app/src/main/assets/country_metadata/BY.yml +++ b/app/src/main/assets/country_metadata/BY.yml @@ -1,14 +1,14 @@ # Do not edit. Source files are in /res/country_metadata atmOperators: [Беларусбанк, Банк БелВЭБ, Белинвестбанк, Приорбанк, Белагропромбанк, БПС-Сбербанк, Белгазпромбанк, Банк - Дабрабыт, ОАО «Белагропромбанк», Альфа-Банк, БНБ-Банк, Паритетбанк, ОАО «Белгазпромбанк», Белвнешэкономбанк, + Дабрабыт, БНБ-Банк, ОАО «Белагропромбанк», Альфа-Банк, Паритетбанк, ОАО «Белгазпромбанк», Белвнешэкономбанк, Технобанк, '"ОАО ""АСБ Беларусбанк"""', ВТБ, Беларусьбанк, БелВЭБ, БПС-Банк, Альфа-банк, Belarusbank, - АСБ Беларусбанк, Франсабанк, ОАО «АСБ Беларусбанк», БеларусБанк, '"ОАО ""БПС-СБЕРБАНК"""', '"АСБ ""Беларусбанк"""', - ОАО «БПС-Сбербанк», МТБанк, Бпс-сбербанк, БелВэб, БСБ Банк, БПС, беларусбанк, ОАО «Белинвестбанк», - БПС-сбербанк, БНБ, Альфабанк, Belinvestbank, '"ОАО ""Белагропромбанк"""', ОАО «Банк Дабрабыт», БелАгроПромБанк, - Банк ВТБ, БТА Банк, БПС-банк, Priorbank, '"ЗАО ""РРБ-Банк"""', Трастбанк, ОАО БАНК БЕЛВЭБ, ОАО «Приорбанк», - Идея Банк, ЗАО «БСБ Банк», Белорусбанк, БелСвиссБанк, БелИнвестБанк, Банк Решение, Банк Москва-Минск, - Банк ВТБ Беларусь, БСБ-Банк, БСБ банк, БПС Сбербанк, Paritetbank, Belagroprombank, BelSwissBank, '"ОАО - ""Белинвестбанк"""', '"ЗАО ""Альфа-Банк"""'] + АСБ Беларусбанк, Франсабанк, ОАО «АСБ Беларусбанк», МТБанк, БеларусБанк, '"ОАО ""БПС-СБЕРБАНК"""', + '"АСБ ""Беларусбанк"""', ОАО «БПС-Сбербанк», ЗАО РРБ-Банк, Бпс-сбербанк, БСБ Банк, БПС, беларусбанк, + ОАО «Белинвестбанк», БПС-сбербанк, Альфабанк, Belinvestbank, '"ОАО ""Белагропромбанк"""', ОАО «Банк + Дабрабыт», БелАгроПромБанк, Банк ВТБ, БТА Банк, БПС-банк, Priorbank, '"ЗАО ""РРБ-Банк"""', Трастбанк, + ОАО БАНК БЕЛВЭБ, ОАО «Приорбанк», Идея Банк, ЗАО «БСБ Банк», Белорусбанк, БелСвиссБанк, БелИнвестБанк, + Банк Решение, Банк Москва-Минск, Банк ВТБ Беларусь, БСБ-Банк, БСБ банк, БПС Сбербанк, Paritetbank, + Belagroprombank, BelSwissBank, '"ОАО ""Белинвестбанк"""', '"ЗАО ""Альфа-Банк"""'] chargingStationOperators: ['"РУП ""Белоруснефть-Минскавтозаправка"""', ПО «Белоруснефть», Белоруснефть, '"РУП ""Белоруснефть-Гомельоблнефтепродукт"""', '"РУП ""Белоруснефть-Могилевоблнефтепродукт"""', '"РУП ""Белоруснефть-Гроднооблнефтепродукт"""', '"РУП ""Белоруснефть-Минскоблнефтепродукт"""', Евроопт, Беларуснафта, Eleven] diff --git a/app/src/main/assets/country_metadata/CA-QC.yml b/app/src/main/assets/country_metadata/CA-QC.yml index 314c629946..afbe950ec2 100644 --- a/app/src/main/assets/country_metadata/CA-QC.yml +++ b/app/src/main/assets/country_metadata/CA-QC.yml @@ -2,6 +2,7 @@ atmOperators: [Desjardins, Banque Laurentienne, Instacoin, RBC, BMO, Banque Nationale, TD Canada Trust, Caisse Desjardins, CIBC, Caisse populaire Desjardins, Banque Scotia, Banque Royale, Banque Manuvie, Caisse Populaire Desjardins d'Amos, Caisse Populaire Desjardins, Banque nationale, Banque de Montréal, BMO Banque de Montréal] -chargingStationOperators: [Le Circuit Électrique, Circuit Électrique, Flo, Le Circuit électrique, Circuit Electrique, Circuit électrique, - Hydro-Québec, Hydro-Quebec, Le circuit électrique, Le Circuite Électrique, Véloasis, Electric Circuit] +chargingStationOperators: [Le Circuit Électrique, Circuit Électrique, Flo, Le Circuit électrique, Circuit Electrique, Hydro-Québec, + Circuit électrique, Hydro-Quebec, Le circuit électrique, Le Circuite Électrique, Véloasis, Electric + Circuit] officialLanguages: [fr] diff --git a/app/src/main/assets/country_metadata/CZ.yml b/app/src/main/assets/country_metadata/CZ.yml index 3e4f73918d..2b10ac8407 100644 --- a/app/src/main/assets/country_metadata/CZ.yml +++ b/app/src/main/assets/country_metadata/CZ.yml @@ -8,9 +8,9 @@ atmOperators: [Česká spořitelna, ČSOB, Komerční banka, Pharro, Euronet, Č Raiffeisen, Oberbank, OK Point, MONETA, Fio Banka, FIO, ERA, Airbank a.s.] chargingStationOperators: [ČEZ, ČEZ (CCS/CHAdeMO/Mennekes type2), PRE, EVMAPA, E.ON (CCS/CHAdeMO/Mennekes), ČEZ (CCS/CHAdeMO/Mennekes typ2), beskolo, EON, E.ON, ČEZ (CCS/CHAdeMO/Mennekes type 2), Tesla, ČEZ (CCS/CHAdeMO and Mennekes - type2), evmapa.cz, MOL (CCS/CHAdeMO/Mennekes), CCS/CHAdeMO and Mennekes type2, ČEZ (CCS/CHAdeMO/Mennekes), - ČEZ (CCS/CHAdeMO/Menneke type2), VŠB, TS Opava, Město Dačice, Kaufland, InChaNet, EVmapa (Mennekes - type 2)] + type2), evmapa.cz, CCS/CHAdeMO and Mennekes type2, ČEZ (CCS/CHAdeMO/Mennekes), ČEZ (CCS/CHAdeMO/Menneke + type2), VŠB, TS Opava, Město Dačice, MOL (CCS/CHAdeMO/Mennekes), MOL, Kaufland, InChaNet, EVmapa + (Mennekes type 2)] clothesContainerOperators: [Textileco, Služby města Český Krumlov s.r.o., SAKO, Město Veltrusy, KLOK.TEX] isAdvisorySpeedLimitKnown: true isLivingStreetKnown: true diff --git a/app/src/main/assets/country_metadata/DE.yml b/app/src/main/assets/country_metadata/DE.yml index 5e5b1c6ca3..261cbf80c9 100644 --- a/app/src/main/assets/country_metadata/DE.yml +++ b/app/src/main/assets/country_metadata/DE.yml @@ -1,22 +1,22 @@ # Do not edit. Source files are in /res/country_metadata -atmOperators: [Sparkasse, Postbank, Euronet, Volksbank, Deutsche Bank, ING-DiBa, Commerzbank, Berliner Sparkasse, Raiffeisenbank, +atmOperators: [Sparkasse, Postbank, Euronet, Volksbank, Deutsche Bank, Commerzbank, ING-DiBa, Berliner Sparkasse, Raiffeisenbank, Berliner Volksbank, Sparkasse Aachen, Bankhaus August Lenz, ING DiBa, Sparda-Bank, Hamburger Sparkasse, Reisebank, Sparkasse Essen, Sparkasse KölnBonn, Stadtsparkasse München, Sparkasse Ansbach, Sparkasse - Marburg-Biedenkopf, Sparkasse Bremen, Kreissparkasse, HypoVereinsbank, VR-Bank, ING, Sparkasse Göttingen, - Sparda-Bank West eG, ReiseBank, Hamburger Volksbank eG, Volksbank Mittelhessen, Kreissparkasse München - Starnberg Ebersberg, Deutsche Postbank AG, BBBank eG, Sparkasse Karlsruhe, VR Bank, Sparda Bank, - Sparkasse Heidelberg, euronet, Deutsche Bank AG, Stadtsparkasse Augsburg, Sparkasse Offenburg/Ortenau, - Mittelbrandenburgische Sparkasse, ING Diba, Commerzbank AG, Sparkasse Trier, Saalesparkasse, ICCash, - Stadtsparkasse Düsseldorf, Sparkasse Herford, Sparkasse Bochum, BBBank, Aachener Bank, Sparkasse Holstein, - Sparkasse Chemnitz, Sparkasse Leipzig, ING-DiBa AG, Degussa Bank, Volksbank Dessau-Anhalt eG, Sparkasse - Hanauerland, Kreissparkasse Köln, Kreissparkasse Böblingen, IC Cash Services GmbH, Berliner Volksbank - eG, Bankhaus Lenz, BW-Bank, Volksbank Krefeld eG, Stadtsparkasse, Sparkasse Bielefeld, ING-Diba, - Stadt-Sparkasse Solingen, Sparkasse Mainz, Sparkasse Hanau, Ostsächsische Sparkasse Dresden, Nord-Ostsee - Sparkasse, Cardpoint GmbH, Targobank, Sparkasse Bodensee, Sparkasse Bayreuth, Förde Sparkasse, Deutsche - Post, BW Bank, Volks- und Raiffeisenbank, Taunus Sparkasse, Sparkasse Westholstein, Sparkasse Saarbrücken, - Sparkasse Mittelthüringen, Sparkasse LeerWittmund, Mainzer Volksbank, Kasseler Sparkasse, IC Cash, - Volksbank Kraichgau eG, Sparkasse Witten, Sparkasse Vorpommern, Sparkasse Nürnberg, Sparkasse Gießen, - Postbank AG, Münchner Bank, Kreissparkasse Verden, Kreissparkasse Tübingen, Ing Diba, Cardpoint, Braunschweigische + Marburg-Biedenkopf, Sparkasse Bremen, Kreissparkasse, ING, HypoVereinsbank, VR-Bank, Sparkasse Göttingen, + Sparda-Bank West eG, ReiseBank, Hamburger Volksbank eG, Volksbank Mittelhessen, Deutsche Postbank AG, + BBBank eG, Sparkasse Karlsruhe, Kreissparkasse München Starnberg Ebersberg, VR Bank, Sparda Bank, Sparkasse + Heidelberg, euronet, Deutsche Bank AG, Stadtsparkasse Augsburg, Sparkasse Offenburg/Ortenau, Mittelbrandenburgische + Sparkasse, ING Diba, Commerzbank AG, Sparkasse Trier, Saalesparkasse, ICCash, Stadtsparkasse Düsseldorf, + Sparkasse Herford, Sparkasse Bochum, BBBank, Aachener Bank, Sparkasse Holstein, Sparkasse Chemnitz, + Sparkasse Leipzig, ING-DiBa AG, Degussa Bank, Volksbank Dessau-Anhalt eG, Sparkasse Hanauerland, Kreissparkasse + Köln, Kreissparkasse Böblingen, IC Cash Services GmbH, Berliner Volksbank eG, Bankhaus Lenz, BW-Bank, + Volksbank Krefeld eG, Stadtsparkasse, Sparkasse Bielefeld, ING-Diba, Stadt-Sparkasse Solingen, Sparkasse + Mainz, Sparkasse Hanau, Sparkasse Bühl, Ostsächsische Sparkasse Dresden, Nord-Ostsee Sparkasse, + Cardpoint GmbH, Targobank, Sparkasse Bodensee, Sparkasse Bayreuth, Förde Sparkasse, Deutsche Post, + BW Bank, Volks- und Raiffeisenbank, Taunus Sparkasse, Sparkasse Westholstein, Sparkasse Saarbrücken, + Sparkasse LeerWittmund, Mainzer Volksbank, Kasseler Sparkasse, IC Cash, Volksbank Kraichgau eG, Sparkasse + Witten, Sparkasse Vorpommern, Sparkasse Nürnberg, Sparkasse Mittelthüringen, Sparkasse Gießen, Postbank + AG, Münchner Bank, Kreissparkasse Verden, Kreissparkasse Tübingen, Ing Diba, Cardpoint, Braunschweigische Landessparkasse, Sparkasse zu Lübeck, Sparkasse Schwäbisch Hall, Sparkasse Rhein Neckar Nord, Sparkasse Kraichgau, Sparkasse Freising, Sparkasse Emden, Sparkasse Dortmund, Raiffeisenbank Oldenburg eG, Nord-Ostsee-Sparkasse, Volksbank Reutlingen, VR-Bank Bad Hersfeld-Rotenburg eG, Stadtsparkasse Wuppertal, @@ -33,42 +33,43 @@ atmOperators: [Sparkasse, Postbank, Euronet, Volksbank, Deutsche Bank, ING-DiBa, Ing-Diba] chargingStationOperators: [Stromnetz Hamburg, Stadtwerke München, EnBW, innogy, RWE, Allego, allego, RWE-Effizienz, Innogy, E-WALD GmbH, LEW, EWE, e-regio GmbH & Co. KG, SWU Stadtwerke Ulm/Neu-Ulm GmbH, Tesla, EnBW Energie Baden-Württemberg - AG, be emobil, NEW, Kaufland, Lidl, Tank & Rast, Vattenfall, Stadtwerke Augsburg, SWM, Lechwerke + AG, be emobil, NEW, Lidl, Kaufland, Tank & Rast, SWM, Vattenfall, Stadtwerke Augsburg, Lechwerke AG, Ionity, Energie- und Wasserversorgung Bonn/Rhein-Sieg GmbH, Tesla Motors Inc., E.ON, Tesla Motors, - FairEnergie GmbH, ENSO Energie Sachsen Ost AG, DREWAG - Stadtwerke Dresden GmbH, Aldi Süd, ADAC, innogy - SE, N-Ergie, Stadtwerke Norderstedt, EWE Vertrieb GmbH, Westfalen Weser Netz, EWV, BMW, E-Werk Mittelbaden, + FairEnergie GmbH, innogy SE, ENSO Energie Sachsen Ost AG, DREWAG - Stadtwerke Dresden GmbH, Aldi Süd, + ADAC, N-Ergie, Stadtwerke Norderstedt, EWE Vertrieb GmbH, Westfalen Weser Netz, BMW, EWV, E-Werk Mittelbaden, Stadtwerke Leipzig, Mainova, Energie Baden-Württemberg AG, innogy eMobility Solutions GmbH, IKEA, Stadtwerke Osnabrück, Stadtwerke Düsseldorf, RheinEnergie, Kreiswerke Main-Kinzig GmbH, Ionity GmbH, Energie- und Wasserversorgung Bruchsal GmbH, Energie und Wasser Potsdam GmbH, wallbe, Stadtwerke Witten, - Regensburger Energie- und Wasserversorgung AG & Co KG, Fastned, eins energie in sachsen, NewMotion, - envia M, Stadtwerke Bielefeld, STAWAG, EWR, enviaM, eE4mobile eG, Stadtwerke Tübingen, Stadtwerke Speyer - GmbH, ladenetz.de, TheNewMotion, SWB, Edeka, Bauhaus, Süwag Energie AG, Stawag, Stadtwerke Marburg, - Stadtwerke Bochum, Porsche, DREWAG - Stadtwerke Dresden, Bayernwerk AG, eon, e-on Drive, VGS mbH, Süwag, - Stadtwerke Meerbusch GmbH, N-ERGIE Aktiengesellschaft, N-ERGIE, Lech Elektrizitätswerke Augsburg, Ikea, - Audi AG, ALDI Süd, swb, Stadtwerke Pforzheim, Stadtwerke Heide, Pfalzwerke, OVAG, IONITY, Entega Energie - GmbH, Energieversorgung Rodau GmbH, ENTEGA Energie GmbH, DREWAG, Allego GmbH, Stadtwerke Tübingen - GmbH, Stadtwerke Iserlohn - Heimatversorger, Mainzer Stadtwerke, Kreis Paderborn, Entega, E-Wald - GmbH, Bayernwerk, BEW, eeMobility, e.on, e.dis, WVV, The New Motion, TankE GmbH, TEAG, Stadtwerke - Rhede GmbH, Stadtwerke Herne, Rheinenergie, RWE Effizienz GmbH, Ovag, Mennekes, Kreiswerke Main-Kinzig, - ENBW, EAM, Allegro, enercity, emma, SÜC Energie und H2O GmbH, Stadtwerke Göttingen, Stadtwerke Baden-Baden, - RWE / DEW21, Pfalzwerke AG, Maingau, Ladeverbund+, LEW Augsburg, Innogy eMobility Solutions GmbH, EGG - Energieversorgung Gera, Charge-ON GmbH] + Regensburger Energie- und Wasserversorgung AG & Co KG, Fastned, eins energie in sachsen, Stadtwerke + Bielefeld, NewMotion, envia M, STAWAG, EWR, enviaM, eE4mobile eG, Stadtwerke Tübingen, Stadtwerke + Speyer GmbH, ladenetz.de, TheNewMotion, SWB, Edeka, Bauhaus, Süwag Energie AG, Stawag, Stadtwerke + Marburg, Stadtwerke Bochum, Porsche, DREWAG - Stadtwerke Dresden, Bayernwerk AG, Allego GmbH, eon, + e-on Drive, VGS mbH, Süwag, Stadtwerke Meerbusch GmbH, N-ERGIE Aktiengesellschaft, N-ERGIE, Lech Elektrizitätswerke + Augsburg, Ikea, Audi AG, ALDI Süd, swb, Stadtwerke Pforzheim, Stadtwerke Heide, Pfalzwerke, OVAG, + IONITY, Entega Energie GmbH, Energieversorgung Rodau GmbH, ENTEGA Energie GmbH, DREWAG, Bayernwerk, + Stadtwerke Tübingen GmbH, Stadtwerke Iserlohn - Heimatversorger, Ovag, Mainzer Stadtwerke, Kreis Paderborn, + Entega, E-Wald GmbH, BEW, Allegro, enercity, eeMobility, e.on, e.dis, WVV, The New Motion, TankE GmbH, + TEAG, Stadtwerke Rhede GmbH, Stadtwerke Herne, Rheinenergie, RWE Effizienz GmbH, Mennekes, Kreiswerke + Main-Kinzig, Filderstadtwerke, ENBW, EAM, emma, SÜC Energie und H2O GmbH, Stadtwerke Göttingen, + Stadtwerke Baden-Baden, RWE / DEW21, Pfalzwerke AG, Maingau, Ladeverbund+, LEW Augsburg, Innogy eMobility + Solutions GmbH, Energieversorgung Leverkusen GmbH & Co. KG (EVL), EGG Energieversorgung Gera, Charge-ON + GmbH] clothesContainerOperators: [Deutsches Rotes Kreuz, Loop, Aktion Hoffnung, AWG, GEB, ALBA Braunschweig GmbH, Humana, Malteser, Stadtreinigung Hamburg, Stadt Karlsruhe, AHE;Deutsches Rotes Kreuz, Abfallwirtschaftsgesellschaft Wuppertal, Vorwerker Diakonie, DRK, Zweckverband für Abfallwirtschaft Kempten, Technische Betriebe Velbert AöR, Abfallwirtschaftsbetrieb München, Texaid, hoelp, Kolping, AWB Köln, AWB, AHE, AWO, GOA, bonnorange AöR, Technische Betriebe Remscheid, Darbo Recycling, Step, Malteser Hilfsdienst e.V., Landkreis Prignitz, Remondis, Malteser Hilfsdienst, FWS, CityGreenPoint, aha Zweckverband Abfallwirtschaft Region Hannover, Stadt Stuttgart, - Berlin-Textilrecycling, TEXAID, Bayerisches Rotes Kreuz, Aktex Rohstoff-Recycling Nord, Diakoniewerk - Essen, Abfall- und Wertstofflogistik Neuss GmbH (AWL), Retextil Recycling International, Gew. Fa. - Mettex, Isevtex, AWISTA, AHG alpha Handelskontor, AHA, unknown, ZKE, Veolia, Kolpingwerk, HeDi, - DRK Kreisverband Bonn e.V., Brotex, AWM, Däsa Wiederverwertungs GmbH, illegal, Textil-Recycling Nord, - TEXAID Deutschland GmbH, RS, Kolping Recycling GmbH, Deutsches Rotes Kreuz e.V., Altkleiderfirma Nargül, - Stadt Karlsruhe Amt für Abfallwirtschaft, DRK-Kreisverband Trier-Saarburg e.V., Bera Textilrecycling, - Baliz Textilwerke, SP Textilverwertung, Neue Arbeit Lahr, Hoppe, HUMANA Kleidersammlung GmbH, Familienschutzwerk, + TEXAID, Berlin-Textilrecycling, Bayerisches Rotes Kreuz, Aktex Rohstoff-Recycling Nord, Diakoniewerk + Essen, Abfall- und Wertstofflogistik Neuss GmbH (AWL), Retextil Recycling International, Isevtex, + Gew. Fa. Mettex, AWISTA, AHG alpha Handelskontor, AHA, unknown, ZKE, Veolia, Kolpingwerk, HeDi, DRK + Kreisverband Bonn e.V., Brotex, AWM, illegal, Däsa Wiederverwertungs GmbH, Deutsches Rotes Kreuz + e.V., Textil-Recycling Nord, TEXAID Deutschland GmbH, RS, Kolping Recycling GmbH, Altkleiderfirma + Nargül, Stadt Karlsruhe Amt für Abfallwirtschaft, DRK-Kreisverband Trier-Saarburg e.V., Bera Textilrecycling, + Baliz Textilwerke, Neue Arbeit Lahr, Johanniter, Hoppe, HUMANA Kleidersammlung GmbH, Familienschutzwerk, BRK, Akza Textilrecycling, AWISTA GmbH, AHE;Deutsches Rotes Kreuz;Ruhrtalengel, aha, TEXAID Collection - GmbH, TEXAID Collection, Retextil, Maltheser Hilfsdienst, Johanniter, HUMANA, Diakonisches Werk - Kassel, Deutsche Lebens-Rettungs-Gesellschaft e.V., DESWOS, Stadtreinigung Leipzig, SOEX, Haytex + GmbH, TEXAID Collection, SP Textilverwertung, Retextil, Maltheser Hilfsdienst, HUMANA, Diakonisches + Werk Kassel, Deutsche Lebens-Rettungs-Gesellschaft e.V., DESWOS, Stadtreinigung Leipzig, SOEX, Haytex Textilrecycling, Ginotex, DRK-Kreisverband Koblenz-Stadt e.V., DRK KV Ammerland, Content KG, Bethel, Baliz, Awista, Arbeiter-Samariter-Bund, ZVO, Wittmann, USB, Stadtreiniger Kassel, Sehbehinderten Selbsthilfe Kurpfalz-Odenwald e.V., REMONDIS, OKA Textil, KuB GmbH, Kreisentsorgungs GmbH Vogtland (KEV), Kolpingsfamilie diff --git a/app/src/main/assets/country_metadata/EC.yml b/app/src/main/assets/country_metadata/EC.yml index c80378dddb..2c627f460a 100644 --- a/app/src/main/assets/country_metadata/EC.yml +++ b/app/src/main/assets/country_metadata/EC.yml @@ -1,7 +1,7 @@ # Do not edit. Source files are in /res/country_metadata atmOperators: [Banco Pichincha, Cooperativa JEP, JEP, Banco de Guayaquil, Banco Internacional, Banco Guayaquil, Banco del Austro, Banco del Pacífico, Banco Bolivariano, Banco de Loja, Produbanco, Banco del Pichincha, - Banred, Banco del Pacifico, BanRed, Cooperativa Policía Nacional, Cooperativa Jep, Pichincha, jardín + Banred, Cooperativa Policía Nacional, Banco del Pacifico, BanRed, Cooperativa Jep, Pichincha, jardín azuayo, Jardín Azuayo, Banco de Pichincha, Banco General Rumiñahui, banco de Guayaquil, Cajero Banco Pichincha, CAJERO JEP, CACPE, Banco de Machala, produbanco, banco internacional, banco del Pacífico, Servipagos, Jardin Azuayo, Cooperativa de la Policia Nacional, Cooperativa de Ahorro y Credito 23 de diff --git a/app/src/main/assets/country_metadata/ES.yml b/app/src/main/assets/country_metadata/ES.yml index d2e466269a..b205f31f4f 100644 --- a/app/src/main/assets/country_metadata/ES.yml +++ b/app/src/main/assets/country_metadata/ES.yml @@ -2,8 +2,8 @@ additionalStreetsignLanguages: [ca, eu, gl, ast] additionalValidHousenumberRegex: s/n atmOperators: [Santander, Bankia, BBVA, La Caixa, Banco Santander, Telebanco 4B, Banco Popular, CaixaBank, Euronet, - Kutxabank, Sabadell, Caja Rural, Banca March, Unicaja, Cajamar, Banc Sabadell, IberCaja, Banco Sabadell, - Liberbank, Abanca, Deutsche Bank, ABANCA, Euro 6000, Caixabank, Servired, Popular, BBK, Telebanco, + Sabadell, Kutxabank, Caja Rural, Banca March, Unicaja, Cajamar, Banc Sabadell, IberCaja, Banco Sabadell, + Liberbank, Abanca, ABANCA, Euro 6000, Deutsche Bank, Caixabank, Servired, Popular, BBK, Telebanco, Ibercaja, Euro6000, Sabadell Atlántico, Kutxa, ING, Caja Duero, Bankinter, BanCaixa, Laboral Kutxa, Caixa Bank, Banco Pastor, euronet, Cajasol, BMN, kutxabank, EspañaDuero, Catalunya Caixa, Cajasur, CAM, Banco de Sabadell, Bancaja, la Caixa, Targo Bank, ING Direct, Euronet Worldwide, Euro Automatic diff --git a/app/src/main/assets/country_metadata/FX.yml b/app/src/main/assets/country_metadata/FX.yml index e2c9e2f05f..2c1adfa111 100644 --- a/app/src/main/assets/country_metadata/FX.yml +++ b/app/src/main/assets/country_metadata/FX.yml @@ -15,11 +15,12 @@ chargingStationOperators: [Bouygues Énergies et Services, Izivia, Freshmile, Cl freshmile, Université de Lille, SDEPA - MObiVE, SDEC, eborn, Tesla Motors Inc., SDE 28, IONITY, INEO TINEA, E. Leclerc, DBT, BeLib, Syndicat Départemental d’Énergie, SIEEEN, Révéo, Intermarché, CAPP] clothesContainerOperators: [Le Relais, Toulouse Métropole, AMOS, Actifrip, Chrysalide Ressourcerie, CCPRO, Solidarité Textiles, Eco-Emballages, - Next Textiles Association, SITCOM - Côte sud des Landes, Ecotextile, Apivet, Le relais, Emmaüs, SMICVAL, - Ludothèque éphémère, Communauté de communes du Grand Pontarlier, Bordeaux Métropole, Au Fil des Chemins, - le Relais, Philtex, La Croix Rouge, KFB, Emmaüs 63, Croix Rouge Française, Croix Rouge, Communauté - d'Agglomération Le Grand Dax (CAGD), WWF, Rennes Métropole, Relais, Le Relais France, Le Relais - 82, Le Relais 37, Inser-vet, Fringuette, Croix-Rouge, Charlieu-Belmont Communauté, Active, Écotextile, - ecotextile, Vetsol, VET'SOL, Secours Catholique, Saint-Étienne Métropole, SEMOCTOM, Recytextile, Mairie - de Paris, Limoges Métropole, Leroy Frip, Le Relais Est, Le Relais Atlantique, Le Foyer Notre-Dame - des sans-abri, Inser-vêt, Emmaus, Collectif Textile Franc-Comtois, ADS Insertion] + Next Textiles Association, SITCOM - Côte sud des Landes, Ecotextile, Apivet, www.lerelais.org, Le relais, + Emmaüs, SMICVAL, Ludothèque éphémère, Communauté de communes du Grand Pontarlier, Bordeaux Métropole, + Au Fil des Chemins, le Relais, Philtex, La Croix Rouge, KFB, Emmaüs 63, Croix Rouge Française, Croix + Rouge, Communauté d'Agglomération Le Grand Dax (CAGD), WWF, Rennes Métropole, Relais, Le Relais + France, Le Relais 82, Le Relais 37, Inser-vet, Fringuette, Croix-Rouge, Charlieu-Belmont Communauté, + Association d'aide aux enfants atteints de leucemie, Active, Écotextile, ecotextile, Vetsol, VET'SOL, + Secours Catholique, Saint-Étienne Métropole, SEMOCTOM, Recytextile, Mairie de Paris, Limoges Métropole, + Leroy Frip, Le Relais Est, Le Relais Atlantique, Le Foyer Notre-Dame des sans-abri, Inser-vêt, Emmaus, + Collectif Textile Franc-Comtois, ADS Insertion] diff --git a/app/src/main/assets/country_metadata/GB.yml b/app/src/main/assets/country_metadata/GB.yml index f1c405c5f1..38f3579042 100644 --- a/app/src/main/assets/country_metadata/GB.yml +++ b/app/src/main/assets/country_metadata/GB.yml @@ -14,21 +14,21 @@ atmOperators: [RBS, Barclays Bank PLC, HSBC, NatWest, Tesco, Barclays, Santander Westminster Bank, Lloyds Banking Group, Lloyds Bank plc, DC ATM, BankMachine, Bank of Ireland; Post Office, Bank Of Ireland, Abbey, AIB] chargingStationOperators: [Ecotricity, Source London, Pod Point, Tesla Motors Inc., Tesla, ChargePlace Scotland, Ubitricity, Lancaster - City Council, Birmingham City Council, evolt, InstaVolt, Chargemaster, CYC, Polar, GeniePoint, Charge + City Council, evolt, Birmingham City Council, InstaVolt, Chargemaster, CYC, Polar, GeniePoint, Charge Your Car, Booths, Lancaster University, Brighton and Hove City Council, ecotricity, ecars Northern Ireland, Pod-Point, Instavolt, POLAR, Exeter City Council, Charge Place Scotland, Tesco, Podpoint, PodPoint, Evolt, Chargeplace Scotland, Nissan, EV Driver, pod point, instavolt, chargemaster, SSE, - Rolec, Lancashire County Council, Genie Point, ESB EV Solutions, ChargeMaster, eVolt, Zero Carbon World, - Tesla Motors, Shell, Polar Chargemaster, Lidl, GMEV, Engie, E.on, Charge Master, BP Chargemaster, BP, - Asda, www.chargeyourcar.org.uk, vendelectric, tesla_standard, polar, podpoint, engenie, West Point - House, Warrington Borough Council, Victory Hall, Vattenfall, University of Sussex, St Modwen Properties, - Shell Recharge, Sainsbury's, Polar Plus, Polar Network, Orkney Islands Council, Open University, Nissan + Rolec, Lancashire County Council, Genie Point, ESB EV Solutions, ChargeMaster, polar, eVolt, Zero Carbon + World, Tesla Motors, Shell, Polar Chargemaster, Lidl, GMEV, Engie, E.on, Charge Master, BP Chargemaster, + BP, Asda, www.chargeyourcar.org.uk, vendelectric, tesla_standard, podpoint, engenie, West Point House, + Warrington Borough Council, Victory Hall, Vattenfall, University of Sussex, St Modwen Properties, Shell + Recharge, Sainsbury's, Polar Plus, Polar Network, Orkney Islands Council, Open University, Nissan West Way Wolverhampton, Milton Park - Pod Point, Milton Park, Kendal College, Eurotunnel, Elektromotive, ESB, Dunston Hall, Chargepoint Genie, ChargePlaceScotland, ChargePlace scotland, Charge your car, Charge your Car, Centro, Bullring, Boot and Shoe, Beech Hill Hotel, 'AutoCharge: EV Pedestal', Allego] clothesContainerOperators: [Salvation Army, The Fire Fighters Charity, Brighton & Hove City Council, The Salvation Army, British Heart Foundation, Scope, Rushcliffe Borough Council, Nottingham City Council, Traid, Cystic Fibrosis - Trust, South Norfolk Council, Cancer Fund for Children, traid, The Firefighters Charity, TRAID, + Trust, traid, South Norfolk Council, Cancer Fund for Children, The Firefighters Charity, TRAID, Severn Waste Services, Oxfam, Fife Council] isAdvisorySpeedLimitKnown: true isLeftHandTraffic: true diff --git a/app/src/main/assets/country_metadata/IN-RJ.yml b/app/src/main/assets/country_metadata/IN-RJ.yml index c7cc954ccf..4b5210efb8 100644 --- a/app/src/main/assets/country_metadata/IN-RJ.yml +++ b/app/src/main/assets/country_metadata/IN-RJ.yml @@ -1,4 +1,4 @@ # Do not edit. Source files are in /res/country_metadata -atmOperators: [SBI, State Bank of India, Bank of Baroda, sbi, ICICI, Punjab National Bank, HDFC Bank, ICICI Bank, Union - Bank, UCO Bank, State Bank Of India, SBI Bank, Canara Bank] +atmOperators: [SBI, State Bank of India, Bank of Baroda, sbi, ICICI, Punjab National Bank, HDFC Bank, ICICI Bank, bank + of india, Union Bank, UCO Bank, State Bank Of India, SBI Bank, Canara Bank] officialLanguages: [hi, en] diff --git a/app/src/main/assets/country_metadata/IR.yml b/app/src/main/assets/country_metadata/IR.yml index 4233f2f8c0..70c4684c93 100644 --- a/app/src/main/assets/country_metadata/IR.yml +++ b/app/src/main/assets/country_metadata/IR.yml @@ -3,7 +3,7 @@ additionalStreetsignLanguages: [en] atmOperators: [بانک ملی, بانک ملت, بانک صادرات, بانک شهر, بانک سپه, بانک تجارت, بانک مسکن, بانک انصار, بانک رفاه, بانک سامان, بانک کشاورزی, بانک پاسارگاد, خودپرداز بانک ملی, بانک قوامین, خودپرداز بانک ملت, پست بانک, خودپرداز بانک صادرات, خودپرداز بانک سپه, بانک ملی ایران, خودپرداز بانک تجارت, بانک اقتصاد نوین, بانک - پارسیان, بانک سینا, بانک آینده, خودپرداز بانک شهر, بانک رفاه کارگران, خودپرداز, ملی, خودپرداز بانک + پارسیان, بانک سینا, بانک رفاه کارگران, بانک آینده, خودپرداز بانک شهر, خودپرداز, ملی, خودپرداز بانک کشاورزی, بانک گردشگری, بانک حکمت ایرانیان, خودپرداز بانک پاسارگاد, قوامین, صادرات, خودپرداز بانک رفاه, خودپرداز بانک آینده, پاسارگاد, عابر بانک, خودپرداز بانک قوامین, خودپرداز بانک انصار, تجارت, بانک توسعه تعاون, انصار, اقتصاد نوین, Saman bank ATM, Saderat Bank, Mellat Bank, Ansar Bank, پست بانک diff --git a/app/src/main/assets/country_metadata/IT.yml b/app/src/main/assets/country_metadata/IT.yml index 4e3766a178..e332bf1ccd 100644 --- a/app/src/main/assets/country_metadata/IT.yml +++ b/app/src/main/assets/country_metadata/IT.yml @@ -13,11 +13,11 @@ atmOperators: [Poste Italiane, Unicredit, Intesa Sanpaolo, Monte dei Paschi di S PosteItaliane, Poste Italiane Spa, Poste Italiane S.p.a., Friuladria, Crédit Agricole, Credito Siciliano, Credit Agricole, ChiantiBanca, Cassa di Risparmio di Venezia, Cassa Rurale Alta Valsugana, Biverbanca, Banca di Credito Cooperativo Valdostana, Banca di Bologna, Banca di Asti, Banca Tercas, Banca Popolare - di Verona, Banca Popolare del Lazio, BCC di Carate Brianza, poste italiane, San Paolo, Euronet Worldwide, - Coinwave Srl, Cassa di Risparmio di Firenze, Cassa di Risparmio di Ferrara, Cassa Padana, Bancomat, - Banco di Desio, Banca di Credito Popolare, Banca di Cividale, Banca delle Marche, Banca Toscana, Banca - Popolare dell'Emilia Romagna, Banca Intesa Sanpaolo, Banca Etruria, Banca Apulia S.p.a., unicredit, - Veneto Banca, Unicredito Italiano S.p.A., Unicredit S.p.a., Ubi Banca, UBI banca, UBI Banca Popolare, + di Verona, Banca Popolare del Lazio, BCC di Carate Brianza, unicredit, poste italiane, Ubi Banca, + San Paolo, Euronet Worldwide, Coinwave Srl, Cassa di Risparmio di Firenze, Cassa di Risparmio di Ferrara, + Cassa Padana, Bancomat, Banco di Desio, Banca di Credito Popolare, Banca di Cividale, Banca delle Marche, + Banca Toscana, Banca Popolare dell'Emilia Romagna, Banca Intesa Sanpaolo, Banca Etruria, Banca Apulia + S.p.a., Veneto Banca, Unicredito Italiano S.p.A., Unicredit S.p.a., UBI banca, UBI Banca Popolare, Südtiroler Sparkasse - Cassa di Risparmio di Bolzano, SanPaolo, Raiffeisenkasse Überetsch - Cassa Raiffeisen Oltradige, Raiffeisenkasse Tirol, Raiffeisenkasse Terlan, Raiffeisenkasse Tauferer-Ahrntal, Raiffeisen Bank, Postomat, Poste Italiane s.p.a., Post Italiane S.p.A, POSTE ITALIANE, Monte dei paschi di diff --git a/app/src/main/assets/country_metadata/JP.yml b/app/src/main/assets/country_metadata/JP.yml index 46f6ee2782..e31357caf3 100644 --- a/app/src/main/assets/country_metadata/JP.yml +++ b/app/src/main/assets/country_metadata/JP.yml @@ -2,10 +2,10 @@ additionalStreetsignLanguages: [ja-Latn] atmOperators: [ゆうちょ銀行, みずほ銀行, 三井住友銀行, セブン銀行, 三菱東京UFJ銀行, 三菱UFJ銀行, りそな銀行, イオン銀行, 七十七銀行, 横浜銀行, 秋田銀行, 京都銀行, 北都銀行, 埼玉りそな銀行, プロミス, 仙台銀行, アイフル, 東京スター銀行, 千葉銀行, JA, 滋賀銀行, 三井住友銀行／SMBC, 東北労働金庫, 京都中央信用金庫, アコム, 但陽信用金庫, 百十四銀行, 武蔵野銀行, - 常陽銀行, 北洋銀行, 荘内銀行, 北海道銀行, レイク, 東邦銀行, 但馬信用金庫, 中国銀行, みちのく銀行, きのくに信用金庫, JAバンク, 徳島銀行, 岩手銀行, 但馬銀行, Seven - Bank, 青森銀行, 福岡銀行, 池田泉州銀行, 京都信用金庫, 七十七銀行/77Bank, きらやか銀行, MUFG, 高知信用金庫, 足利銀行, 紀陽銀行, 広島銀行, 南都銀行／Nanto - Bank, 十六銀行, 京葉銀行, 三菱東京UFJ, 三菱UFJ, 七十七銀行／77Bank, ローソン銀行, スルガ銀行, JP Bank, Community Bank, ATM, 高知銀行, - 関西アーバン銀行, 西武信用金庫, 筑波銀行, 福島銀行, 杜の都信用金庫, 山形銀行, 大東銀行, 大垣共立銀行, 北日本銀行, 七十七銀行・ゆうちょ銀行, イオン銀行/AeonBank, みなと銀行／MinatoBank, + 常陽銀行, 北洋銀行, 荘内銀行, 北海道銀行, レイク, 東邦銀行, 但馬信用金庫, 中国銀行, みちのく銀行, きのくに信用金庫, JAバンク, 池田泉州銀行, 徳島銀行, 岩手銀行, 但馬銀行, + Seven Bank, 青森銀行, 福岡銀行, 京都信用金庫, 七十七銀行/77Bank, きらやか銀行, MUFG, 高知信用金庫, 足利銀行, 紀陽銀行, 広島銀行, 南都銀行／Nanto Bank, + 十六銀行, 京葉銀行, 三菱東京UFJ, 三菱UFJ, 七十七銀行／77Bank, ローソン銀行, スルガ銀行, JP Bank, Community Bank, ATM, 高知銀行, 関西アーバン銀行, + 西武信用金庫, 筑波銀行, 福島銀行, 杜の都信用金庫, 山形銀行, 大東銀行, 大垣共立銀行, 北日本銀行, 七十七銀行・ゆうちょ銀行, イオン銀行/AeonBank, みなと銀行／MinatoBank, みなと銀行, みずほ, Japan Post Bank, JAたじま, 鹿児島銀行, 鳥取銀行, 静岡銀行, 青梅信用金庫, 青い森信用金庫, 阿波銀行, 群馬銀行, 紀陽銀行／KiyoBank, 第三銀行, 琉球銀行, 滋賀中央信用金庫, 湖東信用金庫, 清水銀行, 東奥信用金庫, 東北銀行, 東北労金, 東京都民銀行, 朝日信用金庫, 日本郵便, 新生銀行カードローンレイク, 山陰合同銀行, 尼崎信用金庫, 宮城第一信用金庫, 多摩信用金庫, 埼玉県信用金庫, 四国銀行, 南都銀行, 北陸銀行, 八十二銀行, 但馬銀行／TajimaBank, 京都北都信用金庫, 中央労働金庫, 三菱東京ＵＦＪ銀行, diff --git a/app/src/main/assets/country_metadata/NL.yml b/app/src/main/assets/country_metadata/NL.yml index 6a2cb1f6c2..7489ed7b50 100644 --- a/app/src/main/assets/country_metadata/NL.yml +++ b/app/src/main/assets/country_metadata/NL.yml @@ -27,8 +27,8 @@ atmOperators: [ING, Rabobank, ABN AMRO, ABN Amro, Geldmaat, ABN-AMRO, ING Bank, Het Groene Woud Zuid, Rabobank Graafschap-Zuid, Rabobank Borger-Klenckeland, Rabobank Bodegraven-Woerden, Rabobank Bernheze Maasland, Rabobank Assen-Beilen, Rabobank Assen en Noord-Drenthe, Rabobank Amstel en Vecht, Postbank, Albert Heijn, ABNAmro, ABN Ambro, ABN AMRO Bank] -chargingStationOperators: [Allego, NUON, Fastned, Nuon, EVBOX, Ecotap, Vattenfall, NewMotion, EVnetNL, Rotterdam Elektrisch, Qbuzz, - allego, Pitpoint, Gemeente Rotterdam, gemeente Rotterdam, ecotap, EVBox, EV-Box, We Drive Solar, Liander, +chargingStationOperators: [Allego, NUON, Fastned, Nuon, EVBOX, Ecotap, Vattenfall, EVnetNL, NewMotion, Rotterdam Elektrisch, Pitpoint, + Qbuzz, allego, Gemeente Rotterdam, gemeente Rotterdam, ecotap, EVBox, EV-Box, We Drive Solar, Liander, Havendienst Gemeent Alkmaar, e-laad, PitPoint, LastMileSolutions, EVnet, Terberg Telecom, New Motion, Mitsubishi Electric, Green Flux, E-laad, Allegro, Agrisnellaad, GreenFlux, Gemeente Delft, Alfen, Gemeente Kerkrade, EV Box, E-bike, Aers Energy, e-laad.nl, Webcompanies.nl, Nuon/Vattenfall, Nuon-Heijmans, diff --git a/app/src/main/assets/country_metadata/NO.yml b/app/src/main/assets/country_metadata/NO.yml index 0da49709cb..e913978d14 100644 --- a/app/src/main/assets/country_metadata/NO.yml +++ b/app/src/main/assets/country_metadata/NO.yml @@ -9,16 +9,16 @@ chargingStationOperators: [Fortum, Grønn Kontakt, Oslo kommune, BKK, Grønn kon Nett AS, Akershus fylkeskommune, Atea, Østfold fylkeskommune, ladeinorge.no, Sveio kommune, Skien kommune, Sandefjord kommune, Radøy kommune, Nesodden kommune, NTNU, Larvik kommune, Hamar kommune, Grimstad kommune, Eid kommune, Bærum kommune, Bellona, Avinor, Våler Kommune, UMB Drifts- og vedlikeholdsavd., - Tinn kommune, Sandnes Parkering KF, IKEA, Halden kommune, Fredrikstad kommune, EuroPark AS/Avinor, - Coop, Bergen kommune, BKK Nett AS for Os kommune, Avinor AS, ukjent, eRoute 71, Sunnfjord Energi, Stokke - kommune, Statens vegvesen, Nes kommune, Namsos kommune, Lillehammer kommune, Ishavskraft AS, EuroPark - AS/Oslo Lufthavn AS, Elpro Industrier AS, Coop Norge Handel, Bodø kommune, Bergen Parkering KF, - Asker kommune, Ås kommune, Vågsøy parkering, Universitetet i Agder, Tønsberg parkering Bydrift, Trøgstad - kommune, Tesla, Sørlandssenteret, Rælingen kommune, Porsgrunn kommune, Porsgrunn Kommune, Oslo Kommune, - Nittedal Kommune, Nannestad kommune, NRK, Moving City AS, Midt Kraft, Mandal Parkering, Lindås kommune, - Kongsvinger kommune, Knarvik Senter AS, Kiwi, Horten kommune, Hordaland Fylkeskommune, Gjerstad Kommune, - Fortum Charge&Go, Drammen parkering KF, Drammen Parkering KF, Bratsberg Gruppen, BKK/Lyse, Arendal - kommune] + Tinn kommune, Sandnes Parkering KF, Ishavsveien, IKEA, Halden kommune, Fredrikstad kommune, EuroPark + AS/Avinor, Coop, Bergen kommune, BKK Nett AS for Os kommune, Avinor AS, ukjent, eRoute 71, Sunnfjord + Energi, Stokke kommune, Statens vegvesen, Nes kommune, Namsos kommune, Lillehammer kommune, Ishavskraft + AS, EuroPark AS/Oslo Lufthavn AS, Elpro Industrier AS, Coop Norge Handel, Bodø kommune, Bergen Parkering + KF, Asker kommune, Ås kommune, Vågsøy parkering, Universitetet i Agder, Tønsberg parkering Bydrift, + Trøgstad kommune, Tesla, Sørlandssenteret, Rælingen kommune, Porsgrunn kommune, Porsgrunn Kommune, + Oslo Kommune, Nittedal Kommune, Nannestad kommune, NRK, Moving City AS, Midt Kraft, Mandal Parkering, + Lindås kommune, Kongsvinger kommune, Knarvik Senter AS, Kiwi, Horten kommune, Hordaland Fylkeskommune, + Gjerstad Kommune, Fortum Charge&Go, Drammen parkering KF, Drammen Parkering KF, Bratsberg Gruppen, + BKK/Lyse, Arendal kommune] clothesContainerOperators: [Fretex, UFF, Idrettsinnsamlingen, Uff, Frelsesarméen, Røde Kors, Kirkens Bymisjon, Frelsesarmeen] isAdvisorySpeedLimitKnown: true isLivingStreetKnown: true diff --git a/app/src/main/assets/country_metadata/PT.yml b/app/src/main/assets/country_metadata/PT.yml index 7da8f34dbb..c89ff02488 100644 --- a/app/src/main/assets/country_metadata/PT.yml +++ b/app/src/main/assets/country_metadata/PT.yml @@ -4,10 +4,10 @@ atmOperators: [Caixa Geral de Depósitos, Santander Totta, Millennium BCP, Multi CGD, ATM, Santander, SIBS Multibanco, Novo Banco dos Açores, Millennium bcp, Euronet Worldwide, Crédito agrícola, Barclays, Banif, Banco Popular, credito agricola, caixiave, Deutsche Bank, Credito Agricola, Banco BIC] -chargingStationOperators: [MOBI.E, Mobi.E, Tesla, KLC, Rede Piloto, EDP Comercial, GalpGeste, Prio.E, Galp Power, Galp Geste, Mobi-e, - EV Power, Mobie, Powerdot, Mobilectric, Mobiletric, Tesla Motors Inc., Repsol, Propel-Cepsa, Loulé - Concelho Global, EDP MOP, CME, Ucharge, Mobi, Kilometer Low Cost, Mota Engil II, Mobi.e, Mobi-E, - MOBI.e, Emel, EMACOM] +chargingStationOperators: [MOBI.E, Mobi.E, KLC, EDP Comercial, Tesla, Powerdot, Rede Piloto, Mobilectric, Galp Power, Galp Geste, + Prio.E, GalpGeste, Mobi-e, EV Power, Mobie, Mobiletric, Emacom, Tesla Motors Inc., Repsol, Propel-Cepsa, + Loulé Concelho Global, EDP MOP, Ucharge, Mota Engil II, Mobi, CME, Mobi.e, Mobi-E, MOBI.e, Factor Energia, + Emel, EVCE Power] clothesContainerOperators: [Ultriplo Lda] isAdvisorySpeedLimitKnown: true isSlowZoneKnown: true diff --git a/app/src/main/assets/country_metadata/RU.yml b/app/src/main/assets/country_metadata/RU.yml index 1d0b6c769a..9fb50553db 100644 --- a/app/src/main/assets/country_metadata/RU.yml +++ b/app/src/main/assets/country_metadata/RU.yml @@ -12,8 +12,8 @@ atmOperators: [Сбербанк, Промсвязьбанк, '"ПАО ""Сбер (АО), Челиндбанк, МТС Банк, Банк Возрождение, Sberbank, '"ПАО ""Почта Банк"""', '"ПАО АКБ ""Авангард"""', Русский Стандарт, УРАЛСИБ, Московский кредитный банк, Тинькофф, ОТП Банк, Кредит Европа Банк, '"ПАО ""Сбербанк России"""', Экспресс-волга банк, СКБ-банк, МКБ, Совкомбанк, '"ПАО Банк ""ФК Открытие"""', - Райффайзен банк, Банк Зенит, Аккобанк, Траст, РайффайзенБанк, ПАО «Банк Уралсиб», ОАО «МДМ Банк», '"Банк - ""Отрытие"""', ЮниКредит, Транскредитбанк, Тинькофф Банк, Севергазбанк, Кузнецкбизнесбанк, БинБанк, + Райффайзен банк, Банк Зенит, Аккобанк, Траст, Тинькофф Банк, РайффайзенБанк, ПАО «Банк Уралсиб», ОАО + «МДМ Банк», '"Банк ""Отрытие"""', ЮниКредит, Транскредитбанк, Севергазбанк, Кузнецкбизнесбанк, БинБанк, Банк Санкт-Петербург, Банк ЗЕНИТ, '"ОАО ""Московский кредитный банк"""'] chargingStationOperators: ['"ПАО ""Ленэнерго"""', Мосэнерго, МРСК Волги, '"ПАО ""МРСК Волги"""', Татнефть, '"АК ""Транснефть"""', ТюменьЭнерго, Револьта, СУЭНКО, Русгидро, РосНефть, ОАО «МРСК Урала»] diff --git a/app/src/main/assets/country_metadata/TR.yml b/app/src/main/assets/country_metadata/TR.yml index bb8dfc30ef..e59e44cc78 100644 --- a/app/src/main/assets/country_metadata/TR.yml +++ b/app/src/main/assets/country_metadata/TR.yml @@ -1,10 +1,10 @@ # Do not edit. Source files are in /res/country_metadata -atmOperators: [Akbank, İş Bankası, Ziraat Bankası, Garanti Bankası, DenizBank, Halkbank, Vakıfbank, TEB, Denizbank, - ING Bank, Akbank ATM, Garanti, İş Bankası ATM, Yapı Kredi, Türkiye İş Bankası, QNB Finansbank, Deniz - Bank, Ziraat Bankası ATM, private, HSBC, Finansbank, Vakıfbank ATM, PTT, VakıfBank, Halkbank ATM, - Govermental, Ziraat Bankasi, Garanti Bankası ATM, Denizbank ATM, Bankamatik, Yapı Kredi Bankası, Halk +atmOperators: [İş Bankası, Akbank, Ziraat Bankası, Garanti Bankası, Halkbank, DenizBank, Vakıfbank, TEB, Denizbank, + ING Bank, Akbank ATM, Garanti, Yapı Kredi, İş Bankası ATM, Türkiye İş Bankası, QNB Finansbank, Deniz + Bank, Ziraat Bankası ATM, private, HSBC, Finansbank, Vakıfbank ATM, PTT, VakıfBank, Ziraat Bankasi, + Halkbank ATM, Govermental, Garanti Bankası ATM, Denizbank ATM, Bankamatik, Yapı Kredi Bankası, Halk Bankası, Garanti BBVA, AKBANK, Yapı Kredi ATM, VakifBank, TEB ATM, QNB, Şekerbank, denizbank, Ziraat - Bank, YapıKredi, YapiKredi, Ing Bank, ING, Garanti BBVA ATM, Zıraat Bankası, Yapi Kredi, YAPI KREDİ, + Bank, YapıKredi, YapiKredi, Yapi Kredi, Ing Bank, ING, Garanti BBVA ATM, Zıraat Bankası, YAPI KREDİ, Türkiye İş Bankası A.Ş., Türkiye Finans, Türkiye Bankasi, T.C. Ziraat Bankası, Halk Bank, Garanti Bank, AkBank, Şeker Bank, İşbank, İş bankası, İŞ BANKASI, iş bankası, deniz bank, alBaraka, akbank, ZiraatBank, Ziraat ATM, Ziraat, Vakıf Bank, Vakifbank, QNB Finansbank ATM, Garanti ATM, FİNANSBANK, Finansbank diff --git a/app/src/main/assets/country_metadata/UA.yml b/app/src/main/assets/country_metadata/UA.yml index 7cf00ecf52..23befa10e4 100644 --- a/app/src/main/assets/country_metadata/UA.yml +++ b/app/src/main/assets/country_metadata/UA.yml @@ -4,12 +4,12 @@ atmOperators: [ПриватБанк, Альфа-Банк, Ощадбанк, Пр банк Аваль, Credit Agricole, Райфайзен банк Аваль, Райфайзен Банк Аваль, UniCredit Bank, УкрСибБанк, приватбанк, '"ПАТ ""Укрсоцбанк"""', Промінвестбанк, Приват банк, PrivatBank, Правекс-Банк, Райффайзенбанк Аваль, Надра, Кредитпромбанк, УкрЕксімБанк, Надра Банк, Проминвестбанк, Приват, Полтава-Банк, Банк - Хрещатик, Банк Форум, Банк Південний, партнер Укрсиббанку, Сбербанк России, Приват-Банк, Мегабанк, - Експрес-Банк, Брокбізнесбанк, Universal Bank, KredoBank, Crédit Agricole, Укрінбанк, УкрГазБанк, КредоБанк, + Хрещатик, Банк Південний, партнер Укрсиббанку, Сбербанк России, Приват-Банк, Мегабанк, Експрес-Банк, + Брокбізнесбанк, Банк Форум, Universal Bank, KredoBank, Crédit Agricole, Укрінбанк, УкрГазБанк, КредоБанк, Индустриалбанк, UniCredit, Raiffeisen Bank Aval, Privat Bank, '"АБ ""УКРГАЗБАНК"""'] -chargingStationOperators: ['"Перша національна мережа електрозаправних комплексів ""Тока"""', Одеська міська рада, АвтоЭнтерпрайз, - ЕлектроДрайв, Autoenterprise, AutoEnterprise, Yasno, ElectroUA, Автоэнтерпрайз, Автоентерпрайз, Silver - Fox Energy, Electro UA, AutoEnterprise 201, АвтоЕнтерпрайз, Tesla Club Ukraine, Go To-U, AutoVolt] +chargingStationOperators: [Одеська міська рада, АвтоЭнтерпрайз, ЕлектроДрайв, Autoenterprise, AutoEnterprise, '"Перша національна + мережа електрозаправних комплексів ""Тока"""', Yasno, ElectroUA, Автоэнтерпрайз, Автоентерпрайз, + Silver Fox Energy, Electro UA, AutoEnterprise 201, АвтоЕнтерпрайз, Tesla Club Ukraine, Go To-U, AutoVolt] clothesContainerOperators: [Емаус-Оселя] isAdvisorySpeedLimitKnown: true isLivingStreetKnown: true diff --git a/app/src/main/assets/country_metadata/US-MI.yml b/app/src/main/assets/country_metadata/US-MI.yml index 35e5da6d55..80b7ff6a78 100644 --- a/app/src/main/assets/country_metadata/US-MI.yml +++ b/app/src/main/assets/country_metadata/US-MI.yml @@ -2,5 +2,5 @@ atmOperators: [MSUFCU, Chase, Bank of America, PNC Bank, Michigan State Federal Credit Union, MSU Federal Credit Union, Fifth Third Bank, Michigan Tech Employees Federal Credit Union, Michigan State University Federal Credit Union, Wells Fargo, Lake Trust Credit Union, Chase Bank] -chargingStationOperators: [Michigan State University, Consumers Energy, Tesla Motors, NRG Energy, Lansing Board of Water and Light, - Chargepoint, Tanger Outlet Mall Howell, Hyatt Place, Celebration Cinema] +chargingStationOperators: [Michigan State University, Consumers Energy, NRG Energy, Lansing Board of Water and Light, Chargepoint, + Village of DeWitt, Tanger Outlet Mall Howell, Hyatt Place, Celebration Cinema] diff --git a/app/src/main/assets/country_metadata/US-OH.yml b/app/src/main/assets/country_metadata/US-OH.yml index 2acd725efb..12b736eb2d 100644 --- a/app/src/main/assets/country_metadata/US-OH.yml +++ b/app/src/main/assets/country_metadata/US-OH.yml @@ -1,7 +1,7 @@ # Do not edit. Source files are in /res/country_metadata -atmOperators: [Fifth Third Bank, Huntington Bank, PNC Bank, PNC, Huntington, Chase, US Bank, KeyBank, Athena Bitcoin - Inc., U.S. Bank, The Huntington National Bank, Key Bank, Citizens Bank, Chase Bank, Charter One, - US Bank ATM, Ohio University Credit Union, Glass City Federal Credit Union, First-Knox National Bank, +atmOperators: [Fifth Third Bank, Huntington Bank, PNC Bank, PNC, Huntington, Chase, US Bank, KeyBank, Citizens Bank, + Athena Bitcoin Inc., U.S. Bank, The Huntington National Bank, Key Bank, Chase Bank, Charter One, US + Bank ATM, Ohio University Credit Union, Glass City Federal Credit Union, First-Knox National Bank, First Financial Bank] chargingStationOperators: [Tesla Motors, Bowling Green State University, Kent State University, University of Cincinnati, Easton Town Center] diff --git a/app/src/main/assets/map_theme/jawg/layers/labels.yaml b/app/src/main/assets/map_theme/jawg/layers/labels.yaml index 1d45ffb65b..dad0bc6904 100644 --- a/app/src/main/assets/map_theme/jawg/layers/labels.yaml +++ b/app/src/main/assets/map_theme/jawg/layers/labels.yaml @@ -20,7 +20,7 @@ layers: water-labels: data: { source: jawg, layer: [waterway, water] } - filter: { $zoom: { min: 14 } } + filter: { $zoom: { min: 14 }, not: { structure: tunnel } } draw: text: text_source: global.name_source diff --git a/app/src/main/assets/osmfeatures/de.json b/app/src/main/assets/osmfeatures/de.json index 0a9bbf8aab..6380e8a49a 100644 --- a/app/src/main/assets/osmfeatures/de.json +++ b/app/src/main/assets/osmfeatures/de.json @@ -572,7 +572,7 @@ }, "amenity/payment_terminal": { "name": "Zahlungsterminal", - "terms": "Zahlungsterminal" + "terms": "Zahlungsterminal, Kiosksystem, Münzwechsel, Selbstbedienung" }, "amenity/pharmacy": { "name": "Apotheke", @@ -1457,8 +1457,8 @@ "terms": "Doppelhaushälfte" }, "building/service": { - "name": "Maschinenhaus", - "terms": "Maschinenhaus, Dienstleistungsgebäude" + "name": "Versorgungsgebäude", + "terms": "Maschinenhaus, Dienstleistungsgebäude, Betriebsgebäude, Technikgebäude" }, "building/shed": { "name": "Schuppen", diff --git a/app/src/main/assets/osmfeatures/el.json b/app/src/main/assets/osmfeatures/el.json index 56ca11ed11..255506406b 100644 --- a/app/src/main/assets/osmfeatures/el.json +++ b/app/src/main/assets/osmfeatures/el.json @@ -3480,6 +3480,9 @@ "name": "Διαδρομή Πορθμείου", "terms": "Διαδρομή πορθμείου, Δρομολόγιο πορθμείου" }, + "type/route/foot": { + "name": "Διαδρομή Περιπάτου" + }, "type/route/hiking": { "name": "Διαδρομή Ορεινής Ανάβασης" }, @@ -3489,6 +3492,9 @@ "type/route/light_rail": { "name": "Διαδρομή Ελαφρού Σιδηρόδρομου" }, + "type/route/monorail": { + "name": "Διαδρομή Σιδηροδρόµου απλής τροχιάς" + }, "type/route/pipeline": { "name": "Διαδρομή Σωλήνωσης" }, @@ -3499,11 +3505,11 @@ "name": "Διαδρομή Ρεύματος" }, "type/route/road": { - "name": "Πορεία Δρόμου", + "name": "Οδική Διαδρομή", "terms": "Οδική διαδρομή, Οδικό δρομολόγιο" }, "type/route/subway": { - "name": "Υπόγεια Διαδρομή" + "name": "Διαδρομή Υπόγειου Σιδηρόδρομου" }, "type/route/train": { "name": "Διαδρομή Τρένου" @@ -3511,6 +3517,12 @@ "type/route/tram": { "name": "Διαδρομή Τραμ" }, + "type/route/trolleybus": { + "name": "Διαδρομή Tρόλεϊ" + }, + "type/route_master": { + "name": "Δρομολόγιο" + }, "type/site": { "name": "Χώρος" }, diff --git a/app/src/main/assets/osmfeatures/fr.json b/app/src/main/assets/osmfeatures/fr.json index a8cdd2dc24..2693a08b5e 100644 --- a/app/src/main/assets/osmfeatures/fr.json +++ b/app/src/main/assets/osmfeatures/fr.json @@ -75,6 +75,9 @@ "name": "Tyrolienne", "terms": "Câble aérien, câble de canopée, tyrolienne..." }, + "aeroway": { + "name": "Équipement aérien" + }, "aeroway/aerodrome": { "name": "Aéroport", "terms": "Aéroport, Aérodrome, aeroport, aerodrome, Altiport, Héliport, airport" @@ -1674,7 +1677,7 @@ }, "emergency/fire_hydrant": { "name": "Borne incendie", - "terms": "Borne incendie, borne-fontaine, borne fontaine, bouche d'incendie, poteau incendie, hydrant, fire hydrant" + "terms": "Borne incendie, borne-fontaine, borne fontaine, bouche d'incendie, poteau incendie, hydrant, fire hydrant, point d'eau incendie" }, "emergency/first_aid_kit": { "name": "Kit de premiers secours", @@ -2432,6 +2435,9 @@ "name": "Aire de sports d'hiver", "terms": "ski, nordique, fond, alpin, descente, snowboard, randonnée, rando, luge, traîneau, ski-joring, husky, cheval, raquette, piéton, glace, patin à glace" }, + "leisure": { + "name": "Équipement de loisir" + }, "leisure/adult_gaming_centre": { "name": "Jeux pour adultes", "terms": "Jeux pour adultes" @@ -3048,6 +3054,9 @@ "name": "Tranchée militaire", "terms": "tranchée,guerre,infanterie" }, + "natural": { + "name": "Élément naturel" + }, "natural/bare_rock": { "name": "Zone Rocheuse", "terms": "Zone Rocheuse, Rochers" @@ -3543,6 +3552,9 @@ "name": "Bureau de vote temporaire", "terms": "bureau de vote,vote,élections,démocratie,démocratique" }, + "power": { + "name": "Équipement lié à l'énergie" + }, "power/cable/underground": { "name": "Câble électrique souterrain", "terms": "Câble électrique souterrain" @@ -4554,7 +4566,7 @@ "terms": "data center,technologie,télécommunications,nuage,cloud,ordinateurs,serveurs,hébergeur,hébergement" }, "tourism": { - "name": "Équipement touristiques" + "name": "Équipement touristique" }, "tourism/alpine_hut": { "name": "Refuge de montagne", diff --git a/app/src/main/assets/osmfeatures/gl.json b/app/src/main/assets/osmfeatures/gl.json index 8316690bed..6cf41b0282 100644 --- a/app/src/main/assets/osmfeatures/gl.json +++ b/app/src/main/assets/osmfeatures/gl.json @@ -1,5 +1,8 @@ { "presets": { + "addr/interpolation": { + "name": "Interpolación de enderezo" + }, "address": { "name": "Enderezo", "terms": "dirección, enderezo, domicilio" @@ -15,6 +18,15 @@ "name": "Columna de publicidade", "terms": "columna, publicidade, anuncios, cilindro" }, + "advertising/poster_box": { + "name": "Expositor publicitario" + }, + "advertising/totem": { + "name": "Panel publicitario" + }, + "aerialway": { + "name": "Elemento de vía aérea" + }, "aerialway/cable_car": { "name": "Teleférico", "terms": "teleférico, telecabina, telecadeira" @@ -27,10 +39,17 @@ "name": "Ascensor de Arrastre", "terms": "elevador, remonta pendentes, telesquí, esquí, deslizador, snowboarder" }, + "aerialway/gondola": { + "name": "Teleférico", + "terms": "telecadeira, funicular, vehículo teleférico" + }, "aerialway/goods": { - "name": "Camiño aéreo de mercadorías", + "name": "Vía aérea de mercadorías", "terms": "produto, mercadoría, artigo, mercadería, carga, material, elevador, remonte" }, + "aerialway/j-bar": { + "name": "Telesquí de barra en J" + }, "aerialway/magic_carpet": { "name": "Ascensor Magic Carpet", "terms": "alfombra máxica, alfombra rodante, fita transportadora" @@ -44,20 +63,29 @@ "terms": "ascensor de prato, prato de elevación, tele esquí, telesquí" }, "aerialway/pylon": { - "name": "Pilón Vía Aérea", + "name": "Piar de vía aérea", "terms": "piar, pilona, columna, poste, soporte" }, "aerialway/rope_tow": { "name": "Ascensor de Corda de Remolque", "terms": "ascensor de remolque de corda, cable de remolque, corda de remolque" }, + "aerialway/t-bar": { + "name": "Telesqui de barra en T" + }, "aerialway/zip_line": { "name": "Tirolina" }, + "aeroway": { + "name": "Vías aéreas" + }, "aeroway/aerodrome": { "name": "Aeroporto", "terms": "aeroporto, avión, aeródromo, terminal" }, + "aeroway/apron": { + "name": "Estacionamento aéreo" + }, "aeroway/gate": { "name": "Porta de embarque", "terms": "porta, embarque, saída, aeroporto" @@ -70,10 +98,23 @@ "name": "Heliporto", "terms": "heliporto, helicóptero" }, + "aeroway/holding_position": { + "name": "Punto de espera de avións" + }, + "aeroway/jet_bridge": { + "name": "Ponte de embarque" + }, + "aeroway/parking_position": { + "name": "Estacionamento de transportes aéreos" + }, "aeroway/runway": { "name": "Pista de aeroporto", "terms": "pista, pista de aterraxe, pista de engalaxe" }, + "aeroway/spaceport": { + "name": "Cosmódromo", + "terms": "Base espacial" + }, "aeroway/taxiway": { "name": "Pista de rodaxe", "terms": "pista, pista de carreteo, carreteiro, pista de rodaxe, pista de taxeo, rúa de rodaxe, calle de rodaje, calle de rodaxe, vía de rodaxe, via de rodaxe" @@ -161,6 +202,9 @@ "name": "Biergarten (xardín da cervexa alemán)", "terms": "cervexa, bar, terraza, xardín, ó ar libre, ao aire libre, biergarten" }, + "amenity/binoculars": { + "name": "Binoculares panorámicos" + }, "amenity/boat_rental": { "name": "Alugueiro de embarcacións", "terms": "alugueiro, alugamento, locación, bote, barca, lancha, embarcación, embarcacións" @@ -179,6 +223,14 @@ "name": "Cafetaría", "terms": "cafetaría, café, bar, tetería, cafetería" }, + "amenity/cafe/bubble_tea": { + "name": "Casa de té con burbullas", + "terms": "buba, té con leite, infusión" + }, + "amenity/cafe/coffee_shop": { + "name": "Cafetaría", + "terms": "bar, café, cafetería" + }, "amenity/car_pooling": { "name": "Estación de automóbil compartido (Carpooling)" }, @@ -337,6 +389,9 @@ "amenity/fast_food/sandwich": { "name": "Comida rápida: Sandwiches" }, + "amenity/ferry_terminal": { + "name": "Terminal de transbordadores" + }, "amenity/fire_station": { "name": "Parque de bombeiros", "terms": "estación de bombeiros, bombeiros, parque de bombeiros" @@ -424,6 +479,10 @@ "name": "Estación de transferencia de diñeiro", "terms": "xiro postal, cheque, factura, moeda, finanzas, transferencia bancaria, cable, cabo, persoa a persoa, efectivo a efectivo, intercambio, troco" }, + "amenity/mortuary": { + "name": "Velorio / tanatorio", + "terms": "tanatorio, funeraria, fúnebre, velorio, velatorio, mortuorio, mortuoria, crematorio" + }, "amenity/motorcycle_parking": { "name": "Aparcadoiro de motos", "terms": "aparcadoiro, parking, motos, motocicletas, ciclomotores, aparcamento, estacionamento" @@ -464,6 +523,9 @@ "amenity/parking_space": { "name": "Praza de aparcadoiro" }, + "amenity/parking_space/disabled": { + "name": "Espazo de aparcadoiro para discapacitados" + }, "amenity/payment_centre": { "name": "Centro de pagamento" }, @@ -937,6 +999,9 @@ "attraction/summer_toboggan": { "name": "Escorregadoiro de verán" }, + "attraction/swing_carousel": { + "name": "Randeeira carrusel" + }, "attraction/train": { "name": "Tren turístico", "terms": "tren, ferrocarril, atracción" @@ -1039,6 +1104,9 @@ "name": "Escada", "terms": "escada, escaleira, valado, cerca, reixa" }, + "barrier/swing_gate": { + "name": "Barreira abatible" + }, "barrier/toll_booth": { "name": "Peaxe", "terms": "peaxe, cabina de peaxe, cabina de cobro" @@ -1413,7 +1481,7 @@ "terms": "fabricante, creador, criador, cartaces, cartaz, carteles, tendas, negocios, rótulo, rotulo, rótulos, rotulos" }, "craft/stonemason": { - "name": "Albanel", + "name": "Canteiro", "terms": "albanel, canteiro, pedra" }, "craft/tailor": { @@ -1441,6 +1509,9 @@ "name": "Adega de viños", "terms": "lagar, adega, prensa, lagareta, viño, uva" }, + "disused/amenity": { + "name": "Instalación en desuso" + }, "disused/railway": { "name": "Elemento ferroviario en desuso" }, @@ -3045,6 +3116,9 @@ "playground/balance_beam": { "name": "Barra de equilibrio de xogos" }, + "playground/basket_swing": { + "name": "Cesta da randeeira" + }, "playground/horizontal_bar": { "name": "Barra horizontal de xogos" }, @@ -3063,6 +3137,9 @@ "playground/structure": { "name": "Estrutura de parque infantil" }, + "playground/swing": { + "name": "Randeeira hamaca" + }, "point": { "name": "Punto" }, @@ -3124,10 +3201,10 @@ "terms": "plataforma, andén, transporte público, transporte" }, "public_transport/platform/aerialway": { - "name": "Plataforma de aeroporto" + "name": "Plataforma de vía aérea" }, "public_transport/platform/aerialway_point": { - "name": "Parada / Plataforma de avións" + "name": "Parada / Plataforma de vía aérea" }, "public_transport/platform/bus": { "name": "Plataforma de bus" @@ -3137,11 +3214,11 @@ "terms": "autobús, bus, colectivo, plataforma, transporte público, parada" }, "public_transport/platform/ferry": { - "name": "Plataforma de ferri", + "name": "Plataforma de transbordadores", "terms": "bote, muelle, transbordador, plataforma, transporte público, peirao, barco" }, "public_transport/platform/ferry_point": { - "name": "Parada / Plataforma de ferri" + "name": "Parada / Plataforma de transbordadores" }, "public_transport/platform/light_rail": { "name": "Plataforma de tren lixeiro" @@ -3150,7 +3227,8 @@ "name": "Parada / Plataforma de tren lixeiro" }, "public_transport/platform/monorail": { - "name": "Plataforma de monorraíl" + "name": "Plataforma de monorraíl", + "terms": "monocarríl" }, "public_transport/platform/monorail_point": { "name": "Parada / Plataforma de monorraíl" @@ -3188,12 +3266,22 @@ "public_transport/station": { "name": "Estación de transporte público" }, + "public_transport/station_aerialway": { + "name": "Estación de vía aérea" + }, "public_transport/station_bus": { "name": "Estación de autobuses" }, + "public_transport/station_ferry": { + "name": "Terminal de transbordadores" + }, "public_transport/station_light_rail": { "name": "Estación de tren lixeiro" }, + "public_transport/station_monorail": { + "name": "Estación de monoraíl", + "terms": "monocarríl" + }, "public_transport/station_subway": { "name": "Estación de metro" }, @@ -3206,6 +3294,9 @@ "public_transport/station_tram": { "name": "Estación de tranvía" }, + "public_transport/station_trolleybus": { + "name": "Estación / parada de trolebús" + }, "public_transport/stop_area": { "name": "Área de parada de transporte público", "terms": "transporte público, parada, punto de detención" @@ -3215,7 +3306,7 @@ "terms": "punto detención, transporte público, tránsito, transporte, aéreo, autobús, ferry, tren lixeiro, tranvía, tren, monorraíl, metro, trolebús, parada, bus, ferri" }, "public_transport/stop_position_aerialway": { - "name": "Lugar de parada de avións", + "name": "Lugar de parada de vía aérea", "terms": "punto detención, transporte público, tránsito, transporte, teleférico, telecabina, góndola, transportador, parada" }, "public_transport/stop_position_bus": { @@ -3223,7 +3314,7 @@ "terms": "punto detención, transporte público, tránsito, transporte, autobús, bus, minibús, parada" }, "public_transport/stop_position_ferry": { - "name": "Lugar de parada de ferri", + "name": "Lugar de parada de transbordadores", "terms": "punto detención, transporte público, tránsito, transporte, naval, marítimo, bote, barco, ferry, buque, lancha, muelle, dársena, ferri, peirao, parada" }, "public_transport/stop_position_light_rail": { @@ -3295,10 +3386,12 @@ "name": "Ferrovía en miniatura" }, "railway/monorail": { - "name": "Vía de monorraíl" + "name": "Vía de monorraíl", + "terms": "monocarríl" }, "railway/monorail/hanging": { - "name": "Vía de monorraíl colgante" + "name": "Vía de monorraíl colgante", + "terms": "monocarríl" }, "railway/narrow_gauge": { "name": "Ferrovía estreita" @@ -3359,7 +3452,7 @@ "terms": "Relación, Ligazón, Vínculo, Asociación" }, "route/ferry": { - "name": "Liña de ferri", + "name": "Liña de transbordadores", "terms": "ruta, rota, liña, ferry, ferri, buque, transbordador, lancha, embarcación, trasbordador, barco" }, "seamark": { @@ -4017,7 +4110,7 @@ "name": "Ruta de desvío" }, "type/route/ferry": { - "name": "Liña de ferri", + "name": "Liña de transbordadores", "terms": "ruta, rota, liña, ferri, itinerario, rumbo, dirección, traxecto, ferry, transbordador, buque, barco" }, "type/route/hiking": { @@ -4029,6 +4122,10 @@ "type/route/light_rail": { "name": "Ruta de tren lixeiro" }, + "type/route/monorail": { + "name": "Ruta de monoraíl", + "terms": "monocarríl" + }, "type/route/pipeline": { "name": "Ruta de tubaxe", "terms": "ruta, rota, tubería, tubaría, gasoduto, oleoduto, conduto, cañería, duto, ducto, tubaxe, tubo" @@ -4052,6 +4149,9 @@ "type/route/tram": { "name": "Liña de tranvía" }, + "type/route/trolleybus": { + "name": "Ruta de trolebús" + }, "type/route_master": { "name": "Ruta mestra" }, @@ -4089,7 +4189,7 @@ }, "waterway/drain": { "name": "Gabia", - "terms": "drenaxe, sumidoiro, sumideiro, acougadoiro, desacougadoiro, pluviais, augas, chuvia, chuva, choiva, desagüe, sumidero, alcantarilla, alcantarillado, resumidero, gabia, foxo, foio, cuneta, focha, fochanca, focho, covo" + "terms": "drenaxe, sumidoiro, sumideiro, acougadoiro, desacougadoiro, pluviais, augas, chuvia, chuva, choiva, desagüe, sumidero, alcantarilla, alcantarillado, resumidero, gabia, foxo, foio, cuneta, focha, fochanca, focho, covo, cal, caldeira, canle, quenlla" }, "waterway/fish_pass": { "name": "Paso fluvial", diff --git a/app/src/main/assets/osmfeatures/it.json b/app/src/main/assets/osmfeatures/it.json index 21b3749e87..c7c434fefb 100644 --- a/app/src/main/assets/osmfeatures/it.json +++ b/app/src/main/assets/osmfeatures/it.json @@ -2613,7 +2613,7 @@ "terms": "Linea" }, "man_made": { - "name": "Elementi creati dall’uomo" + "name": "Elemento creato dall'uomo" }, "man_made/adit": { "name": "Cunicolo", @@ -2624,7 +2624,8 @@ "terms": "cella,stazione,trasmissione,trasmissioni,comunicazione,comunicazioni,telecomunicazione,cellulare,cellulari,smartphone,gsm,telefono,telefoni,telefonia,telefonica,radio,televisione,tv,etere" }, "man_made/beacon": { - "name": "Fanale" + "name": "Fanale", + "terms": "fanale,segnale luminoso,segnale" }, "man_made/beehive": { "name": "Arnia", @@ -2634,6 +2635,10 @@ "name": "Frangiflutti", "terms": "frangiflutti,barriera,diga,frangionde,ostacolo,scogliera" }, + "man_made/bridge": { + "name": "Superficie di un ponte", + "terms": "ponte,viadotto,pontile,arco,strallato,cavalcavia" + }, "man_made/bunker_silo": { "name": "Bunker silo", "terms": "insilato,silaggio,stoccaggio,immagazzinamento,magazzino" diff --git a/app/src/main/assets/osmfeatures/pl.json b/app/src/main/assets/osmfeatures/pl.json index 4d47985712..f5f5185bd5 100644 --- a/app/src/main/assets/osmfeatures/pl.json +++ b/app/src/main/assets/osmfeatures/pl.json @@ -3416,8 +3416,8 @@ "terms": "rekreacyjna trasa ponumerowanych węzłów" }, "noexit/yes": { - "name": "Brak dalszej kontynuacji", - "terms": "Brak przejścia/przejazdu,koniec" + "name": "Brak przejścia/przejazdu", + "terms": "brak przejścia, brak przejazdu, koniec drogi" }, "office": { "name": "Biuro", diff --git a/app/src/main/assets/osmfeatures/presets.json b/app/src/main/assets/osmfeatures/presets.json index 72312d1c7e..48715c7ce5 100644 --- a/app/src/main/assets/osmfeatures/presets.json +++ b/app/src/main/assets/osmfeatures/presets.json @@ -397,7 +397,7 @@ "building/terrace": {"icon": "temaki-row_houses", "geometry": ["area"], "tags": {"building": "terrace"}, "terms": ["home", "terrace", "brownstone", "family", "residence", "dwelling"], "matchScore": 0.5, "name": "Row Houses"}, "building/transportation": {"icon": "maki-building", "fields": ["{building}", "smoking"], "geometry": ["area"], "tags": {"building": "transportation"}, "matchScore": 0.5, "name": "Transportation Building"}, "building/university": {"icon": "fas-school", "moreFields": ["{building}", "polling_station"], "geometry": ["area"], "terms": ["college"], "tags": {"building": "university"}, "matchScore": 0.5, "name": "University Building"}, - "building/warehouse": {"icon": "maki-warehouse", "geometry": ["area"], "tags": {"building": "warehouse"}, "matchScore": 0.5, "name": "Warehouse"}, + "building/warehouse": {"icon": "maki-warehouse", "fields": ["{building}", "phone"], "geometry": ["area"], "tags": {"building": "warehouse"}, "matchScore": 0.5, "name": "Warehouse"}, "club": {"icon": "fas-handshake", "fields": ["name", "club", "operator", "address", "building_area", "opening_hours", "opening_hours/covid19", "phone", "website"], "moreFields": ["access_simple", "building/levels_building", "email", "fax", "gnis/feature_id", "height_building", "internet_access", "internet_access/fee", "internet_access/ssid", "level", "max_age", "min_age", "phone", "website", "wheelchair"], "geometry": ["point", "area"], "tags": {"club": "*"}, "terms": ["social"], "name": "Club"}, "club/sport": {"icon": "maki-pitch", "fields": ["name", "sport", "{club}"], "geometry": ["point", "area"], "tags": {"club": "sport"}, "terms": ["athletics club", "sporting club", "sports association", "sports society"], "name": "Sports Club"}, "craft": {"icon": "temaki-tools", "fields": ["name", "craft", "operator", "address", "building_area", "opening_hours", "opening_hours/covid19", "phone", "website"], "moreFields": ["air_conditioning", "building/levels_building", "ele", "email", "fax", "gnis/feature_id", "height_building", "internet_access", "internet_access/fee", "internet_access/ssid", "level", "product", "ref/vatin", "wheelchair"], "geometry": ["point", "area"], "tags": {"craft": "*"}, "terms": [], "name": "Craft"}, @@ -796,9 +796,9 @@ "man_made/pipeline/underground": {"icon": "iD-pipeline-line", "geometry": ["line"], "terms": ["oil", "natural gas", "water", "sewer", "sewage"], "tags": {"man_made": "pipeline", "location": "underground"}, "addTags": {"man_made": "pipeline", "location": "underground", "layer": "-1"}, "name": "Underground Pipeline"}, "man_made/pipeline/valve": {"icon": "temaki-wheel", "geometry": ["vertex"], "fields": ["ref", "operator", "valve", "location", "diameter"], "moreFields": ["colour", "manufacturer", "material"], "terms": ["oil", "natural gas", "water", "sewer", "sewage"], "tags": {"pipeline": "valve"}, "name": "Pipeline Valve"}, "man_made/pumping_station": {"icon": "temaki-powered_pump", "geometry": ["point", "area"], "moreFields": ["gnis/feature_id"], "tags": {"man_made": "pumping_station"}, "name": "Pumping Station"}, - "man_made/reservoir_covered": {"icon": "maki-water", "fields": ["name", "operator", "capacity", "access_simple", "location", "layer"], "moreFields": ["ref"], "geometry": ["area", "point"], "tags": {"man_made": "reservoir_covered"}, "terms": ["underground reservoir", "water tank"], "name": "Covered Reservoir"}, + "man_made/reservoir_covered": {"icon": "maki-water", "fields": ["name", "operator", "capacity_volume", "access_simple", "location", "layer"], "moreFields": ["ref"], "geometry": ["area", "point"], "tags": {"man_made": "reservoir_covered"}, "terms": ["underground reservoir", "water tank"], "name": "Covered Reservoir"}, "man_made/silo": {"icon": "temaki-silo", "fields": ["crop", "building_area"], "moreFields": ["gnis/feature_id"], "geometry": ["point", "area"], "terms": ["grain", "corn", "wheat"], "tags": {"man_made": "silo"}, "name": "Silo"}, - "man_made/storage_tank": {"icon": "temaki-storage_tank", "fields": ["content", "operator", "material", "building_area", "height", "capacity"], "moreFields": ["layer", "location", "manufacturer"], "geometry": ["area", "point"], "terms": ["water", "oil", "gas", "petrol"], "tags": {"man_made": "storage_tank"}, "name": "Storage Tank"}, + "man_made/storage_tank": {"icon": "temaki-storage_tank", "fields": ["content", "operator", "material", "building_area", "height", "capacity_volume"], "moreFields": ["layer", "location", "manufacturer"], "geometry": ["area", "point"], "terms": ["water", "oil", "gas", "petrol"], "tags": {"man_made": "storage_tank"}, "name": "Storage Tank"}, "man_made/storage_tank/water": {"icon": "temaki-storage_tank", "geometry": ["point", "area"], "terms": ["cistern", "water tower"], "tags": {"man_made": "storage_tank", "content": "water"}, "name": "Water Tank"}, "man_made/street_cabinet": {"icon": "fas-door-closed", "geometry": ["point", "area"], "fields": ["ref", "operator", "street_cabinet", "utility_semi", "height", "colour"], "terms": ["cable tv", "monitoring box", "technical box", "telecommunications", "traffic signal controls"], "tags": {"man_made": "street_cabinet"}, "name": "Street Cabinet"}, "man_made/surveillance": {"icon": "temaki-security_camera", "geometry": ["point", "vertex"], "fields": ["surveillance", "surveillance/type", "surveillance/zone", "direction"], "terms": ["anpr", "alpr", "camera", "car plate recognition", "cctv", "guard", "license plate recognition", "monitoring", "number plate recognition", "security", "video", "webcam"], "tags": {"man_made": "surveillance"}, "name": "Surveillance"}, diff --git a/app/src/main/assets/osmfeatures/pt.json b/app/src/main/assets/osmfeatures/pt.json index 43102a0d85..76876b1fdc 100644 --- a/app/src/main/assets/osmfeatures/pt.json +++ b/app/src/main/assets/osmfeatures/pt.json @@ -3258,7 +3258,7 @@ }, "natural/cliff": { "name": "Penhasco", - "terms": "escarpa,falésia,arriba,precipício" + "terms": "escarpa,falésia,arriba,precipício,costa alta" }, "natural/coastline": { "name": "Linha de costa", diff --git a/app/src/main/assets/osmfeatures/sk.json b/app/src/main/assets/osmfeatures/sk.json index bda3ce4771..adbc4cd4fe 100644 --- a/app/src/main/assets/osmfeatures/sk.json +++ b/app/src/main/assets/osmfeatures/sk.json @@ -8,6 +8,9 @@ "name": "Bilboard", "terms": "bilbord,bilboardy,billboardy,reklama,pútač,putac" }, + "aerialway": { + "name": "Objekt lanovky" + }, "aerialway/cable_car": { "name": "Kabínková lanovka", "terms": "kyvadlova lanovka,kyvadlo,lanovka,kabínka,kabinka" @@ -44,6 +47,9 @@ "name": "Lanový vlek", "terms": "lanovy vlek" }, + "aerialway/t-bar": { + "name": "Vlek s dvojmiestnou kotvou" + }, "aeroway/aerodrome": { "name": "Letisko", "terms": "Letisko,pristávacia plocha,terminál,príletová hala,odbavovacia plocha" @@ -60,6 +66,9 @@ "name": "Heliport", "terms": "vrtuľník,helikoptéra,pristávacia plocha,heliport,helipad,vrtulnik,helikoptera,pristavacia plocha" }, + "aeroway/jet_bridge": { + "name": "Nástupný tunel" + }, "aeroway/runway": { "name": "Vzletová dráha", "terms": "pristávacia dráha, vzletová dráha, pristávací pruh,pristavacia draha,vzletova draha, pristavaci pruh" @@ -72,6 +81,9 @@ "name": "Letiskový termnál", "terms": "letiskovy terminal,terminal,terminál" }, + "aeroway/windsock": { + "name": "Veterný rukáv" + }, "amenity": { "name": "Občianska vybavenosť" }, @@ -314,14 +326,26 @@ "amenity/language_school": { "name": "Jazyková škola" }, + "amenity/letter_box": { + "name": "Poštová schránka" + }, "amenity/library": { "name": "Knižnica", "terms": "Kniznica,biblioteka,bibliotéka,skriptáren,skriptaren" }, + "amenity/lounger": { + "name": "Ležadlo" + }, + "amenity/love_hotel": { + "name": "Hodinový hotel" + }, "amenity/marketplace": { "name": "Tržnica", "terms": "trznica,trhovisko,burza,bazár,bazar,trhy,trh" }, + "amenity/mortuary": { + "name": "Márnica" + }, "amenity/motorcycle_parking": { "name": "Parkovanie pre motocykle", "terms": "parkovisko,motorky,stojan,stojan pre motorky,moped,babeta,parkovanie pre motorky" @@ -336,6 +360,15 @@ "amenity/nursing_home": { "name": "Ošetrovateľské centum" }, + "amenity/parking": { + "name": "Parkovisko" + }, + "amenity/parking/underground": { + "name": "Podzemné parkovisko" + }, + "amenity/parking_entrance": { + "name": "Vchod / východ do garáže" + }, "amenity/parking_space": { "name": "Parkovacie miesto", "terms": "parkovisko,miesto na parkovanie" @@ -361,6 +394,9 @@ "amenity/place_of_worship/jewish": { "name": "Židovská synagóga" }, + "amenity/place_of_worship/muslim": { + "name": "Mešita" + }, "amenity/place_of_worship/shinto": { "name": "Šintoistická svätyňa ", "terms": "sintoisticka svatyna" @@ -381,6 +417,9 @@ "name": "Polícia", "terms": "polícia,mestská polícia,verejná bezpečnosť,fízli,poliši,zákon,policia,mestska policia,verejna bezpecnost,fizli,polisi,zakon" }, + "amenity/post_box": { + "name": "Poštová schránka" + }, "amenity/post_office": { "name": "Pošta", "terms": "posta,Poštový úrad,postovy urad,slovenská pošta,slovenska posta" @@ -393,6 +432,12 @@ "name": "Krčma", "terms": "krcma,hostinec,hospoda,šenk,senk,piváreň,pivaren" }, + "amenity/pub/irish": { + "name": "Írska krčma" + }, + "amenity/pub/microbrewery": { + "name": "Pivovarská krčma" + }, "amenity/public_bath": { "name": "Verejné sprchy", "terms": "verejne sprchy" @@ -408,6 +453,9 @@ "amenity/recycling/container/electrical_items": { "name": "Koš na elektroodpad" }, + "amenity/recycling/container/green_waste": { + "name": "Kontajner na zelený odpad" + }, "amenity/recycling_centre": { "name": "Recyklačné centrum", "terms": "recyklacne centrum" @@ -538,6 +586,9 @@ "amenity/toilets/disposal/pitlatrine": { "name": "Latrína" }, + "amenity/toilets/portable": { + "name": "Prenosné WC" + }, "amenity/townhall": { "name": "Mestský úrad", "terms": "radnica,obecný úrad,mestský úrad,správa,obecny urad,mestsky urad,sprava,primátor,primater,starosta" @@ -553,10 +604,19 @@ "name": "Výdajný automat", "terms": "vydajny automat" }, + "amenity/vending_machine/bottle_return": { + "name": "Automat na vrátenie fliaš" + }, + "amenity/vending_machine/bread": { + "name": "Automat na výdaj chleba" + }, "amenity/vending_machine/cigarettes": { "name": "Automat na cigarety", "terms": "cigarety" }, + "amenity/vending_machine/coffee": { + "name": "Automat na kávu" + }, "amenity/vending_machine/condoms": { "name": "Automat na kondómy", "terms": "automat na kondomy,kondóm,kondom" @@ -569,10 +629,22 @@ "name": "Automat na ženké hygienické produkty", "terms": "Automat na zenske produkty,vlozky,vložky,kondomy,kondómy,prezervatív,prezervativ,tampon,tampón" }, + "amenity/vending_machine/fuel": { + "name": "Čerpacia stanica" + }, + "amenity/vending_machine/ice_cream": { + "name": "Automat na nanuky" + }, + "amenity/vending_machine/ice_cubes": { + "name": "Automat na ľad" + }, "amenity/vending_machine/newspapers": { "name": "Automat na noviny", "terms": "noviny,casopisy" }, + "amenity/vending_machine/parcel_pickup": { + "name": "Skrinka na vyzdvihnutie balíkov" + }, "amenity/vending_machine/parking_tickets": { "name": "Automat na parkovacie lístky", "terms": "automat na parkovacie listky" @@ -601,10 +673,28 @@ "name": "Pitná voda pre karavany", "terms": "pitna voda pre karavany" }, + "amenity/weighbridge": { + "name": "Váha pre nákladné vozidlá" + }, "area": { "name": "Plocha", "terms": "územie,uzemie" }, + "attraction/big_wheel": { + "name": "Ruské kolo" + }, + "attraction/bumper_car": { + "name": "Autodrom" + }, + "attraction/carousel": { + "name": "Kolotoč" + }, + "attraction/roller_coaster": { + "name": "Húsenková dráha" + }, + "attraction/train": { + "name": "Turistický vláčik" + }, "barrier": { "name": "Bariéra", "terms": "bariera,plot,zátarasa,zatarasa,blokada,blokáda,múr,mur,brána,brana,stena,rampa" @@ -617,6 +707,12 @@ "name": "Stĺpik", "terms": "stlpik,stĺp,stlptyč,tyc" }, + "barrier/bollard_line": { + "name": "Rad stĺpikov" + }, + "barrier/border_control": { + "name": "Hraničná kontrola" + }, "barrier/cattle_grid": { "name": "Mreža proti pohybu dobytka", "terms": "Mreza proti pohybu dobytka,mreza,priekopa,kravy" @@ -648,6 +744,12 @@ "name": "Živý plot", "terms": "zivy plot,kríky,kriky,okrasný plot,okrasny plot" }, + "barrier/kerb": { + "name": "Obrubník" + }, + "barrier/kerb/raised": { + "name": "Zvýšený obrubník" + }, "barrier/kissing_gate": { "name": "Zábrana pre dobytok", "terms": "Zabrana pre dobytok,kravy" @@ -668,10 +770,16 @@ "name": "Výber mýta", "terms": "Budka pre vyber myta,mytnica,vyber myta,Búdka pre výber mýta,mýto,myto,poplatok,vstupné,vstupne,kasa,pokladna,pokladňa" }, + "barrier/turnstile": { + "name": "Turniket" + }, "barrier/wall": { "name": "Múr", "terms": "mur,stena" }, + "barrier/wall/noise_barrier": { + "name": "Protihluková bariéra" + }, "boundary": { "name": "Hranica" }, @@ -1182,6 +1290,9 @@ "healthcare/speech_therapist": { "name": "Logopéd" }, + "highway": { + "name": "Cestný objekt" + }, "highway/bridleway": { "name": "Jazdecká trať", "terms": "jazdecká cesta, chodník pre kone,jazdecká trasa,jazdecka cesta,chodnik pre kone,jazdecka trasa,jazdecka trat" @@ -1321,6 +1432,9 @@ "name": "Privádzač na cestu 1. triedy", "terms": "Privadzac na cestu 1. triedy,privadzac,privádzač,zjazd,vyjazd,výjazd,nájazd,najazd,pripojovací pruh,pripojovaci pruh" }, + "highway/raceway/karting": { + "name": "Motokárová dráha" + }, "highway/raceway/motocross": { "name": "Motokorosová pretekárska dráha" }, @@ -1531,6 +1645,12 @@ "name": "Križovatka", "terms": "krizovatka" }, + "landuse": { + "name": "Objekt využitia územia" + }, + "landuse/allotments": { + "name": "Záhradkárska osada" + }, "landuse/basin": { "name": "Zadržiavacia nádrž" }, @@ -1768,6 +1888,12 @@ "leisure/pitch/beachvolleyball": { "name": "Kurt plážoveho volejbalu" }, + "leisure/pitch/cricket": { + "name": "Kriketové ihrisko" + }, + "leisure/pitch/equestrian": { + "name": "Jazdecká aréna" + }, "leisure/pitch/rugby_league": { "name": "Ihrisko ragby league", "terms": "rugby league" @@ -1813,6 +1939,9 @@ "leisure/slipway_point": { "name": "Lodný sklz" }, + "leisure/sports_centre": { + "name": "Športové centrum / Komplex" + }, "leisure/sports_centre/climbing": { "name": "Lezecká stena" }, @@ -2004,6 +2133,9 @@ "man_made/tower/communication": { "name": "Komunikačná veža" }, + "man_made/tower/cooling": { + "name": "Chladiaca veža" + }, "man_made/tower/defensive": { "name": "Opevnená veža" }, @@ -2097,6 +2229,9 @@ "name": "Vresovisko", "terms": "vres,vresovec" }, + "natural/hot_spring": { + "name": "Termálna kúpeľ" + }, "natural/mud": { "name": "Blato" }, @@ -2214,12 +2349,18 @@ "office/charity": { "name": "Charita" }, + "office/diplomatic": { + "name": "Diplomatický úrad" + }, "office/diplomatic/consulate": { "name": "Konzulát" }, "office/diplomatic/embassy": { "name": "Veľvyslanectvo" }, + "office/diplomatic/liaison": { + "name": "Úrad pre spoluprácu" + }, "office/educational_institution": { "name": "Vzdelávací inštitút", "terms": "vzdelavaci institut,univerzita,skola,vzdelavanie,škola,vzdelávanie" @@ -2401,6 +2542,9 @@ "name": "Vedľajšie elektrické vedenie", "terms": "vedlajsie elektricke vedenie,rozvod, elektrika" }, + "power/plant": { + "name": "Areál elektrárne" + }, "power/plant/source/coal": { "name": "Uhoľná elektráreň" }, @@ -2444,6 +2588,9 @@ "public_transport/platform/bus_point": { "name": "Autobusová zastávka" }, + "public_transport/platform/bus_tram_point": { + "name": "Elektičková a autobusová zastávka" + }, "public_transport/platform/ferry": { "name": "Nástupište na kompu" }, @@ -2483,21 +2630,48 @@ "public_transport/station_tram": { "name": "Električková stanica" }, + "railway": { + "name": "Železničný objekt" + }, "railway/abandoned": { "name": "Nepoužívaná trať", "terms": "nepouzivana trat,opustena trat,opustená trať" }, + "railway/construction": { + "name": "Železničná trať vo výstavbe" + }, "railway/disused": { "name": "Železnica mimo prevádzky", "terms": "zeleznica mimo prevadzky,mimo prevadzky" }, + "railway/level_crossing": { + "name": "Železničné priecestie" + }, + "railway/monorail": { + "name": "Jednokoľajnicová dráha" + }, + "railway/platform": { + "name": "Nástupište na vlak" + }, + "railway/rail": { + "name": "Vlaková trať" + }, + "railway/railway_crossing": { + "name": "Železničné priecestie" + }, "railway/station": { "name": "Vlaková stanica" }, + "railway/subway": { + "name": "Trať metra" + }, "railway/subway_entrance": { "name": "Vstup do metra", "terms": "vstup,metro,podchod,stanica metra" }, + "railway/tram": { + "name": "Električková trať" + }, "relation": { "name": "Relácia", "terms": "relacia,linka,trasa" @@ -2541,6 +2715,12 @@ "name": "Bižutéria", "terms": "bizuteria,šperky,sperky,naramky,náramnky,nausnice,náušnice,prstene,nahrdelniky,náhrdelniky" }, + "shop/beauty/nails": { + "name": "Nechtové štúdio" + }, + "shop/beauty/tanning": { + "name": "Solárium" + }, "shop/bed": { "name": "Obchod s posteľami/matracmi", "terms": "matrac,matrace,posteľ,postel,postele,spálňa,spalna" @@ -2553,6 +2733,9 @@ "name": "Cykloobchod", "terms": "obchod s bicyklami,bicykle,horské bicykle,horske bicykle" }, + "shop/boat": { + "name": "Obchod predávajúci lode" + }, "shop/bookmaker": { "name": "Stávková kancelária", "terms": "stavkova kancelaria,stavky,tipos,sportka,bingo,stavka,stávka,kurz" @@ -2603,6 +2786,9 @@ "name": "Obchod s odevami", "terms": "odevy,odev,šaty,saty,oblečenie,obchod s oblečením,oblecienie,obchod s oblecenim" }, + "shop/clothes/underwear": { + "name": "Obchod so spodnou bielizňou" + }, "shop/coffee": { "name": "Kaviareň" }, @@ -2650,6 +2836,9 @@ "name": "Čistiareň odevov", "terms": "cistiaren odevov,suché čistenie,suche cistenie" }, + "shop/e-cigarette": { + "name": "Obchod s elektronickými cigaretami" + }, "shop/electronics": { "name": "Elektro obchod", "terms": "elektro,elektronika" @@ -2691,6 +2880,9 @@ "name": "Obchod s nábytkom", "terms": "obchod s nabytkom,nabytok" }, + "shop/games": { + "name": "Obchod so stolovými hrami" + }, "shop/garden_centre": { "name": "Záhradné centrum", "terms": "zahradne centrum,záhradkarske centrum,zahradkarske centrum" @@ -2969,6 +3161,9 @@ "shop/wholesale": { "name": "Veľkoobchod" }, + "shop/wigs": { + "name": "Obchod s parochňami" + }, "shop/window_blind": { "name": "Obchod so žalúziami", "terms": "obchod so zaluziami,zaluzie,žalúzie" @@ -3035,12 +3230,18 @@ "tourism/information/board": { "name": "Informačná tabuľa" }, + "tourism/information/board/welcome_sign": { + "name": "Tabuľa Vitajte" + }, "tourism/information/guidepost": { "name": "Smerovník" }, "tourism/information/map": { "name": "Mapa" }, + "tourism/information/office": { + "name": "Návštevnícke centrum" + }, "tourism/information/route_marker": { "name": "Turistická značka" }, @@ -3077,6 +3278,9 @@ "name": "Zoo", "terms": "zoologická záhrada,zoologicka zahrada,zvieratá,zvierata" }, + "traffic_calming": { + "name": "Upokojovač dopravy" + }, "traffic_calming/bump": { "name": "Spomalovcí prah", "terms": "spomalovaci prah,retardér,retarder" @@ -3085,6 +3289,9 @@ "name": "Spomalovací hrb", "terms": "spomalovaci hrb" }, + "traffic_calming/island": { + "name": "Dopravný ostrovček" + }, "traffic_calming/rumble_strip": { "name": "Nízky spomaľovací prah", "terms": "nizky spomalovaci prah" diff --git a/app/src/main/assets/osmfeatures/zh-CN.json b/app/src/main/assets/osmfeatures/zh-CN.json index 53edbd9d08..f282f7cd54 100644 --- a/app/src/main/assets/osmfeatures/zh-CN.json +++ b/app/src/main/assets/osmfeatures/zh-CN.json @@ -1565,6 +1565,9 @@ "name": "献血中心", "terms": "献血中心,献血室" }, + "healthcare/dentist/orthodontics": { + "name": "牙齿矫正医生" + }, "healthcare/hospice": { "name": "临终安养院", "terms": "临终,善终,安宁,宁养,安养,关怀,保守,疾病,病房,垂死,致命,癌症,晚期,末期,死亡,诊所,医院,医学,医疗,疗法,卫生" @@ -2497,6 +2500,10 @@ "name": "风车", "terms": "风,轮,磨,坊,提水,灌溉,风能,风轮机,发电,风力,风力机,风帆,风轮" }, + "man_made/windpump": { + "name": "风力泵", + "terms": "风泵,风车,风力泵" + }, "man_made/works": { "name": "工厂", "terms": "工厂,加工,制造" @@ -2941,7 +2948,8 @@ "terms": "发电机" }, "power/generator/method/photovoltaic": { - "name": "太阳能板" + "name": "太阳能板", + "terms": "光伏板组件,光伏电池板,太阳能电池板" }, "power/generator/source/hydro": { "name": "水轮机", @@ -2979,11 +2987,12 @@ "name": "核能发电厂" }, "power/plant/source/solar": { - "name": "太阳能发电场" + "name": "太阳能发电场", + "terms": "光伏发电站,太阳能板,光伏发电厂" }, "power/plant/source/wind": { "name": "风电场", - "terms": "风电场,风力发电场" + "terms": "风电场,风力发电场,风车田" }, "power/pole": { "name": "电线杆", diff --git a/app/src/main/res/raw/changelog.yml b/app/src/main/res/raw/changelog.yml index fb9ec24695..0714f84d61 100644 --- a/app/src/main/res/raw/changelog.yml +++ b/app/src/main/res/raw/changelog.yml @@ -1,34 +1,25 @@ -v26.0-beta3: | - - -v26.0-beta2: | - - -v26.0-beta1: | +v26.0: |

⚡ Wait for the download no more!

Reworked it completely. Quest download is now substantially faster and the pins for all quest types appear immediately at the same time! (#1874, #1901)

New Quests

Enhanced Quests

Other Enhancements and Fixes

v25.1: | diff --git a/app/src/main/res/values-cs/strings.xml b/app/src/main/res/values-cs/strings.xml index 0fba1eab45..285e997a8d 100644 --- a/app/src/main/res/values-cs/strings.xml +++ b/app/src/main/res/values-cs/strings.xml @@ -2397,6 +2397,8 @@ Is the situation on this cycleway still the same? --> "Otevřít URL adresu" "Silo" "Historická" + + "budova historického významu, která neslouží žádným občanským, náboženským, nebo komerčním účelům" "Opuštěná" "nevyužívaná budova, jejíž původní funkce nebo účel není znám" diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml index 745568512d..0812e249b5 100644 --- a/app/src/main/res/values-de/strings.xml +++ b/app/src/main/res/values-de/strings.xml @@ -93,8 +93,6 @@ "Es hat mehrere unterschiedliche" "Verkleinern" "Vergrößern" - - "<p>Ah, jemand dem Datenschutz wichtig ist, schön! Ich denke, dass ich nur gute Nachrichten für dich habe:</p> <p><b>Direkte Mitwirkung</b></p> <p> @@ -384,9 +382,7 @@ Andernfalls kannst Du eine alternative Tastatur im App Store herunterladen. Beli "Aktiviert" "Aufgabentyp" "Zurücksetzen" - - - "Halte und bewege eine Aufgabe, um ihre Priorität der Anzeige auf der Karte zu verändern." + "Halte und bewege eine Aufgabe, um ihre Anzeige-Priorität auf der Karte zu verändern." "Rückgängig machen" "Abbrechen" "Hat %s vegetarisches Essen auf der Karte?" @@ -943,11 +939,11 @@ Erfolge" "URL öffnen" "Silo" "Historisch" - "Ein historisches Gebäude, dessen (ursprünglicher) Zweck nicht offensichtlich ist." + "historisches Gebäude, dessen (ursprünglicher) Zweck nicht offensichtlich ist" "Verlassen" - "Ein verlassenes Gebäude dessen ursprüngliche Funktion unbekannt ist" + "verlassenes Gebäude, dessen ursprüngliche Funktion unbekannt ist" "Ruine" - "Ein verfallenes oder zerstörtes Gebäude" + "verfallenes oder zerstörtes Gebäude" "Wie viele Autos können an dieser Ladestation gleichzeitig aufgeladen werden?" - "Karte, die jüngste Naturkatastrophen zeigt. Interessant für humanitäre Mapper. Zeigt außerdem viele weitere interessante Statistiken um zu analysieren, wie vollständig und aktuell Orte kartiert sind." + "Karte, die jüngste Naturkatastrophen zeigt. Interessant für humanitäre Mapper. Zeigt außerdem viele weitere interessante Statistiken, um zu analysieren, wie vollständig und aktuell Orte kartiert sind." \ No newline at end of file diff --git a/app/src/main/res/values-el/strings.xml b/app/src/main/res/values-el/strings.xml index d7063d6b6b..daa5beb4cb 100644 --- a/app/src/main/res/values-el/strings.xml +++ b/app/src/main/res/values-el/strings.xml @@ -2128,4 +2128,18 @@ "Η ράμπα αναπηρικού αμαξίδιου εμφανίζεται ως ξεχωριστή διαδρομή στον χάρτη;" "ξεχωριστή" "όχι ξεχωριστή" + "Ανεβάστε αυτόματα απαντήσεις" + "Περιγράψτε την επιφάνεια" + "Άνοιγμα διεύθυνσης URL" + "Σιλό" + "Ιστορικό" + + + "κτήριο ιστορικής αξίας που δεν εξυπηρετεί πολιτικές, θρησκευτικές ή εμπορικές λειτουργίες" + "Εγκαταλειμμένο" + "αχρησιμοποίητο κτήριο του οποίου η αρχική λειτουργία ή σκοπός είναι άγνωστη" + "Ερείπια" + "εγκαταλελειμμένο, ερειπωμένο και μη αναγνωρίσιμο κτήριο" + "Πόσα αυτοκίνητα μπορούν να φορτιστούν ταυτόχρονα σε αυτόν τον σταθμό φόρτισης;" + "Χάρτης που δείχνει τις πρόσφατες φυσικές καταστροφές, ενδιαφέρουσες για τους ανθρωπιστικούς χαρτογράφους. Επίσης, δείχνει πολλά ενδιαφέροντα στατιστικά στοιχεία για να αναλύσετε πόσο καλά χαρτογραφημένα και ενημερωμένα μέρη είναι." \ No newline at end of file diff --git a/app/src/main/res/values-el/translation_info.xml b/app/src/main/res/values-el/translation_info.xml index c46e86f95e..1953c600c1 100644 --- a/app/src/main/res/values-el/translation_info.xml +++ b/app/src/main/res/values-el/translation_info.xml @@ -1,4 +1,4 @@ - 98 + 100 diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml index 41bb010824..e7c76be348 100644 --- a/app/src/main/res/values-es/strings.xml +++ b/app/src/main/res/values-es/strings.xml @@ -2374,6 +2374,8 @@ Tenga en cuenta que esta aplicación solicita el número de portal de un edifici "Abrir URL" "Silo" "Histórico" + + "edificio de valor histórico que no cumple funciones cívicas, religiosas o comerciales" "Abandonado" "edificio en desuso cuya función o propósito original se desconoce" diff --git a/app/src/main/res/values-fa/strings.xml b/app/src/main/res/values-fa/strings.xml index a6d8f8907d..84dc138084 100644 --- a/app/src/main/res/values-fa/strings.xml +++ b/app/src/main/res/values-fa/strings.xml @@ -2289,4 +2289,20 @@ "در هوای آزاد" "شما %d جُستار مفید برای گردشگران را پاسخ دادید" "آیا این گذرگاه عابر پیاده جزیره ای دارد؟" + "اینجا تابلو ندارد" + "آیا سطح شیب دار صندلی چرخدار به صورت راه جداگانه روی نقشه نمایش داده می شود؟" + "تفکیک شده" + "بدون تفکیک" + "بارگذاری خودکار پاسخ‌ها" + "توصیف سطح" + "بازگشایی نشانی" + "انبار غله" + "تاریخی" + "بنایی با ارزش تاریخی که برای هدفی ناشناخته یا نامشخص ساخته شده است" + "متروکه" + "ساختمان بلا استفاده که کارکرد اصلی یا هدف آن ناشناخته است" + "خرابه" + "ساختمانی متروکه ، ویران و غیرقابل شناسایی" + "چند خودرو در این ایستگاه شارژ می تواند به طور همزمان شارژ شود؟" + "نقشه ای که بلایای طبیعی اخیر را نشان می دهد و برای نقشه‌کش‌های همنوع دوست جالب است. همچنین ، بسیاری از آمارهای متنوع را برای تجزیه و تحلیل چگونگی نقشه‌کشی و به روز بودن مکان ها نشان می دهد." \ No newline at end of file diff --git a/app/src/main/res/values-fa/translation_info.xml b/app/src/main/res/values-fa/translation_info.xml index c46e86f95e..1953c600c1 100644 --- a/app/src/main/res/values-fa/translation_info.xml +++ b/app/src/main/res/values-fa/translation_info.xml @@ -1,4 +1,4 @@ - 98 + 100 diff --git a/app/src/main/res/values-fi/strings.xml b/app/src/main/res/values-fi/strings.xml index 93d22576e6..40225b41cb 100644 --- a/app/src/main/res/values-fi/strings.xml +++ b/app/src/main/res/values-fi/strings.xml @@ -2221,4 +2221,18 @@ päiviä" "Onko pyörätuoliramppi kuvattu erillisenä reittinä kartalla?" "erillinen" "ei erillisenä" + "Lähetä vastaukset automaattisesti" + "Kuvaile pintaa" + "Avaa URL" + "Siilo" + "Historiallinen" + + + "historiallisesti arvokas rakennus, joka ei palvele mitään kansalais-, uskonnollisia tai kaupallisia tehtäviä" + "Hylätty" + "Käyttämätön rakennus, jonka alkuperäistä käyttötarkoitus on tuntematon" + "Raunio" + "hylätty, pilalla oleva ja tunnistamaton rakennus" + "Kuinka monia autoa voi ladata tällä latausasemalla yhtäaikaisesti?" + "Viimeaikaiset luonnonkatastrofit näyttävä kartta humanitaarisille kartoittajille. Näyttää myös monia mielenkiintoisia tilastoja analysoidakseen kuinka hyvin kartoitettuja ja ajantasaisia kartat ovat." \ No newline at end of file diff --git a/app/src/main/res/values-fi/translation_info.xml b/app/src/main/res/values-fi/translation_info.xml index c46e86f95e..3ddf070ea2 100644 --- a/app/src/main/res/values-fi/translation_info.xml +++ b/app/src/main/res/values-fi/translation_info.xml @@ -1,4 +1,4 @@ - 98 + 99 diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml index 0e037f6da0..e1b6576edf 100644 --- a/app/src/main/res/values-fr/strings.xml +++ b/app/src/main/res/values-fr/strings.xml @@ -2298,6 +2298,8 @@ Ces données sont essentielles non seulement pour le facteur mais aussi pour tou "Ouvrir l'URL" "Silo" "Monument historique" + + "Bâtiment à valeur historique, ne présentant pas de fonction civique, religieuse ou commerciale" "Abandonné" "Bâtiment inutilisé dont la fonction originelle est inconnue" diff --git a/app/src/main/res/values-hr/strings.xml b/app/src/main/res/values-hr/strings.xml index 34032e7dac..a5f3dbc280 100644 --- a/app/src/main/res/values-hr/strings.xml +++ b/app/src/main/res/values-hr/strings.xml @@ -8,20 +8,10 @@ "Komunikacije" "Prikaz" "%d MB" - - - "Veličina prostora za privremenu pohranu kartografskih podataka (u MB) na vanjskom mediju" - - + "Veličina prostora za privremenu pohranu karte (u MB) na vanjskom mediju" "Prikazuj sve bilješke" - - "Prikazuj bilješke koje nisu formulirane kao pitanja" - - "Zanemari bilješke koje nisu formulirane kao pitanja" - - "Veličina predmemorije za kartu" "Prati me" "© OpenStreetMap suradnici" @@ -36,9 +26,7 @@ "Ostaviti bilješku umjesto toga?" - - - "Možete ostaviti javnu bilješku na ovoj lokaciji koju drugi kartografi mogu komentirati/riješiti, ili (samo za sebe) sakriti ovaj zadatak." + "Možete ostaviti javnu bilješku na ovoj lokaciji koju drugi kartografi mogu komentirati/riješiti, ili samo za sebe sakriti ovaj zadatak." "U redu" "Ne, samo sakrij" @@ -81,12 +69,10 @@ "Greška prilikom traženja zadataka" "Greška prilikom slanja odgovora" + "Molimo da dodatno približite kartu" - "Molim dodatno zumirajte" - - - "Zaustaviti trenutačnu pretragu i pokrenuti novu ovdje?" + "Zaustavi trenutnu pretragu i pokreni novu ovdje?" "Tražim zadatke..." @@ -103,7 +89,7 @@ "Prijavi grešku" - "Dajte povratne informacije" + "Ostavite povratne informacije" "Licenca" "GNU Opća javna licenca" "Niste spojeni na Internet" @@ -143,12 +129,27 @@ "Ima nekoliko različitih oblika" - - "Udalji" - - - "Zumirajte" + "Približi" + "<p>Ah, netko kome je stalo do privatnosti, lijepo! Mislim da za vas imam samo dobre vijesti:</p> +<p><b>Izravni doprinosi</b></p> +<p> +Prvo, shvatite da s ovom aplikacijom dajete stvarne i izravne doprinose OpenStreetMapu.<br/> +Sve što dodate u ovoj aplikaciji izravno se dodaje na kartu; između aplikacije i OSM infrastrukture ne postoji treća strana, kao što je to slučaj s <a href=\"https://wheelmap.org\">wheelmap.org</a> ili <a href=\"http://www.kort.ch\">Kort</a>. +</p> +<p> +Anonimno uređivanje OpenStreetMapa nije moguće, pa se sve promjene koje napravite rade s vašim korisničkim računom OSM-a. To znači da su datum, sadržaj i (implicitno) lokacija vaših promjena javno vidljivi na openstreetmap web stranici i povezani s vašim računom. +</p> + +<b>Lokacija</b><br/> +<p> +Aplikacija ne dijeli vašu GPS lokaciju ni s kim. Koristi se za automatsko skeniranje zadataka oko vašeg područja i za fokusiranje (i time preuzimanje) karte oko vaše lokacije. +</p> + +<p><b>Upotreba podataka</b></p> +<p> +Kao što je spomenuto, aplikacija izravno komunicira s OSM infrastrukturom.<br/> +Međutim, prije slanja promjena, aplikacija provjerava <a href=\"https://www.westnordost.de/streetcomplete/banned_versions.txt\">jednostavnom tekstualnom datotekom</a> na mom poslužitelju je li joj zabranjeno slati bilo kakve izmjene. Ovo je mjera predostrožnosti da bi se moglo blokirati verzije aplikacije za koje se ispostavilo da imaju kritične programske pogreške, kako ne bi oštetile OSM podatke.</p>" "Uključena" "Samo na Wi-Fi" "Isključena" @@ -208,13 +209,11 @@ Podaci koje unesete se izravno dodaju u OpenStreetMap pod vašim imenom, bez pot "Zaista nema imena?" "Da, nema imena" "Dodaj radno vrijeme" - - - "Molimo vas, pošaljite izvješće o pogrešci programerima" + "Molim, pošaljite izvješće o pogrešci programerima" "O ne, StreetComplete se srušio prošli put!" - "Napišite poruku" + "Napišite e-poštu" "Nemate instaliran klijent e-pošte." @@ -272,9 +271,7 @@ Podaci koje unesete se izravno dodaju u OpenStreetMap pod vašim imenom, bez pot "Opće namjene" "Označili ste mnogo sportova" "Ima li autobusna stanica %s zaklon?" - - - "Plaća li se toalet ?" + "Plaća li se ovaj toalet?" "Ima li ova autobusna stanica trake vodilje za slijepe?" "Ima li ovaj pješački prelaz trake vodilje za slijepe na obje strane?" "Jeste li sigurni da ste to provjerili na licu mjesta?" @@ -305,8 +302,6 @@ Ako duž cijele ulice nema znakova koji se odnose na istaknuti odjeljak, primjen "Galske igre" - - "Je li %s pristupačan za invalidska kolica?" "Djelomično" @@ -326,11 +321,7 @@ Ako duž cijele ulice nema znakova koji se odnose na istaknuti odjeljak, primjen "\"Djelomično\" znači da nema više od jedne stepenice za pristup, i da je većina prostorija pristupačna za invalidska kolica." "\"Djelomično\" znači da nema više od jedne stepenice za pristup." "Kratica u nazivu %s?" - - - "Ima li ovaj toalet stol za presvlačenje za bebe?" - - + "Ima li u ovom toaletu stol za presvlačenje beba?" "Ima li %s stol za presvlačenje beba?" "O kakvoj vrsti reciklaže se radi?" "Reciklažni centar" @@ -348,7 +339,7 @@ Ako duž cijele ulice nema znakova koji se odnose na istaknuti odjeljak, primjen "Ne mogu prepisati slova sa znaka" - "Nedostaje raspored tipkovnice?" + "Nedostaje li vam raspored tipkovnice?" "Otvori postavke" @@ -406,6 +397,7 @@ U suprotnom možete preuzeti drugu tipkovnicu u trgovini aplikacija. Popularne t "Limete" "Mango" "Muškatni oraščić" + "Palmino ulje" "Masline" "Naranče" "Papaje" @@ -431,17 +423,13 @@ U suprotnom možete preuzeti drugu tipkovnicu u trgovini aplikacija. Popularne t "Je li ovaj dio ceste osvjetljen?" "Koristi detektor pokreta" "Osvjetljeno je i danju i noću" - - - "Ovdje se ne može skenirati. Pokušajte dodatno zumirati ili manje naginjati kartu." + "Ovdje se ne može skenirati. Pokušajte dodatno približiti ili manje naginjati kartu." "Kakav je ovo prijelaz?" "Prijelaz sa semaforima" "Samo zebra, bez semafora" "Prijelaz bez ikakvih oznaka" - - "S" "Poništi" @@ -460,9 +448,7 @@ U suprotnom možete preuzeti drugu tipkovnicu u trgovini aplikacija. Popularne t "Garaže na kat" - - - "Ima li %s toalet ?" + "Ima li %s toalet?" "Koji je materijal ovog energetskog stupa?" @@ -492,8 +478,7 @@ U suprotnom možete preuzeti drugu tipkovnicu u trgovini aplikacija. Popularne t "ne postoji" - - "traka koja se eksplicitno dijeli s ostalim vozilima" + "traka koja se eksplicitno dijeli s ostalim vozilima (sharrow)" "po autobusnoj traci" "nogostup eksplicitno dijeljen zajedno s pješacima" @@ -517,7 +502,6 @@ U suprotnom možete preuzeti drugu tipkovnicu u trgovini aplikacija. Popularne t "Ima li %s veganska jela na jelovniku?" - "Isključivo" "Veganska jela ne sadrže proizvode životinja (bez mesa, ribe, peradi, mliječnih proizvoda, jaja, ...)" "Vegeterijanska jela ne sadrže meso, ribu ni perad." @@ -535,7 +519,7 @@ U suprotnom možete preuzeti drugu tipkovnicu u trgovini aplikacija. Popularne t "Konskripcijski broj" - "orijentacijski broj (neobavezno)" + "Orijentacijski broj (neobavezno)" "Također biciklistička staza s druge strane ..." @@ -551,24 +535,14 @@ U suprotnom možete preuzeti drugu tipkovnicu u trgovini aplikacija. Popularne t "Riječ je o poljoprivrednoj ili šumskoj cesti" "Ništa od navedenog, jednostavno nema naziva" - - "Je li ovaj toalet pristupačan za invalidska kolica?" - - "Je li toalet u %s pristupačan za invalidska kolica?" - - "Ovakav znak za invalidska kolica bi mogao biti vidljiv ako je toalet pristupačan za invalidska kolica. -\"Djelomično\" znači da invalidska kolica mogu ući u toalet, ali da nema rukohvata ili prilagođenog umivaonika." +\"Djelomično\" znači da invalidska kolica mogu ući i koristiti toalet, ali da nema rukohvata ili prilagođenog umivaonika." "Napravi novu bilješku" - - "Dodatno zumirajte za stvaranje bilješke" - - "Ovdje možete ostaviti bilješku kako biste ostale kartografe upozorili o problemu. Prilagodite položaj bilješke pomicanjem karte:" @@ -680,8 +654,6 @@ Na primjer 1,3 ili 2–6." "Je li ovaj put dovršen?" "Je li ova zgrada dovršena?" "Nikad se ne pokazuje u %s" - - "Ima li ovo odmorište toalet?" @@ -706,9 +678,7 @@ Na primjer 1,3 ili 2–6." "Koja je bila inicijalna svrha ove zgrade?" - - - "Molim odaberite precizniju vrijednost." + "Molim, odabirete precizniju vrijednost." "Ima više primjena" "Jednostavno odaberite glavnu svrhu ove zgrade. Npr. ako se u prizemlju nalazi trgovina s apartmanima iznad nje, to je još uvijek uglavnom stambena zgrada." "Još nije dovršena" @@ -816,6 +786,10 @@ Na primjer 1,3 ili 2–6." "Bunker" "Nema kućnog broja..." "Zgrada je označena kao:" + + + + "Je li to točno, i nije li to samo dio zgrade?" "Svetište" "Koje je ograničenje brzine za ovu ulicu?" "Prometni znak" @@ -826,8 +800,6 @@ Na primjer 1,3 ili 2–6." "Nema naznačenog radnog vremena" "Koje je ovdje ograničenje brzine za %s?" "Sportski centar" - - "Toaleti" "Što definira ograničenje brzine?" "Preuzmi" @@ -855,10 +827,15 @@ Na primjer 1,3 ili 2–6." "Zatvorio %1$s, %2$s " + - "<p>Slike koje priložite bilješci prenose se na moj poslužitelj i brišu nekoliko dana nakon što je bilješka riješena. Njihovi se metapodaci uklanjaju prije prijenosa</p>" + "Ponovo otvorio korisnik %1$s, %2$s" + + + "Sakrio korisnik %1$s, %2$s" + "<p>Slike koje priložite bilješci prenose se na moj poslužitelj i brišu nekoliko dana nakon što je bilješka riješena. Njihovi se metapodaci uklanjaju prije prijenosa</p>" "Poništi sve odabire" "uključujući zgrade za restorane, kafiće, ..." "Dalje" @@ -897,8 +874,7 @@ Na primjer 1,3 ili 2–6." "Je li pješacima zabranjeno hodati cestom ovdje?" - - "Ova je ulica označena kao da nema nogostupa niti s jedne strane. U slučaju da ipak postoji nogostup, ali se prikazuje zasebno, molimo odgovorite \"sidewalk\"." + "Ova je ulica označena kao da nema nogostupa niti s jedne strane. U slučaju da ipak postoji nogostup, ali se prikazuje zasebno, molimo odgovorite \"Ima nogostup\"." "O kakvoj je zgradi riječ?" @@ -950,18 +926,12 @@ Na primjer 1,3 ili 2–6." "Ako se razlikuje putem, prvi korak je razdvajanje puta. Nakon toga, na zadatak se može odgovoriti za svaki podijeljeni dio zasebno. Razdvojiti put sada?" - - - "Dodirnite put da ga razdvojite na mjestu gdje se odgovor razlikuje. Pokušajte biti što precizniji, možete zumirati kao i obično." - - - "Molim dodatno zumirajte" + "Dodirnite put da ga razdvojite na mjestu gdje se odgovor razlikuje. Pokušajte biti što precizniji, možete približiti kartu kao i obično." + "Molimo da dodatno približite kartu" "To je poprilično podjela. Uvijek možete kasnije dodatno razdvojiti put." "Kakva je ovdje površina nogostupa?" - - "Je li toalet u %s pristupačan za invalidska kolica?" "Ima li ova tramvajska stanica trake vodilje za slijepe?" "Ima li tramvajska stanica %s trake vodilje za slijepe?" @@ -970,8 +940,6 @@ Razdvojiti put sada?" "Koje je ovdje težinsko ograničenje?" "Ta težina izgleda nerealna. Jeste li sigurni da je ispravna?" "Znak izgleda drugačije ..." - - "Želite li ostaviti bilješku? Bilješka s fotografijom omogućit će ostalim kartografima da se pobrinu za nju." "Naplaćuje li se ulazak u %s?" "Je li ova praonica rublja samoposlužna?" @@ -985,9 +953,7 @@ Razdvojiti put sada?" "Cesta na ilustraciji rotirana je isto kao na karti na mjestu pribadače." "Što se ovdje može ostaviti za recikliranje?" - - - "Ako se ovdje može reciklirati nešto drugo a ne samo ponuđeni odgovori, molimo umjesto toga ostavite bilješku." + "Ako se ovdje može reciklirati nešto drugo a ne samo ponuđeni odgovori, molimo da umjesto toga ostavite bilješku." "Baterije" "Limenke" "Odjeća" @@ -1008,11 +974,7 @@ Razdvojiti put sada?" "Povijest verzija" "Što ima novog?" "Ocijenite ovu aplikaciju" - - "na Trgovina Playu" - - "Donirajte" "Pokažite svoju zahvalnost! ❤️" "Zahvaljujemo što razmišljate o tome da podržite ovu aplikaciju! Da biste vidjeli trenutne donacije kao i sami donirali, dotaknite odgovarajuću platformu:" @@ -1020,7 +982,7 @@ Razdvojiti put sada?" "Umjesto toga pretražuj ovdje" - "Nastavi s trenutnim pretraživanjem" + "Nastavi s trenutnom potragom" "Odvojena mjesta za različite vlasnike / stanare" "O kakvoj se vrsti turističkih informacija radi?" @@ -1068,8 +1030,6 @@ Možete ih početi rješavati odmah, a kasnije se prijaviti da biste objavili sv Konačno, ne zaboravite paziti na sigurnost: budite svjesni svoje okoline i ne ulazite na privatno vlasništvo." "Sretno kartiranje!" "Još nemate postignuća" - - "Još nemate poveznica" "Još niste objavili nijedan odgovor na zadatke" "te %d još neobjavljenih izmjena." @@ -1083,12 +1043,8 @@ Konačno, ne zaboravite paziti na sigurnost: budite svjesni svoje okoline i ne u "Profil" "Dokumentacija" - - - "Otključana veza:" - - - "Otključane veze:" + "Otključana poveznica:" + "Otključane poveznice:" "Uvod" "Naučite više o OSM-u i njegovoj zajednici" "Doprinošenje" @@ -1104,8 +1060,6 @@ Konačno, ne zaboravite paziti na sigurnost: budite svjesni svoje okoline i ne u "Zanimljivosti" - - "Interesantne stvari povezane s kartama koje možete isprobati" "Karta za bicikliste" "Karta za pronalaženje mjesta pristupačnih invalidskim kolicima" @@ -1132,11 +1086,14 @@ Konačno, ne zaboravite paziti na sigurnost: budite svjesni svoje okoline i ne u "Servis i aplikacija za dijeljenje fotografija na razini ulice s mnogim izvorima, s izričitim dopuštenjem da se koriste za doprinos OSM-u" - "Servis i aplikacija za dijeljenje fotografija na razini ulice s mnogim izvorima, s izričitim dopuštenjem da se koriste za doprinos OSM-u" + "Servis i aplikacija za dijeljenje uličnih fotografija mnogih suradnika, s izričitim dopuštenjem da se koriste za doprinos OSM-u" "Navigacija korak po korak za invalidska kolica" + + "Geokoder za OSM podatke, koji koriste mnoge druge usluge" + "Iscrtajte sve ceste u gradu, za tisak na majice, šalice,…" "Generirajte karte grada za ispis u nekoliko jednostavnih koraka, po želji s katalogom ulica" @@ -1147,6 +1104,7 @@ Konačno, ne zaboravite paziti na sigurnost: budite svjesni svoje okoline i ne u "Najbrži navigacijski servis" + "Navigacija za razna vozila i pješake, svako sa svojim preferencijama. Može pokazati i izokrone (područja dostupna za X minuta od početne točke)." "Korištenje OSM podataka za generiranje haikua (vrsta japanske poezije)" "Karta koja prikazuje električnu, telekomunikacijsku, plinsku i naftnu infrastrukturu" @@ -1154,18 +1112,17 @@ Konačno, ne zaboravite paziti na sigurnost: budite svjesni svoje okoline i ne u "Kreirajte i ispišite karte za orijentacijske sportove" "Karta za pregledavanje značajki karte OpenStreetMap po kategorijama" "Tjedne vijesti o događanjima u svijetu OpenStreetMapa" + + + "Stvorite plakete pojednostavljenog plana grada ili četvrti" "Prvi zadatak riješen" "Dobrodošli u OpenStreetMap zajednicu! Na svom profilnom ekranu možete vidjeti više informacija za svaku od riješenih vrsta zadatka." "Geodet" - - "Riješili ste %d zadataka! Nastavite tako da otključate još dostignuća koja sadrže poveznice do OSM-a i drugih aplikacija i projekata povezanih s kartama!" "Stalna mušterija" - - - "Doprinjeli ste OSM-u %d dana koristeći ovu aplikaciju! Redoviti suradnici su kamen temeljac OSM-a, hvala na vašoj predanosti! ❤" + "Doprinjeli ste OSM-u %d dana koristeći ovu aplikaciju! Redoviti suradnici su kamen temeljac OSM-a, hvala vam na vašoj predanosti! ❤" "Biciklist" "Riješili ste %d zadataka koji pomažu biciklistima!" "Mobilnost" @@ -1188,8 +1145,6 @@ Imajte na umu da ova aplikacija pita za kućni broj zgrade tek nakon što se utv "Otvori dolaznu poštu" - - "O programu" @@ -1209,8 +1164,6 @@ Imajte na umu da ova aplikacija pita za kućni broj zgrade tek nakon što se utv "Glavni suradnici" "Vaša se statistika još uvijek sinkronizira. Provjerite ovaj ekran kasnije." "Rang u %2$s: %1$d" - - "Kartografski portal %s" "po zemljama" "po vrsti zadatka" @@ -1231,6 +1184,9 @@ Imajte na umu da ova aplikacija pita za kućni broj zgrade tek nakon što se utv "Jestivo ulje" "Motorno ulje" + + "Nezavisno proširenje Nominatima, koje sadrži pretraživanje po nepotpunim uvjetima i pretraživanje dok tipkate" + "Prilagodljiv servis za navigaciju" "Karta sa pretraživanjem i navigacijom" @@ -1253,9 +1209,7 @@ Imajte na umu da ova aplikacija pita za kućni broj zgrade tek nakon što se utv "Višestruke površine..." - - - "Jeste li sigurni da je nemoguće odrediti površinu? Obratite pažnju na opciju odgovora \"Razlikuje se putem\" koja vam omogućuje da označite mjesto na kojem se površina mijenja. Molimo koristite \"Ne mogu reći\" ako postoji jedna površina, ali ona nije dostupna kao odgovor." + "Jeste li sigurni da je nemoguće odrediti površinu? Obratite pažnju na odgovor \"Razlikuje se putem\" koji vam omogućuje da označite mjesto na kojem se površina mijenja. Molimo da koristite \"Ne mogu reći\" ako postoji jedna površina, ali ona nije dostupna kao odgovor." "Molimo ukratko opišite vrstu površine ovdje, na primjer \"pjeskovita s kaldrmom mjestimice\". Duljina teksta ograničena je na 255 znakova." @@ -1272,11 +1226,7 @@ Imajte na umu da ova aplikacija pita za kućni broj zgrade tek nakon što se utv "Cesta na ilustraciji rotirana je isto kao na karti na mjestu pribadače. Obratite pažnju na naznačeni smjer." "ime kuće %s:" - - "konskripcijski broj %1$s, orijentacijski broj %2$s:" - - "konskripcijski broj %s:" "kućni broj %s:" "Koje je radno vrijeme za %1$s (%2$s)?" @@ -1290,7 +1240,7 @@ Imajte na umu da ova aplikacija pita za kućni broj zgrade tek nakon što se utv "Nije navedeno" - "Je li ova situacija s biciklističkom stazom još uvijek aktualna?" + "Je li ova situacija s biciklističkom stazom još uvijek ovakva?" "Je li %1$s (%2$s) pristupačan za invalidska kolica?" @@ -1299,8 +1249,6 @@ Imajte na umu da ova aplikacija pita za kućni broj zgrade tek nakon što se utv "Uobičajeno" "Pitaj češće" "Dotaknite za odabir" - - "Prihvaća li %1$s (%2$s) plaćanje gotovinom?" "Postoji li klupa na tramvajskom stajalištu %s?" "Ima li ova tramvajska stanica klupu?" @@ -1367,17 +1315,14 @@ Imajte na umu da ova aplikacija pita za kućni broj zgrade tek nakon što se utv "Tko je operater ove stanice za punjenje?" + "Otkrijte karte unutrašnjosti trgovačkih centara, željezničkih stanica itd." "Znatiželjni ste kakav smo napredak postigli tijekom godina? Usporedite kako je karta izgledala prije više od 10 godina!" "Potraga za blagom" "Pronašli ste i riješili %d zadataka koji se zaista rijetko dovršavaju, čestitamo!" "Građanin" "Riješili ste %d zadataka korisnih za svakodnevni život u gradu!" - - "Pod vedrim nebom" - - - "Riješili ste %d zadataka korisnih za ljude pod vedrim nebom!" + "Riješili ste %d zadataka korisnih za ljude koji borave u prirodi!" "Ima li ovaj pješački prijelaz otok?" @@ -1393,8 +1338,6 @@ Imajte na umu da ova aplikacija pita za kućni broj zgrade tek nakon što se utv "nije zaseban" "Automatski šalji odgovore" "Opišite površinu" - - "Otvori poveznicu" "Silos" @@ -1410,7 +1353,5 @@ Imajte na umu da ova aplikacija pita za kućni broj zgrade tek nakon što se utv "Koliko se automobila može istovremeno puniti na ovoj stanici za punjenje?" - - "Karta koja prikazuje nedavne prirodne katastrofe, zanimljiva za kartografe humanitarnih organizacija. Također, prikazuje mnoštvo zanimljivih statističkih podataka za analizu koliko su dobro kartirana i ažurirana mjesta." \ No newline at end of file diff --git a/app/src/main/res/values-hr/translation_info.xml b/app/src/main/res/values-hr/translation_info.xml index 5b0ce213bb..c46e86f95e 100644 --- a/app/src/main/res/values-hr/translation_info.xml +++ b/app/src/main/res/values-hr/translation_info.xml @@ -1,4 +1,4 @@ - 97 + 98 diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml index a7d9abf65c..b2e074ee07 100644 --- a/app/src/main/res/values-it/strings.xml +++ b/app/src/main/res/values-it/strings.xml @@ -2359,22 +2359,28 @@ riconoscimento" "Scopri mappe degli interni di ipermercati, stazioni, ..." "Vuoi scoprire come siamo cambiati nel tempo? Confronta l'aspetto che aveva la mappa oltre 10 anni fa!" "Caccia al tesoro" - "Hai trovato e risolto %d missioni che sono completate molto raramente. Super!" + "Hai trovato e risolto %d missioni che sono completate molto raramente, congratulazioni!" "Cittadino/a" "Hai svolto %d missioni che sono utili per la vita di tutti i giorni in città!" "All'aria aperta" "Hai svolto %d missioni utili per chi ama stare all'aria aperta!" "Questo attraversamento pedonale ha un'isola di traffico?" "Non c'è alcun cartello" - "La rampa per la sedia a rotelle è visualizzata sulla mappa come una via alternativa?" - "è alternativa" - "non è alternativa" + "La rampa per la sedia a rotelle è visualizzata sulla mappa come una via separata?" + "separata" + "non separata" + "Carica risposte automaticamente" + "Descrivi la superficie" "Apri URL" "Silo" "Storico" + + "costruzione di valore storico che non assolve ad alcuna funzione civica, religiosa o commerciale" "Abbandonato" "Costruzione inutilizzato la cui funzione o scopo originale è sconosciuto" "Rovine" "Rovine" + "Quante automobili possono essere ricaricate contemporaneamente a questa colonnina?" + "Mappe che mostrano disastri naturali recenti, interessanti per i mappatori umanitari. Inoltre, mostrano molte statistiche interessanti per analizzare quanto i luoghi sono ben mappati o aggiornati." \ No newline at end of file diff --git a/app/src/main/res/values-it/translation_info.xml b/app/src/main/res/values-it/translation_info.xml index 3ddf070ea2..1953c600c1 100644 --- a/app/src/main/res/values-it/translation_info.xml +++ b/app/src/main/res/values-it/translation_info.xml @@ -1,4 +1,4 @@ - 99 + 100 diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml index cb8537facb..21fe889ef6 100644 --- a/app/src/main/res/values-nl/strings.xml +++ b/app/src/main/res/values-nl/strings.xml @@ -2369,6 +2369,8 @@ Let op dat deze app alleen naar het huisnummer van een gebouw vraagt nadat zijn "Open URL" "Silo" "Monumentaal" + + "Een monumentaal gebouw die niet een woon-, religieuze- of commerciële functie heeft" "Verlaten" "ongebruikt gebouw waarvan de oorspronkelijke functie of bestemming onbekend is" diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml index 1215092818..49df1d8e97 100644 --- a/app/src/main/res/values-pl/strings.xml +++ b/app/src/main/res/values-pl/strings.xml @@ -2345,4 +2345,20 @@ Pamiętaj, że ta aplikacja pyta o numer budynku tylko po tym, jak zostanie okre "Na zewnątrz" "Rozwiązałeś %d zadań przydatnych ludziom na zewnątrz!" "Czy te przejście dla pieszych ma wysepkę?" + "Nie ma tabliczki z nazwą" + "Czy rampa dla wóżków inwalidzkich jest wyświetlana jako osobna linia na mapie?" + "osobno" + "nie jest pokazana osobno" + "Automatycznie wysyłaj zmiany" + "Opisz nawierzchnię" + "Otwórz link" + "Silos" + "Historyczny" + "budynek historyczny zbudowany z nieznanego lub niepewnego powodu" + "Opuszczony" + "Opuszczony budynek, niejasne jest w jakim celu powstał" + "Ruiny" + "Ruiny budynku którego stan nie pozwala na ustalenie jego przeznaczenia" + "Ile samochodów elektrycznych może się tu równocześnie ładować?" + "Mapa pokazująca niedawne klęski żywiołowe, interesujące dla osób wspomagających pomoc humanitarną przez tworzenie map. Pokazuje też statystyki jak wiele jest zmapowane w danym miejscu i jak bardzo aktualne są dane OSM. " \ No newline at end of file diff --git a/app/src/main/res/values-pl/translation_info.xml b/app/src/main/res/values-pl/translation_info.xml index c46e86f95e..1953c600c1 100644 --- a/app/src/main/res/values-pl/translation_info.xml +++ b/app/src/main/res/values-pl/translation_info.xml @@ -1,4 +1,4 @@ - 98 + 100 diff --git a/app/src/main/res/values-pt-rBR/strings.xml b/app/src/main/res/values-pt-rBR/strings.xml index 57ace89d4b..b75dfdb604 100644 --- a/app/src/main/res/values-pt-rBR/strings.xml +++ b/app/src/main/res/values-pt-rBR/strings.xml @@ -2137,4 +2137,18 @@ Observe que este aplicativo solicita o número da casa de uma construção somen "A rampa para cadeiras de rodas é exibida como uma maneira separada no mapa?" "separado" "não separado" + "Carregar respostas automaticamente" + "Descreva a superfície" + "Abrir URL" + "Silo" + "Histórico" + + + "edifício de valor histórico que não desempenha funções cívicas, religiosas ou comerciais" + "Abandoned" + "edifício não utilizado, cuja função ou propósito original é desconhecido" + "Ruínas" + "edifício abandonado, em ruínas e não identificável" + "Quantos carros podem ser carregados nesta estação de carregamento ao mesmo tempo?" + "Mapa que mostra desastres naturais recentes, interessante para mapeadores humanitários. Além disso, mostra muitas estatísticas interessantes para analisar como os lugares estão bem mapeados e atualizados." \ No newline at end of file diff --git a/app/src/main/res/values-pt-rBR/translation_info.xml b/app/src/main/res/values-pt-rBR/translation_info.xml index c46e86f95e..1953c600c1 100644 --- a/app/src/main/res/values-pt-rBR/translation_info.xml +++ b/app/src/main/res/values-pt-rBR/translation_info.xml @@ -1,4 +1,4 @@ - 98 + 100 diff --git a/res/country_metadata/atmOperators.yml b/res/country_metadata/atmOperators.yml index 8de17f1b7c..fd6dbcb351 100644 --- a/res/country_metadata/atmOperators.yml +++ b/res/country_metadata/atmOperators.yml @@ -88,7 +88,7 @@ AO: - Banco BIC Angola # 2 AR: - Banco Macro # 138 - - Banco de la Nación Argentina # 59 + - Banco de la Nación Argentina # 58 - Banco Nación # 50 - Macro # 43 - Banco Provincia # 39 @@ -99,10 +99,10 @@ AR: - Galicia # 20 - Banco Galicia # 20 - Santander # 18 + - Banco San Juan # 18 - Banco Ciudad # 18 - NUEVO BANCO DE SANTA FE S.A. # 17 - HSBC # 17 - - Banco San Juan # 17 - Banco de Corrientes # 15 - Banco Credicoop # 14 - Nuevo Banco del Chaco # 13 @@ -113,11 +113,11 @@ AR: - Nuevo Banco de Entre Ríos S.A. # 9 - ICBC # 9 - Supervielle # 8 - - Banco del Chubut # 8 - Banco Santiago del Estero # 8 - Banco Provincia de Buenos Aires # 8 - Banco Hipotecario # 8 - CABAL COOP. LTDA. # 7 + - Banco del Chubut # 7 - Banco Supervielle # 7 - BBVA # 7 - Patagonia Cajero # 6 @@ -157,6 +157,7 @@ AR: - Hipotecario # 2 - Galicia Cajero # 2 - Credicoop Cajero # 2 + - Chubut # 2 - Cajero Macro # 2 - Bancor # 2 - Banco del Chubut S.A. # 2 @@ -181,7 +182,7 @@ AR: - BBVA Banco Francés # 2 AT: - Raiffeisen # 72 - - Raiffeisenbank # 65 + - Raiffeisenbank # 66 - Volksbank # 40 - Sparkasse # 31 - Erste Bank # 21 @@ -306,7 +307,7 @@ AU-VIC: - ANZ # 41 - NAB # 31 - Westpac # 23 - - Bendigo Bank # 19 + - Bendigo Bank # 18 - Bank of Melbourne # 12 - CBA # 6 - HSBC # 4 @@ -349,8 +350,8 @@ AZ: - YuniBank # 22 - Bank Standart # 21 - Texnikabank # 18 - - Ata Bank # 16 - Bank Respublika # 15 + - Ata Bank # 15 - Xalq Bank # 13 - Dəmirbank # 13 - Bankomat # 13 @@ -682,7 +683,7 @@ BO: BR: - Banco do Brasil # 105 - Banco 24 Horas # 98 - - Banco24Horas # 79 + - Banco24Horas # 80 - Bradesco # 73 - Caixa # 36 - Itaú # 34 @@ -698,8 +699,8 @@ BR: - Banco 24h # 12 - Banco 24Horas # 11 - Banco do Brasil S.A. # 10 + - Saque e Pague # 9 - banco24horas # 8 - - Saque e Pague # 7 - Multibanco # 7 - HSBC # 7 - 24 horas # 6 @@ -742,17 +743,17 @@ BW: - Fnb # 2 - FNB ATM # 2 BY: - - Беларусбанк # 510 - - Банк БелВЭБ # 256 + - Беларусбанк # 511 + - Банк БелВЭБ # 261 - Белинвестбанк # 201 - Приорбанк # 177 - Белагропромбанк # 177 - - БПС-Сбербанк # 167 + - БПС-Сбербанк # 168 - Белгазпромбанк # 54 - Банк Дабрабыт # 51 + - БНБ-Банк # 31 - ОАО «Белагропромбанк» # 28 - Альфа-Банк # 25 - - БНБ-Банк # 24 - Паритетбанк # 21 - ОАО «Белгазпромбанк» # 20 - Белвнешэкономбанк # 18 @@ -767,19 +768,18 @@ BY: - АСБ Беларусбанк # 8 - Франсабанк # 7 - ОАО «АСБ Беларусбанк» # 7 + - МТБанк # 7 - БеларусБанк # 7 - '"ОАО ""БПС-СБЕРБАНК"""' # 7 - '"АСБ ""Беларусбанк"""' # 7 - ОАО «БПС-Сбербанк» # 6 - - МТБанк # 6 + - ЗАО РРБ-Банк # 6 - Бпс-сбербанк # 6 - - БелВэб # 6 - БСБ Банк # 6 - БПС # 6 - беларусбанк # 5 - ОАО «Белинвестбанк» # 5 - БПС-сбербанк # 5 - - БНБ # 5 - Альфабанк # 5 - Belinvestbank # 5 - '"ОАО ""Белагропромбанк"""' # 5 @@ -901,9 +901,9 @@ CH: - Credit Suisse # 69 - UBS # 67 - Zürcher Kantonalbank # 63 - - Raiffeisenbank # 46 + - Raiffeisenbank # 47 - ZKB # 37 - - BCV # 32 + - BCV # 33 - Post # 31 - Bank Cler # 31 - Migros Bank # 26 @@ -1140,7 +1140,7 @@ CO: - BBVA # 44 - A Toda Hora S.A. (Red Aval) # 25 - ATH # 24 - - Banco de Bogota # 17 + - Banco de Bogota # 16 - Colpatria # 12 - Banco de Bogotá # 12 - Grupo Aval # 11 @@ -1232,7 +1232,7 @@ CZ: - ČSOB # 284 - Komerční banka # 238 - Pharro # 201 - - Euronet # 76 + - Euronet # 78 - Česká Spořitelna # 66 - Raiffeisenbank # 41 - Air Bank # 40 @@ -1286,15 +1286,15 @@ DE: - Sparkasse # 774 - Postbank # 657 - Euronet # 408 - - Volksbank # 318 + - Volksbank # 319 - Deutsche Bank # 206 - - ING-DiBa # 118 - - Commerzbank # 118 + - Commerzbank # 120 + - ING-DiBa # 119 - Berliner Sparkasse # 89 - - Raiffeisenbank # 84 + - Raiffeisenbank # 83 - Berliner Volksbank # 80 - Sparkasse Aachen # 71 - - Bankhaus August Lenz # 68 + - Bankhaus August Lenz # 69 - ING DiBa # 66 - Sparda-Bank # 62 - Hamburger Sparkasse # 55 @@ -1306,18 +1306,18 @@ DE: - Sparkasse Marburg-Biedenkopf # 46 - Sparkasse Bremen # 46 - Kreissparkasse # 44 + - ING # 43 - HypoVereinsbank # 43 - - VR-Bank # 41 - - ING # 41 + - VR-Bank # 42 - Sparkasse Göttingen # 40 - Sparda-Bank West eG # 40 - ReiseBank # 39 - Hamburger Volksbank eG # 36 - Volksbank Mittelhessen # 32 - - Kreissparkasse München Starnberg Ebersberg # 31 - Deutsche Postbank AG # 31 - BBBank eG # 31 - Sparkasse Karlsruhe # 30 + - Kreissparkasse München Starnberg Ebersberg # 30 - VR Bank # 28 - Sparda Bank # 28 - Sparkasse Heidelberg # 27 @@ -1356,6 +1356,7 @@ DE: - Stadt-Sparkasse Solingen # 16 - Sparkasse Mainz # 16 - Sparkasse Hanau # 16 + - Sparkasse Bühl # 16 - Ostsächsische Sparkasse Dresden # 16 - Nord-Ostsee Sparkasse # 16 - Cardpoint GmbH # 16 @@ -1369,7 +1370,6 @@ DE: - Taunus Sparkasse # 14 - Sparkasse Westholstein # 14 - Sparkasse Saarbrücken # 14 - - Sparkasse Mittelthüringen # 14 - Sparkasse LeerWittmund # 14 - Mainzer Volksbank # 14 - Kasseler Sparkasse # 14 @@ -1378,6 +1378,7 @@ DE: - Sparkasse Witten # 13 - Sparkasse Vorpommern # 13 - Sparkasse Nürnberg # 13 + - Sparkasse Mittelthüringen # 13 - Sparkasse Gießen # 13 - Postbank AG # 13 - Münchner Bank # 13 @@ -1488,9 +1489,9 @@ EC: - Produbanco # 12 - Banco del Pichincha # 12 - Banred # 10 + - Cooperativa Policía Nacional # 8 - Banco del Pacifico # 8 - BanRed # 8 - - Cooperativa Policía Nacional # 7 - Cooperativa Jep # 7 - Pichincha # 6 - jardín azuayo # 5 @@ -1554,8 +1555,8 @@ ES: - Banco Popular # 36 - CaixaBank # 35 - Euronet # 24 + - Sabadell # 23 - Kutxabank # 23 - - Sabadell # 22 - Caja Rural # 22 - Banca March # 22 - Unicaja # 20 @@ -1565,9 +1566,9 @@ ES: - Banco Sabadell # 18 - Liberbank # 17 - Abanca # 17 - - Deutsche Bank # 13 - ABANCA # 13 - Euro 6000 # 12 + - Deutsche Bank # 12 - Caixabank # 12 - Servired # 11 - Popular # 11 @@ -1707,13 +1708,13 @@ FO: - Bank Nordik # 2 FX: - La Banque Postale # 865 - - Crédit Agricole # 684 + - Crédit Agricole # 686 - Société Générale # 401 - Caisse d'Épargne # 323 - - LCL # 300 + - LCL # 301 - Crédit Mutuel # 290 - BNP Paribas # 288 - - CIC # 249 + - CIC # 250 - Banque Populaire # 192 - La Poste # 98 - Caisse d'Epargne # 56 @@ -1756,39 +1757,39 @@ GA: - BICIG # 2 - BGFI bank # 2 GB: - - RBS # 201 + - RBS # 202 - Barclays Bank PLC # 184 - HSBC # 172 - - NatWest # 161 + - NatWest # 162 - Tesco # 159 - Barclays # 149 - - Santander # 132 - - Cash Zone # 128 + - Santander # 133 + - Cash Zone # 129 - Royal Bank of Scotland # 120 - Sainsbury's Bank # 110 - - Lloyds Bank # 106 + - Lloyds Bank # 108 - Natwest # 103 - Sainsbury's # 102 - Post Office # 99 - Halifax # 96 - - Nationwide # 91 + - Nationwide # 92 - Note Machine # 68 - Link # 64 - - Bank of Ireland # 63 + - Bank of Ireland # 64 - Cashzone # 61 - Lloyds # 60 - TSB # 51 - Lloyds TSB # 48 - - Yorkshire Bank # 46 + - Yorkshire Bank # 47 - Clydesdale Bank # 46 - Bank of Scotland # 40 - Ulster Bank # 39 - - Tesco Bank # 34 + - Tesco Bank # 36 - Danske Bank # 30 - Sainsburys # 29 - Co-operative Bank # 29 - Co-op # 29 - - NoteMachine # 27 + - NoteMachine # 28 - Bank Machine # 26 - CashZone # 25 - The Co-operative Bank # 23 @@ -2708,7 +2709,7 @@ IN-PY: - ICICI # 2 - Canara Bank ATM # 2 IN-RJ: - - SBI # 14 + - SBI # 15 - State Bank of India # 8 - Bank of Baroda # 7 - sbi # 5 @@ -2716,6 +2717,7 @@ IN-RJ: - Punjab National Bank # 4 - HDFC Bank # 4 - ICICI Bank # 3 + - bank of india # 2 - Union Bank # 2 - UCO Bank # 2 - State Bank Of India # 2 @@ -2895,7 +2897,7 @@ IQ: - اسامة # 2 - QASRE # 2 IR: - - بانک ملی # 102 + - بانک ملی # 103 - بانک ملت # 82 - بانک صادرات # 71 - بانک شهر # 62 @@ -2918,9 +2920,9 @@ IR: - بانک اقتصاد نوین # 15 - بانک پارسیان # 14 - بانک سینا # 13 + - بانک رفاه کارگران # 13 - بانک آینده # 13 - خودپرداز بانک شهر # 12 - - بانک رفاه کارگران # 12 - خودپرداز # 11 - ملی # 10 - خودپرداز بانک کشاورزی # 10 @@ -3000,10 +3002,10 @@ IS: - Landsbanki Íslands # 2 - Landsbanki # 2 IT: - - Poste Italiane # 361 + - Poste Italiane # 365 - Unicredit # 82 - - Intesa Sanpaolo # 48 - - Monte dei Paschi di Siena # 41 + - Intesa Sanpaolo # 47 + - Monte dei Paschi di Siena # 42 - Postamat # 29 - Poste # 26 - Intesa San Paolo # 26 @@ -3081,7 +3083,9 @@ IT: - Banca Popolare di Verona # 4 - Banca Popolare del Lazio # 4 - BCC di Carate Brianza # 4 + - unicredit # 3 - poste italiane # 3 + - Ubi Banca # 3 - San Paolo # 3 - Euronet Worldwide # 3 - Coinwave Srl # 3 @@ -3098,11 +3102,9 @@ IT: - Banca Intesa Sanpaolo # 3 - Banca Etruria # 3 - Banca Apulia S.p.a. # 3 - - unicredit # 2 - Veneto Banca # 2 - Unicredito Italiano S.p.A. # 2 - Unicredit S.p.a. # 2 - - Ubi Banca # 2 - UBI banca # 2 - UBI Banca Popolare # 2 - Südtiroler Sparkasse - Cassa di Risparmio di Bolzano # 2 @@ -3188,13 +3190,13 @@ JP: - 三井住友銀行 # 71 - セブン銀行 # 71 - 三菱東京UFJ銀行 # 57 - - 三菱UFJ銀行 # 54 + - 三菱UFJ銀行 # 56 - りそな銀行 # 49 - イオン銀行 # 48 - 七十七銀行 # 40 - 横浜銀行 # 34 - 秋田銀行 # 29 - - 京都銀行 # 21 + - 京都銀行 # 22 - 北都銀行 # 20 - 埼玉りそな銀行 # 19 - プロミス # 19 @@ -3222,13 +3224,13 @@ JP: - みちのく銀行 # 7 - きのくに信用金庫 # 7 - JAバンク # 7 + - 池田泉州銀行 # 6 - 徳島銀行 # 6 - 岩手銀行 # 6 - 但馬銀行 # 6 - Seven Bank # 6 - 青森銀行 # 5 - 福岡銀行 # 5 - - 池田泉州銀行 # 5 - 京都信用金庫 # 5 - 七十七銀行/77Bank # 5 - きらやか銀行 # 5 @@ -3609,14 +3611,14 @@ MA: - banque populaire # 2 - BMCE BANK # 2 MD: - - Victoriabank # 33 + - Victoriabank # 34 - Moldindconbank # 29 - Агропромбанк # 25 - Moldova Agroindbank # 18 - - Mobiasbanca # 16 + - Mobiasbanca # 17 - Eximbank # 14 - ЗАО «Агропромбанк» # 11 - - Moldincombank # 8 + - Moldincombank # 9 - FinComBank # 7 - BCR # 6 - Сбербанк # 4 @@ -3868,9 +3870,9 @@ NI: NL: - ING # 346 - Rabobank # 273 - - ABN AMRO # 168 - - ABN Amro # 56 - - Geldmaat # 53 + - ABN AMRO # 167 + - ABN Amro # 55 + - Geldmaat # 54 - ABN-AMRO # 34 - ING Bank # 32 - SNS # 27 @@ -4106,7 +4108,7 @@ NZ: - ANZ # 136 - Westpac # 107 - ASB # 52 - - Bank of New Zealand # 44 + - Bank of New Zealand # 45 - Kiwibank # 35 - BNZ # 32 - ASB Bank # 32 @@ -4283,7 +4285,7 @@ PK: - Askari bank # 2 - Allied bank # 2 PL: - - Euronet # 2709 + - Euronet # 2712 - PKO BP # 529 - Bank Millennium S.A. # 217 - Planet Cash # 195 @@ -4300,7 +4302,7 @@ PL: - Pekao S.A. # 37 - Grupa BPS # 36 - BPS # 31 - - Bank Pekao # 29 + - Bank Pekao # 30 - PKO BP SA # 26 - Cash4You # 26 - BZWBK # 26 @@ -4427,7 +4429,7 @@ RE: - Bred # 2 RO: - BCR # 95 - - BRD # 87 + - BRD # 88 - Banca Transilvania # 64 - Raiffeisen Bank # 54 - Raiffeisen # 42 @@ -4502,13 +4504,13 @@ RS-KM: - Pcb # 2 - NLB # 2 RU: - - Сбербанк # 3374 + - Сбербанк # 3380 - Промсвязьбанк # 1561 - - '"ПАО ""Сбербанк"""' # 1299 - - Сбербанк России # 902 + - '"ПАО ""Сбербанк"""' # 1301 + - Сбербанк России # 901 - ПАО Сбербанк # 778 - Газпромбанк # 601 - - ВТБ # 456 + - ВТБ # 457 - Альфа-Банк # 456 - Санкт-Петербург # 338 - ВТБ24 # 326 @@ -4532,7 +4534,7 @@ RU: - Санкт Петербург # 85 - Почта Банк # 82 - Челябинвестбанк # 81 - - '"ПАО ""МИнБанк"""' # 80 + - '"ПАО ""МИнБанк"""' # 79 - '"Банк ""Уралсиб"""' # 77 - КУБ # 76 - Терминал QIWI # 74 @@ -4543,7 +4545,7 @@ RU: - ПАО «МИнБанк» # 69 - ПриватБанк # 65 - Петрокоммерц # 65 - - Открытие # 63 + - Открытие # 64 - Екатеринбургский муниципальный банк # 63 - СКБ-Банк # 62 - Запсибкомбанк # 56 @@ -4592,13 +4594,13 @@ RU: - Банк Зенит # 20 - Аккобанк # 20 - Траст # 19 + - Тинькофф Банк # 19 - РайффайзенБанк # 19 - ПАО «Банк Уралсиб» # 19 - ОАО «МДМ Банк» # 19 - '"Банк ""Отрытие"""' # 19 - ЮниКредит # 18 - Транскредитбанк # 18 - - Тинькофф Банк # 18 - Севергазбанк # 18 - Кузнецкбизнесбанк # 18 - БинБанк # 18 @@ -4703,7 +4705,7 @@ SE: - Nordea # 54 - SEB # 39 - Bankomat # 38 - - Handelsbanken # 33 + - Handelsbanken # 34 - Kontanten # 20 - Länsförsäkringar # 8 - ICA Banken # 7 @@ -4906,20 +4908,20 @@ TN: - STB # 2 - Banque de Tunisie # 2 TR: - - Akbank # 79 - - İş Bankası # 77 + - İş Bankası # 78 + - Akbank # 78 - Ziraat Bankası # 66 - Garanti Bankası # 38 - - DenizBank # 37 - - Halkbank # 36 + - Halkbank # 37 + - DenizBank # 36 - Vakıfbank # 35 - - TEB # 33 + - TEB # 34 - Denizbank # 33 - ING Bank # 26 - Akbank ATM # 24 - - Garanti # 22 + - Garanti # 23 + - Yapı Kredi # 22 - İş Bankası ATM # 21 - - Yapı Kredi # 21 - Türkiye İş Bankası # 20 - QNB Finansbank # 20 - Deniz Bank # 20 @@ -4930,9 +4932,9 @@ TR: - Vakıfbank ATM # 14 - PTT # 13 - VakıfBank # 12 + - Ziraat Bankasi # 10 - Halkbank ATM # 10 - Govermental # 10 - - Ziraat Bankasi # 9 - Garanti Bankası ATM # 9 - Denizbank ATM # 8 - Bankamatik # 8 @@ -4949,11 +4951,11 @@ TR: - Ziraat Bank # 5 - YapıKredi # 5 - YapiKredi # 5 + - Yapi Kredi # 5 - Ing Bank # 5 - ING # 5 - Garanti BBVA ATM # 5 - Zıraat Bankası # 4 - - Yapi Kredi # 4 - YAPI KREDİ # 4 - Türkiye İş Bankası A.Ş. # 4 - Türkiye Finans # 4 @@ -5084,10 +5086,10 @@ TZ: - Exim Bank # 2 - Barclays Bank # 2 UA: - - ПриватБанк # 1553 - - Альфа-Банк # 728 + - ПриватБанк # 1556 + - Альфа-Банк # 701 - Ощадбанк # 309 - - Приватбанк # 274 + - Приватбанк # 273 - Райффайзен Банк Аваль # 249 - УкрСиббанк # 108 - Укрсиббанк # 71 @@ -5095,8 +5097,8 @@ UA: - Аваль # 52 - Укрексімбанк # 51 - Укргазбанк # 47 - - Кредобанк # 45 - - Укрсоцбанк # 33 + - Кредобанк # 44 + - Укрсоцбанк # 32 - Privatbank # 32 - Приват Банк # 28 - ОщадБанк # 23 @@ -5122,7 +5124,6 @@ UA: - Приват # 7 - Полтава-Банк # 7 - Банк Хрещатик # 7 - - Банк Форум # 7 - Банк Південний # 7 - партнер Укрсиббанку # 6 - Сбербанк России # 6 @@ -5130,6 +5131,7 @@ UA: - Мегабанк # 6 - Експрес-Банк # 6 - Брокбізнесбанк # 6 + - Банк Форум # 6 - Universal Bank # 6 - KredoBank # 6 - Crédit Agricole # 6 @@ -5155,7 +5157,7 @@ UA-40: - Банк ЧБРР # 2 UA-43: - Генбанк # 354 - - РНКБ # 290 + - РНКБ # 289 - АБ Россия # 31 - Севастопольский Морской Банк # 17 - Крайинвестбанк # 16 @@ -5580,11 +5582,11 @@ US-OH: - Chase # 10 - US Bank # 6 - KeyBank # 4 + - Citizens Bank # 4 - Athena Bitcoin Inc. # 4 - U.S. Bank # 3 - The Huntington National Bank # 3 - Key Bank # 3 - - Citizens Bank # 3 - Chase Bank # 3 - Charter One # 3 - US Bank ATM # 2 diff --git a/res/country_metadata/chargingStationOperators.yml b/res/country_metadata/chargingStationOperators.yml index daeedcd1e7..dfe03744da 100644 --- a/res/country_metadata/chargingStationOperators.yml +++ b/res/country_metadata/chargingStationOperators.yml @@ -62,6 +62,7 @@ AT: - Gigasport # 3 - Gemeinde Podersdorf # 3 - EnergieAG # 3 + - Energie Graz GmbH & Co KG # 3 - Energie Burgenland AG # 3 - ÖBB # 2 - vlotte # 2 @@ -94,7 +95,6 @@ AT: - Gemeinde Kirchdorf in Tirol # 2 - Gemeinde Eben # 2 - Energie Steiermark AG # 2 - - Energie Graz GmbH & Co KG # 2 - ElectroDrive # 2 - ELLA # 2 - Direkt Holidays GmbH # 2 @@ -141,10 +141,10 @@ BE: - allego # 9 - Smoov Allego # 8 - Luminus # 8 + - PitPoint # 5 - The Plugin Company # 4 - Tesla # 4 - Smoov # 4 - - PitPoint # 4 - Colruyt # 4 - Bluecorner # 4 - smoov allego # 3 @@ -223,8 +223,8 @@ CA-QC: - Flo # 11 - Le Circuit électrique # 10 - Circuit Electrique # 9 + - Hydro-Québec # 6 - Circuit électrique # 6 - - Hydro-Québec # 5 - Hydro-Quebec # 4 - Le circuit électrique # 3 - Le Circuite Électrique # 3 @@ -356,23 +356,24 @@ CZ: - Tesla # 4 - ČEZ (CCS/CHAdeMO and Mennekes type2) # 3 - evmapa.cz # 3 - - MOL (CCS/CHAdeMO/Mennekes) # 3 - CCS/CHAdeMO and Mennekes type2 # 3 - ČEZ (CCS/CHAdeMO/Mennekes) # 2 - ČEZ (CCS/CHAdeMO/Menneke type2) # 2 - VŠB # 2 - TS Opava # 2 - Město Dačice # 2 + - MOL (CCS/CHAdeMO/Mennekes) # 2 + - MOL # 2 - Kaufland # 2 - InChaNet # 2 - EVmapa (Mennekes type 2) # 2 DE: - Stromnetz Hamburg # 503 - Stadtwerke München # 377 - - EnBW # 348 + - EnBW # 349 - innogy # 195 - RWE # 156 - - Allego # 110 + - Allego # 111 - allego # 85 - RWE-Effizienz # 79 - Innogy # 75 @@ -385,12 +386,12 @@ DE: - EnBW Energie Baden-Württemberg AG # 46 - be emobil # 45 - NEW # 45 + - Lidl # 45 - Kaufland # 45 - - Lidl # 44 - Tank & Rast # 40 + - SWM # 33 - Vattenfall # 32 - Stadtwerke Augsburg # 32 - - SWM # 32 - Lechwerke AG # 32 - Ionity # 32 - Energie- und Wasserversorgung Bonn/Rhein-Sieg GmbH # 32 @@ -398,17 +399,17 @@ DE: - E.ON # 31 - Tesla Motors # 30 - FairEnergie GmbH # 30 + - innogy SE # 29 - ENSO Energie Sachsen Ost AG # 29 - DREWAG - Stadtwerke Dresden GmbH # 29 - Aldi Süd # 29 - ADAC # 29 - - innogy SE # 28 - N-Ergie # 28 - Stadtwerke Norderstedt # 27 - EWE Vertrieb GmbH # 26 - Westfalen Weser Netz # 24 - - EWV # 24 - BMW # 24 + - EWV # 23 - E-Werk Mittelbaden # 23 - Stadtwerke Leipzig # 22 - Mainova # 22 @@ -427,9 +428,9 @@ DE: - Regensburger Energie- und Wasserversorgung AG & Co KG # 19 - Fastned # 19 - eins energie in sachsen # 18 + - Stadtwerke Bielefeld # 18 - NewMotion # 18 - envia M # 17 - - Stadtwerke Bielefeld # 17 - STAWAG # 17 - EWR # 17 - enviaM # 16 @@ -448,6 +449,7 @@ DE: - Porsche # 14 - DREWAG - Stadtwerke Dresden # 14 - Bayernwerk AG # 14 + - Allego GmbH # 14 - eon # 13 - e-on Drive # 13 - VGS mbH # 13 @@ -469,15 +471,17 @@ DE: - Energieversorgung Rodau GmbH # 12 - ENTEGA Energie GmbH # 12 - DREWAG # 12 - - Allego GmbH # 12 + - Bayernwerk # 12 - Stadtwerke Tübingen GmbH # 11 - Stadtwerke Iserlohn - Heimatversorger # 11 + - Ovag # 11 - Mainzer Stadtwerke # 11 - Kreis Paderborn # 11 - Entega # 11 - E-Wald GmbH # 11 - - Bayernwerk # 11 - BEW # 11 + - Allegro # 11 + - enercity # 10 - eeMobility # 10 - e.on # 10 - e.dis # 10 @@ -489,13 +493,11 @@ DE: - Stadtwerke Herne # 10 - Rheinenergie # 10 - RWE Effizienz GmbH # 10 - - Ovag # 10 - Mennekes # 10 - Kreiswerke Main-Kinzig # 10 + - Filderstadtwerke # 10 - ENBW # 10 - EAM # 10 - - Allegro # 10 - - enercity # 9 - emma # 9 - SÜC Energie und H2O GmbH # 9 - Stadtwerke Göttingen # 9 @@ -506,6 +508,7 @@ DE: - Ladeverbund+ # 9 - LEW Augsburg # 9 - Innogy eMobility Solutions GmbH # 9 + - Energieversorgung Leverkusen GmbH & Co. KG (EVL) # 9 - EGG Energieversorgung Gera # 9 - Charge-ON GmbH # 9 EE: @@ -515,7 +518,7 @@ ES: - IBIL # 38 - Tesla Motors Inc. # 27 - EDP # 23 - - Iberdrola # 14 + - Iberdrola # 15 - GIC # 13 - Viesgo # 11 - Feníe Energía # 9 @@ -578,7 +581,7 @@ EU: FI: - Virta # 46 - Fortum Charge & Drive # 15 - - Fortum # 11 + - Fortum # 12 - KSSe # 7 - Tesla Motors Inc. # 5 - K-Lataus # 5 @@ -594,15 +597,15 @@ FI: - Helsingin Energia # 2 - Charge&Drive # 2 FX: - - Bouygues Énergies et Services # 843 + - Bouygues Énergies et Services # 844 - Izivia # 591 - - Freshmile # 403 + - Freshmile # 405 - Clem # 124 - Sodetrel Mobilité # 115 - Mouv Élec Var # 111 - Sodetrel # 101 - SEDI # 97 - - EneRSIEIL # 95 + - EneRSIEIL # 94 - SDE35 # 89 - Sorégies # 78 - SDEY # 71 @@ -667,14 +670,14 @@ FX: GB: - Ecotricity # 69 - Source London # 49 - - Pod Point # 34 + - Pod Point # 35 - Tesla Motors Inc. # 27 - Tesla # 25 - ChargePlace Scotland # 25 - Ubitricity # 21 - Lancaster City Council # 20 - - Birmingham City Council # 20 - evolt # 19 + - Birmingham City Council # 19 - InstaVolt # 16 - Chargemaster # 16 - CYC # 16 @@ -707,6 +710,7 @@ GB: - Genie Point # 4 - ESB EV Solutions # 4 - ChargeMaster # 4 + - polar # 3 - eVolt # 3 - Zero Carbon World # 3 - Tesla Motors # 3 @@ -723,7 +727,6 @@ GB: - www.chargeyourcar.org.uk # 2 - vendelectric # 2 - tesla_standard # 2 - - polar # 2 - podpoint # 2 - engenie # 2 - West Point House # 2 @@ -758,7 +761,7 @@ GB: - 'AutoCharge: EV Pedestal' # 2 - Allego # 2 GR: - - blink # 8 + - blink # 10 - Δήμος Αλίμου # 4 - Fortizo # 4 - Peugeot # 3 @@ -828,7 +831,7 @@ IS: - Ísorka # 2 - Orka Náttúrunnar # 2 IT: - - Enel # 198 + - Enel # 199 - Enel X # 162 - a2a # 26 - Alperia # 24 @@ -921,19 +924,19 @@ MK: MX: - Servicio de Transportes Eléctricos de la Ciudad de México # 3 NL: - - Allego # 179 + - Allego # 181 - NUON # 98 - - Fastned # 95 + - Fastned # 94 - Nuon # 71 - EVBOX # 24 - Ecotap # 20 - Vattenfall # 18 + - EVnetNL # 17 - NewMotion # 16 - - EVnetNL # 16 - Rotterdam Elektrisch # 15 + - Pitpoint # 14 - Qbuzz # 13 - allego # 12 - - Pitpoint # 12 - Gemeente Rotterdam # 12 - gemeente Rotterdam # 11 - ecotap # 11 @@ -1028,6 +1031,7 @@ NO: - UMB Drifts- og vedlikeholdsavd. # 5 - Tinn kommune # 5 - Sandnes Parkering KF # 5 + - Ishavsveien # 5 - IKEA # 5 - Halden kommune # 5 - Fredrikstad kommune # 5 @@ -1090,7 +1094,7 @@ NZ: - Orion # 8 - ChargeNet # 7 - Unison # 5 - - Charge.net.nz # 3 + - Charge.net.nz # 4 - Vector Limited # 2 - Thundergrid # 2 - Tesla # 2 @@ -1100,7 +1104,7 @@ NZ: PE: - La Puntilla # 2 PL: - - GreenWay # 55 + - GreenWay # 56 - RWE # 10 - Lotos # 9 - Orlen # 8 @@ -1134,36 +1138,37 @@ PL: - ABB # 2 PT: - MOBI.E # 104 - - Mobi.E # 51 - - Tesla # 36 - - KLC # 28 - - Rede Piloto # 25 - - EDP Comercial # 20 + - Mobi.E # 49 + - KLC # 43 + - EDP Comercial # 43 + - Tesla # 37 + - Powerdot # 25 + - Rede Piloto # 24 + - Mobilectric # 22 + - Galp Power # 22 + - Galp Geste # 22 + - Prio.E # 20 - GalpGeste # 16 - - Prio.E # 15 - - Galp Power # 15 - - Galp Geste # 15 - Mobi-e # 14 - - EV Power # 12 + - EV Power # 13 - Mobie # 11 - - Powerdot # 10 - - Mobilectric # 8 - - Mobiletric # 7 + - Mobiletric # 6 + - Emacom # 5 - Tesla Motors Inc. # 4 - Repsol # 4 - Propel-Cepsa # 4 - Loulé Concelho Global # 4 - EDP MOP # 4 - - CME # 4 - Ucharge # 3 + - Mota Engil II # 3 - Mobi # 3 - - Kilometer Low Cost # 3 - - Mota Engil II # 2 + - CME # 3 - Mobi.e # 2 - Mobi-E # 2 - MOBI.e # 2 + - Factor Energia # 2 - Emel # 2 - - EMACOM # 2 + - EVCE Power # 2 PY: - Petropar # 2 RE: @@ -1178,7 +1183,7 @@ RO: RS: - putevi srbije # 3 RU: - - '"ПАО ""Ленэнерго"""' # 30 + - '"ПАО ""Ленэнерго"""' # 29 - Мосэнерго # 9 - МРСК Волги # 9 - '"ПАО ""МРСК Волги"""' # 8 @@ -1265,7 +1270,7 @@ TR: - Eşarj # 7 - EŞARJ # 2 TW: - - 英屬開曼群島商睿能新動力股份有限公司台灣分公司 # 53 + - 英屬開曼群島商睿能新動力股份有限公司台灣分公司 # 52 - 睿能創意股份有限公司 # 12 - Gogoro Inc. # 10 - gogoro # 8 @@ -1275,12 +1280,12 @@ TW: TZ: - Jaza Energy # 2 UA: - - '"Перша національна мережа електрозаправних комплексів ""Тока"""' # 98 - Одеська міська рада # 15 - АвтоЭнтерпрайз # 11 - ЕлектроДрайв # 9 - Autoenterprise # 9 - AutoEnterprise # 9 + - '"Перша національна мережа електрозаправних комплексів ""Тока"""' # 9 - Yasno # 6 - ElectroUA # 6 - Автоэнтерпрайз # 5 @@ -1390,10 +1395,10 @@ US-ME: US-MI: - Michigan State University # 12 - Consumers Energy # 6 - - Tesla Motors # 5 - NRG Energy # 3 - Lansing Board of Water and Light # 3 - Chargepoint # 3 + - Village of DeWitt # 2 - Tanger Outlet Mall Howell # 2 - Hyatt Place # 2 - Celebration Cinema # 2 diff --git a/res/country_metadata/clothesContainerOperators.yml b/res/country_metadata/clothesContainerOperators.yml index b9332ee667..2d59776f87 100644 --- a/res/country_metadata/clothesContainerOperators.yml +++ b/res/country_metadata/clothesContainerOperators.yml @@ -6,7 +6,7 @@ AR: AT: - Humana # 42 - Holding Graz # 31 - - Kolping # 13 + - Kolping # 12 - Rotes Kreuz # 10 - MA 48 # 10 - Caritas # 9 @@ -87,27 +87,27 @@ CZ: - Město Veltrusy # 2 - KLOK.TEX # 2 DE: - - Deutsches Rotes Kreuz # 535 + - Deutsches Rotes Kreuz # 537 - Loop # 374 - Aktion Hoffnung # 137 - AWG # 116 - GEB # 114 - ALBA Braunschweig GmbH # 106 - - Humana # 105 - - Malteser # 98 - - Stadtreinigung Hamburg # 97 + - Humana # 103 + - Malteser # 101 + - Stadtreinigung Hamburg # 96 - Stadt Karlsruhe # 70 - AHE;Deutsches Rotes Kreuz # 64 - - Abfallwirtschaftsgesellschaft Wuppertal # 55 + - Abfallwirtschaftsgesellschaft Wuppertal # 56 - Vorwerker Diakonie # 51 - - DRK # 47 + - DRK # 48 - Zweckverband für Abfallwirtschaft Kempten # 46 - Technische Betriebe Velbert AöR # 41 - Abfallwirtschaftsbetrieb München # 41 - Texaid # 40 - hoelp # 39 - Kolping # 39 - - AWB Köln # 38 + - AWB Köln # 39 - AWB # 36 - AHE # 35 - AWO # 32 @@ -124,15 +124,15 @@ DE: - CityGreenPoint # 20 - aha Zweckverband Abfallwirtschaft Region Hannover # 19 - Stadt Stuttgart # 19 - - Berlin-Textilrecycling # 19 - TEXAID # 18 + - Berlin-Textilrecycling # 18 - Bayerisches Rotes Kreuz # 17 - Aktex Rohstoff-Recycling Nord # 17 - Diakoniewerk Essen # 16 - Abfall- und Wertstofflogistik Neuss GmbH (AWL) # 16 - Retextil Recycling International # 14 - - Gew. Fa. Mettex # 14 - Isevtex # 13 + - Gew. Fa. Mettex # 13 - AWISTA # 13 - AHG alpha Handelskontor # 13 - AHA # 13 @@ -144,20 +144,20 @@ DE: - DRK Kreisverband Bonn e.V. # 12 - Brotex # 12 - AWM # 12 + - illegal # 11 - Däsa Wiederverwertungs GmbH # 11 - - illegal # 10 + - Deutsches Rotes Kreuz e.V. # 11 - Textil-Recycling Nord # 10 - TEXAID Deutschland GmbH # 10 - RS # 10 - Kolping Recycling GmbH # 10 - - Deutsches Rotes Kreuz e.V. # 10 - Altkleiderfirma Nargül # 10 - Stadt Karlsruhe Amt für Abfallwirtschaft # 9 - DRK-Kreisverband Trier-Saarburg e.V. # 9 - Bera Textilrecycling # 9 - Baliz Textilwerke # 9 - - SP Textilverwertung # 8 - Neue Arbeit Lahr # 8 + - Johanniter # 8 - Hoppe # 8 - HUMANA Kleidersammlung GmbH # 8 - Familienschutzwerk # 8 @@ -168,9 +168,9 @@ DE: - aha # 7 - TEXAID Collection GmbH # 7 - TEXAID Collection # 7 + - SP Textilverwertung # 7 - Retextil # 7 - Maltheser Hilfsdienst # 7 - - Johanniter # 7 - HUMANA # 7 - Diakonisches Werk Kassel # 7 - Deutsche Lebens-Rettungs-Gesellschaft e.V. # 7 @@ -227,7 +227,7 @@ FI: - Suomen Pakkauskierrätys RINKI Oy # 2 - Auringonnousu # 2 FX: - - Le Relais # 649 + - Le Relais # 650 - Toulouse Métropole # 231 - AMOS # 33 - Actifrip # 25 @@ -239,6 +239,7 @@ FX: - SITCOM - Côte sud des Landes # 10 - Ecotextile # 9 - Apivet # 9 + - www.lerelais.org # 8 - Le relais # 6 - Emmaüs # 6 - SMICVAL # 5 @@ -264,6 +265,7 @@ FX: - Fringuette # 3 - Croix-Rouge # 3 - Charlieu-Belmont Communauté # 3 + - Association d'aide aux enfants atteints de leucemie # 3 - Active # 3 - Écotextile # 2 - ecotextile # 2 @@ -294,9 +296,9 @@ GB: - Nottingham City Council # 5 - Traid # 4 - Cystic Fibrosis Trust # 4 + - traid # 3 - South Norfolk Council # 3 - Cancer Fund for Children # 3 - - traid # 2 - The Firefighters Charity # 2 - TRAID # 2 - Severn Waste Services # 2 @@ -311,7 +313,7 @@ IE: IS: - Sorpa # 2 IT: - - Cannone # 105 + - Cannone # 107 - Caritas Ambrosiana # 27 - Humana # 21 - UIC # 15 @@ -367,7 +369,7 @@ RO: - Caritas # 8 RU: - Перемолка # 8 - - Лепта # 5 + - Лепта # 6 - Спасибо # 2 SE: - Myrorna # 4