Localisation updates from https://translatewiki.net.

author translatewiki.net <l10n-bot@translatewiki.net>

Mon, 21 Sep 2020 14:10:19 +0000 (16:10 +0200)

committer translatewiki.net <l10n-bot@translatewiki.net>

Mon, 21 Sep 2020 14:10:19 +0000 (16:10 +0200)
author translatewiki.net <l10n-bot@translatewiki.net>
Mon, 21 Sep 2020 14:10:19 +0000 (16:10 +0200)
committer translatewiki.net <l10n-bot@translatewiki.net>
Mon, 21 Sep 2020 14:10:19 +0000 (16:10 +0200)
diff --git a/config/locales/bg.yml b/config/locales/bg.yml

index 14209de94ae34c4cdf3aedeb97d3844c731aa3ee..1ecf59420c25d641d59bbe5f93fb65d6cf06ffea 100644 (file)
--- a/config/locales/bg.yml
+++ b/config/locales/bg.yml
@@ -91,6 +91,7 @@ bg:
          allow_write_prefs: променете потребителските им предпочитания
          allow_write_diary: създай дневник на бележките, коментарите и новите приятелства
          allow_write_api: промени картата
          allow_write_prefs: променете потребителските им предпочитания
          allow_write_diary: създай дневник на бележките, коментарите и новите приятелства
          allow_write_api: промени картата
+        allow_read_gpx: прочети личните GPS следи
          allow_write_gpx: Качване на GPS следи
          allow_write_notes: промени бележки
        diary_comment:
          allow_write_gpx: Качване на GPS следи
          allow_write_notes: промени бележки
        diary_comment:
@@ -378,6 +379,7 @@ bg:
        comment: Нов коментар към списък с промени № %{changeset_id} на %{author}
      index:
        title_all: Дискусия за промяна на OpenStreetMap
        comment: Нов коментар към списък с промени № %{changeset_id} на %{author}
      index:
        title_all: Дискусия за промяна на OpenStreetMap
+      title_particular: 'Разговор за промяната #%{changeset_id} на OpenStreetMap'
      timeout:
        sorry: Съжаляваме, но списъка с коментарит по промените който заявихте се зарежда
          твърде дълго.
      timeout:
        sorry: Съжаляваме, но списъка с коментарит по промените който заявихте се зарежда
          твърде дълго.
@@ -417,6 +419,8 @@ bg:
      no_such_entry:
        title: Няма такива публикации в дневника
        heading: Няма бележка със id:%{id}
      no_such_entry:
        title: Няма такива публикации в дневника
        heading: Няма бележка със id:%{id}
+      body: Съжаляваме но в дневника няма запис или коментар със id %{id}. Моля проверете
+        написаното или може връзката която сте избрали да е грешна.
      diary_entry:
        posted_by_html: Написано от %{link_user} на %{created} на %{language_link}
        comment_link: Коментар към публикацията
      diary_entry:
        posted_by_html: Написано от %{link_user} на %{created} на %{language_link}
        comment_link: Коментар към публикацията
@@ -427,9 +431,11 @@ bg:
          other: '%{count} коментара'
        edit_link: Променяне на публикацията
        hide_link: Скриване на публикацията
          other: '%{count} коментара'
        edit_link: Променяне на публикацията
        hide_link: Скриване на публикацията
+      unhide_link: Скриване на публикацията
        confirm: Потвърждаване
        report: Докладване на бележката
      diary_comment:
        confirm: Потвърждаване
        report: Докладване на бележката
      diary_comment:
+      comment_from_html: Коментар от %{link_user} в %{comment_created_at}
        hide_link: Скриване на коментара
        unhide_link: Показване на коментара
        confirm: Потвърждаване
        hide_link: Скриване на коментара
        unhide_link: Показване на коментара
        confirm: Потвърждаване
@@ -440,6 +446,9 @@ bg:
        edit: Променяне
        coordinates: '%{latitude}; %{longitude}'
      feed:
        edit: Променяне
        coordinates: '%{latitude}; %{longitude}'
      feed:
+      user:
+        title: OpenStreetMap дневник записи за %{user}
+        description: Последни OpenStreetMap записи в дневника от %{user}
        all:
          title: Записи в дневника на OpenStreetMap
      comments:
        all:
          title: Записи в дневника на OpenStreetMap
      comments:
@@ -450,9 +459,13 @@ bg:
        older_comments: По-стари коментари
    friendships:
      make_friend:
        older_comments: По-стари коментари
    friendships:
      make_friend:
+      heading: Добави %{user} като приятел?
        button: Добави като приятел
        success: Сега сте приятели с %{name}!
        button: Добави като приятел
        success: Сега сте приятели с %{name}!
+      failed: Съжаляваме, неуспешно добавяне на %{name} като приятел.
+      already_a_friend: Вие вече сте приятел с %{name}.
      remove_friend:
      remove_friend:
+      heading: Премахни %{user} от приятели?
        button: Премахване от приятели
        success: '%{name} беше премахнат от списъка с приятелите.'
        not_a_friend: '%{name} не е между вашите приятели.'
        button: Премахване от приятели
        success: '%{name} беше премахнат от списъка с приятелите.'
        not_a_friend: '%{name} не е между вашите приятели.'
@@ -513,6 +526,7 @@ bg:
            clock: Часовник
            college: Колеж
            community_centre: Обществен център
            clock: Часовник
            college: Колеж
            community_centre: Обществен център
+          conference_centre: Конферентен център
            courthouse: Съд
            crematorium: Крематориум
            dentist: Зъболекар
            courthouse: Съд
            crematorium: Крематориум
            dentist: Зъболекар
@@ -544,6 +558,7 @@ bg:
            parking: Паркинг
            parking_entrance: Вход на паркинг
            parking_space: Паркомясто
            parking: Паркинг
            parking_entrance: Вход на паркинг
            parking_space: Паркомясто
+          payment_terminal: Платежен терминал
            pharmacy: Аптека
            place_of_worship: Място за поклонение
            police: Полиция
            pharmacy: Аптека
            place_of_worship: Място за поклонение
            police: Полиция
@@ -558,6 +573,7 @@ bg:
            school: Училище
            shelter: Подслон
            shower: Душ
            school: Училище
            shelter: Подслон
            shower: Душ
+          social_centre: Социален център
            studio: Студио
            swimming_pool: Плувен басейн
            taxi: Такси
            studio: Студио
            swimming_pool: Плувен басейн
            taxi: Такси
@@ -566,6 +582,7 @@ bg:
            toilets: Тоалетна
            townhall: Кметство
            university: Университет
            toilets: Тоалетна
            townhall: Кметство
            university: Университет
+          vehicle_inspection: Преглед на превозни средства
            vending_machine: Автомат
            veterinary: Ветеринарна клиника
            village_hall: Кметство
            vending_machine: Автомат
            veterinary: Ветеринарна клиника
            village_hall: Кметство
@@ -767,6 +784,7 @@ bg:
            swimming_pool: Плувен басейн
            water_park: Аквапарк
          man_made:
            swimming_pool: Плувен басейн
            water_park: Аквапарк
          man_made:
+          antenna: Антена
            beehive: Кошер
            bridge: Мост
            bunker_silo: Бункер
            beehive: Кошер
            bridge: Мост
            bunker_silo: Бункер
@@ -858,6 +876,7 @@ bg:
            lawyer: Адвокат
            ngo: Офис на НПО
            notary: Нотариус
            lawyer: Адвокат
            ngo: Офис на НПО
            notary: Нотариус
+          research: Изследователски офис
            travel_agent: Туристическа агенция
            "yes": Офис
          place:
            travel_agent: Туристическа агенция
            "yes": Офис
          place:
@@ -917,13 +936,17 @@ bg:
            car_parts: Авточасти
            car_repair: Автосервиз
            carpet: Магазин за килими
            car_parts: Авточасти
            car_repair: Автосервиз
            carpet: Магазин за килими
+          chocolate: Шоколад
            clothes: Магазин за дрехи
            coffee: Магазин за кафе
            computer: Магазин за компютри
            clothes: Магазин за дрехи
            coffee: Магазин за кафе
            computer: Магазин за компютри
+          cosmetics: Козметика
+          curtain: Магазин за завеси
            deli: Деликатесен магазин
            department_store: Универсален магазин
            doityourself: Направи сам
            dry_cleaning: Химическо чистене
            deli: Деликатесен магазин
            department_store: Универсален магазин
            doityourself: Направи сам
            dry_cleaning: Химическо чистене
+          e-cigarette: Магазин е-цигари
            electronics: Магазин за електроника
            erotic: Еротичен магазин
            estate_agent: Недвижими имоти
            electronics: Магазин за електроника
            erotic: Еротичен магазин
            estate_agent: Недвижими имоти
@@ -985,6 +1008,8 @@ bg:
            apartment: Ваканционен апартамент
            artwork: Произведениe на изкуството
            attraction: Атракция
            apartment: Ваканционен апартамент
            artwork: Произведениe на изкуството
            attraction: Атракция
+          cabin: Кабина
+          camp_site: Лагер
            caravan_site: Къмпинг
            chalet: Бунгало
            gallery: Галерия
            caravan_site: Къмпинг
            chalet: Бунгало
            gallery: Галерия
@@ -1030,6 +1055,7 @@ bg:
        select_status: Избери статус
        select_type: Избери тип
        select_last_updated_by: Избери последно променен от
        select_status: Избери статус
        select_type: Избери тип
        select_last_updated_by: Избери последно променен от
+      reported_user: Докладван потребител
        search: Търсене
        search_guidance: 'Търсете за проблеми:'
        user_not_found: Потребителят не съществува
        search: Търсене
        search_guidance: 'Търсете за проблеми:'
        user_not_found: Потребителят не съществува
@@ -1043,6 +1069,7 @@ bg:
        reports_count:
          one: 1 доклад
          other: '%{count} доклада'
        reports_count:
          one: 1 доклад
          other: '%{count} доклада'
+      reported_item: Докладван елемент
        states:
          ignored: Пренебрегнат
          open: Отворен
        states:
          ignored: Пренебрегнат
          open: Отворен
@@ -1057,11 +1084,17 @@ bg:
          zero: Няма доклади
          one: 1 доклад
          other: '%{count} доклада'
          zero: Няма доклади
          one: 1 доклад
          other: '%{count} доклада'
+      report_created_at: Първоначално докладван на %{datetime}
        last_resolved_at: Последно решена на %{datetime}
        last_resolved_at: Последно решена на %{datetime}
+      last_updated_at: Последно актуализиран на %{datetime} от %{displayname}
        resolve: Решаване
        ignore: Пропусни
        reopen: Отново отвори
        reports_of_this_issue: Сигнали за този Проблем
        resolve: Решаване
        ignore: Пропусни
        reopen: Отново отвори
        reports_of_this_issue: Сигнали за този Проблем
+      read_reports: Прочети Отчети
+      new_reports: Нови Доклади
+      other_issues_against_this_user: Други проблеми срещу този потребител
+      no_other_issues: Няма други проблеми срещу този потребител.
        comments_on_this_issue: Коментари за проблема
      resolve:
        resolved: Състоянието на проблема е променен на „Решен“
        comments_on_this_issue: Коментари за проблема
      resolve:
        resolved: Състоянието на проблема е променен на „Решен“
@@ -1069,6 +1102,8 @@ bg:
        ignored: Проблема е променен на „Пропуснат“
      reopen:
        reopened: Проблема е променен на "Отворен"
        ignored: Проблема е променен на „Пропуснат“
      reopen:
        reopened: Проблема е променен на "Отворен"
+    comments:
+      comment_from_html: Коментар от %{user_link} в %{comment_created_at}
      helper:
        reportable_title:
          note: Бележка № %{note_id}
      helper:
        reportable_title:
          note: Бележка № %{note_id}
@@ -1079,16 +1114,26 @@ bg:
      new:
        title_html: Докладване на %{link}
        missing_params: Не може да бъде създаден нов доклад
      new:
        title_html: Докладване на %{link}
        missing_params: Не може да бъде създаден нов доклад
+      disclaimer:
+        intro: 'Преди да изпратите репорта си към страницата на модераторите моля
+          проверете дали:'
+        not_just_mistake: Сигурни ли сте че проблема не е просто грешка
+        resolve_with_user: Вече сте опитали да решите проблема с дадения потребител
        categories:
          diary_entry:
            spam_label: Този запис от дневник е/съдържа спам
        categories:
          diary_entry:
            spam_label: Този запис от дневник е/съдържа спам
+          offensive_label: Този запис в дневника е вредна/заплашителна
            threat_label: Този запис от дневник съдържа заплаха
            other_label: Друго
          diary_comment:
            spam_label: Този коментар от дневник е/съдържа спам
            threat_label: Този запис от дневник съдържа заплаха
            other_label: Друго
          diary_comment:
            spam_label: Този коментар от дневник е/съдържа спам
+          offensive_label: Този коментар в дневника е вредна/заплашителна
            threat_label: Този коментар от дневник е заплаха
            other_label: Друго
          user:
            threat_label: Този коментар от дневник е заплаха
            other_label: Друго
          user:
+          spam_label: Този потребителски профил е/съдържа спам
+          offensive_label: Този потребителски профил е обиден/непристоен
+          threat_label: Този потребителски профил съдържа заплаха
            vandal_label: Този потребител е вандал
            other_label: Друго
          note:
            vandal_label: Този потребител е вандал
            other_label: Друго
          note:
@@ -1131,6 +1176,8 @@ bg:
      partners_bytemark: Bytemark
      partners_partners: партньори
      tou: Условия за ползване
      partners_bytemark: Bytemark
      partners_partners: партньори
      tou: Условия за ползване
+    osm_offline: Базата на данни на  OpenStreetMap в момента е изключена докато се
+      извършва необходима поддръжка.
      help: Помощ
      about: За проекта
      copyright: Авторски права
      help: Помощ
      about: За проекта
      copyright: Авторски права
@@ -1149,6 +1196,10 @@ bg:
        hi: Здравейте %{to_user},
      friendship_notification:
        hi: Здравейте %{to_user},
        hi: Здравейте %{to_user},
      friendship_notification:
        hi: Здравейте %{to_user},
+      subject: '[OpenStreetMap] %{user} ви добави като приятел'
+      had_added_you: '%{user} ви добави като приятел на OpenStreetMap.'
+      see_their_profile: Можете да видите профила му на %{userurl}.
+      befriend_them: Можете да ги добавите като приятел на %{befriendurl}.
      gpx_notification:
        greeting: Здравейте,
        your_gpx_file: Изглежда, че файлът на GPX
      gpx_notification:
        greeting: Здравейте,
        your_gpx_file: Изглежда, че файлът на GPX
@@ -1158,6 +1209,11 @@ bg:
        failure:
          subject: '[OpenStreetMap] Грешка при внасяне на GPX'
          failed_to_import: 'не е внесен. Това е грешката:'
        failure:
          subject: '[OpenStreetMap] Грешка при внасяне на GPX'
          failed_to_import: 'не е внесен. Това е грешката:'
+        more_info_1: Повече информация за проблеми при импорта на GPX обекти и как
+          да ги избегнете
+        more_info_2: 'те могат да бъдат намерени на:'
+      success:
+        subject: '[OpenStreetMap] GPX импорта е успешен'
      signup_confirm:
        subject: '[OpenStreetMap] Добре дошли в OpenStreetMap'
        greeting: Здравейте!
      signup_confirm:
        subject: '[OpenStreetMap] Добре дошли в OpenStreetMap'
        greeting: Здравейте!
@@ -1249,17 +1305,25 @@ bg:
      no_such_message:
        title: Няма такова съобщение
        heading: Няма такова съобщение
      no_such_message:
        title: Няма такова съобщение
        heading: Няма такова съобщение
+      body: Съжаляваме но няма съобщение със това id.
      outbox:
        title: Изпратени
        my_inbox_html: Моят %{inbox_link}
        inbox: входящи
      outbox:
        title: Изпратени
        my_inbox_html: Моят %{inbox_link}
        inbox: входящи
+      outbox: Изпратени
        messages:
          one: Изпратили сте %{count} съобщение
          other: Изпратили сте %{count} съобщения
        to: До
        subject: Тема
        date: Дата
        messages:
          one: Изпратили сте %{count} съобщение
          other: Изпратили сте %{count} съобщения
        to: До
        subject: Тема
        date: Дата
+      no_sent_messages_html: Все още нямате никакви съобщения. Не искате ли да се
+        свържете с други %{people_mapping_nearby_link}?
        people_mapping_nearby: картографи в близост
        people_mapping_nearby: картографи в близост
