From: Tom Hughes Date: Tue, 20 Feb 2024 18:19:42 +0000 (+0000) Subject: Merge remote-tracking branch 'upstream/pull/4529' X-Git-Tag: live~753 X-Git-Url: https://git.openstreetmap.org./rails.git/commitdiff_plain/560e79d0ef241cd0dee4cac9f77bb8bba52d1f5c?hp=7c522a4e024a8763125251f6df6bbcbcc0f0f1a1 Merge remote-tracking branch 'upstream/pull/4529' --- diff --git a/Gemfile.lock b/Gemfile.lock index 9626a4315..0f4c8d1ca 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -95,11 +95,12 @@ GEM autoprefixer-rails (10.4.16.0) execjs (~> 2) aws-eventstream (1.3.0) - aws-partitions (1.889.0) - aws-sdk-core (3.191.1) + aws-partitions (1.894.0) + aws-sdk-core (3.191.2) aws-eventstream (~> 1, >= 1.3.0) aws-partitions (~> 1, >= 1.651.0) aws-sigv4 (~> 1.8) + base64 jmespath (~> 1, >= 1.6.1) aws-sdk-kms (1.77.0) aws-sdk-core (~> 3, >= 3.191.0) @@ -179,7 +180,7 @@ GEM activerecord (>= 3.0, < 8.0) delayed_job (>= 3.0, < 5) docile (1.4.0) - doorkeeper (5.6.8) + doorkeeper (5.6.9) railties (>= 5) doorkeeper-i18n (5.2.7) doorkeeper (>= 5.2) @@ -247,14 +248,14 @@ GEM ffi-libarchive (1.1.14) ffi (~> 1.0) file_exists (0.2.0) - frozen_record (0.27.0) + frozen_record (0.27.1) activemodel fspath (3.1.2) gd2-ffij (0.4.0) ffi (>= 1.0.0) globalid (1.2.1) activesupport (>= 6.1) - google-protobuf (3.25.2) + google-protobuf (3.25.3) hashdiff (1.1.0) hashie (5.0.0) highline (3.0.1) @@ -303,7 +304,8 @@ GEM railties (>= 4.2.0) thor (>= 0.14, < 2.0) json (2.7.1) - jwt (2.7.1) + jwt (2.8.0) + base64 kgio (2.11.4) kramdown (2.4.0) rexml @@ -405,7 +407,7 @@ GEM parser (3.3.0.5) ast (~> 2.4.1) racc - pg (1.5.4) + pg (1.5.5) popper_js (2.11.8) progress (3.6.0) psych (5.1.2) @@ -529,7 +531,7 @@ GEM google-protobuf (~> 3.23) rake (>= 13.0.0) secure_headers (6.5.0) - selenium-webdriver (4.17.0) + selenium-webdriver (4.18.1) base64 (~> 0.2) rexml (~> 3.2, >= 3.2.5) rubyzip (>= 1.2.2, < 3.0) @@ -573,7 +575,7 @@ GEM i18n vendorer (0.2.0) version_gem (1.1.3) - webmock (3.20.0) + webmock (3.21.2) addressable (>= 2.8.0) crack (>= 0.3.2) hashdiff (>= 0.4.0, < 2.0.0) diff --git a/config/locales/af.yml b/config/locales/af.yml index 6a9d72adb..77e8a094b 100644 --- a/config/locales/af.yml +++ b/config/locales/af.yml @@ -304,7 +304,6 @@ af: way_paginated: Weë (%{x}-%{y} van %{count}) relation: Verwantskappe (%{count}) relation_paginated: Verwantskappe (%{x}-%{y} of %{count}) - comment: Kommentaar (%{count}) changesetxml: Wysigingstel XML osmchangexml: osmWysiging XML feed: diff --git a/config/locales/ar.yml b/config/locales/ar.yml index 6ec27d455..719992f24 100644 --- a/config/locales/ar.yml +++ b/config/locales/ar.yml @@ -439,7 +439,6 @@ ar: way_paginated: الطرق (%{x}-%{y} من %{count}) relation: الصلات (%{count}) relation_paginated: الصلات (%{x}-%{y} من %{count}) - comment: التعليقات (%{count}) hidden_comment_by_html: تعليق مخفي من%{time_ago} %{user} comment_by_html: تعليق من %{user}%{time_ago} changesetxml: حزمة التغييرات XML diff --git a/config/locales/ast.yml b/config/locales/ast.yml index b0a6b8115..718f107a6 100644 --- a/config/locales/ast.yml +++ b/config/locales/ast.yml @@ -279,7 +279,6 @@ ast: way_paginated: Víes (%{x}-%{y} de %{count}) relation: Rellaciones (%{count}) relation_paginated: Rellaciones (%{x}-%{y} de %{count}) - comment: Comentarios (%{count}) changesetxml: Conxuntu de cambeos XML osmchangexml: osmChange XML feed: diff --git a/config/locales/ba.yml b/config/locales/ba.yml index bfe066976..e37fa7bbc 100644 --- a/config/locales/ba.yml +++ b/config/locales/ba.yml @@ -3,6 +3,7 @@ # Export driver: phpyaml # Author: AiseluRB # Author: Amire80 +# Author: Bashkorttan # Author: Lizalizaufa # Author: MR973 # Author: Roustammr @@ -264,7 +265,7 @@ ba: one: 1 юл other: '%{count} юлдар' download_xml: ' XML-ды күсереү' - view_history: Тарихты ҡарау + view_history: Тарих view_details: Ентекләберәк location: 'Географик урын:' changeset: @@ -276,7 +277,6 @@ ba: way_paginated: Юлдар (%{x}-%{y} %{count}һынан) relation: Мөнәсәбәттәр (%{count}) relation_paginated: Мөнәсәбәттәр (%{x}-%{y} %{count}нан) - comment: Комментарийҙар (%{count}) changesetxml: Төҙәтеүҙәр пакетының XML-ы osmchangexml: osmChange XML feed: diff --git a/config/locales/be-Tarask.yml b/config/locales/be-Tarask.yml index 6b19a5830..97097bc2b 100644 --- a/config/locales/be-Tarask.yml +++ b/config/locales/be-Tarask.yml @@ -311,7 +311,6 @@ be-Tarask: way_paginated: Лініі (%{x}-%{y} з %{count}) relation: Сувязі (%{count}) relation_paginated: Сувязі (%{x}-%{y} з %{count}) - comment: Камэнтары (%{count}) changesetxml: Набор зьменаў у фармаце XML osmchangexml: osmChange XML feed: diff --git a/config/locales/be.yml b/config/locales/be.yml index 44dd6b835..d9718305d 100644 --- a/config/locales/be.yml +++ b/config/locales/be.yml @@ -337,7 +337,6 @@ be: way_paginated: Лініі (%{x}-%{y} з %{count}) relation: Дачыненні (%{count}) relation_paginated: Дачыненні (%{x}-%{y} з %{count}) - comment: Каментары (%{count}) changesetxml: XML пакета правак osmchangexml: osmChange XML feed: diff --git a/config/locales/bg.yml b/config/locales/bg.yml index f2de6a5a9..3355479d9 100644 --- a/config/locales/bg.yml +++ b/config/locales/bg.yml @@ -317,7 +317,6 @@ bg: way_paginated: Пътища (%{x}-%{y} от общо %{count}) relation: Релации (%{count}) relation_paginated: Релации(%{x}-%{y} от %{count}) - comment: Коментари (%{count}) changesetxml: XML на списъка с промени osmchangexml: osmChange XML feed: @@ -440,11 +439,15 @@ bg: nearby mapper: Картографи в близост friend: Приятел show: + no_home_location_html: '%{edit_profile_link} и задайте домашното си местоположение, + за да видите потребителите наблизо.' edit_your_profile: Редактиране на профила my friends: Моите приятели no friends: Все още нямате добавени приятели. nearby users: Други потребители в близост no nearby users: Все още няма други потребители, които картографират в близост. + friends_changesets: набори с промени на приятели + friends_diaries: записи в дневника на приятели diary_entries: new: title: Нова публикация в дневника @@ -539,6 +542,7 @@ bg: geocoder: search: title: + results_from_html: Резултати от %{results_link} latlon: Вътрешни search_osm_nominatim: prefix: @@ -1424,7 +1428,7 @@ bg: new: title: Възстановяване на парола heading: Забравена парола? - email address: 'Електронна поща:' + email address: Електронна поща new password button: Нова парола help_text: Въведете имейл адреса, който сте използвали при регистрацията, и ние ще Ви изпратим връзка, която можете да използвате, за да промените паролата @@ -1473,7 +1477,7 @@ bg: new: title: Влизане heading: Влизане - email or username: 'Електронна поща или потребителско име:' + email or username: Електронна поща или потребителско име password: Парола remember: Запомняне lost password link: Забравена парола? @@ -1524,6 +1528,7 @@ bg: image: Изображение alt: Алтернативен текст url: URL + codeblock: Блок с код richtext_field: edit: Редактиране preview: Предварителен преглед @@ -2184,6 +2189,8 @@ bg: offramp_right_with_exit_directions: Излезте от %{exit} изход вдясно към %{directions} offramp_right_with_exit_name_directions: Излезте от %{exit} изход вдясно на %{name}, към %{directions} + onramp_right_without_directions: Завийте надясно към рампата + onramp_right: Завийте надясно към рампата endofroad_right_without_exit: В края на пътя завийте надясно по %{name} merge_right_without_exit: Навлезте надясно на %{name} fork_right_without_exit: На разклона завийте надясно по %{name} @@ -2192,11 +2199,14 @@ bg: uturn_without_exit: Обратен завой по %{name} sharp_left_without_exit: Остър завой наляво по %{name} turn_left_without_exit: Завийте наляво по %{name} + offramp_left: Вземете изхода наляво offramp_left_with_exit: Излезте от %{exit} изход вляво offramp_left_with_exit_name: Излезте от %{exit} изход вляво на %{name} offramp_left_with_exit_directions: Излезте от %{exit} изход вляво към %{directions} offramp_left_with_exit_name_directions: Излезте от %{exit} изход вляво на %{name}, към %{directions} + offramp_left_with_name: Вземете изхода наляво към %{name} + offramp_left_with_directions: Вземете изхода наляво в посока %{directions} endofroad_left_without_exit: В края на пътя завийте наляво по %{name} merge_left_without_exit: Навлезте наляво на %{name} fork_left_without_exit: На разклона завийте наляво по %{name} @@ -2211,7 +2221,7 @@ bg: roundabout_with_exit: На кръговото движение излезте от %{exit} изход към %{name} roundabout_with_exit_ordinal: На кръговото движение вземете %{exit} изход към %{name} - exit_roundabout: Излезете от кръговото движение от %{name} + exit_roundabout: Излезте от кръговото движение от %{name} unnamed: неименуван път courtesy: Упътване благодарение на %{link} exit_counts: diff --git a/config/locales/bn.yml b/config/locales/bn.yml index 28d51f5d8..dcc0a6413 100644 --- a/config/locales/bn.yml +++ b/config/locales/bn.yml @@ -369,7 +369,6 @@ bn: way_paginated: পথসমূহ (%{count}টির %{x}-%{y}) relation: সম্পর্ক (%{count}টি) relation_paginated: সম্পর্ক (%{count}টির %{x}-%{y}) - comment: মন্তব্য (%{count}টি) hidden_comment_by_html: '%{user} %{time_ago} মন্তব্যটি লুকিয়েছেন' changesetxml: পরিবর্তনধার্য এক্সএমএল osmchangexml: osmChange এক্সএমএল @@ -546,6 +545,7 @@ bn: show: title: '%{user}-এর দিনলিপি | %{title}' user_title: '%{user}-এর দিনলিপি' + discussion: আলোচনা leave_a_comment: একটি মন্তব্য করুন login_to_leave_a_comment_html: মন্তব্য করতে %{login_link} করুন login: প্রবেশ diff --git a/config/locales/br.yml b/config/locales/br.yml index 212812164..7b16342a0 100644 --- a/config/locales/br.yml +++ b/config/locales/br.yml @@ -388,7 +388,6 @@ br: way_paginated: Hentoù (%{x}-%{y} diwar %{count}) relation: Darempredoù (%{count}) relation_paginated: Darempredoù (%{x}-%{y} diwar %{count}) - comment: Evezhiadennoù (%{count}) hidden_comment_by_html: Kemennadenn kuzhet gant %{user} %{time_ago} comment_by_html: Kemennadenn skrivet gant %{user} %{time_ago} changesetxml: Hollad cheñchamantoù XML @@ -586,6 +585,7 @@ br: show: title: Deizlevr %{user} | %{title} user_title: Deizlevr %{user} + discussion: Kaozeadenn leave_a_comment: Skrivañ un evezhiadenn login_to_leave_a_comment_html: '%{login_link} evit skrivañ un evezhiadenn' login: Kevreañ @@ -1965,6 +1965,7 @@ br: image: Skeudenn alt: Testenn all url: URL + codeblock: Bloc'had kod richtext_field: edit: Aozañ preview: Rakwelet diff --git a/config/locales/bs.yml b/config/locales/bs.yml index 11d95da6d..47cfaf7b7 100644 --- a/config/locales/bs.yml +++ b/config/locales/bs.yml @@ -204,7 +204,6 @@ bs: way_paginated: Putevi (%{x}-%{y} of %{count}) relation: Relacije (%{count}) relation_paginated: Relacije (%{x}-%{y} of %{count}) - comment: Komentari (%{count}) changesetxml: XML seta promjena osmchangexml: osmChange XML feed: diff --git a/config/locales/ca.yml b/config/locales/ca.yml index 7f76ca149..9c023e93f 100644 --- a/config/locales/ca.yml +++ b/config/locales/ca.yml @@ -388,7 +388,6 @@ ca: way_paginated: Vies (%{x}-%{y} de %{count}) relation: Relacions (%{count}) relation_paginated: Relacions (%{x}-%{y} de %{count}) - comment: Comentaris(%{count}) hidden_comment_by_html: Comentari ocult de %{user} %{time_ago} comment_by_html: Comentari de %{user} %{time_ago} changesetxml: XML del conjunt de canvis diff --git a/config/locales/ce.yml b/config/locales/ce.yml index d65e3fc34..6c03dcf45 100644 --- a/config/locales/ce.yml +++ b/config/locales/ce.yml @@ -203,7 +203,6 @@ ce: way_paginated: Сиз (%{x}-%{y} чуьра %{count}) relation: Хилар (%{count}) relation_paginated: Хилар (%{x}-%{y} чуьра %{count}) - comment: Комменташ (%{count}) changesetxml: Нисдарийн XML osmchangexml: osmChange XML feed: diff --git a/config/locales/cs.yml b/config/locales/cs.yml index e4b22fd6e..aa21cbb67 100644 --- a/config/locales/cs.yml +++ b/config/locales/cs.yml @@ -422,7 +422,6 @@ cs: way_paginated: Cesty (%{x}-%{y} z %{count}) relation: Relace (%{count}) relation_paginated: Relace (%{x}–%{y} z %{count}) - comment: Komentáře (%{count}) hidden_comment_by_html: Skrytý komentář od uživatele %{user} %{time_ago} comment_by_html: Komentář od uživatele %{user} %{time_ago} changesetxml: Sada změn XML diff --git a/config/locales/cy.yml b/config/locales/cy.yml index 7e7e2121b..a60c9e522 100644 --- a/config/locales/cy.yml +++ b/config/locales/cy.yml @@ -382,7 +382,6 @@ cy: way_paginated: Llwybrau (%{x}-%{y} o %{count}) relation: Perthnasoedd (%{count}) relation_paginated: Perthnasoedd (%{x}-%{y} o %{count}) - comment: Sylwadau (%{count}) hidden_comment_by_html: Sylw cudd gan %{user} %{time_ago} comment_by_html: Sylw gan %{user} %{time_ago} changesetxml: XML grŵp newid @@ -1380,7 +1379,7 @@ cy: level2: Ffin Gwledydd level4: Ffin Taleithiau level5: Ffin Rhanbarth - level6: Ffin Sir + level6: Ffin Sir / Swydd level8: Ffin Dinas level9: Ffin Pentref level10: Ffin Maesdref diff --git a/config/locales/da.yml b/config/locales/da.yml index 0489206f0..1192d2e6e 100644 --- a/config/locales/da.yml +++ b/config/locales/da.yml @@ -383,7 +383,6 @@ da: way_paginated: Veje (%{x}-%{y} af %{count}) relation: Relationer (%{count}) relation_paginated: Relationer (%{x}-%{y} af %{count}) - comment: Kommentarer (%{count}) hidden_comment_by_html: Skjult kommentar fra %{user} %{time_ago} comment_by_html: Kommentar fra %{user} %{time_ago} changesetxml: XML for ændringssæt diff --git a/config/locales/de.yml b/config/locales/de.yml index 7d10526f8..f40c7ba8e 100644 --- a/config/locales/de.yml +++ b/config/locales/de.yml @@ -462,7 +462,6 @@ de: way_paginated: Wege (%{x}–%{y} von %{count}) relation: Relationen (%{count}) relation_paginated: Relationen (%{x}–%{y} von %{count}) - comment: Kommentare (%{count}) hidden_comment_by_html: Versteckter Kommentar von %{user} %{time_ago} comment_by_html: Kommentar von %{user} %{time_ago} changesetxml: Änderungssatz-XML diff --git a/config/locales/diq.yml b/config/locales/diq.yml index 5b8d496ea..00c88ebba 100644 --- a/config/locales/diq.yml +++ b/config/locales/diq.yml @@ -204,7 +204,6 @@ diq: way_paginated: Ray (%{x}-%{y} - pêro piya %{count}) relation: Elaqeyi %{count} relation_paginated: Elaqeyi %{x}-%{y} pêro piya %{count} - comment: Mışewreyi (%{count}) changesetxml: Vurnayışê peyênê XML osmchangexml: OsmVurnayışê XML feed: diff --git a/config/locales/el.yml b/config/locales/el.yml index 257c3d123..8c450d7b5 100644 --- a/config/locales/el.yml +++ b/config/locales/el.yml @@ -396,7 +396,6 @@ el: way_paginated: Διαδρομές (%{x}-%{y} από %{count}) relation: Σχέσεις (%{count}) relation_paginated: Σχέσεις (%{x}-%{y} από %{count}) - comment: Σχόλια (%{count}) hidden_comment_by_html: Κρυφό σχόλιο από %{user} %{time_ago} comment_by_html: Σχόλιο από %{user} %{time_ago} changesetxml: Ομάδας αλλαγών XML diff --git a/config/locales/en-GB.yml b/config/locales/en-GB.yml index 67dce974e..25b929c68 100644 --- a/config/locales/en-GB.yml +++ b/config/locales/en-GB.yml @@ -297,7 +297,6 @@ en-GB: way_paginated: Ways (%{x}-%{y} of %{count}) relation: Relations (%{count}) relation_paginated: Relations (%{x}-%{y} of %{count}) - comment: Comments (%{count}) changesetxml: Changeset XML osmchangexml: osmChange XML feed: diff --git a/config/locales/eo.yml b/config/locales/eo.yml index 6ad4da81e..0ed93fe27 100644 --- a/config/locales/eo.yml +++ b/config/locales/eo.yml @@ -34,10 +34,10 @@ eo: friendly: '%e %B %Y je %H:%M' helpers: file: - prompt: Elektu dosieron + prompt: Elekti dosieron submit: diary_comment: - create: Publikigi + create: Prikomenti diary_entry: create: Publikigi update: Ĝisdatigi @@ -47,7 +47,7 @@ eo: create: Sendi client_application: create: Registri - update: Aktualigi + update: Ĝisdatigi oauth2_application: create: Registri update: Ĝisdatigi @@ -63,7 +63,7 @@ eo: activerecord: errors: messages: - invalid_email_address: ŝajnas ne estas ĝusta retpoŝta adreso + invalid_email_address: ŝajne ne estas ĝusta retpoŝta adreso email_address_not_routable: ne estas enkursigebla display_name_is_user_n: ne povas esti user_n, escepte se n estas via uzant-identigilo models: @@ -372,7 +372,6 @@ eo: way_paginated: Linioj (%{x}-%{y} el %{count}) relation: Rilatoj (%{count}) relation_paginated: Rilatoj (%{x}-%{y} el %{count}) - comment: Komentoj (%{count}) hidden_comment_by_html: Kaŝita komento de %{time_ago} de %{user} comment_by_html: Komento de %{time_ago} de %{user} changesetxml: Ŝanĝaro XML @@ -559,6 +558,7 @@ eo: show: title: Taglibro de %{user} | %{title} user_title: Taglibro de %{user} + discussion: Diskuto leave_a_comment: Komenti login_to_leave_a_comment_html: '%{login_link} por aldoni komenton' login: Ensaluti diff --git a/config/locales/es.yml b/config/locales/es.yml index 8e8f2e5fc..39970164f 100644 --- a/config/locales/es.yml +++ b/config/locales/es.yml @@ -450,7 +450,6 @@ es: way_paginated: Vías (%{x}-%{y} de %{count}) relation: Relaciones (%{count}) relation_paginated: Relaciones (%{x}-%{y} de %{count}) - comment: Comentarios (%{count}) hidden_comment_by_html: Comentario ocultado por %{user} %{time_ago} comment_by_html: Comentario de %{user} %{time_ago} changesetxml: XML del conjunto de cambios @@ -540,6 +539,15 @@ es: introduction: Haz clic en el mapa para encontrar elementos cercanos. nearby: Elementos cercanos enclosing: Elementos delimitantes + old_nodes: + not_found: + sorry: 'Lo sentimos, no se pudo encontrar el nodo #%{id} versión %{version}.' + old_ways: + not_found: + sorry: 'Lo sentimos, no se pudo encontrar la vía #%{id} versión %{version}.' + old_relations: + not_found: + sorry: 'Lo sentimos, no se pudo encontrar la relación #%{id} versión %{version}.' changesets: changeset_paging_nav: showing_page: Página %{page} @@ -2363,8 +2371,9 @@ es: title: Guía para principiantes description: Guía para principiantes, mantenida por la comunidad. community: - title: Foro de la Comunidad - description: Un lugar compartido para conversaciones sobre OpenStreetMap. + title: Ayuda y foro comunitario + description: Un lugar compartido para buscar ayuda y tener conversaciones + sobre OpenStreetMap. mailing_lists: title: Listas de correo description: Haz una pregunta o discute asuntos interesantes en una amplia @@ -2754,6 +2763,7 @@ es: oauth_clients: new: title: Registrar una nueva aplicación + disabled: Se ha deshabilitado el registro de aplicaciones OAuth 1 edit: title: Editar tu aplicación show: @@ -2837,6 +2847,7 @@ es: title: Mis aplicaciones autorizadas application: Solicitudes permissions: Permisos + last_authorized: Último autorizado no_applications_html: Aún no has autorizado aplicaciones a %{oauth2}. application: revoke: Revocar el acceso @@ -2863,7 +2874,7 @@ es: aunque habrá algunas herramientas y servidores que aún la soliciten. continue: Registrarse terms accepted: ¡Gracias por aceptar los nuevos Términos de Colaborador! - email_confirmation_help_html: Tu dirección no se muestra públicamente, consulta + email_confirmation_help_html: Tu dirección no se mostrará públicamente, consulta nuestra %{privacy_policy_link} para obtener más información. privacy_policy: normativa de privacidad privacy_policy_title: Política de privacidad de la OSMF, incluida la sección @@ -2872,8 +2883,8 @@ es: title: Términos heading: Términos heading_ct: Términos de Colaborador - read and accept with tou: Lea el acuerdo de colaborador y los Términos de Uso, - marque ambas casillas de verificación cuando haya terminado y luego presione + read and accept with tou: Lee el acuerdo de colaborador y los Términos de Uso, + marca ambas casillas de verificación cuando hayas terminado y luego presiona el botón Continuar. contributor_terms_explain: Este acuerdo gobierna los términos de tus contribuciones actuales y futuras. diff --git a/config/locales/et.yml b/config/locales/et.yml index bc6e1df96..34fafc0dc 100644 --- a/config/locales/et.yml +++ b/config/locales/et.yml @@ -329,7 +329,6 @@ et: way_paginated: Jooned (%{x}–%{y} %{count}-st) relation: Relatsioonid (%{count}) relation_paginated: Relatsioonid (%{x}–%{y} %{count}-st) - comment: Kommentaare (%{count}) hidden_comment_by_html: Peidetud kommentaar kasutajalt %{user} %{time_ago} comment_by_html: Kommentaar kasutajalt %{user} %{time_ago} changesetxml: Muudatuskogumi XML diff --git a/config/locales/eu.yml b/config/locales/eu.yml index 466666b3b..e645207b9 100644 --- a/config/locales/eu.yml +++ b/config/locales/eu.yml @@ -362,7 +362,6 @@ eu: way_paginated: Bideak (%{x}-%{y} %{count}-tik) relation: Erlazioak (%{count}) relation_paginated: Erlazioak (%{x}-%{y} %{count}-tik) - comment: Iruzkinak (%{count}) hidden_comment_by_html: '%{user} -ren ezkutuko iruzkina %{time_ago} tik' comment_by_html: '%{user} -ren iruzkina orain dela %{time_ago}' changesetxml: Aldaketaren XML kodea diff --git a/config/locales/fa.yml b/config/locales/fa.yml index e1237dbfb..dddb6edfc 100644 --- a/config/locales/fa.yml +++ b/config/locales/fa.yml @@ -385,7 +385,6 @@ fa: way_paginated: راه‌ها (%{x}-%{y} از %{count}) relation: رابطه‌ها (%{count}) relation_paginated: رابطه‌ها (%{x}-%{y} از %{count}) - comment: نظرها (%{count}) hidden_comment_by_html: نظر پنهان؛ نوشتهٔ %{user}‏ %{time_ago} comment_by_html: نظر از %{user}‏ %{time_ago} changesetxml: Changeset XML diff --git a/config/locales/fi.yml b/config/locales/fi.yml index 7c5a55ec8..fdc0e38be 100644 --- a/config/locales/fi.yml +++ b/config/locales/fi.yml @@ -382,7 +382,6 @@ fi: way_paginated: Reitit (%{x}-%{y} of %{count}) relation: Relaatiot (%{count}) relation_paginated: Relaatiot (%{x}-%{y} / %{count}) - comment: Kommentit (%{count}) hidden_comment_by_html: Piilotettu kommentti käyttäjältä %{user} %{time_ago} comment_by_html: Kommentti käyttäjältä %{user}, %{time_ago} changesetxml: Muutoskokoelman XML @@ -2202,6 +2201,11 @@ fi: vineyard: Viinitarha forest: Talousmetsä wood: Metsä + farmland: Viljelysmaa + grass: Nurmikko + meadow: Niitty + bare_rock: Avokallio + sand: Hiekka golf: Golfkenttä park: Puisto common: Niitty @@ -2212,12 +2216,16 @@ fi: heathland: Kanervikko lake: Järvi reservoir: Tekojärvi + glacier: Jäätikkö + reef: Riutta + wetland: Kosteikko farm: Maatila brownfield: Purettujen rakennusten alue cemetery: Hautausmaa allotments: Siirtolapuutarha pitch: Urheilukenttä centre: Urheilukeskus + beach: Hiekkaranta reserve: Luonnonsuojelualue military: Sotilasalue school: Koulu @@ -2895,6 +2903,7 @@ fi: cyclosm_credit: 'Laattojen tyyli: %{osm_france_link} ylläpitämä %{cyclosm_link}' osm_france: OpenStreetMap Francen thunderforest_credit: Laattojen tekijä %{thunderforest_link} + tracestrack_credit: 'Laatat: %{tracestrack_link}' hotosm_credit: 'Laattojen tyyli: %{osm_france_link} ylläpitämä %{hotosm_link}' site: edit_tooltip: Muokkaa karttaa diff --git a/config/locales/fit.yml b/config/locales/fit.yml index bdf5c7c98..de9caf264 100644 --- a/config/locales/fit.yml +++ b/config/locales/fit.yml @@ -220,7 +220,6 @@ fit: way_paginated: Reitit (%{x}-%{y} of %{count}) relation: Relaatiot (%{count}) relation_paginated: Relaatiot (%{x}-%{y} / %{count}) - comment: Kommentit (%{count}) changesetxml: Muutoskokoelman XML osmchangexml: osmChange XML feed: diff --git a/config/locales/fr.yml b/config/locales/fr.yml index d804a3894..21901a141 100644 --- a/config/locales/fr.yml +++ b/config/locales/fr.yml @@ -136,7 +136,7 @@ fr: create: Téléverser update: Enregistrer les modifications user_block: - create: Créer un bloc + create: Créer un blocage update: Mettre à jour le blocage activerecord: errors: @@ -144,7 +144,7 @@ fr: invalid_email_address: ne semble pas être une adresse de courriel valide email_address_not_routable: n’est pas routable display_name_is_user_n: ne peut pas être user_n à moins que n soit votre identifiant - d'utilisateur + d’utilisateur models: user_mute: is_already_muted: est déjà en sourdine @@ -470,7 +470,6 @@ fr: way_paginated: Chemins (%{x} à %{y} sur %{count}) relation: Relations (%{count}) relation_paginated: Relations (%{x} à %{y} sur %{count}) - comment: Commentaires (%{count}) hidden_comment_by_html: Commentaire caché de %{user} %{time_ago} comment_by_html: Commentaire de %{user} %{time_ago} changesetxml: XML du groupe de modifications @@ -566,7 +565,7 @@ fr: sorry: 'Désolé, le nœud #%{id} version %{version} est introuvable.' old_ways: not_found: - sorry: 'Désolé, la façon #%{id} version %{version} ne pouvait pas être trouvée.' + sorry: 'Désolé, la façon #%{id} version %{version} est introuvable.' old_relations: not_found: sorry: 'Désolé, la relation #%{id} version %{version} est introuvable.' @@ -663,6 +662,7 @@ fr: show: title: Carnet de %{user} | %{title} user_title: Carnet de %{user} + discussion: Discussion leave_a_comment: Laisser un commentaire login_to_leave_a_comment_html: '%{login_link} pour laisser un commentaire' login: Se connecter @@ -1771,7 +1771,7 @@ fr: one: s’est chargé correctement avec %{trace_points} dd %{count} point possible. other: s’est chargé correctement avec %{trace_points} des %{count} points possibles. - all_your_traces_html: Toutes vos traces de GPX téléchargées avec succès peuvent + all_your_traces_html: Toutes vos traces de GPX téléversées avec succès peuvent être trouvées à %{url}. subject: '[OpenStreetMap] Import GPX réussi' signup_confirm: @@ -2813,7 +2813,7 @@ fr: read_gpx: Lire les traces GPC privées write_gpx: Mettre à jour les traces GPC write_notes: Modifier les notes - write_redactions: Rédiger les données cartographiques + write_redactions: Caviarder les données cartographiques read_email: Lire l’adresse courriel de l’utilisateur skip_authorization: Demande d’approbation automatique oauth_clients: @@ -2997,7 +2997,7 @@ fr: my_dashboard: Mon tableau de bord blocks on me: Blocages me concernant blocks by me: Blocages de ma part - create_mute: Désactiver cet utilisateur + create_mute: Mettre cet utilisateur en sourdine destroy_mute: Réactiver le son de cet utilisateur edit_profile: Modifier le profil send message: Envoyer un message @@ -3030,7 +3030,7 @@ fr: importer: Supprimer le droit d’importation block_history: Blocages actifs moderator_history: Blocages donnés - revoke_all_blocks: Révoquer tous les blocs + revoke_all_blocks: Révoquer tous les blocages comments: Commentaires create_block: Bloquer cet utilisateur ou cette utilisatrice activate_user: Activer cet utilisateur ou cette utilisatrice @@ -3146,15 +3146,15 @@ fr: revoke_all: title: Révoquer tous les blocages sur %{block_on} heading_html: Révoquer tous les blocages sur %{block_on} - empty: '%{name} n''a pas de blocs actifs.' + empty: '%{name} n’a pas de blocages actifs.' confirm: Êtes-vous sûr de vouloir révoquer %{active_blocks} ? active_blocks: - one: '%{count} active block' - other: '%{count} active blocks' + one: '%{count} blocage actif' + other: '%{count} blocages actifs' revoke: Révoquer flash: Tous les blocages actifs ont été révoqués. helper: - time_future_html: Prends fin dans %{time}. + time_future_html: Prend fin dans %{time}. until_login: Actif jusqu’à ce que l’utilisateur se connecte. time_future_and_until_login_html: Finit dans %{time} et une fois que l’utilisateur s’est connecté. @@ -3214,29 +3214,29 @@ fr: previous: ◂ Précédent user_mutes: index: - title: Utilisateurs muets - my_muted_users: Mes utilisateurs désactivés + title: Utilisateurs en sourdine + my_muted_users: Mes utilisateurs en sourdine you_have_muted_n_users: - one: Vous avez désactivé %{count} utilisateurs - other: Vous avez désactivé %{count} utilisateurs + one: Vous avez mis en sourdine %{count} utilisateur + other: Vous avez mis en sourdine %{count} utilisateurs user_mute_explainer: Les messages des utilisateurs mis en sourdine sont déplacés vers une boîte de réception distincte et vous ne recevrez pas de notifications - par e-mail. + par courriel. user_mute_admins_and_moderators: Vous pouvez désactiver le son des administrateurs et des modérateurs, mais leurs messages ne seront pas mis en sourdine. table: thead: - muted_user: Utilisateur muet + muted_user: Utilisateur en sourdine actions: Actions tbody: - unmute: Activer le son + unmute: Réactiver le son send_message: Envoyer un message create: - notice: Vous avez désactivé %{name}. + notice: Vous avez mis %{name} en sourdine. error: '%{name} n''a pas pu être mis en sourdine. %{full_message}.' destroy: notice: Vous avez rétabli le son de %{name}. - error: L'utilisateur muet n'a pas pu être rétabli. Veuillez réessayer. + error: Le son de l’utilisateur n’a pas pu être rétabli. Veuillez réessayer. notes: index: title: Notes soumises ou commentées par « %{user} » diff --git a/config/locales/fur.yml b/config/locales/fur.yml index 431f44cbd..81f5920ff 100644 --- a/config/locales/fur.yml +++ b/config/locales/fur.yml @@ -296,7 +296,6 @@ fur: way_paginated: Viis (%{x}-%{y} su %{count}) relation: Relazions (%{count}) relation_paginated: Relazions (%{x}-%{y} su %{count}) - comment: Coments (%{count}) hidden_comment_by_html: Coment platât di %{user} %{time_ago} comment_by_html: Comentât di %{user} %{time_ago} changesetxml: Grup di cambiaments XML diff --git a/config/locales/fy.yml b/config/locales/fy.yml index 2f6ab86c7..5497c735b 100644 --- a/config/locales/fy.yml +++ b/config/locales/fy.yml @@ -326,7 +326,6 @@ fy: way_paginated: Linen (%{x}-%{y} fan %{count}) relation: Relaasjes (%{count}) relation_paginated: Relaasjes (%{x}-%{y} fan %{count}) - comment: Reäksjes (%{count}) changesetxml: Wizigingsset-XML osmchangexml: osmWizigings-XML feed: diff --git a/config/locales/ga.yml b/config/locales/ga.yml index 9380e7fed..74d93c849 100644 --- a/config/locales/ga.yml +++ b/config/locales/ga.yml @@ -227,7 +227,6 @@ ga: way_paginated: Bealaí (%{x}-%{y} de %{count}) relation: Gaolta (%{count}) relation_paginated: Gaolta (%{x}-%{y} de %{count}) - comment: Nótaí tráchta (%{count}) changesetxml: XML an Tacair athruithe osmchangexml: XML osmChange feed: diff --git a/config/locales/gcf.yml b/config/locales/gcf.yml index 5f9d14cf5..05513dbe4 100644 --- a/config/locales/gcf.yml +++ b/config/locales/gcf.yml @@ -105,7 +105,6 @@ gcf: download_xml: Chantyé XML location: 'Ki koté:' changeset: - comment: Komantasyon (%{count}) hidden_comment_by_html: Komantasyon ou dévwè a %{user} %{time_ago} comment_by_html: Komantasyon a %{user} %{time_ago} changesetxml: Niméwo Chanjeman XML @@ -235,6 +234,7 @@ gcf: police: Manblo prison: Lajòl school: Lékòl + toilets: Kakatwa townhall: Lanméri waste_basket: Bwètazòdi bridge: @@ -309,6 +309,7 @@ gcf: island: Lilèt mud: Labou peninsula: Pwent + reef: Kay rock: Wòch sand: Sab scrub: Zèb-razyé @@ -318,6 +319,7 @@ gcf: valley: Koulé volcano: Vòlkan water: Glo + wood: Granbwa office: lawyer: Avoka place: @@ -325,10 +327,12 @@ gcf: city: Vil prensipal country: Péyi house: Kaz + houses: Kaz island: Lilèt islet: Tililèt locality: Koté sea: Lanmè + suburb: Fobou town: Vil village: Vilaj "yes": Koté @@ -473,7 +477,7 @@ gcf: title: Konèkté-w heading: Konekté email or username: 'Adres imél ouben nom itilizaté aw :' - password: 'Kòd aw:' + password: 'Kòd a''w:' lost password link: Ou pèd kòd a-w? login_button: Konektéw auth_providers: @@ -511,12 +515,13 @@ gcf: close: Fèmé search: search: Chèché - where_am_i: Ki moun an yé? + where_am_i: Ola sa yé? submit_text: Voyé key: table: entry: motorway: Lotowout + main_road: Chimen a gouvèlman trunk: Wokad primary: Chimen a gouvèlman train: Tren @@ -526,11 +531,14 @@ gcf: grass: Zèb sand: Sab reservoir: Rézèvwa + reef: Kay cemetery: Simityè beach: Bòdlanmè school: Lékòl hospital: Lopital + toilets: Kakatwa welcome: + title: Kontan vwè-w! rules: title: Larèl-la! add_a_note: @@ -538,6 +546,11 @@ gcf: traces: new: help: Anmwé + oauth: + authorize: + allow_write_api: modifyé kat-la. + scopes: + write_api: Modifyé kat-la oauth_clients: show: confirm: Ès ou sèkten? @@ -566,8 +579,11 @@ gcf: remove as friend: Woté on zanmi add as friend: Ajouté on zanmi mapper since: 'Arpantè dèpi:' + comments: Komantasyon go_public: flash success: Tou sa ou fè jis alè ki lé piblik ou pa otorizé édité. + suspended: + support: janmdifòs user_blocks: show: confirm: Ès ou sèkten? @@ -577,6 +593,7 @@ gcf: javascripts: share: title: Simé + download: Chantyé map: locate: title: Montré la ou yé diff --git a/config/locales/gd.yml b/config/locales/gd.yml index 28a88347b..c0ca4c561 100644 --- a/config/locales/gd.yml +++ b/config/locales/gd.yml @@ -202,7 +202,6 @@ gd: way_paginated: Slighean (%{x}-%{y} à %{count}) relation: Dàimhean (%{count}) relation_paginated: Dàimhean (%{x}-%{y} à %{count}) - comment: Beachdan (%{count}) changesetxml: XML le seata atharraichean osmchangexml: XML osmChange feed: diff --git a/config/locales/gl.yml b/config/locales/gl.yml index f04f1468d..25320ab3a 100644 --- a/config/locales/gl.yml +++ b/config/locales/gl.yml @@ -371,7 +371,6 @@ gl: way_paginated: Vías (%{x}-%{y} de %{count}) relation: Relacións (%{count}) relation_paginated: Relacións (%{x}-%{y} de %{count}) - comment: Comentarios (%{count}) hidden_comment_by_html: Comentario de %{user} agochado %{time_ago} comment_by_html: Comentario de %{user} %{time_ago} changesetxml: XML do conxunto de modificacións diff --git a/config/locales/gsw.yml b/config/locales/gsw.yml index c5475f3d6..b540e6e1d 100644 --- a/config/locales/gsw.yml +++ b/config/locales/gsw.yml @@ -113,7 +113,6 @@ gsw: way_paginated: Wäg (%{x}-%{y} von %{count}) relation: Relatione (%{count}) relation_paginated: Relatione (%{x}-%{y} of %{count}) - comment: Kommendar (%{count}) changesetxml: Changeset-XML osmchangexml: osmChange XML feed: diff --git a/config/locales/he.yml b/config/locales/he.yml index 78838d02a..3a368b571 100644 --- a/config/locales/he.yml +++ b/config/locales/he.yml @@ -407,7 +407,6 @@ he: way_paginated: קווים (%{x}–%{y} מתוך %{count}) relation: יחסים (%{count}) relation_paginated: יחסים (%{x}–%{y} מתוך %{count}) - comment: הערות (%{count}) hidden_comment_by_html: הערה מוסתרת מאת %{user} %{time_ago} comment_by_html: הערה מאת %{user} %{time_ago} changesetxml: XML של ערכת השינויים @@ -598,6 +597,7 @@ he: show: title: היומן של%{user} ‏ | %{title} user_title: היומן של %{user} + discussion: דיון leave_a_comment: הוספת תגובה login_to_leave_a_comment_html: נא %{login_link} כדי להשאיר תגובה login: להיכנס @@ -2296,8 +2296,8 @@ he: title: המדריך למתחילים description: מדריך בתחזוקת הקהילה למתחילים. community: - title: פורום קהילתי - description: מקום משותף לשיחות על OpenStreetMap. + title: עזרה ופורום קהילתי + description: מקום משותף לחפש עזרה ולנהל שיחות על OpenStreetMap. mailing_lists: title: רשימות תפוצה description: לשאול שאלה או לדון בדברים מעניינים ברשימות תפוצה נושאים ואזוריות @@ -2659,6 +2659,7 @@ he: oauth_clients: new: title: רישון יישום חדש + disabled: רישום יישומי OAuth 1 הושבת edit: title: עריכת היישום שלך show: @@ -2738,6 +2739,7 @@ he: title: האפליקציות המורשות שלי application: אפליקציה permissions: הרשאות + last_authorized: אושר בפעם האחרונה no_applications_html: לא אישרת עדיין יישומי %{oauth2}. application: revoke: שלילת גישה diff --git a/config/locales/hi.yml b/config/locales/hi.yml index 68f43d8c3..21b0c83c4 100644 --- a/config/locales/hi.yml +++ b/config/locales/hi.yml @@ -306,7 +306,6 @@ hi: way_paginated: रास्तें (%{count} का %{x}-%{y}) relation: सम्बन्ध (%{count}) relation_paginated: सम्बन्ध (%{count} के %{x}-%{y}) - comment: जवाब (%{count}) changesetxml: Changeset XML osmchangexml: osmChange XML feed: @@ -464,6 +463,7 @@ hi: show: title: '%{user} की डायरी | %{title}' user_title: '%{user}''s की डायरी' + discussion: चर्चा leave_a_comment: अपने विचार व्यक्त करें login_to_leave_a_comment_html: सत्रारंभ यहाँ %{login_link}, एक टिप्पणी लिखिने के लिए diff --git a/config/locales/hr.yml b/config/locales/hr.yml index 084524196..690267bfa 100644 --- a/config/locales/hr.yml +++ b/config/locales/hr.yml @@ -294,7 +294,6 @@ hr: way_paginated: Putovi(%{x}-%{y} od %{count}) relation: Relacije (%{count}) relation_paginated: Relacije(%{x}-%{y} od %{count}) - comment: Komentari (%{count}) changesetxml: XLM Set promjena osmchangexml: osmChange XML feed: diff --git a/config/locales/hsb.yml b/config/locales/hsb.yml index 9f9b2a01f..513c3b0aa 100644 --- a/config/locales/hsb.yml +++ b/config/locales/hsb.yml @@ -335,7 +335,6 @@ hsb: way_paginated: Puće (%{x}-%{y} z %{count}) relation: Relacije (%{count}) relation_paginated: Relacije (%{x}-%{y} z %{count}) - comment: Komentary (%{count}) changesetxml: Sadźba změnow XML osmchangexml: osmChange XML feed: diff --git a/config/locales/hu.yml b/config/locales/hu.yml index f73ceb8af..86ed3dd3a 100644 --- a/config/locales/hu.yml +++ b/config/locales/hu.yml @@ -73,6 +73,8 @@ hu: messages: invalid_email_address: nem tűnik érvényes e-mail-címnek email_address_not_routable: nem irányítható + display_name_is_user_n: nem lehet user_n, hacsak nem az n a Te felhasználói + azonosítód models: user_mute: is_already_muted: már el van némítva @@ -378,7 +380,6 @@ hu: way_paginated: 'Vonalak (%{x}-%{y} ennyiből: %{count})' relation: Kapcsolatok (%{count}) relation_paginated: 'Kapcsolatok (%{x}-%{y} ennyiből: %{count})' - comment: Hozzászólások (%{count}) hidden_comment_by_html: Rejtett hozzászólás %{user} felhasználótól %{time_ago} comment_by_html: Hozzászólt %{user} %{time_ago} changesetxml: Módosításcsomag adatai (XML) @@ -614,10 +615,32 @@ hu: newer_comments: Újabb hozzászólások older_comments: Régebbi hozzászólások doorkeeper: + errors: + messages: + account_selection_required: Az engedélyezési szerver megköveteli a végfelhasználói + fiók kiválasztását + consent_required: Az engedélyezési szerverhez a végfelhasználó beleegyezése + szükséges + interaction_required: Az engedélyezési szerver végfelhasználói interakciót + igényel + login_required: Az engedélyezési szerver végfelhasználói hitelesítést igényel flash: applications: create: notice: Alkalmazás regisztrálva. + openid_connect: + errors: + messages: + auth_time_from_resource_owner_not_configured: A Doorkeeper::OpenidConnect.configure.auth_time_from_resource_owner + konfiguráció hiánya miatti hiba. + reauthenticate_resource_owner_not_configured: A Doorkeeper::OpenidConnect.configure.reauthenticate_resource_owner + hiányzó konfiguráció miatt nem sikerült. + resource_owner_from_access_token_not_configured: A Doorkeeper::OpenidConnect.configure.resource_owner_from_access_token + hiányzó konfigurációja miatt nem sikerült. + select_account_for_resource_owner_not_configured: A Doorkeeper::OpenidConnect.configure.select_account_for_resource_owner + konfiguráció hiánya miatti hiba. + subject_not_configured: Az azonosítótoken generálása meghiúsult a Doorkeeper::OpenidConnect.configure.subject + konfiguráció hiánya miatt. scopes: address: Tartózkodási cím megtekintése email: Email cím megtekintése @@ -1630,6 +1653,8 @@ hu: one: sikeresen betöltődött a lehetséges %{count} pontból %{trace_points} ponttal. other: sikeresen betöltődött a lehetséges %{count} pontból %{trace_points} ponttal. + all_your_traces_html: 'Az összes sikeresen feltöltött GPX nyomkövetés megtalálható + itt: %{url}.' subject: '[OpenStreetMap] Sikeres GPX importálás' signup_confirm: subject: '[OpenStreetMap] Üdvözlünk az OpenStreetMapen' @@ -1793,6 +1818,9 @@ hu: people_mapping_nearby: közeli térképszerkesztő muted: title: Elnémított üzenetek + messages: + one: '%{count} némított üzeneted van' + other: '%{count} némított üzeneted van' reply: wrong_user: „%{user}” néven jelentkeztél be, de azt az üzenetet, amelyre válaszolni szeretnél, nem ez a felhasználó kapta. A válaszadáshoz jelentkezz be a helyes @@ -1817,13 +1845,14 @@ hu: as_unread: Üzenet megjelölve olvasatlanként unmute: notice: Az üzenet átkerült a Beérkezett üzenetek mappába + error: Az üzenetet nem sikerült áthelyezni a Beérkezett üzenetek mappába. destroy: destroyed: Üzenet törölve passwords: new: title: Elvesztett jelszó heading: Elfelejtetted jelszavad? - email address: 'E-mail-cím:' + email address: E-mail-cím new password button: Jelszó alaphelyzetbe állítása help_text: Add meg az e-mail-címed, amellyel regisztráltál. Küldeni fogunk egy hivatkozást, amellyel visszaállíthatod a jelszavad. @@ -1838,6 +1867,7 @@ hu: flash token bad: Nem találtad meg a tokent? Esetleg ellenőrizd az URL-t. update: flash changed: Jelszavad megváltozott. + flash token bad: Nem találtad meg a tokent? Esetleg ellenőrizd az URL-t. preferences: show: title: Megjelenési beállítások @@ -1882,8 +1912,8 @@ hu: new: title: Bejelentkezés heading: Bejelentkezés - email or username: 'E-mail-cím vagy felhasználónév:' - password: 'Jelszó:' + email or username: E-mail-cím vagy felhasználónév + password: Jelszó remember: Emlékezz rám lost password link: Elfelejtetted a jelszavad? login_button: Bejelentkezés @@ -1941,6 +1971,7 @@ hu: image: Kép alt: Alternatív szöveg url: URL + codeblock: Kódblokk richtext_field: edit: Szerkesztés preview: Előnézet @@ -2084,6 +2115,7 @@ hu: contributors_es_cc_by: CC BY 4.0 contributors_za_south_africa: Dél-Afrika contributors_gb_united_kingdom: Egyesült Királyság + contributors_2_contributors_page: Közreműködők oldala contributors_footer_2_html: Az adatok befoglalása az OpenStreetMapbe nem jelenti azt, hogy az eredeti adatszolgáltató támogatja az OpenStreetMapet, garanciát nyújt vagy felelősséget vállal rá. @@ -2092,7 +2124,9 @@ hu: ne adjanak hozzá adatokat egyetlen szerzői jogvédett forrásból se (pl. Google Térkép vagy nyomtatott térképek) a szerzői jog tulajdonosának kifejezett engedélye nélkül. + infringement_2_1_online_filing_page: on-line bejelentési oldal trademarks_title: Védjegyek + trademarks_1_1_trademark_policy: Védjegypolitika index: js_1: Vagy egy olyan böngészőt használsz, amely nem támogatja a JavaScriptet, vagy letiltottad a JavaScriptet. diff --git a/config/locales/ia.yml b/config/locales/ia.yml index 6273b658e..0fabf1543 100644 --- a/config/locales/ia.yml +++ b/config/locales/ia.yml @@ -355,7 +355,6 @@ ia: way_paginated: Vias (%{x}-%{y} de %{count}) relation: Relationes (%{count}) relation_paginated: Relationes (%{x}-%{y} de %{count}) - comment: Commentos (%{count}) hidden_comment_by_html: Commento celate de %{user} %{time_ago} comment_by_html: Commento de %{user} %{time_ago} changesetxml: XML del gruppo de modificationes diff --git a/config/locales/id.yml b/config/locales/id.yml index 3c33b1f61..568e2f17f 100644 --- a/config/locales/id.yml +++ b/config/locales/id.yml @@ -372,7 +372,6 @@ id: way_paginated: Jalan (%{x}-%{y} dari %{count}) relation: Hubungan (%{count}) relation_paginated: Hubungan (%{x}-%{y} dari %{count}) - comment: Komentar %{count} hidden_comment_by_html: Komentar tersembunyi dari %{user} %{time_ago} comment_by_html: Komentar dari %{user} %{time_ago} changesetxml: Set Perubahan XML diff --git a/config/locales/is.yml b/config/locales/is.yml index 489c0d29b..cee8c3a66 100644 --- a/config/locales/is.yml +++ b/config/locales/is.yml @@ -365,7 +365,6 @@ is: way_paginated: Leiðir (%{x}-%{y} af %{count}) relation: Vensl (%{count}) relation_paginated: Vensl (%{x}-%{y} af %{count}) - comment: Athugasemdir (%{count}) hidden_comment_by_html: Falin umsögn frá %{user} %{time_ago} comment_by_html: Umsögn frá %{user} %{time_ago} changesetxml: XML breytingasetts diff --git a/config/locales/it.yml b/config/locales/it.yml index 5734fc540..ff8c0bdf6 100644 --- a/config/locales/it.yml +++ b/config/locales/it.yml @@ -411,7 +411,6 @@ it: way_paginated: Percorsi (%{x}-%{y} di %{count}) relation: Relazioni (%{count}) relation_paginated: Relazioni (%{x}-%{y} di %{count}) - comment: Commenti (%{count}) hidden_comment_by_html: Commento nascosto da %{user} %{time_ago} comment_by_html: Commento da %{user} %{time_ago} changesetxml: Gruppo di modifiche XML @@ -592,6 +591,7 @@ it: show: title: Diario di %{user} | %{title} user_title: Diario di %{user} + discussion: Discussione leave_a_comment: Lascia un commento login_to_leave_a_comment_html: '%{login_link} per lasciare un commento' login: Entra diff --git a/config/locales/ja.yml b/config/locales/ja.yml index ef05c2da7..b62ce537d 100644 --- a/config/locales/ja.yml +++ b/config/locales/ja.yml @@ -374,7 +374,6 @@ ja: way_paginated: ウェイ (%{x}-%{y} / %{count}) relation: リレーション (%{count}件) relation_paginated: リレーション (%{x}-%{y} / %{count}) - comment: コメント (%{count}件) changesetxml: 変更セット XML osmchangexml: OSM 差分 XML feed: diff --git a/config/locales/ka.yml b/config/locales/ka.yml index 5a4fe12e5..de756c49c 100644 --- a/config/locales/ka.yml +++ b/config/locales/ka.yml @@ -156,7 +156,6 @@ ka: way_paginated: ხაზები (%{x}-%{y} %{count}-დან) relation: ურთიერთობები (%{count}) relation_paginated: ურთიერთობები (%{x}-%{y} %{count}-დან) - comment: კომენტარები (%{count}) changesetxml: ცვლილებების პაკეტის XML osmchangexml: osmChange XML feed: diff --git a/config/locales/kab.yml b/config/locales/kab.yml index 6cc9bc271..d854252d1 100644 --- a/config/locales/kab.yml +++ b/config/locales/kab.yml @@ -252,7 +252,6 @@ kab: way_paginated: Iberdan (%{x}-%{y} si %{count}) relation: AssaÉ£en (%{count}) relation_paginated: AssaÉ£en (%{x}-%{y} si %{count}) - comment: Iwenniten (%{count}) changesetxml: XML n ugraw n ibeddilen osmchangexml: XML osmChange feed: diff --git a/config/locales/kk-cyrl.yml b/config/locales/kk-cyrl.yml index 76571b823..9741fc8c9 100644 --- a/config/locales/kk-cyrl.yml +++ b/config/locales/kk-cyrl.yml @@ -248,7 +248,6 @@ kk-cyrl: node: Нүктелер (%{count}) way: Сызықтар (%{count}) relation: Қатынастар (%{count}) - comment: Пікірлер (%{count}) changesetxml: Өңдеме дестесінің XML-і osmchangexml: osmChange XML feed: diff --git a/config/locales/km.yml b/config/locales/km.yml index b6a7d62fc..6d80b0ccc 100644 --- a/config/locales/km.yml +++ b/config/locales/km.yml @@ -131,7 +131,6 @@ km: way_paginated: ផ្លូវចំនួន (%{x}-%{y} ក្នុងចំណោម %{count}) relation: ទំនាក់ទំនងចំនួន (%{count}) relation_paginated: ទំនាក់ទំនងចំនួន (%{x}-%{y} ក្នុងចំណោម %{count}) - comment: មតិយោបល់ (%{count}) changesetxml: សំណុំបន្លាស់ប្ដូរ​ XML feed: title: សំណុំបន្លាស់ប្ដូរ​ %{id} diff --git a/config/locales/kn.yml b/config/locales/kn.yml index d16523b6d..6ab75900f 100644 --- a/config/locales/kn.yml +++ b/config/locales/kn.yml @@ -238,7 +238,6 @@ kn: way_paginated: ದಾರಿಗಳು (%{x}-%{y} ರ %{count}) relation: ಸಂಬಂಧಗಳು (%{count}) relation_paginated: ಸಂಬಂಧಗಳು(%{x}-%{y} of %{count}) - comment: ಕಾಮೆಂಟ್ಗಳನ್ನು (%{count}) feed: title: ಬದಲಾವಣೆಗಳು %{id} title_comment: ಬದಲಾವಣೆಗಳು %{id} - %{comment} diff --git a/config/locales/ko.yml b/config/locales/ko.yml index 3945f4f7b..5da80f0ec 100644 --- a/config/locales/ko.yml +++ b/config/locales/ko.yml @@ -353,7 +353,6 @@ ko: way_paginated: 길(%{count}개 중 %{x}-%{y}) relation: 관계(%{count}) relation_paginated: 관계(%{count}개 중 %{x}-%{y}) - comment: 의견(%{count}개) hidden_comment_by_html: '%{time_ago} %{user}님의 비밀 의견' comment_by_html: '%{time_ago} %{user}님의 의견' changesetxml: 바뀜집합 XML diff --git a/config/locales/ku-Latn.yml b/config/locales/ku-Latn.yml index 315fd0dfd..5ad9b15b2 100644 --- a/config/locales/ku-Latn.yml +++ b/config/locales/ku-Latn.yml @@ -343,7 +343,6 @@ ku-Latn: way_paginated: Rê (%{x}-%{y} ji %{count}) relation: Eleqe (%{count}) relation_paginated: Eleqe (%{x}-%{y} bi tevahî %{count}) - comment: Şîrove (%{count}) hidden_comment_by_html: Şîroveya veşartî ji %{user} %{time_ago} comment_by_html: Şîroveya ji %{user} %{time_ago} changesetxml: Desteya guhartinan a XML diff --git a/config/locales/lb.yml b/config/locales/lb.yml index ad2c3ab50..6b96eb4ec 100644 --- a/config/locales/lb.yml +++ b/config/locales/lb.yml @@ -335,7 +335,6 @@ lb: way_paginated: Weeër (%{x}–%{y} vu(n) %{count}) relation: Relatiounen (%{count}) relation_paginated: Relatiounen (%{x}-%{y} vu(n) %{count}) - comment: Bemierkungen (%{count}) changesetxml: XML mam Set vun Ännerungen osmchangexml: osmChange XML feed: diff --git a/config/locales/lt.yml b/config/locales/lt.yml index b31b07af7..4080eab01 100644 --- a/config/locales/lt.yml +++ b/config/locales/lt.yml @@ -7,6 +7,7 @@ # Author: Eitvys200 # Author: Empers # Author: Garas +# Author: Hugo.arg # Author: Kris2paz # Author: Macofe # Author: Mantak111 @@ -63,6 +64,10 @@ lt: messages: invalid_email_address: nepanaÅ¡us į tinkamą e-paÅ¡to adresą email_address_not_routable: nemarÅ¡rutizuojamas + display_name_is_user_n: negali bÅ«ti user_n, nebent n yra jÅ«sų naudotojo id + models: + user_mute: + is_already_muted: jau nutildytas models: acl: Prieigos valdymo sąraÅ¡as changeset: Pakeitimas @@ -274,6 +279,8 @@ lt: reopened_at_by_html: '%{user} iÅ¡ naujo suaktyvino %{when}' rss: title: OpenStreetMap pastabos + description_all: Pastabų, apie kurias praneÅ¡ta, kurios buvo pakomentuotos + ar uždarytos, sąraÅ¡as description_area: sąraÅ¡as pastabų, praneÅ¡ta, pakomentuota arba uždaryta jÅ«sų srityje (%{min_lat}|%{min_lon}) -- (%{max_lat}|%{max_lon})] description_item: Rss kanalas pastabai %{id} @@ -308,6 +315,8 @@ lt: retain_changeset_discussions: JÅ«sų pakeitimų diskusijos, jei tokių yra, bus iÅ¡saugotos. retain_email: JÅ«sų el. paÅ¡to adresas bus iÅ¡saugotas. + recent_editing_html: Kadangi neseniai redagavote, jÅ«sų paskyros Å¡iuo metu + iÅ¡trinti negalima. IÅ¡trinti bus galima po %{time}. confirm_delete: Ar tikrai? cancel: AtÅ¡aukti accounts: @@ -393,7 +402,6 @@ lt: way_paginated: Keliai (%{x}-%{y} iÅ¡ %{count}) relation: RyÅ¡iai (%{count}) relation_paginated: RyÅ¡iai (%{x}-%{y} iÅ¡ %{count}) - comment: Komentarai (%{count}) hidden_comment_by_html: Paslėptas komentaras nuo %{user} %{time_ago} comment_by_html: Komentaras nuo %{user} %{time_ago} changesetxml: Pakeitimo XML @@ -486,6 +494,9 @@ lt: introduction: Spauskite ant žemėlapio, norėdami rasti gretimus objektus nearby: Artimi objektai enclosing: Gaubiantys objektai + old_relations: + not_found: + sorry: AtsipraÅ¡ome, santykio %{id} versijos %{version} nepavyko rasti. changesets: changeset_paging_nav: showing_page: Puslapis %{page} @@ -634,6 +645,12 @@ lt: applications: create: notice: Aplikacija užregistruota. + scopes: + address: ŽiÅ«rėti savo fizinį adresą + email: ŽiÅ«rėti savo el. paÅ¡to adresą + openid: Autentifikuokite savo paskyrą + phone: ŽiÅ«rėti savo telefono ryÅ¡io numerį + profile: ŽiÅ«rėti savo profilio informaciją errors: contact: contact_url_title: Ä®vairių susisiekimo bÅ«dų paaiÅ¡kinimas @@ -686,15 +703,19 @@ lt: "yes": Lyninis keltuvas aeroway: aerodrome: Aerodromas + airstrip: Pakilimo takas apron: Oro uosto aikÅ¡telė gate: Oro uosto vartai hangar: Angaras helipad: Sraigtasparnių aikÅ¡telė holding_position: Užlaikymo pozicija + navigationaid: Aviacijos navigacijos pagalba parking_position: Stovėjimo Pozicija runway: Pakilimo takas + taxilane: Taksi linija taxiway: Riedėjimo takas terminal: Oro uosto terminalas + windsock: Vėjarodis amenity: animal_boarding: GyvÅ«nų vieÅ¡butis animal_shelter: GyvÅ«nų prieglauda @@ -773,8 +794,10 @@ lt: public_bath: VieÅ¡a Pirtis public_bookcase: Knygų dalinimosi lentyna public_building: Visuomeninis pastatas + ranger_station: Reindžerio stotis recycling: Perdirbimo punktas restaurant: Restoranas + sanitary_dump_station: Sanitarinis sąvartynas school: Mokykla shelter: Pastogė shower: DuÅ¡as @@ -787,6 +810,7 @@ lt: theatre: Teatras toilets: Tualetas townhall: Rotušė + training: Mokymų įstaiga university: Universitetas vehicle_inspection: Automobilių ApžiÅ«ra vending_machine: Vendingas @@ -794,9 +818,13 @@ lt: village_hall: Nedidelio miestelio valdžios bÅ«stinė waste_basket: Atliekų krepÅ¡elis waste_disposal: Atliekų Å¡alinimas + waste_dump_site: Atliekų sąvartynas + watering_place: Laistymo vieta water_point: Vandens Punktas weighbridge: Svarstyklės + "yes": Patogumai boundary: + aboriginal_lands: Čiabuvių žemės administrative: Administracinė riba census: Gyventojų suraÅ¡ymo teritorijos riba national_park: Nacionalinis parkas @@ -805,6 +833,7 @@ lt: "yes": Riba bridge: aqueduct: Akvedukas + boardwalk: Promenada suspension: Kabantis tiltas swing: SiÅ«buojantis tiltas viaduct: Viadukas @@ -813,8 +842,11 @@ lt: apartment: Apartamentas apartments: Apartamentai barn: Tvartas + bungalow: Vila + cabin: Trobelė chapel: Koplyčia church: Bažnyčios Pastatas + civic: Civilinis statinys college: Koledžo Pastatas commercial: Komercinės paskirties pastatas construction: Statomas pastatas @@ -822,6 +854,7 @@ lt: dormitory: Bendrabutis duplex: Dvibutis farm: Ūkinis Namas + farm_auxiliary: Pagalbinis Å«kis garage: Garažas garages: Garažai greenhouse: Å iltnamis @@ -829,9 +862,11 @@ lt: hospital: Ligoninės pastatas hotel: VieÅ¡bučio Pastatas house: Namas + houseboat: Plaukiojantis namas hut: Trobelė industrial: Pramoninis pastatas kindergarten: Darželio Pastatas + manufacture: Pramoninis statinys office: Biurų pastatas public: Visuomeninis pastatas residential: Gyvenamasis pastatas @@ -839,15 +874,19 @@ lt: roof: Stogas ruins: Sugriuvęs pastatas school: Mokyklos pastatas + semidetached_house: Pusiau atskiras namas + service: Pagalbinis statinys shed: PaÅ¡iÅ«rė stable: Arklidė static_caravan: Karavanas + temple: Å ventyklos pastatas terrace: Terasos Pastatas train_station: Traukinių Stoties Pastatas university: Universiteto pastatas warehouse: Sandėlis "yes": Pastatas club: + scout: Skautų bazė sport: Sporto klubas "yes": Klubas craft: @@ -855,28 +894,39 @@ lt: blacksmith: Kalvis brewery: Alaus darykla carpenter: Dailidė + caterer: Maisto tiekėjas confectionery: Konditerija + dressmaker: Siuvėjas electrician: Elektrikas electronics_repair: Elektronikos taisykla gardener: Sodininkas + glaziery: Stiklius handicraft: Rankdarbiai + metal_construction: Metalo gamykla painter: Dažytojas photographer: Fotografas plumber: Santechnikas roofer: Stogdengys sawmill: LentpjÅ«vė shoemaker: Batsiuvys + stonemason: Akmenskaldys tailor: Siuvėjas + window_construction: Langų gamintojas winery: Vyno darykla "yes": Amatų parduotuvė emergency: + access_point: Prieigos taÅ¡kas ambulance_station: Greitosios medicinos pagalbos stotis assembly_point: Susirinkimo taÅ¡kas defibrillator: Defibriliatorius fire_extinguisher: Gesintuvas + fire_water_pond: PrieÅ¡gaisrinis telkinys landing_site: Avarinio nusileidimo aikÅ¡telė life_ring: Gelbėjimo ratas phone: Avarinis telefonas + siren: Avarinė sirena + suction_point: Avarinis siurbimo taÅ¡kas + water_tank: PrieÅ¡gaisrinis telkinys highway: abandoned: Apleistas kelias bridleway: Jodinėjimo takas @@ -917,18 +967,23 @@ lt: tertiary: Trečios reikÅ¡mės kelias tertiary_link: Trečios reikÅ¡mės kelias track: Vėžės + traffic_mirror: Eismo veidrodis traffic_signals: Å viesoforas trunk: Magistralinis kelias trunk_link: Magistralinis kelias unclassified: Neklasifikuotas kelias "yes": Kelias historic: + aircraft: Istorinis lėktuvas archaeological_site: Archeologinė vieta + bomb_crater: Istorinis bombos krateris battlefield: MÅ«Å¡io vieta boundary_stone: Pasienio akmuo building: Istorinis pastatas bunker: Bunkeris + cannon: Istorinė patranka castle: Pilis + charcoal_pile: Istorinė anglių krÅ«va church: Bažnyčia city_gate: Miesto vartai citywalls: Miesto sienos @@ -938,13 +993,16 @@ lt: manor: Dvaras memorial: Memorialas mine: Kasykla + mine_shaft: Kasyklos Å¡achta monument: Paminklas railway: Istorinis geležinkelis roman_road: Romėnų kelias ruins: Griuvėsiai + rune_stone: Runų akmuo stone: Akmuo tomb: Kapas tower: BokÅ¡tas + wayside_chapel: Pakelės koplytėlė wayside_cross: Pakelės kryžius wayside_shrine: Koplytstulpis wreck: Nuskendęs laivas @@ -953,6 +1011,7 @@ lt: "yes": SandÅ«ra landuse: allotments: Sodai/sodininkų bendrijos + aquaculture: AkvakultÅ«ra basin: Baseinas brownfield: Apleista teritorija cemetery: Kapinės @@ -971,9 +1030,11 @@ lt: military: Karinė zona mine: Kasykla orchard: vaisių sodas + plant_nursery: Daigynas quarry: Karjeras railway: Geležinkelis recreation_ground: Rekreacinė zona + religious: Å ventvietė reservoir: Rezervuaras reservoir_watershed: Vandens rezervuaras residential: Gyvenamasis rajonas @@ -982,8 +1043,12 @@ lt: vineyard: Vynuogynas "yes": Žemėnauda leisure: + adult_gaming_centre: Suaugusiųjų žaidimų centras + bandstand: Estrada beach_resort: PajÅ«rio kurortas bird_hide: paukščių stebėjimo vieta + bleachers: TribÅ«nos + bowling_alley: Boulingas common: Bendra žemė dance: Å okių salė dog_park: Å unų parkas @@ -999,6 +1064,7 @@ lt: miniature_golf: Mini golfas nature_reserve: Gamtos draustinis park: Parkas + picnic_table: Pikniko stalas pitch: Sporto aikÅ¡tė playground: Žaidimų aikÅ¡telė recreation_ground: Rekreacinis plotas @@ -1027,25 +1093,32 @@ lt: cross: Kryžius dyke: Pylimas flagpole: Vėliavos stiebas + kiln: Krosnis lighthouse: Å vyturys + manhole: Liukas mast: Stiebas mine: Kasykla mineshaft: Kasyklos Å¡achta monitoring_station: Stebėjimo Stotis petroleum_well: Naftos Å¡ulinys + pier: Pirsas pipeline: Vamzdynas pumping_station: Siurblinė reservoir_covered: Uždengtas rezervuaras silo: Siloso bokÅ¡tas snow_cannon: Sniego patranka snow_fence: Sniego tvora + storage_tank: Rezervuaras surveillance: Stebėjimas telescope: Teleskopas tower: BokÅ¡tas + utility_pole: Elektros stulpas + wastewater_plant: Vandenvalda watermill: Vandens MalÅ«nas water_tap: Vandens čiaupas water_tower: Vandens BokÅ¡tas water_well: Å ulinys + water_works: Vandentiekis windmill: Vėjo malÅ«nas works: Gamykla "yes": Žmogaus sukurta @@ -1053,11 +1126,14 @@ lt: airfield: Karinis aerodromas barracks: Kareivinės bunker: Bunkeris + checkpoint: Patikros punktas + trench: Tranšėja "yes": Karinis mountain_pass: "yes": Kalnų perėja natural: atoll: Atolas + bare_rock: Plikos uolos bay: Ä®lanka beach: PaplÅ«dimys cape: KyÅ¡ulys @@ -1102,6 +1178,7 @@ lt: water: Vanduo wetland: Pelkė wood: Medžiai + "yes": Gamtinis objektas office: accountant: Buhalteris administrative: Administracija @@ -1123,7 +1200,9 @@ lt: newspaper: Laikraščio biuras ngo: NGO įstaiga notary: Notaro biuras + religion: Religinė įstaiga research: Tyrimų biuras + tax_advisor: Mokesčių patarėjas telecommunication: Telekomunikacijų tarnyba travel_agent: Kelionių agentÅ«ra "yes": Biuras @@ -1146,6 +1225,7 @@ lt: neighbourhood: Rajonas plot: Sklypas postcode: PaÅ¡to kodas + quarter: Mikrorajonas region: Regionas sea: JÅ«ra square: AikÅ¡tė @@ -1183,12 +1263,14 @@ lt: shop: alcohol: Licencijuotos parduotuvės antiques: Antikvariniai daiktai + appliance: Buitinės technikos parduotuvė art: Meno parduotuvė baby_goods: KÅ«dikių prekių parduotuvė bag: Rankinių parduotuvė bakery: Kepykla bathroom_furnishing: Vonios kambario baldų parduotuvė beauty: Grožio salonas + bed: Patalynės gaminiai beverages: Gėrimų parduotuvė bicycle: Dviračių parduotuvė bookmaker: Žymė @@ -1255,6 +1337,7 @@ lt: massage: Masažas medical_supply: Medicinos reikmenų parduotuvė mobile_phone: Mobiliųjų telefonų parduotuvė + money_lender: Pinigų skolintojas motorcycle: Motociklų parduotuvė motorcycle_repair: Motociklų remonto dirbtuvės music: Muzikos prekių parduotuvė @@ -1269,6 +1352,7 @@ lt: pawnbroker: Lombardas perfumery: Parfumerijos parduotuvė pet: Naminių gyvÅ«nėlių parduotuvė + pet_grooming: Naminių gyvÅ«nėlių priežiÅ«ra photo: Foto prekių parduotuvė seafood: JÅ«ros gėrybės second_hand: Dėvėtų parduotuvė @@ -1276,6 +1360,7 @@ lt: shoes: Batų parduotuvė sports: Sporto prekių parduotuvė stationery: RaÅ¡tinės reikmenys + storage_rental: Sandėliavimo nuoma supermarket: Prekybos centras tailor: Siuvėjas tattoo: Tatuiruočių salonas @@ -1285,9 +1370,11 @@ lt: toys: Žaislų parduotuvė travel_agency: Kelionių agentÅ«ra tyres: Padangų Parduotuvė + vacant: Laisva parduotuvė variety_store: Ä®vairių prekių parduotuvė video: Video parduotuvė video_games: Vaizdo žaidimų parduotuvė + wholesale: Didmeninė parduotuvė wine: Vyno Parduotuvė "yes": Parduotuvė tourism: @@ -1310,6 +1397,7 @@ lt: picnic_site: Poilsiavietė theme_park: Nuotykių parkas viewpoint: Apžvalgos aikÅ¡telė + wilderness_hut: Trobelė gamtoje zoo: Zoologijos sodas tunnel: building_passage: Praėjimas pro pastatą @@ -1336,12 +1424,15 @@ lt: "yes": Vandens vektorius admin_levels: level2: Å alies sienos + level3: Regiono riba level4: Valstybės sienos level5: Regiono ribos level6: Apskrities ribos + level7: Savivaldybės riba level8: Miesto sienos level9: Kaimo riba level10: Priemiesčio riba + level11: Mikrorajono riba types: cities: Miestai towns: Miestai @@ -1354,6 +1445,7 @@ lt: title: Problemos select_status: Parinkite bÅ«seną select_type: Pasirinkite tipą + reported_user: Pranešęs naudotojas not_updated: Neatnaujinta search: IeÅ¡koti search_guidance: 'Problemų paieÅ¡ka:' @@ -1362,6 +1454,7 @@ lt: status: BÅ«sena reports: PraneÅ¡imai last_updated: Paskutinis atnaujinimas + last_updated_time_ago_user_html: '%{time_ago} %{user}' link_to_reports: ŽiÅ«rėti praneÅ¡imus reports_count: one: '{%count} praneÅ¡imas' @@ -1673,11 +1766,13 @@ lt: to: Kam subject: Tema date: Data + actions: Veiksmai message_summary: unread_button: Žymėti neskaitytu read_button: Žymėti skaitytu reply_button: Atsakyti destroy_button: IÅ¡trinti + unmute_button: Perkelti į gautuosius new: title: Siųsti žinutę send_message_to_html: Siųsti naują žinutę naudotojui %{name} @@ -1692,12 +1787,15 @@ lt: body: Gaila, bet žinutės su tokiu id nėra. outbox: title: IÅ¡siųstieji + actions: Veiksmai messages: one: JÅ«s %{count} nusiųstą praneÅ¡imą other: JÅ«s %{count} nusiųstus(-ų) praneÅ¡imus(-ų) no_sent_messages_html: JÅ«s dar negavote nei vienos žinutės. Kodėl gi nesusisiekus su %{people_mapping_nearby_link}? people_mapping_nearby: netoliese žyminčiais naudotojais + muted: + title: Nutildyti praneÅ¡imai reply: wrong_user: JÅ«s prisijungęs kaip „%{user}“, bet praneÅ¡imas, kuriuo jÅ«sų praÅ¡yta atsakyti, nebuvo nusiųstas tam naudotojui. Prisijunkite prie teisingos naudotojo @@ -1716,16 +1814,20 @@ lt: heading: my_inbox: Mano gauti my_outbox: IÅ¡siųsti + muted_messages: Nutildyti praneÅ¡imai mark: as_read: PraneÅ¡imas pažymėtas kaip skaitytas as_unread: PraneÅ¡imas pažymėtas kaip neskaitytas + unmute: + notice: Žinutė perkelta į gautuosius + error: Žinutės nepavyko perkelti į gautuosius. destroy: destroyed: PraneÅ¡imas iÅ¡trintas passwords: new: title: PamirÅ¡au slaptažodį heading: PamirÅ¡ote slaptažodį? - email address: 'E-paÅ¡to adresas:' + email address: El. paÅ¡to adresas new password button: Atstatyti slaptažodį help_text: Ä®veskite elektroninio paÅ¡to adresą, kurį naudojote užsiregistruodami. Mes atsiųsime nuorodą į elektroninį paÅ¡tą, kurią galėsite naudoti norėdami @@ -1741,6 +1843,7 @@ lt: flash token bad: Ženklas nerastas, galbÅ«t bloga nuoroda? update: flash changed: JÅ«sų slaptažodis sėkmingai pakeistas. + flash token bad: Prieigos raktas nerastas, galbÅ«t blogai nurodytas URL? preferences: show: title: Mano parinktys @@ -1785,8 +1888,8 @@ lt: new: title: Prisijungti heading: Prisijungti - email or username: 'E-paÅ¡to adresas arba naudotojo vardas:' - password: 'Slaptažodis:' + email or username: 'El. paÅ¡to adresas ar naudotojo vardas:' + password: Slaptažodis remember: Prisiminti prisijungimą lost password link: PamirÅ¡ote slaptažodį? login_button: Prisijungti @@ -1806,8 +1909,8 @@ lt: title: Prisijungti su Facebook alt: Prisijungti su Facebook paskyra microsoft: - title: Prisijungti su Windows Live - alt: Prisijungti su Windows Live paskyra + title: Prisijungti su Microsoft + alt: Prisijungti su Microsoft paskyra github: title: Prisijungti su GitHub alt: Prisijungti su GitHub Paskyra @@ -1843,12 +1946,14 @@ lt: image: Paveikslėlis alt: Alternatyvusis tekstas url: Interneto adresas (URL) + codeblock: Kodo blokas richtext_field: edit: Redaguoti preview: PeržiÅ«rėti site: about: next: Kitas + heading_html: '%{copyright}OpenStreetMap %{br} bendradarbiai' used_by_html: '%{name} pateikia žemėlapio duomenis tÅ«kstančiams interneto puslapių, mobilių aplikacijų ir techninės įrangos įrenginių' lede_text: OpenStreetMap kuria bendruomenė žymėtojų, kuriančių ir prižiÅ«rinčių @@ -1858,6 +1963,8 @@ lt: orotofoto nuotraukas, GPS įrenginius ir paprastus lauko žemėlapius, tikrindami, kad OSM duomenys yra teisingi ir aktualÅ«s. community_driven_title: Bendruomenės vystomas + community_driven_osm_blog: OpenStreetMap tinklaraÅ¡tis + community_driven_user_diaries: naudotojų dienoraščiai community_driven_community_blogs: bendruomenių tinklaraščiai community_driven_osm_foundation: OSM fondas open_data_title: Atviri duomenys @@ -1868,9 +1975,20 @@ lt: open_data_open_data: atviri duomenys open_data_copyright_license: Autorių teisių ir licencijos puslapis legal_title: Teisės + legal_1_1_html: |- + Å i svetainė ir daugelis susijusių paslaugų formaliai valdomi + %{openstreetmap_foundation_link} (OSMF) + bendruomenės vardu. Visų OSMF valdovų paslaugų naudojimui taikoma + %{terms_of_use_link}, %{aup_link} ir mÅ«sų %{privacy_policy_link}. legal_1_1_openstreetmap_foundation: OpenStreetMap fondas legal_1_1_terms_of_use: Naudojimo sąlygos + legal_1_1_aup: Priimtino naudojimo politika + legal_1_1_privacy_policy: Privatumo politika + legal_2_1_html: |- + PraÅ¡ome %{contact_the_osmf_link} + Jei turite licencijų, autorių teisių ar kitų teisinių klausimų. legal_2_1_contact_the_osmf: susisiekti su OSMF + legal_2_2_registered_trademarks: OSMF registruotie prekių ženklai partners_title: Partneriai copyright: foreign: @@ -1887,28 +2005,97 @@ lt: mapping_link: pradėti žymėjimą legal_babble: title_html: Autorinės teisės ir licencija + introduction_1_html: |- + OpenStreetMap%{registered_trademark_link} yra %{open_data}, licencijuota pagal + %{odc_odbl_link} (ODbL) pagal %{osm_foundation_link} (OSMF). + introduction_1_open_data: atviri duomenys + introduction_1_odc_odbl: Open Data Commons Open Database licencija + introduction_1_osm_foundation: OpenStreetMap fondas + introduction_3_html: MÅ«sų dokumentai yra licencijuoti pagal %{creative_commons_link} + licenciją (CC BY-SA 2.0). + introduction_3_creative_commons: Creative Commons Attribution-ShareAlike 2.0 credit_title_html: Kaip paminėti OpenStreetMap credit_1_html: 'Naudodami OpenStreetMap duomenis, privalote atlikti Å¡iuos du dalykus:' + credit_2_1: Nurodykite priskyrimą naudojant OpenStreetMap autorių teisių praneÅ¡imą. + credit_2_2: PaaiÅ¡kinkite, kad duomenys yra prieinami pagal atviros duomenų + bazės licenciją. + credit_3_attribution_guidelines: Priskyrimo gairės + credit_4_1_this_copyright_page: šį autorių teisių puslapį attribution_example: alt: Pavyzdys kaip galima priskirti paskyrimus OpenStreetMap svetainėje title: Priskyrimo pavyzdys more_title_html: Papildoma informacija + more_1_1_html: Skaitykite daugiau apie mÅ«sų duomenų naudojimą ir kaip mums + priskirti autorystę apsilankę %{osmf_licence_page_link}. + more_1_1_osmf_licence_page: OSMF licencijos puslapis + more_2_1_api_usage_policy: API naudojimo politika contributors_title_html: MÅ«sų autoriai contributors_intro_html: MÅ«sų autoriai yra tÅ«kstančiai įvairių žmonių. Taip pat įtrauktas ir laisvai prieinamas turinys iÅ¡ valstybinių kartografijos agentÅ«rų bei įvairių kitų Å¡altinių. contributors_at_austria: Austrija + contributors_at_cc_by_at_with_amendments: CC BY AT su pakeitimais contributors_au_australia: Australija + contributors_au_geoscape_australia: Geoscape Australia + contributors_au_cc_licence: Creative Commons Attribution 4.0 tarptautinė licencija + (CC BY 4.0) + contributors_ca_credit_html: |- + %{canada}: yra duomenų iÅ¡ + GeoBase®, GeoGratis (© Kanados gamtos + Å¡altinių departamentas), CanVec (© Kanados gamtos + Å¡altinių departamentas), ir StatCan (Kanados statistikos + Geografijos skyriaus). contributors_ca_canada: Kanada + contributors_cz_credit_html: '%{czechia}: yra duomenų iÅ¡ Valstybinės žemėtvarkos + administracijos ir kadastro, licencijuojama pagal %{cc_licence_link}' + contributors_cz_czechia: Čekija + contributors_cz_cc_licence: Creative Commons Attribution 4.0 tarptautinė licencija + (CC BY 4.0) + contributors_fi_credit_html: |- + %{finland}: yra duomenų iÅ¡ + Suomijos topografinės duomenų bazės nacionalinės žemės tyrimo tarnybos + ir kitų duomenų rinkinių, pagal %{nlsfi_license_link}. contributors_fi_finland: Suomija + contributors_fi_nlsfi_license: NLSFI licencija + contributors_fr_credit_html: |- + %{france}: yra duomenų iÅ¡ + Bendrojo mokesčių valdytojo. contributors_fr_france: PrancÅ«zija + contributors_nl_credit_html: '%{netherlands}: Yra © AND duomenų, 2007 + (%{and_link})' contributors_nl_netherlands: Nyderlandai + contributors_nz_credit_html: |- + %{new_zealand}: yra duomenų iÅ¡ %{linz_data_service_link} + licencijuojama antriniam panaudojimui pagal %{cc_by_link}. contributors_nz_new_zealand: Naujoji Zelandija + contributors_nz_linz_data_service: LINZ duomenų tarnyba + contributors_nz_cc_by: CC BY 4.0 + contributors_rs_credit_html: |- + %{serbia}: yra duomenų iÅ¡ %{rgz_link} ir %{open_data_portal} + (vieÅ¡a Serbijos informacija), 2018. + contributors_rs_serbia: Serbija + contributors_rs_rgz: Serbijos geodezijos tarnyba + contributors_rs_open_data_portal: Nacionalinis atvirų duomenų portalas + contributors_si_credit_html: |- + %{slovenia}: yra duomenų iÅ¡ %{gu_link} ir %{mkgp_link} + (vieÅ¡a Slovėnijos informacija). contributors_si_slovenia: Slovėnija + contributors_si_gu: Matavimo ir žemėlapių tarnyba + contributors_si_mkgp: Žemės Å«kio, miÅ¡kų ir maisto ministerija + contributors_es_credit_html: |- + %{spain}: yra duomenų iÅ¡ + Ispanijos nacionalinio geografijos instituto (%{ign_link}) ir + Nacionalinės kartografinės sistemos (%{scne_link}) + licenzijuojama pakartotiniam naudojimui pagal %{cc_by_link}. contributors_es_spain: Ispanija + contributors_za_credit_html: '%{south_africa}: yra duomenų iÅ¡ %{ngi_link}, + valstybės teisės saugomos.' contributors_za_south_africa: Pietų Afrika + contributors_za_ngi: 'Vyriausiasis direktoratas: Nacionalinė geografinė erdvinė + informacija' contributors_gb_united_kingdom: Jungtinė Karalystė + contributors_2_contributors_page: Pagalbininkų puslapis contributors_footer_2_html: Duomenų įtraukimas į OpenStreetMap nereiÅ¡kia, kad originalių duomenų tiekėjas remia OpenStreetMap. Nenumatomos jokios garantijos ir neprisiimama jokia atsakomybė. @@ -1916,6 +2103,8 @@ lt: infringement_1_html: OSM pildytojai primenami niekada nesinaudoti autorių teisėmis apsaugotų Å¡altinių (pvz. Google Maps ar spausdintų žemėlapių) be leidimo naudoti. + infringement_2_1_takedown_procedure: paÅ¡alinimo procedÅ«ra + infringement_2_1_online_filing_page: pildymo internetu puslapis index: js_1: JÅ«s arba naudojate narÅ¡yklę, nepalaikančią JavaScript, arba iÅ¡jungėte JavaScript palaikymą. @@ -2053,37 +2242,61 @@ lt: cycleway_national: Nacionalinis dviračių takas cycleway_regional: Regioninis dviračių takas cycleway_local: Vietinis dviračių takas + cycleway_mtb: Kalnų dviračių marÅ¡rutas footway: Pėsčiųjų takas rail: Geležinkelis + train: Traukinys subway: Metropoliteno linija + ferry: Keltas + light_rail: Greitasis traukinys + tram: Tramvajus + trolleybus: Troleibusas + bus: Autobusas cable_car: Lyno keltuvas - chair_lift: keltuvas + chair_lift: Keltuvas runway: Kilimo takas taxiway: Riedėjimo takas apron: Oro uosto lėktuvų aikÅ¡telė admin: Administracinės ribos + capital: Sostinė + city: Miestas + orchard: Vaismedžių plantacija + vineyard: Vynuogynas forest: MiÅ¡kas - wood: Medžių teritorija + wood: MiÅ¡kas + farmland: Pasėliai + grass: Žolės + meadow: Pieva + bare_rock: Plikos uolos + sand: Smėlynas golf: Golfo laukas park: Parkas common: Bendras + built_up: Užstatyta teritorija resident: Gyvenamoji zona retail: Mažmeninis rajonas industrial: Pramoninė zona commercial: Komericinis plotas heathland: Å ilynas + scrubland: KrÅ«mynai lake: Ežeras - reservoir: rezervuaras + reservoir: Tvenkinys + intermittent_water: IÅ¡džiÅ«stantis vandentakis + glacier: Ledynas + reef: Rifas + wetland: Å lapynė farm: Ūkis brownfield: Apleista teritorija cemetery: Kapinės allotments: Sodai pitch: Sportinis laukas centre: Sporto centras + beach: PaplÅ«dimys reserve: Gamtos rezervatas military: Karinis rajonas school: Mokykla - university: universitetas + university: Universitetas + hospital: Ligoninė building: Didelis pastatas station: Geležinkelio stotis summit: VirÅ¡Å«nė @@ -2093,8 +2306,12 @@ lt: private: Privati prieiga destination: Atvykimo susisiekimas construction: Statomi keliai + bus_stop: Autobusų stotelė + stop: Sustojimas bicycle_shop: Dviračių parduotuvė + bicycle_rental: Dviračių nuoma bicycle_parking: Dviračių stovėjimo aikÅ¡telė + bicycle_parking_small: Maža dviračių stovėjimo aikÅ¡telė toilets: Tualetai welcome: title: Sveiki atvykę! @@ -2757,6 +2974,7 @@ lt: overlays: Ä®jungti papildomus sluoksnius problemų praneÅ¡imui title: Sluoksniai osm_france: OpenStreetMap PrancÅ«zija + andy_allan: Endis Alanas site: edit_tooltip: Redaguoti žemėlapį edit_disabled_tooltip: Norėdami redaguoti, priartinkite diff --git a/config/locales/lv.yml b/config/locales/lv.yml index b1dfcb6db..77377fe3c 100644 --- a/config/locales/lv.yml +++ b/config/locales/lv.yml @@ -276,7 +276,6 @@ lv: way_paginated: Ceļi (%{x}-%{y} no %{count}) relation: Relācijas (%{count}) relation_paginated: Relācijas (%{x}-%{y} no %{count}) - comment: Komentāri (%{count}) changesetxml: Izmaiņu kopas XML osmchangexml: osmChange XML feed: diff --git a/config/locales/mk.yml b/config/locales/mk.yml index f3f88c78d..fd6b8b88b 100644 --- a/config/locales/mk.yml +++ b/config/locales/mk.yml @@ -354,7 +354,6 @@ mk: way_paginated: Патишта (%{x}-%{y} од вкупно %{count}) relation: Односи (%{count}) relation_paginated: Односи (%{x}-%{y} од вкупно %{count}) - comment: Коментари (%{count}) hidden_comment_by_html: Скриен коментар од %{user} %{time_ago} comment_by_html: Коментар од %{user} %{time_ago} changesetxml: XML за измените @@ -542,6 +541,7 @@ mk: show: title: Дневникот на %{user} | %{title} user_title: Дневникот на %{user} + discussion: Разговор leave_a_comment: Напиши коментар login_to_leave_a_comment_html: '%{login_link} за да оставите коментар' login: Најава diff --git a/config/locales/mo.yml b/config/locales/mo.yml index 59955c5c6..0588febb3 100644 --- a/config/locales/mo.yml +++ b/config/locales/mo.yml @@ -111,7 +111,6 @@ mo: way_paginated: Кэй (%{x}-%{y} дин %{count}) relation: Релаций (%{count}) relation_paginated: Релаций (%{x}-%{y} дин %{count}) - comment: Коментарий (%{count}) join_discussion: Вэ ругэм сэ ынтраць ын конт пентру а вэ алэтура дискуцией discussion: Дискуцие node: diff --git a/config/locales/ms.yml b/config/locales/ms.yml index 56f2a4aca..09ed6e3de 100644 --- a/config/locales/ms.yml +++ b/config/locales/ms.yml @@ -290,7 +290,6 @@ ms: way_paginated: Jalan (%{x}-%{y} / %{count}) relation: Hubungan (%{count}) relation_paginated: Hubungan (%{x}-%{y} / %{count}) - comment: Komen (%{count}) changesetxml: XML Set Ubah osmchangexml: XML osmChange feed: diff --git a/config/locales/my.yml b/config/locales/my.yml index 00c5f1b4b..3cd4ae52b 100644 --- a/config/locales/my.yml +++ b/config/locales/my.yml @@ -146,7 +146,6 @@ my: location: 'တည်နေရာ:' changeset: belongs_to: စာရေးသူ - comment: မှတ်ချက်များ (%{count}) join_discussion: ဆွေးနွေးရန် လော့အင်ဝင်ပါ discussion: ဆွေးနွေးချက် relation: diff --git a/config/locales/nb.yml b/config/locales/nb.yml index e17b4732c..90644a741 100644 --- a/config/locales/nb.yml +++ b/config/locales/nb.yml @@ -343,7 +343,6 @@ nb: way_paginated: Strekninger (%{x}-%{y} av %{count}) relation: Forbindelser (%{count}) relation_paginated: Forbindelser (%{x}-%{y} av %{count}) - comment: Kommentarer (%{count}) changesetxml: XML for endringssett osmchangexml: osmChange-XML feed: @@ -510,6 +509,7 @@ nb: show: title: '%{user} sin dagbok | %{title}' user_title: Dagboken til %{user} + discussion: Diskusjon leave_a_comment: Legg igjen en kommentar login_to_leave_a_comment_html: '%{login_link} for Ã¥ legge inn en kommentar' login: Logg inn diff --git a/config/locales/ne.yml b/config/locales/ne.yml index a9e9c35ff..68abe84e7 100644 --- a/config/locales/ne.yml +++ b/config/locales/ne.yml @@ -170,7 +170,6 @@ ne: way_paginated: बाटोहरू (जम्मा %{count} मध्येबाट %{x}-%{y}) relation: सम्बन्धहरू (%{count}) relation_paginated: सम्बन्धहरू (जम्मा %{count} मध्येबाट %{x}-%{y}) - comment: टिप्पणीहरू (%{count}) changesetxml: चेन्जसेट XML osmchangexml: osmChange XML feed: diff --git a/config/locales/nl.yml b/config/locales/nl.yml index 6bde8c521..63f4e79be 100644 --- a/config/locales/nl.yml +++ b/config/locales/nl.yml @@ -410,7 +410,6 @@ nl: way_paginated: Wegen (%{x}-%{y} van %{count}) relation: Relaties (%{count}) relation_paginated: Relaties (%{x}-%{y} van %{count}) - comment: Reacties (%{count}) hidden_comment_by_html: Verborgen reactie van %{user}, %{time_ago} comment_by_html: Reactie van %{user}, %{time_ago} changesetxml: Wijzigingenset-XML diff --git a/config/locales/nn.yml b/config/locales/nn.yml index f3b7c6610..000c0763b 100644 --- a/config/locales/nn.yml +++ b/config/locales/nn.yml @@ -328,7 +328,6 @@ nn: way_paginated: Strekningar (%{x}-%{y} av %{count}) relation: Samhøve (%{count}) relation_paginated: Samhøve (%{x}–%{y} av %{count}) - comment: Kommentarar (%{count}) hidden_comment_by_html: Skylt kommentar frÃ¥ %{user} %{time_ago} comment_by_html: Kommentar frÃ¥ %{user} %{time_ago} changesetxml: XML for endringssett diff --git a/config/locales/nqo.yml b/config/locales/nqo.yml index 985005bf1..537ac7476 100644 --- a/config/locales/nqo.yml +++ b/config/locales/nqo.yml @@ -304,7 +304,6 @@ nqo: way_paginated: ߛߌߟߊ (%{x}-%{y} ߦߋ߫ %{count}) relation: ߕߍߓߊ߯ߦߊ (%{count}) relation_paginated: ߕߍߓߊ߯ߦߊ (%{x}-%{y} %{count}) - comment: ߡߙߌߣߊ߲ (%{count}) hidden_comment_by_html: ߞߊ߲߬ߞߎߡߊ ߥߣߊ߬ߙߌ߬ߣߍ߲߬ ߦߋ߫ %{user} ߡߊ߬ %{time_ago} ߟߊ߫ comment_by_html: ߞߊ߲߬ߞߎߡߊ ߞߊ߬ ߝߘߊ߫ %{user} ߟߊ߫ %{time_ago} ߡߊ߬ changesetxml: XML ߟߊ߬ߘߏ߲߬ߠߌ߲ ߡߊߝߊ߬ߟߋ߲߫ diff --git a/config/locales/oc.yml b/config/locales/oc.yml index 6d2040a60..22a3e9ce3 100644 --- a/config/locales/oc.yml +++ b/config/locales/oc.yml @@ -340,7 +340,6 @@ oc: way_paginated: Linhas (%{x} a %{y} sus %{count}) relation: Relacions (%{count}) relation_paginated: Relacions (%{x} a %{y} sus %{count}) - comment: Comentaris (%{count}) changesetxml: Grop de modificacions XML osmchangexml: osmChange XML feed: diff --git a/config/locales/pa.yml b/config/locales/pa.yml index 62853c128..18f52123e 100644 --- a/config/locales/pa.yml +++ b/config/locales/pa.yml @@ -171,7 +171,6 @@ pa: changeset: title: 'ਤਬਦੀਲੀ ਲੜੀ: %{id}' belongs_to: ਲੇਖਕ - comment: ਟਿੱਪਣੀਆਂ (%{count}) changesetxml: ਤਬਦੀਲੀ ਲੜੀ XML feed: title: ਤਬਦੀਲੀ ਲੜੀ %{id} diff --git a/config/locales/pl.yml b/config/locales/pl.yml index ef2583ac3..8a7334089 100644 --- a/config/locales/pl.yml +++ b/config/locales/pl.yml @@ -444,7 +444,6 @@ pl: way_paginated: Linie (%{x}-%{y} z %{count}) relation: Relacje (%{count}) relation_paginated: Relacje (%{x}-%{y} z %{count}) - comment: Komentarze (%{count}) hidden_comment_by_html: Ukryty komentarz od użytkownika %{user} %{time_ago} comment_by_html: Komentarz od %{user} %{time_ago} changesetxml: XML w formacie zestawu zmian @@ -2791,8 +2790,8 @@ pl: my_dashboard: Mój panel blocks on me: Otrzymane blokady blocks by me: Nałożone blokady - create_mute: Wycisz tego użytkownika - destroy_mute: Odcisz tego użytkownika + create_mute: wycisz tego użytkownika + destroy_mute: odcisz tego użytkownika edit_profile: Edytuj profil send message: wyślij wiadomość diary: dziennik @@ -3007,10 +3006,11 @@ pl: notice: Wyciszyłeś %{name}. notes: index: - title: Uwagi utworzone lub skomentowane przez %{user} + title: Uwagi użytkownika %{user} heading: Uwagi użytkownika %{user} subheading_html: Uwagi %{submitted} lub %{commented} przez %{user} - subheading_commented: skomentował + subheading_submitted: utworzone + subheading_commented: skomentowane no_notes: Brak uwag id: Identyfikator creator: Autor diff --git a/config/locales/pnb.yml b/config/locales/pnb.yml index 11b6746fd..fe71ee566 100644 --- a/config/locales/pnb.yml +++ b/config/locales/pnb.yml @@ -305,7 +305,6 @@ pnb: way_paginated: راہ (⁠%{count} وچ %{x} توں %{y}⁠) relation: سمبندھ (⁠%{count}⁠) relation_paginated: سمبندھ (⁠%{count} وچ %{x} توں %{y}⁠) - comment: ٹپݨیاں (⁠%{count}⁠) changesetxml: تبدیلیاں لئی سروت دی فائل osmchangexml: تبدیلیاں لئی سروت دی فائل فارماٹ feed: diff --git a/config/locales/pt-PT.yml b/config/locales/pt-PT.yml index 1b4aec322..d7d2ec89e 100644 --- a/config/locales/pt-PT.yml +++ b/config/locales/pt-PT.yml @@ -393,7 +393,6 @@ pt-PT: way_paginated: Linhas (%{x}-%{y} de %{count}) relation: Relações (%{count}) relation_paginated: Relações (%{x}-%{y} of %{count}) - comment: Comentários (%{count}) hidden_comment_by_html: Comentário ocultado por %{user} há %{time_ago} comment_by_html: Comentário de %{user} há %{time_ago} changesetxml: XML do conjunto de alterações diff --git a/config/locales/pt.yml b/config/locales/pt.yml index b02ba30dc..d011c97e9 100644 --- a/config/locales/pt.yml +++ b/config/locales/pt.yml @@ -412,7 +412,6 @@ pt: way_paginated: Linhas (%{x}-%{y} de %{count}) relation: Relações (%{count}) relation_paginated: Relações (%{x}-%{y} de %{count}) - comment: Comentários (%{count}) hidden_comment_by_html: Comentário ocultado por %{user} há %{time_ago} comment_by_html: Comentário de %{user} há %{time_ago} changesetxml: XML do conjunto de alterações diff --git a/config/locales/ro.yml b/config/locales/ro.yml index 0a00a3819..d03638d19 100644 --- a/config/locales/ro.yml +++ b/config/locales/ro.yml @@ -379,7 +379,6 @@ ro: way_paginated: Căi (%{x}-%{y} din %{count}) relation: Comunicații (%{count}) relation_paginated: Comunicații (%{x}-%{y} din %{count}) - comment: Comentarii (%{count}) hidden_comment_by_html: Comentariu ascuns de la %{user} %{time_ago} comment_by_html: Comentariu de la %{user} %{time_ago} changesetxml: Set de modificări XML diff --git a/config/locales/ru.yml b/config/locales/ru.yml index bd700c7de..a97c8c158 100644 --- a/config/locales/ru.yml +++ b/config/locales/ru.yml @@ -457,7 +457,6 @@ ru: way_paginated: Линии (%{x}-%{y} из %{count}) relation: Отношения (%{count}) relation_paginated: Отношения (%{x}-%{y} из %{count}) - comment: Комментарии (%{count}) comment_by_html: Комментарий от %{user} %{time_ago} changesetxml: XML пакета правок osmchangexml: osmChange XML diff --git a/config/locales/sat.yml b/config/locales/sat.yml index 7e0159361..bc6fff49d 100644 --- a/config/locales/sat.yml +++ b/config/locales/sat.yml @@ -154,7 +154,6 @@ sat: way: (%{count}) ᱦᱚᱨᱠᱚ relation: ᱥᱟᱹᱜᱟᱹᱭᱠᱩ (%{count}) relation_paginated: ᱥᱟᱹᱜᱟᱹᱭᱠᱩ (%{x}-%{y} of %{count}) - comment: (%{count})ᱚᱠᱛᱟᱠᱚ discussion: ᱜᱟᱞᱢᱟᱨᱟᱣ node: title_html: ᱜᱟᱸᱴᱷ:%{name} diff --git a/config/locales/sc.yml b/config/locales/sc.yml index b69c2a4f0..ff5af50ee 100644 --- a/config/locales/sc.yml +++ b/config/locales/sc.yml @@ -358,7 +358,6 @@ sc: way_paginated: Lìnias (%{x}-%{y} de %{count}) relation: Relatziones (%{count}) relation_paginated: Relatziones (%{x}-%{y} de %{count}) - comment: Cummentos (%{count}) hidden_comment_by_html: Cummentu cuadu de %{user} %{time_ago} comment_by_html: Cummentu de %{user} %{time_ago} changesetxml: XML de s'annantu de modìficas diff --git a/config/locales/scn.yml b/config/locales/scn.yml index 16870b4e7..8d51a5744 100644 --- a/config/locales/scn.yml +++ b/config/locales/scn.yml @@ -253,7 +253,6 @@ scn: way_paginated: Camini (%{x}-%{y} di %{count}) relation: Rilazzioni (%{count}) relation_paginated: Rilazzioni (%{x}-%{y} di %{count}) - comment: Cummenti (%{count}) changesetxml: XML dû gruppu di canciamenti osmchangexml: XML osmChange feed: diff --git a/config/locales/sco.yml b/config/locales/sco.yml index 6a6d25b53..08a460be7 100644 --- a/config/locales/sco.yml +++ b/config/locales/sco.yml @@ -124,7 +124,6 @@ sco: way_paginated: Ways (%{x}-%{y} of %{count}) relation: Relations (%{count}) relation_paginated: Relations (%{x}-%{y} of %{count}) - comment: Comments (%{count}) changesetxml: Chyngeset XML osmchangexml: osmChange XML feed: diff --git a/config/locales/sk.yml b/config/locales/sk.yml index 7e24c6803..3d74cf2fc 100644 --- a/config/locales/sk.yml +++ b/config/locales/sk.yml @@ -381,7 +381,6 @@ sk: way_paginated: Cesty (%{x}–%{y} z %{count}) relation: Relácie (%{count}) relation_paginated: Relácie (%{x}–%{y} z %{count}) - comment: Komentáre (%{count}) hidden_comment_by_html: Skrytý komentár od používateľa %{user} %{time_ago} comment_by_html: Komentár od používateľa %{user} %{time_ago} changesetxml: XML sady zmien diff --git a/config/locales/skr-arab.yml b/config/locales/skr-arab.yml index 10d7ccaf1..ef823dfc9 100644 --- a/config/locales/skr-arab.yml +++ b/config/locales/skr-arab.yml @@ -207,7 +207,6 @@ skr-arab: belongs_to: مصنف node: نوݙاں(%{count}) way: رستے(%{count}) - comment: تبصرے (%{count}) discussion: بحث مباحثہ node: title_html: 'نوڈ: %{name}' diff --git a/config/locales/sl.yml b/config/locales/sl.yml index 318ae10bf..8081cf503 100644 --- a/config/locales/sl.yml +++ b/config/locales/sl.yml @@ -397,7 +397,6 @@ sl: way_paginated: Poti (%{x}-%{y} od %{count}) relation: Relacije (%{count}) relation_paginated: Zveze (%{x}-%{y} od %{count}) - comment: Komentarji (%{count}) hidden_comment_by_html: Skrit komentar %{user} %{time_ago} comment_by_html: Komentar %{user} %{time_ago} changesetxml: Nabor sprememb XML @@ -2948,8 +2947,8 @@ sl: support: podpora automatically_suspended: Oprostite, vaÅ¡ račun je bil blokiran zaradi sumljive dejavnosti. - contact_support_html: To odločitev bo kmalu pregledal skrbnik, lahko pa se obrnete - na %{support_link}, če se želite o tem pogovoriti. + contact_support_html: To odločitev bo kmalu pregledal administrator, lahko pa + se obrnete na %{support_link}, če se želite o tem pogovoriti. auth_failure: connection_failed: Povezava do ponudnika avtentikacije ni uspela invalid_credentials: Neveljavne avtentikacijske poverilnice @@ -2968,8 +2967,8 @@ sl: not_a_role: Besedilo `%{role}' ni pravilna vloga. already_has_role: Uporabnik že ima vlogo %{role}. doesnt_have_role: Uporabnik nima vloge %{role}. - not_revoke_admin_current_user: Trenutnemu uporabniku ni mogoče preklicati vloge - skrbnika. + not_revoke_admin_current_user: Trenutnemu uporabniku ni mogoče odvzeti vloge + administratorja. grant: title: Potrdi dodeljevanje vloge heading: Potrdi dodeljevanje vloge diff --git a/config/locales/sq.yml b/config/locales/sq.yml index e3f572384..8d9775163 100644 --- a/config/locales/sq.yml +++ b/config/locales/sq.yml @@ -176,7 +176,6 @@ sq: way_paginated: Mënyrat (%{x}-%{y} nga %{count}) relation: Marrëdhëniet (%{count}) relation_paginated: Marrëdhëniet (%{x}-%{y} nga %{count}) - comment: Komentet (%{count}) changesetxml: Grupi i ndryshimeve në XML osmchangexml: osmNdrsyhimi XML feed: diff --git a/config/locales/sr.yml b/config/locales/sr.yml index b4efc2241..e2bab9269 100644 --- a/config/locales/sr.yml +++ b/config/locales/sr.yml @@ -313,6 +313,10 @@ sr: browse: created: Направљено closed: Затворено + created_ago_html: Направљено %{time_ago} + closed_ago_html: Затворено %{time_ago} + created_ago_by_html: Направљено %{time_ago} од %{user} + edited_ago_by_html: Уређено %{time_ago} од %{user} version: Верзија in_changeset: Скуп промена anonymous: анониман @@ -331,7 +335,6 @@ sr: way_paginated: Линије (%{x}-%{y} од %{count}) relation: Односи (%{count}) relation_paginated: Односи (%{x}-%{y} од %{count}) - comment: Коментари (%{count}) hidden_comment_by_html: Сакривени коментар корисника %{user} %{time_ago} comment_by_html: '%{user} коментарисао(ла) пре %{time_ago}' changesetxml: XML скуп промена @@ -494,6 +497,7 @@ sr: show: title: Дневник корисника/це %{user} | %{title} user_title: Дневник корисника/це %{user} + discussion: Дискусија leave_a_comment: Остави коментар login_to_leave_a_comment_html: '%{login_link} да бисте оставили коментар' login: Пријавите се @@ -610,7 +614,7 @@ sr: car_sharing: Краткорочно изнајмљивање аутомобила car_wash: Ауто-перионица casino: Казино - charging_station: Акумулаторска станица + charging_station: Станица за пуњење ЕВ childcare: Агенција за чување деце cinema: Биоскоп clinic: Клиника @@ -1137,6 +1141,7 @@ sr: hardware: Продавница алата health_food: Продавница здраве хране hifi: Продавница аудио-опреме + ice_cream: Сладоледџиница interior_decoration: Декорација ентеријера jewelry: Јувелирница kiosk: Трафика @@ -1258,6 +1263,7 @@ sr: open: Отвори resolved: Решено show: + no_reports: Нема пријава resolve: Разреши ignore: Игнориши reopen: Поново отвори @@ -1362,6 +1368,7 @@ sr: see_their_profile: Можете видети његов/њен профил на %{userurl}. befriend_them: Можете га/је додати и као пријатеља на %{befriendurl}. gpx_failure: + hi: Здарво %{to_user}, failed_to_import: 'Увоз није успео. Грешка:' import_failures_url: https://wiki.openstreetmap.org/wiki/GPX_Import_Failures?uselang=sr-ec subject: '[OpenStreetMap] GPX увоз није успео' @@ -1653,8 +1660,14 @@ sr: community_driven_osm_foundation: OSM фондација open_data_title: Отворени подаци legal_title: Правни аспекти - legal_1_1_terms_of_use: Услови коришћења - legal_1_1_privacy_policy: Политика приватности + legal_1_1_html: |- + Овим сајтом и многим другим сродним сервисима управља + %{openstreetmap_foundation_link} (OSMF) + а у име заједнице. Коришћење OSMF сервиса предмет је наших %{terms_of_use_link}, %{aup_link} и %{privacy_policy_link}. + legal_1_1_openstreetmap_foundation: OpenStreetMap фондација + legal_1_1_terms_of_use: услова коришћења + legal_1_1_aup: политике прихватљиве употребе + legal_1_1_privacy_policy: политике приватности partners_title: Партнери copyright: foreign: @@ -1671,7 +1684,13 @@ sr: mapping_link: почни с уређивањем карте legal_babble: title_html: Ауторска права и лиценца + introduction_2_html: Можете да умножавате, делите, преносите и прилагођавате + наше податке, све док наводите OpenStreetMap и њене уреднике. Ако желите + да мењате и дограђујете наше податке, можете их делити само под истом лиценцом. + Овај %{legal_code_link} наводи Ваша права и обавезе. introduction_2_legal_code: правни текст + introduction_3_html: Наша документација је доступна под лиценцом %{creative_commons_link} + (CC BY-SA 2.0). introduction_3_creative_commons: Creative Commons Ауторство-Делити под истим условима 2.0 credit_title_html: Како да наведете OpenStreetMap @@ -1706,14 +1725,13 @@ sr: contributors_za_south_africa: Јужна Африка contributors_gb_united_kingdom: Уједињено Краљевство contributors_2_contributors_page: доприносиоци - contributors_footer_2_html: |2- - Укључивање података у Опенстритмап не подразумева да изворни - власник података прихвата Опенстритмап, обезбеђује било какву - гаранцију или прихвата одговорност. + contributors_footer_2_html: Укључивањем података у OpenStreetMap не значи + да изворни власник података подржава OpenStreetMap, обезбеђује било какву + гаранцију или прихвата одговорност. infringement_title_html: Кршење ауторских права - infringement_1_html: ОСМ сарадници се подсећају да никад не додају податке - из извора заштићених ауторским правима (нпр. Гугл карте или штампане карте) - без изричите дозволе власника ауторских права. + infringement_1_html: OSM сарадници се подсећају да никад не додају податке + из извора заштићених ауторским правима (нпр. Гугл мапе или штампане карте) + без изричите дозволе носиоца ауторских права. trademarks_title: Заштитни знаци trademarks_1_1_trademark_policy: Робне марке index: @@ -1913,6 +1931,7 @@ sr: para_1: Ако хоћеш нешто ситно да поправиш а немаш времена да се пријавиш или да научиш да уређујеш, једноставно додај белешку. communities: + title: Заједнице local_chapters: title: Локални огранци other_groups: @@ -2177,6 +2196,7 @@ sr: my profile: Мој профил my settings: Моје поставке my comments: Моји коментари + my_preferences: Моја подешавања my_dashboard: Tабла blocks on me: Мени забрањено blocks by me: Моје забране @@ -2445,7 +2465,7 @@ sr: gps: Јавне GPS трасе overlays: Омогући преклапање за тражење грешака на карти title: Слојеви - openstreetmap_contributors: Творци OpenStreetMap + openstreetmap_contributors: OpenStreetMap сарадници make_a_donation: Донација website_and_api_terms: Веб-сајт и API услови site: diff --git a/config/locales/sv.yml b/config/locales/sv.yml index 8784f187a..de8d6685c 100644 --- a/config/locales/sv.yml +++ b/config/locales/sv.yml @@ -79,8 +79,8 @@ sv: create: Registrera update: Uppdatera redaction: - create: Skapa redaktering - update: Spara redaktering + create: Skapa maskering + update: Spara maskering trace: create: Uppladdning update: Spara ändringar @@ -362,7 +362,7 @@ sv: make_edits_public_button: Gör alla mina redigeringar offentliga update: success_confirm_needed: Användarinformation uppdaterades. Kontrollera din e-post - för att bekräfta din e-postadress. + för att bekräfta din nya e-postadress. success: Användarinformation uppdaterades. destroy: success: Kontot har raderats. @@ -399,8 +399,7 @@ sv: way_paginated: Sträckor (%{x}-%{y} av %{count}) relation: Förbindelser (%{count}) relation_paginated: Förbindelser (%{x}-%{y} av %{count}) - comment: Kommentarer (%{count}) - hidden_comment_by_html: Dolde kommentar frÃ¥n %{user} %{time_ago} + hidden_comment_by_html: Dold kommentar frÃ¥n %{user} %{time_ago} comment_by_html: Kommenterades frÃ¥n %{user} %{time_ago} changesetxml: XML för ändringsuppsättning osmchangexml: osmChange XML @@ -482,7 +481,7 @@ sv: wikimedia_commons_link: Sidan %{page} finner du pÃ¥ Wikimedia Commons telephone_link: Ring %{phone_number} colour_preview: Förhandsgranskning av färgen %{colour_value} - email_link: E-posta %{email} + email_link: Mejla %{email} query: title: Undersök kartobjekt introduction: Klicka pÃ¥ kartan för att hitta funktioner i närheten. @@ -720,12 +719,12 @@ sv: pylon: Pylon station: Linbanestation t-bar: Ankarlift - "yes": Svävarbana + "yes": Luftväg aeroway: aerodrome: Flygfält airstrip: Landningsbana - apron: Flygplatsplatta - gate: Flygplatsgate + apron: Flygplatsramp + gate: Flygplatsport hangar: Hangar helipad: Helikopterplatta holding_position: Väntplats @@ -820,9 +819,9 @@ sv: restaurant: Restaurang sanitary_dump_station: Sanitär tömningsstation school: Skola - shelter: Hydda + shelter: Skydd shower: Dusch - social_centre: Nöjescenter + social_centre: Socialcenter social_facility: Socialtjänst studio: Studio swimming_pool: Simbassäng @@ -831,7 +830,7 @@ sv: theatre: Teater toilets: Toaletter townhall: RÃ¥dhus - training: Träningsanstalt + training: Träningsanläggning university: Universitet vehicle_inspection: Fordonsbesiktning vending_machine: Varuautomat @@ -868,7 +867,7 @@ sv: chapel: Kapell church: Kyrkbyggnad civic: Offentlig byggnad - college: Universitetsbyggnad + college: Högskolebyggnad commercial: Kommersiell byggnad construction: Byggnad under uppförande detached: FristÃ¥ende hus @@ -877,7 +876,7 @@ sv: farm: GÃ¥rd farm_auxiliary: Utbyggnad pÃ¥ en gÃ¥rd garage: Garage - garages: Garage + garages: Garagelänga greenhouse: Växthus hangar: Hangar hospital: Sjukhusbyggnad @@ -907,7 +906,7 @@ sv: warehouse: Varuhus "yes": Byggnad club: - scout: Scoutklubbhus + scout: Scoutkollo sport: Idrottsförening "yes": Klubb craft: @@ -923,7 +922,7 @@ sv: gardener: TrädgÃ¥rdsmästare glaziery: Glasmästeri handicraft: Konsthantverk - hvac: Värme- och ventilationsverk + hvac: VVS-hantverk metal_construction: Metallkonstruktör painter: MÃ¥lare photographer: Fotograf @@ -1042,7 +1041,7 @@ sv: allotments: Kolonilotter aquaculture: Akvakultur basin: Bäcken - brownfield: Outvecklat omrÃ¥de + brownfield: Övergiven industrimark cemetery: Begravningsplats commercial: Kommersiellt omrÃ¥de conservation: NaturskyddsomrÃ¥de @@ -1050,9 +1049,9 @@ sv: farmland: Jordbruksmark farmyard: GÃ¥rdsplan forest: Skog - garages: Garage + garages: Garagelänga grass: Gräs - greenfield: Outvecklat omrÃ¥de + greenfield: Outvecklad jordbruksmark industrial: IndustriomrÃ¥de landfill: Soptipp meadow: Äng @@ -1125,12 +1124,12 @@ sv: communications_tower: Kommunikationstorn crane: Kran cross: Kors - dolphin: Dykdalb + dolphin: Förtöjningsstolpe dyke: Dike embankment: Fördämning flagpole: FlaggstÃ¥ng - gasometer: Gasometer - groyne: VÃ¥gbrytare + gasometer: Gasklocka + groyne: Hövd kiln: Kalkugn lighthouse: Fyr manhole: Gatubrunn @@ -1151,13 +1150,13 @@ sv: surveillance: Övervakning telescope: Teleskop tower: Torn - utility_pole: Bruksstolpe - wastewater_plant: Avfallsfabrik + utility_pole: Elstolpe + wastewater_plant: Vattenreningsverk watermill: Vattenkvarn water_tap: Vattenkran water_tower: Vattentorn water_well: Brunn - water_works: Vattenreningsverk + water_works: Vattenverk windmill: Väderkvarn works: Fabrik "yes": Konstgjord @@ -1172,7 +1171,7 @@ sv: "yes": Bergspass natural: atoll: Atoll - bare_rock: Klippa + bare_rock: Blottat berggrund bay: Bukt beach: Strand cape: Udde @@ -1228,7 +1227,7 @@ sv: company: Företag diplomatic: Diplomatiskt kontor educational_institution: Utbildningsinstitution - employment_agency: Bemanningsföretag + employment_agency: Arbetsförmedling energy_supplier: Energileverantörskontor estate_agent: Fastighetsmäklare financial: Finanskontor @@ -1239,7 +1238,7 @@ sv: logistics: Logistik kontor newspaper: Tidningskontor ngo: Icke-statligt kontor - notary: Notar + notary: Notarie religion: Religiöst kontor research: Forskningskontor tax_advisor: SkatterÃ¥dgivare @@ -1326,7 +1325,7 @@ sv: carpet: Mattaffär charity: Välgörenhetsbutik cheese: Ostbutik - chemist: Apotek + chemist: Apotek (Chemist) chocolate: Choklad clothes: Klädbutik coffee: Kaffebutik @@ -1346,14 +1345,14 @@ sv: e-cigarette: E-cigarettbutik electronics: Elektronikbutik erotic: Sexbutik - estate_agent: Egendomsmäklare + estate_agent: Fastighetsmäklare fabric: Tygaffär farm: GÃ¥rdsbutik fashion: Modebutik fishing: Fiskebutik florist: Florist food: Mataffär - frame: Ramhandlare + frame: Rambutik funeral_directors: Begravningsentreprenör furniture: Möbler garden_centre: TrädgÃ¥rdshandel @@ -1389,10 +1388,10 @@ sv: newsagent: Tidningskiosk nutrition_supplements: Kosttillskottsbutik optician: Optiker - organic: Ekologiska livsmedelsaffär + organic: Ekologisk matbutik outdoor: Friluftsbutik paint: Färgbutik - pastry: Kafeteria + pastry: Konditori pawnbroker: PantlÃ¥nare perfumery: Parfymbutik pet: Djuraffär @@ -1431,7 +1430,7 @@ sv: camp_pitch: Campingplats camp_site: Campingplats caravan_site: Husvagnsuppställningsplats - chalet: Stuga + chalet: Fjällstuga gallery: Galleri guest_house: Gäststuga hostel: Vandrarhem @@ -1749,14 +1748,14 @@ sv: subject_own: '[OpenStreetMap] %{commenter} har kommenterat pÃ¥ en av dina ändringsuppsättningar' subject_other: '[OpenStreetMap] %{commenter} har kommenterat pÃ¥ ett ändringsuppsättning du är intresserad av' - your_changeset: '%{commenter} har lämnat en kommentar pÃ¥ en av dina ändringsuppsättningar - skapt den %{time}' + your_changeset: '%{commenter} lämnade en kommentar vid %{time} pÃ¥ en av dina + ändringar' your_changeset_html: '%{commenter} lämnade en kommentar kl. %{time} pÃ¥ en av dina ändringsuppsättningar' - commented_changeset: '%{commenter} har lämnat en kommentar pÃ¥ en ändringsuppsättning - pÃ¥ en karta du bevakar, skapad av %{changeset_author} %{time}' - commented_changeset_html: '%{commenter} har lämnat en kommentar pÃ¥ en ändringsuppsättning - pÃ¥ en karta du bevakar, skapad av %{changeset_author} %{time}' + commented_changeset: '%{commenter} lämnade en kommentar vid %{time} pÃ¥ en + ändringsuppsättning du tittar pÃ¥ skapad av %{changeset_author}' + commented_changeset_html: '%{commenter} lämnade en kommentar vid %{time} pÃ¥ + en ändringsuppsättning du tittar pÃ¥ skapad av %{changeset_author}' partial_changeset_with_comment: med kommentar '%{changeset_comment}' partial_changeset_with_comment_html: med kommentar '%{changeset_comment}' partial_changeset_without_comment: utan kommentar @@ -1882,8 +1881,9 @@ sv: help_text: Ange e-postadressen du använde för att registrera dig sÃ¥ skickar vi en länk till den som du kan använda för att Ã¥terställa ditt lösenord. create: - notice email on way: Synd att du förlorade det, men ett nytt är pÃ¥ väg via e-post. - notice email cannot find: Kunde inte hitta den e-postadressen. + notice email on way: Ledsen att du tappade bort det :-( men ett mejl är pÃ¥ väg + sÃ¥ du kan Ã¥terställa det snart. + notice email cannot find: Kunde inte hitta den e-postadressen, tyvärr. edit: title: Återställ lösenord heading: Återställ lösenord för %{user} @@ -2113,6 +2113,7 @@ sv: gratis kart-API för tredje part. Se vÃ¥ra %{api_usage_policy_link}, %{tile_usage_policy_link} och %{nominatim_usage_policy_link}. more_2_1_api_usage_policy: API-användningspolicy + more_2_1_tile_usage_policy: Användningspolicy för Brickor more_2_1_nominatim_usage_policy: Nominativ användningspolicy contributors_title_html: VÃ¥ra bidragsgivare contributors_intro_html: |- @@ -2464,9 +2465,9 @@ sv: para_1: Om du bara vill ha ett litet problem fixat och inte har tid att registrera dig sÃ¥ är det lätt att lämna en kartanteckning. para_2_html: |- - GÃ¥ till %{map_link} och tryck pÃ¥ anteckningsikonen: %{note_icon}. - En markör, som du kan dra omkring, kommer att läggas till pÃ¥ kartan. - Lägg till ett meddelande och spara. NÃ¥gon annan kommer att undersöka frÃ¥gan. + GÃ¥ bara till %{map_link} och klicka pÃ¥ anteckningsikonen: %{note_icon}. + Detta lägger till en markör pÃ¥ kartan som du kan flytta genom att dra. + Lägg till ditt meddelande, klicka sedan pÃ¥ spara och annat kartläggare kommer att undersöka. the_map: kartan communities: title: Gemenskaper @@ -2652,11 +2653,13 @@ sv: read_gpx: Läs privata GPS-spÃ¥r write_gpx: Ladda upp GPS-spÃ¥r write_notes: Ändra anteckningar + write_redactions: Omarbeta kartdata read_email: Läs användarens e-postadress skip_authorization: Godkänn applikation automatiskt oauth_clients: new: title: Registrera en ny applikation + disabled: Registrering av OAuth 1-applikationer har inaktiverats edit: title: Redigera ditt tillägg show: @@ -2740,6 +2743,7 @@ sv: title: Mina auktoriserade applikationer application: Applikation permissions: Behörigheter + last_authorized: Sista auktoriserade no_applications_html: Du har ännu inte auktoriserad nÃ¥gra %{oauth2}-applikationer. application: revoke: Återkalla Ã¥tkomst @@ -2810,13 +2814,13 @@ sv: no_such_user: title: Finns ingen sÃ¥dan användare heading: Användaren %{user} finns inte - body: Det finns ingen användare med namnet %{user}. Kontrollera stavningen, - eller sÃ¥ kanske länken är trasig. + body: Tyvärr, det finns ingen användare med namnet %{user}. Kontrollera din + stavning, eller sÃ¥ kanske länken du klickade pÃ¥ är fel. deleted: raderad show: my diary: Min dagbok my edits: Mina redigeringar - my traces: Mina GPS-spÃ¥r + my traces: Mina spÃ¥r my notes: Mina kartanteckningar my messages: Mina meddelanden my profile: Min profil @@ -2832,7 +2836,7 @@ sv: send message: Skicka meddelande diary: Dagbok edits: Redigeringar - traces: GPS-spÃ¥r + traces: SpÃ¥r notes: Kartanteckningar remove as friend: Ta bort vän add as friend: Lägg till vän @@ -2883,7 +2887,7 @@ sv: summary_no_ip_html: '%{name} skapad den %{date}' confirm: Bekräfta valda användare hide: Dölj valda användare - empty: Inga användare hittades + empty: Inga motsvarande användare hittades suspended: title: Kontot avstängt heading: Kontot avstängt @@ -2897,7 +2901,7 @@ sv: invalid_credentials: Ogiltiga autentiseringsuppgifter no_authorization_code: Ingen behörighetskod unknown_signature_algorithm: Okänd signaturalgoritm - invalid_scope: Ogiltiga omfattning + invalid_scope: Ogiltig omfattning unknown_error: Autentisering misslyckades auth_association: heading: Ditt ID är inte associerat med ett OpenStreetMap-konto ännu. @@ -2925,9 +2929,9 @@ sv: bÃ¥de användare och roll är korrekta. revoke: title: Bekräfta Ã¥terkallning av roll - heading: Bekräfta Ã¥terkallning av roll - are_you_sure: Är du säker pÃ¥ att du vill avlägsna rollen "%{role}" frÃ¥n användaren - "%{name}"? + heading: Bekräfta Ã¥terkallande av roll + are_you_sure: Är du säker pÃ¥ att du vill Ã¥terkalla rollen `%{role}' frÃ¥n användaren + `%{name}'? confirm: Bekräfta fail: Kunde inte Ã¥terkalla rollen "%{role}" frÃ¥n användaren "%{name}". Kontrollera att bÃ¥de användaren och rollen är korrekta. @@ -2942,13 +2946,12 @@ sv: new: title: Skapa blockering pÃ¥ %{name} heading_html: Skapa blockering pÃ¥ %{name} - period: Hur lÃ¥ng tid, frÃ¥n och med nu, användaren ska vara blockerad frÃ¥n API. + period: Hur lÃ¥ng tid, frÃ¥n och med nu, användaren ska vara blockerad frÃ¥n API:t. back: Visa alla blockeringar edit: title: Redigera blockering pÃ¥ %{name} heading_html: Redigera blockering pÃ¥ %{name} - period: Hur lÃ¥ng tid, frÃ¥n och med nu, som användaren ska vara blockerad frÃ¥n - API. + period: Hur lÃ¥ng tid, frÃ¥n och med nu, användaren ska vara blockerad frÃ¥n API:t. show: Visa denna blockering back: Visa alla blockeringar filter: @@ -3171,8 +3174,12 @@ sv: openstreetmap_contributors: OpenStreetMap-bidragsgivare make_a_donation: Gör en donation website_and_api_terms: Webbplats och API-villkor + cyclosm_credit: Brickstil av %{cyclosm_link} värd av %{osm_france_link} osm_france: OpenStreetMap Frankrike + thunderforest_credit: Brickor satt till förfogande av %{thunderforest_link} andy_allan: Andy Allan + tracestrack_credit: Brickor satt till förfogande av %{tracestrack_link} + hotosm_credit: Brickstil av %{hotosm_link} värd av %{osm_france_link} hotosm_name: Humanitärt OpenStreetMap-team site: edit_tooltip: Redigera kartan @@ -3225,14 +3232,14 @@ sv: offramp_right_with_name: Ta rampen till höger in pÃ¥ %{name} offramp_right_with_directions: Ta rampen Ã¥t höger mot %{directions} offramp_right_with_name_directions: Ta rampen Ã¥t höger till %{name}, mot %{directions} - onramp_right_without_exit: Sväng vänster pÃ¥ rampen till %{name} + onramp_right_without_exit: Sväng höger pÃ¥ rampen in pÃ¥ %{name} onramp_right_with_directions: Sväng höger till rampen mot %{directions} onramp_right_with_name_directions: Sväng höger pÃ¥ rampen till %{name}, mot %{directions} onramp_right_without_directions: Sväng höger till rampen onramp_right: Sväng höger upp pÃ¥ rampen endofroad_right_without_exit: Vid slutet av vägen, sväng höger in pÃ¥ %{name} - merge_right_without_exit: Sväng rakt in pÃ¥ %{name} + merge_right_without_exit: GÃ¥ smman rakt in pÃ¥ %{name} fork_right_without_exit: Vid vägskälet sväng höger in pÃ¥ %{name} turn_right_without_exit: Högersväng in pÃ¥ %{name} sharp_right_without_exit: Skarp högersväng in pÃ¥ %{name} @@ -3240,9 +3247,9 @@ sv: sharp_left_without_exit: Skarp vänstersväng in pÃ¥ %{name} turn_left_without_exit: Vänstersväng in pÃ¥ %{name} offramp_left: Ta rampen till vänster - offramp_left_with_exit: Ta utfarten %{exit} Ã¥t vänster - offramp_left_with_exit_name: Ta utfarten %{exit} Ã¥t vänster till %{name} - offramp_left_with_exit_directions: Ta utfarten %{exit} Ã¥t vänster mot %{directions} + offramp_left_with_exit: Ta avfart %{exit} till vänster + offramp_left_with_exit_name: Ta avfart %{exit} till vänster in pÃ¥ %{name} + offramp_left_with_exit_directions: Ta avfart %{exit} till vänster mot %{directions} offramp_left_with_exit_name_directions: Ta utfarten %{exit} Ã¥t vänster till %{name}, mot %{directions} offramp_left_with_name: Ta rampen till vänster in pÃ¥ %{name} @@ -3253,10 +3260,10 @@ sv: onramp_left_with_directions: Sväng vänster till rampen mot %{directions} onramp_left_with_name_directions: Sväng vänster pÃ¥ rampen till %{name}, mot %{directions} - onramp_left_without_directions: Sväng vänster till rampen + onramp_left_without_directions: Sväng vänster in pÃ¥ rampen onramp_left: Sväng vänster till rampen endofroad_left_without_exit: Vid slutet av vägen, sväng vänster in pÃ¥ %{name} - merge_left_without_exit: Sväng vänster in pÃ¥ %{name} + merge_left_without_exit: GÃ¥ samman vänster till %{name} fork_left_without_exit: Vid vägskälet sväng vänster in pÃ¥ %{name} slight_left_without_exit: Svag vänstersväng in pÃ¥ %{name} via_point_without_exit: (via punkt) @@ -3271,7 +3278,7 @@ sv: roundabout_with_exit: Vid rondellen, ta avfart %{exit} mot %{name} roundabout_with_exit_ordinal: Vid rondellen, ta avfart %{exit} mot %{name} exit_roundabout: Lämna rondellen mot %{name} - unnamed: namnlös + unnamed: icke namngiven väg courtesy: Vägbeskrivning med tillstÃ¥nd av %{link} exit_counts: first: 1:a @@ -3304,29 +3311,29 @@ sv: heading: Redigera redaktering title: Redigera redaktering index: - empty: Inga redakteringar att visa. - heading: Lista över redakteringar - title: Lista över redakteringar + empty: Inga maskeringar att visa. + heading: Lista över maskeringar + title: Lista över maskeringar new: - heading: Ange information för ny redaktering - title: Skapa ny redaktering + heading: Ange information för ny maskering + title: Skapa ny maskering show: description: 'Beskrivning:' - heading: Visa redaktering "%{title}" - title: Visa redaktering + heading: Visa maskering "%{title}" + title: Visa maskering user: 'Skapad av:' - edit: Redigera denna redaktering - destroy: Ta bort denna redaktering + edit: Redigera denna maskeiring + destroy: Ta bort denna maskering confirm: Är du säker? create: - flash: Redaktering skapad. + flash: Maskering skapad. update: flash: Ändringarna sparade. destroy: - not_empty: Redakteringen är inte tom. Avredaktera alla versioner som tillhör - denna redaktering innan den förstörs. - flash: Redaktering förstörd. - error: Det uppstod ett fel när redakteringen skulle förstöras. + not_empty: Maskeringen är inte tom. Avmaskera alla versioner som tillhör denna + maskering innan den förstörs. + flash: Maskeringen förstörd. + error: Det uppstod ett fel när maskeringen skulle förstöras. validations: leading_whitespace: har ett inledande mellanslag trailing_whitespace: har ett avslutande mellanslag diff --git a/config/locales/te.yml b/config/locales/te.yml index 986ecc828..99067da74 100644 --- a/config/locales/te.yml +++ b/config/locales/te.yml @@ -331,7 +331,6 @@ te: way_paginated: దారులు (%{count} లో %{x}-%{y}) relation: సంబంధాలు (%{count}) relation_paginated: '%{count} లో %{x}-%{y} యొక్క సంబంధాలు' - comment: వ్యాఖ్యలు (%{count}) changesetxml: మార్పులసమితి XML osmchangexml: osmChange XML feed: diff --git a/config/locales/th.yml b/config/locales/th.yml index 0fb6e5832..2f74d64e2 100644 --- a/config/locales/th.yml +++ b/config/locales/th.yml @@ -304,7 +304,6 @@ th: way_paginated: เส้นทางที่ (%{x}-%{y} จาก %{count}) relation: ความสัมพันธ์ (%{count}) relation_paginated: ความสัมพันธ์ (%{x}-%{y} จาก %{count}) - comment: ความคิดเห็น (%{count}) hidden_comment_by_html: ความคิดเห็นที่ซ่อนอยู่จาก %{user} %{time_ago} comment_by_html: ความคิดเห็นจาก %{user} %{time_ago} changesetxml: ชุดการเปลี่ยนแปลง XML diff --git a/config/locales/tl.yml b/config/locales/tl.yml index 492d7eebf..70f708f7a 100644 --- a/config/locales/tl.yml +++ b/config/locales/tl.yml @@ -294,7 +294,6 @@ tl: way_paginated: Mga daan (%{x}-%{y} ng %{count}) relation: Mga kaugnayan (%{count}) relation_paginated: Mga kaugnayan (%{x}-%{y} ng %{count}) - comment: Mga puna (%{count}) changesetxml: XML ng pangkat ng pagbabago osmchangexml: XML ng osmChange feed: diff --git a/config/locales/tr.yml b/config/locales/tr.yml index ac2146595..43924c1f4 100644 --- a/config/locales/tr.yml +++ b/config/locales/tr.yml @@ -9,6 +9,7 @@ # Author: Archaeodontosaurus # Author: Asma # Author: BaRaN6161 TURK +# Author: Bulut # Author: Captantrips # Author: Cobija # Author: Emperyan @@ -106,7 +107,7 @@ tr: issue: Sorun language: Dil message: Mesaj - node: Nokta + node: Düğüm node_tag: Düğüm Etiketi old_node: Eski Nokta old_node_tag: Eski Nokta Etiketi @@ -398,7 +399,6 @@ tr: way_paginated: Yol (%{x}-%{y} - toplam %{count}) relation: Ä°lişkiler (%{count}) relation_paginated: Ä°lişkiler (%{x}-%{y} - toplam %{count}) - comment: Yorumlar (%{count}) hidden_comment_by_html: '%{user} tarafından %{time_ago} yapılan gizli yorum' comment_by_html: '%{user} tarafından %{time_ago} yapılan yorum' changesetxml: ' XML değişiklik kaydı' @@ -587,6 +587,7 @@ tr: show: title: '%{user} Kullanıcısının Günlüğü | %{title}' user_title: '%{user} Kullanıcısının Günlüğü' + discussion: Tartışma leave_a_comment: Yorum yap login_to_leave_a_comment_html: Yorum yazmak için %{login_link} login: Oturum Aç @@ -697,7 +698,7 @@ tr: make_friend: heading: '%{user}, arkadaş olarak eklensin mi?' button: Arkadaş olarak ekle - success: '%{name} arkadaş listesine eklendi!' + success: '%{name}, arkadaş listesine eklendi!' failed: Üzgünüz, %{name} arkadaş olarak eklenemedi. already_a_friend: '%{name} ile zaten arkadaşsın.' limit_exceeded: Son zamanlarda çok sayıda kullanıcıyla arkadaş oldunuz. Lütfen diff --git a/config/locales/tt.yml b/config/locales/tt.yml index 5d49c1487..d64a32ee8 100644 --- a/config/locales/tt.yml +++ b/config/locales/tt.yml @@ -347,7 +347,6 @@ tt: way_paginated: Сызыклар (%{count} сызыктан %{x}-%{y}) relation: Мөнәсәбәтләр (%{count}) relation_paginated: Мөнәсәбәтләр (%{count} мөнәсәбәттән %{x}-%{y}) - comment: Шәрехләр (%{count}) hidden_comment_by_html: '%{user} исемле кулланучыдан яшерен шәрех %{time_ago}' comment_by_html: '%{user} исемле кулланучыдан шәрех %{time_ago}' changesetxml: Үзгәртүләр өеменең XMLы diff --git a/config/locales/uk.yml b/config/locales/uk.yml index 68b8fb293..e3b5d3823 100644 --- a/config/locales/uk.yml +++ b/config/locales/uk.yml @@ -428,7 +428,6 @@ uk: way_paginated: Лінії (%{x}-%{y} із %{count}) relation: Зв’язки (%{count}) relation_paginated: Зв’язки (%{x}-%{y} із %{count}) - comment: Коментарі (%{count}) hidden_comment_by_html: Прихований коментар від %{user} %{time_ago} comment_by_html: Коментар від %{user} %{time_ago} changesetxml: XML опис набору змін diff --git a/config/locales/vi.yml b/config/locales/vi.yml index e454e2a70..397cabf70 100644 --- a/config/locales/vi.yml +++ b/config/locales/vi.yml @@ -342,7 +342,6 @@ vi: way_paginated: Các lối (%{x}–%{y} trên %{count}) relation: Các quan hệ (%{count}) relation_paginated: Các quan hệ (%{x}–%{y} trên %{count}) - comment: Bình luận (%{count}) hidden_comment_by_html: Nhận xét ẩn của %{user} từ %{time_ago} comment_by_html: Nhận xét của %{user} từ %{time_ago} changesetxml: Bộ thay đổi XML diff --git a/config/locales/xmf.yml b/config/locales/xmf.yml index 0a4ed84eb..3e78c7209 100644 --- a/config/locales/xmf.yml +++ b/config/locales/xmf.yml @@ -301,7 +301,6 @@ xmf: way_paginated: ღოზეფი (%{x}-%{y} %{count}-შე) relation: ურთიართობეფი (%{count}) relation_paginated: ურთიართობეფი (%{x}-%{y} %{count}-შე) - comment: კომენტარეფი (%{count}) changesetxml: თირუეფიშ პაკეტიშ XML osmchangexml: osmChange XML feed: diff --git a/config/locales/yo.yml b/config/locales/yo.yml index 7edd241cb..db03f5a88 100644 --- a/config/locales/yo.yml +++ b/config/locales/yo.yml @@ -1,6 +1,7 @@ # Messages for Yoruba (Yorùbá) # Exported from translatewiki.net # Export driver: phpyaml +# Author: BigDareLibrary # Author: Demmy --- yo: @@ -33,6 +34,7 @@ yo: form: use_map_link: Lo map show: + discussion: Ijiroro login: wole layouts: home: ibùdó diff --git a/config/locales/zh-CN.yml b/config/locales/zh-CN.yml index 6b73a8aa5..9edb09215 100644 --- a/config/locales/zh-CN.yml +++ b/config/locales/zh-CN.yml @@ -412,7 +412,6 @@ zh-CN: way_paginated: 路径 (%{x}-%{y}，共 %{count}) relation: 关系 (%{count}) relation_paginated: 关系 (%{x}-%{y}，共 %{count}) - comment: 评论（%{count}） hidden_comment_by_html: '%{user} 于 %{time_ago} 的隐藏评论' comment_by_html: '%{user} 于 %{time_ago} 的评论' changesetxml: 变更集 XML @@ -591,6 +590,7 @@ zh-CN: show: title: '%{user} 的日记 | %{title}' user_title: '%{user}的日记' + discussion: 讨论 leave_a_comment: 留下评论 login_to_leave_a_comment_html: '%{login_link}以留下评论' login: 登录 diff --git a/config/locales/zh-TW.yml b/config/locales/zh-TW.yml index 010edccbb..63cfa8586 100644 --- a/config/locales/zh-TW.yml +++ b/config/locales/zh-TW.yml @@ -374,7 +374,6 @@ zh-TW: way_paginated: 路線 (%{count} 的 %{x}-%{y}) relation: 關聯 (%{count}) relation_paginated: 關聯 (%{count} 的 %{x}-%{y}) - comment: 評論 (%{count}) hidden_comment_by_html: '%{user}%{time_ago}隱藏評論' comment_by_html: 來自%{user}%{time_ago}的評論 changesetxml: 變更集 XML @@ -555,6 +554,7 @@ zh-TW: show: title: '%{user} 的日記|%{title}' user_title: '%{user} 的日記' + discussion: 討論 leave_a_comment: 留下評論 login_to_leave_a_comment_html: '%{login_link}來留下評論' login: 登入