From: Andy Allan Date: Wed, 24 Feb 2021 10:49:39 +0000 (+0000) Subject: Merge branch 'pull/3091' X-Git-Tag: live~2666 X-Git-Url: https://git.openstreetmap.org./rails.git/commitdiff_plain/3debff60ef50158c5439003ad4357d1f3dcc120b?hp=00dbe5f4a4bffdac2ac093cbd42e17da9945851c Merge branch 'pull/3091' --- diff --git a/DOCKER.md b/DOCKER.md index d5a673bbe..ce0430939 100644 --- a/DOCKER.md +++ b/DOCKER.md @@ -71,6 +71,7 @@ You can now use Docker to load this extract into your local Docker-based OSM ins docker-compose run --rm web osmosis \ -verbose \ --read-pbf district-of-columbia-latest.osm.pbf \ + --log-progress \ --write-apidb \ host="db" \ database="openstreetmap" \ diff --git a/Dockerfile b/Dockerfile index 33812d25d..e8ff01387 100644 --- a/Dockerfile +++ b/Dockerfile @@ -2,7 +2,7 @@ FROM ubuntu:20.04 ENV DEBIAN_FRONTEND=noninteractive -# Install system packages +# Install system packages then clean up to minimize image size RUN apt-get update \ && apt-get install --no-install-recommends -y \ build-essential \ @@ -30,7 +30,7 @@ RUN apt-get update \ && apt-get clean \ && rm -rf /var/lib/apt/lists/* -# Install current Osmosis +# Install compatible Osmosis to help users import sample data in a new instance RUN curl -OL https://github.com/openstreetmap/osmosis/releases/download/0.47.2/osmosis-0.47.2.tgz \ && tar -C /usr/local -xzf osmosis-0.47.2.tgz @@ -45,6 +45,7 @@ ADD Gemfile Gemfile.lock /app/ RUN gem install bundler \ && bundle install -# Install NodeJS packages +# Install NodeJS packages using yarnpkg +# `bundle exec rake yarn:install` will not work ADD package.json yarn.lock /app/ RUN yarnpkg install diff --git a/Gemfile b/Gemfile index b80771a28..ce35201ee 100644 --- a/Gemfile +++ b/Gemfile @@ -1,7 +1,7 @@ source "https://rubygems.org" # Require rails -gem "rails", "6.0.3.4" +gem "rails", "6.0.3.5" # Require json for multi_json gem "json" diff --git a/Gemfile.lock b/Gemfile.lock index a9b901a8b..297dc0618 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -3,62 +3,62 @@ GEM specs: aasm (5.1.1) concurrent-ruby (~> 1.0) - actioncable (6.0.3.4) - actionpack (= 6.0.3.4) + actioncable (6.0.3.5) + actionpack (= 6.0.3.5) nio4r (~> 2.0) websocket-driver (>= 0.6.1) - actionmailbox (6.0.3.4) - actionpack (= 6.0.3.4) - activejob (= 6.0.3.4) - activerecord (= 6.0.3.4) - activestorage (= 6.0.3.4) - activesupport (= 6.0.3.4) + actionmailbox (6.0.3.5) + actionpack (= 6.0.3.5) + activejob (= 6.0.3.5) + activerecord (= 6.0.3.5) + activestorage (= 6.0.3.5) + activesupport (= 6.0.3.5) mail (>= 2.7.1) - actionmailer (6.0.3.4) - actionpack (= 6.0.3.4) - actionview (= 6.0.3.4) - activejob (= 6.0.3.4) + actionmailer (6.0.3.5) + actionpack (= 6.0.3.5) + actionview (= 6.0.3.5) + activejob (= 6.0.3.5) mail (~> 2.5, >= 2.5.4) rails-dom-testing (~> 2.0) - actionpack (6.0.3.4) - actionview (= 6.0.3.4) - activesupport (= 6.0.3.4) + actionpack (6.0.3.5) + actionview (= 6.0.3.5) + activesupport (= 6.0.3.5) rack (~> 2.0, >= 2.0.8) rack-test (>= 0.6.3) rails-dom-testing (~> 2.0) rails-html-sanitizer (~> 1.0, >= 1.2.0) actionpack-page_caching (1.2.3) actionpack (>= 5.0.0) - actiontext (6.0.3.4) - actionpack (= 6.0.3.4) - activerecord (= 6.0.3.4) - activestorage (= 6.0.3.4) - activesupport (= 6.0.3.4) + actiontext (6.0.3.5) + actionpack (= 6.0.3.5) + activerecord (= 6.0.3.5) + activestorage (= 6.0.3.5) + activesupport (= 6.0.3.5) nokogiri (>= 1.8.5) - actionview (6.0.3.4) - activesupport (= 6.0.3.4) + actionview (6.0.3.5) + activesupport (= 6.0.3.5) builder (~> 3.1) erubi (~> 1.4) rails-dom-testing (~> 2.0) rails-html-sanitizer (~> 1.1, >= 1.2.0) active_record_union (1.3.0) activerecord (>= 4.0) - activejob (6.0.3.4) - activesupport (= 6.0.3.4) + activejob (6.0.3.5) + activesupport (= 6.0.3.5) globalid (>= 0.3.6) - activemodel (6.0.3.4) - activesupport (= 6.0.3.4) - activerecord (6.0.3.4) - activemodel (= 6.0.3.4) - activesupport (= 6.0.3.4) - activerecord-import (1.0.7) + activemodel (6.0.3.5) + activesupport (= 6.0.3.5) + activerecord (6.0.3.5) + activemodel (= 6.0.3.5) + activesupport (= 6.0.3.5) + activerecord-import (1.0.8) activerecord (>= 3.2) - activestorage (6.0.3.4) - actionpack (= 6.0.3.4) - activejob (= 6.0.3.4) - activerecord (= 6.0.3.4) + activestorage (6.0.3.5) + actionpack (= 6.0.3.5) + activejob (= 6.0.3.5) + activerecord (= 6.0.3.5) marcel (~> 0.3.1) - activesupport (6.0.3.4) + activesupport (6.0.3.5) concurrent-ruby (~> 1.0, >= 1.0.2) i18n (>= 0.7, < 2) minitest (~> 5.1) @@ -73,17 +73,17 @@ GEM autoprefixer-rails (10.2.4.0) execjs aws-eventstream (1.1.0) - aws-partitions (1.422.0) - aws-sdk-core (3.111.2) + aws-partitions (1.428.0) + aws-sdk-core (3.112.0) aws-eventstream (~> 1, >= 1.0.2) aws-partitions (~> 1, >= 1.239.0) aws-sigv4 (~> 1.1) jmespath (~> 1.0) - aws-sdk-kms (1.41.0) - aws-sdk-core (~> 3, >= 3.109.0) + aws-sdk-kms (1.42.0) + aws-sdk-core (~> 3, >= 3.112.0) aws-sigv4 (~> 1.1) - aws-sdk-s3 (1.87.0) - aws-sdk-core (~> 3, >= 3.109.0) + aws-sdk-s3 (1.88.1) + aws-sdk-core (~> 3, >= 3.112.0) aws-sdk-kms (~> 1) aws-sigv4 (~> 1.1) aws-sigv4 (1.2.2) @@ -102,7 +102,7 @@ GEM smart_properties binding_of_caller (1.0.0) debug_inspector (>= 0.0.1) - bootsnap (1.7.0) + bootsnap (1.7.2) msgpack (~> 1.0) bootstrap (4.5.3) autoprefixer-rails (>= 9.1.0) @@ -112,7 +112,7 @@ GEM actionpack (>= 5.2) activemodel (>= 5.2) brakeman (5.0.0) - browser (5.3.0) + browser (5.3.1) builder (3.2.4) bzip2-ffi (1.0.0) ffi (~> 1.0) @@ -129,7 +129,7 @@ GEM xpath (~> 3.2) childprocess (3.0.0) coderay (1.1.3) - composite_primary_keys (12.0.6) + composite_primary_keys (12.0.9) activerecord (~> 6.0.0) concurrent-ruby (1.1.8) config (2.2.3) @@ -147,7 +147,7 @@ GEM activerecord (>= 3.0, < 6.2) delayed_job (>= 3.0, < 5) docile (1.3.5) - dry-configurable (0.12.0) + dry-configurable (0.12.1) concurrent-ruby (~> 1.0) dry-core (~> 0.5, >= 0.5.0) dry-container (0.7.2) @@ -168,7 +168,7 @@ GEM dry-initializer (~> 3.0) dry-logic (~> 1.0) dry-types (~> 1.5) - dry-types (1.5.0) + dry-types (1.5.1) concurrent-ruby (~> 1.0) dry-container (~> 0.3) dry-core (~> 0.5, >= 0.5) @@ -204,7 +204,7 @@ GEM ruby2_keywords faraday-net_http (1.0.1) ffi (1.14.2) - ffi-libarchive (1.0.4) + ffi-libarchive (1.0.17) ffi (~> 1.0) fspath (3.1.2) gd2-ffij (0.4.0) @@ -216,7 +216,7 @@ GEM html_tokenizer (0.0.7) htmlentities (4.3.4) http_accept_language (2.1.1) - i18n (1.8.8) + i18n (1.8.9) concurrent-ruby (~> 1.0) i18n-js (3.8.0) i18n (>= 0.6.6) @@ -269,7 +269,7 @@ GEM multi_json (1.15.0) multi_xml (0.6.0) multipart-post (2.1.1) - nio4r (2.5.4) + nio4r (2.5.5) nokogiri (1.11.1) mini_portile2 (~> 2.5.0) racc (~> 1.4) @@ -287,7 +287,7 @@ GEM multi_json (~> 1.3) multi_xml (~> 0.5) rack (>= 1.2, < 3) - omniauth (2.0.2) + omniauth (2.0.3) hashie (>= 3.4.6) rack (>= 1.6.2, < 3) rack-protection @@ -327,7 +327,7 @@ GEM popper_js (1.16.0) progress (3.5.2) public_suffix (4.0.6) - puma (5.2.0) + puma (5.2.1) nio4r (~> 2.0) quad_tile (1.0.1) r2 (0.2.7) @@ -343,20 +343,20 @@ GEM rack-test (1.1.0) rack (>= 1.0, < 3) rack-uri_sanitizer (0.0.2) - rails (6.0.3.4) - actioncable (= 6.0.3.4) - actionmailbox (= 6.0.3.4) - actionmailer (= 6.0.3.4) - actionpack (= 6.0.3.4) - actiontext (= 6.0.3.4) - actionview (= 6.0.3.4) - activejob (= 6.0.3.4) - activemodel (= 6.0.3.4) - activerecord (= 6.0.3.4) - activestorage (= 6.0.3.4) - activesupport (= 6.0.3.4) + rails (6.0.3.5) + actioncable (= 6.0.3.5) + actionmailbox (= 6.0.3.5) + actionmailer (= 6.0.3.5) + actionpack (= 6.0.3.5) + actiontext (= 6.0.3.5) + actionview (= 6.0.3.5) + activejob (= 6.0.3.5) + activemodel (= 6.0.3.5) + activerecord (= 6.0.3.5) + activestorage (= 6.0.3.5) + activesupport (= 6.0.3.5) bundler (>= 1.3.0) - railties (= 6.0.3.4) + railties (= 6.0.3.5) sprockets-rails (>= 2.0.0) rails-controller-testing (1.0.5) actionpack (>= 5.0.1.rc1) @@ -370,9 +370,9 @@ GEM rails-i18n (6.0.0) i18n (>= 0.7, < 2) railties (>= 6.0.0, < 7) - railties (6.0.3.4) - actionpack (= 6.0.3.4) - activesupport (= 6.0.3.4) + railties (6.0.3.5) + actionpack (= 6.0.3.5) + activesupport (= 6.0.3.5) method_source rake (>= 0.8.7) thor (>= 0.20.3, < 2.0) @@ -381,13 +381,13 @@ GEM rb-fsevent (0.10.4) rb-inotify (0.10.1) ffi (~> 1.0) - regexp_parser (2.0.3) + regexp_parser (2.1.0) request_store (1.5.0) rack (>= 1.4) rexml (3.2.4) rinku (2.0.6) rotp (6.2.0) - rubocop (1.9.1) + rubocop (1.10.0) parallel (~> 1.10) parser (>= 3.0.0.0) rainbow (>= 2.2.2, < 4.0) @@ -423,7 +423,7 @@ GEM sprockets (> 3.0) sprockets-rails tilt - secure_headers (6.3.1) + secure_headers (6.3.2) selenium-webdriver (3.142.7) childprocess (>= 0.5, < 4.0) rubyzip (>= 1.2.2) @@ -531,7 +531,7 @@ DEPENDENCIES r2 (~> 0.2.7) rack-cors rack-uri_sanitizer - rails (= 6.0.3.4) + rails (= 6.0.3.5) rails-controller-testing rails-i18n (~> 6.0.0) rinku (>= 2.0.6) diff --git a/app/assets/javascripts/index.js b/app/assets/javascripts/index.js index 10f28ef92..a2169643f 100644 --- a/app/assets/javascripts/index.js +++ b/app/assets/javascripts/index.js @@ -189,7 +189,7 @@ $(document).ready(function () { map._object); $.removeCookie("_osm_location"); - $.cookie("_osm_location", OSM.locationCookie(map), { expires: expiry, path: "/" }); + $.cookie("_osm_location", OSM.locationCookie(map), { secure: true, expires: expiry, path: "/" }); }); if ($.cookie("_osm_welcome") !== "hide") { @@ -198,7 +198,7 @@ $(document).ready(function () { $(".welcome .close").on("click", function () { $(".welcome").removeClass("visible"); - $.cookie("_osm_welcome", "hide", { expires: expiry, path: "/" }); + $.cookie("_osm_welcome", "hide", { secure: true, expires: expiry, path: "/" }); }); var bannerExpiry = new Date(); @@ -209,7 +209,7 @@ $(document).ready(function () { $("#banner").hide(); e.preventDefault(); if (cookieId) { - $.cookie(cookieId, "hide", { expires: bannerExpiry, path: "/" }); + $.cookie(cookieId, "hide", { secure: true, expires: bannerExpiry, path: "/" }); } }); diff --git a/app/assets/javascripts/index/directions.js b/app/assets/javascripts/index/directions.js index ee44ad4c4..a58b0af16 100644 --- a/app/assets/javascripts/index/directions.js +++ b/app/assets/javascripts/index/directions.js @@ -334,7 +334,7 @@ OSM.Directions = function (map) { select.on("change", function (e) { chosenEngine = engines[e.target.selectedIndex]; - $.cookie("_osm_directions_engine", chosenEngine.id, { expires: expiry, path: "/" }); + $.cookie("_osm_directions_engine", chosenEngine.id, { secure: true, expires: expiry, path: "/" }); getRoute(true, true); }); diff --git a/app/assets/javascripts/leaflet.layers.js b/app/assets/javascripts/leaflet.layers.js index f375dc08f..5c5e43c5c 100644 --- a/app/assets/javascripts/leaflet.layers.js +++ b/app/assets/javascripts/leaflet.layers.js @@ -119,7 +119,7 @@ L.OSM.layers = function (options) { .attr("class", "text-muted") .appendTo(overlaySection); - var overlays = $(" contributor terms: - heading: 'Termes de col·laboració:' + heading: Termes de col·laboració agreed: Heu acceptat els nous termes de col·laboració. not yet agreed: Encara no heu acceptat els nous termes de col·laboració. review link text: Seguiu aquest enllaç per revisar i acceptar els nous termes @@ -2523,10 +2532,11 @@ ca: són de domini públic. link: https://www.osmfoundation.org/wiki/License/Contributor_Terms link text: què és això? - image: 'Imatge:' + image: Imatge gravatar: gravatar: Usa Gravatar link: https://wiki.openstreetmap.org/wiki/Gravatar + what_is_gravatar: Què és Gravatar? disabled: S'ha inhabilitat Gravatar. enabled: S'ha habilitat que es mostri el vostre Gravatar. new image: Afegeix una imatge @@ -2534,7 +2544,7 @@ ca: delete image: Suprimeix la imatge actual replace image: Reemplaça la imatge actual image size hint: (val més usar imatges quadrades d'almenys 100x100) - home location: 'Ubicació inicial:' + home location: Ubicació inicial no home location: No heu especificat la ubicació d'origen. update home location on click: Voleu actualitzar la ubicació d'inici en fer clic al mapa? diff --git a/config/locales/ce.yml b/config/locales/ce.yml index 5bf13cbfa..0c0a7de50 100644 --- a/config/locales/ce.yml +++ b/config/locales/ce.yml @@ -1,7 +1,6 @@ # Messages for Chechen (нохчийн) # Exported from translatewiki.net # Export driver: phpyaml -# Author: Abijeet Patro # Author: Sasan700 # Author: Умар --- diff --git a/config/locales/cs.yml b/config/locales/cs.yml index 066e22c29..10b1926e4 100644 --- a/config/locales/cs.yml +++ b/config/locales/cs.yml @@ -1,7 +1,6 @@ # Messages for Czech (čeština) # Exported from translatewiki.net # Export driver: phpyaml -# Author: Abijeet Patro # Author: Bilbo # Author: Chmee2 # Author: Cvanca @@ -157,19 +156,24 @@ cs: body: Text recipient: Příjemce redaction: + title: Název description: Popis report: category: Uveďte důvod Vašeho hlášení details: Poskytněte prosím bližší informace k problému (nutné). user: + auth_provider: Poskytovatel autentizace + auth_uid: Autentifikační UID email: E-mail - new_email: 'Nová e-mailová adresa:' + email_confirmation: potvrzení e-mailem + new_email: nová emailová adresa active: Aktivní display_name: Zobrazované jméno - description: Popis - home_lat: 'Šířka:' - home_lon: 'Délka:' - languages: Jazyky + description: Popis profilu + home_lat: Zeměpisná šířka + home_lon: Zeměpisná délka + languages: Preferované jazyky + preferred_editor: Preferovaný editor pass_crypt: Heslo pass_crypt_confirmation: Potvrdit heslo help: @@ -184,6 +188,10 @@ cs: needs_view: Potřebuje se uživatel příhlásit před tím, než bude tento blok vymazán? user: + email_confirmation: Vaše adresa se nezobrazuje veřejně, více informací získáte + v našich pravidlech + ochrany osobních údajů. new_email: (nikde se veřejně nezobrazuje) datetime: distance_in_words_ago: @@ -2530,13 +2538,13 @@ cs: account: title: Upravit účet my settings: Moje nastavení - current email address: 'Stávající e-mailová adresa:' - external auth: 'Externí autentizace:' + current email address: Stávající e-mailová adresa + external auth: Externí autentizace openid: link: https://wiki.openstreetmap.org/wiki/Cs:OpenID link text: co to znamená? public editing: - heading: 'Veřejné editace:' + heading: Veřejné editace enabled: Aktivní. Není anonym, smí editovat data. enabled link: https://wiki.openstreetmap.org/wiki/Anonymous_edits enabled link text: co to znamená? @@ -2554,7 +2562,7 @@ cs: neprozradí.
  • Tuto operaci nelze vrátit a vÅ¡ichni noví uživatelé jsou implicitně veřejní.
    • contributor terms: - heading: 'Podmínky pro přispěvatele:' + heading: Podmínky pro přispěvatele agreed: Odsouhlasili jste nové Podmínky pro přispěvatele. not yet agreed: Dosud jste neodsouhlasili nové Podmínky pro přispěvatele. review link text: Až se vám to bude hodit, pomocí tohoto odkazu si prosím @@ -2562,10 +2570,11 @@ cs: agreed_with_pd: Také jste prohlásili, že své editace považujete za volné dílo. link: http://wiki.openstreetmap.org/wiki/CS:Open_Database_License/Contributor_Terms?uselang=cs link text: co to znamená? - image: 'Obrázek:' + image: Obrázek gravatar: gravatar: Používat Gravatar link: http://wiki.openstreetmap.org/wiki/CS:Gravatar + what_is_gravatar: Co je Gravatar? disabled: Gravatar byl zakázán. enabled: Zobrazování vaÅ¡eho Gravataru bylo povoleno. new image: Přidat obrázek @@ -2573,7 +2582,7 @@ cs: delete image: Odstranit stávající obrázek replace image: Nahradit stávající obrázek image size hint: (nejlépe fungují čtvercové obrázky velikosti nejméně 100×100) - home location: 'Poloha domova:' + home location: Poloha domova no home location: Nezadali jste polohu svého bydliÅ¡tě. update home location on click: Upravit pozici domova při kliknutí na mapu? save changes button: Uložit změny diff --git a/config/locales/cy.yml b/config/locales/cy.yml index 081a09eaa..13ac6bdcf 100644 --- a/config/locales/cy.yml +++ b/config/locales/cy.yml @@ -1,7 +1,6 @@ # Messages for Welsh (Cymraeg) # Exported from translatewiki.net # Export driver: phpyaml -# Author: Abijeet Patro # Author: Cymrodor # Author: Robin Owain --- diff --git a/config/locales/da.yml b/config/locales/da.yml index ba51d234b..c74c5d4d3 100644 --- a/config/locales/da.yml +++ b/config/locales/da.yml @@ -1,7 +1,6 @@ # Messages for Danish (dansk) # Exported from translatewiki.net # Export driver: phpyaml -# Author: Abijeet Patro # Author: Brufnus # Author: Christian List # Author: Dargelf @@ -145,19 +144,20 @@ da: body: Brødtekst recipient: Modtager redaction: + title: Titel description: Beskrivelse report: category: Vælg Ã¥rsagen til din rapportering details: Forklar venligst problemet i flere detaljer (pÃ¥krævet). user: email: E-mail - new_email: 'Ny e-mailadresse:' + new_email: Ny e-mailadresse active: Aktiv display_name: Vist navn - description: Beskrivelse - home_lat: 'Breddegrad:' - home_lon: 'Længdegrad:' - languages: Sprog + description: Profilbeskrivelse + home_lat: Breddegrad + home_lon: Længdegrad + languages: Foretrukne sprog pass_crypt: Adgangskode pass_crypt_confirmation: Bekræft adgangskode help: @@ -2457,13 +2457,13 @@ da: account: title: Rediger konto my settings: Mine indstillinger - current email address: 'Nuværende e-mailadresse:' - external auth: 'Ekstern godkendelse:' + current email address: Nuværende e-mailadresse + external auth: Ekstern godkendelse openid: link: https://wiki.openstreetmap.org/wiki/OpenID link text: hvad er dette? public editing: - heading: 'Offentlig redigering:' + heading: Offentlig redigering enabled: Aktiveret. Ikke anonym og kan ændre data. enabled link: https://wiki.openstreetmap.org/wiki/Anonymous_edits enabled link text: hvad er dette? @@ -2489,10 +2489,11 @@ da: fælleseje/uden ophavsret. link: https://www.osmfoundation.org/wiki/License/Contributor_Terms link text: hvad er dette? - image: 'Billede:' + image: Billede gravatar: gravatar: Brug Gravatar link: http://wiki.openstreetmap.org/wiki/Gravatar + what_is_gravatar: Hvad er Gravatar? disabled: Gravatar er blevet deaktiveret. enabled: Visning af din Gravatar er blevet aktiveret. new image: Tilføj et billede @@ -2500,7 +2501,7 @@ da: delete image: Fjern det nuværende billede replace image: Erstat det aktuelle billede image size hint: (kvadratiske billeder pÃ¥ mindst 100x100 fungerer bedst) - home location: 'Hjemmeposition:' + home location: Hjemmeposition no home location: Du har ikke angivet din hjemmeposition. update home location on click: Opdater hjemmeposition nÃ¥r jeg klikker pÃ¥ kortet? save changes button: Gem ændringer diff --git a/config/locales/de.yml b/config/locales/de.yml index 15161e459..3fad6e93e 100644 --- a/config/locales/de.yml +++ b/config/locales/de.yml @@ -1,7 +1,6 @@ # Messages for German (Deutsch) # Exported from translatewiki.net # Export driver: phpyaml -# Author: Abijeet Patro # Author: Al # Author: Alefar # Author: Als-Holder @@ -9,6 +8,7 @@ # Author: Apmon # Author: Atomkraftzwerg # Author: Avatar +# Author: BPX-web # Author: Bergrübe # Author: Bpw85 # Author: Bxalber @@ -79,6 +79,7 @@ # Author: Thomas Bohn # Author: Umherirrender # Author: Unkn0wnCat +# Author: Wolfdietmann # Author: Woodpeck # Author: Zauberzunge2000 --- @@ -200,12 +201,15 @@ de: category: Wähle einen Grund für deine Meldung aus details: Bitte mehr Einzelheiten zum Problem angeben (erforderlich). user: + auth_provider: Authentifizierungslieferant + auth_uid: Authentifizierungsmethoden UID email: E-Mail - new_email: 'Neue E-Mail-Adresse:' + email_confirmation: E-Mail-Bestätigung + new_email: Neue E-Mail-Adresse active: Aktiv display_name: Anzeigename - description: Beschreibung - home_lat: 'Breitengrad:' + description: Profilbeschreibung + home_lat: Breitengrad home_lon: 'Längengrad:' languages: Bevorzugte Sprachen preferred_editor: Bevorzugter Editor @@ -215,8 +219,16 @@ de: trace: tagstring: durch Komma getrennt user_block: + reason: Der Grund, warum die Benutzerin gesperrt wird. Sei bitte möglichst + ruhig und sachlich, beschreibe die Lage möglichst detailliert und denke + daran, dass deine Nachricht öffentlich sichtbar ist. Denke daran, dass nicht + alle Benutzer den Jargon des Gemeinschaftsprojekts verstehen und verwende + bitte Formulierungen, die für Laien verständlich sind. needs_view: Muss der Benutzer sich anmelden, damit die Sperre aufgehoben wird? user: + email_confirmation: Deine E-Mail-Adresse wird nicht öffentlich gezeigt. Für + mehr Informationen lesen sie die Datenschutzerklärung. new_email: (nicht öffentlich sichtbar) datetime: distance_in_words_ago: @@ -266,7 +278,7 @@ de: description: iD (im Browser eingebetteter Editor) remote: name: Fernsteuerung - description: externem Editor (JOSM oder Merkaartor) + description: externe Editoren (JOSM, Potlatch, Merkaartor) auth: providers: none: Keine @@ -2041,6 +2053,12 @@ de: url: https://wiki.openstreetmap.org/ title: OpenStreetMap Wiki description: Durchsuche das Wiki für eine ausführliche OSM-Dokumentation. + potlatch: + removed: Deine Standard OpenStreetMap Editor ist Potlatch. Da die Entwicklung + des Adobe Flash Player eingestellt wurde, ist Potlatch nicht mehr für die + Nutzung im Browser verfügbar. + desktop_html: Wenn du Potlatch weiternutzen möchtest kannst du die Desktopanwendung + für Mac und Windows hier Herunterladen. sidebar: search_results: Suchergebnisse close: Schließen @@ -2609,7 +2627,7 @@ de: link: https://wiki.openstreetmap.org/wiki/OpenID link text: Was ist das? public editing: - heading: 'Karte bearbeiten (public editing):' + heading: Karte bearbeiten (public editing) enabled: Aktiviert. Normales Bearbeiten der Kartendaten ist möglich. enabled link: https://wiki.openstreetmap.org/wiki/Anonymous_edits enabled link text: Was bedeutet das? @@ -2641,6 +2659,7 @@ de: gravatar: gravatar: Gravatar verwenden link: https://wiki.openstreetmap.org/wiki/Gravatar + what_is_gravatar: Was ist Gravatar? disabled: Gravatar wurde deaktiviert. enabled: Die Anzeige deines Gravatars wurde aktiviert. new image: Bild einfügen @@ -2649,7 +2668,7 @@ de: replace image: Bild austauschen image size hint: (quadratische Bilder mit zumindest 100x100 Pixel funktionieren am besten) - home location: 'Standort:' + home location: Heimatstandort no home location: Du hast noch keinen Standort angegeben. update home location on click: Standort beim Klick auf die Karte aktualisieren save changes button: Änderungen speichern @@ -2909,6 +2928,7 @@ de: other: Du bist weniger als %{count} Fuß von diesem Punkt entfernt base: standard: Standard + cyclosm: CyclOSM cycle_map: Radfahrerkarte transport_map: Verkehrskarte hot: Humanitär @@ -2924,6 +2944,8 @@ de: donate_link_text: terms: Nutzungsbedingungen der Website und API + cyclosm: Kachelstil von CyclOSM + gehostet von OpenStreetMap Frankreich thunderforest: Kacheln mit freundlicher Genehmigung von Andy Allan opnvkarte: Kacheln mit freundlicher Genehmigung von
  • This action cannot be reversed and all new users are now public by default.
    • contributor terms: - heading: 'Contributor Terms:' + heading: Contributor Terms agreed: You have agreed to the new Contributor Terms. not yet agreed: You have not yet agreed to the new Contributor Terms. review link text: Please follow this link at your convenience to review and @@ -2168,7 +2168,7 @@ en-GB: in the Public Domain. link: http://www.osmfoundation.org/wiki/License/Contributor_Terms link text: what is this? - image: 'Image:' + image: Image gravatar: gravatar: Use Gravatar link: https://wiki.openstreetmap.org/wiki/Gravatar @@ -2179,7 +2179,7 @@ en-GB: delete image: Remove the current image replace image: Replace the current image image size hint: (square images at least 100x100 work best) - home location: 'Home Location:' + home location: Home Location no home location: You have not entered your home location. update home location on click: Update home location when I click on the map? save changes button: Save Changes diff --git a/config/locales/eo.yml b/config/locales/eo.yml index ef8331c19..7f268343f 100644 --- a/config/locales/eo.yml +++ b/config/locales/eo.yml @@ -1,7 +1,6 @@ # Messages for Esperanto (Esperanto) # Exported from translatewiki.net # Export driver: phpyaml -# Author: Abijeet Patro # Author: Airon90 # Author: Alefar # Author: Bwildenhain.BO diff --git a/config/locales/es.yml b/config/locales/es.yml index 366d1fc9e..2db1e1987 100644 --- a/config/locales/es.yml +++ b/config/locales/es.yml @@ -2,7 +2,6 @@ # Exported from translatewiki.net # Export driver: phpyaml # Author: 2axterix2 -# Author: Abijeet Patro # Author: Adjen # Author: Aguslr # Author: Alberto Chung diff --git a/config/locales/et.yml b/config/locales/et.yml index f7f78d6ff..7508b60f3 100644 --- a/config/locales/et.yml +++ b/config/locales/et.yml @@ -1,7 +1,6 @@ # Messages for Estonian (eesti) # Exported from translatewiki.net # Export driver: phpyaml -# Author: Abijeet Patro # Author: AivoK # Author: Avjoska # Author: Kanne diff --git a/config/locales/eu.yml b/config/locales/eu.yml index 54a4d98f9..397bafbfe 100644 --- a/config/locales/eu.yml +++ b/config/locales/eu.yml @@ -2,7 +2,6 @@ # Exported from translatewiki.net # Export driver: phpyaml # Author: 9and3r -# Author: Abijeet Patro # Author: Amaia # Author: An13sa # Author: Asieriko @@ -226,14 +225,14 @@ eu: history_title_html: 'Erlazioaren historia: %{name}' members: Kideak relation_member: - entry_role_html: '%{type} %{name} %{role} bezala' + entry_role_html: '%{type} %{name} %{role} rolean' type: node: Nodo way: Bide relation: Erlazio containing_relation: entry_html: '%{relation_name} erlazioa' - entry_role_html: '%{relation_name} erlazioa (%{relation_role} bezala)' + entry_role_html: '%{relation_name} erlazioa (%{relation_role} rolean)' not_found: sorry: 'Barkatu, %{type} #%{id} ezin izan da aurkitu.' type: @@ -420,7 +419,7 @@ eu: heading: Gehitu %{user} adiskidetzat? button: Gehitu lagun gisa success: '%{name} zure laguna de orain!' - failed: Barkatu, %{name} lagun bezala ezin izan da gehitu. + failed: Barkatu, ezin izan da %{name} adiskidetzat gehitu. already_a_friend: '%{name} eta zuk lagunak zarete jada.' remove_friend: heading: '%{user} lagun moduan kendu?' @@ -734,7 +733,7 @@ eu: bunker_silo: Bunkerra chimney: Tximinia crane: Garabia - dolphin: Lotura argitalpena + dolphin: Mutiloia dyke: Dikea embankment: Lubeta flagpole: Bandera masta @@ -1065,15 +1064,15 @@ eu: no_other_issues: Ez dago beste arazorik erabiltzaile honen aurka. comments_on_this_issue: Arazo honen inguruko iruzkinak resolve: - resolved: Arazoaren egoera 'Konponduta' bezala eguneratu da + resolved: Arazoaren egoera 'Konponduta' dela ezarri da ignore: - ignored: Arazoaren egoera 'Ezikusia' bezala eguneratu da + ignored: Arazoaren egoera 'Ez ikusi eginda' dela ezarri da reopen: - reopened: Arazoaren egoera 'Irekiaa' bezala eguneratu da + reopened: Arazoaren egoera 'Irekita' dela ezarri da comments: reassign_param: Arazoa biresleitu? reports: - reported_by_html: '%{user} erabiltzaileak %{category} bezala reportatua' + reported_by_html: '%{user} erabiltzaileak %{category} gisa salatua. Data: %{updated_at}' helper: reportable_title: diary_comment: '%{entry_title}, iruzkina #%{comment_id}' @@ -1181,10 +1180,11 @@ eu: footer_html: Mezua irakurri dezakezu %{readurl}-n ere eta erantzun %{replyurl}-n friendship_notification: hi: Kaixo %{to_user}, - subject: '[OpenStreetMap] %{user} lagun bezala gehitu zaitu' + subject: '[OpenStreetMap] %{user} erabiltzaileak adiskidetzat gehitu zaitu' had_added_you: '%{user} lagun bezala gehitu zaitu OpenStreetMap-en.' see_their_profile: Haien profila %{userurl}n ikusi dezakezu. - befriend_them: Haiek ere lagun bezala gehitu ditzakezu %{befriendurl}n. + befriend_them: Hura adiskidetzat gehitzeko aukera ere baduzu, %{befriendurl} + orrian. gpx_failure: failed_to_import: 'inportzean kale egin du. Hemen dago akatsa:' subject: '[OpenStreetMap] GPX Inportazioan porrota' diff --git a/config/locales/fa.yml b/config/locales/fa.yml index f84a6eff2..c68df3477 100644 --- a/config/locales/fa.yml +++ b/config/locales/fa.yml @@ -1,7 +1,6 @@ # Messages for Persian (فارسی) # Exported from translatewiki.net # Export driver: phpyaml -# Author: Abijeet Patro # Author: Ahangarha # Author: Alirezaaa # Author: Amirsara @@ -29,6 +28,7 @@ # Author: Nbi # Author: Omidh # Author: Pirehelokan +# Author: Reza koulivand # Author: Reza1615 # Author: Ruila # Author: Sahim @@ -152,19 +152,24 @@ fa: body: متن recipient: گیرنده redaction: + title: عنوان description: شرح report: category: دلیل گزارش خود را انتخاب کنید details: لطفاً جزئیات بیشتری از مشکل ارائه دهید (ضروری است). user: + auth_provider: فراهم‌آورندهٔ احراز هویت + auth_uid: شناسه UID احراز هویت email: ایمیل - new_email: 'نشانی ایمیل جدید:' + email_confirmation: تایید ایمیل + new_email: نشانی ایمیل جدید active: فعال display_name: نام نمایشی - description: توضیحات - home_lat: 'عرض جغرافیایی:' - home_lon: 'طول جغرافیایی:' - languages: زبان‌ها + description: توضیحات نمایه + home_lat: عرض جغرافیایی + home_lon: طول جغرافیایی + languages: زبان‌های مورد ترجیح + preferred_editor: ویرایش‌گر مورد ترجیح pass_crypt: گذرواژه pass_crypt_confirmation: تأیید گذرواژه help: @@ -176,6 +181,10 @@ fa: در نظر داشته باشید که همهٔ کاربران اصطلاحات تخصصی جامعه را نمی‌فهمند، لطفاً سعی کنید واژه‌هایی که استفاده می‌کنید غیرتخصصی باشد. needs_view: آیا قبل از پاک‌شدن این مسدودی، کاربر باید وارد حساب کاربری شود؟ user: + email_confirmation: آدرس شما به صورت عمومی نمایش داده نمی شود ، برای اطلاعات + بیشتر به     سیاست حفظ حریم + خصوصی ما مراجعه کنید . new_email: (هرگز به‌صورت عمومی نشان داده نمی‌شود) datetime: distance_in_words_ago: @@ -548,6 +557,7 @@ fa: pylon: ستون station: ایستگاه راه هوایی t-bar: T-Bar چپ + "yes": راه هوایی aeroway: aerodrome: فرودگاه هواپیما airstrip: پایگاه هوایی @@ -667,6 +677,7 @@ fa: waste_dump_site: سایت تخلیه زباله watering_place: مکان آبیاری water_point: منطقه دارای آب + "yes": تسهیلات boundary: aboriginal_lands: سرزمین بومی‌‌ها administrative: مرز اداری @@ -720,6 +731,7 @@ fa: school: ساختمان مدرسه semidetached_house: خانه نیمه مستقل service: ساختمان خدماتی + shed: دهنه stable: پایدار static_caravan: کاروان temple: ساختمان معبد @@ -748,6 +760,7 @@ fa: plumber: لوله Ú©Ø´ roofer: تعمیرکننده سقف shoemaker: کفاش + stonemason: سنگ تراش tailor: خیاط window_construction: پنجره‌سازی winery: شراب‌سازی @@ -923,6 +936,7 @@ fa: chimney: دودکش communications_tower: برج ارتباطی crane: جرثقیل + cross: تقاطع(چهارراه) dolphin: محل پهلوگیری dyke: خاکریز embankment: پشته @@ -940,6 +954,7 @@ fa: pier: اسکله کوچک pipeline: خط لوله silo: سیلو + snow_fence: حفاظ برف storage_tank: مخازن سیال surveillance: نظارت telescope: تلسکوپ @@ -957,6 +972,7 @@ fa: airfield: فرودگاه نظامی barracks: پادگان bunker: پناهگاه + trench: ترانشه "yes": نظامی mountain_pass: "yes": گردنه @@ -1108,6 +1124,7 @@ fa: dry_cleaning: تمیز کننده خشک e-cigarette: فروشگاه سیگار الکترونیک electronics: فروشگاه الکترونیکی + erotic: فروشگاه سرگرمی بزرگسالان estate_agent: بنگاه املاک farm: فروشگاه مزرعه fashion: فروشگاه مد @@ -1565,6 +1582,14 @@ fa: as_unread: پیام به عنوان نخوانده علامت‌گذاری شد destroy: destroyed: پیام حذف شد + shared: + markdown_help: + link: پیوند + text: متن + image: تصویر + url: آدرس اینترنتی + richtext_field: + edit: ویرایش کنید site: about: next: بعدی @@ -2403,13 +2428,13 @@ fa: account: title: ویرایش حساب my settings: تنظیمات من - current email address: 'ایمیل فعلی:' - external auth: 'احراز هویت خارجی:' + current email address: ایمیل فعلی + external auth: احراز هویت خارجی openid: link: https://wiki.openstreetmap.org/wiki/OpenID link text: این چیست؟ public editing: - heading: 'ویرایش عمومی:' + heading: ویرایش عمومی enabled: فعال. گمنام نیستید و می‌توانید داده را ویرایش کنید. enabled link: https://wiki.openstreetmap.org/wiki/Anonymous_edits enabled link text: این چیست؟ @@ -2426,7 +2451,7 @@ fa: contributor terms: - heading: 'شرایط مشارکت‌کننده:' + heading: شرایط مشارکت‌کننده agreed: شما شرایط جدید مشارکت‌کننده را پذیرفته‌اید. not yet agreed: شما هنوز شرایط جدید مشارکت‌کننده را نپذیرفته‌اید. review link text: لطفاً در فرصت مناسب این پیوند را دنبال کنید و پس از مطالعهٔ @@ -2435,7 +2460,7 @@ fa: باشد. link: https://www.osmfoundation.org/wiki/License/Contributor_Terms link text: این چیست؟ - image: 'تصویر:' + image: تصویر gravatar: gravatar: استفاده از Gravatar link: https://wiki.openstreetmap.org/wiki/Gravatar @@ -2446,7 +2471,7 @@ fa: delete image: حذف تصویر فعلی replace image: ' تصویر فعلی را عوض کنید' image size hint: (عکس مربعی با ابعاد حداقل 100×100 بهترین کارایی را دارد) - home location: 'موقعیت خانه:' + home location: موقعیت خانه no home location: شما محل خانهٔ خودتان را وارد نکرده‌اید. update home location on click: وقتی روی نقشه کلیک می‌کنم موقعیت خانه روزآمد شود. diff --git a/config/locales/fi.yml b/config/locales/fi.yml index 02f3e020e..80e9fc6a1 100644 --- a/config/locales/fi.yml +++ b/config/locales/fi.yml @@ -2,7 +2,6 @@ # Exported from translatewiki.net # Export driver: phpyaml # Author: 01miki10 -# Author: Abijeet Patro # Author: Actuallyisjoha # Author: Alluk. # Author: Antsa @@ -161,12 +160,12 @@ fi: details: Kuvaile ongelmaa (pakollinen) user: email: Sähköpostiosoite - new_email: 'Uusi sähköpostiosoite:' + new_email: Uusi sähköpostiosoite active: Aktivoitu display_name: Näyttönimi - description: Kuvaus - home_lat: 'Leveyspiiri:' - home_lon: 'Pituuspiiri:' + description: Henkilökuvaus + home_lat: Leveyspiiri + home_lon: Pituuspiiri languages: Kielet pass_crypt: Salasana pass_crypt_confirmation: Vahvista salasana @@ -223,7 +222,7 @@ fi: description: iD (selainkäyttöinen muokkain) remote: name: Kauko-ohjaus - description: Kauko-ohjaus (JOSM tai Merkaartor) + description: Kauko-ohjaus (JOSM, Potlatch tai Merkaartor) auth: providers: none: Ei mitään @@ -2356,13 +2355,13 @@ fi: account: title: Asetusten muokkaus my settings: Käyttäjäasetukset - current email address: 'Nykyinen sähköpostiosoite:' - external auth: 'Kolmannen osapuolen tunnukset kirjautuessa:' + current email address: Nykyinen sähköpostiosoite + external auth: Kolmannen osapuolen tunnukset kirjautuessa openid: link: https://wiki.openstreetmap.org/wiki/Fi:OpenID link text: Mitä tämä tarkoittaa? public editing: - heading: 'Muokkaukset julkisia:' + heading: Muokkaukset julkisia enabled: Kyllä. Karttatietojen muokkaus sallittu. enabled link: https://wiki.openstreetmap.org/wiki/Anonymous_edits enabled link text: Mitä tämä tarkoittaa? @@ -2379,7 +2378,7 @@ fi: toimintoa ei voi perua ja kaikki uudet käyttäjät ovat automaattisesti julkisia. contributor terms: - heading: 'Osallistumisehdot:' + heading: Osallistumisehdot agreed: Olet hyväksynyt osallistumisehdot. not yet agreed: Et ole vielä hyväksynyt osallistumisehtoja. review link text: Lue ja hyväksy uudistuneet osallistumisehdot napsauttamalla @@ -2388,10 +2387,11 @@ fi: vapaita (Public Domain). link: https://www.osmfoundation.org/wiki/License/Contributor_Terms link text: Mitä tämä tarkoittaa? - image: 'Kuva:' + image: Kuva gravatar: gravatar: Käytä Gravataria link: https://wiki.openstreetmap.org/wiki/Gravatar + what_is_gravatar: Mikä on Gravatar? disabled: Gravatar on poistettu käytöstä. enabled: Gravatarisi näyttäminen on otettu käyttöön. new image: Lisää kuva @@ -2400,7 +2400,7 @@ fi: replace image: Korvaa nykyinen kuva image size hint: (parhaat kuvat ovat neliönmuotoisia, joiden koko on vähintään 100x100) - home location: 'Kotipaikka:' + home location: Kotipaikka no home location: Kotipaikkaa ei ole vielä määritetty. update home location on click: Päivitä kotipaikka karttaa napsauttaessa save changes button: Tallenna muutokset diff --git a/config/locales/fit.yml b/config/locales/fit.yml index f5fffeb6b..56c93e50d 100644 --- a/config/locales/fit.yml +++ b/config/locales/fit.yml @@ -1,7 +1,6 @@ # Messages for Tornedalen Finnish (meänkieli) # Exported from translatewiki.net # Export driver: phpyaml -# Author: Abijeet Patro # Author: Pyscowicz --- fit: diff --git a/config/locales/fr.yml b/config/locales/fr.yml index 10067e650..b77768223 100644 --- a/config/locales/fr.yml +++ b/config/locales/fr.yml @@ -2,7 +2,6 @@ # Exported from translatewiki.net # Export driver: phpyaml # Author: 0x010C -# Author: Abijeet Patro # Author: Alno # Author: Boniface # Author: Cquoi @@ -72,6 +71,7 @@ # Author: Vcalame # Author: Vega # Author: Verdy p +# Author: Windes # Author: Wladek92 # Author: Yodaspirine # Author: Yvecai @@ -104,7 +104,7 @@ fr: create: Téléverser update: Enregistrer les modifications user_block: - create: Créer un blocage + create: Créer un bloc update: Mettre à jour le blocage activerecord: errors: @@ -223,9 +223,9 @@ fr: qu’expire ce blocage ? user: email_confirmation: Votre adresse n’est pas affichée publiquement, voyez notre - politique - de confidentialité pour plus d’informations. + politique de confidentialité pour plus d’informations. new_email: (jamais affichée publiquement) datetime: distance_in_words_ago: diff --git a/config/locales/fur.yml b/config/locales/fur.yml index e7dc0e604..06e2461f1 100644 --- a/config/locales/fur.yml +++ b/config/locales/fur.yml @@ -1,7 +1,6 @@ # Messages for Friulian (furlan) # Exported from translatewiki.net # Export driver: phpyaml -# Author: Abijeet Patro # Author: Davio # Author: Klenje # Author: Macofe diff --git a/config/locales/fy.yml b/config/locales/fy.yml index dd23ca587..80f64808a 100644 --- a/config/locales/fy.yml +++ b/config/locales/fy.yml @@ -1,7 +1,6 @@ # Messages for Western Frisian (Frysk) # Exported from translatewiki.net # Export driver: phpyaml -# Author: Abijeet Patro # Author: PiefPafPier # Author: Robin van der Vliet --- diff --git a/config/locales/ga.yml b/config/locales/ga.yml index 3d1bde693..1b280f419 100644 --- a/config/locales/ga.yml +++ b/config/locales/ga.yml @@ -1,7 +1,6 @@ # Messages for Irish (Gaeilge) # Exported from translatewiki.net # Export driver: phpyaml -# Author: Abijeet Patro # Author: Cliste # Author: Tem --- diff --git a/config/locales/gcf.yml b/config/locales/gcf.yml index 54fcc7f8f..0fb248fbf 100644 --- a/config/locales/gcf.yml +++ b/config/locales/gcf.yml @@ -1,7 +1,6 @@ # Messages for Guadeloupean Creole French (Guadeloupean Creole French) # Exported from translatewiki.net # Export driver: phpyaml -# Author: Abijeet Patro # Author: Léon973 --- gcf: diff --git a/config/locales/gd.yml b/config/locales/gd.yml index 9cbaca834..26a264161 100644 --- a/config/locales/gd.yml +++ b/config/locales/gd.yml @@ -1,7 +1,6 @@ # Messages for Scottish Gaelic (Gàidhlig) # Exported from translatewiki.net # Export driver: phpyaml -# Author: Abijeet Patro # Author: Akerbeltz # Author: GunChleoc # Author: Macofe diff --git a/config/locales/gl.yml b/config/locales/gl.yml index 2f8b3e94a..bf6a8f804 100644 --- a/config/locales/gl.yml +++ b/config/locales/gl.yml @@ -1,7 +1,6 @@ # Messages for Galician (galego) # Exported from translatewiki.net # Export driver: phpyaml -# Author: Abijeet Patro # Author: Athena in Wonderland # Author: Banjo # Author: Breogan2008 @@ -131,19 +130,24 @@ gl: body: Corpo recipient: Destinatario redaction: + title: Título description: Descrición report: category: Escoller a razón da túa denuncia details: Por favor, achegue máis detalles sobre o problema (requirido) user: + auth_provider: Fornecedor de autenticación + auth_uid: UID de autenticación email: Enderezo de correo electrónico - new_email: 'Novo enderezo de correo electrónico:' + email_confirmation: Email de confirmación + new_email: Novo enderezo de correo electrónico active: Activo display_name: Nome público - description: Descrición - home_lat: 'Latitude:' - home_lon: 'Lonxitude:' - languages: Linguas + description: Descrición do perfil + home_lat: Latitude + home_lon: Lonxitude + languages: Linguas preferidas + preferred_editor: Editor preferido pass_crypt: Contrasinal pass_crypt_confirmation: Confirmar contrasinal help: @@ -158,6 +162,10 @@ gl: needs_view: O usuario ten que acceder ó sistema antes de que o bloqueo sexa revogado? user: + email_confirmation: O teu enderezo non ficará visíbel de xeito público. Consulta + a política + de privacidade para máis información. new_email: (nunca amosado publicamente) datetime: distance_in_words_ago: @@ -2545,13 +2553,13 @@ gl: account: title: Editar a conta my settings: Os meus axustes - current email address: 'Enderezo de correo electrónico actual:' - external auth: 'Autenticación externa:' + current email address: Enderezo de correo electrónico actual + external auth: Autenticación externa openid: link: https://wiki.openstreetmap.org/wiki/OpenID link text: que é isto? public editing: - heading: 'Edición pública:' + heading: Edición pública enabled: Activado. Non es anónimo e podes editar os datos. enabled link: https://wiki.openstreetmap.org/wiki/Anonymous_edits enabled link text: que é isto? @@ -2569,7 +2577,7 @@ gl: públicos.
  • Non é posíbel reverter esta acción e agora os novos usuarios xa son públicos por defecto.
    • contributor terms: - heading: 'Termos do contribuínte:' + heading: Termos do contribuínte agreed: Aceptaches os novos termos do contribuínte. not yet agreed: Aínda non aceptaches os novos termos do contribuínte. review link text: Siga esta ligazón para revisar e aceptar os novos termos @@ -2578,10 +2586,11 @@ gl: dominio público. link: https://www.osmfoundation.org/wiki/License/Contributor_Terms link text: que é isto? - image: 'Imaxe:' + image: Imaxe gravatar: gravatar: Empregar o Gravatar link: https://wiki.openstreetmap.org/wiki/Gravatar + what_is_gravatar: Que é o Gravatar? disabled: Gravatar foi desactivado. enabled: A visualización do teu Gravatar foi activada. new image: Engadir unha imaxe @@ -2589,7 +2598,7 @@ gl: delete image: Eliminar a imaxe actual replace image: Substituír a imaxe actual image size hint: (as imaxes cadradas de, polo menos, 100x100 funcionan mellor) - home location: 'Lugar de orixe:' + home location: Lugar de orixe no home location: Non inseriches o teu lugar de orixe. update home location on click: Desexas actualizar a túa localización ó premer sobre o mapa? @@ -2819,6 +2828,7 @@ gl: custom_dimensions: Estabelecer dimensións personalizadas format: 'Formato:' scale: 'Escala:' + image_dimensions: A imaxe amosará a capa estándar con %{width} x %{height} download: Baixar short_url: Enderezo URL curto include_marker: Incluí-lo marcador diff --git a/config/locales/gsw.yml b/config/locales/gsw.yml index 66013cd85..77b821add 100644 --- a/config/locales/gsw.yml +++ b/config/locales/gsw.yml @@ -1,7 +1,6 @@ # Messages for Swiss German (Alemannisch) # Exported from translatewiki.net # Export driver: phpyaml -# Author: Abijeet Patro # Author: Als-Chlämens # Author: Als-Holder # Author: Doktorpixel14 diff --git a/config/locales/he.yml b/config/locales/he.yml index 17227be17..018f417a4 100644 --- a/config/locales/he.yml +++ b/config/locales/he.yml @@ -1,7 +1,6 @@ # Messages for Hebrew (עברית) # Exported from translatewiki.net # Export driver: phpyaml -# Author: Abijeet Patro # Author: Amire80 # Author: Aude # Author: Dan.translate @@ -2386,8 +2385,8 @@ he: notice email cannot find: סליחה, הכתובת הזאת לא נמצאה. reset_password: title: איפוס סיסמה - heading: איפוס הססמה עבור %{user} - reset: איפוס הססמה + heading: איפוס הסיסמה עבור %{user} + reset: איפוס הסיסמה flash changed: סיסמתך שונתה. flash token bad: לא מצאנו את האסימון ההוא, אולי בדיקת הכתובת תעזור? new: diff --git a/config/locales/hr.yml b/config/locales/hr.yml index 5f196b4d8..44897be5d 100644 --- a/config/locales/hr.yml +++ b/config/locales/hr.yml @@ -1,7 +1,6 @@ # Messages for Croatian (hrvatski) # Exported from translatewiki.net # Export driver: phpyaml -# Author: Abijeet Patro # Author: Anarhistička Maca # Author: Astrind # Author: Bugoslav @@ -48,6 +47,9 @@ hr: create: Napravi blokadu update: Ažuriraj blokadu activerecord: + errors: + messages: + invalid_email_address: ne izgleda kao ispravna adresa e-poÅ¡te models: acl: Kontrole pristupa changeset: Set promjena @@ -72,6 +74,7 @@ hr: relation: Relacija relation_member: Član relacije relation_tag: Oznaka relacije + report: Prijavi session: Sesija trace: Trag tracepoint: Točka trase @@ -87,6 +90,7 @@ hr: name: Naziv (obvezno) callback_url: Callback URL support_url: PodrÅ¡ka URL + allow_write_api: uredi kartu allow_write_notes: izmijeni biljeÅ¡ke diary_comment: body: Tijelo @@ -117,17 +121,21 @@ hr: body: Tijelo recipient: Primatelj redaction: + title: Naslov description: Opis user: email: Email - new_email: 'Nova E-mail adresa:' + email_confirmation: 'Potvrda adrese e-poÅ¡te:' + new_email: 'Nova adresa e-poÅ¡te:' active: Aktivan display_name: Prikaži ime - description: Opis - home_lat: 'Geografska Å¡irina (Latitude):' - home_lon: 'Geografska dužina (Longitude):' - languages: Jezici + description: 'Opis profila:' + home_lat: 'Geografska Å¡irina (latitude):' + home_lon: 'Geografska dužina (longitude):' + languages: 'Željeni jezici:' + preferred_editor: 'Preferencijalni uređivač:' pass_crypt: Lozinka + pass_crypt_confirmation: Potvrdi zaporku help: trace: tagstring: odvojeno zarezom @@ -137,7 +145,55 @@ hr: new_email: (nikada se ne prikazuje javno) datetime: distance_in_words_ago: + about_x_hours: + one: prije otprilike 1 sat + few: prije otprilike %{count} sata + other: prije otprilike %{count} sati + about_x_months: + one: prije otprilike 1 mjesec + few: prije otprilike %{count} mjeseca + other: prije otprilike %{count} mjeseci + about_x_years: + one: prije otprilike 1 godine + few: prije otprilike %{count} godine + other: prije otprilike %{count} godina + almost_x_years: + one: prije skoro 1 godine + few: prije skoro %{count} godine + other: prije skoro %{count} godina half_a_minute: prije pola minute + less_than_x_seconds: + one: prije manje od sekunde + few: prije manje od %{count} sekunde + other: prije manje od %{count} sekundi + less_than_x_minutes: + one: prije manje od minute + few: prije manje od %{count} minute + other: prije manje od %{count} minuta + over_x_years: + one: prije preko 1 godine + few: prije preko %{count} godine + other: prije preko %{count} godina + x_seconds: + one: prije 1 sekunde + few: prije %{count} sekunde + other: prije %{count} sekundi + x_minutes: + one: prije 1 minute + few: prije %{count} minute + other: prije %{count} minuta + x_days: + one: prije 1 dana + few: prije %{count} dana + other: prije %{count} dana + x_months: + one: prije 1 mjeseca + few: prije %{count} mjeseca + other: prije %{count} mjeseci + x_years: + one: prije 1 godine + few: prije %{count} godine + other: prije %{count} godina editor: default: Zadano (currently %{name}) id: @@ -145,7 +201,16 @@ hr: description: iD (uređivač u pregledniku) remote: name: Remote Control - description: Remote Control (JOSM ili Merkaartor) + description: Remote Control (JOSM, Potlatch ili Merkaartor) + auth: + providers: + none: Nijedan + openid: OpenID + google: Google + facebook: Facebook + windowslive: Windows Live + github: GitHub + wikipedia: Wikipedia api: notes: comment: @@ -159,6 +224,8 @@ hr: reopened_at_by_html: Reaktivirao korisnik %{user} u %{when} rss: title: BiljeÅ¡ke OpenStreetMap-a + description_area: Lista biljeÅ¡ki, prijavljenih, komentiranih ili zatvorenih + u tvojem području [(%{min_lat}|%{min_lon}) -- (%{max_lat}|%{max_lon})] description_item: RSS-tok biljeÅ¡ke %{id} opened: nova biljeÅ¡ka (blizu %{place}) commented: novi komentar (blizu %{place}) @@ -181,6 +248,14 @@ hr: anonymous: anonimno no_comment: (bez komentara) part_of: Dio od + part_of_relations: + one: 1 relacija + few: '%{count} relacije' + other: '%{count} relacija' + part_of_ways: + one: 1 put + few: '%{count} puta' + other: '%{count} putova' download_xml: Preuzmi XML view_history: Prikaži povijest view_details: Prikaži detalje @@ -212,6 +287,10 @@ hr: title_html: 'Put: %{name}' history_title_html: 'Povijest puta: %{name}' nodes: Točke + nodes_count: + one: 1 točka + few: '%{count} točke' + other: '%{count} točaka' also_part_of_html: one: dio puta %{related_ways} other: dio putova %{related_ways} @@ -219,6 +298,10 @@ hr: title_html: 'Relacija: %{name}' history_title_html: 'Povijest relacije: %{name}' members: Članovi + members_count: + one: 1 član + few: '%{count} člana' + other: '%{count} članova' relation_member: entry_role_html: '%{type} %{name} kao %{role}' type: @@ -264,6 +347,7 @@ hr: tag: Opis wiki stranica za oznaku %{key}=%{value} (tag) wikidata_link: '%{page} Predmet na Wikidata' wikipedia_link: Članak o %{page} na Wikipediji + wikimedia_commons_link: '%{page} element na Wikimedia Commons' telephone_link: Nazovi %{phone_number} note: title: 'BiljeÅ¡ka: %{id}' @@ -285,6 +369,7 @@ hr: reopened_by_anonymous_html: Ponovno aktivirano anonimno u %{when} hidden_by_html: Sakrio/la %{user} u %{when} + report: Prijavi ovu biljeÅ¡ku query: title: Provjeri elemente karte introduction: Klikni na kartu za pronalazak okolnih elemenata karte. @@ -323,6 +408,8 @@ hr: comment: comment: 'Novi komentar na setu promjena #%{changeset_id} od %{author}' commented_at_by_html: Osvježio korisnik %{user} %{when} + comments: + comment: 'Novi komentar od %{author} na setu promjena #%{changeset_id}' index: title_all: Rasprava o OpenStreetMap setu promjena title_particular: 'Rasprava o OpenStreetMap setu promjena #%{changeset_id}' @@ -330,8 +417,8 @@ hr: new: title: Novi zapis u dnevnik form: - location: 'Lokacija:' - use_map_link: koristi kartu + location: Lokacija + use_map_link: Koristi kartu index: title: Dnevnici korisnika title_friends: Dnevnici prijatelja @@ -340,6 +427,7 @@ hr: in_language_title: 'Zapisi u dnevniku na jeziku: %{language}' new: Novi zapis u dnevnik new_title: Sročite novi zapis u vaÅ¡ dnevnik + my_diary: Moj dnevnik no_entries: Nema zapisa u dnevniku recent_entries: Nedavni zapisi u dnevnik older_entries: Stariji zapisi @@ -359,7 +447,8 @@ hr: body: Žao mi je, ne postoji zapis u dnevniku ili komentar sa id %{id}. Provjerite ispravnost upisa, ili je poveznica na koji ste kliknuli neispravna. diary_entry: - posted_by_html: 'Postano od %{link_user} u %{created} na jeziku: %{language_link}' + posted_by_html: Poslao %{link_user} u %{created} na jeziku %{language_link} + updated_at_html: Zadnji put ažurirano %{updated}. comment_link: Komentiraj ovaj zapis reply_link: PoÅ¡alji poruku autoru comment_count: @@ -424,10 +513,14 @@ hr: drag_lift: Sidro/tanjurić gondola: Žičara station: Stanica žičare + t-bar: Sidro + "yes": Žičara aeroway: aerodrome: Zračna luka + airstrip: Uzletno/sletna pista apron: PristaniÅ¡na platforma gate: Izlaz + hangar: Hangar helipad: Heliodrom runway: Pista taxiway: Rulnica @@ -528,16 +621,18 @@ hr: viaduct: Vijadukt "yes": Most building: - apartments: Stambeni blok + apartments: Stambena zgrada chapel: Kapelica - church: Crkva + church: Crkvena zgrada commercial: Poslovna zgrada construction: Zgrada u izgradnji dormitory: Studentski dom - farm: Farma (zgrada) + farm: Zgrada farme garage: Garaža + garages: Garaže + greenhouse: Plastenik/staklenik hospital: Bolnica - hotel: Hotel + hotel: Zgrada hotela house: Kuća industrial: Industrijska zgrada manufacture: Tvornička zgrada @@ -545,10 +640,13 @@ hr: public: Javna zgrada residential: Stambena zgrada retail: Maloprodajna zgrada + roof: Krov school: Å kolska zgrada - terrace: Terasa - train_station: Željeznički kolodvor + stable: Staja + terrace: Kućica u nizu + train_station: Zgrada željezničkog kolodvora university: Zgrada SveučiliÅ¡ta + warehouse: SkladiÅ¡te "yes": Zgrada craft: brewery: Pivovara @@ -560,6 +658,7 @@ hr: plumber: Vodoinstalater shoemaker: Obućar tailor: Krojač + winery: Vinarija "yes": Radionica emergency: ambulance_station: Garaža hitne pomoći @@ -902,9 +1001,11 @@ hr: "yes": Vodotok admin_levels: level2: Državna granica + level3: Granica regije level5: Granica regije level6: Granica županije - level8: Granica grada + level7: Granica općine/grada + level8: Granica naselja level9: Granica sela level10: Granica predgrađa types: @@ -1516,7 +1617,7 @@ hr: email or username: 'Email adresa ili korisničko ime:' password: 'Lozinka:' openid_html: '%{logo} OpenID:' - remember: 'Zapamti me:' + remember: Zapamti me lost password link: Izgubljena zaporka? login_button: Prijava register now: Registrirajte se sada @@ -1856,6 +1957,22 @@ hr: hours: one: 1 sat other: '%{count} sati' + days: + one: 1 dan + few: '%{count} dana' + other: '%{count} dana' + weeks: + one: 1 tjedan + few: '%{count} tjedna' + other: '%{count} tjedana' + months: + one: 1 mjesec + few: '%{count} mjeseca' + other: '%{count} mjeseci' + years: + one: 1 godina + few: '%{count} godine' + other: '%{count} godina' blocks_on: title: Blokade na %{name} heading_html: Lista blokada na %{name} @@ -1867,6 +1984,7 @@ hr: show: title: '%{block_on} blokiran od %{block_by}' heading_html: '%{block_on} blokiran od %{block_by}' + created: Stvoreno status: Status show: Prikaži edit: Uredi @@ -1909,6 +2027,7 @@ hr: link: Poveznica ili HTML long_link: Poveznica short_link: Kratka poveznica + geo_uri: Geo URI embed: HTML custom_dimensions: Postavi prilagođene dimenzije format: 'Format:' @@ -1954,12 +2073,22 @@ hr: map_data_zoom_in_tooltip: Približi da vidiÅ¡ podatke karte queryfeature_tooltip: Provjeri elemente karte queryfeature_disabled_tooltip: Približi za provjeru elemenata + changesets: + show: + comment: Komentiraj + subscribe: Pretplati se + unsubscribe: Otkaži pretplatu + hide_comment: sakrij + unhide_comment: vrati sakriveno notes: new: intro: Primjetili ste greÅ¡ku ili nedostatak nečega? Javite ostalim kartografima kako bismo to ispravili. Stavite oznaku na pravo mjesto i dodajte biljeÅ¡ku s opisom problema. (Molimo ne unaÅ¡ajte osobne podatke ili podatke s karata koje su zaÅ¡tićene autorskim pravima) + advice: VaÅ¡a biljeÅ¡ka je javna i može se koristiti za ažuriranje karte, zato + ne upisujte osobne podatke, ili podatke sa karata ili tablica podataka zaÅ¡tićenih + autorskim pravima. add: Dodaj biljeÅ¡ku show: anonymous_warning: Ova biljeÅ¡ka sadrži komentare anonimnih korisnika koje @@ -1987,14 +2116,34 @@ hr: instructions: continue_without_exit: Nastavi na %{name} slight_right_without_exit: Lagano desno na %{name} + offramp_right: Uđite na autocestu desno + offramp_right_with_exit: Skrenite na izlaz %{exit} desno offramp_right_with_name: Siđi sa autoceste desno na %{name} onramp_right_without_exit: Skreni desno na autocestu %{name} endofroad_right_without_exit: Na kraju ceste skreni desno na %{name} + exit_counts: + first: "1." + second: "2." + third: "3." + fourth: "4." + fifth: "5." + sixth: "6." + seventh: "7." + eighth: "8." + ninth: "9." + tenth: "10." + time: Vrijeme + query: + node: Točka + way: Put + relation: Relacija context: directions_from: Upute odavde directions_to: Upute do ovog mjesta + add_note: Dodaj biljeÅ¡ku ovdje show_address: Prikaži adresu query_features: Provjeri elemente karte + centre_map: Centriraj kartu ovdje redactions: show: description: 'Opis:' diff --git a/config/locales/hsb.yml b/config/locales/hsb.yml index ecb75afa6..7099f8c5d 100644 --- a/config/locales/hsb.yml +++ b/config/locales/hsb.yml @@ -1,7 +1,6 @@ # Messages for Upper Sorbian (hornjoserbsce) # Exported from translatewiki.net # Export driver: phpyaml -# Author: Abijeet Patro # Author: J budissin # Author: Macofe # Author: Michawiki diff --git a/config/locales/hu.yml b/config/locales/hu.yml index b1764cb00..2f3c56bb0 100644 --- a/config/locales/hu.yml +++ b/config/locales/hu.yml @@ -2,7 +2,6 @@ # Exported from translatewiki.net # Export driver: phpyaml # Author: --szabi-- -# Author: Abijeet Patro # Author: Athoss # Author: Balint36 # Author: BanKris diff --git a/config/locales/ia.yml b/config/locales/ia.yml index 7991fec62..33a3497df 100644 --- a/config/locales/ia.yml +++ b/config/locales/ia.yml @@ -1,7 +1,6 @@ # Messages for Interlingua (interlingua) # Exported from translatewiki.net # Export driver: phpyaml -# Author: Abijeet Patro # Author: Carlosedepaula # Author: Fanjiayi # Author: Julian Mendez diff --git a/config/locales/id.yml b/config/locales/id.yml index 5e593fb1e..9ec61003a 100644 --- a/config/locales/id.yml +++ b/config/locales/id.yml @@ -1,8 +1,8 @@ # Messages for Indonesian (Bahasa Indonesia) # Exported from translatewiki.net # Export driver: phpyaml -# Author: Abijeet Patro # Author: Akmaie Ajam +# Author: Andikbuyung # Author: Arief # Author: Arifin.wijaya # Author: ArlandGa @@ -144,19 +144,22 @@ id: body: Isi recipient: Penerima redaction: + title: Judul description: Deskripsi report: category: 'Pilih alasan laporan Anda:' details: Silakan berikan rincian tentang masalah (wajib). user: email: Email - new_email: 'Alamat Email Baru:' + email_confirmation: Konfirmasi Surel + new_email: Alamat Surel Baru active: Aktif display_name: Nama Tampilan - description: Keterangan - home_lat: 'Garis Lintang:' - home_lon: 'Garis Bujur:' - languages: Bahasa + description: Deskripsi Profil + home_lat: Garis Lintang + home_lon: Garis Bujur + languages: Bahasa yang Dipilih + preferred_editor: Editor yang Dipilih pass_crypt: Kata Sandi pass_crypt_confirmation: Konfirmasi Kata Sandi help: diff --git a/config/locales/is.yml b/config/locales/is.yml index a2b29773d..1eec31fbd 100644 --- a/config/locales/is.yml +++ b/config/locales/is.yml @@ -1,7 +1,6 @@ # Messages for Icelandic (íslenska) # Exported from translatewiki.net # Export driver: phpyaml -# Author: Abijeet Patro # Author: Macofe # Author: Nemo bis # Author: Snævar diff --git a/config/locales/it.yml b/config/locales/it.yml index fb8a264ad..42e9256c9 100644 --- a/config/locales/it.yml +++ b/config/locales/it.yml @@ -1,7 +1,6 @@ # Messages for Italian (italiano) # Exported from translatewiki.net # Export driver: phpyaml -# Author: Abijeet Patro # Author: Albe Albe 460 # Author: Alessioz # Author: Alexmar983 diff --git a/config/locales/ja.yml b/config/locales/ja.yml index d8432b6df..218b1e8c5 100644 --- a/config/locales/ja.yml +++ b/config/locales/ja.yml @@ -2,7 +2,6 @@ # Exported from translatewiki.net # Export driver: phpyaml # Author: A2y4 -# Author: Abijeet Patro # Author: Aefgh39622 # Author: Atysn # Author: CmplstofB @@ -162,18 +161,19 @@ ja: body: 本文 recipient: 受信者 redaction: + title: タイトル description: 説明 report: category: 報告の理由を選択してください。 details: 問題についてもう少し詳しく記述してください (必須)。 user: email: メール - new_email: '新しいメール アドレス:' + new_email: 新しいメール アドレス active: アクティブ display_name: 表示名 description: 説明 - home_lat: '緯度:' - home_lon: '経度:' + home_lat: 緯度 + home_lon: 経度 languages: 言語 pass_crypt: パスワード pass_crypt_confirmation: パスワードを確認 @@ -184,6 +184,8 @@ ja: reason: ユーザーがブロックされている理由です。メッセージは多くの人の目にふれることになるため、できるだけ冷静かつ理性的になり、できるだけ丁寧に状況を説明するようにしてください。すべての利用者がコミュニティ固有の用語を理解しているわけではないため、分かりやすい用語を使うように努めてください。 needs_view: このブロックを解消するには、先に利用者がログインする必要がありますか？ user: + email_confirmation: あなたのアドレスは非公開です。詳細は弊財団のプライバシーポリシーをご参照ください。 new_email: (非公開) datetime: distance_in_words_ago: @@ -2345,13 +2347,13 @@ ja: account: title: アカウントの編集 my settings: 設定 - current email address: '現在のメール アドレス:' - external auth: '外部認証:' + current email address: 現在のメール アドレス + external auth: 外部認証 openid: link: https://wiki.openstreetmap.org/wiki/JA:OpenID?uselang=ja link text: これは何ですか? public editing: - heading: '公開編集:' + heading: 公開編集 enabled: 有効。匿名ではなく、データを編集できます。 enabled link: http://wiki.openstreetmap.org/wiki/JA:Anonymous_edits?uselang=ja enabled link text: これは何ですか? @@ -2363,14 +2365,14 @@ ja: API 更新より地図データの編集は公開利用者以外、できなくなりました。 (その理由はこちらで)。 contributor terms: - heading: '協力者規約:' + heading: 協力者規約 agreed: あなたは、新しい協力者規約を承諾しています。 not yet agreed: あなたはまだ新しい投稿規約を承諾していません。 review link text: ご都合の良い時にこのリンクをクリックして新しい協力者規約を確認の上、承諾してしてください。 agreed_with_pd: また、あなたは、自分の編集結果がパブリックドメインにあるべきだと考えているということも宣言しています。 link: https://www.osmfoundation.org/wiki/License/Contributor_Terms link text: これは何ですか? - image: '画像:' + image: 画像 gravatar: gravatar: Gravatar を使用 link: http://wiki.openstreetmap.org/wiki/Gravatar @@ -2381,7 +2383,7 @@ ja: delete image: 現在の画像を削除 replace image: 現在の画像を置換 image size hint: (100x100 以下の正方形の画像が最適) - home location: 'ホーム地点:' + home location: ホーム地点 no home location: あなたはまだホーム地点を登録していません。 update home location on click: ホーム地点を、地図上のクリックした地点に変更 save changes button: 変更を保存 diff --git a/config/locales/ka.yml b/config/locales/ka.yml index ab2945e25..d5fb370a9 100644 --- a/config/locales/ka.yml +++ b/config/locales/ka.yml @@ -1,7 +1,6 @@ # Messages for Georgian (ქართული) # Exported from translatewiki.net # Export driver: phpyaml -# Author: Abijeet Patro # Author: David1010 # Author: MIKHEIL # Author: Temuri rajavi diff --git a/config/locales/kab.yml b/config/locales/kab.yml index 7c86bde20..519a53260 100644 --- a/config/locales/kab.yml +++ b/config/locales/kab.yml @@ -1,7 +1,6 @@ # Messages for Kabyle (Taqbaylit) # Exported from translatewiki.net # Export driver: phpyaml -# Author: Abijeet Patro # Author: Alem # Author: Amsideg # Author: Belkacem77 diff --git a/config/locales/km.yml b/config/locales/km.yml index 75593c450..8be5f4a98 100644 --- a/config/locales/km.yml +++ b/config/locales/km.yml @@ -1,7 +1,6 @@ # Messages for Khmer (ភាសាខ្មែរ) # Exported from translatewiki.net # Export driver: phpyaml -# Author: Abijeet Patro # Author: Sovichet # Author: គីមស៊្រុន # Author: វ័ណថារិទ្ធ diff --git a/config/locales/kn.yml b/config/locales/kn.yml index b45526a70..7db67d1ec 100644 --- a/config/locales/kn.yml +++ b/config/locales/kn.yml @@ -2,7 +2,6 @@ # Exported from translatewiki.net # Export driver: phpyaml # Author: AKJ GOWDA -# Author: Abijeet Patro # Author: Ananth subray # Author: Nayvik # Author: Omshivaprakash diff --git a/config/locales/ko.yml b/config/locales/ko.yml index b0f4a0c45..4af2c0da4 100644 --- a/config/locales/ko.yml +++ b/config/locales/ko.yml @@ -2,7 +2,6 @@ # Exported from translatewiki.net # Export driver: phpyaml # Author: A Retired User -# Author: Abijeet Patro # Author: Alattalatta # Author: Alex00728 # Author: Asdfqwer51 @@ -159,6 +158,7 @@ ko: category: ë³´ê³  이유를 선택하세요 details: 문제와 관련하여 더 자세한 사항을 제공해주세요.(필수) user: + auth_provider: 인증 제공자 auth_uid: 인증 UID email: 이메일 email_confirmation: 이메일 인증 @@ -2336,6 +2336,7 @@ ko: gravatar: gravatar: Gravatar 사용 link: https://wiki.openstreetmap.org/wiki/Gravatar + what_is_gravatar: Gravatar는 무엇입니까? disabled: 그라바타가 비활성화되었습니다. enabled: 그라바타의 표시가 활성화되었습니다 new image: 그림 추가 diff --git a/config/locales/ksh.yml b/config/locales/ksh.yml index 36001b909..f289a229d 100644 --- a/config/locales/ksh.yml +++ b/config/locales/ksh.yml @@ -1,7 +1,6 @@ # Messages for Colognian (Ripoarisch) # Exported from translatewiki.net # Export driver: phpyaml -# Author: Abijeet Patro # Author: Purodha --- ksh: diff --git a/config/locales/ku-Latn.yml b/config/locales/ku-Latn.yml index 3046776c9..e9e7a8084 100644 --- a/config/locales/ku-Latn.yml +++ b/config/locales/ku-Latn.yml @@ -2,7 +2,6 @@ # Exported from translatewiki.net # Export driver: phpyaml # Author: 1233qwer1234qwer4 -# Author: Abijeet Patro # Author: Balyozxane # Author: Bikarhêner # Author: George Animal @@ -126,20 +125,25 @@ ku-Latn: body: Nivîs recipient: Wergir redaction: + title: Sernav description: Danasîn report: category: Ji bo rapora xwe sedemekî bibijêre details: Ji kerema xwe di derbarê pirsgirêkê de zêdetir zanyarî bide (hewce ye). user: + auth_provider: Pêşkêşkera teyîdkirina nasnameyê + auth_uid: UIDa teyîdkirina nasnameyê email: E-name - new_email: 'Navnîşana e-nameyê yê nû:' + email_confirmation: Piştrastkirina e-nameyê + new_email: Navnîşana e-nameyê yê nû active: Çalak display_name: Nav nîşan bide - description: Danasîn - home_lat: 'Hêlîpan:' - home_lon: 'Hêlîlar:' - languages: Ziman + description: Danasîna Profîlê + home_lat: Hêlîpan + home_lon: Hêlîlar + languages: Zimanên tercîhkirî + preferred_editor: Edîtora tercîhkirî pass_crypt: Şîfre pass_crypt_confirmation: Şîfreyê Bipejirîne help: @@ -153,6 +157,10 @@ ku-Latn: fam bikin bi kar bîne. needs_view: Gelo hewce dike bikarhêner berî ku ev astengî rabe têkeve? user: + email_confirmation: Adrêsa te ji her kesê re nayê nîşandan, ji bo zêdetir + agahiyan binêre siyaseta + me ya veşarîtiyê. new_email: (ti carî nayê nîşandan) datetime: distance_in_words_ago: @@ -472,7 +480,7 @@ ku-Latn: zero: Bêşîrove one: '%{count} şîrove' other: '%{count} şîrove' - edit_link: Vê nivîsê biguhêre + edit_link: Vê nivîsê biguherîne hide_link: Vê nivîsê biveşêre unhide_link: Veşartina vê nivîsê rake confirm: Tesdîq bike @@ -486,7 +494,7 @@ ku-Latn: location: location: 'Cih:' view: Bibîne - edit: Biguhêre + edit: Biguherîne feed: user: title: Nivîsên rojane yên %{user} a OpenStreetMapê @@ -1295,10 +1303,10 @@ ku-Latn: issues: index: title: Pirsgirêk - select_status: Rewşê Hilbijêre - select_type: Tîp Hilbijêre - select_last_updated_by: Rojanekirina Dawî Hilbijêre - reported_user: Bikarhênerê/a Hatiye Raporkirî + select_status: Rewşê Bibijêre + select_type: Tîp Bibijêre + select_last_updated_by: Rojanekirina Dawî Bibijêre + reported_user: Bikarhênerê/a Raporkirî not_updated: Rojanekirin Nebû search: Lê bigere search_guidance: Pirsgirêkên Lêgerînê @@ -1313,7 +1321,7 @@ ku-Latn: reports_count: one: 1 Rapor other: '%{count} Raporan' - reported_item: Gotarê Hatiye Raporkirî + reported_item: Hêmanê Raporkirî states: ignored: Guh nedê open: Veke @@ -1328,7 +1336,7 @@ ku-Latn: zero: Rapor tune ye one: 1 rapor other: '%{count} raporan' - report_created_at: Berê di %{datetime} de hat raporkirin + report_created_at: Pêşî di %{datetime} de hatiye raporkirin last_resolved_at: Herî dawî di %{datetime} de hat çareserkirin last_updated_at: Ji aliyê %{displayname} ve herî dawî di %{datetime} de hat rojanekirin @@ -1365,7 +1373,7 @@ ku-Latn: title_html: Rapor %{link} missing_params: Raporeke nû nehat çêkirin disclaimer: - intro: 'Berî şandina rapora xwe ji moderatorên malperê, ji keram xwe vê piştrast + intro: 'Berî şandina rapora xwe ji moderatorên malperê, ji kerama xwe vê piştrast bike:' not_just_mistake: Em dizanin ku ev pirsgirêk ne tenê çewtî ye unable_to_fix: Pirsgirêkê tu bi xwe an jî bi alîkariya endamên civata xwe @@ -1395,7 +1403,7 @@ ku-Latn: other_label: Yên din create: successful_report: Rapora we bi serkeftî hat tomarkirin - provide_details: Ji kerema xwe zanyariyên pêwist bi dest bixin + provide_details: Ji kerema xwe zanyariyên pêwîst bi dest bixin layouts: logo: alt_text: Logoya OpenStreetMapê @@ -1454,8 +1462,8 @@ ku-Latn: şirove kir:' header_html: '%{from_user} nivîsa rojane yê OpenStreetMapê a bi mijara %{subject} şirove kir:' - footer: Herwiha ji ser rûpela %{readurl} jî dikarî şiroveyê bixwînî û ji ser - %{commenturl} dikarî şirove bikî an jî ji ser %{replyurl} peyamekî bişîne + footer: Herwiha ji ser rûpela %{readurl} jî dikarî şîroveyê bixwînî û ji ser + %{commenturl} dikarî şîrove bikî an jî ji ser %{replyurl} peyamekî bişîne nivîserê. footer_html: Herwiha ji ser rûpela %{readurl} jî dikarî şiroveyê bixwînî û ji ser %{commenturl} dikarî şirove bikî an jî ji ser %{replyurl} peyamekî bişîne @@ -1470,7 +1478,7 @@ ku-Latn: footer: Tu dikarî peyamê li ser %{readurl} jî bixwînî û li ser %{replyurl} jî dikarî bersiv bidî ê go ji te re şand. footer_html: Tu dikarî peyamê li ser %{readurl} jî bixwînî û li ser %{replyurl} - jî dikarî bersiv bidî ê go ji te re şand. + jî dikarî bersiv bidî ê ku ji te re şand. friendship_notification: hi: Merheba %{to_user}, subject: '[OpenStreetMap] %{user} te wek heval lê zêde kir' @@ -1632,7 +1640,7 @@ ku-Latn: no_such_message: title: Mesajek wek vê tine ye heading: Mesajek wek vê tine ye - body: Li me bibore, bi vê id'yê ti peyam tine ye. + body: Li me bibore, bi vê id-yê ti peyam tine ye. outbox: title: Qutiya min a çûyiyan my_inbox_html: '%{inbox_link}' @@ -1733,7 +1741,7 @@ ku-Latn: title: Derbarê vê wergerê de html: Eger di navbera vê rûpela tercumekirî û %{english_original_link} de îxtilafek hebe wê rûpela bi zimanê îngilîzî li ber çavan were girtin - english_link: eslê we ya bi îngilîzî + english_link: eslê wê ya bi îngilîzî native: title: Der barê vê rûpelê html: Hûn vêga dinêrin versiyona bi zimanê îngilîzî ya rûpela mafê daneriyê. @@ -2558,13 +2566,13 @@ ku-Latn: account: title: Hesabê biguherîne my settings: Hevyazên min - current email address: 'Navnîşana e-nameyê yê niha:' - external auth: Teyîdkirina xaricîː + current email address: Navnîşana e-nameyê yê niha + external auth: Teyîdkirina xaricî openid: link: https://wiki.openstreetmap.org/wiki/OpenID link text: Ev çi ye? public editing: - heading: Guherandina ji her kesê re vekirîː + heading: Guherandina ji her kesê re vekirî enabled: Çalak e. Ne anonîm e û dikare daneyan biguherîne. enabled link: https://wiki.openstreetmap.org/wiki/Anonymous_edits enabled link text: Ev çiye? @@ -2583,7 +2591,7 @@ ku-Latn: re vekirî nê kirin
  • Hûn nikarin ji vê kiryarê bizivirin û bikarhênerên nû bi otomatîkî ji her kesê re vekirî têne xuyan.
    • contributor terms: - heading: Şertên beşdariyêː + heading: Şertên beşdariyê agreed: Te Şertên Beşdariyê ya nû qebûl kir not yet agreed: Te hêj Şertên Beşdariyê ya nû qebûl nekiriye. review link text: Gava ku tu misaîd bî, ji bo ku Şertên Beşdariyê ya nû kontrol @@ -2592,10 +2600,11 @@ ku-Latn: Giştî were qebûlkirin. link: https://www.osmfoundation.org/wiki/License/Contributor_Terms link text: Ev çi ye? - image: 'Wêne:' + image: Wêne gravatar: gravatar: Gravatarê bi kar bîne link: https://wiki.openstreetmap.org/wiki/Gravatar + what_is_gravatar: Gravatar çi ye? disabled: Gravatar hate neçalakkirin. enabled: Gravatarê te niha dikare were xuyan. new image: Wêneyek lê zêde bike @@ -2604,7 +2613,7 @@ ku-Latn: replace image: Rismê ku lê ye biguherîne image size hint: (wêneyên ku herî kêm ji 100x100 kareyan pêk werin, çêtir têne xuyan) - home location: Cihê malê teː + home location: Cihê malê te no home location: Te cihê malê xwe diyar nekir. update home location on click: Gava ku tu bitikînî ser nexşeyê bila cihê malê te were rojanekirin? @@ -2832,6 +2841,7 @@ ku-Latn: custom_dimensions: Mezinahiyên taybet eyar bike format: 'Format:' scale: 'Pîvan (miqyas):' + image_dimensions: Wêne wê tebeqeya standard li %{width} x %{height} nîşan bide download: Daxîne short_url: URLya kurt include_marker: Nîşanek deyne diff --git a/config/locales/lb.yml b/config/locales/lb.yml index e51825143..42e91f5f1 100644 --- a/config/locales/lb.yml +++ b/config/locales/lb.yml @@ -1,7 +1,6 @@ # Messages for Luxembourgish (Lëtzebuergesch) # Exported from translatewiki.net # Export driver: phpyaml -# Author: Abijeet Patro # Author: Davio # Author: Les Meloures # Author: Robby diff --git a/config/locales/lt.yml b/config/locales/lt.yml index 2ecb34d52..7c32f342a 100644 --- a/config/locales/lt.yml +++ b/config/locales/lt.yml @@ -1,7 +1,6 @@ # Messages for Lithuanian (lietuvių) # Exported from translatewiki.net # Export driver: phpyaml -# Author: Abijeet Patro # Author: Aurimas # Author: Cyklopas # Author: Eitvys200 diff --git a/config/locales/lv.yml b/config/locales/lv.yml index 7285a58c0..47d96cd43 100644 --- a/config/locales/lv.yml +++ b/config/locales/lv.yml @@ -1,7 +1,6 @@ # Messages for Latvian (latvieÅ¡u) # Exported from translatewiki.net # Export driver: phpyaml -# Author: Abijeet Patro # Author: Admresdeserv. # Author: Baisulis # Author: Bbot22 diff --git a/config/locales/mk.yml b/config/locales/mk.yml index 20f00f604..32d16d39c 100644 --- a/config/locales/mk.yml +++ b/config/locales/mk.yml @@ -1,7 +1,6 @@ # Messages for Macedonian (македонски) # Exported from translatewiki.net # Export driver: phpyaml -# Author: Abijeet Patro # Author: Bjankuloski06 # Author: Macofe # Author: Nemo bis diff --git a/config/locales/mo.yml b/config/locales/mo.yml index 84e977109..dcd52f52e 100644 --- a/config/locales/mo.yml +++ b/config/locales/mo.yml @@ -1,7 +1,6 @@ # Messages for Moldovan (молдовеняскэ) # Exported from translatewiki.net # Export driver: phpyaml -# Author: Abijeet Patro # Author: Cybernenea11 # Author: TheChampionMan1234 --- diff --git a/config/locales/mr.yml b/config/locales/mr.yml index e4985a2da..0adc158d0 100644 --- a/config/locales/mr.yml +++ b/config/locales/mr.yml @@ -1,7 +1,6 @@ # Messages for Marathi (मराठी) # Exported from translatewiki.net # Export driver: phpyaml -# Author: Abijeet Patro # Author: Singleton # Author: Sureshkhole # Author: Susheelkasab diff --git a/config/locales/ms.yml b/config/locales/ms.yml index 71aa02ae5..10fe1d757 100644 --- a/config/locales/ms.yml +++ b/config/locales/ms.yml @@ -1,7 +1,6 @@ # Messages for Malay (Bahasa Melayu) # Exported from translatewiki.net # Export driver: phpyaml -# Author: Abijeet Patro # Author: Anakmalaysia # Author: Izing # Author: Jeluang Terluang diff --git a/config/locales/my.yml b/config/locales/my.yml index 926418fc9..42fcb560f 100644 --- a/config/locales/my.yml +++ b/config/locales/my.yml @@ -1,7 +1,6 @@ # Messages for Burmese (မြန်မာဘာသာ) # Exported from translatewiki.net # Export driver: phpyaml -# Author: Abijeet Patro # Author: Dr Lotus Black # Author: Ninjastrikers # Author: သူထွန်း diff --git a/config/locales/nb.yml b/config/locales/nb.yml index 294abda6f..26d4c3b18 100644 --- a/config/locales/nb.yml +++ b/config/locales/nb.yml @@ -2,7 +2,6 @@ # Exported from translatewiki.net # Export driver: phpyaml # Author: Abbe98 -# Author: Abijeet Patro # Author: Citadell # Author: Danmichaelo # Author: Dittaeva @@ -46,7 +45,7 @@ nb: create: Send client_application: create: Registrer - update: Rediger + update: Oppdater redaction: create: Lag maskering update: Lagre markering @@ -139,27 +138,40 @@ nb: body: Brødtekst recipient: Mottaker redaction: + title: Tittel description: Beskrivelse report: category: Begrunn rapporten din details: Fremskaff flere detaljer om problemet (pÃ¥krevet) user: + auth_provider: Leverandør av autentisering + auth_uid: Autentisering UID email: E-post - new_email: 'Ny e-postadresse:' + email_confirmation: E-post-bekreftelse + new_email: Ny e-postadresse active: Aktiv display_name: Visningsnavn - description: Beskrivelse - home_lat: 'Breddegrad:' - home_lon: 'Lengdegrad:' - languages: SprÃ¥k + description: Profilbeskrivelse + home_lat: Breddegrad + home_lon: Lengdegrad + languages: Foretrukne sprÃ¥k + preferred_editor: Foretrukket redigeringsverktøy pass_crypt: Passord pass_crypt_confirmation: Bekreft passord help: trace: tagstring: kommaseparert user_block: + reason: Grunnen til at brukeren er blitt blokkert. Vennligst vær sÃ¥ rolig + og fornuftig som mulig, og gi sÃ¥ mye informasjon som du kan om situasjonen, + mens du husker pÃ¥ at meldingen vil være offentlig synlig. Husk pÃ¥ at ikke + alle brukere skjønner seg pÃ¥ kartuttrykk, sÃ¥ vennligst bruk hverdagslige + uttrykk. needs_view: MÃ¥ brukeren logge inn før denne blokkeringen blir fjernet? user: + email_confirmation: Adressen din vises ikke offentlig, se vÃ¥re personvernsregler + for mer informasjon. new_email: ' (vises aldri offentlig)' datetime: distance_in_words_ago: @@ -299,6 +311,9 @@ nb: title_html: 'Forbindelse: %{name}' history_title_html: 'Forbindelseshistorikk: %{name}' members: Medlemmer + members_count: + one: ett medlem + other: '%{count} medlemmer' relation_member: entry_role_html: '%{type} %{name} som %{role}' type: @@ -309,6 +324,7 @@ nb: entry_html: Relasjon %{relation_name} entry_role_html: Relasjon %{relation_name} (som %{relation_role}) not_found: + title: Ikke funnet sorry: Beklager, klarte ikke finne %{type}-en med ID %{id}. type: node: node @@ -317,6 +333,7 @@ nb: changeset: endringssett note: merknad timeout: + title: Feil pga. tidsavbrudd sorry: Beklager, det tok for lang tid Ã¥ hente data for %{type} med ID %{id}. type: node: node @@ -416,8 +433,8 @@ nb: new: title: Ny dagboksoppføring form: - location: 'Posisjon:' - use_map_link: bruk kart + location: Posisjon + use_map_link: Bruk kart index: title: Brukeres dagbøker title_friends: Dine venners dagbøker @@ -446,7 +463,8 @@ nb: body: Beklager, det er ingen dagbokinnlegg eller kommentar med ID %{id}. Sjekk om du har skrevet riktig eller om lenka du klikket er feil. diary_entry: - posted_by_html: Skrevet av %{link_user} den %{created} pÃ¥ %{language_link} + posted_by_html: Skrevet av %{link_user} den %{created} pÃ¥ %{language_link}. + updated_at_html: Sist oppdatert den %{updated}. comment_link: Kommenter dette innlegget reply_link: Send en beskjed til forfatteren comment_count: @@ -516,6 +534,7 @@ nb: chair_lift: Stolheis drag_lift: Skitrekk gondola: Gondolheis + magic_carpet: Magisk-teppe-heis platter: Tallerken-heis pylon: Pylon station: Fjellheisstasjon @@ -530,8 +549,10 @@ nb: holding_position: Venteposisjon parking_position: Parkeringsposisjon runway: Rullebane + taxilane: Taxifelt taxiway: Taxibane terminal: Terminal + windsock: Vindpose amenity: animal_shelter: Dyrehospits arts_centre: Kunstsenter @@ -542,7 +563,9 @@ nb: bench: Benk bicycle_parking: Sykkelparkering bicycle_rental: Sykkelutleie + bicycle_repair_station: Sykkelreparasjonsstasjon biergarten: Ølhage + blood_bank: Blodbank boat_rental: BÃ¥tutleie brothel: Bordell bureau_de_change: Vekslingskontor @@ -559,6 +582,7 @@ nb: clock: Klokke college: Høyskole community_centre: Samfunnshus + conference_centre: Konferansesenter courthouse: Rettsbygning crematorium: Krematorium dentist: Tannlege @@ -578,16 +602,20 @@ nb: hospital: Sykehus hunting_stand: Jaktbod ice_cream: Iskrem + internet_cafe: Internettcafe kindergarten: Barnehage + language_school: SprÃ¥kskole library: Bibliotek marketplace: Markedsplass monastery: Kloster motorcycle_parking: Motorsykkelparkering + music_school: Musikkskole nightclub: Nattklubb nursing_home: Pleiehjem parking: Parkeringsplass parking_entrance: Innkjøring til parkeringsgarasje parking_space: Parkeringsplass + payment_terminal: Betalingsterminal pharmacy: Apotek place_of_worship: Tilbedelsesplass police: Politi @@ -595,6 +623,8 @@ nb: post_office: Postkontor prison: Fengsel pub: Pub + public_bath: Offentlig bad + public_bookcase: Offentlig bokkasse public_building: Offentlig bygning recycling: Resirkuleringspunkt restaurant: Restaurant @@ -616,12 +646,14 @@ nb: village_hall: Forsamlingshus waste_basket: Søppelkasse waste_disposal: AvfallshÃ¥ndtering + waste_dump_site: Avfallsdeponi water_point: Vannpunkt boundary: administrative: Administrativ grense census: Folketellingsgrense national_park: Nasjonalpark protected_area: Verna omrÃ¥de + "yes": Avgrensning bridge: aqueduct: Akvadukt boardwalk: Strandpromenade @@ -630,41 +662,71 @@ nb: viaduct: Viadukt "yes": Bru building: - apartments: Leilighetsblokk + apartments: Leiligheter + barn: LÃ¥ve + bungalow: Bungalow + cabin: Hytte chapel: Kapell - church: Kirke + church: Kirkebygning commercial: Kommersiell bygning + construction: Bygning under konstruksjon dormitory: Sovesal - farm: GÃ¥rdsbygg + farm: GÃ¥rdshus + farm_auxiliary: Ytterlig gÃ¥rdsbygning garage: Garasje + garages: Garasjer + greenhouse: Drivhus + hangar: Hangar hospital: Sykehusbygg - hotel: Hotell + hotel: Hotellbygning house: Hus + houseboat: HusbÃ¥t industrial: Industribygg + kindergarten: Barnehagebygning office: Kontorbygg public: Offentlig bygg residential: Boligbygg retail: Detaljsalgbygg + roof: Tak + ruins: Bygningsruin school: Skolebygg - terrace: Terrasse - train_station: Jernbanestasjon + shed: Skur + stable: Stall + static_caravan: Husvogn + temple: Tempelbygning + terrace: Terrassebygning + train_station: Jernbanestasjonsbygning university: Universitetsbygg + warehouse: Lagerhall "yes": Bygning + club: + scout: Speiderklubbhus + sport: Sportsklubb + "yes": Klubb craft: + beekeper: Birøkter + blacksmith: Smed brewery: Bryggeri carpenter: Tømrer + caterer: Catering electrician: Elektriker + electronics_repair: Elektronikkreparatør gardener: Gartner painter: Maler photographer: Fotograf plumber: Rørlegger + roofer: Taklegger + sawmill: Sagbruk shoemaker: Skomaker tailor: Skredder + window_construction: Vindussnekker + winery: VingÃ¥rd "yes": Handtverksbutikk emergency: ambulance_station: Ambulansestasjon assembly_point: Samlingsplass defibrillator: Hjertestarter + fire_xtinguisher: Brannslukker landing_site: Nødlandingsplass phone: Nødtelefon water_tank: Nødvanntank @@ -709,6 +771,7 @@ nb: tertiary: Tertiær vei tertiary_link: Tertiær vei track: Traktorvei + traffic_mirror: Trafikkspeil traffic_signals: Trafikklys trunk: Hovedvei trunk_link: Hovedvei @@ -721,6 +784,7 @@ nb: boundary_stone: Grensestein building: Historisk bygning bunker: Bunker + cannon: Historisk kanon castle: Slott church: Kirke city_gate: Byport @@ -778,6 +842,7 @@ nb: leisure: beach_resort: Strandsted bird_hide: FugletÃ¥rn + bowling_alley: Bowlinghall common: Allmenning dog_park: Hundepark firepit: BÃ¥lgrop @@ -806,13 +871,16 @@ nb: "yes": Fritid man_made: adit: Stoll + antenna: Antenne beacon: Fyr beehive: Bikube breakwater: Molo bridge: Bro bunker_silo: Bunker + cairn: Varde chimney: Skorstein crane: Kran + cross: Kors dolphin: Fortøyningspæl dyke: Grøft embankment: Dike @@ -828,9 +896,13 @@ nb: petroleum_well: Oljebrønn pier: Molo pipeline: Rørgate + pumping_station: Pumpestasjon silo: Silo + snow_cannon: Snøkanon storage_tank: Lagringstank + street_cabinet: Gatekabinett surveillance: OvervÃ¥kning + telescope: Teleskop tower: TÃ¥rn wastewater_plant: Kloakkanlegg watermill: Vannmølle @@ -972,7 +1044,9 @@ nb: carpet: Teppebutikk charity: Veldedighetsbutikk chemist: Kjemiker + chocolate: Sjokolade clothes: Klesbutikk + coffee: Kaffebutikk computer: Databutikk confectionery: Konditori convenience: Nærbutikk @@ -2243,13 +2317,13 @@ nb: account: title: Rediger konto my settings: Mine innstillinger - current email address: 'NÃ¥værende e-postadresse:' - external auth: 'Ekstern bekreftelse:' + current email address: NÃ¥værende e-postadresse + external auth: Ekstern autentisering openid: link: https://wiki.openstreetmap.org/wiki/OpenID link text: hva er dette? public editing: - heading: 'Offentlig redigering:' + heading: Offentlig redigering enabled: Aktivert. Ikke anonym og kan redigere data. enabled link: https://wiki.openstreetmap.org/wiki/Anonymous_edits enabled link text: hva er dette? @@ -2266,7 +2340,7 @@ nb: ). contributor terms: - heading: 'BidragsytervilkÃ¥r:' + heading: BidragsytervilkÃ¥r agreed: Du har godkjent de nye BidragsytervilkÃ¥rene. not yet agreed: Du har ennÃ¥ ikke godkjent de nye bidragsytervilkÃ¥rene. review link text: Vennligst følg denne lenken nÃ¥r det passer deg, for Ã¥ se @@ -2275,10 +2349,11 @@ nb: offentlig eiendom (Public Domain). link: https://www.osmfoundation.org/wiki/License/Contributor_Terms link text: hva er dette? - image: 'Bilde:' + image: Bilde gravatar: gravatar: Bruk Gravatar link: https://wiki.openstreetmap.org/wiki/Gravatar + what_is_gravatar: Hva er Gravatar? disabled: Gravatar har blitt slÃ¥tt av. enabled: Visning av din Gravatar er slÃ¥tt pÃ¥. new image: Legg til et bilde @@ -2286,7 +2361,7 @@ nb: delete image: Fjern gjeldende bilde replace image: Erstatt gjeldende bilde image size hint: (kvadratiske bilder som er minst 100x100 fungerer best) - home location: 'Hjemmeposisjon:' + home location: Hjemmeposisjon no home location: Du har ikke angitt din hjemmeposisjon. update home location on click: Oppdater hjemmeposisjon nÃ¥r jeg klikker pÃ¥ kartet? save changes button: Lagre endringer diff --git a/config/locales/nds.yml b/config/locales/nds.yml index 09f1cab6b..e9e374b75 100644 --- a/config/locales/nds.yml +++ b/config/locales/nds.yml @@ -1,7 +1,6 @@ # Messages for Low German (Plattdüütsch) # Exported from translatewiki.net # Export driver: phpyaml -# Author: Abijeet Patro # Author: Slomox --- nds: diff --git a/config/locales/ne.yml b/config/locales/ne.yml index 94074c71c..a451c24c7 100644 --- a/config/locales/ne.yml +++ b/config/locales/ne.yml @@ -1,7 +1,6 @@ # Messages for Nepali (नेपाली) # Exported from translatewiki.net # Export driver: phpyaml -# Author: Abijeet Patro # Author: Drjpoudel # Author: Haribanshi # Author: Krish Dulal diff --git a/config/locales/nl.yml b/config/locales/nl.yml index b1a5d2af0..093bfc268 100644 --- a/config/locales/nl.yml +++ b/config/locales/nl.yml @@ -2,7 +2,6 @@ # Exported from translatewiki.net # Export driver: phpyaml # Author: A67-A67 -# Author: Abijeet Patro # Author: Alphensebezorger # Author: Aranka # Author: Arent diff --git a/config/locales/nn.yml b/config/locales/nn.yml index f77d87b66..30ca2b9d1 100644 --- a/config/locales/nn.yml +++ b/config/locales/nn.yml @@ -2,7 +2,6 @@ # Exported from translatewiki.net # Export driver: phpyaml # Author: Abaksle -# Author: Abijeet Patro # Author: Bjorni # Author: Dittaeva # Author: Eirik diff --git a/config/locales/oc.yml b/config/locales/oc.yml index 441c37551..d868865ca 100644 --- a/config/locales/oc.yml +++ b/config/locales/oc.yml @@ -1,7 +1,6 @@ # Messages for Occitan (occitan) # Exported from translatewiki.net # Export driver: phpyaml -# Author: Abijeet Patro # Author: COMISSIONTOPOC # Author: Cedric31 # Author: Gasconoc diff --git a/config/locales/pa.yml b/config/locales/pa.yml index 75d51cd70..69301b4ef 100644 --- a/config/locales/pa.yml +++ b/config/locales/pa.yml @@ -2,7 +2,6 @@ # Exported from translatewiki.net # Export driver: phpyaml # Author: Aalam -# Author: Abijeet Patro # Author: Babanwalia # Author: Jimidar # Author: Satnam S Virdi diff --git a/config/locales/pl.yml b/config/locales/pl.yml index 2a1cd04e0..643676e64 100644 --- a/config/locales/pl.yml +++ b/config/locales/pl.yml @@ -2,7 +2,6 @@ # Exported from translatewiki.net # Export driver: phpyaml # Author: "Behemot" -# Author: Abijeet Patro # Author: Ajank # Author: Alan ffm # Author: Alefar @@ -45,6 +44,7 @@ # Author: RicoElectrico # Author: Rmikke # Author: Ruila +# Author: SemanticPioneer # Author: Soeb # Author: Sp5uhe # Author: Stojex @@ -306,7 +306,7 @@ pl: title: Uwagi OpenStreetMap description_area: Lista uwag stworzonych, skomentowanych lub zamkniętych w twojej okolicy [(%{min_lat}|%{min_lon}) -- (%{max_lat}|%{max_lon})] - description_item: Kanał RSS dla uwagi %{id} + description_item: Kanał RSS uwagi %{id} opened: 'nowa uwaga (w lokalizacji: %{place})' commented: nowy komentarz (w pobliżu %{place}) closed: 'zamknięta uwaga (w lokalizacji: %{place})' @@ -410,14 +410,14 @@ pl: note: uwaga timeout: title: Przekroczono limit czasu - sorry: Niestety, pobranie danych dla %{type} o identyfikatorze %{id} trwało - zbyt długo. + sorry: Niestety, pobranie danych %{type} o identyfikatorze %{id} trwało zbyt + długo. type: - node: węzeł - way: linia - relation: relacja - changeset: zestaw zmian - note: Uwaga + node: węzła + way: linii + relation: relacji + changeset: zestawu zmian + note: uwagi redacted: redaction: Poprawka %{id} message_html: '%{type} w wersji %{version} nie może zostać wyświetlony z powodu @@ -435,8 +435,8 @@ pl: tag_details: tags: Znaczniki wiki_link: - key: Strona wiki dla znacznika %{key} - tag: Strona wiki dla znacznika %{key}=%{value} + key: Strona wiki znacznika %{key} + tag: Strona wiki znacznika %{key}=%{value} wikidata_link: '%{page} element na Wikidata' wikipedia_link: Artykuł %{page} w Wikipedii wikimedia_commons_link: Plik %{page} na Wikimedia Commons @@ -566,8 +566,8 @@ pl: coordinates: '%{latitude}; %{longitude}' feed: user: - title: Wpisy dla %{user} - description: Ostatnie wpisy od %{user} + title: Wpisy użytkownika %{user} + description: Ostatnie wpisy dziennika użytkownika %{user} language: title: Wpisy dziennika w języku %{language_name} description: Ostatnie wpisy użytkowników OpenStreetMap w języku %{language_name} @@ -943,7 +943,7 @@ pl: conservation: Rezerwat construction: Teren budowy farm: Farma - farmland: Grunty rolne + farmland: Grunty orne farmyard: Podwórze gospodarskie forest: Las garages: Garaże @@ -959,7 +959,7 @@ pl: quarry: Kamieniołom railway: Teren kolejowy recreation_ground: Teren rekreacyjny - religious: Teren dla celów religijnych + religious: Teren do celów religijnych reservoir: Sztuczny zbiornik wodny reservoir_watershed: Zbiornik wodny residential: Zabudowa mieszkalna @@ -1594,7 +1594,7 @@ pl: subject: '[OpenStreetMap] Prośba zmiany hasła' greeting: Cześć, hopefully_you: Ktoś (prawdopodobnie ty) poprosił o zresetowanie hasła do konta - w serwisie openstreetmap.org dla tego adresu e-mail. + w serwisie openstreetmap.org przypisanego do tego adresu e-mail. click_the_link: Jeśli to ty, kliknij poniższy odnośnik, aby wyczyścić hasło. note_comment_notification: anonymous: Anonimowy użytkownik @@ -1765,8 +1765,8 @@ pl: about: next: Dalej copyright_html: ©Autorzy
    OpenStreetMap - used_by_html: '%{name} dostarcza dane mapowe dla tysięcy stron internetowych, - aplikacji oraz urządzeń' + used_by_html: '%{name} dostarcza dane mapowe tysiącom stron internetowych, aplikacji + oraz urządzeń' lede_text: OpenStreetMap jest tworzony przez społeczność dodającą dane o drogach, ścieżkach, kawiarniach, dworcach i wielu innych, na całym świecie. local_knowledge_title: Wiedza lokalna @@ -1775,7 +1775,7 @@ pl: czy dane w OSM są dokładne i aktualne. community_driven_title: Zarządzany przez społeczność community_driven_html: |- - Społeczność OpenStreetMap jest różnorodna, zaangażowana i każdego dnia coraz większa. Wśród edytujących mapę są amatorscy kartografowie, specjaliści GIS, inżynierowie odpowiadający za pracę serwerów OSM, osoby tworzące mapy obszarów dotkniętych skutkami klęski żywiołowej dla potrzeb służb ratunkowych oraz wielu innych ludzi. + Społeczność OpenStreetMap jest różnorodna, zaangażowana i każdego dnia coraz większa. Wśród edytujących mapę są amatorscy kartografowie, specjaliści GIS, inżynierowie odpowiadający za pracę serwerów OSM, osoby tworzące mapy obszarów dotkniętych skutkami klęski żywiołowej potrzebne służbom ratunkowym oraz wielu innych ludzi. Aby dowiedzieć się więcej na temat wspólnoty, odwiedź Blog OpenStreetMap, blogi użytkowników, @@ -1937,7 +1937,7 @@ pl: anon_edits_link_text: Tu dowiesz się dlaczego. id_not_configured: iD nie został skonfigurowany no_iframe_support: Używana przeglądarka nie obsługuje HTML iframes, które są - niezbędne dla tej funkcji. + niezbędne do tej funkcji. export: title: Eksportuj area_to_export: Obszar do wyeksportowania @@ -1968,7 +1968,7 @@ pl: miast metro: title: Metro Extracts - description: Wyciągi dla dużych miast i otaczających je obszarów + description: Wyciągi dużych miast i otaczających je obszarów other: title: Inne zasoby description: Dodatkowe zasoby wymienione w OpenStreetMap wiki @@ -2179,7 +2179,7 @@ pl: way_html: Linia to droga lub obszar, np. ulica, rzeka, jezioro lub budynek. tag_html: Znacznik to część danych opisująca linię lub węzeł, - np. nazwa restauracji lub ograniczenie prędkości dla drogi. + np. nazwa restauracji lub ograniczenie prędkości na drodze. rules: title: Zasady! paragraph_1_html: W OpenStreetMap jest kilka formalnych zasad, ale oczekujemy, @@ -2363,7 +2363,7 @@ pl: edit: title: Edycja aplikacji show: - title: Szczegóły OAuth dla %{app_name} + title: Szczegóły OAuth do %{app_name} key: 'Klucz odbiorcy:' secret: 'Sekret odbiorcy:' url: 'URL znacznika zapytania:' @@ -2382,8 +2382,8 @@ pl: issued_at: Czas wydania revoke: Odwołaj! my_apps: Programy klienckie - no_apps_html: Poniżej zarejestrować można programy korzystające ze standardu - %{oauth}. Programy muszą być wcześniej zarejestrowane, nim będzie można skorzystać + no_apps_html: Poniżej można zarejestrować programy korzystające ze standardu + %{oauth}. Programy należy wcześniej zarejestrować, nim będzie można skorzystać z zapytań OAuth do tej usługi. oauth: OAuth registered_apps: 'Zarejestrowano następujące aplikacje klienckie:' @@ -2898,13 +2898,13 @@ pl: key: title: Legenda tooltip: Legenda - tooltip_disabled: Legenda nie jest dostępna dla tej warstwy + tooltip_disabled: Legenda nie jest dostępna do tej warstwy map: zoom: in: Przybliż out: Oddal locate: - title: Wyświetl dla mojego aktualnego położenia + title: Wyświetl moje aktualne położenie metersPopup: one: Jesteś w promieniu 1 metra od tego punktu few: Jesteś w promieniu %{count} metrów od tego punktu @@ -2967,7 +2967,7 @@ pl: add: Dodaj uwagę show: anonymous_warning: Uwaga zawiera informacje od anonimowych użytkowników, które - powinny być dodatkowo zweryfikowane przed wprowadzeniem zmian na mapie. + należy zweryfikować przed wprowadzeniem zmian na mapie. hide: Ukryj resolve: Oznacz jako rozwiązaną reactivate: Ponownie aktywuj @@ -3089,7 +3089,7 @@ pl: heading: Lista poprawek title: Lista poprawek new: - heading: Wprowadź informację dla nowej poprawki + heading: Wprowadź informacje o nowej poprawce title: Tworzenie nowej poprawki show: description: 'Opis:' diff --git a/config/locales/ps.yml b/config/locales/ps.yml index 8f102c137..89486c790 100644 --- a/config/locales/ps.yml +++ b/config/locales/ps.yml @@ -1,7 +1,6 @@ # Messages for Pashto (پښتو) # Exported from translatewiki.net # Export driver: phpyaml -# Author: Abijeet Patro # Author: Ahmed-Najib-Biabani-Ibrahimkhel # Author: Amjad Khan --- diff --git a/config/locales/pt-BR.yml b/config/locales/pt-BR.yml index dc1c92a9e..6baa2b898 100644 --- a/config/locales/pt-BR.yml +++ b/config/locales/pt-BR.yml @@ -1,7 +1,6 @@ # Messages for Brazilian Portuguese (português do Brasil) # Exported from translatewiki.net # Export driver: phpyaml -# Author: Abijeet Patro # Author: Adrianojbr # Author: Alvarenga # Author: Amgauna @@ -14,6 +13,7 @@ # Author: Diego Queiroz # Author: EVinente # Author: Eduardo Addad de Oliveira +# Author: Eduardoaddad # Author: Eelucaslima # Author: Fmca # Author: Ftrebien @@ -1324,8 +1324,8 @@ pt-BR: level10: Limite de Bairro level11: Limite da vizinhança types: - cities: Cidades Maiores - towns: Cidades Menores + cities: Cidades maiores + towns: Cidades menores places: Lugares results: no_results: Nenhum resultado encontrado @@ -3065,7 +3065,7 @@ pt-BR: flash: Redação destruída. error: Houve um erro ao destruir esta anulação. validations: - leading_whitespace: tem espaço em branco líder + leading_whitespace: tem espaço em branco principal trailing_whitespace: tem espaço em branco à direita invalid_characters: contém caracteres inválidos url_characters: contém caracteres de URL especiais (%{characters}) diff --git a/config/locales/pt-PT.yml b/config/locales/pt-PT.yml index bb6d1c18f..8ae379758 100644 --- a/config/locales/pt-PT.yml +++ b/config/locales/pt-PT.yml @@ -1,11 +1,11 @@ # Messages for Portuguese (português) # Exported from translatewiki.net # Export driver: phpyaml -# Author: Abijeet Patro # Author: AntMadeira # Author: Athena in Wonderland # Author: Crazymadlover # Author: Eduardo Addad de Oliveira +# Author: Eduardoaddad # Author: FranciscoDS # Author: Giro720 # Author: Gmare @@ -152,28 +152,42 @@ pt-PT: body: Conteúdo recipient: Destinatário redaction: + title: Título description: Descrição report: category: Seleciona um motivo para a tua denúncia details: Por favor, fornece mais alguns detalhes sobre o problema (obrigatório). user: + auth_provider: Provedor de autenticação + auth_uid: UID de autenticação email: E-mail - new_email: 'Novo e-mail:' + email_confirmation: E-mail de confirmação + new_email: Novo e-mail active: Ativo display_name: Nome visualizado - description: Descrição - home_lat: 'Latitude:' - home_lon: 'Longitude:' - languages: Idiomas + description: Descrição do perfil + home_lat: Latitude + home_lon: Longitude + languages: Idiomas preferidos + preferred_editor: Editor preferido pass_crypt: Palavra-passe pass_crypt_confirmation: Confirmar palavra-passe help: trace: tagstring: separadas por vírgulas user_block: + reason: O motivo por que o utilizador está a ser bloqueado. Por favor, escreve + com o tom mais calmo e razoável possível, fornecendo o máximo de detalhes + sobre a situação e tendo em conta que a mensagem ficará visível publicamente. + Convém notar que nem todos os utilizadores entendem o jargão da comunidade, + por isso, tenta escrever de uma forma mais compreensível para leigos. needs_view: O utilizador precisa de iniciar sessão antes de o bloqueio ser revogado? user: + email_confirmation: O teu endereço não ficará visível publicamente. Consulta + a política + de privacidade para mais informações. new_email: (nunca é mostrado publicamente) datetime: distance_in_words_ago: @@ -332,6 +346,7 @@ pt-PT: entry_html: Relação %{relation_name} entry_role_html: Relação %{relation_name} (como %{relation_role}) not_found: + title: Não encontrado sorry: Lamentamos, não foi possível encontrar %{type} n.º %{id}. type: node: nó @@ -340,6 +355,7 @@ pt-PT: changeset: conjunto de alterações note: nota timeout: + title: Erro de tempo limite esgotado sorry: 'Lamentamos, demorou demasiado tempo a obter os dados do pedido: %{type} com o id %{id}.' type: @@ -509,7 +525,7 @@ pt-PT: description: Publicações recentes nos diários de utilizadores OpenStreetMap em %{language_name} all: - title: Publicações no diário de editores do OpenStreetMap + title: Publicações no diário de mapeadores do OpenStreetMap description: Publicações recentes no diário OpenStreetMap comments: has_commented_on: '%{display_name} comentou nas seguintes publicações de diários' @@ -1488,10 +1504,21 @@ pt-PT: see_their_profile: Podes ver o perfil dele em %{userurl}. see_their_profile_html: Podes ver o seu perfil a %{userurl}. befriend_them: Também podes adicioná-lo como amigo em %{befriendurl}. + befriend_them_html: Também os podes adicionar como amigos em %{befriendurl}. + gpx_description: + description_with_tags_html: 'Parece que o teu ficheiro GPX %{trace_name} com + a descrição %{trace_description} e as etiquetas: %{tags}' + description_with_no_tags_html: Parece que o teu ficheiro GPX %{trace_name} com + a descrição %{trace_description} e sem etiquetas gpx_failure: + hi: Olá, %{to_user}. failed_to_import: 'falhou na importação. Eis o erro:' + more_info_html: Podes encontrar mais informações sobre falhas de importação + GPX e como evitá-las em %{url}. + import_failures_url: https://wiki.openstreetmap.org/wiki/GPX_Import_Failures?uselang=pt subject: '[OpenStreetMap] Erro ao importar GPX' gpx_success: + hi: Olá, %{to_user}. loaded_successfully: one: carregado com %{trace_points} de entre um 1 ponto possível. other: carregado com %{trace_points} de entre %{possible_points} pontos possíveis. @@ -1528,23 +1555,34 @@ pt-PT: que estás a vigiar' your_note: '%{commenter} deixou um comentário numa das tuas notas perto de %{place}.' + your_note_html: '%{commenter} deixou um comentário numa das tuas notas perto + de %{place}.' commented_note: '%{commenter} deixou um comentário numa nota comentada por ti. A nota fica perto de %{place}.' + commented_note_html: '%{commenter} deixou um comentário numa nota comentada + por ti. A nota fica perto de %{place}.' closed: subject_own: '[OpenStreetMap] %{commenter} resolveu uma das tuas notas' subject_other: '[OpenStreetMap] %{commenter} resolveu uma nota que estás a vigiar' your_note: '%{commenter} resolveu uma das tuas notas perto de %{place}.' + your_note_html: '%{commenter} resolveu uma das tuas notas perto de %{place}.' commented_note: '%{commenter} resolveu uma nota comentada por ti. A nota fica perto de %{place}.' + commented_note_html: '%{commenter} resolveu uma nota comentada por ti. A nota + fica perto de %{place}.' reopened: subject_own: '[OpenStreetMap] %{commenter} reabriu uma das tuas notas.' subject_other: '[OpenStreetMap] %{commenter} reabriu uma nota que estás a vigiar' your_note: '%{commenter} reabriu uma das tuas notas perto de %{place}.' + your_note_html: '%{commenter} reabriu uma das tuas notas perto de %{place}.' commented_note: '%{commenter} reabriu uma nota comentada por ti. A nota fica perto de %{place}.' + commented_note_html: '%{commenter} reabriu uma nota comentada por ti. A nota + fica perto de %{place}.' details: Podes ver mais detalhes sobre a nota em %{url}. + details_html: Podes ver mais detalhes sobre a nota em %{url}. changeset_comment_notification: hi: Olá, %{to_user}. greeting: Olá, @@ -1555,14 +1593,23 @@ pt-PT: que estás a vigiar' your_changeset: '%{commenter} deixou um comentário a %{time} num dos teus conjuntos de alterações' + your_changeset_html: '%{commenter} deixou um comentário a %{time} num dos + teus conjuntos de alterações' commented_changeset: '%{commenter} deixou um comentário a %{time} num conjunto de alterações vigiado por ti, criado por %{changeset_author}' + commented_changeset_html: '%{commenter} deixou um comentário a %{time} num + conjunto de alterações vigiado por ti, criado por %{changeset_author}' partial_changeset_with_comment: com o comentário '%{changeset_comment}' + partial_changeset_with_comment_html: com o comentário '%{changeset_comment}' partial_changeset_without_comment: sem comentários details: Podes encontrar mais informações sobre o conjunto de alterações em %{url}. + details_html: Podes encontrar mais informações sobre o conjunto de alterações + em %{url}. unsubscribe: Para deixares de receber atualizações sobre este conjunto de alterações, visita %{url} e clica em "Anular subscrição". + unsubscribe_html: Para deixares de receber atualizações sobre este conjunto + de alterações, visita %{url} e clica em "Anular subscrição". messages: inbox: title: Caixa de Entrada @@ -1638,6 +1685,24 @@ pt-PT: as_unread: Mensagem marcada como não lida destroy: destroyed: Mensagem eliminada + shared: + markdown_help: + title_html: Formatado com kramdown + headings: Títulos + heading: Cabeçalho + subheading: Subtítulo + unordered: Lista não ordenada + ordered: Lista ordenada + first: Primeiro item + second: Segundo item + link: Hiperligação + text: Texto + image: Imagem + alt: Texto alternativo + url: URL + richtext_field: + edit: Editar + preview: Pré-visualizar site: about: next: Seguinte @@ -1934,6 +1999,15 @@ pt-PT: url: https://wiki.openstreetmap.org/wiki/Pt:Main_Page title: Wiki OpenStreetMap description: Explora a wiki de documentação sobre o OpenStreetMap. + potlatch: + removed: O teu editor padrão do OpenStreetMap está definido como sendo o Potlatch. + Como o Adobe Flash Player foi retirado, o Potlatch já não se encontra disponível + para uso num navegador de Internet. + desktop_html: Ainda podes usar o Potlatch transferindo + a aplicação desktop para Mac e Windows. + id_html: Alternativamente, podes definir o teu editor padrão para o iD, que + é executado no teu navegador de Internet tal como o Potlatch fazia. Altera + as tuas definições de utilizador aqui. sidebar: search_results: Resultados da Pesquisa close: Fechar @@ -2448,15 +2522,15 @@ pt-PT: description: Descrição user location: Localização do utilizador if_set_location_html: Indica a tua localização principal na página %{settings_link} - para veres outros editores nas redondezas. + para veres outros mapeadores nas redondezas. settings_link_text: configurações my friends: Os meus amigos no friends: Ainda não adicionaste nenhum amigo. km away: '%{count} km de distância' m away: '%{count} m de distância' - nearby users: Outros editores nas redondezas - no nearby users: Não há outros editores nas redondezas que admitam estar a editar - o mapa nas redondezas. + nearby users: Outros mapeadores nas redondezas + no nearby users: Não há outros mapeadores que admitam estar a editar o mapa + nas redondezas. role: administrator: Este utilizador é um administrador moderator: Este utilizador é um moderador @@ -2489,13 +2563,13 @@ pt-PT: account: title: Editar conta my settings: Definições - current email address: 'E-mail atual:' - external auth: 'Autenticação externa:' + current email address: E-mail atual + external auth: Autenticação externa openid: link: https://wiki.openstreetmap.org/wiki/OpenID link text: o que é isto? public editing: - heading: 'Edição pública:' + heading: Edição pública enabled: Ativado. Não é anónimo e pode editar dados. enabled link: https://wiki.openstreetmap.org/wiki/Pt:Anonymous_edits enabled link text: o que é isto? @@ -2513,7 +2587,7 @@ pt-PT: revertida e todos os novos utilizadores têm as edições disponibilizadas publicamente. contributor terms: - heading: 'Termos de Contribuidor:' + heading: Termos de contribuidor agreed: Aceitaste os novos Termos de Contribuidor. not yet agreed: Ainda não aceitaste os novos Termos de Contribuidor. review link text: Por favor, clica na ligação seguinte para reveres e aceitares @@ -2522,10 +2596,11 @@ pt-PT: em Domínio Público. link: https://www.osmfoundation.org/wiki/License/Contributor_Terms link text: o que é isto? - image: 'Imagem:' + image: Imagem gravatar: gravatar: Usar imagem Gravatar link: https://wiki.openstreetmap.org/wiki/Gravatar + what_is_gravatar: O que é o Gravatar? disabled: O Gravatar foi desativado. enabled: A exibição do teu Gravatar foi ativada. new image: Adicionar uma imagem @@ -2764,6 +2839,7 @@ pt-PT: custom_dimensions: Definir dimensões format: 'Formato:' scale: 'Escala:' + image_dimensions: A imagem mostrará a camada padrão com %{width} x %{height} download: Transferir short_url: URL curto include_marker: Incluir marcador @@ -2791,6 +2867,7 @@ pt-PT: other: Estás a menos de %{count} pés deste ponto base: standard: Mapa Padrão + cyclosm: CyclOSM cycle_map: Mapa de Ciclismo transport_map: Transportes Públicos hot: Humanitário @@ -2806,6 +2883,8 @@ pt-PT: donate_link_text: terms: Condições de utilização do website e da API + cyclosm: Estilo dos mosaicos por CyclOSM + hospedado por OpenStreetMap França thunderforest: Mosaicos cortesia de Andy Allan opnvkarte: Os mosaicos são uma cortesia de MeMoMaps diff --git a/config/locales/ro.yml b/config/locales/ro.yml index f7104d291..29f6e50e4 100644 --- a/config/locales/ro.yml +++ b/config/locales/ro.yml @@ -1,7 +1,6 @@ # Messages for Romanian (română) # Exported from translatewiki.net # Export driver: phpyaml -# Author: Abijeet Patro # Author: C1pr1an # Author: EddyPetrisor # Author: GabiBil @@ -130,27 +129,41 @@ ro: body: Textul mesajului recipient: Destinatar redaction: + title: Titlu description: Descriere report: category: Selectați un motiv pentru raportul dvs details: Vă rugăm să furnizați mai multe detalii despre problemă (necesar). user: + auth_provider: Furnizor de autentificare + auth_uid: Autentificare UID email: E-mail - new_email: 'Adresa de e-mail nouă:' + email_confirmation: Confirmare Email + new_email: Adresa de e-mail nouă active: Activ display_name: Afișare nume - description: Descriere - home_lat: 'Latitudine:' - home_lon: 'Longitudine:' - languages: Limbi + description: Descriere Profil + home_lat: Latitudine + home_lon: Longitudine + languages: Limbi preferate + preferred_editor: Editor Preferat pass_crypt: Parolă + pass_crypt_confirmation: Confirmă Parola help: trace: tagstring: utilizează virgule user_block: + reason: Motivul pentru care utilizatorul este blocat. Vă rugăm să fiți cât + mai calm și cât mai rezonabil posibil, oferind cât mai multe detalii despre + situație, amintindu-vă că mesajul va fi vizibil public. Rețineți că nu toți + utilizatorii înțeleg jargonul comunității, așa că vă rugăm să încercați + să folosiți termenii obișnuiți. needs_view: Utilizatorul trebuie să se conecteze înainte ca această blocare să fie ștearsă? user: + email_confirmation: Adresa dumneavoastră nu este afișată public, vezi politica + de confidențialitate pentru mai multe informații. new_email: (nu a fost afișată în mod public) datetime: distance_in_words_ago: @@ -201,7 +214,7 @@ ro: description: iD (editor înglobat în navigator) remote: name: Control la distanță - description: Control de la distanță (JOSM sau Merkaartor) + description: Control de la distanță (JOSM, Potlatch, Merkaartor) auth: providers: none: Fără @@ -248,6 +261,14 @@ ro: anonymous: anonim no_comment: (niciun comentariu) part_of: Parte din + part_of_relations: + one: 1 relație + few: '%{count} relații' + other: "" + part_of_ways: + one: 1 relație + few: '%{count} relații' + other: "" download_xml: Descarcă XML view_history: Vezi istoric view_details: Vezi detalii @@ -282,6 +303,10 @@ ro: title_html: 'Cale: %{name}' history_title_html: 'Istoricul căii: %{name}' nodes: Noduri + nodes_count: + one: 1 nod + few: '%{count} noduri' + other: "" also_part_of_html: one: parte a liniei de %{related_ways} other: parte din liniile de %{related_ways} @@ -289,6 +314,10 @@ ro: title_html: 'Relație: %{name}' history_title_html: 'Istoricul relației: %{name}' members: Membri + members_count: + one: 1 membru + few: '%{count} membri' + other: "" relation_member: entry_html: '%{type} %{name}' entry_role_html: '%{type} %{name} ca %{role}' @@ -300,6 +329,7 @@ ro: entry_html: Relația %{relation_name} entry_role_html: Relația %{relation_name} (ca %{relation_role}) not_found: + title: Nu a fost găsit sorry: 'Scuze, dar %{type} #%{id} nu s-a putut găsi.' type: node: nod @@ -308,6 +338,7 @@ ro: changeset: set de modificări note: notă timeout: + title: Eroare de expirare sorry: Ne pare rău, dar durata recepționării datelor pentru %{type} cu identificatorul %{id} este prea mare. type: @@ -409,8 +440,8 @@ ro: new: title: O nouă înregistrare în jurnal form: - location: 'Localizare:' - use_map_link: utilizează harta + location: Localizare + use_map_link: Utilizează Harta index: title: Jurnalele utilizatorilor title_friends: Jurnalele prietenilor @@ -440,7 +471,8 @@ ro: cu identificatorul %{id}. Vă rugăm să verificați ortografia; sau poate ați făcut clic pe un link invalid. diary_entry: - posted_by_html: Postat de către %{link_user} pe %{created} în %{language_link} + posted_by_html: Postat de %{link_user} pe %{created} în %{language_link} + updated_at_html: Ultima actualizare pe %{updated}. comment_link: Comentează la această înregistrare reply_link: Trimite un mesaj autorului comment_count: @@ -860,6 +892,7 @@ ro: quarry: Carieră railway: Cale ferată recreation_ground: Zonă de recreere + religious: Așezăminte Religioase reservoir: Rezervor reservoir_watershed: Cumpăna apelor residential: Zonă rezidențială @@ -868,9 +901,15 @@ ro: vineyard: Podgorie "yes": Utilizarea terenului leisure: + adult_gaming_centre: Centru de Jocuri Video Pentru Adulți + amusement_arcade: Sală de Jocuri + bandstand: Chioșc de muzică beach_resort: Stațiune pe plajă bird_hide: Observator de păsări + bleachers: Tribune + bowling_alley: Sală de Bowling common: teren comun + dance: Sală de dans dog_park: Parc de câini firepit: Groapă de foc fishing: Zonă de pescuit @@ -883,7 +922,9 @@ ro: marina: Marina miniature_golf: Minigolf nature_reserve: Rezervație naturală + outdoor_seating: Scaune în aer liber park: Parc + picnic_table: Masă de picnic pitch: Teren de sport playground: Loc de joacă recreation_ground: Zonă de recreere @@ -898,13 +939,19 @@ ro: "yes": Relaxare man_made: adit: Galerie de acces + advertising: Publicitate + antenna: Antenă + avalanche_protection: Protecție Avalanșă beacon: Far + beam: Rază beehive: Stup de albine breakwater: Dig bridge: Pod bunker_silo: Buncăr chimney: Șemineu + communications_tower: Turn de Comunicații crane: Macara + cross: Cruce dolphin: Post de ancorare dyke: Opritoare embankment: Terasament @@ -913,6 +960,7 @@ ro: groyne: Epiuri kiln: Pana lighthouse: Far + manhole: Capac de cămin de vizitare mast: Catarg mine: Mină mineshaft: Puțul minei @@ -920,12 +968,18 @@ ro: petroleum_well: Fântână de petrol pier: Dig pipeline: Conductă + pumping_station: Stație de Pompare + reservoir_covered: Rezervor Acoperit silo: Siloz + snow_fence: Gard zăpadă storage_tank: Rezervor de depozitare + street_cabinet: Cabinet stradal surveillance: Supraveghere + telescope: Telescop tower: Turn wastewater_plant: Stație de epurare a apei watermill: Fântână de apă + water_tap: Robinet de apă water_tower: Turn de apă water_well: Fântână water_works: Lucrări la apă @@ -936,6 +990,8 @@ ro: airfield: Aeroport militar barracks: Cazarme bunker: Buncăr + checkpoint: Punct intermediar + trench: Tranșeu "yes": Armată mountain_pass: "yes": Trecătoare prin munți @@ -955,6 +1011,7 @@ ro: grassland: Fâneață heath: Căldură hill: Deal + hot_spring: Izvor Termal island: Insulă land: Teren marsh: Mlaștină @@ -978,20 +1035,31 @@ ro: water: Apă wetland: Zonă umedă wood: Pădure + "yes": Caracteristică Naturală office: accountant: Contabil administrative: Administrație + advertising_agency: Agenție de publicitate architect: Arhitect association: Asociație company: Societate + diplomatic: Birou Diplomatic educational_institution: Instituție educațională employment_agency: Agenția forței de muncă + energy_supplier: Birou furnizor de energie electrică estate_agent: Agent imobiliar + financial: Birou Financiar government: Birou guvernamental insurance: Birou de Asigurări it: Birou de IT lawyer: Avocat + logistics: Birou de Logistică + newspaper: Birou de Ziare ngo: Birou ONG + notary: Notariat + religion: Birou Religios + research: Birou de Cercetare + tax_advisor: Consilier fiscal telecommunication: Birou de telecomunicații travel_agent: Agenție de turism "yes": Birou @@ -1047,11 +1115,17 @@ ro: tram_stop: Stație de tramvai yard: Depou shop: + agrarian: Magazin agricol alcohol: Fără licență antiques: Antichități + appliance: Magazin de electrocasnice art: Magazin de artă + baby_goods: Accesorii pentru bebeluși + bag: Magazin de genți bakery: Brutărie + bathroom_furnishing: Mobilier de baie beauty: Salon de frumusețe + bed: Produse pentru lenjerie de pat beverages: Magazin de băuturi bicycle: Magazin de biciclete bookmaker: Semn de carte @@ -1063,61 +1137,90 @@ ro: car_repair: Service auto carpet: Magazin de tâmplărie charity: Magazin de caritate + cheese: Magazin de brânzeturi chemist: Chimist + chocolate: Ciocolată clothes: Magazin de haine + coffee: Cafenea computer: Magazin de calculatoare confectionery: Cofetărie convenience: Magazin de cartier copyshop: Magazin de copiere cosmetics: Magazin de cosmetice + craft: Magazin pentru echipamente necesare meșteșugarilor + curtain: Magazin de perdele + dairy: Magazin de lactate deli: Deli department_store: Magazin specializat discount: Magazin cu itemuri la discount doityourself: Bricolaj dry_cleaning: Curățătorie chimică + e-cigarette: Magazin de țigări electronice electronics: Magazin de electronice + erotic: Magazin erotic estate_agent: Agent imobiliar + fabric: Magazin de țesături farm: Magazinul fermei fashion: Magazin de modă + fishing: Magazin de articole pentru pescuit florist: Florărie food: Alimentară + frame: Magazin de rame funeral_directors: Director de funeralii furniture: Mobilier garden_centre: Magazin de grădinărit + gas: Magazin de gaz general: Magazin general gift: Magazin de cadouri greengrocer: Piață de zarzavat grocery: Magazin alimentar hairdresser: Coafor hardware: Magazinul de scule + health_food: Magazin de produse naturiste + hearing_aids: Aparate Auditive + herbalist: Herbalist hifi: Hi-Fi houseware: Magazinul de electrocasnice + ice_cream: Magazin de înghețate interior_decoration: Decoeațiuni interioare jewelry: Bijuterie kiosk: Chioșc kitchen: Magazin de bucătărie laundry: Spălătorie + locksmith: Lăcătuș lottery: Loterie mall: Mall massage: Masaj + medical_supply: Magazin de echipamente muzicale mobile_phone: Magazin de telefoane + money_lender: Creditor de bani motorcycle: Magazin de motociclete + motorcycle_repair: Service de reparații motociclete music: Magazin de muzică + musical_instrument: Instrumente muzicale newsagent: Chioșc de ziare + nutrition_supplements: Suplimente nutritive optician: Optician organic: Magazin de alimente organice outdoor: Magazin de aer liber paint: Atelier de vopsitorie + pastry: Patiserie pawnbroker: Amanetar + perfumery: Parfumerie pet: Magazin de animale + pet_grooming: Îngrijirea animalelor photo: Magazin de fotografie seafood: Mâncare de mare second_hand: Magazin second hand + sewing: Croitorie shoes: Magazin de pantofi sports: Magazin de articole sportive stationery: Magazin de papetărie + storage_rental: Spații de depozitare de închiriat supermarket: Supermarket tailor: Croitor + tattoo: Magazin de tatuaje + tea: Magazin de Ceai ticket: Magazin de bilete tobacco: Magazin de tutun toys: Magazin de jucării @@ -1126,6 +1229,8 @@ ro: vacant: Magazin de închiriat variety_store: Magazin de varietăți video: Magazin video + video_games: Magazin de Jocuri Video + wholesale: Magazin Angro wine: Magazin de vinuri "yes": Magazin tourism: @@ -1135,6 +1240,7 @@ ro: attraction: Atracție bed_and_breakfast: Cazare și mic dejun cabin: Cabină + camp_pitch: Teren pentru camping camp_site: Loc de campare caravan_site: Parc de rulote chalet: Cabană @@ -1148,6 +1254,7 @@ ro: picnic_site: Loc de picnic theme_park: Parc tematic viewpoint: Punct de panoramă + wilderness_hut: Colibă în sălbăticie zoo: Gradină zoologică tunnel: building_passage: Pasaj între clădiri @@ -1174,12 +1281,15 @@ ro: "yes": Cale navigabilă admin_levels: level2: Frontieră de țară + level3: Limită Regiune level4: Frontieră de stat level5: Frontieră de regiune level6: Frontieră de județ + level7: Limită Municipalitate level8: Limită de oraș level9: Limita satului level10: Limită de suburbie + level11: Limită Cartier types: cities: Orașe towns: Orășele @@ -1348,6 +1458,7 @@ ro: footer: De asemenea, puteți citi comentariul la %{readurl} și puteți să comentați la %{commenturl} sau să răspundeți la %{replyurl} message_notification: + subject: '[OpenStreetMap] %{message_title}' hi: Salut, %{to_user}, header: '%{from_user} v-a trimis un mesaj prin OpenStreetMap cu subiectul %{subject}:' footer_html: De asemenea, puteți citi mesajul la %{readurl} și puteți răspunde @@ -1357,11 +1468,14 @@ ro: subject: '[OpenStreetMap] %{user} te-a adaugat ca prieten' had_added_you: '%{user} te-a adăugat ca prieten pe OpenStreetMap.' see_their_profile: Puteți vedea profilul lor la %{userurl}. + see_their_profile_html: Puteți vedea profilul respectiv la %{userurl}. befriend_them: De asemenea, îi puteți adăuga ca prieten la %{befriendurl} gpx_failure: + hi: Salut %{to_user}, failed_to_import: 'nu a reușit să importe. Iată eroarea:' subject: '[OpenStreetMap] eșec import fișier GPX' gpx_success: + hi: Salut %{to_user}, loaded_successfully: other: încărcat cu succes cu %{trace_points} din 1 punct posibil. subject: '[OpenStreetMap] succes import fișier GPX' @@ -1425,6 +1539,7 @@ ro: commented_changeset: '%{commenter} a lăsat un comentariu %{time} cu privire la un set de modificări pe care îl urmăriți creat de %{changeset_author}' partial_changeset_with_comment: cu comentariul '%{changeset_comment}' + partial_changeset_with_comment_html: cu comentariul '%{changeset_comment}' partial_changeset_without_comment: fără comentarii details: Mai multe detalii despre setul de modificări pot fi găsite la adresa %{url}. @@ -1505,12 +1620,29 @@ ro: as_unread: Mesaj marcat ca necitit destroy: destroyed: Mesaj șters + shared: + markdown_help: + headings: Titluri + heading: Titlu + subheading: Subtitlu + unordered: Lista neordonată + ordered: Listă ordonată + first: Primul element + second: Al doilea element + link: Legătură + text: Text + image: Imagine + alt: Text alternativ + url: URL + richtext_field: + edit: Editează + preview: Previzualizare site: about: next: Înainte copyright_html: ©Contributori
    OpenStreetMap - used_by_html: '%{name} împuternicește datele de pe hărți pe mii de site-uri - web, aplicații mobile și dispozitive hardware' + used_by_html: '%{name} oferă datele hărților pe mii de site-uri web, aplicații + mobile și dispozitive hardware' lede_text: |- OpenStreetMap este construit de o comunitate de cartografi care contribuie și întrețin datele despre drumuri, trasee, cafenele, stații de cale ferată și multe altele din întreaga lume. @@ -1570,8 +1702,7 @@ ro: doar sub aceeași licență. Aici codul legal sunt explicate drepturile și responsabilitățile. intro_3_1_html: |- - Cartografia din hărțile noastre și documentația noastră sunt - licențiat sub Creative + Documentația noastră este licențiată sub Creative Commons Attribution-ShareAlike 2.0 (CC BY-SA). credit_title_html: Cum se creditează OpenStreetMap credit_1_html: Noi cerem să utilizați creditul© contribuitori OpenStreetMap& @@ -1987,6 +2118,7 @@ ro: ca acestea să se finalizeze înainte de a mai încărca, pentru a nu bloca coada de așteptare pentru ceilalți utilizatori. edit: + cancel: Anulează title: Editarea traseului %{name} heading: Editarea traseului %{name} visibility_help: ce înseamnă asta? @@ -2003,6 +2135,7 @@ ro: uploaded: 'Încărcate:' points: 'Puncte:' start_coordinates: 'Start coordonate:' + coordinates_html: '%{latitude}; %{longitude}' map: hartă edit: modificare owner: 'Proprietar:' @@ -2022,7 +2155,8 @@ ro: pending: ÎN AȘTEPTARE count_points: one: 1 punct - other: '%{count} puncte' + few: '%{count} puncte' + other: "" more: mai multe trace_details: Vezi detaliile urmei view_map: Vezi hartă @@ -2360,13 +2494,13 @@ ro: account: title: Modificare cont my settings: Setările mele - current email address: 'Adresa de e-mail actuală:' - external auth: 'Autentificare externă:' + current email address: Adresa de e-mail actuală + external auth: Autentificare externă openid: link: https://wiki.openstreetmap.org/wiki/OpenID link text: Ce este aceasta? public editing: - heading: 'Editarea publică:' + heading: Editare publică enabled: Activat. Nu este anonim și poate edita date. enabled link: https://wiki.openstreetmap.org/wiki/Anonymous_edits enabled link text: Ce este aceasta? @@ -2384,7 +2518,7 @@ ro: că devine publică.
  • Această acțiune nu poate fi inversată și toți utilizatorii noi sunt acum publici în mod implicit.
    • contributor terms: - heading: 'Termenii colaboratorului:' + heading: Termenii contribuitorului agreed: Ați fost de acord cu noii Termeni ai Contributorului. not yet agreed: Încă nu ați fost de acord cu noii Termeni de Contributor. review link text: Vă rugăm să urmați acest link la comoditatea dvs. pentru @@ -2393,10 +2527,11 @@ ro: sunt în Domeniul Public. link: https://www.osmfoundation.org/wiki/License/Contributor_Terms link text: Ce este aceasta? - image: 'Imagine:' + image: Imagine gravatar: gravatar: Utilizați Gravatar link: https://wiki.openstreetmap.org/wiki/Gravatar + what_is_gravatar: Ce este Gravatar? disabled: Gravatar a fost dezactivat. enabled: Afișarea Gravatarului dvs. a fost activată. new image: Adaugă imagine nouă @@ -2404,7 +2539,7 @@ ro: delete image: Eliminați imaginea curentă replace image: Înlocuiți imaginea curentă image size hint: (imagini pătrate cel puțin 100x100 merg cel mai bine) - home location: 'Locație Acasă:' + home location: Locație Acasă no home location: Nu ați introdus locația dvs. de domiciliu. update home location on click: Actualizați locația locuinței dvs. când faceți click pe hartă? @@ -2639,6 +2774,7 @@ ro: custom_dimensions: Setați dimensiuni personalizate format: 'Format:' scale: Scară + image_dimensions: Imaginea va afișa stratul standard la %{width} x %{height} download: Descărcare short_url: URL scurt include_marker: Includeți marcator @@ -2660,15 +2796,19 @@ ro: title: Arată locația mea metersPopup: one: Sunteți la un metru de acest punct - other: Sunteți la %{count} metri de acest punct + few: Sunteți la %{count} metri de acest punct + other: "" feetPopup: one: Sunteți la un picior unitate de măsură de acest punct - other: Suntețî la %{count} picioare unitate de măsură de acest punct + few: Sunteți la %{count} picioare unitate de măsură de acest punct + other: "" base: standard: Standard + cyclosm: CyclOSM cycle_map: Hartă de ciclism transport_map: Hartă de transport hot: Umanitară + opnvkarte: ÖPNVKarte layers: header: Straturile hărții notes: Notație hartă diff --git a/config/locales/ru.yml b/config/locales/ru.yml index 75c4c666c..1172e7d06 100644 --- a/config/locales/ru.yml +++ b/config/locales/ru.yml @@ -5,7 +5,6 @@ # Author: AMDmi3 # Author: AOleg # Author: AZISS -# Author: Abijeet Patro # Author: Aideih # Author: Aleksandr Dezhin # Author: Alexander Istomin @@ -239,6 +238,10 @@ ru: needs_view: Позволить ли пользователю входить в систему, прежде, чем блокировка будет снята? user: + email_confirmation: Ваш адрес не будет отображаться публично, смотрите нашу + политику конфиденциальности + для получения дополнительной информации. new_email: (не будет показан) datetime: distance_in_words_ago: @@ -342,6 +345,16 @@ ru: anonymous: аноним no_comment: (комментарий отсутствует) part_of: Участвует в + part_of_relations: + one: '%{count} отношение' + few: '%{count} отношения' + many: '%{count} отношений' + other: "" + part_of_ways: + one: '%{count} путь' + few: '%{count} пути' + many: '%{count} путей' + other: "" download_xml: Скачать XML view_history: Посмотреть историю view_details: Подробнее @@ -374,6 +387,11 @@ ru: title_html: 'Линия: %{name}' history_title_html: 'История линии: %{name}' nodes: Точки + nodes_count: + one: '%{count} точка' + few: '%{count} точки' + many: '%{count} точек' + other: "" also_part_of_html: one: содержится в линии %{related_ways} other: содержится в линиях %{related_ways} @@ -381,6 +399,11 @@ ru: title_html: 'Отношение: %{name}' history_title_html: 'История отношения: %{name}' members: Участники + members_count: + one: '%{count} член' + few: '%{count} члена' + many: '%{count} членов' + other: "" relation_member: entry_role_html: '%{type} %{name} в роли %{role}' type: @@ -531,6 +554,7 @@ ru: написания. Или, возможно, ссылка, по которой вы перешли, ошибочна. diary_entry: posted_by_html: Опубликован %{link_user} %{created} на языке %{language_link}. + updated_at_html: Последнее обновление %{updated}. comment_link: Оставить комментарий reply_link: Написать автору comment_count: @@ -605,6 +629,7 @@ ru: pylon: Опора линии электропередач station: Станция канатного подъёмника t-bar: Т-образные подъёмники-буксиры + "yes": Воздушная дорога aeroway: aerodrome: Аэродром airstrip: Взлётно-посадочная полоса @@ -615,6 +640,7 @@ ru: holding_position: Место ожидания parking_position: Позиция парковки runway: Взлётно-посадочная полоса + taxilane: Ряд для такси taxiway: Рулёжная дорожка terminal: Терминал windsock: Ветроуказатель @@ -692,9 +718,12 @@ ru: prison: Тюрьма pub: Паб public_bath: Общественная баня + public_bookcase: Общественный книжный шкаф public_building: Общественное здание + ranger_station: Станция рейнджеров recycling: Место утилизации restaurant: Ресторан + sanitary_dump_station: Санитарная свалка school: Школа shelter: Укрытие shower: Душ @@ -708,6 +737,7 @@ ru: toilets: Туалет townhall: Городская администрация university: Университет + vehicle_inspection: Техосмотр vending_machine: Торговый автомат veterinary: Ветеринарная клиника village_hall: Общественный центр @@ -719,6 +749,7 @@ ru: census: Граница переписного участка national_park: Национальный парк protected_area: Охраняемая территория + "yes": Граница bridge: aqueduct: Акведук boardwalk: Тротуар @@ -727,21 +758,30 @@ ru: viaduct: Виадук "yes": Мост building: + apartment: Квартира apartments: Квартиры bungalow: Бунгало cabin: Хижина chapel: Часовня church: Церковь + civic: Гражданское здание + college: Здание колледжа commercial: Офисное здание construction: Строящееся здание + detached: Особняк dormitory: Общежитие + duplex: Дуплекс farm: Ферма + farm_auxiliary: Вспомогательный фермерский дом garage: Гараж garages: Гаражи + greenhouse: Теплица hangar: Ангар hospital: Здание больницы hotel: Гостиница house: Дом + houseboat: Плавучий дом + hut: Хижина industrial: Промышленное здание kindergarten: Детский сад manufacture: Промышленное здание @@ -764,6 +804,7 @@ ru: "yes": Клуб craft: beekeper: Пчеловод + blacksmith: Кузнец brewery: Пивоварня carpenter: Плотник electrician: Электрик @@ -775,6 +816,7 @@ ru: sawmill: Лесопилка shoemaker: Сапожник tailor: Портной + winery: Винодельня "yes": Мастерская emergency: ambulance_station: Станция скорой медицинской помощи @@ -921,12 +963,14 @@ ru: "yes": Досуг man_made: adit: Штольня + avalanche_protection: Защита от лавин beacon: Маяк beehive: Улей breakwater: Волнорез bridge: Мост bunker_silo: Бункер chimney: Дымовая труба + communications_tower: Башня связи crane: Кран cross: Перекресток dolphin: Причальная тумба @@ -937,6 +981,7 @@ ru: groyne: Буна kiln: Печь lighthouse: Маяк + manhole: Люк mast: Мачта mine: Рудник mineshaft: Шахтный ствол @@ -946,8 +991,11 @@ ru: pipeline: Трубопровод pumping_station: Насосная станция silo: Силос + snow_cannon: Снежная пушка + snow_fence: Снегозащитное заграждение storage_tank: Крытый резервуар surveillance: Камера наблюдения + telescope: Телескоп tower: Башня wastewater_plant: Станция очистки сточных вод watermill: Водяная мельница @@ -1078,6 +1126,7 @@ ru: baby_goods: Товары для детей bag: Магазин сумок bakery: Булочная + bathroom_furnishing: Мебель для ванной beauty: Салон красоты beverages: Магазин напитков bicycle: Веломагазин @@ -1144,12 +1193,15 @@ ru: organic: Магазин органических продуктов outdoor: Магазин для активного отдыха paint: Лавка художника + pastry: Кондитерская pawnbroker: Ломбард perfumery: Парфюмерия pet: Зоомагазин + pet_grooming: Уход за домашними животными photo: Фотомагазин seafood: Морепродукты second_hand: Комиссионный магазин + sewing: Швейный цех shoes: Обувной магазин sports: Спортивный магазин stationery: Канцелярские товары @@ -1475,6 +1527,8 @@ ru: details: Дополнительные сведения о пакете правок можно найти на %{url}. unsubscribe: Чтобы отказаться от новых сообщений для этого пакета правок, перейдите по ссылке %{url} и нажмите кнопку "Отписаться". + unsubscribe_html: Чтобы отказаться от подписки на обновления этого набора изменений, + зайдите на %{url} и нажмите «Отписаться». messages: inbox: title: Входящие @@ -1563,7 +1617,14 @@ ru: destroyed: Сообщение удалено shared: markdown_help: + title_html: Разобрано с помощью kramdown + headings: Заголовки + heading: Заголовок subheading: Подзаголовок + unordered: Неупорядоченный список + ordered: Упорядоченный список + first: Первый элемент + second: Второй элемент link: Ссылка text: Текст image: Изображение @@ -2055,6 +2116,7 @@ ru: uploaded: 'Передан на сервер:' points: 'Точек:' start_coordinates: 'Координаты начала:' + coordinates_html: '%{latitude}; %{longitude}' map: на карте edit: править owner: 'Владелец:' @@ -2412,13 +2474,13 @@ ru: account: title: Изменить учетную запись my settings: Мои настройки - current email address: 'Текущий адрес электронной почты:' + current email address: Текущий адрес электронной почты external auth: 'Внешняя аутентификация:' openid: link: https://wiki.openstreetmap.org/wiki/RU:OpenID link text: что это? public editing: - heading: 'Публичная правка:' + heading: Общедоступная правка enabled: Включено. Можно редактировать. Правки не анонимны. enabled link: https://wiki.openstreetmap.org/wiki/RU:%D0%90%D0%BD%D0%BE%D0%BD%D0%B8%D0%BC%D0%BD%D1%8B%D0%B5_%D0%BF%D1%80%D0%B0%D0%B2%D0%BA%D0%B8 enabled link text: что это? @@ -2436,7 +2498,7 @@ ru: силы, а все новые пользователи теперь доступны для связи по умолчанию. contributor terms: - heading: 'Условия участия:' + heading: Условия участия agreed: Вы согласились с новыми Условиями участия. not yet agreed: Вы ещё не согласились с новыми Условиями участия. review link text: Пожалуйста, перейдите по этой ссылке в удобное для вас время @@ -2449,6 +2511,7 @@ ru: gravatar: gravatar: Использовать Gravatar link: https://wiki.openstreetmap.org/wiki/Gravatar?uselang=ru + what_is_gravatar: Что такое Gravatar? disabled: Gravatar отключён. enabled: Отображение вашего Gravatar включено. new image: Добавить изображение @@ -2457,7 +2520,7 @@ ru: replace image: Заменить текущее изображение image size hint: (квадратные изображения, по крайней мере 100×100, работают лучше) - home location: 'Моё местоположение:' + home location: Моё местоположение no home location: Вы не обозначили свое домашнее местоположение. update home location on click: Обновлять моё местоположение, когда я нажимаю на карту? @@ -2693,6 +2756,8 @@ ru: custom_dimensions: Выбрать размер вручную format: 'Формат:' scale: 'Масштаб:' + image_dimensions: На изображении будет показан стандартный слой в %{width} x + %{height} download: Скачать short_url: Короткая ссылка include_marker: Включая маркер @@ -2741,8 +2806,11 @@ ru: donate_link_text: terms: Условия использования сайта и API + cyclosm: Оформление тайлов выполнено CyclOSM, + хостинг от OpenStreetMap France thunderforest: Тайлы предоставлены Andy Allan + opnvkarte: Тайлы любезно предоставлены MeMoMaps hotosm: Оформление тайлов выполнено Humanitarian OpenStreetMap Team, хостинг от OpenStreetMap France diff --git a/config/locales/sat.yml b/config/locales/sat.yml index bd04f500b..8e2f31b48 100644 --- a/config/locales/sat.yml +++ b/config/locales/sat.yml @@ -1,7 +1,6 @@ # Messages for Santali (ᱥᱟᱱᱛᱟᱲᱤ) # Exported from translatewiki.net # Export driver: phpyaml -# Author: Abijeet Patro # Author: Durga Soren # Author: Manik Soren # Author: Prakash Baski diff --git a/config/locales/sc.yml b/config/locales/sc.yml index 321a9a75a..e500a39d6 100644 --- a/config/locales/sc.yml +++ b/config/locales/sc.yml @@ -1,7 +1,6 @@ # Messages for Sardinian (sardu) # Exported from translatewiki.net # Export driver: phpyaml -# Author: Abijeet Patro # Author: L2212 # Author: Placebo2 # Author: Via maxima diff --git a/config/locales/scn.yml b/config/locales/scn.yml index e40d69491..40f7169fc 100644 --- a/config/locales/scn.yml +++ b/config/locales/scn.yml @@ -1,7 +1,6 @@ # Messages for Sicilian (sicilianu) # Exported from translatewiki.net # Export driver: phpyaml -# Author: Abijeet Patro # Author: Gmelfi # Author: Macofe # Author: Pippinu diff --git a/config/locales/sco.yml b/config/locales/sco.yml index 8a60d9639..9c5178113 100644 --- a/config/locales/sco.yml +++ b/config/locales/sco.yml @@ -1,7 +1,6 @@ # Messages for Scots (Scots) # Exported from translatewiki.net # Export driver: phpyaml -# Author: Abijeet Patro # Author: AmaryllisGardener # Author: John Reid # Author: MJL diff --git a/config/locales/sk.yml b/config/locales/sk.yml index 7d791f7c0..559b5b85b 100644 --- a/config/locales/sk.yml +++ b/config/locales/sk.yml @@ -1,7 +1,6 @@ # Messages for Slovak (slovenčina) # Exported from translatewiki.net # Export driver: phpyaml -# Author: Abijeet Patro # Author: Chiak # Author: Helix84 # Author: Jose1711 diff --git a/config/locales/sl.yml b/config/locales/sl.yml index 0a886d6b9..99142c928 100644 --- a/config/locales/sl.yml +++ b/config/locales/sl.yml @@ -2,7 +2,6 @@ # Exported from translatewiki.net # Export driver: phpyaml # Author: 123wiki456pedija789 -# Author: Abijeet Patro # Author: Damjang # Author: Dbc334 # Author: Eleassar @@ -275,8 +274,7 @@ sl: relation: zveza start_rjs: feature_warning: Nalaganje %{num_features}-ih značilnosti, kar lahko upočasni - brskalnik ali ga naredi neodzivnega. Ali ste prepričani, da želite prikazati - te podatke? + brskalnik ali ga naredi neodzivnega. Ali res želite prikazati te podatke? load_data: Naloži podatke loading: Nalaganje ... tag_details: @@ -2066,16 +2064,14 @@ sl: grant: title: Potrdi dodeljevanje vloge heading: Potrdi dodeljevanje vloge - are_you_sure: Ali ste prepričani, da želite dodeliti vlogo '%{role}' uporabniku - '%{name}'? + are_you_sure: Ali res želite dodeliti vlogo '%{role}' uporabniku '%{name}'? confirm: Potrdi fail: Ne morem odobriti vlogo '%{role}' uporabniku '%{name}'. Prosimo preverite, če sta uporabnik in vloga pravilna. revoke: title: Potrdi preklic vloge heading: Potrdi preklic vloge - are_you_sure: Ali ste prepričani, da želite preklicati vlogo '%{role}' uporabniku - '%{name}'? + are_you_sure: Ali res želite preklicati vlogo '%{role}' uporabnika '%{name}'? confirm: Potrdi fail: Ne morem preklicati vlogo '%{role}' uporabniku '%{name}'. Prosimo preverite, če sta uporabnik in vloga pravilna. diff --git a/config/locales/sq.yml b/config/locales/sq.yml index 9948ba513..b0387b411 100644 --- a/config/locales/sq.yml +++ b/config/locales/sq.yml @@ -1,8 +1,8 @@ # Messages for Albanian (shqip) # Exported from translatewiki.net # Export driver: phpyaml -# Author: Abijeet Patro # Author: Bjakupi +# Author: Eraldkerciku # Author: Euriditi # Author: Fanjiayi # Author: GretaDoci @@ -33,53 +33,53 @@ sq: create: Dërgo client_application: create: Regjistrohu - update: Redakto + update: Përditëso trace: create: Ngarko - update: Ruaj ndryshimet + update: Ruaj Ndryshimet activerecord: models: - acl: Qasja në listën e kontrollit - changeset: Vargu i ndryshimeve - changeset_tag: Etiketa e vargut të ndryshimeve + acl: Qasja në Listën e Kontrollit + changeset: Grupi i Ndryshimeve + changeset_tag: Etiketa e Grupit të Ndryshimeve country: Vendi - diary_comment: Koment ditari - diary_entry: Shënim ditari + diary_comment: Koment Ditari + diary_entry: Shënim Ditari friend: Mik language: Gjuha message: Mesazh node: Nyjë - node_tag: Etiketë nyje + node_tag: Etiketë Nyje notifier: Lajmëruesi - old_node: Nyjë e vjetër - old_node_tag: Etiketë e vjetër e nyjës - old_relation: Marrëdhënie e vjetër - old_relation_member: Anëtar me lidhje të vjetër - old_relation_tag: Etiketë relacioni e vjetër - old_way: Rrugë e vjetër - old_way_node: Nyje rrugore e vjetër - old_way_tag: Etiketë rrugore e vjetër - relation: Lidhje - relation_member: Anëtar me lidhje të vjetër - relation_tag: Etiketë lidhjeje + old_node: Nyjë e Vjetër + old_node_tag: Etiketë e Vjetër e Nyjës + old_relation: Marrëdhënie e Vjetër + old_relation_member: Anëtar me Lidhje të Vjetër + old_relation_tag: Etiketë Marrëdhënie e Vjetër + old_way: Rrugë e Vjetër + old_way_node: Nyje Rrugore e Vjetër + old_way_tag: Etiketë Rrugore e Vjetër + relation: Lidhja + relation_member: Anëtar i Marrëdhënies + relation_tag: Etiketë Lidhjeje session: Seancë trace: Gjurmë - tracepoint: Pika e gjurmës - tracetag: Etiketa e gjurmës + tracepoint: Pika e Gjurmës + tracetag: Etiketa e Gjurmës user: Përdoruesi - user_preference: Parapëlqimet e përdoruesit - user_token: Shenja e përdoruesit + user_preference: Parapëlqimet e Përdoruesit + user_token: Shenja e Përdoruesit way: Rruga - way_node: Nyjë rruge - way_tag: Etiketë rruge + way_node: Nyjë Rruge + way_tag: Etiketë Rruge attributes: diary_comment: - body: Trupi i mesazhit + body: Trupi i Mesazhit diary_entry: user: Përdoruesi title: Titulli - latitude: Gjerësia gjeografike - longitude: Gjatësia gjeografike + latitude: Gjerësia Gjeografike + longitude: Gjatësia Gjeografike language: Gjuha friend: user: Përdoruesi @@ -87,29 +87,29 @@ sq: trace: user: Përdoruesi visible: I dukshëm - name: Emri + name: Emri i skedës size: Madhësia - latitude: Gjerësia gjeografike - longitude: Gjatësia gjeografike + latitude: Gjerësia Gjeografike + longitude: Gjatësia Gjeografike public: Publik description: Përshkrimi - gpx_file: 'Ngarko një skedar GPX:' - visibility: 'Dukshmëria:' - tagstring: 'Etiketat:' + gpx_file: Ngarko një skedar GPX + visibility: Dukshmëria + tagstring: Etiketat message: sender: Dërguesi title: Titulli - body: Trupi i mesazhit + body: Trupi i Mesazhit recipient: Marrësi user: email: Emaili - new_email: 'Adresa e re e emailit:' + new_email: Adresa e re e emailit active: Aktiv - display_name: Emër i dukshëm - description: Përshkrimi - home_lat: 'Latituda:' - home_lon: 'Longituda:' - languages: Gjuhët + display_name: Emri i Dukshëm + description: Përshkrimi i Profilit + home_lat: Gjerësia gjeografike + home_lon: Gjatësia gjeografike + languages: Gjuhët e Parapëlqyera pass_crypt: Fjalëkalimi help: trace: @@ -124,8 +124,8 @@ sq: name: iD description: iD (në redaktorin e shfletuesit) remote: - name: Kontrollë nga larg - description: Kontrollë nga larg (JOSM apo Merkaartor) + name: Kontroll nga Larg + description: Kontrollo nga larg (JOSM, Potlatch, Merkaartor) browse: created: Krijuar closed: Mbyllur @@ -136,17 +136,17 @@ sq: edited_by_html: Redaktuar %{time} më parë nga %{user} closed_by_html: Mbyllur %{time} më parë nga %{user} version: Versioni - in_changeset: Grupi i ndryshimeve + in_changeset: Grupi i Ndryshimeve anonymous: Anonim no_comment: (nuk ka koment) part_of: Pjesë e - download_xml: Shkarko në XML - view_history: Shiko historikun - view_details: Shiko detajet - location: Vendndodhja + download_xml: Shkarko XML-në + view_history: Shiko Historikun + view_details: Shiko Detajet + location: 'Vendndodhja:' changeset: - title: 'Grupi i ndryshimeve: %{id}' - belongs_to: Autor + title: 'Grupi i Ndryshimeve: %{id}' + belongs_to: Autori node: Nyjet (%{count}) node_paginated: Nyjet (%{x}-%{y} nga %{count}) way: Mënyrat (%{count}) @@ -167,17 +167,17 @@ sq: discussion: Diskutim node: title_html: 'Nyja: %{name}' - history_title_html: 'Historiati i nyjës: %{name}' + history_title_html: 'Historiku i nyjës: %{name}' way: title_html: 'Drejtimi: %{name}' - history_title_html: 'Historiati i rrugës: %{name}' + history_title_html: 'Historiku i Rrugës: %{name}' nodes: Nyjet also_part_of_html: one: pjesë e rrugës %{related_ways} other: pjesë e rrugëve %{related_ways} relation: title_html: 'Lidhja: %{name}' - history_title_html: 'Historiati i lidhjes: %{name}' + history_title_html: 'Historiku i lidhjes: %{name}' members: Anëtarët relation_member: entry_html: '%{type} %{name}' @@ -218,7 +218,7 @@ sq: feature_warning: Duke ngarkuar %{num_features} karakteristika, të cilat mund ta bëjnë shfletuesin tuaj të ngadalshëm ose të pavëmendshëm. Jeni të sigurt që dëshironi ti shfaqni këto të dhëna? - load_data: Ngarko të dhënat + load_data: Ngarko të Dhënat loading: Duke ngarkuar... tag_details: tags: Etiketat @@ -237,36 +237,36 @@ sq: hidden_title: 'Shënim i fshehur #%{note_name}' opened_by_html: Krijuar nga %{user} në %{when} më parë - opened_by_anonymous_html: Krijuar nga person anonim %{when} + opened_by_anonymous_html: Krijuar nga një person anonim %{when} më parë commented_by_html: Krijuar nga %{user} në %{when} më parë - commented_by_anonymous_html: Krijuar nga person anonim %{when} + commented_by_anonymous_html: Krijuar nga një person anonim %{when} më parë closed_by_html: Zgjidhur nga %{user} në %{when} më parë - closed_by_anonymous_html: Zgjidhur nga person anonim %{when} + closed_by_anonymous_html: Zgjidhur nga një person anonim %{when} më parë reopened_by_html: Riaktivizuar nga %{user} në %{when} më parë - reopened_by_anonymous_html: Riaktivizuar nga person anonim %{when} + reopened_by_anonymous_html: Riaktivizuar nga një person anonim %{when} më parë hidden_by_html: Fshehur nga %{user} në %{when} më parë query: - title: Tiparet e pyetsorit + title: Tiparet e Pyetësorit introduction: Kliko në hartë për të gjetur tipare në afërsi. nearby: Tiparet në afërsi enclosing: Tipare të bashkangjitura changesets: changeset_paging_nav: showing_page: Faqe %{page} - next: Vazhdo » + next: Tjetra » previous: « Mëparshëm changeset: anonymous: Anonim no_edits: (nuk ka redaktime) - view_changeset_details: Shiko detajet e grupit të ndryshimeve + view_changeset_details: Shikoni detajet e ndryshimeve changesets: id: ID saved_at: Të ruajtura në @@ -274,48 +274,47 @@ sq: comment: Koment area: Zona index: - title: Grupi i ndryshimeve + title: Ndryshimet title_user: Ndryshime fjalish nga %{user} - title_friend: Ndryshime nga miqtë e tu + title_friend: Ndryshime nga miqtë e mi title_nearby: Ndryshime nga përdorues të zonës - empty: Nuk u gjet grupi i ndryshimeve. - empty_area: Nuk ka grupndryshime në këtë fushë. - empty_user: Nuk grupndryshime nga ky përdorues. - no_more: Nuk u gjetë më shum grupndryshime. - no_more_area: Nuk ka më grupndryshime në këtë fushë. - no_more_user: Nuk më grupndryshime nga ky përdorues. + empty: Asnjë ndryshim nuk u gjet. + empty_area: Asnjë ndryshim në këtë zonë. + empty_user: Asnjë ndryshim nga ky përdorues. + no_more: Nuk u gjetën më ndryshime. + no_more_area: Nuk ka më ndryshime në këtë zonë. + no_more_user: Nuk ka më ndryshime nga ky përdorues. load_more: Ngarko më shumë timeout: - sorry: Na vjen keq, lista e grupit të ndryshimeve që u kërkua mori shumë kohë - për tu shkarkuar. + sorry: Na vjen keq, lista e ndryshimeve që ju kërkuat zgjati shumë për t'u rikuperuar. changeset_comments: comment: - comment: 'Koment në grupin e ndryshimeve #%{changeset_id} nga %{author}' + comment: 'Koment i ri mbi ndryshimet #%{changeset_id} nga %{author}' commented_at_by_html: Përditësuar %{when} më parë nga %{user} index: - title_all: Diskutim mbi vargun e ndryshimit në OpenStreetMap + title_all: Diskutimi mbi ndryshimet në OpenStreetMap title_particular: 'Diskutimi mbi grupin e ndryshimeve #%{changeset_id} të OpenStreetMap' diary_entries: new: - title: Shënim i ri në ditar + title: Shënim i ri në Ditar form: - location: 'Lokacioni:' - use_map_link: përdor hartën + location: Vendndodhja + use_map_link: Përdor Hartën index: - title: Ditarët e përdoruesve - title_friends: Ditarë të miqve + title: Ditarët e përdoruesëve + title_friends: Ditarët e miqve title_nearby: Ditarët e përdoruesve këtu pranë user_title: Ditari i %{user} - in_language_title: Shënimet në ditar në %{language} - new: Shënim i ri në ditar + in_language_title: Shënimet në Ditar në %{language} + new: Shënim i ri në Ditar new_title: Shkruani një shënim të ri në ditarin tuaj no_entries: Nuk ka shënime në ditar recent_entries: 'Shënimet më të fundit në ditar:' - older_entries: Shënimet e vjetra - newer_entries: Shënimet e fundit + older_entries: Shënimet e Vjetra + newer_entries: Shënimet më të reja edit: - title: Redakto shënimin në ditar - marker_text: Lokacioni i shënimit në ditar + title: Redakto Shënimin në Ditar + marker_text: Vendndodhja e shënimit në ditar show: title: Ditari i %{user} | %{title} user_title: Ditari i %{user} @@ -330,7 +329,7 @@ sq: diary_entry: posted_by_html: Postuar nga %{link_user} më %{created} në %{language_link} comment_link: Komento në këtë shënim - reply_link: Përgjigju në këtë shënim + reply_link: Dërgoni një mesazh autorit comment_count: zero: Nuk ka komente one: '%{count} koment' @@ -343,7 +342,7 @@ sq: hide_link: Fshih këtë koment confirm: Konfirmo location: - location: 'Lokacioni:' + location: 'Vendndodhja:' view: Shfaq edit: Redakto feed: @@ -358,10 +357,10 @@ sq: title: Shënimet e ditarit të OpenStreetMap description: Shënimet e fundit në ditar nga përdoruesit e OpenStreetMap comments: - has_commented_on: '%{display_name} ka komentuar në këto të shënime ditari' + has_commented_on: '%{display_name} ka komentuar shënimet e mëposhtme të ditarit' post: Posto when: Kur - comment: Komenti + comment: Koment newer_comments: Komentet më të fundit older_comments: Komentet e vjetra friendships: @@ -503,7 +502,7 @@ sq: house: Shtëpi public: Ndërtesë publike terrace: Tarracë - train_station: Stacion hekurudhor + train_station: Stacion Hekurudhor university: Godinë universitare "yes": Ndërtesë craft: @@ -807,7 +806,7 @@ sq: toys: Dyqan lodrash "yes": Dyqan tourism: - apartment: Apartament + apartment: Apartament Pushimesh artwork: Vepër artistike bed_and_breakfast: Bujtinë me mëngjes cabin: Kabinë @@ -1042,9 +1041,9 @@ sq: të saj. Nëse ndryshoni apo ndërtoni mbi hartat apo të dhënat tona, ju\nmund të shpërndani rezultatet nën licencën e njëjtë. Licenca e plotë legal\n \ code shpjegon të drejtat dhe përgjegjësitë tuaja." - intro_3_1_html: |- - Hartografimi i pjesëve tona, dhe dokumantacioni ynë, janë të licencuara nën licensë të Creative - Commons Attribution-ShareAlike 2.0(CC BY-SA). + intro_3_1_html: "Dokumentacioni ynë është i licencuar nën\n + \nLicenca Kreative e Atribuimit të përbashkët-ShareAlike 2.0 (CC BY-SA + 2.0)." credit_title_html: Si të citoni OpenStreetMap credit_1_html: Ne kërkojmë që ju të përdorni kreditet e “© OpenStreetMap contributors”. @@ -1080,11 +1079,15 @@ sq: Resources Canada), CanVec (© Department of Natural Resources Canada), and StatCan (Geography Division, Statistics Canada). - contributors_nz_html: 'New Zealand: Përmban të dhëna të sigururar - nga Land Information New Zealand. Crown Copyright reserved.' + contributors_nz_html: |- + Zelanda e Re : Përmban të dhëna me burim nga + Shërbimi i të Dhënave LINZ dhe + licencuar për ripërdorim nën + CC BY 4.0 . contributors_gb_html: |- - Britani e Madhe: Përmban të dhëna nga Ordnance - Survey©. Crown i ka të drejtat autoriale dhe të databazës. + Mbretëria e Bashkuar : Përmban Ordinancë + Të dhënat e sondazhit & kopje; E drejta e autorit e kurorës dhe e drejta e bazës së të dhënave + 2010-19. contributors_footer_2_html: " Përfshirja e të dhënave në OpenStreetMap nuk thekson se të ofruesi origjinal i të \n dhënave përdor OpenStreetMap, ofron garancion, apo\n pranon çfarëdo anekse." @@ -1162,7 +1165,7 @@ sq: duke dokumentuar temat e hartës. welcome: url: /mirësevjen - title: Mirësevjen në OSM + title: Mirësevini në OpenStreetMap description: Filloni me këtë udhëzues të thjeshtë që mbulon bazat e OpenStreetMap. beginners_guide: url: http://wiki.openstreetmap.org/wiki/Sq:Beginners%27_guide @@ -1170,9 +1173,9 @@ sq: description: Një udhëzues për fillestarë që mirëmbahet nga komuniteti. help: url: https://help.openstreetmap.org/ - title: help.openstreetmap.org - description: Bëni një pyetje ose shikoni përgjigjet në faqen pyetje dhe përgjigje - të OSM-së. + title: Forumi i Ndihmës + description: Bëni një pyetje ose shikoni përgjigjet në faqen e pyetjeve dhe + përgjigjeve të OpenStreetMap. mailing_lists: title: Listat E Postimeve description: Bëni një pyetje ose diskutoni çështje interesante në një gamë @@ -1186,7 +1189,7 @@ sq: search: Kërko from: Prej to: Për - where_am_i: Ku jam unë? + where_am_i: Ku është kjo? key: table: entry: @@ -1378,10 +1381,10 @@ sq: terms accepted: Faleminderit për pranimin kushteve të reja për kontribues! terms declined url: http://wiki.openstreetmap.org/wiki/Contributor_Terms_Declined terms: - title: Kushtet për kontribues - heading: Kushtet për kontribues + title: Kushtet + heading: Kushtet consider_pd: Përveç marrëveshjes së mësipërme, unë i konsideroj kontributet - e mia të jenë në Domenin Publik + e mia të jenë në Domeinin Publik consider_pd_why: çfarë është kjo? consider_pd_why_url: http://www.osmfoundation.org/wiki/License/Why_would_I_want_my_contributions_to_be_public_domain declined: http://wiki.openstreetmap.org/wiki/Contributor_Terms_Declined @@ -1459,11 +1462,11 @@ sq: account: title: Redakto llogarinë my settings: Preferencat e mia - current email address: 'Adresa e tanishme e emailit:' + current email address: Adresa e Tanishme e Emailit openid: link text: çfarë është kjo? public editing: - heading: 'Redaktim publik:' + heading: Redaktim publik enabled: I aktivizuar. Jo anonim dhe mund të redaktojë të dhënat. enabled link: http://wiki.openstreetmap.org/wiki/Anonymous_edits enabled link text: çfarë është kjo? @@ -1473,7 +1476,7 @@ sq: public editing note: heading: Redaktim publik contributor terms: - heading: Kushtet për kontribues + heading: Kushtet e kontribuesit agreed: Ti je pajtuar me kushtet e reja për kontribues. not yet agreed: Ti ende nuk je pajtuar me kushtet e reja për kontribues. review link text: Të lutem ndiq i këtë link për të për të lexuar dhe pranuar @@ -1482,7 +1485,7 @@ sq: pronësi publike. link: http://www.osmfoundation.org/wiki/License/Contributor_Terms link text: Çka është kjo? - image: 'Imazhi:' + image: Imazhi gravatar: gravatar: Përdor Gravatar new image: Shto një imazh @@ -1490,7 +1493,7 @@ sq: delete image: Heq imazhin e tanishëm replace image: Zëvendëso imazhin e tanishëm image size hint: (imazhet katror të paktën 100x100 duken më mirë) - home location: 'Vendndodhja e shtëpisë:' + home location: Vendndodhja e Shtëpisë no home location: Nuk ke shëuar vendndodhjen e shtëpisë tënde. update home location on click: Përditëso vendndodhjen e shtëpisë kur unë klikoj në hartë! diff --git a/config/locales/sr-Latn.yml b/config/locales/sr-Latn.yml index b4312a17a..654bf3d86 100644 --- a/config/locales/sr-Latn.yml +++ b/config/locales/sr-Latn.yml @@ -1,7 +1,6 @@ # Messages for Serbian (Latin script) (srpski (latinica)‎) # Exported from translatewiki.net # Export driver: phpyaml -# Author: Abijeet Patro # Author: Macofe # Author: McDutchie # Author: Milicevic01 diff --git a/config/locales/sr.yml b/config/locales/sr.yml index 0dc5524ed..5cfe6e807 100644 --- a/config/locales/sr.yml +++ b/config/locales/sr.yml @@ -1,7 +1,6 @@ # Messages for Serbian (Cyrillic script) (српски (ћирилица)‎) # Exported from translatewiki.net # Export driver: phpyaml -# Author: Abijeet Patro # Author: Acamicamacaraca # Author: Aktron # Author: BadDog diff --git a/config/locales/sv.yml b/config/locales/sv.yml index 2fac247e4..f70752804 100644 --- a/config/locales/sv.yml +++ b/config/locales/sv.yml @@ -3,7 +3,6 @@ # Export driver: phpyaml # Author: Aaoo # Author: Abbedabb -# Author: Abijeet Patro # Author: Adrianod # Author: Ainali # Author: Balp diff --git a/config/locales/ta.yml b/config/locales/ta.yml index b44429bf7..10783392a 100644 --- a/config/locales/ta.yml +++ b/config/locales/ta.yml @@ -1,7 +1,6 @@ # Messages for Tamil (தமிழ்) # Exported from translatewiki.net # Export driver: phpyaml -# Author: Abijeet Patro # Author: Aswn # Author: ElangoRamanujam # Author: Karthi.dr diff --git a/config/locales/te.yml b/config/locales/te.yml index 5bf5eaa57..b4637549b 100644 --- a/config/locales/te.yml +++ b/config/locales/te.yml @@ -1,7 +1,6 @@ # Messages for Telugu (తెలుగు) # Exported from translatewiki.net # Export driver: phpyaml -# Author: Abijeet Patro # Author: Arjunaraoc # Author: Chaduvari # Author: Gayatri @@ -683,6 +682,7 @@ te: oauth_clients: show: edit: వివరాలను మార్చు + confirm: నిశ్చయంగానే ఉన్నారా? index: application: ఉపకరణపు పేరు users: diff --git a/config/locales/th.yml b/config/locales/th.yml index 5ce47b2db..32719f83e 100644 --- a/config/locales/th.yml +++ b/config/locales/th.yml @@ -1,7 +1,6 @@ # Messages for Thai (ไทย) # Exported from translatewiki.net # Export driver: phpyaml -# Author: Abijeet Patro # Author: Aefgh39622 # Author: Ariesanywhere # Author: B20180 diff --git a/config/locales/tl.yml b/config/locales/tl.yml index b384e615d..db3607bd2 100644 --- a/config/locales/tl.yml +++ b/config/locales/tl.yml @@ -1,7 +1,6 @@ # Messages for Tagalog (Tagalog) # Exported from translatewiki.net # Export driver: phpyaml -# Author: Abijeet Patro # Author: AnakngAraw # Author: Brazal.dang # Author: Chitetskoy diff --git a/config/locales/tr.yml b/config/locales/tr.yml index ec15b42f7..bc7c897b1 100644 --- a/config/locales/tr.yml +++ b/config/locales/tr.yml @@ -1,7 +1,6 @@ # Messages for Turkish (Türkçe) # Exported from translatewiki.net # Export driver: phpyaml -# Author: Abijeet Patro # Author: Agaafd # Author: Alerque # Author: Alidemirtas diff --git a/config/locales/tt.yml b/config/locales/tt.yml index 32068a1f2..39509a5bf 100644 --- a/config/locales/tt.yml +++ b/config/locales/tt.yml @@ -1,7 +1,6 @@ # Messages for Tatar (Cyrillic script) (татарча) # Exported from translatewiki.net # Export driver: phpyaml -# Author: Abijeet Patro # Author: KhayR # Author: Marat-avgust # Author: Ерней diff --git a/config/locales/uk.yml b/config/locales/uk.yml index daf54657f..b25207d36 100644 --- a/config/locales/uk.yml +++ b/config/locales/uk.yml @@ -2,7 +2,6 @@ # Exported from translatewiki.net # Export driver: phpyaml # Author: AS -# Author: Abijeet Patro # Author: Alex Blokha # Author: Alex Khimich # Author: Andrew J.Kurbiko diff --git a/config/locales/vi.yml b/config/locales/vi.yml index 31ef88ddd..38ee69bd1 100644 --- a/config/locales/vi.yml +++ b/config/locales/vi.yml @@ -2,7 +2,6 @@ # Exported from translatewiki.net # Export driver: phpyaml # Author: A Retired User -# Author: Abijeet Patro # Author: Dinhxuanduyet # Author: Ioe2015 # Author: JohnsonLee01 @@ -134,19 +133,24 @@ vi: body: Nội dung recipient: Người nhận redaction: + title: Tiêu đề description: Miêu tả report: category: Chọn lý do cho báo cáo của bạn details: Vui lòng cung cấp thêm chi tiết về vấn đề (yêu cầu). user: + auth_provider: Nhà cung cấp Xác thá»±c + auth_uid: Định dạng Duy nhất Xác thá»±c email: ThÆ° điện tá»­ - new_email: 'Địa chỉ ThÆ° điện tá»­ Mới:' + email_confirmation: Xác nhận ThÆ° điện tá»­ + new_email: Địa chỉ ThÆ° điện tá»­ Mới active: Tích cá»±c display_name: Tên Hiển thị - description: Miêu tả - home_lat: 'VÄ© độ:' - home_lon: 'Kinh độ:' - languages: Ngôn ngữ + description: Miêu tả trong Hồ sÆ¡ + home_lat: VÄ© độ + home_lon: Kinh độ + languages: Ngôn ngữ Ưu tiên + preferred_editor: Trình vẽ Ưa thích pass_crypt: Mật khẩu pass_crypt_confirmation: Xác nhận mật khẩu help: @@ -158,6 +162,10 @@ vi: hãy tránh thuật ngữ chuyên môn vì người dùng có thể không rành. needs_view: Người dùng có phải cần đăng nhập trước khi bỏ cấm được không? user: + email_confirmation: Địa chỉ thÆ° điện tá»­ của bạn không được hiển thị công khai. + Xem thêm chi tiết trong quy định quyền riêng tÆ° của chúng tôi. new_email: (không lúc nào hiện công khai) datetime: distance_in_words_ago: @@ -2391,13 +2399,13 @@ vi: account: title: Chỉnh sá»­a tài khoản my settings: Tùy chọn - current email address: 'Địa chỉ ThÆ° điện tá»­ Hiện tại:' - external auth: 'Xác minh Bên ngoài:' + current email address: Địa chỉ ThÆ° điện tá»­ Hiện tại + external auth: Xác minh Bên ngoài openid: link: https://wiki.openstreetmap.org/wiki/OpenID link text: đây là gì? public editing: - heading: 'Sá»­a đổi công khai:' + heading: Sá»­a đổi công khai enabled: Kích hoạt. Không vô danh và có thể sá»­a đổi dữ liệu. enabled link: https://wiki.openstreetmap.org/wiki/Anonymous_edits?uselang=vi enabled link text: đây là gì? @@ -2413,7 +2421,7 @@ vi:
  • Không thể lùi lại tác vụ này, và mọi người dùng mới hiện là người dùng công khai theo mặc định.
    • contributor terms: - heading: 'Các Điều khoản Đóng góp:' + heading: Các Điều khoản Đóng góp agreed: Bạn đã đồng ý với các Điều khoản Đóng góp mới. not yet agreed: Bạn chÆ°a đồng ý với các Điều khoản Đóng góp mới. review link text: Xin vui lòng theo liên kết này khi nào có thì giờ để đọc @@ -2422,10 +2430,11 @@ vi: phạm vi công cộng. link: https://wiki.osmfoundation.org/wiki/Licence/Contributor_Terms?uselang=vi link text: đây là gì? - image: 'Hình:' + image: Hình gravatar: gravatar: Sá»­ dụng Gravatar link: https://wiki.openstreetmap.org/wiki/Gravatar?uselang=vi + what_is_gravatar: Gravatar là gì? disabled: Hình Gravatar của bạn đã bị tắt. enabled: Hình Gravatar của bạn đã bị kích hoạt. new image: Thêm hình @@ -2433,7 +2442,7 @@ vi: delete image: Xóa hình hiện dùng replace image: Thay hình hiện dùng image size hint: (hình vuông ít nhất 100×100 điểm ảnh là tốt nhất) - home location: 'Vị trí Nhà:' + home location: Vị trí Nhà no home location: Bạn chÆ°a định vị trí nhà. update home location on click: Cập nhật vị trí nhà khi tôi nhấn chuột vào bản đồ? diff --git a/config/locales/yi.yml b/config/locales/yi.yml index 54df7075d..9e98c2279 100644 --- a/config/locales/yi.yml +++ b/config/locales/yi.yml @@ -1,7 +1,6 @@ # Messages for Yiddish (ייִדיש) # Exported from translatewiki.net # Export driver: phpyaml -# Author: Abijeet Patro # Author: פוילישער --- yi: diff --git a/config/locales/yo.yml b/config/locales/yo.yml index e28e60843..83d9812e4 100644 --- a/config/locales/yo.yml +++ b/config/locales/yo.yml @@ -1,7 +1,6 @@ # Messages for Yoruba (Yorùbá) # Exported from translatewiki.net # Export driver: phpyaml -# Author: Abijeet Patro # Author: Demmy --- yo: diff --git a/config/locales/zh-CN.yml b/config/locales/zh-CN.yml index d1a0d9bb1..e951326bc 100644 --- a/config/locales/zh-CN.yml +++ b/config/locales/zh-CN.yml @@ -5,7 +5,6 @@ # Author: 500000000006城 # Author: A Chinese Wikipedian # Author: A Retired User -# Author: Abijeet Patro # Author: Anakmalaysia # Author: Angrydog001 # Author: Assoc @@ -42,6 +41,7 @@ # Author: SinonJZH # Author: StephDC # Author: TianyinLee +# Author: Vikarna # Author: VulpesVulpes825 # Author: WQL # Author: Wong128cn @@ -181,13 +181,13 @@ zh-CN: details: 请提供一些有关问题的更多详情（必填）。 user: email: 电子邮件 - new_email: 新电子邮件地址： + new_email: 新电子邮件地址 active: 激活 display_name: 显示名称 - description: 描述 - home_lat: 纬度： - home_lon: 经度： - languages: 语言 + description: 资料描述 + home_lat: 纬度 + home_lon: 经度 + languages: 首选语言 pass_crypt: 密码 pass_crypt_confirmation: 确认密码 help: @@ -2317,13 +2317,13 @@ zh-CN: account: title: 编辑账户 my settings: 我的设置 - current email address: 当前电子邮件地址： - external auth: 外部身份验证： + current email address: 当前电子邮件地址 + external auth: 外部身份验证 openid: link: https://wiki.openstreetmap.org/wiki/OpenID link text: 这是什么？ public editing: - heading: 公开编辑： + heading: 公开编辑 enabled: 启用。非匿名用户，可以编辑数据。 enabled link: https://wiki.openstreetmap.org/wiki/Anonymous_edits enabled link text: 这是什么？ @@ -2345,6 +2345,7 @@ zh-CN: gravatar: gravatar: 使用 Gravatar link: http://wiki.openstreetmap.org/wiki/Gravatar + what_is_gravatar: 什么是Gravatar？ disabled: Gravatar已禁用。 enabled: 您的Gravatar显示已启用。 new image: 添加图像 @@ -2352,7 +2353,7 @@ zh-CN: delete image: 删除当前图像 replace image: 替换当前图像 image size hint: (正方形图像，尺寸至少为100x100) - home location: 住所位置： + home location: 住所位置 no home location: 您还没有输入您的住所位置。 update home location on click: 点击地图时更新所在位置？ save changes button: 保存更改 diff --git a/config/locales/zh-TW.yml b/config/locales/zh-TW.yml index 11f44eb17..ff0255372 100644 --- a/config/locales/zh-TW.yml +++ b/config/locales/zh-TW.yml @@ -3,7 +3,6 @@ # Export driver: phpyaml # Author: A Retired User # Author: A2093064 -# Author: Abijeet Patro # Author: Anakmalaysia # Author: Assh1857 # Author: C933103 diff --git a/docker-compose.yml b/docker-compose.yml index 1111ad010..8f67212eb 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -14,9 +14,6 @@ services: - web-images:/home/osm/images ports: - "3000:3000" - environment: - # https://github.com/Shopify/bootsnap/issues/262 - ENABLE_BOOTSNAP: 'false' command: bundle exec rails s -p 3000 -b '0.0.0.0' depends_on: - db diff --git a/docker/postgres/Dockerfile b/docker/postgres/Dockerfile index 9faddd841..8358e6e7f 100644 --- a/docker/postgres/Dockerfile +++ b/docker/postgres/Dockerfile @@ -4,4 +4,4 @@ FROM postgres:11 ADD docker/postgres/openstreetmap-postgres-init.sh /docker-entrypoint-initdb.d/ # Custom database functions are in a SQL file. -ADD db/functions/functions.sql /usr/local/sbin/osm-db-functions.sql +ADD db/functions/functions.sql /usr/local/share/osm-db-functions.sql diff --git a/docker/postgres/openstreetmap-postgres-init.sh b/docker/postgres/openstreetmap-postgres-init.sh index 3973311c1..1a7c58857 100755 --- a/docker/postgres/openstreetmap-postgres-init.sh +++ b/docker/postgres/openstreetmap-postgres-init.sh @@ -2,6 +2,7 @@ set -ex # Create 'openstreetmap' user +# Password and superuser privilege are needed to successfully run test suite psql -v ON_ERROR_STOP=1 -U "$POSTGRES_USER" <<-EOSQL CREATE USER openstreetmap SUPERUSER PASSWORD 'openstreetmap'; GRANT ALL PRIVILEGES ON DATABASE openstreetmap TO openstreetmap; @@ -11,4 +12,4 @@ EOSQL psql -v ON_ERROR_STOP=1 -U "$POSTGRES_USER" -c "CREATE EXTENSION btree_gist" openstreetmap # Define custom functions -psql -v ON_ERROR_STOP=1 -U "$POSTGRES_USER" -f "/usr/local/sbin/osm-db-functions.sql" openstreetmap +psql -v ON_ERROR_STOP=1 -U "$POSTGRES_USER" -f "/usr/local/share/osm-db-functions.sql" openstreetmap diff --git a/test/controllers/user_blocks_controller_test.rb b/test/controllers/user_blocks_controller_test.rb index d5db89615..3e2be801d 100644 --- a/test/controllers/user_blocks_controller_test.rb +++ b/test/controllers/user_blocks_controller_test.rb @@ -351,7 +351,14 @@ class UserBlocksControllerTest < ActionDispatch::IntegrationTest assert_select "input[type='submit'][value='Revoke!']", :count => 1 end - # Check that revoking a block works + # Check that revoking a block using GET should fail + get revoke_user_block_path(:id => active_block, :confirm => true) + assert_response :success + assert_template "revoke" + b = UserBlock.find(active_block.id) + assert b.ends_at - Time.now > 100 + + # Check that revoking a block works using POST post revoke_user_block_path(:id => active_block, :confirm => true) assert_redirected_to user_block_path(active_block) b = UserBlock.find(active_block.id) diff --git a/test/controllers/users_controller_test.rb b/test/controllers/users_controller_test.rb index 02e5db7db..54c737b97 100644 --- a/test/controllers/users_controller_test.rb +++ b/test/controllers/users_controller_test.rb @@ -406,6 +406,25 @@ class UsersControllerTest < ActionDispatch::IntegrationTest ActionMailer::Base.deliveries.clear end + def test_login + user = create(:user) + + get login_path + assert_response :redirect + assert_redirected_to login_path(:cookie_test => true) + follow_redirect! + assert_response :success + assert_template "login" + + get login_path, :params => { :username => user.display_name, :password => "test" } + assert_response :success + assert_template "login" + + post login_path, :params => { :username => user.display_name, :password => "test" } + assert_response :redirect + assert_redirected_to root_path + end + def test_logout_without_referer post logout_path assert_response :redirect @@ -812,6 +831,16 @@ class UsersControllerTest < ActionDispatch::IntegrationTest user = create(:user) uppercase_user = build(:user, :email => user.email.upcase).tap { |u| u.save(:validate => false) } + # Resetting with GET should fail + assert_no_difference "ActionMailer::Base.deliveries.size" do + perform_enqueued_jobs do + get user_forgot_password_path, :params => { :email => user.email } + end + end + assert_response :success + assert_template :lost_password + + # Resetting with POST should work assert_difference "ActionMailer::Base.deliveries.size", 1 do perform_enqueued_jobs do post user_forgot_password_path, :params => { :email => user.email } diff --git a/test/integration/oauth_test.rb b/test/integration/oauth_test.rb index 3242df9e2..1505cb34a 100644 --- a/test/integration/oauth_test.rb +++ b/test/integration/oauth_test.rb @@ -6,8 +6,9 @@ class OAuthTest < ActionDispatch::IntegrationTest def test_oauth10_web_app client = create(:client_application, :callback_url => "http://some.web.app.example.org/callback", :allow_read_prefs => true, :allow_write_api => true, :allow_read_gpx => true) - post "/login", :params => { :username => client.user.email, :password => "test" } + get "/login" follow_redirect! + post "/login", :params => { :username => client.user.email, :password => "test" } follow_redirect! assert_response :success @@ -19,8 +20,9 @@ class OAuthTest < ActionDispatch::IntegrationTest def test_oauth10_desktop_app client = create(:client_application, :allow_read_prefs => true, :allow_write_api => true, :allow_read_gpx => true) - post "/login", :params => { :username => client.user.email, :password => "test" } + get "/login" follow_redirect! + post "/login", :params => { :username => client.user.email, :password => "test" } follow_redirect! assert_response :success @@ -31,8 +33,9 @@ class OAuthTest < ActionDispatch::IntegrationTest def test_oauth10a_web_app client = create(:client_application, :callback_url => "http://some.web.app.example.org/callback", :allow_read_prefs => true, :allow_write_api => true, :allow_read_gpx => true) - post "/login", :params => { :username => client.user.email, :password => "test" } + get "/login" follow_redirect! + post "/login", :params => { :username => client.user.email, :password => "test" } follow_redirect! assert_response :success @@ -44,8 +47,9 @@ class OAuthTest < ActionDispatch::IntegrationTest def test_oauth10a_desktop_app client = create(:client_application, :allow_read_prefs => true, :allow_write_api => true, :allow_read_gpx => true) - post "/login", :params => { :username => client.user.email, :password => "test" } + get "/login" follow_redirect! + post "/login", :params => { :username => client.user.email, :password => "test" } follow_redirect! assert_response :success diff --git a/test/integration/page_locale_test.rb b/test/integration/page_locale_test.rb index 2c4939b05..239c1d847 100644 --- a/test/integration/page_locale_test.rb +++ b/test/integration/page_locale_test.rb @@ -12,6 +12,8 @@ class PageLocaleTest < ActionDispatch::IntegrationTest def test_defaulting user = create(:user, :languages => []) + get "/login" + follow_redirect! post "/login", :params => { :username => user.email, :password => "test" } follow_redirect! @@ -33,6 +35,8 @@ class PageLocaleTest < ActionDispatch::IntegrationTest get "/diary", :params => { :locale => "es" } assert_select "html[lang=?]", "es" + get "/login" + follow_redirect! post "/login", :params => { :username => user.email, :password => "test" } follow_redirect! diff --git a/test/test_helper.rb b/test/test_helper.rb index a023dd610..da36be28b 100644 --- a/test/test_helper.rb +++ b/test/test_helper.rb @@ -243,6 +243,7 @@ module ActiveSupport end def session_for(user) + get login_path post login_path, :params => { :username => user.display_name, :password => "test" } follow_redirect! end diff --git a/yarn.lock b/yarn.lock index 00b9e7cc0..efc404b6b 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2,20 +2,25 @@ # yarn lockfile v1 -"@babel/code-frame@^7.0.0": - version "7.8.3" - resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.8.3.tgz#33e25903d7481181534e12ec0a25f16b6fcf419e" - integrity sha512-a9gxpmdXtZEInkCSHUJDLHZVBgb1QS0jhss4cPP93EW7s+uC5bikET2twEF3KV+7rDblJcmNvTR7VJejqd2C2g== +"@babel/code-frame@7.12.11": + version "7.12.11" + resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.12.11.tgz#f4ad435aa263db935b8f10f2c552d23fb716a63f" + integrity sha512-Zt1yodBx1UcyiePMSkWnU4hPqhwq7hGi2nFL1LeA3EUl+q2LQx16MISgJ0+z7dnmgvP9QtIleuETGOiOH1RcIw== dependencies: - "@babel/highlight" "^7.8.3" + "@babel/highlight" "^7.10.4" -"@babel/highlight@^7.8.3": - version "7.8.3" - resolved "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.8.3.tgz#28f173d04223eaaa59bc1d439a3836e6d1265797" - integrity sha512-PX4y5xQUvy0fnEVHrYOarRPXVWafSjTW9T0Hab8gVIawpl2Sj0ORyrygANq+KjcNlSSTw0YCLSNA8OyZ1I4yEg== +"@babel/helper-validator-identifier@^7.12.11": + version "7.12.11" + resolved "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.12.11.tgz#c9a1f021917dcb5ccf0d4e453e399022981fc9ed" + integrity sha512-np/lG3uARFybkoHokJUmf1QfEvRVCPbmQeUQpKow5cQ3xWrV9i3rUHodKDJPQfTVX61qKi+UdYk8kik84n7XOw== + +"@babel/highlight@^7.10.4": + version "7.12.13" + resolved "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.12.13.tgz#8ab538393e00370b26271b01fa08f7f27f2e795c" + integrity sha512-kocDQvIbgMKlWxXe9fof3TQ+gkIPOUSEYhJjqUjvKMez3krV7vbzYCDq39Oj11UAVK7JqPVGQPlgE85dPNlQww== dependencies: + "@babel/helper-validator-identifier" "^7.12.11" chalk "^2.0.0" - esutils "^2.0.2" js-tokens "^4.0.0" "@eslint/eslintrc@^0.3.0": @@ -243,11 +248,11 @@ eslint-visitor-keys@^2.0.0: integrity sha512-QudtT6av5WXels9WjIM7qz1XD1cWGvX4gGXvp/zBn9nXG02D0utdU3Em2m/QjTnrsk6bBjmCygl3rmj118msQQ== eslint@^7.3.1: - version "7.19.0" - resolved "https://registry.yarnpkg.com/eslint/-/eslint-7.19.0.tgz#6719621b196b5fad72e43387981314e5d0dc3f41" - integrity sha512-CGlMgJY56JZ9ZSYhJuhow61lMPPjUzWmChFya71Z/jilVos7mR/jPgaEfVGgMBY5DshbKdG8Ezb8FDCHcoMEMg== + version "7.20.0" + resolved "https://registry.yarnpkg.com/eslint/-/eslint-7.20.0.tgz#db07c4ca4eda2e2316e7aa57ac7fc91ec550bdc7" + integrity sha512-qGi0CTcOGP2OtCQBgWZlQjcTuP0XkIpYFj25XtRTQSHC+umNnp7UMshr2G8SLsRFYDdAPFeHOsiteadmMH02Yw== dependencies: - "@babel/code-frame" "^7.0.0" + "@babel/code-frame" "7.12.11" "@eslint/eslintrc" "^0.3.0" ajv "^6.10.0" chalk "^4.0.0" @@ -259,7 +264,7 @@ eslint@^7.3.1: eslint-utils "^2.1.0" eslint-visitor-keys "^2.0.0" espree "^7.3.1" - esquery "^1.2.0" + esquery "^1.4.0" esutils "^2.0.2" file-entry-cache "^6.0.0" functional-red-black-tree "^1.0.1" @@ -299,10 +304,10 @@ esprima@^4.0.0: resolved "https://registry.yarnpkg.com/esprima/-/esprima-4.0.1.tgz#13b04cdb3e6c5d19df91ab6987a8695619b0aa71" integrity sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A== -esquery@^1.2.0: - version "1.3.1" - resolved "https://registry.yarnpkg.com/esquery/-/esquery-1.3.1.tgz#b78b5828aa8e214e29fb74c4d5b752e1c033da57" - integrity sha512-olpvt9QG0vniUBZspVRN6lwB7hOZoTRtT+jzR+tS4ffYx2mzbw+z0XCOk44aaLYKApNX5nMm+E+P6o25ip/DHQ== +esquery@^1.4.0: + version "1.4.0" + resolved "https://registry.yarnpkg.com/esquery/-/esquery-1.4.0.tgz#2148ffc38b82e8c7057dfed48425b3e61f0f24a5" + integrity sha512-cCDispWt5vHHtwMY2YrAQ4ibFkAL8RbH5YGBnZBc90MolvvfkkQcJro/aZiAQUlQ3qgrYS6D6v8Gc5G5CQsc9w== dependencies: estraverse "^5.1.0"