+    reply:
+      wrong_user: Вие сте влезли като `%{user}' но съобщението на което искате да
+        отговорите не е изпратено на този потребител. Моля влезте като правилния потребител
+        за да можете да отговорите.
      show:
        title: Прочетете съобщението
        from: От
      show:
        title: Прочетете съобщението
        from: От
@@ -1302,6 +1366,8 @@ bg:
          mapping_link: картографирате
        legal_babble:
          title_html: Авторски права и лиценз
          mapping_link: картографирате
        legal_babble:
          title_html: Авторски права и лиценз
+        credit_title_html: Как да кредитирате OpenStreetMap
+        more_title_html: Открийте повече
          contributors_title_html: Нашите сътрудници
          contributors_fr_html: |-
            <strong>Франция</strong>: Съдържа данни от
          contributors_title_html: Нашите сътрудници
          contributors_fr_html: |-
            <strong>Франция</strong>: Съдържа данни от
@@ -1313,10 +1379,12 @@ bg:
            на тези знаци, моля изпратете Вашите въпроси на <a href="http://wiki.osmfoundation.org/wiki/Licensing_Working_Group">работната
            група по лиценза</a>.
      index:
            на тези знаци, моля изпратете Вашите въпроси на <a href="http://wiki.osmfoundation.org/wiki/Licensing_Working_Group">работната
            група по лиценза</a>.
      index:
+      js_2: OpenStreetMap използва JavaScript за своята статична карта.
        permalink: Постоянна връзка
        shortlink: Къса връзка
        createnote: Добавяне на бележка
      edit:
        permalink: Постоянна връзка
        shortlink: Къса връзка
        createnote: Добавяне на бележка
      edit:
+      user_page_link: Потребителска страница
        id_not_configured: iD не е настроен
      export:
        title: Изнасяне
        id_not_configured: iD не е настроен
      export:
        title: Изнасяне
@@ -1345,8 +1413,10 @@ bg:
        latitude: 'Геогр. шир:'
        longitude: 'Геогр. дълж:'
        output: Изход
        latitude: 'Геогр. шир:'
        longitude: 'Геогр. дълж:'
        output: Изход
+      paste_html: Копирайте HTML за вграждане в интернет страница
        export_button: Изнасяне
      fixthemap:
        export_button: Изнасяне
      fixthemap:
+      title: Докладвай проблем/Коригирай картата
        how_to_help:
          title: Как да помогна
          join_the_community:
        how_to_help:
          title: Как да помогна
          join_the_community:
@@ -1401,9 +1471,13 @@ bg:
            trunk: Междуградски път
            primary: Главен път
            secondary: Второстепенен път
            trunk: Междуградски път
            primary: Главен път
            secondary: Второстепенен път
+          unclassified: Некласифициран път
            track: Полски път
            bridleway: Конен път
            cycleway: Велосипедна пътека
            track: Полски път
            bridleway: Конен път
            cycleway: Велосипедна пътека
+          cycleway_national: Национална велосипедна алея
+          cycleway_regional: Регионална велосипедна алея
+          cycleway_local: Локална велосипедна алея
            footway: Пътека
            rail: Железен път
            subway: Метро
            footway: Пътека
            rail: Железен път
            subway: Метро
@@ -1426,7 +1500,8 @@ bg:
            park: Парк
            resident: Жилищна зона
            common:
            park: Парк
            resident: Жилищна зона
            common:
-            1: ливада
+          - Обща
+          - ливада
            retail: Търговска зона
            industrial: Промишлена зона
            commercial: Търговска зона
            retail: Търговска зона
            industrial: Промишлена зона
            commercial: Търговска зона
@@ -1452,6 +1527,7 @@ bg:
            - връх
            tunnel: Тунел (пунктирана линия)
            bridge: Мост (плътна линия)
            - връх
            tunnel: Тунел (пунктирана линия)
            bridge: Мост (плътна линия)
+          private: Частен достъп
            construction: Пътища в изграждане
            bicycle_shop: Магазин за велосипеди
            bicycle_parking: Паркинг на велосипеди
            construction: Пътища в изграждане
            bicycle_shop: Магазин за велосипеди
            bicycle_parking: Паркинг на велосипеди
@@ -1511,7 +1587,12 @@ bg:
            да завършат преди да качвате нови, за да не запълните опашката, на която
            чакат още потребители.
      edit:
            да завършат преди да качвате нови, за да не запълните опашката, на която
            чакат още потребители.
      edit:
+      cancel: Отказ
+      title: Редактиране трасе %{name}
+      heading: Редактиране трасе %{name}
        visibility_help: какво означава това?
        visibility_help: какво означава това?
+    update:
+      updated: Трасето е обновено
      trace_optionals:
        tags: Етикети
      show:
      trace_optionals:
        tags: Етикети
      show:
@@ -1521,6 +1602,7 @@ bg:
        uploaded: 'Качено на:'
        points: 'Точки:'
        start_coordinates: 'Начални координати:'
        uploaded: 'Качено на:'
        points: 'Точки:'
        start_coordinates: 'Начални координати:'
+      coordinates_html: '%{latitude}; %{longitude}'
        map: карта
        edit: променяне
        owner: 'Собственик:'
        map: карта
        edit: променяне
        owner: 'Собственик:'
@@ -1528,8 +1610,10 @@ bg:
        tags: 'Етикети:'
        none: Няма
        edit_trace: Променяне на следата
        tags: 'Етикети:'
        none: Няма
        edit_trace: Променяне на следата
+      delete_trace: Изтрий това трасе
        trace_not_found: Следата не е открита!
        visibility: 'Видимост:'
        trace_not_found: Следата не е открита!
        visibility: 'Видимост:'
+      confirm_delete: Изтрий това трасе?
      trace_paging_nav:
        showing_page: Страница %{page}
        older: По-стари следи
      trace_paging_nav:
        showing_page: Страница %{page}
        older: По-стари следи
@@ -1539,6 +1623,7 @@ bg:
        count_points:
          one: 1 точка
          other: '%{count} точки'
        count_points:
          one: 1 точка
          other: '%{count} точки'
+      more: още
        view_map: Вижте на картата
        edit: променяне
        edit_map: Редактиране на картата
        view_map: Вижте на картата
        edit: променяне
        edit_map: Редактиране на картата
@@ -1556,18 +1641,43 @@ bg:
        upload_trace: Качване на следи от GPS
        see_all_traces: Всички следи
        see_my_traces: Мои следи
        upload_trace: Качване на следи от GPS
        see_all_traces: Всички следи
        see_my_traces: Мои следи
+    georss:
+      title: OpenStreetMap GPS трасета
      description:
        description_with_count:
          one: файл от GPX с %{count} точка от %{user}
          other: файл от GPX с %{count} точки от %{user}
        description_without_count: Файл на GPX от %{user}
      description:
        description_with_count:
          one: файл от GPX с %{count} точка от %{user}
          other: файл от GPX с %{count} точки от %{user}
        description_without_count: Файл на GPX от %{user}
+  application:
+    permission_denied: Нямате разрешение за достъп до това действие
+    require_admin:
+      not_an_admin: Трябва да сте админ за да извършите това действие
    oauth:
      authorize:
    oauth:
      authorize:
+      allow_to: 'Позволи приложението на клиента да:'
+      allow_read_prefs: прочетете вашите потребителски предпочитания
+      allow_write_prefs: променете вашите потребителски предпочитания
+      allow_write_diary: създай дневник на бележките, коментарите и новите приятелства
        allow_write_api: промени картата.
        allow_write_api: промени картата.
+      allow_read_gpx: прочети вашите лични GPS следи.
+      allow_write_gpx: Качване на GPS следи.
        allow_write_notes: променяне на бележки.
        allow_write_notes: променяне на бележки.
+      grant_access: Позволи Достъп
+    authorize_success:
+      title: Искането за достъп е разрешено
+      allowed_html: Вие позволихте на приложение %{app_name} достъп до вашия профил.
+      verification: Верификационния код е %{code}.
+    authorize_failure:
+      title: Искането за достъп не успя
      revoke:
        flash: Анулирахте удостоверяването на %{application}
    oauth_clients:
      revoke:
        flash: Анулирахте удостоверяването на %{application}
    oauth_clients:
+    show:
+      key: 'Клиентски ключ:'
+      secret: 'Клиентски секрет:'
+      edit: Редакция детайли
+      delete: Изтриване Клиент
+      confirm: Сигурен ли сте?
      index:
        title: Мои данни за OAuth
        my_tokens: Упълномощени от мен приложения
      index:
        title: Мои данни за OAuth
        my_tokens: Упълномощени от мен приложения
@@ -1575,6 +1685,7 @@ bg:
        issued_at: Упълномощено на
        revoke: Анулиране!
        my_apps: Мои клиентски приложения
        issued_at: Упълномощено на
        revoke: Анулиране!
        my_apps: Мои клиентски приложения
+      oauth: OAuth
        register_new: Регистриране на приложение
    users:
      login:
        register_new: Регистриране на приложение
    users:
      login:
@@ -1588,6 +1699,9 @@ bg:
        login_button: Влизане
        register now: Регистрирайте се
        with external: 'Или използвайте удостоверяване от външен източник:'
        login_button: Влизане
        register now: Регистрирайте се
        with external: 'Или използвайте удостоверяване от външен източник:'
+      new to osm: Нов за OpenStreetMap?
+      to make changes: За да правите промени в OpenStreetMap data, вие трябва да имате
+        профил.
        create account minute: Създайте своя сметка. Отнема само минута.
        no account: Нямате сметка?
        auth failure: Съжаляваме, но не можете да влезете с тези данни.
        create account minute: Създайте своя сметка. Отнема само минута.
        no account: Нямате сметка?
        auth failure: Съжаляваме, но не можете да влезете с тези данни.
@@ -1635,6 +1749,7 @@ bg:
        notice email cannot find: Съжаляваме, но този електронен адрес не е намерен.
      reset_password:
        title: Възстановяване на парола
        notice email cannot find: Съжаляваме, но този електронен адрес не е намерен.
      reset_password:
        title: Възстановяване на парола
+      heading: Смени Парола за %{user}
        reset: Нулиране на парола
        flash changed: Паролата е променена успешно.
      new:
        reset: Нулиране на парола
        flash changed: Паролата е променена успешно.
      new:
@@ -1673,6 +1788,7 @@ bg:
        deleted: изтрито
      show:
        my diary: Моя дневник
        deleted: изтрито
      show:
        my diary: Моя дневник
+      new diary entry: Нова публикация в дневника
        my edits: Мои промени
        my traces: Моите следи
        my notes: Моите бележки
        my edits: Мои промени
        my traces: Моите следи
        my notes: Моите бележки
@@ -1681,6 +1797,7 @@ bg:
        my settings: Настройки
        my comments: Моите коментари
        oauth settings: Настройки на OAuth
        my settings: Настройки
        my comments: Моите коментари
        oauth settings: Настройки на OAuth
+      blocks on me: Блокирани от мен
        blocks by me: Блокирани от мен
        send message: Изпратете съобщение
        diary: Дневник
        blocks by me: Блокирани от мен
        send message: Изпратете съобщение
        diary: Дневник
@@ -1709,8 +1826,18 @@ bg:
        m away: '%{count} м от вас'
        nearby users: Други потребители в близост
        no nearby users: Все още няма други потребители, които картографират в близост.
        m away: '%{count} м от вас'
        nearby users: Други потребители в близост
        no nearby users: Все още няма други потребители, които картографират в близост.
+      role:
+        administrator: Този потребител е администратор
+        moderator: Този потребител е модератор
+        grant:
+          administrator: Позволи администраторски достъп
+          moderator: Позволи модераторски достъп
        comments: Коментари
        create_block: Блокиране на този потребител
        comments: Коментари
        create_block: Блокиране на този потребител
+      activate_user: Активирай този Потребител
+      deactivate_user: Деактивирай този Потребител
+      confirm_user: Потвърди този Потребител
+      hide_user: Скрий този Потребител
        delete_user: Изтриване на този потребител
        confirm: Потвърдете
        report: Докладване на потребителя
        delete_user: Изтриване на този потребител
        confirm: Потвърдете
        report: Докладване на потребителя
@@ -1733,6 +1860,7 @@ bg:
          enabled: Разрешено. Не е анонимно и можете да променяте данните.
          enabled link: https://wiki.openstreetmap.org/wiki/Anonymous_edits
          enabled link text: Какво е това?
          enabled: Разрешено. Не е анонимно и можете да променяте данните.
          enabled link: https://wiki.openstreetmap.org/wiki/Anonymous_edits
          enabled link text: Какво е това?
+        disabled link text: защо не мога да редактирам?
        contributor terms:
          heading: 'Условия за сътрудничество:'
          agreed: Приели сте новите условия за сътрудничество.
        contributor terms:
          heading: 'Условия за сътрудничество:'
          agreed: Приели сте новите условия за сътрудничество.
@@ -1779,12 +1907,17 @@ bg:
        showing:
          one: Страница %{page} (%{first_item} от %{items})
          other: Страница %{page} (%{first_item}-%{last_item} от %{items})
        showing:
          one: Страница %{page} (%{first_item} от %{items})
          other: Страница %{page} (%{first_item}-%{last_item} от %{items})
+      summary_no_ip_html: '%{name} създадено на %{date}'
+    suspended:
+      webmaster: webmaster
    user_role:
      grant:
        confirm: Потвърждаване
      revoke:
        confirm: Потвърждаване
    user_blocks:
    user_role:
      grant:
        confirm: Потвърждаване
      revoke:
        confirm: Потвърждаване
    user_blocks:
+    not_found:
+      back: Обратно към индекс
      revoke:
        revoke: Анулиране!
      helper:
      revoke:
        revoke: Анулиране!
      helper:
diff --git a/config/locales/bn.yml b/config/locales/bn.yml

index b35bbeaaaae2eebd98e6f75f5b80aa6e83627421..4e6c1d990235e8bafcef76cc89827ebc9b878d10 100644 (file)
--- a/config/locales/bn.yml
+++ b/config/locales/bn.yml
@@ -124,6 +124,7 @@ bn:
          description: বিবরণ
          languages: ভাষা
          pass_crypt: পাসওয়ার্ড
          description: বিবরণ
          languages: ভাষা
          pass_crypt: পাসওয়ার্ড
+        pass_crypt_confirmation: পাসওয়ার্ড নিশ্চিত করুন
    datetime:
      distance_in_words_ago:
        about_x_hours:
    datetime:
      distance_in_words_ago:
        about_x_hours:
@@ -211,6 +212,9 @@ bn:
      anonymous: নামহীন
      no_comment: (কোন মন্তব্য নেই)
      part_of: অংশ
      anonymous: নামহীন
      no_comment: (কোন মন্তব্য নেই)
      part_of: অংশ
+    part_of_relations:
+      one: ১টি সম্পর্ক
+      other: '%{count}টি সম্পর্ক'
      download_xml: XML ডাউনলোড করুন
      view_history: ইতিহাস দেখুন
      view_details: বিস্তারিত দেখুন
      download_xml: XML ডাউনলোড করুন
      view_history: ইতিহাস দেখুন
      view_details: বিস্তারিত দেখুন
diff --git a/config/locales/da.yml b/config/locales/da.yml

index 454f502a36e79ea421312b3692f3d9834474189f..5b18bd51727719b2492e634e4fe392a100d8972b 100644 (file)
--- a/config/locales/da.yml
+++ b/config/locales/da.yml
@@ -154,6 +154,7 @@ da:
          description: Beskrivelse
          languages: Sprog
          pass_crypt: Adgangskode
          description: Beskrivelse
          languages: Sprog
          pass_crypt: Adgangskode
+        pass_crypt_confirmation: Bekræft adgangskode
      help:
        trace:
          tagstring: kommasepareret
      help:
        trace:
          tagstring: kommasepareret
diff --git a/config/locales/de.yml b/config/locales/de.yml

index c5bbef18315196cfcbfcfd53d1f4ca782e15f104..70a44d346d788d3f81dd5f6198963cf885a22780 100644 (file)
--- a/config/locales/de.yml
+++ b/config/locales/de.yml
@@ -191,6 +191,7 @@ de:
          description: Beschreibung
          languages: Sprachen
          pass_crypt: Passwort
          description: Beschreibung
          languages: Sprachen
          pass_crypt: Passwort
+        pass_crypt_confirmation: Passwort bestätigen
      help:
        trace:
          tagstring: durch Komma getrennt
      help:
        trace:
          tagstring: durch Komma getrennt
@@ -295,6 +296,12 @@ de:
      anonymous: anonym
      no_comment: (kein Kommentar)
      part_of: Teil von
      anonymous: anonym
      no_comment: (kein Kommentar)
      part_of: Teil von
+    part_of_relations:
+      one: 1 Relation
+      other: '%{count} Relationen'
+    part_of_ways:
+      one: 1 Weg
+      other: '%{count} Wege'
      download_xml: XML herunterladen
      view_history: Verlauf anzeigen
      view_details: Details anzeigen
      download_xml: XML herunterladen
      view_history: Verlauf anzeigen
      view_details: Details anzeigen
@@ -335,6 +342,9 @@ de:
        title_html: 'Relation: %{name}'
        history_title_html: 'Relationverlauf: %{name}'
        members: Mitglieder
        title_html: 'Relation: %{name}'
        history_title_html: 'Relationverlauf: %{name}'
        members: Mitglieder
+      members_count:
+        one: 1 Mitglied
+        other: '%{count} Mitglieder'
      relation_member:
        entry_role_html: '%{type} %{name} als %{role}'
        type:
      relation_member:
        entry_role_html: '%{type} %{name} als %{role}'
        type:
@@ -589,6 +599,7 @@ de:
            bicycle_rental: Fahrradverleih
            bicycle_repair_station: Fahrrad-Reparaturstation
            biergarten: Biergarten
            bicycle_rental: Fahrradverleih
            bicycle_repair_station: Fahrrad-Reparaturstation
            biergarten: Biergarten
+          blood_bank: Blutbank
            boat_rental: Bootsverleih
            brothel: Bordell
            bureau_de_change: Wechselstube
            boat_rental: Bootsverleih
            brothel: Bordell
            bureau_de_change: Wechselstube
@@ -677,6 +688,7 @@ de:
            village_hall: Gemeindezentrum
            waste_basket: Mülleimer
            waste_disposal: Abfallentsorgung
            village_hall: Gemeindezentrum
            waste_basket: Mülleimer
            waste_disposal: Abfallentsorgung
+          waste_dump_site: Mülldeponie
            watering_place: Tränke
            water_point: Wasseranschluss
            weighbridge: Fahrzeugwaage
            watering_place: Tränke
            water_point: Wasseranschluss
            weighbridge: Fahrzeugwaage
@@ -1061,6 +1073,7 @@ de:
            insurance: Versicherungsbüro
            it: IT-Büro
            lawyer: Rechtsanwalt
            insurance: Versicherungsbüro
            it: IT-Büro
            lawyer: Rechtsanwalt
+          logistics: Logistikbüro
            newspaper: Büro eines Zeitungsverlags
            ngo: NGO
            notary: Notar
            newspaper: Büro eines Zeitungsverlags
            ngo: NGO
            notary: Notar
diff --git a/config/locales/eo.yml b/config/locales/eo.yml

index bf02aa55dda7f5326edc19927baab6cb74e3adbb..2ca9b42b166e20f9b193675de8e87df4bf458fb0 100644 (file)
--- a/config/locales/eo.yml
+++ b/config/locales/eo.yml
@@ -144,6 +144,7 @@ eo:
          description: Priskribo
          languages: Lingvoj
          pass_crypt: Pasvorto
          description: Priskribo
          languages: Lingvoj
          pass_crypt: Pasvorto
+        pass_crypt_confirmation: Konfirmi pasvorton
      help:
        trace:
          tagstring: disigitaj per komoj
      help:
        trace:
          tagstring: disigitaj per komoj
@@ -246,6 +247,12 @@ eo:
      anonymous: anonimulo
      no_comment: (neniu komento)
      part_of: Parto de
      anonymous: anonimulo
      no_comment: (neniu komento)
      part_of: Parto de
+    part_of_relations:
+      one: 1 rilato
+      other: '%{count} rilatoj'
+    part_of_ways:
+      one: 1 linio
+      other: '%{count} linioj'
      download_xml: Elŝuti XML
      view_history: Vidi historion
      view_details: Montri detalojn
      download_xml: Elŝuti XML
      view_history: Vidi historion
      view_details: Montri detalojn
@@ -280,6 +287,9 @@ eo:
        title_html: 'Linio: %{name}'
        history_title_html: 'Historio de linio: %{name}'
        nodes: Nodoj
        title_html: 'Linio: %{name}'
        history_title_html: 'Historio de linio: %{name}'
        nodes: Nodoj
+      nodes_count:
+        one: 1 nodo
+        other: '%{count} nodoj'
        also_part_of_html:
          one: parto de linio %{related_ways}
          other: parto de linioj %{related_ways}
        also_part_of_html:
          one: parto de linio %{related_ways}
          other: parto de linioj %{related_ways}
@@ -287,6 +297,9 @@ eo:
        title_html: 'Rilato: %{name}'
        history_title_html: 'Historio de rilato: %{name}'
        members: Anoj
        title_html: 'Rilato: %{name}'
        history_title_html: 'Historio de rilato: %{name}'
        members: Anoj
+      members_count:
+        one: 1 ano
+        other: '%{count} anoj'
      relation_member:
        entry_role_html: '%{type} %{name} kiel %{role}'
        type:
      relation_member:
        entry_role_html: '%{type} %{name} kiel %{role}'
        type:
@@ -657,24 +670,91 @@ eo:
            apartment: Apartamentaro
            apartments: Apartamentaro
            barn: Garbejo
            apartment: Apartamentaro
            apartments: Apartamentaro
            barn: Garbejo
+          bungalow: Bangalo
+          cabin: Kabano
+          chapel: Kapelo
+          church: Kirko
+          civic: Publika konstruaĵo
+          college: Postmezgrada lernejo (konstruaĵo)
+          commercial: Oficeja/komerca konstruaĵo
+          construction: Konstruaĵo dum konstruado
+          detached: Liberstaranta domo
+          dormitory: Studenthejmo
+          duplex: Ĝemela domo
+          farm: Ĉefarma domo
+          farm_auxiliary: Ĉefarma konstruaĵo
+          garage: Garaĝo
+          garages: Garaĝaro
+          greenhouse: Kultivdomo
+          hangar: Hangaro
+          hospital: Malsanulejo (konstruaĵo)
+          hotel: Hotelo (konstruaĵo)
+          house: Domo
+          houseboat: Domboato
+          hut: Ĥato
+          industrial: Industria konstruaĵo
+          kindergarten: Infanvartejo (konstruaĵo)
+          manufacture: Fabriko
+          office: Oficejo (konstruaĵo)
+          public: Publika konstruaĵo
+          residential: Loĝeja konstruaĵo
+          retail: Komerca konstruaĵo
+          roof: Tegmento
+          ruins: Ruinoj de konstruaĵo
+          school: Lernejo (konstruaĵo)
+          semidetached_house: Ĝemela domo
+          service: Serva konstruaĵeto
+          shed: Budo
+          stable: Ĉeval-stalo
+          static_caravan: Movdomo (nemovata)
+          temple: Templo (konstruaĵo)
+          terrace: Envicaj domoj
+          train_station: Fervoj-stacio (konstruaĵo)
+          university: Universitato (konstruaĵo)
+          warehouse: Magazeno
            "yes": Konstruaĵo
            "yes": Konstruaĵo
+        club:
+          scout: Skolta klubejo
+          sport: Sporta klubejo
+          "yes": Klubejo
          craft:
          craft:
+          beekeper: Abelejo
+          blacksmith: Forĝejo
            brewery: Bierfarejo
            carpenter: Ĉarpentistejo
            brewery: Bierfarejo
            carpenter: Ĉarpentistejo
+          caterer: Oficejo de manĝ-provizisto
+          confectionery: Sukeraĵejo
+          dressmaker: Laborejo de tajloro
            electrician: Elektristejo
            electrician: Elektristejo
+          electronics_repair: Riparejo de elektronikaĵoj
            gardener: Ĝardenistejo
            gardener: Ĝardenistejo
+          glaziery: Laborejo de vitristo
+          handicraft: Laborejo de manmetisto
+          hvac: Oficejo de isto pri hejtado, aerumado, klimatizado
+          metal_construction: Laborejo de metal-konstruaĵisto
            painter: Farbistejo
            photographer: Fotistejo
            plumber: Tubistejo
            painter: Farbistejo
            photographer: Fotistejo
            plumber: Tubistejo
+          roofer: Oficejo de tegmentisto
+          sawmill: Segejo
            shoemaker: Ŝuistejo
            shoemaker: Ŝuistejo
+          stonemason: Laborejo de ŝton-tranĉisto
            tailor: Tajlorejo
            tailor: Tajlorejo
+          window_construction: Laborejo de fenestr-faristo
+          winery: Vinejo
            "yes": Metiejo
          emergency:
            "yes": Metiejo
          emergency:
+          access_point: Vivsava rekonebla signo
            ambulance_station: Ambulanca stacio
            assembly_point: Vivsava renkontiĝejo
            defibrillator: Defibrililo
            ambulance_station: Ambulanca stacio
            assembly_point: Vivsava renkontiĝejo
            defibrillator: Defibrililo
+          fire_xtinguisher: Fajestingilo
+          fire_water_pond: Fajrobrigada akvorezervujo
            landing_site: Surteriĝejo en urĝo
            landing_site: Surteriĝejo en urĝo
+          life_ring: Savoringo
            phone: Alarma telefono
            phone: Alarma telefono
+          siren: Alarmsireno
+          suction_point: Fajrobrigada akvopumpejo
            water_tank: Kontraŭbrulega akvujo
            "yes": Je danĝero
          highway:
            water_tank: Kontraŭbrulega akvujo
            "yes": Je danĝero
          highway:
@@ -687,6 +767,7 @@ eo:
            cycleway: Bicikovojo
            elevator: Lifto
            emergency_access_point: Vivsava rekonebla signo
            cycleway: Bicikovojo
            elevator: Lifto
            emergency_access_point: Vivsava rekonebla signo
+          emergency_bay: Kriokaza strat-golfo
            footway: Piedvojeto
            ford: Travadejo
            give_way: Trafiksigno ‘cedi traveturon’
            footway: Piedvojeto
            ford: Travadejo
            give_way: Trafiksigno ‘cedi traveturon’
@@ -717,35 +798,45 @@ eo:
            tertiary: Vojo tria-ranga
            tertiary_link: Ligilo al vojo tria-ranga
            track: Vojo kampa
            tertiary: Vojo tria-ranga
            tertiary_link: Ligilo al vojo tria-ranga
            track: Vojo kampa
+          traffic_mirror: Trafika spegulo
            traffic_signals: Trafiklumoj
            traffic_signals: Trafiklumoj
+          trailhead: Komenco de turisma kurso
            trunk: Vojo ekspresa
            trunk_link: Ligilo al vojo ekspresa
            turning_loop: Ejo por ĝirado U-forma
            unclassified: Vojo kvara-ranga
            "yes": Vojo
          historic:
            trunk: Vojo ekspresa
            trunk_link: Ligilo al vojo ekspresa
            turning_loop: Ejo por ĝirado U-forma
            unclassified: Vojo kvara-ranga
            "yes": Vojo
          historic:
+          aircraft: Aviadilo historia
            archaeological_site: Arĥeologia ejo
            archaeological_site: Arĥeologia ejo
+          bomb_crater: Kratero eksploda
            battlefield: Batalejo historia
            boundary_stone: Limŝtono
            building: Konstruaĵo historia
            bunker: Bunkro armea
            battlefield: Batalejo historia
            boundary_stone: Limŝtono
            building: Konstruaĵo historia
            bunker: Bunkro armea
+          cannon: Pafilego historia
            castle: Kastelo
            castle: Kastelo
+          charcoal_pile: Karbigejo historia
            church: Kirko
            city_gate: Pordego urba
            citywalls: Muro urba
            fort: Fortikaĵo
            heritage: Heredaĵa objekto/ejo
            church: Kirko
            city_gate: Pordego urba
            citywalls: Muro urba
            fort: Fortikaĵo
            heritage: Heredaĵa objekto/ejo
+          hollow_way: Voja kavo
            house: Domo
            manor: Palaceto historia
            memorial: Memorigaĵo
            house: Domo
            manor: Palaceto historia
            memorial: Memorigaĵo
+          milestone: Mejloŝtono historia
            mine: Minejo
            mine_shaft: Ŝakto
            monument: Monumento
            mine: Minejo
            mine_shaft: Ŝakto
            monument: Monumento
+          railway: Historia fervoja objekto
            roman_road: Romia ŝoseo
            ruins: Ruinoj historiaj
            stone: Ŝtonego historia
            tomb: Tombo
            tower: Turo
            roman_road: Romia ŝoseo
            ruins: Ruinoj historiaj
            stone: Ŝtonego historia
            tomb: Tombo
            tower: Turo
+          wayside_chapel: Adorejo apudvoja
            wayside_cross: Krucifikso apudvoja
            wayside_shrine: Adorejo apudvoja
            wreck: Ruinoj de ŝipo
            wayside_cross: Krucifikso apudvoja
            wayside_shrine: Adorejo apudvoja
            wreck: Ruinoj de ŝipo
@@ -754,6 +845,7 @@ eo:
            "yes": Vojkruciĝo
          landuse:
            allotments: Familiaj ĝardenoj
            "yes": Vojkruciĝo
          landuse:
            allotments: Familiaj ĝardenoj
+          aquaculture: Tereno de akvokulturo
            basin: Baseno
            brownfield: Antaŭ-konstruejo (post-malkonstruado)
            cemetery: Tombejo
            basin: Baseno
            brownfield: Antaŭ-konstruejo (post-malkonstruado)
            cemetery: Tombejo
@@ -773,9 +865,11 @@ eo:
            military: Armea tereno
            mine: Minejo
            orchard: Fruktoĝardeno
            military: Armea tereno
            mine: Minejo
            orchard: Fruktoĝardeno
+          plant_nursery: Arb-plantejo
            quarry: Minejo subĉiela
            railway: Fervojo
            recreation_ground: Ripoza tereno
            quarry: Minejo subĉiela
            railway: Fervojo
            recreation_ground: Ripoza tereno
+          religious: Religia tereno
            reservoir: Lago artefarita
            reservoir_watershed: Baseno artefarita
            residential: Privatdoma tereno
            reservoir: Lago artefarita
            reservoir_watershed: Baseno artefarita
            residential: Privatdoma tereno
@@ -784,9 +878,15 @@ eo:
            vineyard: Vinberĝardeno
            "yes": Utilkampo
          leisure:
            vineyard: Vinberĝardeno
            "yes": Utilkampo
          leisure:
+          adult_gaming_centre: Hazardludejo
+          amusement_arcade: Salono de ludoj
+          bandstand: Orkestrejo
            beach_resort: Apudmara ripoz-centro
            bird_hide: Bird-observejo
            beach_resort: Apudmara ripoz-centro
            bird_hide: Bird-observejo
+          bleachers: Spektejo
+          bowling_alley: Kegloludejo
            common: Publika ripoza tereno
            common: Publika ripoza tereno
+          dance: Dancejo
            dog_park: Hund-parko
            firepit: Lignofajrejo
            fishing: Fiŝkaptadejo
            dog_park: Hund-parko
            firepit: Lignofajrejo
            fishing: Fiŝkaptadejo
@@ -799,7 +899,9 @@ eo:
            marina: Jaĥt-haveno
            miniature_golf: Minigolfludejo
            nature_reserve: Naturrezervejo
            marina: Jaĥt-haveno
            miniature_golf: Minigolfludejo
            nature_reserve: Naturrezervejo
+          outdoor_seating: Seĝoj eksterdome
            park: Parko
            park: Parko
+          picnic_table: Piknika tablo
            pitch: Ludkampo
            playground: Infana ludejo
            recreation_ground: Ripoza tereno
            pitch: Ludkampo
            playground: Infana ludejo
            recreation_ground: Ripoza tereno
@@ -814,13 +916,21 @@ eo:
            "yes": Ripozejo
          man_made:
            adit: Minejo horizontala
            "yes": Ripozejo
          man_made:
            adit: Minejo horizontala
+          advertising: Reklamo
+          antenna: Anteno
+          avalanche_protection: Kontraŭ-lavanga protektilo
            beacon: Buo fiksa
            beacon: Buo fiksa
+          beam: Trabo
            beehive: Abulejo
            breakwater: Ond-rompilo
            bridge: Ponto
            bunker_silo: Bunkro armea
            beehive: Abulejo
            breakwater: Ond-rompilo
            bridge: Ponto
            bunker_silo: Bunkro armea
+          cairn: Ŝtonamaso
            chimney: Fumtubo
            chimney: Fumtubo
+          clearcut: Hakita arbaro
+          communications_tower: Turo telekomunikada
            crane: Gruo
            crane: Gruo
+          cross: Kruco
            dolphin: Dukdalbo
            dyke: Digo
            embankment: Surŝutaĵo
            dolphin: Dukdalbo
            dyke: Digo
            embankment: Surŝutaĵo
@@ -829,6 +939,7 @@ eo:
            groyne: Ond-rompileto
            kiln: Forno industria
            lighthouse: Lumturo
            groyne: Ond-rompileto
            kiln: Forno industria
            lighthouse: Lumturo
+          manhole: Stratkanala kovrilo
            mast: Masto
            mine: Minejo
            mineshaft: Ŝakto
            mast: Masto
            mine: Minejo
            mineshaft: Ŝakto
@@ -836,12 +947,20 @@ eo:
            petroleum_well: Naftoŝakto
            pier: Marponto
            pipeline: Konduktubo
            petroleum_well: Naftoŝakto
            pier: Marponto
            pipeline: Konduktubo
+          pumping_station: Pump-stacio
+          reservoir_covered: Kovrita akvorezervujo
            silo: Tur-stokejo
            silo: Tur-stokejo
+          snow_cannon: Neĝokanono
+          snow_fence: Kontraŭ-neĝa barilo
            storage_tank: Rezervujo
            storage_tank: Rezervujo
+          street_cabinet: Ŝranko distribua
            surveillance: Supergardo
            surveillance: Supergardo
+          telescope: Teleskopo
            tower: Turo
            tower: Turo
+          utility_pole: Fosto
            wastewater_plant: Akvopurigejo
            watermill: Muelejo akva
            wastewater_plant: Akvopurigejo
            watermill: Muelejo akva
+          water_tap: Akvokrano
            water_tower: Akvoturo
            water_well: Puto
            water_works: Akvotrinkebligejo
            water_tower: Akvoturo
            water_well: Puto
            water_works: Akvotrinkebligejo
@@ -852,10 +971,13 @@ eo:
            airfield: Aerbazo armea
            barracks: Soldatejo
            bunker: Bunkro armea
            airfield: Aerbazo armea
            barracks: Soldatejo
            bunker: Bunkro armea
+          checkpoint: Kontrolejo armea
+          trench: Tranĉeo armea
            "yes": Armeo
          mountain_pass:
            "yes": Montpasejo
          natural:
            "yes": Armeo
          mountain_pass:
            "yes": Montpasejo
          natural:
+          bare_rock: Roka areo
            bay: Golfo
            beach: Sablobordo
            cape: Promontoro
            bay: Golfo
            beach: Sablobordo
            cape: Promontoro
@@ -871,6 +993,7 @@ eo:
            grassland: Herbejo
            heath: Erikejo
            hill: Monteto
            grassland: Herbejo
            heath: Erikejo
            hill: Monteto
+          hot_spring: Tervarma akvofonto
            island: Insulo
            land: Tero
            marsh: Aluvia grundo
            island: Insulo
            land: Tero
            marsh: Aluvia grundo
@@ -894,20 +1017,31 @@ eo:
            water: Akvejo
            wetland: Malsekejo
            wood: Arbaro
            water: Akvejo
            wetland: Malsekejo
            wood: Arbaro
+          "yes": Naturo
          office:
            accountant: Oficejo de kontisto
            administrative: Administra oficejo
          office:
            accountant: Oficejo de kontisto
            administrative: Administra oficejo
+          advertising_agency: Oficejo de reklamo
            architect: Oficejo de arĥitekturisto
            association: Oficejo de asocio
            company: Oficejo de firmao
            architect: Oficejo de arĥitekturisto
            association: Oficejo de asocio
            company: Oficejo de firmao
+          diplomatic: Oficejo diplomata
            educational_institution: Oficejo de edukada institucio
            employment_agency: Dungoficejo
            educational_institution: Oficejo de edukada institucio
            employment_agency: Dungoficejo
+          energy_supplier: Oficejo de elektr-provizanto
            estate_agent: Oficejo de nemoveblaĵisto
            estate_agent: Oficejo de nemoveblaĵisto
+          financial: Oficejo financa
            government: Registara oficejo
            insurance: Asekurkompaniejo
            it: Oficejo de informteĥnika firmao
            lawyer: Oficejo de leĝisto
            government: Registara oficejo
            insurance: Asekurkompaniejo
            it: Oficejo de informteĥnika firmao
            lawyer: Oficejo de leĝisto
+          logistics: Oficejo de ekspedo
+          newspaper: Oficejo de redakto
            ngo: Oficejo de ne-registara organizaĵo
            ngo: Oficejo de ne-registara organizaĵo
+          notary: Oficejo de notario
+          religion: Kancelario religia
+          research: Oficejo de scienca esplorado
+          tax_advisor: Oficejo de impost-konsilo
            telecommunication: Telekomunikada oficejo
            travel_agent: Vojaĝ-oficejo
            "yes": Oficejo
            telecommunication: Telekomunikada oficejo
            travel_agent: Vojaĝ-oficejo
            "yes": Oficejo
@@ -927,6 +1061,7 @@ eo:
            locality: Ejo
            municipality: Municipo
            neighbourhood: Najbaraĵo
            locality: Ejo
            municipality: Municipo
            neighbourhood: Najbaraĵo
+          plot: Parcelo
            postcode: Poŝtkodo
            quarter: Kvartalo
            region: Regiono
            postcode: Poŝtkodo
            quarter: Kvartalo
            region: Regiono
@@ -961,12 +1096,19 @@ eo:
            switch: Trakforko
            tram: Tramlinio
            tram_stop: Haltejo trama
            switch: Trakforko
            tram: Tramlinio
            tram_stop: Haltejo trama
+          yard: Stacio fervoja vara
          shop:
          shop:
+          agrarian: Agrokultura vendejo
            alcohol: Alkohol-vendejo
            antiques: Antikvaĵ-vendejo
            alcohol: Alkohol-vendejo
            antiques: Antikvaĵ-vendejo
+          appliance: Elektronikaĵega vendejo
            art: Artaĵ-vendejo
            art: Artaĵ-vendejo
+          baby_goods: Bebaĵa vendejo
+          bag: Saka/valiza vendejo
            bakery: Panejo
            bakery: Panejo
+          bathroom_furnishing: Lavĉambr-akcesoraĵa vendejo
            beauty: Beligejo
            beauty: Beligejo
+          bed: Lita/matraca vendejo
            beverages: Trinkaĵ-vendejo
            bicycle: Bicikl-vendejo
            bookmaker: Vetperisto
            beverages: Trinkaĵ-vendejo
            bicycle: Bicikl-vendejo
            bookmaker: Vetperisto
@@ -978,61 +1120,90 @@ eo:
            car_repair: Aŭtoriparejo
            carpet: Tapiŝ-vendejo
            charity: Almoza vendejo
            car_repair: Aŭtoriparejo
            carpet: Tapiŝ-vendejo
            charity: Almoza vendejo
+          cheese: Fromaĝa vendejo
            chemist: Purigaĵ-vendejo
            chemist: Purigaĵ-vendejo
+          chocolate: Ĉokolada vendejo
            clothes: Vesta vendejo
            clothes: Vesta vendejo
+          coffee: Kafa vendejo
            computer: Komputil-vendejo
            confectionery: Sukeraĵejo
            convenience: Butiko oportuna
            copyshop: Fotokopiilejo
            cosmetics: Kosmetikaĵ-vendejo
            computer: Komputil-vendejo
            confectionery: Sukeraĵejo
            convenience: Butiko oportuna
            copyshop: Fotokopiilejo
            cosmetics: Kosmetikaĵ-vendejo
+          craft: Materialoj-por-metio-vendejo
+          curtain: Kurtena vendejo
+          dairy: Laktaĵa vendejo
            deli: Delikataĵ-vendejo
            department_store: Ĉiovendejo
            discount: Vendejo kun rabatitaj artikoloj
            doityourself: Memfaradil-vendejo
            dry_cleaning: Vestaĵ-lavejo (nepolara solvilo)
            deli: Delikataĵ-vendejo
            department_store: Ĉiovendejo
            discount: Vendejo kun rabatitaj artikoloj
            doityourself: Memfaradil-vendejo
            dry_cleaning: Vestaĵ-lavejo (nepolara solvilo)
+          e-cigarette: Elektronik-cigareda vendejo
            electronics: Elektronik-vendejo
            electronics: Elektronik-vendejo
+          erotic: Seksumila vendejo
            estate_agent: Oficejo de nemoveblaĵisto
            estate_agent: Oficejo de nemoveblaĵisto
+          fabric: Teksaĵa vendejo
            farm: Terfrukt-vendejo
            fashion: Vesta vendejo
            farm: Terfrukt-vendejo
            fashion: Vesta vendejo
+          fishing: Fiŝkaptila vendejo
            florist: Florvendejo
            food: Manĝovendejo
            florist: Florvendejo
            food: Manĝovendejo
+          frame: Kadroj-de-pentraĵoj-vendejo
            funeral_directors: Tombistejo
            furniture: Mebl-vendejo
            garden_centre: Ĝarden-vendejo
            funeral_directors: Tombistejo
            furniture: Mebl-vendejo
            garden_centre: Ĝarden-vendejo
+          gas: Gasa vendejo
            general: Ĝeneral-vendejo
            gift: Suvenir-vendejo
            greengrocer: Legom-butiko
            grocery: Manĝovendejo
            hairdresser: Frizejo
            hardware: Laboril-vendejo
            general: Ĝeneral-vendejo
            gift: Suvenir-vendejo
            greengrocer: Legom-butiko
            grocery: Manĝovendejo
            hairdresser: Frizejo
            hardware: Laboril-vendejo
+          health_food: Sanig-manĝaĵa vendejo
+          hearing_aids: Aŭd-helpila vendejo
+          herbalist: Herba vendejo
            hifi: Altfidel-son-vendejo
            houseware: Mastrum-aparata vendejo
            hifi: Altfidel-son-vendejo
            houseware: Mastrum-aparata vendejo
+          ice_cream: Glaciaĵa vendejo
            interior_decoration: Ensembl-vendejo
            jewelry: Juvel-vendejo
            kiosk: Gazetbudo
            kitchen: Kuirej-mebla vendejo
            laundry: Vestaĵ-lavejo (akvo)
            interior_decoration: Ensembl-vendejo
            jewelry: Juvel-vendejo
            kiosk: Gazetbudo
            kitchen: Kuirej-mebla vendejo
            laundry: Vestaĵ-lavejo (akvo)
+          locksmith: Laborejo de seruristo
            lottery: Loteri-vendejo
            mall: Vendejaro
            massage: Kabineto de masaĝo
            lottery: Loteri-vendejo
            mall: Vendejaro
            massage: Kabineto de masaĝo
+          medical_supply: Medicin-aparata vendejo
            mobile_phone: Poŝtelefon-vendejo
            mobile_phone: Poŝtelefon-vendejo
+          money_lender: Mon-pruntejo
            motorcycle: Motorcikl-vendejo
            motorcycle: Motorcikl-vendejo
+          motorcycle_repair: Motorcikl-riparejo
            music: Muzik-vendejo
            music: Muzik-vendejo
+          musical_instrument: Muzik-instrumenta vendejo
            newsagent: Gazet-vendejo
            newsagent: Gazet-vendejo
+          nutrition_supplements: Diet-suplementa vendejo
            optician: Optikbutiko
            organic: Ekologi-manĝaĵa vendejo
            outdoor: Vojaĝil-vendejo
            paint: Farb-vendejo
            optician: Optikbutiko
            organic: Ekologi-manĝaĵa vendejo
            outdoor: Vojaĝil-vendejo
            paint: Farb-vendejo
+          pastry: Kukejo
            pawnbroker: Mon-pruntejo (kontraŭ garantiaĵo)
            pawnbroker: Mon-pruntejo (kontraŭ garantiaĵo)
+          perfumery: Parfumejo
            pet: Dombest-vendejo
            pet: Dombest-vendejo
+          pet_grooming: Hejmbesta beligejo
            photo: Fotovendejo
            seafood: Marfrukt-vendejo
            second_hand: Brokantejo
            photo: Fotovendejo
            seafood: Marfrukt-vendejo
            second_hand: Brokantejo
+          sewing: Kudrilar-vendejo
            shoes: Ŝuo-vendejo
            sports: Sportovendejo
            stationery: Papervaro-vendejo
            shoes: Ŝuo-vendejo
            sports: Sportovendejo
            stationery: Papervaro-vendejo
+          storage_rental: Magazena spaco por lui
            supermarket: Superbazaro
            tailor: Tajlorejo
            supermarket: Superbazaro
            tailor: Tajlorejo
+          tattoo: Salono de tatuado
+          tea: Tea vendejo
            ticket: Bilet-vendejo
            tobacco: Tabak-vendejo
            toys: Ludil-vendejo
            ticket: Bilet-vendejo
            tobacco: Tabak-vendejo
            toys: Ludil-vendejo
@@ -1041,6 +1212,8 @@ eo:
            vacant: Forlasita vendejo
            variety_store: Diversaĵ-vendejo
            video: Filmovendejo
            vacant: Forlasita vendejo
            variety_store: Diversaĵ-vendejo
            video: Filmovendejo
+          video_games: Videoluda vendejo
+          wholesale: Pogranda vendejo
            wine: Vin-vendejo
            "yes": Vendejo
          tourism:
            wine: Vin-vendejo
            "yes": Vendejo
          tourism:
@@ -1050,6 +1223,7 @@ eo:
            attraction: Vidindaĵo
            bed_and_breakfast: Pensiono 'tranokti k matenmanĝi'
            cabin: Kabano
            attraction: Vidindaĵo
            bed_and_breakfast: Pensiono 'tranokti k matenmanĝi'
            cabin: Kabano
+          camp_pitch: Loko por kampadveturilo/tendo
            camp_site: Kampadejo
            caravan_site: Kampadveturil-parkumejo
            chalet: Dometo feria
            camp_site: Kampadejo
            caravan_site: Kampadveturil-parkumejo
            chalet: Dometo feria
@@ -1063,6 +1237,7 @@ eo:
            picnic_site: Piknika ejo
            theme_park: Amuzparko
            viewpoint: Belvidejo
            picnic_site: Piknika ejo
            theme_park: Amuzparko
            viewpoint: Belvidejo
+          wilderness_hut: Sovaĝeja kabano
            zoo: Bestoĝardeno
          tunnel:
            building_passage: Trakonstruaĵa tunelo
            zoo: Bestoĝardeno
          tunnel:
            building_passage: Trakonstruaĵa tunelo
@@ -2749,7 +2924,7 @@ eo:
        node: Nodo
        way: Linio
        relation: Rilato
        node: Nodo
        way: Linio
        relation: Rilato
-      nothing_found: Neniuj objektoj trovitaj
+      nothing_found: Neniu objekto trovita
        error: 'Eraro dum komunikado kun %{server}: %{error}'
        timeout: Atingis tempolimon dum kontakto kun %{server}
      context:
        error: 'Eraro dum komunikado kun %{server}: %{error}'
        timeout: Atingis tempolimon dum kontakto kun %{server}
      context:
diff --git a/config/locales/is.yml b/config/locales/is.yml

index 784375153d9949eab47967353a096dff5d433f8e..aa9c9579eca74c08e913ea5196eb952f61195d88 100644 (file)
--- a/config/locales/is.yml
+++ b/config/locales/is.yml
@@ -19,6 +19,8 @@ is:
        friendly: '%e. %B %Y kl. %H:%M'
        blog: '%e. %B %Y'
    helpers:
        friendly: '%e. %B %Y kl. %H:%M'
        blog: '%e. %B %Y'
    helpers:
+    file:
+      prompt: Veldu skrá
      submit:
        diary_comment:
          create: Vista
      submit:
        diary_comment:
          create: Vista
@@ -31,7 +33,7 @@ is:
          create: Senda
        client_application:
          create: Nýskrá
          create: Senda
        client_application:
          create: Nýskrá
-        update: Breyta
+        update: Uppfæra
        redaction:
          create: Búa til leiðréttingu
          update: Vista leiðréttingu
        redaction:
          create: Búa til leiðréttingu
          update: Vista leiðréttingu
@@ -84,8 +86,18 @@ is:
        way_tag: Merki leiðar
      attributes:
        client_application:
        way_tag: Merki leiðar
      attributes:
        client_application:
+        name: Nafn (krafist)
+        url: Slóð á aðalforritið (nauðsynleg)
          callback_url: Svarslóð
          support_url: Slóð á aðstoð
          callback_url: Svarslóð
          support_url: Slóð á aðstoð
+        allow_read_prefs: lesa notandastillingar þeirra
+        allow_write_prefs: breyta notandastillingum þeirra
+        allow_write_diary: búa til bloggfærslur, setja inn athugasemdir og bæta við
+          vinum
+        allow_write_api: breyta kortagögnunum
+        allow_read_gpx: lesa einka-GPS-ferlana þeirra
+        allow_write_gpx: senda inn GPS ferla
+        allow_write_notes: breyta minnispunktum
        diary_comment:
          body: Texti
        diary_entry:
        diary_comment:
          body: Texti
        diary_entry:
@@ -100,21 +112,22 @@ is:
        trace:
          user: Notandi
          visible: Sýnileg
        trace:
          user: Notandi
          visible: Sýnileg
-        name: Nafn
+        name: Skráarheiti
          size: Stærð
          latitude: Breiddargráða
          longitude: Lengdargráða
          public: Opinbert
          description: Lýsing
          size: Stærð
          latitude: Breiddargráða
          longitude: Lengdargráða
          public: Opinbert
          description: Lýsing
-        gpx_file: 'Hlaða inn GPX skrá:'
-        visibility: 'Sýnileiki:'
-        tagstring: 'Merki:'
+        gpx_file: Hlaða inn GPX-skrá
+        visibility: Sýnileiki
+        tagstring: Merki
        message:
          sender: Sendandi
          title: Fyrirsögn
          body: Texti
          recipient: Móttakandi
        report:
        message:
          sender: Sendandi
          title: Fyrirsögn
          body: Texti
          recipient: Móttakandi
        report:
+        category: Veldu ástæðu fyrir að þú gerir skýrslu
          details: Tilgreindu öll nauðsynleg atriði um vandamálið (nauðsynlegt).
        user:
          email: Netfang
          details: Tilgreindu öll nauðsynleg atriði um vandamálið (nauðsynlegt).
        user:
          email: Netfang
@@ -123,6 +136,7 @@ is:
          description: Lýsing
          languages: Tungumál
          pass_crypt: Lykilorð
          description: Lýsing
          languages: Tungumál
          pass_crypt: Lykilorð
+        pass_crypt_confirmation: Staðfestu lykilorð
      help:
        trace:
          tagstring: aðskilið með kommum
      help:
        trace:
          tagstring: aðskilið með kommum
@@ -229,10 +243,18 @@ is:
      anonymous: nafnlaus
      no_comment: (engin athugasemd)
      part_of: Hluti af
      anonymous: nafnlaus
      no_comment: (engin athugasemd)
      part_of: Hluti af
+    part_of_relations:
+      one: 1 vensl
+      other: '%{count} vensl'
+    part_of_ways:
+      one: 1 leið
+      other: '%{count} leiðir'
      download_xml: Sækja XML
      view_history: Skoða feril
      view_details: Skoða nánar
      location: 'Staðsetning:'
      download_xml: Sækja XML
      view_history: Skoða feril
      view_details: Skoða nánar
      location: 'Staðsetning:'
+    common_details:
+      coordinates_html: '%{latitude}, %{longitude}'
      changeset:
        title: 'Breytingasett: %{id}'
        belongs_to: Höfundur
      changeset:
        title: 'Breytingasett: %{id}'
        belongs_to: Höfundur
@@ -261,6 +283,9 @@ is:
        title_html: 'Leið: %{name}'
        history_title_html: 'Saga leiðar: %{name}'
        nodes: Hnútar
        title_html: 'Leið: %{name}'
        history_title_html: 'Saga leiðar: %{name}'
        nodes: Hnútar
+      nodes_count:
+        one: liður
+        other: '%{count} liðir'
        also_part_of_html:
          one: hluti leiðar %{related_ways}
          other: hlutar leiða %{related_ways}
        also_part_of_html:
          one: hluti leiðar %{related_ways}
          other: hlutar leiða %{related_ways}
@@ -268,6 +293,9 @@ is:
        title_html: 'Vensl: %{name}'
        history_title_html: 'Ferill vensla: %{name}'
        members: Meðlimir
        title_html: 'Vensl: %{name}'
        history_title_html: 'Ferill vensla: %{name}'
        members: Meðlimir
+      members_count:
+        one: 1 meðlimur
+        other: '%{count} meðlimir'
      relation_member:
        entry_html: '%{type} %{name}'
        entry_role_html: '%{type} %{name} sem „%{role}“'
      relation_member:
        entry_html: '%{type} %{name}'
        entry_role_html: '%{type} %{name} sem „%{role}“'
@@ -338,6 +366,7 @@ is:
        reopened_by_anonymous: Endurvirkjað af nafnlausum notanda fyrir <abbr title='%{exact_time}'>%{when}</abbr>
        hidden_by: Falið af %{user} <abbr title='%{exact_time}'> %{when}</abbr>
        report: Tilkynna þennan minnispunkt
        reopened_by_anonymous: Endurvirkjað af nafnlausum notanda fyrir <abbr title='%{exact_time}'>%{when}</abbr>
        hidden_by: Falið af %{user} <abbr title='%{exact_time}'> %{when}</abbr>
        report: Tilkynna þennan minnispunkt
+      coordinates_html: '%{latitude}, %{longitude}'
      query:
        title: Rannsaka fitjur
        introduction: Smelltu á kortið til að finna fitjur í nágrenninu.
      query:
        title: Rannsaka fitjur
        introduction: Smelltu á kortið til að finna fitjur í nágrenninu.
@@ -404,6 +433,7 @@ is:
        in_language_title: Bloggfærslur á %{language}
        new: Ný bloggfærsla
        new_title: Semja nýja færslu á bloggið mitt
        in_language_title: Bloggfærslur á %{language}
        new: Ný bloggfærsla
        new_title: Semja nýja færslu á bloggið mitt
+      my_diary: Bloggið mitt
        no_entries: Engar bloggfærslur
        recent_entries: Nýlegar bloggfærslur
        older_entries: Eldri færslur
        no_entries: Engar bloggfærslur
        recent_entries: Nýlegar bloggfærslur
        older_entries: Eldri færslur
@@ -425,7 +455,7 @@ is:
      diary_entry:
        posted_by_html: Sett inn af %{link_user} %{created} á %{language_link}
        comment_link: Bæta athugasemd við þessa færslu
      diary_entry:
        posted_by_html: Sett inn af %{link_user} %{created} á %{language_link}
        comment_link: Bæta athugasemd við þessa færslu
-      reply_link: Svara þessari færslu
+      reply_link: Senda skilaboð til höfundar
        comment_count:
          zero: Engar athugasemdir
          one: '%{count} athugasemd'
        comment_count:
          zero: Engar athugasemdir
          one: '%{count} athugasemd'
@@ -445,6 +475,7 @@ is:
        location: 'Staðsetning:'
        view: Skoða
        edit: Breyta
        location: 'Staðsetning:'
        view: Skoða
        edit: Breyta
+      coordinates: '%{latitude}; %{longitude}'
      feed:
        user:
          title: OpenStreetMap bloggfærslur eftir %{user}
      feed:
        user:
          title: OpenStreetMap bloggfærslur eftir %{user}
@@ -493,10 +524,12 @@ is:
            chair_lift: Stólalyfta
            drag_lift: Toglyfta
            gondola: Eggjalyfta
            chair_lift: Stólalyfta
            drag_lift: Toglyfta
            gondola: Eggjalyfta
+          magic_carpet: Töfrateppislyfta
            platter: Diskalyfta
            pylon: Lyftumastur
            station: Lyftustöð
            t-bar: T-lyfta
            platter: Diskalyfta
            pylon: Lyftumastur
            station: Lyftustöð
            t-bar: T-lyfta
+          "yes": Víralyfta
          aeroway:
            aerodrome: Flugsvæði
            airstrip: Flugbraut
          aeroway:
            aerodrome: Flugsvæði
            airstrip: Flugbraut
@@ -505,11 +538,15 @@ is:
            hangar: Flugskýli
            helipad: Þyrlupallur
            holding_position: Biðstæði
            hangar: Flugskýli
            helipad: Þyrlupallur
            holding_position: Biðstæði
+          navigationaid: Aðstoð við flugleiðsögn
            parking_position: Loftfarastæði
            runway: Flugbraut
            parking_position: Loftfarastæði
            runway: Flugbraut
+          taxilane: Aksturbraut
            taxiway: Akbraut flugvéla
            terminal: Flugstöð
            taxiway: Akbraut flugvéla
            terminal: Flugstöð
+          windsock: Vindpoki
          amenity:
          amenity:
+          animal_boarding: Dýrahótel
            animal_shelter: Dýraheimili
            arts_centre: Listamiðstöð
            atm: Hraðbanki
            animal_shelter: Dýraheimili
            arts_centre: Listamiðstöð
            atm: Hraðbanki
@@ -519,7 +556,9 @@ is:
            bench: Bekkur
            bicycle_parking: Hjólastæði
            bicycle_rental: Reiðhjólaleiga
            bench: Bekkur
            bicycle_parking: Hjólastæði
            bicycle_rental: Reiðhjólaleiga
+          bicycle_repair_station: Reiðhjólaviðgerðastöð
            biergarten: Bjórgarður
            biergarten: Bjórgarður
+          blood_bank: Blóðbanki
            boat_rental: Bátaleiga
            brothel: Hóruhús
            bureau_de_change: Gjaldeyrisskipti
            boat_rental: Bátaleiga
            brothel: Hóruhús
            bureau_de_change: Gjaldeyrisskipti
@@ -536,6 +575,7 @@ is:
            clock: Klukka
            college: Framhaldsskóli
            community_centre: Samfélagsmiðstöð
            clock: Klukka
            college: Framhaldsskóli
            community_centre: Samfélagsmiðstöð
+          conference_centre: Ráðstefnumiðstöð
            courthouse: Dómshús
            crematorium: Bálstofa
            dentist: Tannlæknir
            courthouse: Dómshús
            crematorium: Bálstofa
            dentist: Tannlæknir
@@ -543,6 +583,7 @@ is:
            drinking_water: Drykkjarvatn
            driving_school: Ökuskóli
            embassy: Sendiráð
            drinking_water: Drykkjarvatn
            driving_school: Ökuskóli
            embassy: Sendiráð
+          events_venue: Aðstaða fyrir atburð
            fast_food: Skyndibitastaður
            ferry_terminal: Ferjustöð
            fire_station: Slökkvistöð
            fast_food: Skyndibitastaður
            ferry_terminal: Ferjustöð
            fire_station: Slökkvistöð
@@ -555,16 +596,24 @@ is:
            hospital: Sjúkrahús
            hunting_stand: Skotvöllur
            ice_cream: Ísbúð
            hospital: Sjúkrahús
            hunting_stand: Skotvöllur
            ice_cream: Ísbúð
+          internet_cafe: Netkaffi
            kindergarten: Leikskóli
            kindergarten: Leikskóli
+          language_school: Tungumálaskóli
            library: Bókasafn
            library: Bókasafn
+          loading_dock: Hleðslupallur
+          love_hotel: Elskendahótel
            marketplace: Markaður
            marketplace: Markaður
+          mobile_money_agent: Afgreiðsla farsímapeninga
            monastery: Klaustur
            monastery: Klaustur
+          money_transfer: Greiðslumiðlun
            motorcycle_parking: Mótorhjólastæði
            motorcycle_parking: Mótorhjólastæði
+          music_school: Tónlistarskóli
            nightclub: Næturklúbbur
            nursing_home: Hjúkrunarheimili
            parking: Bílastæði
            parking_entrance: Aðgangur að bílastæði
            parking_space: Bílastæði
            nightclub: Næturklúbbur
            nursing_home: Hjúkrunarheimili
            parking: Bílastæði
            parking_entrance: Aðgangur að bílastæði
            parking_space: Bílastæði
+          payment_terminal: Greiðslukassi
            pharmacy: Lyfjabúð
            place_of_worship: Tilbeiðslustaður
            police: Lögreglustöð
            pharmacy: Lyfjabúð
            place_of_worship: Tilbeiðslustaður
            police: Lögreglustöð
@@ -572,9 +621,13 @@ is:
            post_office: Pósthús
            prison: Fangelsi
            pub: Krá
            post_office: Pósthús
            prison: Fangelsi
            pub: Krá
+          public_bath: Almenningsbaðhús
+          public_bookcase: Almenningsbókakassi
            public_building: Opinber bygging
            public_building: Opinber bygging
+          ranger_station: Landvarðastöð
            recycling: Endurvinnsla
            restaurant: Veitingastaður
            recycling: Endurvinnsla
            restaurant: Veitingastaður
+          sanitary_dump_station: Stöð fyrir hreinlætisúrgang
            school: Skóli
            shelter: Skýli
            shower: Sturta
            school: Skóli
            shelter: Skýli
            shower: Sturta
@@ -587,18 +640,27 @@ is:
            theatre: Leikhús
            toilets: Klósett
            townhall: Ráðhús
            theatre: Leikhús
            toilets: Klósett
            townhall: Ráðhús
+          training: Æfingaaðstaða
            university: Háskóli
            university: Háskóli
+          vehicle_inspection: Bifreiðaskoðun
            vending_machine: Sjálfsali
            veterinary: Dýraspítali
            village_hall: Hreppsskrifstofa
            waste_basket: Ruslafata
            waste_disposal: Ruslsöfnun
            vending_machine: Sjálfsali
            veterinary: Dýraspítali
            village_hall: Hreppsskrifstofa
            waste_basket: Ruslafata
            waste_disposal: Ruslsöfnun
+          waste_dump_site: Sorplosunarsvæði
+          watering_place: Vatnsból
            water_point: Vatnspóstur
            water_point: Vatnspóstur
+          weighbridge: Bílavog
+          "yes": Aðstaða
          boundary:
          boundary:
+          aboriginal_lands: Frumbyggjaland
            administrative: Stjórnsýslumörk
            census: Manntalsmörk
            national_park: Þjóðgarður
            administrative: Stjórnsýslumörk
            census: Manntalsmörk
            national_park: Þjóðgarður
+          political: Kjördeilda/kjördæmamörk
            protected_area: Verndarsvæði
            protected_area: Verndarsvæði
+          "yes": Mörk
          bridge:
            aqueduct: Vatnsveitubrú
            boardwalk: Plankabrú
          bridge:
            aqueduct: Vatnsveitubrú
            boardwalk: Plankabrú
@@ -607,39 +669,94 @@ is:
            viaduct: Dalbrú
            "yes": Brú
          building:
            viaduct: Dalbrú
            "yes": Brú
          building:
-          apartments: Háhýsi
+          apartment: Íbúð
+          apartments: Íbúðir
+          barn: Hlaða
+          bungalow: Sumarbústaður
+          cabin: Kofi
            chapel: Kapellan
            chapel: Kapellan
-          church: Kirkjan
+          church: Kirkjubygging
+          civic: Almenningsbygging
+          college: Framhaldsskólabygging
            commercial: Verslunarhús
            commercial: Verslunarhús
+          construction: Bygging á framkvæmdastigi
+          detached: Aðskilið hús
            dormitory: Heimavist
            dormitory: Heimavist
+          duplex: Parhús
            farm: Bóndabær
            farm: Bóndabær
+          farm_auxiliary: Aðskilin bygging á býli
            garage: Bílskúr
            garage: Bílskúr
+          garages: Verkstæði
+          greenhouse: Gróðurhús
+          hangar: Flugskýli
            hospital: Sjúkrahús
            hospital: Sjúkrahús
-          hotel: Hótel
+          hotel: Hótelbygging
            house: Hús
            house: Hús
+          houseboat: Húsbátur
+          hut: Kofi
            industrial: Iðnaðarhús
            industrial: Iðnaðarhús
+          kindergarten: Leikskólabygging
+          manufacture: Verksmiðjubygging
            office: Skrifstofuhús
            public: Opinber bygging
            residential: Íbúðarhús
            office: Skrifstofuhús
            public: Opinber bygging
            residential: Íbúðarhús
+          retail: Verslunarbygging
+          roof: Þak
+          ruins: Byggingarústir
            school: Skóli
            school: Skóli
+          semidetached_house: Hálfaðgreint hús
+          service: Þjónustubygging
+          shed: Skúr
+          stable: Hesthús
+          static_caravan: Hjólhýsi
+          temple: Trúarleg bygging
+          terrace: Raðhús
+          train_station: Lestarstöðvarbygging
+          university: Háskólabygging
+          warehouse: Vöruhús
            "yes": Bygging
            "yes": Bygging
+        club:
+          scout: Aðstaða skátafélags
+          sport: Íþróttaklúbbur
+          "yes": Klúbbur
          craft:
          craft:
+          beekeper: Býflugnabóndi
+          blacksmith: Járnsmiður
            brewery: Brugghús
            carpenter: Trésmiður
            brewery: Brugghús
            carpenter: Trésmiður
+          caterer: Veisluþjónusta
+          confectionery: Sælgætisverslun
+          dressmaker: Klæðskeri
            electrician: Rafvirki
            electrician: Rafvirki
+          electronics_repair: Raftækjaviðgerðir
            gardener: Garðyrkjumaður
            gardener: Garðyrkjumaður
+          glaziery: Glerverkstæði
+          handicraft: Handverk
+          hvac: Loftræsti- og hitunarkerfi
+          metal_construction: Málmsmíði
            painter: Málari
            photographer: Ljósmyndari
            plumber: Pípulagningamaður
            painter: Málari
            photographer: Ljósmyndari
            plumber: Pípulagningamaður
+          roofer: Þaksmiður
+          sawmill: Sögunarmylla
            shoemaker: Skósmiður
            shoemaker: Skósmiður
+          stonemason: Steinsmiður
            tailor: Klæðskeri
            tailor: Klæðskeri
+          window_construction: Gluggasmíði
+          winery: Víngerð
            "yes": Handverkshús
          emergency:
            "yes": Handverkshús
          emergency:
+          access_point: Aðgangspunktur
            ambulance_station: Sjúkrabílastöð
            assembly_point: Safnsvæði
            defibrillator: Hjartastuðtæki
            ambulance_station: Sjúkrabílastöð
            assembly_point: Safnsvæði
            defibrillator: Hjartastuðtæki
+          fire_xtinguisher: Slökkvitæki
+          fire_water_pond: Slökkviliðsvatnsból
            landing_site: Neyðarlending
            landing_site: Neyðarlending
+          life_ring: Björgunarhringur
            phone: Neyðarsími
            phone: Neyðarsími
+          siren: Neyðarsírena
+          suction_point: Soghani fyrir neyðartilfelli
            water_tank: Vatnstankur fyrir neyðartilfelli
            "yes": Neyðartilfelli
          highway:
            water_tank: Vatnstankur fyrir neyðartilfelli
            "yes": Neyðartilfelli
          highway:
@@ -652,6 +769,7 @@ is:
            cycleway: Hjólastígur
            elevator: Lyfta
            emergency_access_point: Neyðaraðgangur
            cycleway: Hjólastígur
            elevator: Lyfta
            emergency_access_point: Neyðaraðgangur
+          emergency_bay: Neyðarútskot
            footway: Göngustígur
            ford: Vað
            give_way: Víkja-skilti
            footway: Göngustígur
            ford: Vað
            give_way: Víkja-skilti
@@ -682,35 +800,45 @@ is:
            tertiary: Annar vegur
            tertiary_link: Annar vegur
            track: Slóði
            tertiary: Annar vegur
            tertiary_link: Annar vegur
            track: Slóði
+          traffic_mirror: Umferðarspegill
            traffic_signals: Umferðarljós
            traffic_signals: Umferðarljós
+          trailhead: Upphaf slóða
            trunk: Stofnbraut (Hringvegurinn)
            trunk_link: Stofnbraut (Hringvegurinn)
            turning_loop: Snúningsslaufa
            unclassified: Óflokkaður vegur
            "yes": Vegur
          historic:
            trunk: Stofnbraut (Hringvegurinn)
            trunk_link: Stofnbraut (Hringvegurinn)
            turning_loop: Snúningsslaufa
            unclassified: Óflokkaður vegur
            "yes": Vegur
          historic:
+          aircraft: Söguleg flugvél
            archaeological_site: Fornminjar
            archaeological_site: Fornminjar
+          bomb_crater: Sögulegur sprengjugígur
            battlefield: Orustuvöllur
            boundary_stone: Landamerkjasteinn
            building: Söguleg bygging
            bunker: Sprengjubyrgi
            battlefield: Orustuvöllur
            boundary_stone: Landamerkjasteinn
            building: Söguleg bygging
            bunker: Sprengjubyrgi
+          cannon: Söguleg fallbyssa
            castle: Kastali
            castle: Kastali
+          charcoal_pile: Sögulegur kolahaugur
            church: Kirkja
            city_gate: Borgarhlið
            citywalls: Borgarmúrar
            fort: Virki
            heritage: Sögulegur staður
            church: Kirkja
            city_gate: Borgarhlið
            citywalls: Borgarmúrar
            fort: Virki
            heritage: Sögulegur staður
+          hollow_way: Tröð (niðursokkin leið)
            house: Hús
            manor: Herragarður
            memorial: Minnismerki
            house: Hús
            manor: Herragarður
            memorial: Minnismerki
+          milestone: Sögulegur kílómetrasteinn
            mine: Náma
            mine_shaft: Námugöng
            monument: Minnisvarði
            mine: Náma
            mine_shaft: Námugöng
            monument: Minnisvarði
+          railway: Sögulegt lestarspor
            roman_road: Rómverskur vegur
            ruins: Rústir
            stone: Steinn
            tomb: Gröf
            tower: Turn
            roman_road: Rómverskur vegur
            ruins: Rústir
            stone: Steinn
            tomb: Gröf
            tower: Turn
+          wayside_chapel: Vegakapella
            wayside_cross: Vegakross
            wayside_shrine: Vegaskrín
            wreck: Flak
            wayside_cross: Vegakross
            wayside_shrine: Vegaskrín
            wreck: Flak
@@ -719,6 +847,7 @@ is:
            "yes": Tenging
          landuse:
            allotments: Úthlutuð svæði
            "yes": Tenging
          landuse:
            allotments: Úthlutuð svæði
+          aquaculture: Vatnseldi
            basin: Lægð
            brownfield: Byggingarsvæði
            cemetery: Grafreitur
            basin: Lægð
            brownfield: Byggingarsvæði
            cemetery: Grafreitur
@@ -738,9 +867,11 @@ is:
            military: Hersvæði
            mine: Náma
            orchard: Trjágarður
            military: Hersvæði
            mine: Náma
            orchard: Trjágarður
+          plant_nursery: Græðlingaræktun
            quarry: Grjótnáma
            railway: Lestarteinar
            recreation_ground: Leikvöllur
            quarry: Grjótnáma
            railway: Lestarteinar
            recreation_ground: Leikvöllur
+          religious: Trúartengt svæði
            reservoir: Uppistöðulón
            reservoir_watershed: Vatnasvið uppistöðulóns
            residential: Íbúðasvæði
            reservoir: Uppistöðulón
            reservoir_watershed: Vatnasvið uppistöðulóns
            residential: Íbúðasvæði
@@ -749,9 +880,15 @@ is:
            vineyard: Vínekra
            "yes": Landnotkun
          leisure:
            vineyard: Vínekra
            "yes": Landnotkun
          leisure:
+          adult_gaming_centre: Spilasalur fyrir fullorðna
+          amusement_arcade: Spilasalur
+          bandstand: Hljómsveitarpallur
            beach_resort: Strandbær
            bird_hide: Fuglaskoðunarhús
            beach_resort: Strandbær
            bird_hide: Fuglaskoðunarhús
+          bleachers: Áhorfendapallar
+          bowling_alley: Keiluhöll
            common: Almenningur
            common: Almenningur
+          dance: Danssalur
            dog_park: Hundagarður
            firepit: Eldhola
            fishing: Fiskveiði
            dog_park: Hundagarður
            firepit: Eldhola
            fishing: Fiskveiði
@@ -764,7 +901,9 @@ is:
            marina: Bátalægi
            miniature_golf: Mínigolf
            nature_reserve: Náttúruverndarsvæði
            marina: Bátalægi
            miniature_golf: Mínigolf
            nature_reserve: Náttúruverndarsvæði
+          outdoor_seating: Sæti utandyra
            park: Almenningsgarður
            park: Almenningsgarður
+          picnic_table: Nestisborð
            pitch: Íþróttavöllur
            playground: Leikvöllur
            recreation_ground: Leikvöllur
            pitch: Íþróttavöllur
            playground: Leikvöllur
            recreation_ground: Leikvöllur
@@ -779,13 +918,21 @@ is:
            "yes": Afþreying
          man_made:
            adit: Námuinngangur
            "yes": Afþreying
          man_made:
            adit: Námuinngangur
+          advertising: Auglýsing
+          antenna: Loftnet
+          avalanche_protection: Snjóflóðavörn
            beacon: Miðunarmerki
            beacon: Miðunarmerki
+          beam: Biti
            beehive: Býflugnabú
            breakwater: Brimvarnargarður
            bridge: Brú
            bunker_silo: Sprengjubyrgi
            beehive: Býflugnabú
            breakwater: Brimvarnargarður
            bridge: Brú
            bunker_silo: Sprengjubyrgi
+          cairn: Varða
            chimney: Skorsteinn
            chimney: Skorsteinn
+          clearcut: Höggvið
+          communications_tower: Samskiptamastur
            crane: Krani
            crane: Krani
+          cross: Kross
            dolphin: Bryggjustólpi
            dyke: Flóðgarður
            embankment: Stallur
            dolphin: Bryggjustólpi
            dyke: Flóðgarður
            embankment: Stallur
@@ -794,6 +941,7 @@ is:
            groyne: Öldubrjótur
            kiln: Brennsluofn
            lighthouse: Viti
            groyne: Öldubrjótur
            kiln: Brennsluofn
            lighthouse: Viti
+          manhole: Mannop
            mast: Mastur
            mine: Náma
            mineshaft: Námugöng
            mast: Mastur
            mine: Náma
            mineshaft: Námugöng
@@ -801,12 +949,20 @@ is:
            petroleum_well: Olíulind
            pier: Bryggja
            pipeline: Leiðsla
            petroleum_well: Olíulind
            pier: Bryggja
            pipeline: Leiðsla
+          pumping_station: Dælustöð
+          reservoir_covered: Yfirbyggt vatnsforðabúr
            silo: Síló
            silo: Síló
+          snow_cannon: Snjóbyssa
+          snow_fence: Snjógirðing
            storage_tank: Geymslutankur
            storage_tank: Geymslutankur
+          street_cabinet: Götuklefi
            surveillance: Eftirlit
            surveillance: Eftirlit
+          telescope: Sjónauki
            tower: Turn
            tower: Turn
+          utility_pole: Strengjamastur
            wastewater_plant: Vatnshreinsistöð
            watermill: Vatnsmylla
            wastewater_plant: Vatnshreinsistöð
            watermill: Vatnsmylla
+          water_tap: Vatnshani
            water_tower: Vatnsturn
            water_well: Brunnur
            water_works: Vatnsvinnsla
            water_tower: Vatnsturn
            water_well: Brunnur
            water_works: Vatnsvinnsla
@@ -817,10 +973,13 @@ is:
            airfield: Herflugvöllur
            barracks: Herbúðir
            bunker: Sprengjubyrgi
            airfield: Herflugvöllur
            barracks: Herbúðir
            bunker: Sprengjubyrgi
+          checkpoint: Varðstöð
+          trench: Skurður
            "yes": Hernaðar
          mountain_pass:
            "yes": Fjallaskarð
          natural:
            "yes": Hernaðar
          mountain_pass:
            "yes": Fjallaskarð
          natural:
+          bare_rock: Berar klappir
            bay: Flói
            beach: Strönd
            cape: Höfði
            bay: Flói
            beach: Strönd
            cape: Höfði
@@ -836,6 +995,7 @@ is:
            grassland: Gresja
            heath: Heiði
            hill: Hæð
            grassland: Gresja
            heath: Heiði
            hill: Hæð
+          hot_spring: Heit uppspretta
            island: Eyja
            land: Land
            marsh: Votlendi
            island: Eyja
            land: Land
            marsh: Votlendi
@@ -859,20 +1019,31 @@ is:
            water: Vatn
            wetland: Votlendi
            wood: Skógur
            water: Vatn
            wetland: Votlendi
            wood: Skógur
+          "yes": Náttúrulegt fyrirbrigði
          office:
            accountant: Bókari
            administrative: Stjórnsýsla
          office:
            accountant: Bókari
            administrative: Stjórnsýsla
+          advertising_agency: Auglýsingastofa
            architect: Arkítektar
            association: Samtök
            company: Fyrirtæki
            architect: Arkítektar
            association: Samtök
            company: Fyrirtæki
+          diplomatic: Diplómataskrifstofa
            educational_institution: Menntastofnun
            employment_agency: Vinnumiðlun
            educational_institution: Menntastofnun
            employment_agency: Vinnumiðlun
+          energy_supplier: Skrifstofa orkusala
            estate_agent: Fasteignasali
            estate_agent: Fasteignasali
+          financial: Fjármálaskrifstofa
            government: Stjórnarskrifstofa
            insurance: Tryggingaskrifstofa
            it: Upplýsingatækniskrifstofa
            lawyer: Lögmaður
            government: Stjórnarskrifstofa
            insurance: Tryggingaskrifstofa
            it: Upplýsingatækniskrifstofa
            lawyer: Lögmaður
+          logistics: Birgðastjórnunarskrifstofa
+          newspaper: Skrifstofa dagblaðs
            ngo: Skrifstofa frjálsra félagasamtaka
            ngo: Skrifstofa frjálsra félagasamtaka
+          notary: Lögbókandi
+          religion: Skrifstofa trúarlegra málefna
+          research: Rannsóknaskrifstofa
+          tax_advisor: Skattaráðgjöf
            telecommunication: Fjarskiptaskrifstofa
            travel_agent: Ferðaskrifstofa
            "yes": Skrifstofa
            telecommunication: Fjarskiptaskrifstofa
            travel_agent: Ferðaskrifstofa
            "yes": Skrifstofa
@@ -892,6 +1063,7 @@ is:
            locality: Sveitarfélag
            municipality: Sveitarfélag
            neighbourhood: Nágrenni
            locality: Sveitarfélag
            municipality: Sveitarfélag
            neighbourhood: Nágrenni
+          plot: Lóð
            postcode: Póstnúmer
            quarter: Hverfi
            region: Hérað
            postcode: Póstnúmer
            quarter: Hverfi
            region: Hérað
@@ -926,12 +1098,19 @@ is:
            switch: Lestarteinaskipting
            tram: Sporvagn
            tram_stop: Sporvagnastöð
            switch: Lestarteinaskipting
            tram: Sporvagn
            tram_stop: Sporvagnastöð
+          yard: Járnbrautagerði
          shop:
          shop:
+          agrarian: Landbúnaðarverslun
            alcohol: Án vínveitingaleyfis
            antiques: Antíkverslun
            alcohol: Án vínveitingaleyfis
            antiques: Antíkverslun
+          appliance: Raftækjaverslun
            art: Listmunaverslun
            art: Listmunaverslun
+          baby_goods: Barnavörur
+          bag: Pokaverslun
            bakery: Bakarí
            bakery: Bakarí
+          bathroom_furnishing: Baðherbergisinnréttingar
            beauty: Snyrtivöruverslun
            beauty: Snyrtivöruverslun
+          bed: Svefnherbergisvörur
            beverages: Drykkjarfangaverslun
            bicycle: Hjólaverslun
            bookmaker: Veðmangari
            beverages: Drykkjarfangaverslun
            bicycle: Hjólaverslun
            bookmaker: Veðmangari
@@ -943,61 +1122,90 @@ is:
            car_repair: Bílaviðgerðir
            carpet: Teppabúð
            charity: Góðgerðaverslun
            car_repair: Bílaviðgerðir
            carpet: Teppabúð
            charity: Góðgerðaverslun
+          cheese: Ostabúð
            chemist: Lyfsali
            chemist: Lyfsali
+          chocolate: Súkkulaði
            clothes: Fataverslun
            clothes: Fataverslun
+          coffee: Kaffiverslun
            computer: Tölvuverslun
            confectionery: Sælgætisverslun
            convenience: Kjörbúð
            copyshop: Ljósritunarverslun
            cosmetics: Snyrtivöruverslun
            computer: Tölvuverslun
            confectionery: Sælgætisverslun
            convenience: Kjörbúð
            copyshop: Ljósritunarverslun
            cosmetics: Snyrtivöruverslun
+          craft: Aðföng fyrir handverk
+          curtain: Gluggatjaldaverslun
+          dairy: Mjólkurbúð
            deli: Sælkeraverslun
            department_store: Kjörbúð
            discount: Afsláttarvöruverslun
            doityourself: Föndurvörur
            dry_cleaning: Þurrhreinsun
            deli: Sælkeraverslun
            department_store: Kjörbúð
            discount: Afsláttarvöruverslun
            doityourself: Föndurvörur
            dry_cleaning: Þurrhreinsun
+          e-cigarette: Rafrettuverslun
            electronics: Raftækjaverslun
            electronics: Raftækjaverslun
+          erotic: Erótísk verslun
            estate_agent: Fasteignasali
            estate_agent: Fasteignasali
+          fabric: Vefnaðarvöruverslun
            farm: Beint frá býli
            fashion: Tískuverslun
            farm: Beint frá býli
            fashion: Tískuverslun
+          fishing: Fiskveiðivöruverslun
            florist: Blómabúð
            food: Matvöruverslun
            florist: Blómabúð
            food: Matvöruverslun
+          frame: Rammabúð
            funeral_directors: Útfararstjóri
            furniture: Húsgögn
            garden_centre: Garðyrkja
            funeral_directors: Útfararstjóri
            furniture: Húsgögn
            garden_centre: Garðyrkja
+          gas: Gasverslun
            general: Almenn verslun
            gift: Gjafabúð
            greengrocer: Grænmetissali
            grocery: Matvöruverslun
            hairdresser: Hársnyrting
            hardware: Verkfærabúð
            general: Almenn verslun
            gift: Gjafabúð
            greengrocer: Grænmetissali
            grocery: Matvöruverslun
            hairdresser: Hársnyrting
            hardware: Verkfærabúð
+          health_food: Heilsufæðisverslun
+          hearing_aids: Heyrnartæki
+          herbalist: Jurtaverslun
            hifi: Hljómtækjaverslun
            houseware: Húsbúnaðarverslun
            hifi: Hljómtækjaverslun
            houseware: Húsbúnaðarverslun
+          ice_cream: Ísbúð
            interior_decoration: Innanhúshönnun
            jewelry: Skartgripaverslun
            kiosk: Söluturn
            kitchen: Eldhúsvörur
            laundry: Þvottahús
            interior_decoration: Innanhúshönnun
            jewelry: Skartgripaverslun
            kiosk: Söluturn
            kitchen: Eldhúsvörur
            laundry: Þvottahús
+          locksmith: Lásasmíði
            lottery: Lottó
            mall: Verslunarkjarni
            massage: Nudd
            lottery: Lottó
            mall: Verslunarkjarni
            massage: Nudd
+          medical_supply: Lækningavöruverslun
            mobile_phone: Farsímaverslun
            mobile_phone: Farsímaverslun
+          money_lender: Peningaútlán
            motorcycle: Mótorhjólaverslun
            motorcycle: Mótorhjólaverslun
+          motorcycle_repair: Mótorhjólaviðgerðir
            music: Tónlistarverslun
            music: Tónlistarverslun
+          musical_instrument: Hljóðfæri
            newsagent: Blaðasali
            newsagent: Blaðasali
+          nutrition_supplements: Fæðubótarefni
            optician: Sjóntækjafræðingur
            organic: Verslun með lífrænt fæði
            outdoor: Útivistarverslun
            paint: Málningarvöruverslun
            optician: Sjóntækjafræðingur
            organic: Verslun með lífrænt fæði
            outdoor: Útivistarverslun
            paint: Málningarvöruverslun
+          pastry: Kökubúð
            pawnbroker: Veðlánari
            pawnbroker: Veðlánari
+          perfumery: Ilmvötn
            pet: Gæludýraverslun
            pet: Gæludýraverslun
+          pet_grooming: Snyrting fyrir gæludýr
            photo: Ljósmyndavöruverslun
            seafood: Fiskmeti
            second_hand: Verslun með notað
            photo: Ljósmyndavöruverslun
            seafood: Fiskmeti
            second_hand: Verslun með notað
+          sewing: Saumabúð
            shoes: Skóbúð
            sports: Íþróttavöruverslun
            stationery: Ritfangaverslun
            shoes: Skóbúð
            sports: Íþróttavöruverslun
            stationery: Ritfangaverslun
+          storage_rental: Leigugeymslur
            supermarket: Kjörbúð
            tailor: Klæðskeri
            supermarket: Kjörbúð
            tailor: Klæðskeri
+          tattoo: Húðflúrstofa
+          tea: Teverslun
            ticket: Miðasala
            tobacco: Tóbaksverslun
            toys: Leikfangaverslun
            ticket: Miðasala
            tobacco: Tóbaksverslun
            toys: Leikfangaverslun
@@ -1006,6 +1214,8 @@ is:
            vacant: Laust verslunarrými
            variety_store: Smávörumarkaður
            video: Videoleiga
            vacant: Laust verslunarrými
            variety_store: Smávörumarkaður
            video: Videoleiga
+          video_games: Tölvuleikjaverslun
+          wholesale: Heildsöluverslun
            wine: Vínbúð
            "yes": Verslun
          tourism:
            wine: Vínbúð
            "yes": Verslun
          tourism:
@@ -1015,6 +1225,7 @@ is:
            attraction: Aðdráttarafl
            bed_and_breakfast: BB-gisting og veitingar
            cabin: Kofi
            attraction: Aðdráttarafl
            bed_and_breakfast: BB-gisting og veitingar
            cabin: Kofi
+          camp_pitch: Tjaldreitur
            camp_site: Tjaldstæði
            caravan_site: Hjólhýsastæði
            chalet: Fjallakofi
            camp_site: Tjaldstæði
            caravan_site: Hjólhýsastæði
            chalet: Fjallakofi
@@ -1028,6 +1239,7 @@ is:
            picnic_site: Nestisaðstaða
            theme_park: Þemagarður
            viewpoint: Útsýnisstaður
            picnic_site: Nestisaðstaða
            theme_park: Þemagarður
            viewpoint: Útsýnisstaður
+          wilderness_hut: Óbyggðakofi
            zoo: Dýragarður
          tunnel:
            building_passage: Undirgöng í gegnum byggingu
            zoo: Dýragarður
          tunnel:
            building_passage: Undirgöng í gegnum byggingu
@@ -1233,12 +1445,13 @@ is:
        header: '%{from_user} hefur bætt við athugasemd á OpenStreetMap bloggfærsluna
          með titlinum „%{subject}“:'
        footer: Þú getur einnig lesið athugasemdina á %{readurl} og skrifað athugasemd
        header: '%{from_user} hefur bætt við athugasemd á OpenStreetMap bloggfærsluna
          með titlinum „%{subject}“:'
        footer: Þú getur einnig lesið athugasemdina á %{readurl} og skrifað athugasemd
-        á %{commenturl} eða svarað á %{replyurl}
+        á %{commenturl} eða sent skilaboð til höfundarins á %{replyurl}
      message_notification:
        subject_header: '[OpenStreetMap] %{subject}'
        hi: Hæ %{to_user},
        header: '%{from_user} hefur send þér skilaboð á OpenStreetMap með titlinum „%{subject}“:'
      message_notification:
        subject_header: '[OpenStreetMap] %{subject}'
        hi: Hæ %{to_user},
        header: '%{from_user} hefur send þér skilaboð á OpenStreetMap með titlinum „%{subject}“:'
-      footer_html: Þú getur einnig lesið skilaboðin á %{readurl} og svarað á %{replyurl}
+      footer_html: Þú getur einnig lesið skilaboðin á %{readurl} og sent skilaboð
+        til höfundarins á %{replyurl}
      friendship_notification:
        hi: Hæ %{to_user},
        subject: '[OpenStreetMap] %{user} bætti þér við sem vin'
      friendship_notification:
        hi: Hæ %{to_user},
        subject: '[OpenStreetMap] %{user} bætti þér við sem vin'
@@ -1428,8 +1641,8 @@ is:
      about:
        next: Næsta
        copyright_html: <span>&copy;</span>Þátttakendur í<br>OpenStreetMap<br>verkefninu
      about:
        next: Næsta
        copyright_html: <span>&copy;</span>Þátttakendur í<br>OpenStreetMap<br>verkefninu
-      used_by_html: '%{name} drífur áfram kortagögn á þúsundum vefsíðna, símaforritum
-        og tækjum'
+      used_by_html: '%{name} veitir kortagögn á þúsundum vefsíðna, símaforritum og
+        tækjum'
        lede_text: OpenStreetMap er byggt upp af heilu samfélagi kortagerðarfólks sem
          leggur inn og viðheldur gögnum um vegi, stíga, kaffihús, járnbrautir og margt,
          margt fleira, út um víða veröld.
        lede_text: OpenStreetMap er byggt upp af heilu samfélagi kortagerðarfólks sem
          leggur inn og viðheldur gögnum um vegi, stíga, kaffihús, járnbrautir og margt,
          margt fleira, út um víða veröld.
@@ -1499,10 +1712,8 @@ is:
            sama leyfi.
            <a href="https://opendatacommons.org/licenses/odbl/1.0/">Leyfistextinn</a>
            útskýrir réttindi þín og skyldur.
            sama leyfi.
            <a href="https://opendatacommons.org/licenses/odbl/1.0/">Leyfistextinn</a>
            útskýrir réttindi þín og skyldur.
-        intro_3_1_html: |-
-          Landupplýsingarnar í kortaflísunum okkar, og í hjálparskjölunum, eru
-          gefnar út með <a href="https://creativecommons.org/licenses/by-sa/2.0/">Creative
-          Commons Attribution-ShareAlike 2.0</a> notkunarleyfi (CC BY-SA).
+        intro_3_1_html: "Hjálparskjölin okkar eru gefin út með \n<a href=\"https://creativecommons.org/licenses/by-sa/2.0/\">Creative\nCommons
+          Attribution-ShareAlike 2.0</a> notkunarleyfi (CC BY-SA 2.0)."
          credit_title_html: Hvernig á að vísa til OpenStreetMap
          credit_1_html: |-
            Við gerum kröfu um að þú notir tilvísunina &ldquo;&copy; Þátttakendur í
          credit_title_html: Hvernig á að vísa til OpenStreetMap
          credit_1_html: |-
            Við gerum kröfu um að þú notir tilvísunina &ldquo;&copy; Þátttakendur í
@@ -1516,6 +1727,11 @@ is:
            mögulegir (t.d. prentuðum verkum), stingum við upp á að\nþú beinir lesendum
            á openstreetmap.org (mögulega að tengja\n'OpenStreetMap' við fullt vistfang
            þessarar síðu), á opendatacommons.org, og\nef slíkt á við, á creativecommons.org."
            mögulegir (t.d. prentuðum verkum), stingum við upp á að\nþú beinir lesendum
            á openstreetmap.org (mögulega að tengja\n'OpenStreetMap' við fullt vistfang
            þessarar síðu), á opendatacommons.org, og\nef slíkt á við, á creativecommons.org."
+        credit_3_1_html: "Kortatíglarnir í &ldquo;staðlaða stílnum&rdquo; á www.openstreetmap.org
+          eru \nunnir af OpenStreetMap Foundation með OpenStreetMap-gögnum \nsem bera
+          Open Database notkunarleyfi. Ef þú ert að nota þessar kortaflísar skaltu
+          nota \neftirfarandi tilvísun: \n&ldquo;Grunnkort og gögn frá OpenStreetMap
+          og OpenStreetMap Foundation&rdquo;. \\"
          credit_4_html: |-
            Á flettanlegum rafrænum landakortum ætti tilvísunin að birtast í horni kortsins.
            Til dæmis:
          credit_4_html: |-
            Á flettanlegum rafrænum landakortum ætti tilvísunin að birtast í horni kortsins.
            Til dæmis:
@@ -1929,6 +2145,7 @@ is:
          other: Þú ert með %{count} ferla í bið. Íhugaðu að bíða með að senda inn fleiri
            ferla til að aðrir notendur komist að.
      edit:
          other: Þú ert með %{count} ferla í bið. Íhugaðu að bíða með að senda inn fleiri
            ferla til að aðrir notendur komist að.
      edit:
+      cancel: Hætta við
        title: Breyti ferlinum %{name}
        heading: Breyti ferlinum %{name}
        visibility_help: hvað þýðir þetta?
        title: Breyti ferlinum %{name}
        heading: Breyti ferlinum %{name}
        visibility_help: hvað þýðir þetta?
@@ -1946,6 +2163,7 @@ is:
        uploaded: 'Hlaðið inn:'
        points: 'Punktar:'
        start_coordinates: 'Byrjunarhnit:'
        uploaded: 'Hlaðið inn:'
        points: 'Punktar:'
        start_coordinates: 'Byrjunarhnit:'
+      coordinates_html: '%{latitude}; %{longitude}'
        map: kort
        edit: breyta
        owner: 'Eigandi:'
        map: kort
        edit: breyta
        owner: 'Eigandi:'
@@ -2207,7 +2425,13 @@ is:
        title: Skilmálar
        heading: Skilmálar
        heading_ct: Skilmálar vegna framlags
        title: Skilmálar
        heading: Skilmálar
        heading_ct: Skilmálar vegna framlags
+      read and accept with tou: Vinsamlega lestu samkomulag vegna framlaga auk notkunarskilmálanna,
+        merktu í báða reitina þegar því er lokið og ýttu á hnappinn til að halda áfram.
+      contributor_terms_explain: Þessir skilmálar eru forsendur fyrir núverandi- jafnt
+        sem framtíðar-framlögum þínum.
        read_ct: Ég hef lesið og samþykki ofangreinda skilmála fyrir framlög þátttakenda
        read_ct: Ég hef lesið og samþykki ofangreinda skilmála fyrir framlög þátttakenda
+      tou_explain_html: Þessi %{tou_link} stýra notkuninni á vefsvæðinu ásamt öðrum
+        stoðkerfum OSMF. Smelltu á tengilinn, lestu síðan og samþykktu textann.
        read_tou: Ég hef lesið og samþykki notkunarskilmálana
        consider_pd: Til viðbótar við ofangreint samkomulag, lít ég svo á að framlög
          mín verði í almenningseigu (Public Domain)
        read_tou: Ég hef lesið og samþykki notkunarskilmálana
        consider_pd: Til viðbótar við ofangreint samkomulag, lít ég svo á að framlög
          mín verði í almenningseigu (Public Domain)
@@ -2617,6 +2841,7 @@ is:
          cycle_map: Hjólakort
          transport_map: Umferðarkort
          hot: Hjálparstarf
          cycle_map: Hjólakort
          transport_map: Umferðarkort
          hot: Hjálparstarf
+        opnvkarte: ÖPNVKarte
        layers:
          header: Lög á korti
          notes: Minnispunktar á korti
        layers:
          header: Lög á korti
          notes: Minnispunktar á korti
@@ -2629,6 +2854,7 @@ is:
        terms: <a href='%{terms_url}' target='_blank'>Skilmálar vefsvæðis og API-kerfisviðmóts</a>
        thunderforest: Kortatíglar frá <a href='%{thunderforest_url}' target='_blank'>Andy
          Allan</a>
        terms: <a href='%{terms_url}' target='_blank'>Skilmálar vefsvæðis og API-kerfisviðmóts</a>
        thunderforest: Kortatíglar frá <a href='%{thunderforest_url}' target='_blank'>Andy
          Allan</a>
+      opnvkarte: Kortatíglar frá <a href='%{memomaps_url}' target='_blank'>MeMoMaps</a>
        hotosm: Stíll kortatígla frá <a href='%{hotosm_url}' target='_blank'>Humanitarian
          OpenStreetMap teyminu</a> hýst á <a href='%{osmfrance_url}' target='_blank'>OpenStreetMap
          France</a>
        hotosm: Stíll kortatígla frá <a href='%{hotosm_url}' target='_blank'>Humanitarian
          OpenStreetMap teyminu</a> hýst á <a href='%{osmfrance_url}' target='_blank'>OpenStreetMap
          France</a>
diff --git a/config/locales/pt-BR.yml b/config/locales/pt-BR.yml

index 79680fd1632fb91ec49c568de4457f06bd3aecdb..d200e2f8df106d79cf840a6524599422e790d930 100644 (file)
--- a/config/locales/pt-BR.yml
+++ b/config/locales/pt-BR.yml
@@ -278,6 +278,12 @@ pt-BR:
      anonymous: anônimo
      no_comment: (nenhum comentário)
      part_of: Parte de
      anonymous: anônimo
      no_comment: (nenhum comentário)
      part_of: Parte de
+    part_of_relations:
+      one: 1 relação
+      other: '%{count} relações'
+    part_of_ways:
+      one: 1 via
+      other: '%{count} vias'
      download_xml: Baixar XML
      view_history: Ver histórico
      view_details: Ver detalhes
      download_xml: Baixar XML
      view_history: Ver histórico
      view_details: Ver detalhes
@@ -312,6 +318,9 @@ pt-BR:
        title_html: 'Linha: %{name}'
        history_title_html: 'Histórico da linha: %{name}'
        nodes: Pontos
        title_html: 'Linha: %{name}'
        history_title_html: 'Histórico da linha: %{name}'
        nodes: Pontos
+      nodes_count:
+        one: 1 nó
+        other: '%{count} nós'
        also_part_of_html:
          one: parte da linha %{related_ways}
          other: parte das linhas %{related_ways}
        also_part_of_html:
          one: parte da linha %{related_ways}
          other: parte das linhas %{related_ways}
@@ -319,6 +328,9 @@ pt-BR:
        title_html: 'Relação: %{name}'
        history_title_html: 'Histórico da relação: %{name}'
        members: Membros
        title_html: 'Relação: %{name}'
        history_title_html: 'Histórico da relação: %{name}'
        members: Membros
+      members_count:
+        one: 1 membro
+        other: '%{count} membros'
      relation_member:
        entry_html: '%{type} %{name}'
        entry_role_html: '%{type} %{name} como %{role}'
      relation_member:
        entry_html: '%{type} %{name}'
        entry_role_html: '%{type} %{name} como %{role}'
diff --git a/config/locales/pt-PT.yml b/config/locales/pt-PT.yml

index 1ec8300065bfe8291a7aeccdbf789e8f9d299500..0d2c984821fd3ae121918ce45ad42d0497fcf4ec 100644 (file)
--- a/config/locales/pt-PT.yml
+++ b/config/locales/pt-PT.yml
@@ -161,6 +161,7 @@ pt-PT:
          description: Descrição
          languages: Idiomas
          pass_crypt: Palavra-passe
          description: Descrição
          languages: Idiomas
          pass_crypt: Palavra-passe
+        pass_crypt_confirmation: Confirmar palavra-passe
      help:
        trace:
          tagstring: separadas por vírgulas
      help:
        trace:
          tagstring: separadas por vírgulas
@@ -263,6 +264,12 @@ pt-PT:
      anonymous: anónimo
      no_comment: (sem comentário)
      part_of: Faz parte de
      anonymous: anónimo
      no_comment: (sem comentário)
      part_of: Faz parte de
+    part_of_relations:
+      one: 1 relação
+      other: '%{count} relações'
+    part_of_ways:
+      one: 1 via
+      other: '%{count} vias'
      download_xml: Receber XML
      view_history: Ver histórico
      view_details: Ver detalhes
      download_xml: Receber XML
      view_history: Ver histórico
      view_details: Ver detalhes
@@ -297,6 +304,9 @@ pt-PT:
        title_html: 'Linha: %{name}'
        history_title_html: 'Histórico da Linha: %{name}'
        nodes: Nós
        title_html: 'Linha: %{name}'
        history_title_html: 'Histórico da Linha: %{name}'
        nodes: Nós
+      nodes_count:
+        one: 1 nó
+        other: '%{count} nós'
        also_part_of_html:
          one: parte da linha %{related_ways}
          other: parte das linhas %{related_ways}
        also_part_of_html:
          one: parte da linha %{related_ways}
          other: parte das linhas %{related_ways}
@@ -304,6 +314,9 @@ pt-PT:
        title_html: 'Relação: %{name}'
        history_title_html: 'Histórico da Relação: %{name}'
        members: Membros
        title_html: 'Relação: %{name}'
        history_title_html: 'Histórico da Relação: %{name}'
        members: Membros
+      members_count:
+        one: 1 membro
+        other: '%{count} membros'
      relation_member:
        entry_html: '%{type} %{name}'
        entry_role_html: '%{type} %{name} como %{role}'
      relation_member:
        entry_html: '%{type} %{name}'
        entry_role_html: '%{type} %{name} como %{role}'
diff --git a/config/locales/sv.yml b/config/locales/sv.yml

index 712cdb114a29cd3af10175633cfa092106a5bb96..a1278ea3fb2ffc8baa432b42ca017f4f145aeca5 100644 (file)
--- a/config/locales/sv.yml
+++ b/config/locales/sv.yml
@@ -170,6 +170,7 @@ sv:
          description: Beskrivning
          languages: Språk
          pass_crypt: Lösenord
          description: Beskrivning
          languages: Språk
          pass_crypt: Lösenord
+        pass_crypt_confirmation: Bekräfta lösenord
      help:
        trace:
          tagstring: kommaseparerad
      help:
        trace:
          tagstring: kommaseparerad
diff --git a/config/locales/vi.yml b/config/locales/vi.yml

index 5c89f5b282db563f772e5f8d3411adb5aa3d36e3..935f8fd341d08e68a3fc33fc0bfb5fa40ae37b6a 100644 (file)
--- a/config/locales/vi.yml
+++ b/config/locales/vi.yml
@@ -26,6 +26,8 @@ vi:
        friendly: '%e tháng %m năm %Y lúc %H:%M'
        blog: '%d tháng %m năm %Y'
    helpers:
        friendly: '%e tháng %m năm %Y lúc %H:%M'
        blog: '%d tháng %m năm %Y'
    helpers:
+    file:
+      prompt: Chọn tập tin
      submit:
        diary_comment:
          create: Lưu
      submit:
        diary_comment:
          create: Lưu
@@ -140,6 +142,7 @@ vi:
          description: Miêu tả
          languages: Ngôn ngữ
          pass_crypt: Mật khẩu
          description: Miêu tả
          languages: Ngôn ngữ
          pass_crypt: Mật khẩu
+        pass_crypt_confirmation: Xác nhận mật khẩu
      help:
        trace:
          tagstring: dấu phẩy phân cách
      help:
        trace:
          tagstring: dấu phẩy phân cách
@@ -242,6 +245,12 @@ vi:
      anonymous: vô danh
      no_comment: (không miêu tả)
      part_of: Trực thuộc
      anonymous: vô danh
      no_comment: (không miêu tả)
      part_of: Trực thuộc
+    part_of_relations:
+      one: '%{count} quan hệ'
+      other: '%{count} quan hệ'
+    part_of_ways:
+      one: '%{count} lối'
+      other: '%{count} lối'
      download_xml: Tải về XML
      view_history: Xem Lịch sử
      view_details: Xem Chi tiết
      download_xml: Tải về XML
      view_history: Xem Lịch sử
      view_details: Xem Chi tiết
@@ -276,6 +285,8 @@ vi:
        title_html: 'Lối: %{name}'
        history_title_html: 'Lịch sử Lối: %{name}'
        nodes: Các nốt
        title_html: 'Lối: %{name}'
        history_title_html: 'Lịch sử Lối: %{name}'
        nodes: Các nốt
+      nodes_count:
+        other: '%{count} nốt'
        also_part_of_html:
          one: trực thuộc lối %{related_ways}
          other: trực thuộc các lối %{related_ways}
        also_part_of_html:
          one: trực thuộc lối %{related_ways}
          other: trực thuộc các lối %{related_ways}
@@ -283,6 +294,9 @@ vi:
        title_html: 'Quan hệ: %{name}'
        history_title_html: 'Lịch sử Quan hệ: %{name}'
        members: Thành viên
        title_html: 'Quan hệ: %{name}'
        history_title_html: 'Lịch sử Quan hệ: %{name}'
        members: Thành viên
+      members_count:
+        one: '%{count} thành viên'
+        other: '%{count} thành viên'
      relation_member:
        entry_role_html: '%{type} %{name} với vai trò %{role}'
        type:
      relation_member:
        entry_role_html: '%{type} %{name} với vai trò %{role}'
        type:
@@ -520,6 +534,7 @@ vi:
            runway: Đường băng
            taxiway: Đường lăn
            terminal: Nhà ga Sân bay
            runway: Đường băng
            taxiway: Đường lăn
            terminal: Nhà ga Sân bay
+          windsock: Ống gió
          amenity:
            animal_shelter: Trạm Bảo vệ Động vật
            arts_centre: Trung tâm Nghệ thuật
          amenity:
            animal_shelter: Trạm Bảo vệ Động vật
            arts_centre: Trung tâm Nghệ thuật
@@ -571,6 +586,7 @@ vi:
            marketplace: Chợ phiên
            monastery: Nhà tu
            motorcycle_parking: Chỗ Đậu Xe máy
            marketplace: Chợ phiên
            monastery: Nhà tu
            motorcycle_parking: Chỗ Đậu Xe máy
+          music_school: Trường Âm nhạc
            nightclub: Câu lạc bộ Đêm
            nursing_home: Viện Dưỡng lão
            parking: Chỗ Đậu xe
            nightclub: Câu lạc bộ Đêm
            nursing_home: Viện Dưỡng lão
            parking: Chỗ Đậu xe
@@ -605,11 +621,13 @@ vi:
            waste_basket: Thùng rác
            waste_disposal: Thùng rác
            water_point: Trạm Đóng Bình Nước uống
            waste_basket: Thùng rác
            waste_disposal: Thùng rác
            water_point: Trạm Đóng Bình Nước uống
+          "yes": Tiện nghi
          boundary:
            administrative: Biên giới Hành chính
            census: Biên giới Điều tra Dân số
            national_park: Vườn quốc gia
            protected_area: Khu bảo tồn
          boundary:
            administrative: Biên giới Hành chính
            census: Biên giới Điều tra Dân số
            national_park: Vườn quốc gia
            protected_area: Khu bảo tồn
+          "yes": Biên giới
          bridge:
            aqueduct: Cống nước
            boardwalk: Lối đi có Lót Ván
          bridge:
            aqueduct: Cống nước
            boardwalk: Lối đi có Lót Ván
@@ -618,26 +636,40 @@ vi:
            viaduct: Cầu Cạn
            "yes": Cầu
          building:
            viaduct: Cầu Cạn
            "yes": Cầu
          building:
+          apartment: Chung cư
            apartments: Căn hộ
            apartments: Căn hộ
+          barn: Chuồng
+          bungalow: Boongalô
+          cabin: Túp lều
            chapel: Nhà nguyện
            church: Nhà thờ
            chapel: Nhà nguyện
            church: Nhà thờ
+          college: Tòa nhà Cao đẳng
            commercial: Tòa nhà Thương mại
            dormitory: Ký túc xá
            farm: Nông trại
            garage: Ga ra
            commercial: Tòa nhà Thương mại
            dormitory: Ký túc xá
            farm: Nông trại
            garage: Ga ra
+          garages: Ga ra
+          greenhouse: Nhà kính
+          hangar: Nhà Máy bay
            hospital: Tòa nhà Bệnh viện
            hotel: Khách sạn
            house: Nhà ở
            hospital: Tòa nhà Bệnh viện
            hotel: Khách sạn
            house: Nhà ở
+          hut: Túp lều
            industrial: Tòa nhà Công nghiệp
            office: Tòa nhà Văn phòng
            public: Tòa nhà Công cộng
            residential: Nhà ở
            retail: Tòa nhà Cửa hàng
            industrial: Tòa nhà Công nghiệp
            office: Tòa nhà Văn phòng
            public: Tòa nhà Công cộng
            residential: Nhà ở
            retail: Tòa nhà Cửa hàng
+          roof: Mái che
            school: Nhà trường
            school: Nhà trường
+          shed: Lán
            terrace: Thềm
            train_station: Nhà ga
            university: Tòa nhà Đại học
            terrace: Thềm
            train_station: Nhà ga
            university: Tòa nhà Đại học
+          warehouse: Nhà kho
            "yes": Tòa nhà
            "yes": Tòa nhà
+        club:
+          "yes": Câu lạc bộ
          craft:
            brewery: Nhà máy Bia
            carpenter: Thợ Đóng Đồ Gỗ
          craft:
            brewery: Nhà máy Bia
            carpenter: Thợ Đóng Đồ Gỗ
@@ -655,6 +687,7 @@ vi:
            defibrillator: Máy Khử Rung Tim
            landing_site: Nơi Hạ cánh Khẩn cấp
            phone: Điện thoại Khẩn cấp
            defibrillator: Máy Khử Rung Tim
            landing_site: Nơi Hạ cánh Khẩn cấp
            phone: Điện thoại Khẩn cấp
+          siren: Còi Báo động
            water_tank: Bể Chứa Nước Khẩn cấp
            "yes": Khẩn cấp
          highway:
            water_tank: Bể Chứa Nước Khẩn cấp
            "yes": Khẩn cấp
          highway:
@@ -756,6 +789,7 @@ vi:
            quarry: Mỏ Đá
            railway: Đường sắt
            recreation_ground: Sân Giải trí
            quarry: Mỏ Đá
            railway: Đường sắt
            recreation_ground: Sân Giải trí
+          religious: Đất Tôn giáo
            reservoir: Bể nước
            reservoir_watershed: Lưu vực Hồ Nhân tạo
            residential: Khu vực Nhà ở
            reservoir: Bể nước
            reservoir_watershed: Lưu vực Hồ Nhân tạo
            residential: Khu vực Nhà ở
@@ -780,6 +814,7 @@ vi:
            miniature_golf: Golf Nhỏ
            nature_reserve: Khu Bảo tồn Thiên niên
            park: Công viên
            miniature_golf: Golf Nhỏ
            nature_reserve: Khu Bảo tồn Thiên niên
            park: Công viên
+          picnic_table: Bàn ăn Ngoài trời
            pitch: Sân cỏ
            playground: Sân chơi
            recreation_ground: Sân Giải trí
            pitch: Sân cỏ
            playground: Sân chơi
            recreation_ground: Sân Giải trí
@@ -794,13 +829,17 @@ vi:
            "yes": Giải trí
          man_made:
            adit: Lối vào
            "yes": Giải trí
          man_made:
            adit: Lối vào
+          advertising: Quảng cáo
+          antenna: Ăng ten
            beacon: Đèn hiệu
            beehive: Tổ ong
            breakwater: Đê chắn sóng
            bridge: Cầu
            bunker_silo: Boong ke
            chimney: Ống khói
            beacon: Đèn hiệu
            beehive: Tổ ong
            breakwater: Đê chắn sóng
            bridge: Cầu
            bunker_silo: Boong ke
            chimney: Ống khói
+          communications_tower: Tháp Viễn thông
            crane: Cần cẩu
            crane: Cần cẩu
+          cross: Thánh Giá
            dolphin: Cột neo đậu
            dyke: Đê
            embankment: Đê
            dolphin: Cột neo đậu
            dyke: Đê
            embankment: Đê
@@ -809,6 +848,7 @@ vi:
            groyne: Đê biển
            kiln: Lò
            lighthouse: Hải đăng
            groyne: Đê biển
            kiln: Lò
            lighthouse: Hải đăng
+          manhole: Miệng Cống
            mast: Cột
            mine: Mỏ
            mineshaft: Hầm Mỏ
            mast: Cột
            mine: Mỏ
            mineshaft: Hầm Mỏ
@@ -816,9 +856,11 @@ vi:
            petroleum_well: Giếng dầu
            pier: Cầu tàu
            pipeline: Ống dẫn
            petroleum_well: Giếng dầu
            pier: Cầu tàu
            pipeline: Ống dẫn
+          pumping_station: Trạm Bơm
            silo: Xi lô
            storage_tank: Bể chứa
            surveillance: Giám sát
            silo: Xi lô
            storage_tank: Bể chứa
            surveillance: Giám sát
+          telescope: Kính Thiên văn
            tower: Tháp
            wastewater_plant: Nhà máy Nước thải
            watermill: Cối xay nước
            tower: Tháp
            wastewater_plant: Nhà máy Nước thải
            watermill: Cối xay nước
@@ -888,6 +930,9 @@ vi:
            it: Văn phòng CNTT
            lawyer: Luật sư
            ngo: Văn phòng Tổ chức Phi chính phủ
            it: Văn phòng CNTT
            lawyer: Luật sư
            ngo: Văn phòng Tổ chức Phi chính phủ
+          religion: Văn phòng Tôn giáo
+          research: Văn phòng Nghiên cứu
+          tax_advisor: Cố vấn Thuế
            telecommunication: Văn phòng Viễn thông
            travel_agent: Văn phòng Du lịch
            "yes": Văn phòng
            telecommunication: Văn phòng Viễn thông
            travel_agent: Văn phòng Du lịch
            "yes": Văn phòng
@@ -960,6 +1005,7 @@ vi:
            carpet: Tiệm Thảm
            charity: Cửa hàng Từ thiện
            chemist: Tiệm Dược phẩm
            carpet: Tiệm Thảm
            charity: Cửa hàng Từ thiện
            chemist: Tiệm Dược phẩm
+          chocolate: Sô cô la
            clothes: Tiệm Quần áo
            computer: Tiệm Máy tính
            confectionery: Tiệm Kẹo
            clothes: Tiệm Quần áo
            computer: Tiệm Máy tính
            confectionery: Tiệm Kẹo
@@ -988,6 +1034,7 @@ vi:
            hardware: Tiệm Ngũ kim
            hifi: Cửa hàng Hi-fi
            houseware: Cửa hàng gia dụng
            hardware: Tiệm Ngũ kim
            hifi: Cửa hàng Hi-fi
            houseware: Cửa hàng gia dụng
+          ice_cream: Tiệm Kem
            interior_decoration: Trang trí Nội thất
            jewelry: Tiệm Kim hoàn
            kiosk: Quán
            interior_decoration: Trang trí Nội thất
            jewelry: Tiệm Kim hoàn
            kiosk: Quán
@@ -1004,6 +1051,7 @@ vi:
            organic: Tiệm Thực phẩm Hữu cơ
            outdoor: Tiệm Thể thao Ngoài trời
            paint: Tiệm Sơn
            organic: Tiệm Thực phẩm Hữu cơ
            outdoor: Tiệm Thể thao Ngoài trời
            paint: Tiệm Sơn
+          pastry: Tiệm Bánh ngọt
            pawnbroker: Tiệm Cầm đồ
            pet: Tiệm Vật nuôi
            photo: Tiệm Rửa Hình
            pawnbroker: Tiệm Cầm đồ
            pet: Tiệm Vật nuôi
            photo: Tiệm Rửa Hình
@@ -1895,6 +1943,7 @@ vi:
          đợi việc xong trước khi tải lên thêm tuyến đường, để cho người khác vào hàng
          đợi kịp.
      edit:
          đợi việc xong trước khi tải lên thêm tuyến đường, để cho người khác vào hàng
          đợi kịp.
      edit:
+      cancel: Hủy bỏ
        title: Sửa đổi tuyến đường %{name}
        heading: Sửa đổi tuyến đường %{name}
        visibility_help: điều này có nghĩa là gì?
        title: Sửa đổi tuyến đường %{name}
        heading: Sửa đổi tuyến đường %{name}
        visibility_help: điều này có nghĩa là gì?
diff --git a/config/locales/zh-TW.yml b/config/locales/zh-TW.yml

index 089f563b6edf2b7bec7d9958fdb5ab8e671ca691..2cbf741a64e84532ee688bbad6ee234fc76f1f2c 100644 (file)
--- a/config/locales/zh-TW.yml
+++ b/config/locales/zh-TW.yml
@@ -631,6 +631,7 @@ zh-TW:
            post_office: 郵局
            prison: 監獄
            pub: 酒館
            post_office: 郵局
            prison: 監獄
            pub: 酒館
+          public_bookcase: 公共書櫃
            public_building: 公共建築
            ranger_station: 護林員站
            recycling: 回收點
            public_building: 公共建築
            ranger_station: 護林員站
            recycling: 回收點
@@ -647,6 +648,7 @@ zh-TW:
            theatre: 劇院
            toilets: 廁所
            townhall: 市政廳
            theatre: 劇院
            toilets: 廁所
            townhall: 市政廳
+          training: 訓練設施
            university: 大學
            vending_machine: 自動販賣機
            veterinary: 獸醫
            university: 大學
            vending_machine: 自動販賣機
            veterinary: 獸醫
@@ -679,7 +681,7 @@ zh-TW:
            chapel: 禮拜堂
            church: 教堂建築
            college: 學院建物
            chapel: 禮拜堂
            church: 教堂建築
            college: 學院建物
-          commercial: å\95\86æ¥å»ºç\89©
+          commercial: å\95\86æ¥å»ºç¯\89
            dormitory: 宿舍
            duplex: 複式住宅
            farm: 農舍
            dormitory: 宿舍
            duplex: 複式住宅
            farm: 農舍
@@ -695,7 +697,14 @@ zh-TW:
            kindergarten: 幼稚園建築
            office: 辦公建築
            public: 公共建築
            kindergarten: 幼稚園建築
            office: 辦公建築
            public: 公共建築
+          residential: 住宅建築
+          retail: 零售建物
            roof: 屋頂
            roof: 屋頂
+          school: 學校建物
+          semidetached_house: 半獨立房
+          temple: 廟宇建築
+          train_station: 車站建物
+          university: 大學建築
            "yes": 建築物
          club:
            sport: 體育會
            "yes": 建築物
          club:
            sport: 體育會
@@ -714,9 +723,12 @@ zh-TW:
            painter: 畫家
            photographer: 攝影師
            plumber: 管道工
            painter: 畫家
            photographer: 攝影師
            plumber: 管道工
+          roofer: 屋頂工
+          sawmill: 鋸木廠
            shoemaker: 鞋匠
            stonemason: 石工
            tailor: 裁縫師
            shoemaker: 鞋匠
            stonemason: 石工
            tailor: 裁縫師
+          window_construction: 窗戶建設
            winery: 酒廠
            "yes": 工藝品店
          emergency:
            winery: 酒廠
            "yes": 工藝品店
          emergency:
@@ -725,7 +737,9 @@ zh-TW:
            defibrillator: 除顫器
            fire_xtinguisher: 滅火器
            landing_site: 緊急降落點
            defibrillator: 除顫器
            fire_xtinguisher: 滅火器
            landing_site: 緊急降落點
+          life_ring: 緊急救生圈
            phone: 緊急電話
            phone: 緊急電話
+          siren: 緊急警報器
            water_tank: 緊急水箱
            "yes": 緊急
          highway:
            water_tank: 緊急水箱
            "yes": 緊急
          highway:
@@ -768,6 +782,7 @@ zh-TW:
            tertiary: 三級道路
            tertiary_link: 地區道路聯絡道
            track: 產業道路
            tertiary: 三級道路
            tertiary_link: 地區道路聯絡道
            track: 產業道路
+          traffic_mirror: 道路反射鏡
            traffic_signals: 交通號誌
            trunk: 快速道路
            trunk_link: 快速道路聯絡道
            traffic_signals: 交通號誌
            trunk: 快速道路
            trunk_link: 快速道路聯絡道
@@ -810,6 +825,7 @@ zh-TW:
            "yes": 路口
          landuse:
            allotments: 社區農園
            "yes": 路口
          landuse:
            allotments: 社區農園
+          aquaculture: 水產養殖
            basin: 盆地
            brownfield: 低污染再利用地
            cemetery: 墓地
            basin: 盆地
            brownfield: 低污染再利用地
            cemetery: 墓地
@@ -842,8 +858,10 @@ zh-TW:
          leisure:
            adult_gaming_centre: 成人遊戲中心
            amusement_arcade: 電子遊樂場
          leisure:
            adult_gaming_centre: 成人遊戲中心
            amusement_arcade: 電子遊樂場
+          bandstand: 演奏台
            beach_resort: 海灘遊樂區
            bird_hide: 賞鳥亭
            beach_resort: 海灘遊樂區
            bird_hide: 賞鳥亭
+          bleachers: 露天看台
            common: 公共用地
            dance: 舞廳
            dog_park: 遛狗公園
            common: 公共用地
            dance: 舞廳
            dog_park: 遛狗公園
@@ -876,13 +894,16 @@ zh-TW:
          man_made:
            adit: 坑道
            antenna: 天線
          man_made:
            adit: 坑道
            antenna: 天線
+          avalanche_protection: 雪崩防護
            beacon: 信標台
            beacon: 信標台
+          beam: 橫樑
            beehive: 蜂巢
            breakwater: 防波堤
            bridge: 橋
            bunker_silo: 掩體
            chimney: 煙囪
            crane: 起重機
            beehive: 蜂巢
            breakwater: 防波堤
            bridge: 橋
            bunker_silo: 掩體
            chimney: 煙囪
            crane: 起重機
+          cross: 十字架
            dolphin: 繫船柱
            dyke: 堤
            embankment: 堤
            dolphin: 繫船柱
            dyke: 堤
            embankment: 堤
@@ -919,10 +940,13 @@ zh-TW:
            airfield: 軍用機場
            barracks: 軍營
            bunker: 掩體
            airfield: 軍用機場
            barracks: 軍營
            bunker: 掩體
+          checkpoint: 檢查站
+          trench: 溝渠
            "yes": 軍事
          mountain_pass:
            "yes": 埡口
          natural:
            "yes": 軍事
          mountain_pass:
            "yes": 埡口
          natural:
+          bare_rock: 裸露岩石
            bay: 灣
            beach: 海灘
            cape: 海角
            bay: 灣
            beach: 海灘
            cape: 海角
@@ -966,6 +990,7 @@ zh-TW:
          office:
            accountant: 會計師事務所
            administrative: 管理局
          office:
            accountant: 會計師事務所
            administrative: 管理局
+          advertising_agency: 廣告代理
            architect: 建築師事務所
            association: 協會
            company: 公司
            architect: 建築師事務所
            association: 協會
            company: 公司
@@ -982,7 +1007,10 @@ zh-TW:
            logistics: 物流辦公處
            newspaper: 報社
            ngo: 非政府組織辦公室
            logistics: 物流辦公處
            newspaper: 報社
            ngo: 非政府組織辦公室
+          notary: 公證人
+          religion: 宗教辦公處
            research: 研究室
            research: 研究室
+          tax_advisor: 稅務顧問
            telecommunication: 電信業辦事處
            travel_agent: 旅行社
            "yes": 辦公室
            telecommunication: 電信業辦事處
            travel_agent: 旅行社
            "yes": 辦公室
@@ -1040,6 +1068,7 @@ zh-TW:
          shop:
            alcohol: 酒館
            antiques: 古董店
          shop:
            alcohol: 酒館
            antiques: 古董店
+          appliance: 家用電器店
            art: 藝品店
            baby_goods: 嬰兒用品
            bag: 包包店
            art: 藝品店
            baby_goods: 嬰兒用品
            bag: 包包店
author	translatewiki.net <l10n-bot@translatewiki.net>
	Mon, 21 Sep 2020 14:10:19 +0000 (16:10 +0200)
committer	translatewiki.net <l10n-bot@translatewiki.net>
	Mon, 21 Sep 2020 14:10:19 +0000 (16:10 +0200)
config/locales/bg.yml		patch \| blob \| history
config/locales/bn.yml		patch \| blob \| history
config/locales/da.yml		patch \| blob \| history
config/locales/de.yml		patch \| blob \| history
config/locales/eo.yml		patch \| blob \| history
config/locales/is.yml		patch \| blob \| history
config/locales/pt-BR.yml		patch \| blob \| history
config/locales/pt-PT.yml		patch \| blob \| history
config/locales/sv.yml		patch \| blob \| history
config/locales/vi.yml		patch \| blob \| history
config/locales/zh-TW.yml		patch \| blob \| history