From 8573b6efd52ac9c8db896079ee02f699403d5130 Mon Sep 17 00:00:00 2001 From: rugk Date: Mon, 16 May 2022 01:32:02 +0200 Subject: [PATCH 01/68] Add cause to feature request issue template MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit When writing https://github.com/openstreetmap/openstreetmap-website/issues/3551 I noticed that your template is somewhat problematic. What users really should write is how/why they have the feature request they want, i.e. what (problem) is “behind” a feature request. Similar to how user stories should always go like ”I as a [who] want [what], because [why]”, here the “why” aspect was missing. The “Description” does not really tangle that, it only tangles _what_ the user wants. Screenshots may also be better inline inside of a text description, but I see you want to nudge the user to add screenshots or mockups, so that's fine IMHO. --- .github/ISSUE_TEMPLATE/feature.yml | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/.github/ISSUE_TEMPLATE/feature.yml b/.github/ISSUE_TEMPLATE/feature.yml index e556dfa72..0931ca0d6 100644 --- a/.github/ISSUE_TEMPLATE/feature.yml +++ b/.github/ISSUE_TEMPLATE/feature.yml @@ -4,6 +4,14 @@ description: You want to request a feature, share an idea or have a question. # labels: # assignees: body: + - type: textarea + id: idea + attributes: + label: Problem + description: Please describe problem or use case that is the cause for your feature request or idea. + placeholder: + validations: + required: false - type: textarea id: idea attributes: @@ -15,7 +23,7 @@ body: - type: textarea attributes: label: Screenshots - description: Please add screenshots if they can help us understand your request/idea/question. + description: Please add screenshots or mockups if they can help us understand your request/idea/question. placeholder: validations: required: false From 5ed2bfc950401f84b41528cb79b925b42327f386 Mon Sep 17 00:00:00 2001 From: Anton Khorev Date: Wed, 27 Jul 2022 19:35:29 +0300 Subject: [PATCH 02/68] Changed sidebar close button to Bootstrap --- app/assets/javascripts/leaflet.layers.js | 5 ++--- app/assets/stylesheets/common.scss | 5 ----- 2 files changed, 2 insertions(+), 8 deletions(-) diff --git a/app/assets/javascripts/leaflet.layers.js b/app/assets/javascripts/leaflet.layers.js index 5c5e43c5c..5e541f1e5 100644 --- a/app/assets/javascripts/leaflet.layers.js +++ b/app/assets/javascripts/leaflet.layers.js @@ -22,9 +22,8 @@ L.OSM.layers = function (options) { .attr("class", "sidebar_heading") .appendTo($ui) .append( - $("") - .text(I18n.t("javascripts.close")) - .attr("class", "icon close") + $(" <% end %> From 66e526c2d5ed93fdb6b514a4927ba15ba71fb7bb Mon Sep 17 00:00:00 2001 From: Anton Khorev Date: Wed, 27 Jul 2022 20:54:47 +0300 Subject: [PATCH 04/68] Changed directions close button to Bootstrap --- app/assets/javascripts/index/directions.js | 8 ++++---- app/views/layouts/_search.html.erb | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/app/assets/javascripts/index/directions.js b/app/assets/javascripts/index/directions.js index 5040e7f3e..ad780d4f4 100644 --- a/app/assets/javascripts/index/directions.js +++ b/app/assets/javascripts/index/directions.js @@ -157,7 +157,7 @@ OSM.Directions = function (map) { })); }); - $(".directions_form .close").on("click", function (e) { + $(".directions_form .btn-close").on("click", function (e) { e.preventDefault(); var route_from = endpoints[0].value; if (route_from) { @@ -254,9 +254,9 @@ OSM.Directions = function (map) { map.fitBounds(polyline.getBounds().pad(0.05)); } - var html = "

" + - "" + I18n.t("javascripts.directions.directions") + - "

" + + var html = "" + + "

" + I18n.t("javascripts.directions.directions") + "

" + + "

" + I18n.t("javascripts.directions.distance") + ": " + formatDistance(route.distance) + ". " + I18n.t("javascripts.directions.time") + ": " + formatTime(route.time) + "."; if (typeof route.ascend !== "undefined" && typeof route.descend !== "undefined") { diff --git a/app/views/layouts/_search.html.erb b/app/views/layouts/_search.html.erb index c2501b95b..24e25076f 100644 --- a/app/views/layouts/_search.html.erb +++ b/app/views/layouts/_search.html.erb @@ -19,7 +19,7 @@

-
+
From 4000a4004b3ad981b96f7dbf66836580e7b13a38 Mon Sep 17 00:00:00 2001 From: Anton Khorev Date: Wed, 27 Jul 2022 21:02:16 +0300 Subject: [PATCH 05/68] Changed feature close buttons to Bootstrap --- app/assets/javascripts/index/browse.js | 5 +++-- app/views/application/_sidebar_header.html.erb | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/app/assets/javascripts/index/browse.js b/app/assets/javascripts/index/browse.js index 1140515f5..8ef859d85 100644 --- a/app/assets/javascripts/index/browse.js +++ b/app/assets/javascripts/index/browse.js @@ -50,10 +50,11 @@ OSM.initializeBrowse = function (map) { $("#browse_status").html( $("
") .append( + $("
From eb0f6d5952761257836cf9c99a9b007ad84b70c6 Mon Sep 17 00:00:00 2001 From: Anton Khorev Date: Wed, 27 Jul 2022 21:10:49 +0300 Subject: [PATCH 06/68] Fixed welcome banner close button --- app/assets/javascripts/index.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/assets/javascripts/index.js b/app/assets/javascripts/index.js index fc7780fca..d5a3731d8 100644 --- a/app/assets/javascripts/index.js +++ b/app/assets/javascripts/index.js @@ -195,7 +195,7 @@ $(document).ready(function () { $(".welcome").addClass("visible"); } - $(".welcome .close").on("click", function () { + $(".welcome .btn-close").on("click", function () { $(".welcome").removeClass("visible"); Cookies.set("_osm_welcome", "hide", { secure: true, expires: expiry, path: "/", samesite: "lax" }); }); From 89095c898116d8c4b314c1316557a86a781ba7f7 Mon Sep 17 00:00:00 2001 From: Anton Khorev Date: Wed, 27 Jul 2022 21:36:54 +0300 Subject: [PATCH 07/68] Fix eslint errors --- app/assets/javascripts/leaflet.key.js | 2 +- app/assets/javascripts/leaflet.layers.js | 2 +- app/assets/javascripts/leaflet.share.js | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/app/assets/javascripts/leaflet.key.js b/app/assets/javascripts/leaflet.key.js index 3e8e66854..b9b7c9c04 100644 --- a/app/assets/javascripts/leaflet.key.js +++ b/app/assets/javascripts/leaflet.key.js @@ -20,7 +20,7 @@ L.OSM.key = function (options) { .appendTo($ui) .append( $("
- <%= t("site.search.reverse_directions_text") %> +
From d235b12767bba240611fc6452b7508627c56542b Mon Sep 17 00:00:00 2001 From: Andy Allan Date: Wed, 3 Aug 2022 14:58:40 +0100 Subject: [PATCH 15/68] Enable focus styling for leaflet control buttons Fixes #3633 --- app/assets/stylesheets/common.scss | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/app/assets/stylesheets/common.scss b/app/assets/stylesheets/common.scss index 1f80a9b5b..fa5cd5643 100644 --- a/app/assets/stylesheets/common.scss +++ b/app/assets/stylesheets/common.scss @@ -283,7 +283,8 @@ body.compact-nav { margin-bottom: 10px; outline: none; - &:hover { + &:hover, + &:focus { background-color: black; } From 68776e378c01f3b09b07ec7c402fbf6517740c5f Mon Sep 17 00:00:00 2001 From: Andy Allan Date: Wed, 3 Aug 2022 15:20:17 +0100 Subject: [PATCH 16/68] Fix remaining tooltips, and add tests These were broken during the upgrade to bootstrap 5 Fixes #3632 --- app/assets/javascripts/application.js | 2 +- app/assets/javascripts/leaflet.layers.js | 2 +- app/assets/javascripts/leaflet.note.js | 2 +- app/assets/javascripts/leaflet.query.js | 2 +- test/system/site_test.rb | 31 ++++++++++++++++++++++++ 5 files changed, 35 insertions(+), 4 deletions(-) diff --git a/app/assets/javascripts/application.js b/app/assets/javascripts/application.js index d5b16bbfb..740990fb3 100644 --- a/app/assets/javascripts/application.js +++ b/app/assets/javascripts/application.js @@ -59,7 +59,7 @@ window.updateLinks = function (loc, zoom, layers, object) { var editDisabled = zoom < 13; $("#edit_tab") .tooltip({ placement: "bottom" }) - .attr("data-original-title", editDisabled ? + .attr("data-bs-original-title", editDisabled ? I18n.t("javascripts.site.edit_disabled_tooltip") : "") // Disable the button group and also the buttons to avoid // inconsistent behaviour when zooming diff --git a/app/assets/javascripts/leaflet.layers.js b/app/assets/javascripts/leaflet.layers.js index 5c5e43c5c..0f8e6c4d2 100644 --- a/app/assets/javascripts/leaflet.layers.js +++ b/app/assets/javascripts/leaflet.layers.js @@ -171,7 +171,7 @@ L.OSM.layers = function (options) { } $(item).attr("class", disabled ? "disabled" : ""); - item.attr("data-original-title", disabled ? + item.attr("data-bs-original-title", disabled ? I18n.t("javascripts.site.map_" + name + "_zoom_in_tooltip") : ""); }); }; diff --git a/app/assets/javascripts/leaflet.note.js b/app/assets/javascripts/leaflet.note.js index 86c455499..5f8010967 100644 --- a/app/assets/javascripts/leaflet.note.js +++ b/app/assets/javascripts/leaflet.note.js @@ -17,7 +17,7 @@ L.OSM.note = function (options) { var disabled = OSM.STATUS === "database_offline" || map.getZoom() < 12; link .toggleClass("disabled", disabled) - .attr("data-original-title", I18n.t(disabled ? + .attr("data-bs-original-title", I18n.t(disabled ? "javascripts.site.createnote_disabled_tooltip" : "javascripts.site.createnote_tooltip")); } diff --git a/app/assets/javascripts/leaflet.query.js b/app/assets/javascripts/leaflet.query.js index 5f449c214..00292b74d 100644 --- a/app/assets/javascripts/leaflet.query.js +++ b/app/assets/javascripts/leaflet.query.js @@ -20,7 +20,7 @@ L.OSM.query = function (options) { isDisabled = map.getZoom() < 14; link .toggleClass("disabled", isDisabled) - .attr("data-original-title", I18n.t(isDisabled ? + .attr("data-bs-original-title", I18n.t(isDisabled ? "javascripts.site.queryfeature_disabled_tooltip" : "javascripts.site.queryfeature_tooltip")); diff --git a/test/system/site_test.rb b/test/system/site_test.rb index b9d7bcd57..a08f7f344 100644 --- a/test/system/site_test.rb +++ b/test/system/site_test.rb @@ -37,4 +37,35 @@ class SiteTest < ApplicationSystemTestCase tooltip.assert_text "Map Key" tooltip.assert_text "not available" end + + test "tooltip shows for query button when zoomed in" do + visit "/#map=14/0/0" + + assert_no_selector ".tooltip" + button = find ".control-query .control-button" + button.hover + tooltip = find ".tooltip" + tooltip.assert_text "Query features" + tooltip.assert_no_text "Zoom in" + end + + test "tooltip shows for query button when zoomed out" do + visit "/#map=10/0/0" + + assert_no_selector ".tooltip" + button = find ".control-query .control-button" + button.hover + tooltip = find ".tooltip" + tooltip.assert_text "Zoom in to query features" + end + + test "tooltip shows for edit button when zoomed out" do + visit "/#map=11/0/0" + + assert_no_selector ".tooltip" + button = find "#edit_tab" + button.hover + tooltip = find ".tooltip" + tooltip.assert_text "Zoom in to edit the map" + end end From d797dec4ce4605f5b48afca372f452c906d54b6f Mon Sep 17 00:00:00 2001 From: Andy Allan Date: Wed, 3 Aug 2022 17:06:18 +0100 Subject: [PATCH 17/68] Add a basic security policy. Fixes #3553 --- SECURITY.md | 9 +++++++++ 1 file changed, 9 insertions(+) create mode 100644 SECURITY.md diff --git a/SECURITY.md b/SECURITY.md new file mode 100644 index 000000000..c1ad6e5ac --- /dev/null +++ b/SECURITY.md @@ -0,0 +1,9 @@ +# Security Policy + +## Reporting a Vulnerability + +We welcome any reports of security vulnerabilities, and we will respond to you quickly to acknowledge receipt. + +To report a vulnerability please email [the maintainers using this link](mailto:tom@compton.nu;openstreetmap-website@gravitystorm.co.uk;security@openstreetmap.org). This will also notify the security team for the main deployment of this software. + +Please note that we do not offer any bug bounties and we do not participate in any bug programs. If your security report is validated by us, then we are happy to credit you publicly in our issue tracker, on request. From dce0f1639e9ac0c4d79182725b2996ad85c4d279 Mon Sep 17 00:00:00 2001 From: Harry Wood Date: Mon, 27 Jun 2022 12:20:50 +0100 Subject: [PATCH 18/68] Add wording to discourage reporting a note Add some wording wrapped around the 'Report this note' link to explain to users to resolve the note instead. Tackling the issue reported by DWG, that too many note reports are coming to them, where the users could deal it themselves: https://github.com/openstreetmap/openstreetmap-website/issues/3071 --- app/views/browse/note.html.erb | 2 +- config/locales/en.yml | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/app/views/browse/note.html.erb b/app/views/browse/note.html.erb index af859651e..24240d6df 100644 --- a/app/views/browse/note.html.erb +++ b/app/views/browse/note.html.erb @@ -29,7 +29,7 @@ <% end -%> <% if current_user && current_user != @note.author %> -

<%= report_link(t(".report"), @note) %>

+

<%= t "javascripts.notes.show.report_link_html", :link => report_link(t(".report"), @note) %>

<% end %> <% if @note_comments.length > 1 %> diff --git a/config/locales/en.yml b/config/locales/en.yml index 3c8f09a48..9db476748 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -421,7 +421,7 @@ en: reopened_by_html: "Reactivated by %{user} %{when}" reopened_by_anonymous_html: "Reactivated by anonymous %{when}" hidden_by_html: "Hidden by %{user} %{when}" - report: Report this note + report: report this note coordinates_html: "%{latitude}, %{longitude}" query: title: "Query Features" @@ -2883,6 +2883,7 @@ en: reactivate: Reactivate comment_and_resolve: Comment & Resolve comment: Comment + report_link_html: "If this note contains sensitive information that needs to be removed, you can %{link}. For all other problems with the note, please resolve it yourself with a comment." edit_help: Move the map and zoom in on a location you want to edit, then click here. directions: ascend: "Ascend" From 7eae946b9ab6ca317373d70f088498720002f2b8 Mon Sep 17 00:00:00 2001 From: Harry Wood Date: Mon, 27 Jun 2022 13:03:39 +0100 Subject: [PATCH 19/68] Move note reporting link to bottom of the sidebar Move the 'report this note' and surrounding sentence down the sidebar beneath the commont/resolve form to give it less prominence. --- app/assets/stylesheets/common.scss | 4 ++++ app/views/browse/note.html.erb | 12 ++++++------ 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/app/assets/stylesheets/common.scss b/app/assets/stylesheets/common.scss index 1f80a9b5b..cd3ae4889 100644 --- a/app/assets/stylesheets/common.scss +++ b/app/assets/stylesheets/common.scss @@ -841,6 +841,10 @@ tr.turn:hover { } } + form.note-comment-resolve { + margin: 10px 0px 40px 0px; + } + .subscribe-buttons input { font-size: 90%; line-height: 15px; diff --git a/app/views/browse/note.html.erb b/app/views/browse/note.html.erb index 24240d6df..0706dbb46 100644 --- a/app/views/browse/note.html.erb +++ b/app/views/browse/note.html.erb @@ -28,10 +28,6 @@

<%= t "javascripts.notes.show.anonymous_warning" %>

<% end -%> - <% if current_user && current_user != @note.author %> -

<%= t "javascripts.notes.show.report_link_html", :link => report_link(t(".report"), @note) %>

- <% end %> - <% if @note_comments.length > 1 %>
    @@ -47,7 +43,7 @@ <% if @note.status == "open" %> <% if current_user -%> - +
    @@ -61,7 +57,7 @@ <% end -%> <% else %> -
    +
    <% if current_user and current_user.moderator? -%> @@ -73,4 +69,8 @@
    <% end %> + + <% if current_user && current_user != @note.author %> +

    <%= t "javascripts.notes.show.report_link_html", :link => report_link(t(".report"), @note) %>

    + <% end %>
From c185ef25984da52d494201d693618313f970284e Mon Sep 17 00:00:00 2001 From: Andy Allan Date: Wed, 3 Aug 2022 18:25:22 +0100 Subject: [PATCH 20/68] Use standard bootstrap spacers, rather than custom css, to space out the elements Also make the reporting text small, since it's not required reading in most circumstances. --- app/assets/stylesheets/common.scss | 4 ---- app/views/browse/note.html.erb | 6 +++--- 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/app/assets/stylesheets/common.scss b/app/assets/stylesheets/common.scss index cd3ae4889..1f80a9b5b 100644 --- a/app/assets/stylesheets/common.scss +++ b/app/assets/stylesheets/common.scss @@ -841,10 +841,6 @@ tr.turn:hover { } } - form.note-comment-resolve { - margin: 10px 0px 40px 0px; - } - .subscribe-buttons input { font-size: 90%; line-height: 15px; diff --git a/app/views/browse/note.html.erb b/app/views/browse/note.html.erb index 0706dbb46..fb186e55e 100644 --- a/app/views/browse/note.html.erb +++ b/app/views/browse/note.html.erb @@ -43,7 +43,7 @@ <% if @note.status == "open" %> <% if current_user -%> -
+
@@ -57,7 +57,7 @@
<% end -%> <% else %> -
+
<% if current_user and current_user.moderator? -%> @@ -71,6 +71,6 @@ <% end %> <% if current_user && current_user != @note.author %> -

<%= t "javascripts.notes.show.report_link_html", :link => report_link(t(".report"), @note) %>

+

<%= t "javascripts.notes.show.report_link_html", :link => report_link(t(".report"), @note) %>

<% end %>
From 723e6851ef5f3ea98b7649a631356fe41f6c43fa Mon Sep 17 00:00:00 2001 From: Andy Allan Date: Wed, 3 Aug 2022 18:48:02 +0100 Subject: [PATCH 21/68] Minor grammar changes to feature template --- .github/ISSUE_TEMPLATE/feature.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/ISSUE_TEMPLATE/feature.yml b/.github/ISSUE_TEMPLATE/feature.yml index 0931ca0d6..696b2cfbd 100644 --- a/.github/ISSUE_TEMPLATE/feature.yml +++ b/.github/ISSUE_TEMPLATE/feature.yml @@ -8,7 +8,7 @@ body: id: idea attributes: label: Problem - description: Please describe problem or use case that is the cause for your feature request or idea. + description: Please describe the problem or use case that is the cause for your feature request or idea. placeholder: validations: required: false @@ -16,7 +16,7 @@ body: id: idea attributes: label: Description - description: Please describe you feature request, idea or question. + description: Please describe your feature request, idea or question. placeholder: validations: required: false From f16d4977031f8790d6b97e4117e3446c04eb5600 Mon Sep 17 00:00:00 2001 From: Andy Allan Date: Wed, 3 Aug 2022 18:59:32 +0100 Subject: [PATCH 22/68] Remove the user menu focus overrides This restores the outline effect when the button is focussed using keyboard navigation. Refs #3633 --- app/assets/stylesheets/common.scss | 7 ------- 1 file changed, 7 deletions(-) diff --git a/app/assets/stylesheets/common.scss b/app/assets/stylesheets/common.scss index fdf35d615..9ec7fb3f4 100644 --- a/app/assets/stylesheets/common.scss +++ b/app/assets/stylesheets/common.scss @@ -201,16 +201,9 @@ nav.secondary { &:hover { border-color: $grey; } - &:focus { - background-color: white; - box-shadow: none; - } } &.show .btn-outline-secondary { background-color: white; - &:focus { - box-shadow: none; - } } } From fb362ef0d8e457cdc49b43f251f2a71eca8ef509 Mon Sep 17 00:00:00 2001 From: Tom Hughes Date: Tue, 5 Jul 2022 18:41:42 +0100 Subject: [PATCH 23/68] Enable brotli compression for assets --- Gemfile | 3 +++ Gemfile.lock | 5 +++++ config/initializers/brotli.rb | 3 +++ 3 files changed, 11 insertions(+) create mode 100644 config/initializers/brotli.rb diff --git a/Gemfile b/Gemfile index 65ee29d58..1b2b60864 100644 --- a/Gemfile +++ b/Gemfile @@ -36,6 +36,9 @@ gem "image_optim_rails" # Use argon2 for password hashing gem "argon2" +# Support brotli compression for assets +gem "sprockets-exporters_pack" + # Load rails plugins gem "actionpack-page_caching", ">= 1.2.0" gem "activerecord-import" diff --git a/Gemfile.lock b/Gemfile.lock index 0d0587ad9..d2d443eb6 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -125,6 +125,7 @@ GEM actionpack (>= 5.2) activemodel (>= 5.2) brakeman (5.2.3) + brotli (0.4.0) browser (5.3.1) builder (3.2.4) bzip2-ffi (1.1.0) @@ -476,6 +477,9 @@ GEM sprockets (4.1.1) concurrent-ruby (~> 1.0) rack (> 1, < 3) + sprockets-exporters_pack (0.1.2) + brotli (>= 0.2.0) + sprockets (>= 4.0.0.beta3) sprockets-rails (3.4.2) actionpack (>= 5.2) activesupport (>= 5.2) @@ -590,6 +594,7 @@ DEPENDENCIES selenium-webdriver simplecov simplecov-lcov + sprockets-exporters_pack strong_migrations terser validates_email_format_of (>= 1.5.1) diff --git a/config/initializers/brotli.rb b/config/initializers/brotli.rb new file mode 100644 index 000000000..9e8125b14 --- /dev/null +++ b/config/initializers/brotli.rb @@ -0,0 +1,3 @@ +Rails.application.config.assets.configure do |env| + env.register_exporter %w[text/* application/javascript application/json application/xml image/x-icon image/svg+xml], Sprockets::ExportersPack::BrotliExporter +end From a9a00acf68ceee07d384ea8bcc52ca70508ccfb1 Mon Sep 17 00:00:00 2001 From: Andy Allan Date: Wed, 3 Aug 2022 19:49:46 +0100 Subject: [PATCH 24/68] Fix italic font styles This was missed during the bootstrap 5 upgrade --- app/views/browse/_common_details.html.erb | 2 +- app/views/browse/changeset.html.erb | 2 +- app/views/changesets/_changeset.html.erb | 2 +- app/views/traces/_trace.html.erb | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/app/views/browse/_common_details.html.erb b/app/views/browse/_common_details.html.erb index a4b8b2642..8aa5b64c7 100644 --- a/app/views/browse/_common_details.html.erb +++ b/app/views/browse/_common_details.html.erb @@ -3,7 +3,7 @@ #<%= common_details.version %> -

+

<% if common_details.changeset.tags["comment"].present? %> <%= linkify(common_details.changeset.tags["comment"]) %> <% else %> diff --git a/app/views/browse/changeset.html.erb b/app/views/browse/changeset.html.erb index 0861ed30f..4045c0b48 100644 --- a/app/views/browse/changeset.html.erb +++ b/app/views/browse/changeset.html.erb @@ -3,7 +3,7 @@ <%= render "sidebar_header", :title => t(".title", :id => @changeset.id) %>

-

+

<%= linkify(@changeset.tags["comment"].to_s.presence || t("browse.no_comment")) %>

<%= changeset_details(@changeset) %>

diff --git a/app/views/changesets/_changeset.html.erb b/app/views/changesets/_changeset.html.erb index a47a99d33..40ee4212a 100644 --- a/app/views/changesets/_changeset.html.erb +++ b/app/views/changesets/_changeset.html.erb @@ -11,7 +11,7 @@ end %> <%= tag.li :id => "changeset_#{changeset.id}", :data => { :changeset => changeset_data }, :class => "list-group-item" do %> -

+

<%= changeset.tags["comment"].to_s.presence || t("browse.no_comment") %> diff --git a/app/views/traces/_trace.html.erb b/app/views/traces/_trace.html.erb index 74e096dd1..ba14f214e 100644 --- a/app/views/traces/_trace.html.erb +++ b/app/views/traces/_trace.html.erb @@ -38,7 +38,7 @@ <%= safe_join(trace.tags.collect { |tag| link_to_tag tag.tag }, ", ") %> <% end %>

-

+

<%= trace.description %>

From a57d658a6c030e29a6c2bcedc8c90465e39cc2f4 Mon Sep 17 00:00:00 2001 From: "translatewiki.net" Date: Thu, 4 Aug 2022 13:13:39 +0200 Subject: [PATCH 25/68] Localisation updates from https://translatewiki.net. --- config/locales/be-Tarask.yml | 53 ++++++++++++++++++++---------------- config/locales/bn.yml | 3 ++ config/locales/br.yml | 10 +++---- config/locales/ja.yml | 2 +- 4 files changed, 39 insertions(+), 29 deletions(-) diff --git a/config/locales/be-Tarask.yml b/config/locales/be-Tarask.yml index 1279c4504..a1b90a231 100644 --- a/config/locales/be-Tarask.yml +++ b/config/locales/be-Tarask.yml @@ -30,6 +30,7 @@ be-Tarask: create: Рэгістрацыя update: Абнавіць doorkeeper_application: + create: Рэгістрацыя update: Абнавіць redaction: create: Стварыць рэдакцыю @@ -104,6 +105,7 @@ be-Tarask: language: Мова doorkeeper/application: name: Назва + redirect_uri: URI перанакіраваньняў scopes: Дазволы friend: user: Удзельнік @@ -544,7 +546,7 @@ be-Tarask: ferry_terminal: Паромная станцыя fire_station: Пажарны пастарунак fountain: Фантан - fuel: Запраўка + fuel: Заправачная станцыя grave_yard: Могілкі hospital: Шпіталь hunting_stand: Паляўнічая вежа @@ -658,8 +660,8 @@ be-Tarask: brownfield: Прамысловая забруджаная глеба cemetery: Могілкі commercial: Камэрцыйная тэрыторыя - conservation: Запаведнік - construction: Будаўніцтва + conservation: Запаведная зона + construction: Будаўнічая зона farmland: Фэрма farmyard: Гаспадарчае падвор’е forest: Лес @@ -812,7 +814,7 @@ be-Tarask: cosmetics: Касмэтычная крама department_store: Унівэрсальная крама discount: Крама тавараў са зьніжкамі - doityourself: Зрабі сам + doityourself: Крама „Зрабі сам“ dry_cleaning: Хімчыстка electronics: Крама электронікі estate_agent: Агенцтва нерухомасьці @@ -829,7 +831,7 @@ be-Tarask: grocery: Бакалея hairdresser: Цырульня hardware: Гаспадарчыя тавары - hifi: Крама аўдыё/відэё тэхнікі + hifi: Крама аўдыё/відэатэхнікі jewelry: Ювэлірная крама kiosk: Шапік laundry: Пральня @@ -856,7 +858,7 @@ be-Tarask: artwork: Твор мастацтва attraction: Славутасьць bed_and_breakfast: Танная гасьцініца - cabin: Кабіна + cabin: Турыстычная хатка camp_site: Кемпінг caravan_site: Пляцоўка для трэйлераў chalet: Шале @@ -969,6 +971,9 @@ be-Tarask: greeting: Вітаем, click_the_link: Калі гэта Вы, калі ласка, націсьніце на спасылку ніжэй, каб скінуць Ваш пароль. + changeset_comment_notification: + commented: + partial_changeset_without_comment: без камэнтароў confirmations: confirm: heading: Праверце электронную пошту! @@ -1120,6 +1125,8 @@ be-Tarask: heading: Выйсьці з OpenStreetMap logout_button: Выйсьці site: + about: + open_data_title: Адкрытыя зьвесткі copyright: foreign: title: Пра гэты пераклад @@ -1145,23 +1152,19 @@ be-Tarask: вынікі толькі на ўмовах такой жа ліцэнзіі. Поўны тэкст ліцэнзіі растлумачыць вам правы і адказнасьці. credit_title_html: Як спасылацца на OpenStreetMap - credit_1_html: |- - Мы патрабуем, каб - Вы пазначалі “© удзельнікі OpenStreetMap”. - credit_2_1_html: Мусіце таксама яўна пазначыць, што зьвесткі даступныя паводле - ліцэнзіі Open Database, а калі карыстаецеся нашымі кавалкамі мапаў, што - картаграфія ліцэнзаваная паводле CC BY-SA. Гэта можна зрабіць, спаслаўшыся - на гэтую старонку правоў. - Калі вы распаўсюджваеце OSM у фармаце зьвестак, вы мусіце разьмяшчаць наўпроставую - спасылку на ліцэнзіі. Калі вы выкарыстоўваеце носьбіты, дзе выкарыстаньне - спасылак немагчымае (напрыклад, друкаваныя працы), мы прапануем накіроўваць - вашых чытачоў на www.openstreetmap.org (магчымае выкарыстаньне поўнага адрасу - ‘OpenStreetMap’), на opendatacommons.org і, пры неабходнасьці, - на www.creativecommons.org. - credit_3_1_html: Фрагмэнты мапы ў “стандартным стылі” на www.openstreetmap.org - - гэта прадукт OpenStreetMap Foundation з выкарыстаньнем дадзеных OpenStreetMap - згодна з Open Database ліцэнзіяй. Пры выкарыстанні гэтага стылю мапы патрабуецца - такая ж спасылка, як і для дадзеных Open Database. + credit_1_html: 'Карыстаючыся зьвесткамі OpenStreetMap, вы павінны выканаць + дзьве ўмовы:' + credit_2_1_html: |- +
    +
  • Згадаць OpenStreetMap, пазначыўшы нашую нататку пра аўтарскае права.
    • +
  • Выразна зазначыць, што зьвесткі даступныя пад ліцэнзіяй Open Database License.
    • +
+ credit_3_1_html: Для паведамленьня пра аўтарскія правы маем розныя патрабаваньні + ў залежнасьці ад таго, як вы карыстаецеся нашымі зьвесткамі. Напрыклад, + калі вы стварылі праглядальную мапу, друкаваную мапу ці статычную выяву, + будуць дзейнічаць розныя правілы. Дэтальнае апісаньне патрабаваньняў можна + знайсьці на Кіраўніцтве + атрыбуцыямі. more_title_html: Даведацца болей more_1_html: Даведайцеся болей пра выкарыстаньне нашых зьвестак і пра спасыланьне на нас на старонцы ліцэнзіі @@ -1566,6 +1569,8 @@ be-Tarask: з-за \n падазронай актыўнасьці.\n

\n

\n Гэтае рашэньне можа быць хутка перагледжанае адміністратарам, ці\n Вы можаце зьвязацца з %{webmaster}, калі жадаеце гэта абмеркаваць.\n

" + auth_failure: + invalid_credentials: Хібныя аўтэнтыфікацыйныя зьвесткі user_role: filter: not_a_role: Радок «%{role}» не зьяўляецца слушнай роляй. @@ -1679,6 +1684,8 @@ be-Tarask: base: cycle_map: Роварная мапа transport_map: Транспартная мапа + layers: + data: Зьвесткі мапы site: edit_tooltip: Рэдагаваць мапу edit_disabled_tooltip: Павялічыць маштаб мапы для рэдагаваньня diff --git a/config/locales/bn.yml b/config/locales/bn.yml index f495a20d9..ab87078a1 100644 --- a/config/locales/bn.yml +++ b/config/locales/bn.yml @@ -498,6 +498,9 @@ bn: index: title_all: ওপেনস্ট্রিটম্যাপ পরিবর্তনধার্যের আলোচনা title_particular: 'ওপেনস্ট্রিটম্যাপ পরিবর্তনধার্য #%{changeset_id} আলোচনা' + timeout: + sorry: দুঃখিত, আপনার অনুরোধ করা চেঞ্জসেট মন্তব্যের তালিকা পুনরুদ্ধার করতে খুব + বেশি সময় লেগেছে। dashboards: contact: km away: '%{count}কিমি দূরে' diff --git a/config/locales/br.yml b/config/locales/br.yml index 36f7962d8..f43556737 100644 --- a/config/locales/br.yml +++ b/config/locales/br.yml @@ -166,11 +166,11 @@ br: datetime: distance_in_words_ago: about_x_hours: - one: war-dro un eurvezh 'zo - two: war-dro 2 eurvezh 'zo - few: war-dro %{count} eurvezh 'zo - many: war-dro %{count} eurvezh 'zo - other: war-dro %{count} eurvezh 'zo + one: war-dro un eurvezh zo + two: war-dro 2 eurvezh zo + few: war-dro %{count} eurvezh zo + many: war-dro %{count} eurvezh zo + other: war-dro %{count} eurvezh zo about_x_months: one: war-dro ur miz 'zo. two: war-dro 2 viz 'zo. diff --git a/config/locales/ja.yml b/config/locales/ja.yml index 5194c46f3..3b0855096 100644 --- a/config/locales/ja.yml +++ b/config/locales/ja.yml @@ -464,7 +464,7 @@ ja: reopened_by_html: '%{user}さんが%{when}に再開' reopened_by_anonymous_html: 誰かが%{when}に再開 hidden_by_html: '%{user}さんが%{when}に非表示化' - report: このメモを報告 + report: このノートを報告 query: title: 地物を検索 introduction: 地図上をクリックすると、近くの地物を探します。 From 7e0e7ac57b732df84af7bf6a195dd7c3ee17e7a0 Mon Sep 17 00:00:00 2001 From: "translatewiki.net" Date: Mon, 8 Aug 2022 13:11:52 +0200 Subject: [PATCH 26/68] Localisation updates from https://translatewiki.net. --- config/locales/be.yml | 22 +++++++++++++--------- config/locales/bn.yml | 6 +++--- config/locales/et.yml | 6 ++++++ config/locales/fr.yml | 5 ++++- config/locales/fy.yml | 5 ++++- config/locales/he.yml | 2 ++ config/locales/hi.yml | 5 ++++- config/locales/ia.yml | 5 ++++- config/locales/it.yml | 5 ++++- config/locales/mk.yml | 2 +- config/locales/nl.yml | 5 ++++- config/locales/pt-BR.yml | 2 +- config/locales/tr.yml | 5 ++++- config/locales/zh-CN.yml | 6 +++--- 14 files changed, 57 insertions(+), 24 deletions(-) diff --git a/config/locales/be.yml b/config/locales/be.yml index 306494269..2a5395381 100644 --- a/config/locales/be.yml +++ b/config/locales/be.yml @@ -37,6 +37,8 @@ be: client_application: create: Зарэгістравацца update: Абнавіць + doorkeeper_application: + update: Абнавіць redaction: create: Стварыць рэдакцыю update: Захаваць рэдакцыю @@ -114,8 +116,8 @@ be: public: Агульны description: Апісанне gpx_file: 'Даслаць GPX-файл:' - visibility: 'Бачнасць:' - tagstring: 'Тэгі:' + visibility: Бачнасць + tagstring: Тэгі message: sender: Ад title: Тэма @@ -127,14 +129,16 @@ be: details: Просьба прадставіць некаторыя падрабязнасці аб праблеме (абавязкова). user: email: Электронная пошта - new_email: 'Новы адрас электроннай пошты:' + new_email: Новы адрас электроннай пошты active: Актыўны display_name: Бачнае імя description: Апісанне - home_lat: 'Шырата:' - home_lon: 'Даўгата:' - languages: Мовы + home_lat: Шырата + home_lon: Даўгата + languages: Пераважныя мовы + preferred_editor: Пераважны рэдактар pass_crypt: Пароль + pass_crypt_confirmation: Пацвердзіце пароль help: trace: tagstring: падзеленыя коскамі @@ -250,8 +254,8 @@ be: edit: title: Правіць рахунак my settings: Мае настройкі - current email address: 'Бягучы адрас электроннай пошты:' - external auth: 'Знешняя Аўтэнтыфікацыя:' + current email address: Бягучы адрас электроннай пошты + external auth: Знешняя Аўтэнтыфікацыя openid: link: http://wiki.openstreetmap.org/wiki/OpenID link text: што гэта? @@ -411,7 +415,7 @@ be: reopened_by_html: Паўторна актывавана ўдзельнікам %{user} %{when} reopened_by_anonymous_html: Пераадкрыта ананімным удзельнікам %{when} hidden_by_html: Схавана ўдзельнікам %{user} %{when} - report: Паскардзіцца на гэтую заўвагу + report: паскардзіцца на гэтую заўвагу query: title: Пошук аб’ектаў introduction: Пстрыкніце на карце, каб атрымаць звесткі пра аб'екты паблізу. diff --git a/config/locales/bn.yml b/config/locales/bn.yml index ab87078a1..74c2a7454 100644 --- a/config/locales/bn.yml +++ b/config/locales/bn.yml @@ -870,7 +870,7 @@ bn: cycleway: সাইকেল রাস্তা elevator: লিফট emergency_access_point: জরুরি প্রবেশ স্থল - emergency_bay: জরুরি উপসাগর + emergency_bay: জরুরি বে footway: ফুটপাথ ford: ফোর্ড milestone: মাইলফলক @@ -905,7 +905,7 @@ bn: "yes": সড়ক historic: archaeological_site: প্রত্নতাত্ত্বিক স্থান - bomb_crater: ঐতিহাসিক বোমা গর্ত + bomb_crater: ঐতিহাসিক বোমার খাদ battlefield: যুদ্ধক্ষেত্র boundary_stone: সীমানাজ্ঞাপক পাথর building: ঐতিহাসিক ভবন @@ -1954,7 +1954,7 @@ bn: title: ব্যবহারকারীগণ heading: ব্যবহারকারীগণ summary_html: '%{ip_address} থেকে %{date} তারিখে %{name} তৈরি করেছেন' - summary_no_ip_html: '%{date}য়ে %{name}টি তৈরি হয়েছে' + summary_no_ip_html: '%{date}-এ %{name} তৈরি হয়েছে' confirm: নির্বাচিত ব্যবহারকারীদের নিশ্চিত করুন hide: নির্বাচিত ব্যবহারকারীদের লুকান empty: কোন সাদৃশ্যপূর্ণ ব্যবহারকারী পাওয়া যায়নি diff --git a/config/locales/et.yml b/config/locales/et.yml index b80f4135f..c4c0486d9 100644 --- a/config/locales/et.yml +++ b/config/locales/et.yml @@ -722,11 +722,13 @@ et: bus_stop: Bussipeatus construction: Ehitusjärgus tee corridor: Koridor + crossing: Ülekäik cycleway: Jalgrattatee elevator: Elevaator emergency_access_point: Hädaabi punkt footway: Jalgrada ford: Koolmekoht + give_way: Märk "Anna teed" living_street: Õueala milestone: Verstapost motorway: Kiirtee @@ -741,6 +743,7 @@ et: service: Teenindustee speed_camera: Kiiruskaamera steps: Trepp + stop: Stoppmärk street_lamp: Tänavavalgusti tertiary: Kohalik maantee traffic_signals: Valgusfoor @@ -924,6 +927,7 @@ et: car_repair: Autoparandus carpet: Vaibakauplus charity: Heategevuslik kauplus + cheese: Juustupood chemist: Apteek clothes: Riidepood computer: Arvutikauplus @@ -949,6 +953,7 @@ et: kiosk: Kiosk laundry: Pesumaja mall: Ostukeskus + massage: Massaaž mobile_phone: Mobiiltelefonide pood motorcycle: Mootorrattapood music: Muusikapood @@ -2335,6 +2340,7 @@ et: custom_dimensions: Vali suurus käsitsi format: 'Vorming:' scale: 'Mõõtkava:' + image_dimensions: Pildil näeb tavakaarti suurusega %{width} x %{height} download: Laadi alla short_url: Lühilink include_marker: Lisa marker diff --git a/config/locales/fr.yml b/config/locales/fr.yml index e14289535..96948c3eb 100644 --- a/config/locales/fr.yml +++ b/config/locales/fr.yml @@ -546,7 +546,7 @@ fr: reopened_by_html: Réactivée par %{user}, %{when} reopened_by_anonymous_html: Réactivée par un utilisateur anonyme, %{when} hidden_by_html: Masquée par %{user}, %{when} - report: Signaler cette note + report: signaler cette note coordinates_html: '%{latitude}, %{longitude}' query: title: Requête sur les objets @@ -3161,6 +3161,9 @@ fr: reactivate: Réactiver comment_and_resolve: Commenter et résoudre comment: Commenter + report_link_html: Si cette note contient des informations sensibles qui doivent + être supprimées, vous pouvez %{link}. Pour tous les autres problèmes avec + la note, veuillez le résoudre vous-même avec un commentaire. edit_help: Déplacez la carte et zoomez sur un emplacement que vous voulez modifier, puis cliquez dessus. directions: diff --git a/config/locales/fy.yml b/config/locales/fy.yml index 14c800a9a..da54a190c 100644 --- a/config/locales/fy.yml +++ b/config/locales/fy.yml @@ -448,7 +448,7 @@ fy: reopened_by_html: Weraktivearre troch %{user} %{when} reopened_by_anonymous_html: Weraktivearre troch anonym %{when} hidden_by_html: Ferburgen troch %{user} %{when} - report: Dizze notysje melde + report: dizze notysje melde query: title: Skaaimerken opfreegje introduction: Klik op 'e kaart foar skaaimerken fuortby. @@ -3043,6 +3043,9 @@ fy: reactivate: Weraktivearje comment_and_resolve: Reägearje & oplosse comment: Reägearje + report_link_html: At dizze notysje gefoelige ynformaasje befettet dy't fuorthelle + wurde moat, dan kinne jo %{link}. Los alle oare problemen mei de notysje + graach sels op fia in reäksje. edit_help: Sko de kaart en sûm yn op 'e lokaasje dy't jo bewurkje wolle, klik dan hjir. directions: diff --git a/config/locales/he.yml b/config/locales/he.yml index b93eecfae..1e9ae4924 100644 --- a/config/locales/he.yml +++ b/config/locales/he.yml @@ -3020,6 +3020,8 @@ he: reactivate: הפעלה מחדש comment_and_resolve: להגיב ולפתור comment: להגיב + report_link_html: אם ההערה הזאת מכילה מידע רגיש שיש להסיר, אפשר %{link}. עבור + כל שאר הבעיות עם ההערה, נא לפתור אותה בעצמך באמצעות הערה. edit_help: יש להזיז את המפה ולהתמקד על מיקום שברצונך לערוך ואז ללחוץ כאן. directions: ascend: מעלה diff --git a/config/locales/hi.yml b/config/locales/hi.yml index d79c826a9..1ca1feb5c 100644 --- a/config/locales/hi.yml +++ b/config/locales/hi.yml @@ -407,7 +407,7 @@ hi: द्वारा फिर चालू किया गया hidden_by_html: %{when} %{user} द्वारा छिपाया गया - report: इस नोट को रिपोर्ट करें + report: इस नोट को रिपोर्ट कर query: title: क्वेरी की सुविधाएँ introduction: आस-पास की सुविधाओं के लिए नक़्शे पर क्लिक करें @@ -1081,6 +1081,9 @@ hi: reactivate: 'पुन: सक्रिय करें' comment_and_resolve: टिप्पणी कर समाधान करें comment: जवाब देना + report_link_html: अगर इस नोट में संवेदनशील जानकारी है जिसे हटाना उचित है, + आप %{link} सकते हैं। नोट से जुड़ी दूसरी समस्याओं के लिए कृपया एक टिप्पणी + से उन्हें सुलझाएँ। directions: directions: रास्ता distance: दूरी diff --git a/config/locales/ia.yml b/config/locales/ia.yml index 94f43dd3f..c3b889600 100644 --- a/config/locales/ia.yml +++ b/config/locales/ia.yml @@ -452,7 +452,7 @@ ia: reopened_by_html: Reactivate per %{user} %{when} reopened_by_anonymous_html: Reactivate per un anonymo %{when} hidden_by_html: Celate per %{user} %{when} - report: Signalar iste nota + report: signalar iste nota query: title: Cercar objectos introduction: Clicca sur le carta pro cercar objectos a proximitate. @@ -3032,6 +3032,9 @@ ia: reactivate: Reactivar comment_and_resolve: Commentar e resolver comment: Commento + report_link_html: Si iste nota contine information sensibile que debe esser + removite, tu pote %{link}. Pro omne altere problemas con le nota, per favor + resolve lo tu mesme con un commento. edit_help: Displacia le carta e face zoom avante in un loco que tu vole modificar, postea clicca hic. directions: diff --git a/config/locales/it.yml b/config/locales/it.yml index 0b63e0420..c4b289926 100644 --- a/config/locales/it.yml +++ b/config/locales/it.yml @@ -508,7 +508,7 @@ it: reopened_by_html: Riattivata da %{user} %{when} reopened_by_anonymous_html: Riattivata da anonimo %{when} hidden_by_html: Nascosta da %{user} %{when} - report: Segnala questa nota + report: segnala questa nota coordinates_html: '%{latitude}, %{longitude}' query: title: Ricerca di elementi @@ -3095,6 +3095,9 @@ it: reactivate: Riattiva comment_and_resolve: Commenta e chiudi comment: Commenta + report_link_html: Se questa nota contiene informazioni sensibili che devono + essere rimosse, puoi %{link}. Per ogni altro tipo di problema con questa + nota, prova a risolverla di persona con un commento. edit_help: Sposta la mappa e usa lo zoom sulla posizione che vuoi modificare, quindi clicca qui. directions: diff --git a/config/locales/mk.yml b/config/locales/mk.yml index cb7026957..7036a9c53 100644 --- a/config/locales/mk.yml +++ b/config/locales/mk.yml @@ -455,7 +455,7 @@ mk: reopened_by_html: Преактивирано од %{user} %{when} reopened_by_anonymous_html: Преактивирано од анонимен %{when} hidden_by_html: Скриено од %{user} %{when} - report: Пријави го јазолов + report: пријави го јазолов coordinates_html: '%{latitude}, %{longitude}' query: title: Пребарување на елементи diff --git a/config/locales/nl.yml b/config/locales/nl.yml index 7e7e9d6a4..76edaeec9 100644 --- a/config/locales/nl.yml +++ b/config/locales/nl.yml @@ -512,7 +512,7 @@ nl: geactiveerd door anoniem hidden_by_html: %{when} ago verborgen door %{user} - report: Deze opmerking rapporteren + report: deze opmerking rapporteren query: title: Objecten opvragen introduction: Klik op de kaart om nabije objecten te vinden. @@ -3099,6 +3099,9 @@ nl: reactivate: Opnieuw activeren comment_and_resolve: Reageren en oplossen comment: Reageren + report_link_html: Als deze opmerking gevoelige informatie bevat die verwijderd + moet worden, kun je %{link}. Als er andere problemen zijn, kun je een reactie + achterlaten en haar als opgelost markeren. edit_help: Verplaats de kaart en zoom in op een plaats die u wilt bewerken. Klik daarna hier. directions: diff --git a/config/locales/pt-BR.yml b/config/locales/pt-BR.yml index 250f2b7fa..f04a15e1f 100644 --- a/config/locales/pt-BR.yml +++ b/config/locales/pt-BR.yml @@ -506,7 +506,7 @@ pt-BR: reopened_by_html: Reaberto por %{user} %{when} reopened_by_anonymous_html: Reaberto por um usuário anônimo %{when} hidden_by_html: Ocultado por %{user} %{when} - report: Denunciar esta nota + report: denunciar esta nota coordinates_html: '%{latitude}, %{longitude}' query: title: Consultar elementos diff --git a/config/locales/tr.yml b/config/locales/tr.yml index de49df266..786c8cf1f 100644 --- a/config/locales/tr.yml +++ b/config/locales/tr.yml @@ -505,7 +505,7 @@ tr: yeniden etkin hâle getirildi. hidden_by_html: '%{user} tarafından %{when} gizlendi' - report: Bu notu bildir + report: bu notu bildir coordinates_html: '%{latitude}, %{longitude}' query: title: Sorgu Özellikleri @@ -3098,6 +3098,9 @@ tr: reactivate: Yeniden etkinleştir comment_and_resolve: Yorum ve Çözüm comment: Yorum + report_link_html: Bu not, kaldırılması gereken hassas bilgiler içeriyorsa + %{link} bağlantısına tıklayınız. Notla ilgili diğer tüm sorunlar için lütfen + yorum yazarak çözmeye çalışınız. edit_help: Haritayı sürükleyip ve düzenleme yapmak istediğiniz konuma yakınlaştırdıktan sonra buraya tıklayın. directions: diff --git a/config/locales/zh-CN.yml b/config/locales/zh-CN.yml index 102447755..707e12c26 100644 --- a/config/locales/zh-CN.yml +++ b/config/locales/zh-CN.yml @@ -470,8 +470,8 @@ zh-CN: relation: 关系 start_rjs: feature_warning: 正在载入 %{num_features} 个要素，这可能使您的浏览器变慢或失去响应。您确定想要显示该数据吗？ - load_data: 载入数据 - loading: 正在载入... + load_data: 加载数据 + loading: 加载中… tag_details: tags: 标签 wiki_link: @@ -531,7 +531,7 @@ zh-CN: no_more: 未找到更多变更集。 no_more_area: 该区域内没有更多变更集。 no_more_user: 无该用户的更多修改集合。 - load_more: 载入更多 + load_more: 加载更多 timeout: sorry: 抱歉，您所请求的变更集列表检索时间过长。 changeset_comments: From 6795f4adc372d4da2cfafb366643a7e2974cd822 Mon Sep 17 00:00:00 2001 From: Tom Hughes Date: Tue, 9 Aug 2022 18:27:56 +0100 Subject: [PATCH 27/68] Update bundle --- Gemfile.lock | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index d2d443eb6..26ee43c4c 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -86,8 +86,8 @@ GEM autoprefixer-rails (10.4.7.0) execjs (~> 2) aws-eventstream (1.2.0) - aws-partitions (1.613.0) - aws-sdk-core (3.131.5) + aws-partitions (1.616.0) + aws-sdk-core (3.132.0) aws-eventstream (~> 1, >= 1.0.2) aws-partitions (~> 1, >= 1.525.0) aws-sigv4 (~> 1.1) @@ -215,10 +215,10 @@ GEM factory_bot_rails (6.2.0) factory_bot (~> 6.2.0) railties (>= 5.0.0) - faraday (2.4.0) - faraday-net_http (~> 2.0) + faraday (2.5.1) + faraday-net_http (>= 2.0, < 3.1) ruby2_keywords (>= 0.0.4) - faraday-net_http (2.1.0) + faraday-net_http (3.0.0) ffi (1.15.5) ffi-compiler (1.0.1) ffi (>= 1.0.0) @@ -354,9 +354,9 @@ GEM omniauth-oauth2 (~> 1.4) openstreetmap-deadlock_retry (1.3.1) parallel (1.22.1) - parser (3.1.2.0) + parser (3.1.2.1) ast (~> 2.4.1) - pg (1.4.2) + pg (1.4.3) popper_js (2.11.5) progress (3.6.0) public_suffix (4.0.7) @@ -420,17 +420,17 @@ GEM rexml (3.2.5) rinku (2.0.6) rotp (6.2.0) - rubocop (1.32.0) + rubocop (1.34.1) json (~> 2.3) parallel (~> 1.10) - parser (>= 3.1.0.0) + parser (>= 3.1.2.1) rainbow (>= 2.2.2, < 4.0) regexp_parser (>= 1.8, < 3.0) rexml (>= 3.2.5, < 4.0) - rubocop-ast (>= 1.19.1, < 2.0) + rubocop-ast (>= 1.20.0, < 2.0) ruby-progressbar (~> 1.7) unicode-display_width (>= 1.4.0, < 3.0) - rubocop-ast (1.19.1) + rubocop-ast (1.21.0) parser (>= 3.1.1.0) rubocop-minitest (0.21.0) rubocop (>= 0.90, < 2.0) @@ -460,8 +460,8 @@ GEM sprockets (> 3.0) sprockets-rails tilt - secure_headers (6.3.4) - selenium-webdriver (4.3.0) + secure_headers (6.4.0) + selenium-webdriver (4.4.0) childprocess (>= 0.5, < 5.0) rexml (~> 3.2, >= 3.2.5) rubyzip (>= 1.2.2, < 3.0) @@ -495,10 +495,10 @@ GEM tzinfo (2.0.5) concurrent-ruby (~> 1.0) unicode-display_width (2.2.0) - validates_email_format_of (1.7.0) + validates_email_format_of (1.7.2) i18n vendorer (0.2.0) - webmock (3.16.0) + webmock (3.17.1) addressable (>= 2.8.0) crack (>= 0.3.2) hashdiff (>= 0.4.0, < 2.0.0) From 386cf2975572f1f41b76122f0846be71f35ab7c4 Mon Sep 17 00:00:00 2001 From: "translatewiki.net" Date: Thu, 11 Aug 2022 13:13:40 +0200 Subject: [PATCH 28/68] Localisation updates from https://translatewiki.net. --- config/locales/bn.yml | 3 +++ config/locales/br.yml | 24 +++++++++++++++++++----- config/locales/eo.yml | 5 ++++- config/locales/hu.yml | 2 +- config/locales/it.yml | 2 +- config/locales/mk.yml | 3 +++ config/locales/pa.yml | 16 ++++++++-------- config/locales/pl.yml | 10 +++++++--- 8 files changed, 46 insertions(+), 19 deletions(-) diff --git a/config/locales/bn.yml b/config/locales/bn.yml index 74c2a7454..f307094c4 100644 --- a/config/locales/bn.yml +++ b/config/locales/bn.yml @@ -2050,6 +2050,9 @@ bn: resolve: মিমাংসা করুন reactivate: পুনঃসক্রিয় comment: মন্তব্য + report_link_html: যদি এই নোটটিতে সংবেদনশীল তথ্য থাকে যা অপসারণ করা উচিত, তাহলে + %{link}। নোটের সাথে অন্যান্য সমস্ত সমস্যার জন্য, দয়া করে একটি মন্তব্যের + মাধ্যমে এটি নিজেই সমাধান করুন৷ directions: engines: graphhopper_car: গাড়ি (GraphHopper) diff --git a/config/locales/br.yml b/config/locales/br.yml index f43556737..9b1e08f66 100644 --- a/config/locales/br.yml +++ b/config/locales/br.yml @@ -281,6 +281,13 @@ br: entry: comment: Evezhiadenn full: Notenn glok + account: + deletions: + show: + title: Dilemel ma c'hont + delete_account: Dilemel ar gont + confirm_delete: Sur oc'h? + cancel: Nullañ accounts: edit: title: Aozañ ar gont @@ -320,10 +327,13 @@ br: link text: Petra eo se ? save changes button: Enrollañ ar c'hemmoù make edits public button: Lakaat ma holl aozadennoù da vezañ foran + delete_account: Dilemel ar gont... update: success_confirm_needed: Hizivaet eo bet titouroù an implijer. Gwiriit ho posteloù evit kadarnaat ho chomlec'h postel nevez. success: Hizivaet eo bet titouroù an implijer. + destroy: + success: Kont dilamet. browse: created: Krouet closed: Serret @@ -805,7 +815,7 @@ br: warehouse: Sanailh "yes": Savadur club: - sport: Klub sport + sport: Kleub sport "yes": Klub craft: beekeeper: Gwenaner @@ -933,7 +943,7 @@ br: cemetery: Bered commercial: Takad kenwerzh conservation: Takad gwarezet - construction: Savadur + construction: Takad Savidigezh farmland: Douaroù-labour farmyard: Mereuri forest: Koadeg @@ -954,7 +964,7 @@ br: reservoir: Mirlenn reservoir_watershed: ↓Mirlec'h dour residential: Takad annez - retail: Kenwerzhioù + retail: Takad Kenwerzh village_green: Takad natur foran vineyard: Gwinieg "yes": Implij an douaroù @@ -1170,6 +1180,7 @@ br: platform: Savenn hent-houarn preserved: Hent-houarn miret proposed: Hent-houarn kinniget + rail: Hent-Houarn spur: Hent-houarn kevreañ station: Porzh-houarn stop: Porzh-houarn @@ -1218,7 +1229,7 @@ br: deli: Tineller department_store: Gourstal discount: Stal discount - doityourself: Stal bitellat + doityourself: Stal Bitellat dry_cleaning: Naetaat ent sec'h e-cigarette: Stal sigaretennoù tredanek electronics: Stal traoù eletronek @@ -1304,7 +1315,7 @@ br: artwork: Oberenn arz attraction: Tra zedennus bed_and_breakfast: Bod ha boued - cabin: Kabanenn + cabin: Kabanenn an Douristed camp_pitch: Tachenn-gampiñ camp_site: Tachenn gampiñ caravan_site: Tachenn karavanennoù @@ -1775,6 +1786,7 @@ br: ? update: success: Profil hizivaet. + failure: N'haller ket hizivaat ar profil. sessions: new: title: Kevreañ @@ -2181,6 +2193,7 @@ br: common: - prad - prad + - liorzh retail: Takad kenwerzh industrial: Takad greantel commercial: Takad kenwerzhel @@ -2340,6 +2353,7 @@ br: in: e-barzh index: public_traces: Roudoù GPS foran + my_gps_traces: Ma Roudoù GPS public_traces_from: Roudoù GPS foran gant %{user} description: Furchal ar roud GPS pellgarget nevez zo tagged_with: ' balizennet gant %{tags}' diff --git a/config/locales/eo.yml b/config/locales/eo.yml index f1f0454ab..e6d21cb56 100644 --- a/config/locales/eo.yml +++ b/config/locales/eo.yml @@ -467,7 +467,7 @@ eo: reopened_by_html: Remalfermita de %{user} %{when} reopened_by_anonymous_html: Remalfermita de anonimulo %{when} hidden_by_html: Kaŝita de %{user} %{when} - report: Raporti tiun ĉi rimarkon + report: raporti tiun ĉi rimarkon coordinates_html: '%{latitude}; %{longitude}' query: title: Informoj pri objektoj @@ -2990,6 +2990,9 @@ eo: reactivate: Remalfermi comment_and_resolve: Komenti kaj solvi comment: Komenti + report_link_html: Se tiu ĉi rimarko enhavas privatajn informojn, kiuj ne devas + esti publikigitaj, vi povas %{link}. Koncerne al ĉiuj aliaj problemoj pri + la rimarko – solu ilin mem per skribi komenton. edit_help: Movu la mapon kaj pligrandigu al loko kiun vi volas redakti, kaj poste alklaku tie ĉi. directions: diff --git a/config/locales/hu.yml b/config/locales/hu.yml index 4b8f7ff18..32316271f 100644 --- a/config/locales/hu.yml +++ b/config/locales/hu.yml @@ -475,7 +475,7 @@ hu: reopened_by_html: Újraaktiválta %{user}, %{when} reopened_by_anonymous_html: Újraaktiválva névtelenül, %{when} hidden_by_html: Elrejtette %{user}, %{when} - report: Jegyzet bejelentése + report: jegyzet bejelentése query: title: Objektumok lekérdezése introduction: Kattints a térképre a közeli objektumok megtalálásához. diff --git a/config/locales/it.yml b/config/locales/it.yml index c4b289926..46dd65ae2 100644 --- a/config/locales/it.yml +++ b/config/locales/it.yml @@ -508,7 +508,7 @@ it: reopened_by_html: Riattivata da %{user} %{when} reopened_by_anonymous_html: Riattivata da anonimo %{when} hidden_by_html: Nascosta da %{user} %{when} - report: segnala questa nota + report: segnalare questa nota coordinates_html: '%{latitude}, %{longitude}' query: title: Ricerca di elementi diff --git a/config/locales/mk.yml b/config/locales/mk.yml index 7036a9c53..a576129ce 100644 --- a/config/locales/mk.yml +++ b/config/locales/mk.yml @@ -3025,6 +3025,9 @@ mk: reactivate: Реактивирај comment_and_resolve: Коментирај и реши comment: Коментирај + report_link_html: Доколку оваа белешка содржи чувствителни информации кои + треба да се остранат, можете да %{link}. За сите други проблеми со белешката, + решете ги самите со коментар. edit_help: Поместете ја картата и приближете во местото што сакате да го уредите, па стиснете тука. directions: diff --git a/config/locales/pa.yml b/config/locales/pa.yml index be222edae..05029d421 100644 --- a/config/locales/pa.yml +++ b/config/locales/pa.yml @@ -193,14 +193,14 @@ pa: way: ਰਾਹ relation: ਸਬੰਧ changeset: ਚੇਂਜ਼ਸੈੱਟ - note: ਟਿੱਪਣੀ + note: ਨੋਟ timeout: type: node: ਨੋਡ way: ਰਾਹ relation: ਸਬੰਧ changeset: ਚੇਂਜ਼ਸੈੱਟ - note: ਟਿੱਪਣੀ + note: ਨੋਟ redacted: type: node: ਨੋਡ @@ -250,7 +250,7 @@ pa: show: leave_a_comment: ਕੋਈ ਟਿੱਪਣੀ ਛੱਡੋ login_to_leave_a_comment_html: ਟਿੱਪਣੀ ਛੱਡਣ ਵਾਸਤੇ %{login_link} - login: ਦਾਖ਼ਲਾ + login: ਲੌਗਇਨ no_such_entry: title: ਅਜਿਹਾ ਕੋਈ ਡਾਇਰੀ ਇੰਦਰਾਜ ਨਹੀਂ diary_entry: @@ -843,21 +843,21 @@ pa: no home location: ਤੁਸੀਂ ਆਪਣੇ ਘਰ ਦੀ ਸਥਿਤੀ ਨਹੀਂ ਦੱਸੀ ਹੈ। sessions: new: - title: ਦਾਖ਼ਲਾ - heading: ਦਾਖ਼ਲਾ + title: ਲੌਗਇਨ + heading: ਲੌਗਇਨ email or username: 'ਈਮੇਲ ਪਤਾ ਜਾਂ ਵਰਤੋਂਕਾਰ-ਨਾਂ:' password: 'ਪਛਾਣ-ਸ਼ਬਦ:' remember: ਮੈਨੂੰ ਯਾਦ ਰੱਖੋ lost password link: ਆਪਣਾ ਪਛਾਣ-ਸ਼ਬਦ ਗੁਆ ਦਿੱਤਾ? - login_button: ਦਾਖ਼ਲ ਹੋਵੋ + login_button: ਲੌਗਇਨ register now: ਹੁਣੇ ਰਜਿਸਟਰ ਕਰੋ new to osm: ਓਪਨ-ਸਟਰੀਟ-ਮੈਪ 'ਤੇ ਨਵੇਂ ਹੋ? create account minute: ਖਾਤਾ ਬਣਾਉ। ਸਿਰ਼ਫ ਇੱਕ ਮਿੰਟ ਲੱਗਦਾ ਹੈ। no account: ਖਾਤਾ ਨਹੀਂ ਹੈ? destroy: - title: ਲਾਗ ਆਊਟ + title: ਲੌਗਆਊਟ heading: OpenStreetMap ਤੋਂ ਬਾਹਰ ਜਾਓ - logout_button: ਵਿਦਾਈ + logout_button: ਲੌਗਆਊਟ site: about: next: ਅੱਗੇ diff --git a/config/locales/pl.yml b/config/locales/pl.yml index a94175ca4..40d4048ba 100644 --- a/config/locales/pl.yml +++ b/config/locales/pl.yml @@ -53,6 +53,7 @@ # Author: Strebski # Author: Teiron # Author: The Polish +# Author: Tsca # Author: Ty221 # Author: WaldiSt # Author: Woytecr @@ -342,8 +343,8 @@ pl: zostaną usunięte. delete_display_name: Twoja wyświetlana nazwa zostanie usunięta i będzie mogła być użyta przez inne konta. - retain_caveats: 'Jednak niektóre informacje o tobie będą zachowane na OpenStreetMap, - nawet po usunięciu konta:' + retain_caveats: 'Jednak niektóre informacje o Tobie pozostaną zachowane na + OpenStreetMap nawet po usunięciu konta:' retain_edits: Twoje ewentualne zmiany w bazie danych mapy zostaną zachowane. retain_traces: Twoje przesłane ślady zostaną zachowane. retain_diary_entries: Twoje ewentualne wpisy do dziennika i komentarze pod @@ -544,7 +545,7 @@ pl: reopened_by_html: Ponownie aktywowana przez %{user} %{when} reopened_by_anonymous_html: Ponownie aktywowana anonimowo %{when} hidden_by_html: Ukryte przez %{user} %{when} - report: Zgłoś tę uwagę + report: ją zgłosić coordinates_html: '%{latitude}, %{longitude}' query: title: Dane obiektów @@ -3128,6 +3129,9 @@ pl: reactivate: Ponownie aktywuj comment_and_resolve: Skomentuj i rozwiąż comment: Dodaj komentarz + report_link_html: Jeśli ta uwaga zawiera wrażliwe informacje, które należy + usunąć, możesz %{link}. W przypadku wszystkich innych problemów z tą uwagą, + rozwiąż ją z odpowiednim komentarzem. edit_help: Proszę przesunąć mapę i przybliżyć modyfikowane położenie, a następnie kliknąć tutaj. directions: From 31eb7cc11a524427ca11491fe1e9c98d7afbd2b8 Mon Sep 17 00:00:00 2001 From: "translatewiki.net" Date: Mon, 15 Aug 2022 13:12:09 +0200 Subject: [PATCH 29/68] Localisation updates from https://translatewiki.net. --- config/locales/bg.yml | 2 +- config/locales/br.yml | 18 ++++++++++-------- config/locales/fa.yml | 5 ++++- config/locales/pl.yml | 2 +- config/locales/ru.yml | 2 +- config/locales/uk.yml | 5 ++++- config/locales/yi.yml | 26 ++++++++++++++++++++++++++ config/locales/zh-TW.yml | 1 + 8 files changed, 48 insertions(+), 13 deletions(-) diff --git a/config/locales/bg.yml b/config/locales/bg.yml index 59bcd999a..c7579bc0a 100644 --- a/config/locales/bg.yml +++ b/config/locales/bg.yml @@ -374,7 +374,7 @@ bg: reopened_by_html: Повторно отворена от %{user} %{when} reopened_by_anonymous_html: Повторно отворена от анонимен %{when} hidden_by_html: Скрита от %{user} %{when} - report: Докладване на бележката + report: докладване на бележката coordinates_html: '%{latitude}, %{longitude}' query: title: Търсене на обекти diff --git a/config/locales/br.yml b/config/locales/br.yml index 9b1e08f66..5b3d5d924 100644 --- a/config/locales/br.yml +++ b/config/locales/br.yml @@ -468,7 +468,7 @@ br: reopened_by_anonymous_html: Adenaouet gant un den dizanv %{when} 'zo hidden_by_html: Kuzhet gant %{user} %{when} 'zo - report: Signaliñ an notenn-mañ + report: danevelliñ an notenn-mañ query: title: Arc'hweladurioù enklask introduction: Klikit war ar gartenn evit kavout arc'hweladurioù e-kichen. @@ -650,8 +650,8 @@ br: aeroway: aerodrome: Nijva airstrip: Leurenn bradañ - apron: ↓Parklec'h nijerezioù - gate: Dor + apron: Roudenn Aerborzh + gate: Dor Lestrañ hangar: Karrdi helipad: biñsporzh holding_position: Post gortoz @@ -659,7 +659,7 @@ br: runway: Hent taxilane: Forzh taksi taxiway: Hent-taksioù aerborzh - terminal: Terminal + terminal: Termenva Aerborzh amenity: animal_shelter: Lec'h-goudor evit al loened arts_centre: Kreizenn an arzoù @@ -709,7 +709,7 @@ br: ice_cream: Dienn skorn internet_cafe: Sibertavarn kindergarten: Liorzh ar vugale - language_school: Skol yezh + language_school: Skol Yezh library: Levraoueg love_hotel: Leti karantez marketplace: Marc'hallac'h @@ -1809,8 +1809,8 @@ br: war al liamm er postel kadarnaat, mar plij, evit gweredekaat ho kont, pe goulennit ur postel kadarnaat all . account is suspended: Digarezit, arsavet eo bet ho kont abalamour d'un obererezh - arvarus.
Kit e darempred gant ar webmaster - m'hoc'h eus c'hoant da gaozeal diwar-benn an dra-se. + arvarus.
Kit e darempred gant ar support m'hoc'h + eus c'hoant da gaozeal diwar-benn an dra-se. auth failure: Ho tigarez, met n'eus ket bet gallet hoc'h anavezout gant an titouroù pourchaset. openid_logo_alt: Kevreañ gant un OpenID @@ -2574,7 +2574,7 @@ br: my notes: ma notennoù my messages: Ma c'hemennadennoù my profile: Ma frofil - my settings: ma arventennoù + my settings: Ma arventennoù my comments: ma evezhiadennoù my_preferences: Ma fenndibaboù my_dashboard: Ma zaolenn-vourzh @@ -2615,6 +2615,7 @@ br: activate_user: Gweredekaat an implijer-mañ deactivate_user: Diweredekaat an implijer-mañ confirm_user: Kadarnaat an implijer-mañ + unconfirm_user: Digadarnaat an implijer-mañ hide_user: Kuzhat an implijer-mañ unhide_user: Diguzhat an implijer-mañ delete_user: Dilemel an implijer-mañ @@ -2653,6 +2654,7 @@ br: no_authorization_code: Kod aotre ebet unknown_signature_algorithm: Kod aotre dianav invalid_scope: Astenn dianav + unknown_error: Dilesadur sac'het auth_association: heading: N'eo ket kevredet ho ID ouzh ur gont OpenStreetMap. option_1: Ma'z oc'h un den nevez en OpenStreetMap, krouit ur gont nevez, mar diff --git a/config/locales/fa.yml b/config/locales/fa.yml index 81e59a60f..98157a181 100644 --- a/config/locales/fa.yml +++ b/config/locales/fa.yml @@ -490,7 +490,7 @@ fa: دوباره آن را فعال کرد hidden_by_html: %{when} %{user} آن را مخفی کرد - report: گزارش این یادداشت + report: این یادداشت را گزارش کنید query: title: پرس‌وجوی عارضه‌ها introduction: روی نقشه کلیک کنید تا عارضه‌های نزدیک را بیابید @@ -2973,6 +2973,9 @@ fa: reactivate: فعال‌سازی مجدد comment_and_resolve: نظر + حل شد comment: نظر + report_link_html: اگر این یادداشت حاوی اطلاعات حساسی است که باید حذف شود، + می‌توانید %{link}. برای سایر مشکلات مربوط به این یادداشت لطفاً خودتان همراه + با نوشتن نظر آن را حل کنید. edit_help: نقشه را جابه‌جا کنید و روی مکانی که می‌خواهید ویرایش نمایید بزرگنمایی کنید. سپس اینجا کلیک کنید. directions: diff --git a/config/locales/pl.yml b/config/locales/pl.yml index 40d4048ba..a52d7f656 100644 --- a/config/locales/pl.yml +++ b/config/locales/pl.yml @@ -343,7 +343,7 @@ pl: zostaną usunięte. delete_display_name: Twoja wyświetlana nazwa zostanie usunięta i będzie mogła być użyta przez inne konta. - retain_caveats: 'Jednak niektóre informacje o Tobie pozostaną zachowane na + retain_caveats: 'Jednak niektóre informacje o tobie pozostaną zachowane na OpenStreetMap nawet po usunięciu konta:' retain_edits: Twoje ewentualne zmiany w bazie danych mapy zostaną zachowane. retain_traces: Twoje przesłane ślady zostaną zachowane. diff --git a/config/locales/ru.yml b/config/locales/ru.yml index 9f458edc6..8f8210d56 100644 --- a/config/locales/ru.yml +++ b/config/locales/ru.yml @@ -571,7 +571,7 @@ ru: reopened_by_html: Переоткрыта %{user} %{when} reopened_by_anonymous_html: Переоткрыта анонимно %{when} hidden_by_html: Скрыта %{user} %{when} - report: Сообщить об этой заметке + report: пожаловаться на эту заметку query: title: Что здесь? introduction: Нажмите на карту, чтобы найти ближайшие объекты diff --git a/config/locales/uk.yml b/config/locales/uk.yml index be9df22ec..a4876c060 100644 --- a/config/locales/uk.yml +++ b/config/locales/uk.yml @@ -533,7 +533,7 @@ uk: reopened_by_html: Відновлено %{user} %{when} reopened_by_anonymous_html: Відновлено анонімом %{when} hidden_by_html: Приховано %{user} %{when} - report: Поскаржитися на цю нотатку + report: поскаржитися на цю нотатку coordinates_html: '%{latitude}, %{longitude}' query: title: Отримати об’єкти @@ -3129,6 +3129,9 @@ uk: reactivate: Поновити comment_and_resolve: Прокоментувати та Опрацювати comment: Коментар + report_link_html: Якщо ця нотатка містить конфіденційну інформацію, яку потрібно + видалити, ви можете %{link}. Всі інші проблеми з нотаткою вирішуйте самостійно + в коментарях. edit_help: Перемістіть мапу і наблизьтесь до місця, яке ви бажаєте змінити, потім клацніть тут. directions: diff --git a/config/locales/yi.yml b/config/locales/yi.yml index c9ef3eadb..7ff1e7a0c 100644 --- a/config/locales/yi.yml +++ b/config/locales/yi.yml @@ -59,6 +59,10 @@ yi: remote: name: ווייטקאנטראל description: ווייטקאנטראל (JOSM אדער Merkaartor) + account: + deletions: + show: + cancel: אַנולירן browse: created: געשאַפֿן closed: געשלאסן @@ -70,6 +74,9 @@ yi: view_history: ווייזן היסטאָריע view_details: ווייזן פרטים location: 'לאקאציע:' + changesets: + changeset_paging_nav: + showing_page: בלאַט %{page} geocoder: search_osm_nominatim: prefix: @@ -103,6 +110,12 @@ yi: destroy_button: אויסמעקן sent_message_summary: destroy_button: אויסמעקן + preferences: + edit: + cancel: אַנולירן + profiles: + edit: + cancel: אַנולירן sessions: new: password: 'פאַסווארט:' @@ -114,6 +127,10 @@ yi: questions: title: שאלות? traces: + edit: + cancel: אַנולירן + trace_paging_nav: + showing_page: בלאַט %{page} trace: public: עפֿנטלעך users: @@ -122,8 +139,17 @@ yi: continue: אײַנשרייבן terms: legale_select: 'וואוין־לאנד:' + user_role: + grant: + confirm: באַשטעטיקן + revoke: + confirm: באַשטעטיקן + user_blocks: + blocks: + showing_page: בלאַט %{page} javascripts: share: + cancel: אַנולירן image: בילד link: לינק אדער HTML long_link: לינק diff --git a/config/locales/zh-TW.yml b/config/locales/zh-TW.yml index 27fee15cc..5f0ad4589 100644 --- a/config/locales/zh-TW.yml +++ b/config/locales/zh-TW.yml @@ -2834,6 +2834,7 @@ zh-TW: reactivate: 重新開啟 comment_and_resolve: 評論並解決 comment: 評論 + report_link_html: 如果此註記含有需要移除的敏感資訊，您可以%{link}。對於註記的所有其他問題，您可以依據評論內容來自行處理。 edit_help: 將地圖移至你想編輯的位置並放大，然後按這裡。 directions: ascend: 上升 From 159ef16601b7b7157ce9d766db97c4189d145e42 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 15 Aug 2022 23:00:49 +0000 Subject: [PATCH 30/68] Bump eslint from 8.21.0 to 8.22.0 Bumps [eslint](https://github.com/eslint/eslint) from 8.21.0 to 8.22.0. - [Release notes](https://github.com/eslint/eslint/releases) - [Changelog](https://github.com/eslint/eslint/blob/main/CHANGELOG.md) - [Commits](https://github.com/eslint/eslint/compare/v8.21.0...v8.22.0) --- updated-dependencies: - dependency-name: eslint dependency-type: direct:development update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- yarn.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/yarn.lock b/yarn.lock index 2e1f1890b..f4acb0bd2 100644 --- a/yarn.lock +++ b/yarn.lock @@ -234,9 +234,9 @@ eslint-visitor-keys@^3.3.0: integrity sha512-mQ+suqKJVyeuwGYHAdjMFqjCyfl8+Ldnxuyp3ldiMBFKkvytrXUZWaiPCEav8qDHKty44bD+qV1IP4T+w+xXRA== eslint@^8.0.0: - version "8.21.0" - resolved "https://registry.yarnpkg.com/eslint/-/eslint-8.21.0.tgz#1940a68d7e0573cef6f50037addee295ff9be9ef" - integrity sha512-/XJ1+Qurf1T9G2M5IHrsjp+xrGT73RZf23xA1z5wB1ZzzEAWSZKvRwhWxTFp1rvkvCfwcvAUNAP31bhKTTGfDA== + version "8.22.0" + resolved "https://registry.yarnpkg.com/eslint/-/eslint-8.22.0.tgz#78fcb044196dfa7eef30a9d65944f6f980402c48" + integrity sha512-ci4t0sz6vSRKdmkOGmprBo6fmI4PrphDFMy5JEq/fNS0gQkJM3rLmrqcp8ipMcdobH3KtUP40KniAE9W19S4wA== dependencies: "@eslint/eslintrc" "^1.3.0" "@humanwhocodes/config-array" "^0.10.4" From c815101381c7cbbbc2c486e27c0db3bb695e24f7 Mon Sep 17 00:00:00 2001 From: Tom Hughes Date: Tue, 16 Aug 2022 19:20:51 +0100 Subject: [PATCH 31/68] Update bundle --- Gemfile.lock | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index 26ee43c4c..08b7747ad 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -86,7 +86,7 @@ GEM autoprefixer-rails (10.4.7.0) execjs (~> 2) aws-eventstream (1.2.0) - aws-partitions (1.616.0) + aws-partitions (1.618.0) aws-sdk-core (3.132.0) aws-eventstream (~> 1, >= 1.0.2) aws-partitions (~> 1, >= 1.525.0) @@ -124,7 +124,7 @@ GEM bootstrap_form (5.1.0) actionpack (>= 5.2) activemodel (>= 5.2) - brakeman (5.2.3) + brakeman (5.3.1) brotli (0.4.0) browser (5.3.1) builder (3.2.4) @@ -215,7 +215,7 @@ GEM factory_bot_rails (6.2.0) factory_bot (~> 6.2.0) railties (>= 5.0.0) - faraday (2.5.1) + faraday (2.5.2) faraday-net_http (>= 2.0, < 3.1) ruby2_keywords (>= 0.0.4) faraday-net_http (3.0.0) @@ -420,14 +420,14 @@ GEM rexml (3.2.5) rinku (2.0.6) rotp (6.2.0) - rubocop (1.34.1) + rubocop (1.35.0) json (~> 2.3) parallel (~> 1.10) parser (>= 3.1.2.1) rainbow (>= 2.2.2, < 4.0) regexp_parser (>= 1.8, < 3.0) rexml (>= 3.2.5, < 4.0) - rubocop-ast (>= 1.20.0, < 2.0) + rubocop-ast (>= 1.20.1, < 2.0) ruby-progressbar (~> 1.7) unicode-display_width (>= 1.4.0, < 3.0) rubocop-ast (1.21.0) From 778f6a8e36d1a35e555a1ed98d00db28254090dc Mon Sep 17 00:00:00 2001 From: Kiel Hurley Date: Wed, 17 Aug 2022 13:19:25 +1200 Subject: [PATCH 32/68] Correct name in graphhopper.js When using directions, the footer says "Directions courtesy of Graphhopper" --- app/assets/javascripts/index/directions/graphhopper.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/assets/javascripts/index/directions/graphhopper.js b/app/assets/javascripts/index/directions/graphhopper.js index 9a09c1009..11d600316 100644 --- a/app/assets/javascripts/index/directions/graphhopper.js +++ b/app/assets/javascripts/index/directions/graphhopper.js @@ -14,7 +14,7 @@ function GraphHopperEngine(id, vehicleType) { return { id: id, - creditline: "Graphhopper", + creditline: "GraphHopper", draggable: false, getRoute: function (points, callback) { From 09324c9530e104992f65897752d30f58aabba5ec Mon Sep 17 00:00:00 2001 From: "translatewiki.net" Date: Thu, 18 Aug 2022 13:13:08 +0200 Subject: [PATCH 33/68] Localisation updates from https://translatewiki.net. --- config/locales/bn.yml | 3 +++ config/locales/cs.yml | 3 ++- config/locales/id.yml | 55 +++++++++++++++++++++++--------------- config/locales/ja.yml | 49 +++++++++++++++++++++++---------- config/locales/ku-Latn.yml | 6 ++--- config/locales/zh-CN.yml | 9 ++++--- 6 files changed, 82 insertions(+), 43 deletions(-) diff --git a/config/locales/bn.yml b/config/locales/bn.yml index f307094c4..566b1d115 100644 --- a/config/locales/bn.yml +++ b/config/locales/bn.yml @@ -1864,6 +1864,7 @@ bn: auth no password: তৃতীয় কোনো পদ্ধতিতে লগইন সক্রিয় থাকলে পাসওয়ার্ড বাধ্যতামূলক নয়, কিন্তু অতিরিক্ত কিছু সরঞ্জাম এবং সার্ভারের জন্য কখনো প্রয়োজন হতে পারে। continue: নিবন্ধন করুন + terms accepted: নতুন অবদানকারী শর্তাবলী গ্রহণ করার জন্য ধন্যবাদ! terms: title: শর্তাবলী heading: শর্তাবলী @@ -1917,6 +1918,7 @@ bn: remove as friend: বন্ধু থেকে বাদ দিন add as friend: বন্ধু যোগ করুন mapper since: 'এ থেকে মানচিত্র বানাচ্ছেন:' + ct status: 'অবদানকারী শর্তাবলী:' ct undecided: সিদ্ধান্তহীন ct declined: বাতিলকৃত latest edit: 'সর্বশেষ সম্পাদনা করেন (%{ago}):' @@ -2037,6 +2039,7 @@ bn: map: layers: data: মানচিত্র উপাত্ত + terms: ওয়েবসাইট ও এপিআই শর্তাবলী site: edit_tooltip: মানচিত্রটি সম্পাদনা করুন changesets: diff --git a/config/locales/cs.yml b/config/locales/cs.yml index 1e8f9f49b..cfadccc42 100644 --- a/config/locales/cs.yml +++ b/config/locales/cs.yml @@ -17,6 +17,7 @@ # Author: Jaroslav Cerny # Author: Jezevec # Author: Jkjk +# Author: Kareyac # Author: Korytaacheck # Author: Kudlav # Author: Kuvaly @@ -503,7 +504,7 @@ cs: reopened_by_anonymous_html: Znovu aktivoval %{when} anonym hidden_by_html: Skryl %{when} uživatel %{user} - report: Nahlásit tuto poznámku + report: nahlásit tuto poznámku coordinates_html: '%{latitude}, %{longitude}' query: title: Průzkum prvků diff --git a/config/locales/id.yml b/config/locales/id.yml index d5ce073a2..0c2adf764 100644 --- a/config/locales/id.yml +++ b/config/locales/id.yml @@ -469,7 +469,7 @@ id: yang lalu hidden_by_html: Disembunyikan oleh %{user} %{when} yang lalu - report: Laporkan catatan ini + report: laporkan catatan ini query: title: Fitur Kueri introduction: Klik di peta untuk mencari fitur terdekat. @@ -1305,7 +1305,7 @@ id: artwork: Karya Seni attraction: Atraksi bed_and_breakfast: Penginapan untuk Tidur dan Sarapan - cabin: Kabin + cabin: Kabin Turis camp_pitch: Perkemahan camp_site: Perkemahan caravan_site: Tempat Karavan @@ -1945,25 +1945,26 @@ id: Dokumentasi kami dilisensikan di bawah Creative Commons Attribution-ShareAlike 2.0 lisensi (CC BY-SA 2.0). credit_title_html: Cara memberikan kredit pada OpenStreetMap - credit_1_html: Kami mewajibkan Anda untuk menggunakan kredit “© - Kontributor OpenStreetMap”. - credit_2_1_html: Anda juga harus memperjelas bahwa data tersedia di bawah - Lisensi Database Terbuka, dan jika menggunakan tiles peta kami, kartografi - berlisensi sebagai CC-BY-SA. Anda dapat melakukannya dengan menghubungkan - ke halaman hak cipta. - Alternatifnya, dan sebagai sebuah persyaratan jika Anda mendistribusikan - OSM dalam bentuk data, Anda dapat menamakan dan menghubungkannya langsung - pada lisensinya. Pada media yang tidak memungkinkan tautan (misalnya hasil - cetak), kami menyarankan Anda untuk mengarahkan pembaca Anda pada openstreetmap.org - (mungkin dengan memperluas halaman 'OpenStreetMap' secara penuh), untuk - opendatacommons.org, dan jika relevan, untuk creativecommons.org. - credit_3_1_html: |- - Tile peta dalam “gaya standar” di www.openstreetmap.org adalah - Karya Produksi oleh OpenStreetMap Foundation menggunakan data OpenStreetMap - di bawah Open Database License. Ketika menggunakan gaya peta ini, atribusi yang sama diharuskan untuk data peta. - credit_4_html: |- - Untuk peta elektronik dapat ditelusuri, kredit harus muncul di sudut peta. - Sebagai contoh: + credit_1_html: 'Ketika Anda menggunakan data OpenStreetMap, Anda diwajibkan + untuk melakukan dua hal berikut:' + credit_2_1_html: "
    \n
  • Berikan kredit kepada OpenStreetMap dengan + menampilkan pemberitahuan hak cipta kami.
    • \n
  • Jelaskan bahwa data + tersedia di bawah Lisensi Open Database.
    • \n
" + credit_3_1_html: Untuk pemberitahuan hak cipta, kami memiliki persyaratan + yang berbeda tentang bagaimana ini harus ditampilkan, tergantung pada bagaimana + Anda menggunakan data kami. Misalnya, aturan yang berbeda berlaku tentang + cara menampilkan pemberitahuan hak cipta bergantung pada apakah Anda membuat + peta yang dapat dijelajahi, peta yang dicetak, atau gambar statis. Detail + lengkap tentang persyaratan dapat ditemukan di Pedoman + Atribusi . + credit_4_html: 'Untuk memperjelas bahwa data tersedia di bawah Lisensi Open + Database, Anda dapat menautkan ke halaman + hak cipta. Cara lainnya, dan diwajibkan jika Anda mendistribusikan OSM + dalam bentul data, Anda bisa menyebut nama dan tautan ke lisensi. Dalam + media yang tidak memungkinkan tautan (contohnya: karya cetak), kami menyarankan + Anda mengarahkan pembaca Anda ke openstreetmap.org (mungkin dengan memperluas + tulisan ''OpenStreetMap'' menjadi alamat lengkap) dan opendatacommons.org. + Dalam contoh ini, kreditnya ditampilkan di pojok peta.' attribution_example: alt: Contoh tentang bagaimana memberikan atribusi untuk OpenStreetMap pada halaman web @@ -2239,6 +2240,7 @@ id: common: - Umum - Padang rumput + - kebun retail: Area pertokoan industrial: Kawasan industri commercial: Area komersial @@ -2399,6 +2401,7 @@ id: in: dalam index: public_traces: Jejak GPS Umum + my_gps_traces: Jejak GPS Saya public_traces_from: Jejak GPS Umum dari %{user} description: Ramban unggahan jejak GPS terbaru. tagged_with: di tag dengan %{tags} @@ -2409,6 +2412,7 @@ id: all_traces: Semua Jejak my_traces: Jejak Saya traces_from: Jejak Publik dari %{user} + remove_tag_filter: Hapus Filter Tag destroy: scheduled_for_deletion: Trek yang dijadwalkan untuk dihapus make_public: @@ -2526,6 +2530,9 @@ id: oauth2_applications: index: title: Aplikasi Klien Saya + no_applications_html: Apakah anda memiliki aplikasi yang ingin didaftarkan untuk + digunakan dengan menggunakan standar %{oauth2}? Anda harus mendaftarkan aplikasi + web Anda sebelum dapat membuat permintaan OAuth untuk layanan ini. new: Daftarkan aplikasi baru name: Nama permissions: Izin @@ -2542,7 +2549,12 @@ id: delete: Hapus confirm_delete: Hapus aplikasi ini? client_id: ID Klien + client_secret: Rahasia Klien + client_secret_warning: Pastikan untuk menyimpan rahasia ini - ia tidak akan + dapat diakses lagi permissions: Izin + not_found: + sorry: Maaf, aplikasi itu tidak dapat ditemukan. oauth2_authorizations: new: title: Butuh Izin @@ -2704,6 +2716,7 @@ id: suspended: title: Akun Ditangguhkan heading: Akun Ditangguhkan + support: dukung body_html: "

\n Maaf, akun Anda telah ditangguhkan secara otomatis dikarenakan \n aktivitas yang mencurigakan. \n

\n

\n Keputusan ini akan ditinjau ulang oleh seorang administrator sesaat lagi, atau\n anda dapat menghubungi diff --git a/config/locales/ja.yml b/config/locales/ja.yml index 3b0855096..6cbdd9592 100644 --- a/config/locales/ja.yml +++ b/config/locales/ja.yml @@ -297,7 +297,18 @@ ja: deletions: show: title: 自分のアカウントを削除する + warning: 警告！アカウントの削除プロセスは最終的なものであり、元に戻すことはできません。 delete_account: アカウントを削除 + delete_introduction: 下のボタンを使用してご自分の OpenStreetMap アカウントを削除できます。次の詳細に注意してください。 + delete_profile: アバター、説明、自宅の場所などのプロフィール情報が削除されます。 + delete_display_name: 表示名は削除され、他のアカウントで再利用できます。 + retain_caveats: ただし、アカウントが削除された後でも、あなたに関する一部の情報は OpenStreetMap に保持されます（以下ご参照）。 + retain_edits: マップ データベースへの編集内容は保持されます。 + retain_traces: アップロードされたトレースがあれば、保持されます。 + retain_diary_entries: 日記のエントリと日記のコメントがある場合は保持されますが、表示されません。 + retain_notes: 日記のエントリと日記のコメントがある場合は保持されますが、表示されません。 + retain_changeset_discussions: 変更セットのディスカッションがあれば、保持されます。 + retain_email: メールアドレスは保持されます。 confirm_delete: 本当によろしいですか? cancel: キャンセル accounts: @@ -923,6 +934,7 @@ ja: trailhead: トレイル終始点 trunk: 国道 trunk_link: 国道 + turning_circle: ロータリー turning_loop: 環形ターミナル unclassified: 未分類の道路 "yes": 道路 @@ -1911,15 +1923,20 @@ ja: ドキュメントは、Creative Commons Attribution-ShareAlike 2.0 ライセンス (CC BY-SA 2.0) に基づいてライセンスされます。 credit_title_html: OpenStreetMap のクレジット表記の仕方 - credit_1_html: '“© OpenStreetMap contributors”のクレジットを必ず使用してください。' - credit_2_1_html: あなたはデータが Open Database License に基づいて提供されていること、そして地図タイルを使用する場合は、地図画像が - CC BY-SA としてライセンスされていることを明確にしなければなりません。著作権表示ページにリンクすることでこれを表現することができます。また、データの形式でOpenStreetMapを配布する場合の要件として、名前を表示の上、ライセンスに直接リンクすることができます。リンクを張れないメディア（印刷など）の場合は、openstreetmap.org（OpenStreetMapをアドレスとして展開した形）、opendatacommons.org、さらに関連がある場合はcreativecommons.orgへ読者を誘導することをお勧めします。 + credit_1_html: OpenStreetMap を使う場所では、以下の2つの条件を必ず守ってください。 + credit_2_1_html: |- +

    +
  • 私たちの著作権表示ページを掲載し、OpenStreetMap にクレジットがあることを示してください。
    • +
  • データはライセンス要件である Open Database License に基づいて提供されていることを明示してください。
    • +
credit_3_1_html: |- - www.openstreetmap.org に載っている“standard style” の地図のタイルは、OpenStreetMap財団によるオープンデータベース・ライセンス（Open Database License）に準拠してOSMデータ（OpenStreetMap data ）を使用した作成物（Produced Work）です。もし皆さんがこれらのタイルを利用する場合は、以下の継承を表示してください。 - “Base map and data from OpenStreetMap and OpenStreetMap Foundation”。 + 著作権表示に関しては、皆さんが私たちのデータをどう使われるかによって、その表示要件が異なります。たとえば皆さんが新しく作成した地図は利用者が動かせるかどうか（browsable）、地図を印刷した、静止画像の地図を作成したなど、それぞれに適用されるルールが異なります。表示要件の詳細は + 帰属のガイドラインをご参照ください。 credit_4_html: |- - 閲覧可能な電子地図の場合は、地図の隅にクレジットを表示してください。 - 例: + あなたはデータが Open Database License に基づいて提供されていることを明示するため + この著作権ページにリンクしてください。もしくは OSM をデータ形式で配布する場合の必須条件として、直接、それぞれのライセンス条項の名前を提示しリンクしてください。リンク付与が不可能な媒体の場合は（例：印刷物ほか）、読者の皆さんに openstreetmap.orgを読むよう（「OpenStreetMap」という文言を連絡先URLに置換してもよい）、また opendatacommons.org + をお勧めしてください。左の丸カッコ内の処理例ですと、地図の隅に著作権表示が印刷されます。 attribution_example: alt: ウェブページに OpenStreetMap を記述する方法の例 title: 権利表示の例 @@ -1938,9 +1955,10 @@ ja: BY)、Land Vorarlberg、Land Tirol (ライセンス CC BY AT with amendments) によるデータを含みます。' - contributors_au_html: 'オーストラリア: PSMA - Australia Limitedを出典とするデータはCC - BY 4.0のもとオーストラリア連邦政府の許諾を得ています。' + contributors_au_html: 'オーストラリア: 行政管轄の境界（Administrative Boundaries）の組み入れもしくは採用した開発において©PSMA + Australia Limitedを出典とするデータはクリエイティブ・コモンズ表示 + 4.0 国際 (CC BY 4.0)のもとオーストラリア連邦政府の許諾を得ています。' contributors_ca_html: 'カナダ: GeoBase®、GeoGratis (© Department of Natural Resources Canada)、CanVec (© Department of Natural Resources Canada)、StatCan (Geography Division, Statistics Canada) によるデータを含みます。' @@ -1971,8 +1989,8 @@ ja: infringement_1_html: 'OpenStreetMapの協力者は、著作権者から明確な許諾を得ずに、著作権のある情報源 (例: Google マップや印刷された地図) から決してデータを持ち込まないよう注意するものとします。' infringement_2_html: もし著作権のある素材がOpenStreetMapのデータベースや本サイトに不正に追加されたとお考えの場合は、却下手順をお読みになるか、オンライン却下のページから直接申し立てを行ってください。 + href="https://wiki.osmfoundation.org/wiki/Takedown_procedure">却下手順をお読みになるか、オンライン却下のページから直接申し立てを行ってください。 trademarks_title_html: 商標 trademarks_1_html: OpenStreetMapならびに拡大鏡のロゴおよびState of the MapはOpenStreetMap財団の登録商標です。商標の利用に関しては、商標利用ポリシーを参照ください。 @@ -2279,6 +2297,7 @@ ja: in: 'タグ:' index: public_traces: 公開GPSトレース + my_gps_traces: 自作のGPSトレース public_traces_from: '%{user}さんによる公開GPSトレース' description: 最近のGPSトレースのアップロードを参照 tagged_with: (タグ %{tags} が付いているもの) @@ -2311,7 +2330,7 @@ ja: require_admin: not_an_admin: この作業を行うには、管理者になる必要があります。 setup_user_auth: - blocked_zero_hour: OpenStreetMapウィブサイトにて緊急のお知らせがあります。編集を保存するにはお知らせを読んでください。 + blocked_zero_hour: OpenStreetMap Web サイトに緊急のメッセージがあります。まずメッセージを読まないと、編集内容を保存することができません。 blocked: APIへのアクセスがブロックされました。Web インターフェイスからログインし直して詳細を確認してください。 need_to_see_terms: あなたは一時的にAPIの利用を停止されています。ウェブインターフェイスにログインして協力者規約をご覧ください。同意しなくてもかまいませんが、必ずご覧ください。 settings_menu: @@ -2470,7 +2489,7 @@ ja: read_tou: 私は利用規約を読み終え、これに同意します consider_pd: 上記に加え、私の投稿をパブリック ドメインとします consider_pd_why: これは何ですか? - consider_pd_why_url: https://www.osmfoundation.org/wiki/License/Why_would_I_want_my_contributions_to_be_public_domain + consider_pd_why_url: https://wiki.osmfoundation.org/wiki/Licence_and_Legal_FAQ/Why_would_I_want_my_contributions_to_be_public_domain guidance_html: この規約の理解を助ける情報として、要約 (英語) や 非公式の翻訳 をご覧ください。 continue: 続行 @@ -2541,6 +2560,7 @@ ja: deactivate_user: この利用者を無効化 confirm_user: このユーザーを確認 unconfirm_user: このユーザーへの承認を取り消す + unsuspend_user: このユーザーの権限停止を解除 hide_user: この利用者を表示しない unhide_user: このユーザーを再表示 delete_user: この利用者を削除 @@ -2803,6 +2823,7 @@ ja: reactivate: 再有効化 comment_and_resolve: コメント & 解決 comment: コメント + report_link_html: このメモに削除が必要な機密情報が含まれている場合は、%{link}してください。メモに関する他の問題については、すべてコメントを付けてご自分で解決してください。 edit_help: 編集したい位置に移動してズームインしてから、ここをクリックしてください。 directions: ascend: 上り坂 diff --git a/config/locales/ku-Latn.yml b/config/locales/ku-Latn.yml index b5a7b3334..aba322b3a 100644 --- a/config/locales/ku-Latn.yml +++ b/config/locales/ku-Latn.yml @@ -472,7 +472,7 @@ ku-Latn: ji nû ve hate aktîvkirin hidden_by_html: Ji aliyê %{user} ve %{when} hate veşartin - report: Vê nîşeyê gilî bike + report: vê nîşeyê gilî bike query: title: Taybetmendiyan Nîşan Bide introduction: Ji bo ku hûn taybetmendiyên din yên nêzîkî bibînin, bitikînin @@ -2040,8 +2040,8 @@ ku-Latn: Belgekirinên di nexşeya me de, di bin lîsansa Creative Commons Attribution-ShareAlike 2.0 (CC BY-SA 2.0) de hatiye lîsanskirin. credit_title_html: Em çawan wekî çavkaniyekê behsa OpenStreetMapê bikin - credit_1_html: Ji bo referansgirtinê divê tu wisa binivîsîː “© - beşarên OpenStreetMapê ”. + credit_1_html: 'Li cihê ku daneya OpenStreetMapê bi kar bînî, divê van du + tiştan bikî:' credit_2_1_html: Herwiha divê hûn zelal bikin ku daneyên me di bin lîsansa Open Database License de hatiye lîsanskirin, û eger karoyên nexşeya me were emilandin, diyar bikin ku ev kartografî jî bi CC BY-SA hatiye lîsanskirin. diff --git a/config/locales/zh-CN.yml b/config/locales/zh-CN.yml index 707e12c26..fd8fd478c 100644 --- a/config/locales/zh-CN.yml +++ b/config/locales/zh-CN.yml @@ -93,7 +93,7 @@ zh-CN: create: 发布 update: 更新 issue_comment: - create: 添加批注 + create: 添加评论 message: create: 发送 client_application: @@ -636,7 +636,7 @@ zh-CN: title: '%{user} 已添加日记评论' heading: '%{user} 的日记评论' subheading_html: '%{user} 已添加日记评论' - no_comments: 没有日记留言 + no_comments: 没有日记评论 post: 发布 when: 时间 comment: 评论 @@ -2354,7 +2354,7 @@ zh-CN: allow_to: 允许客户应用程序： allow_read_prefs: 读取您的用户首选项。 allow_write_prefs: 修改您的用户首选项。 - allow_write_diary: 创建日记文章，评论和交朋友。 + allow_write_diary: 创建日记，评论和交朋友。 allow_write_api: 修改地图。 allow_read_gpx: 读取您的私人 GPS 轨迹。 allow_write_gpx: 上传 GPS 轨迹。 @@ -2375,7 +2375,7 @@ zh-CN: scopes: read_prefs: 阅读用户首选项 write_prefs: 修改用户首选项 - write_diary: 创建日记条目、评论和交朋友 + write_diary: 创建日记、评论和交朋友 write_api: 修改地图 read_gpx: 读取私人GPS轨迹 write_gpx: 上传GPS轨迹 @@ -2831,6 +2831,7 @@ zh-CN: reactivate: 重启 comment_and_resolve: 评论与解决 comment: 评论 + report_link_html: 如果此注记包含需要被移除的敏感信息，您可以%{link}。对于注记的所有其他问题，您可以依据评论内容来自行处理。 edit_help: 移动地图并在您想编辑的位置放大，然后点击这里。 directions: ascend: 上升 From 0734a83fbf7b4861154c835e9e725b984d6a446c Mon Sep 17 00:00:00 2001 From: "translatewiki.net" Date: Mon, 22 Aug 2022 13:12:29 +0200 Subject: [PATCH 34/68] Localisation updates from https://translatewiki.net. --- config/locales/br.yml | 3 ++- config/locales/da.yml | 5 ++++- config/locales/de.yml | 5 ++++- config/locales/id.yml | 41 +++++++++++++++++++++++++---------------- config/locales/sc.yml | 20 ++++++++++++++++++++ config/locales/tt.yml | 20 +++++++++++++------- 6 files changed, 68 insertions(+), 26 deletions(-) diff --git a/config/locales/br.yml b/config/locales/br.yml index 5b3d5d924..2de1f0829 100644 --- a/config/locales/br.yml +++ b/config/locales/br.yml @@ -7,6 +7,7 @@ # Author: Fulup # Author: Gwendal # Author: Gwenn-Ael +# Author: Huñvreüs # Author: Iriep # Author: Macofe # Author: McDutchie @@ -1266,7 +1267,7 @@ br: locksmith: alc'hwezer lottery: Lotiri mall: Palier kenwerzh - massage: Kemenadenn + massage: Kemennadenn medical_supply: Stal dafar yec'hed mobile_phone: Stal pellgomzerioù hezoug money_lender: Amprestañ arc'hant diff --git a/config/locales/da.yml b/config/locales/da.yml index 262286811..09ebd14a4 100644 --- a/config/locales/da.yml +++ b/config/locales/da.yml @@ -478,7 +478,7 @@ da: reopened_by_html: Genaktiveret af %{user} %{when} reopened_by_anonymous_html: Genaktiveret af anonym %{when} hidden_by_html: Skjult af %{user} %{when} - report: Rapporter denne bemærkning + report: rapportere denne bemærkning query: title: Find kortobjekter introduction: Klik på kortet for at finde kortobjekter i nærheden. @@ -3049,6 +3049,9 @@ da: reactivate: Genaktiver comment_and_resolve: Kommentere på og løse comment: Kommenter + report_link_html: Hvis denne bemærkning indeholder følsomme oplysninger, der + skal fjernes, kan du %{link}. For alle andre problemer med bemærkningen, + bedes du løse det selv med en kommentar. edit_help: Flyt kortet og zoom ind på et sted, du vil redigere, og klik så her. directions: ascend: Stigning diff --git a/config/locales/de.yml b/config/locales/de.yml index 761aa0102..8d6dd3aa1 100644 --- a/config/locales/de.yml +++ b/config/locales/de.yml @@ -539,7 +539,7 @@ de: reopened_by_html: Reaktiviert von %{user} %{when} reopened_by_anonymous_html: Reaktiviert von Anonym %{when} hidden_by_html: Versteckt von %{user} %{when} - report: Diesen Hinweis melden + report: diesen Hinweis melden query: title: Objektabfrage introduction: Klicke auf die Karte, um benachbarte Objekte zu finden. @@ -3153,6 +3153,9 @@ de: reactivate: Reaktivieren comment_and_resolve: Kommentieren & Erledigen comment: Kommentieren + report_link_html: Wenn diese Notiz vertrauliche Informationen enthält, die + entfernt werden müssen, kannst du %{link}. Alle anderen Probleme mit der + Notiz löse bitte selbst mit einem Kommentar. edit_help: Wähle eine höhere Zoomstufe und verschiebe die Karte an einen Ort, den du bearbeiten möchtest, und klicke hier. directions: diff --git a/config/locales/id.yml b/config/locales/id.yml index 0c2adf764..2e2c52bf8 100644 --- a/config/locales/id.yml +++ b/config/locales/id.yml @@ -35,6 +35,7 @@ # Author: Rizkiahmadz # Author: Shinkiwa # Author: Vasanthi +# Author: Veracious # Author: Wulankhairunisa # Author: 아라 --- @@ -62,18 +63,18 @@ id: create: Daftar update: Perbarui redaction: - create: Membuat Redaksi - update: Simpan Redaksi + create: Membuat redaksi + update: Simpan redaksi trace: - create: Upload + create: Unggah update: Simpan Perubahan user_block: - create: Buat blokir - update: Perbarui blokir + create: Buat blok + update: Perbarui blok activerecord: errors: messages: - invalid_email_address: tidak tampak sebagai alamat e-mail yang sah + invalid_email_address: nampaknya bukan alamat surel yang sah email_address_not_routable: tidak dapat dirutekan models: acl: Daftar Kontrol Akses @@ -86,11 +87,11 @@ id: issue: Masalah language: Bahasa message: Pesan - node: Node/Titik - node_tag: Tag node/titik - notifier: Pemberitahuan - old_node: Node/Titik Lama - old_node_tag: Tag Node/Titik Lama + node: Titik noda + node_tag: Tag titik noda + notifier: Pemberitahu + old_node: Titik noda Lama + old_node_tag: Tag Titik noda Lama old_relation: Relasi Lama old_relation_member: Anggota Relasi Lama old_relation_tag: Tag Relasi Lama @@ -100,7 +101,7 @@ id: relation: Relasi relation_member: Anggota Relasi relation_tag: Tag Relasi - report: Laporan + report: Laporkan session: Sesi trace: Jejak tracepoint: Titik Digitasi @@ -162,6 +163,7 @@ id: category: 'Pilih alasan laporan Anda:' details: Silakan berikan rincian tentang masalah (wajib). user: + auth_uid: UID Otentikasi email: Email email_confirmation: Konfirmasi Surel new_email: Alamat Surel Baru @@ -397,7 +399,7 @@ id: relation_member: entry_role_html: '%{type} %{name} sebagai %{role}' type: - node: Node/Titik + node: Titik noda way: Way/Garis relation: Relasi containing_relation: @@ -595,7 +597,7 @@ id: location: location: 'Lokasi:' view: Lihat - edit: Edit + edit: Sunting feed: user: title: Entri catatan harian OpenStreetMap untuk %{user} @@ -668,6 +670,7 @@ id: taxiway: Landas hubung terminal: Terminal Bandara amenity: + animal_boarding: Penitipan Hewan animal_shelter: Tempat Perlindungan Hewan arts_centre: Pusat Kesenian atm: ATM @@ -835,9 +838,11 @@ id: brewery: Pabrik Bir carpenter: Tukang Kayu caterer: Jasa Boga + dressmaker: Pembuat baju electrician: Tukang Listrik electronics_repair: Servis Elektronik gardener: Tukang Kebun + glaziery: Toko kaca handicraft: Kerajinan Tangan painter: Tukang Cat photographer: Fotografer @@ -846,6 +851,7 @@ id: shoemaker: Perajin Sepatu tailor: Penjahit window_construction: Konstruksi Jendela + winery: Kilang anggur "yes": Toko Kerajinan emergency: access_point: Titik Akses @@ -1024,6 +1030,7 @@ id: gasometer: Kilang kiln: Tanur lighthouse: Mercusuar + manhole: Lubang Got mine: Tambang mineshaft: Lubang Bukaan Tambang monitoring_station: Stasiun Pengawas @@ -1277,6 +1284,7 @@ id: pawnbroker: Rumah Gadai perfumery: Toko Parfum pet: Toko Hewan + pet_grooming: Perawatan Hewan Peliharaan photo: Studio Foto seafood: Boga Bahari second_hand: Toko loak @@ -1286,6 +1294,7 @@ id: stationery: Toko Alat Tulis supermarket: Supermarket tailor: Penjahit + tattoo: Studio Tato tea: Toko Teh ticket: Toko Tiket tobacco: Toko Tembakau @@ -1471,7 +1480,7 @@ id: sign_up: Mendaftar start_mapping: Mulai Pemetaan sign_up_tooltip: Buat akun untuk mengedit - edit: Edit + edit: Sunting history: Riwayat export: Ekspor issues: Masalah @@ -3069,7 +3078,7 @@ id: tenth: ke-10 time: Waktu tempuh query: - node: Node/Titik + node: Titik noda way: Jalan relation: Relasi nothing_found: Tidak ada fasilitas yang ditemukan diff --git a/config/locales/sc.yml b/config/locales/sc.yml index 3e11c1357..5c85f0a47 100644 --- a/config/locales/sc.yml +++ b/config/locales/sc.yml @@ -163,10 +163,30 @@ sc: entry: comment: Cummentu full: Nota intrea + account: + deletions: + show: + confirm_delete: Seguru ses? accounts: edit: + my settings: Preferèntzias meas + openid: + link: https://wiki.openstreetmap.org/wiki/OpenID + link text: ite est custu? + public editing: + heading: Modificatzione pùblica + enabled link: https://wiki.openstreetmap.org/wiki/Anonymous_edits + enabled link text: ite est custu? + disabled: Inabilitadu e chene permissu de mudare sos datos; totu sas modìficas + antepostas sunt anònimas. + disabled link text: pro ite non potzo fàghere modìficas? + public editing note: + heading: Modificatzione pùblica contributor terms: heading: Règulas po contribuire + agreed: As atzetadu sos tèrmines noos de collaboratzione. + not yet agreed: No as galu atzetadu sos tèrmines noos de collaboratzione. + link text: ite est custu? save changes button: Sarva sas modìficas make edits public button: Fais totu sas modìficas meas pùblicas delete_account: Boga su contu... diff --git a/config/locales/tt.yml b/config/locales/tt.yml index 07546f8fd..62d496251 100644 --- a/config/locales/tt.yml +++ b/config/locales/tt.yml @@ -10,10 +10,13 @@ tt: formats: friendly: '%e %B %Y сәгать %H:%M' helpers: + file: + prompt: Файлны сайлагыз submit: diary_comment: create: Саклау diary_entry: + create: Бастыру update: Яңарту issue_comment: create: Шәрехне өстәү @@ -21,7 +24,10 @@ tt: create: Җибәрү client_application: create: Теркәлү - update: Үзгәртү + update: Яңарту + doorkeeper_application: + create: Теркәлү + update: Яңарту trace: create: Төяү update: Үзгәрешләрне саклау @@ -62,13 +68,13 @@ tt: trace: user: Кулланучы visible: Күренүчәнлек - name: Исем + name: Файл исеме size: Зурлык latitude: Киңлек longitude: Озынлык description: Тасвир - gpx_file: 'GPX файлын төяү:' - tagstring: 'Тамгалар:' + gpx_file: GPX файлын төяү + tagstring: Тамгалар message: sender: Җибәрүче title: Тема @@ -215,8 +221,8 @@ tt: my friends: Дусларым diary_entries: form: - location: 'Урын:' - use_map_link: Харитада күрсәтергә + location: Урын + use_map_link: Хаританы кулланырга index: title: Көндәлекләр title_friends: Дуслар көндәлекләре @@ -247,7 +253,7 @@ tt: prefix: aeroway: aerodrome: Аэродром - apron: Перрон + apron: Аэропорт перроны gate: Утыруга чыгу hangar: Ангар helipad: Боралак мәйданчыгы From 651c6b0d4c3cae766385d47d5d7043c8d80d9437 Mon Sep 17 00:00:00 2001 From: Tom Hughes Date: Tue, 23 Aug 2022 20:40:50 +0100 Subject: [PATCH 35/68] Update bundle --- Gemfile.lock | 35 ++++++++++++++++------------------- 1 file changed, 16 insertions(+), 19 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index 08b7747ad..6b5a62a4e 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -74,8 +74,8 @@ GEM i18n (>= 1.6, < 2) minitest (>= 5.1) tzinfo (~> 2.0) - addressable (2.8.0) - public_suffix (>= 2.0.2, < 5.0) + addressable (2.8.1) + public_suffix (>= 2.0.2, < 6.0) annotate (3.2.0) activerecord (>= 3.2, < 8.0) rake (>= 10.4, < 14.0) @@ -86,8 +86,8 @@ GEM autoprefixer-rails (10.4.7.0) execjs (~> 2) aws-eventstream (1.2.0) - aws-partitions (1.618.0) - aws-sdk-core (3.132.0) + aws-partitions (1.621.0) + aws-sdk-core (3.134.0) aws-eventstream (~> 1, >= 1.0.2) aws-partitions (~> 1, >= 1.525.0) aws-sigv4 (~> 1.1) @@ -105,12 +105,11 @@ GEM coderay (>= 1.0.0) erubi (>= 1.0.0) rack (>= 0.9.0) - better_html (1.0.16) - actionview (>= 4.0) - activesupport (>= 4.0) + better_html (2.0.1) + actionview (>= 6.0) + activesupport (>= 6.0) ast (~> 2.0) erubi (~> 1.4) - html_tokenizer (~> 0.0.6) parser (>= 2.4) smart_properties binding_of_caller (1.0.0) @@ -180,7 +179,7 @@ GEM dry-logic (1.2.0) concurrent-ruby (~> 1.0) dry-core (~> 0.5, >= 0.5) - dry-schema (1.9.3) + dry-schema (1.10.2) concurrent-ruby (~> 1.0) dry-configurable (~> 0.13, >= 0.13.0) dry-core (~> 0.5, >= 0.5) @@ -199,10 +198,9 @@ GEM dry-core (~> 0.5, >= 0.5) dry-initializer (~> 3.0) dry-schema (~> 1.8, >= 1.8.0) - erb_lint (0.1.3) + erb_lint (0.2.0) activesupport - better_html (~> 1.0.7) - html_tokenizer + better_html (>= 2.0.1) parser (>= 2.7.1.4) rainbow rubocop @@ -232,7 +230,6 @@ GEM activesupport (>= 5.0) hashdiff (1.0.1) hashie (5.0.0) - html_tokenizer (0.0.7) htmlentities (4.3.4) http_accept_language (2.1.1) i18n (1.12.0) @@ -286,8 +283,8 @@ GEM mini_magick (4.11.0) mini_mime (1.1.2) mini_portile2 (2.8.0) - minitest (5.16.2) - msgpack (1.5.4) + minitest (5.16.3) + msgpack (1.5.6) multi_json (1.15.0) multi_xml (0.6.0) net-imap (0.2.3) @@ -359,8 +356,8 @@ GEM pg (1.4.3) popper_js (2.11.5) progress (3.6.0) - public_suffix (4.0.7) - puma (5.6.4) + public_suffix (5.0.0) + puma (5.6.5) nio4r (~> 2.0) quad_tile (1.0.1) r2 (0.2.7) @@ -420,7 +417,7 @@ GEM rexml (3.2.5) rinku (2.0.6) rotp (6.2.0) - rubocop (1.35.0) + rubocop (1.35.1) json (~> 2.3) parallel (~> 1.10) parser (>= 3.1.2.1) @@ -498,7 +495,7 @@ GEM validates_email_format_of (1.7.2) i18n vendorer (0.2.0) - webmock (3.17.1) + webmock (3.18.1) addressable (>= 2.8.0) crack (>= 0.3.2) hashdiff (>= 0.4.0, < 2.0.0) From a0d0dee8869a0199262aad57f23752c2b4a390ef Mon Sep 17 00:00:00 2001 From: Andy Allan Date: Wed, 24 Aug 2022 14:05:19 +0100 Subject: [PATCH 36/68] Return to issue index if you can't view reassigned issue Fixes #3652 --- app/controllers/issue_comments_controller.rb | 17 ++++++++++++++--- config/locales/en.yml | 1 + test/system/issues_test.rb | 17 +++++++++++++++++ 3 files changed, 32 insertions(+), 3 deletions(-) diff --git a/app/controllers/issue_comments_controller.rb b/app/controllers/issue_comments_controller.rb index 3a6b357f9..a4bb6a5ed 100644 --- a/app/controllers/issue_comments_controller.rb +++ b/app/controllers/issue_comments_controller.rb @@ -11,9 +11,20 @@ class IssueCommentsController < ApplicationController comment = @issue.comments.build(issue_comment_params) comment.user = current_user comment.save! - notice = t(".comment_created") - reassign_issue(@issue) if params[:reassign] - redirect_to @issue, :notice => notice + + if params[:reassign] + reassign_issue(@issue) + flash[:notice] = t ".issue_reassigned" + + if current_user.has_role? @issue.assigned_role + redirect_to @issue + else + redirect_to issues_path + end + else + flash[:notice] = t(".comment_created") + redirect_to @issue + end end private diff --git a/config/locales/en.yml b/config/locales/en.yml index 9db476748..ea85cef19 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -1436,6 +1436,7 @@ en: issue_comments: create: comment_created: Your comment was successfully created + issue_reassigned: Your comment was created and the issue was reassigned reports: new: title_html: "Report %{link}" diff --git a/test/system/issues_test.rb b/test/system/issues_test.rb index f539dd739..e93e92a69 100644 --- a/test/system/issues_test.rb +++ b/test/system/issues_test.rb @@ -125,10 +125,27 @@ class IssuesTest < ApplicationSystemTestCase check :reassign click_on "Add Comment" + assert_content "and the issue was reassigned" + assert_current_path issues_path + issue.reload assert_equal "moderator", issue.assigned_role end + def test_reassign_issue_as_super_user + issue = create(:issue) + sign_in_as(create(:super_user)) + + visit issue_path(issue) + + fill_in :issue_comment_body, :with => "reassigning to moderators" + check :reassign + click_on "Add Comment" + + assert_content "and the issue was reassigned" + assert_current_path issue_path(issue) + end + def test_issue_index_with_multiple_roles user1 = create(:user) user2 = create(:user) From efea7cd33b1f92a4faea54bdca544b243ad4119c Mon Sep 17 00:00:00 2001 From: "translatewiki.net" Date: Thu, 25 Aug 2022 13:13:13 +0200 Subject: [PATCH 37/68] Localisation updates from https://translatewiki.net. --- config/locales/et.yml | 2 + config/locales/fr.yml | 1 + config/locales/ia.yml | 2 + config/locales/is.yml | 5 +- config/locales/my.yml | 22 ++++ config/locales/nl.yml | 2 + config/locales/sc.yml | 261 ++++++++++++++++++++++++++++++++++++++- config/locales/zh-TW.yml | 1 + 8 files changed, 289 insertions(+), 7 deletions(-) diff --git a/config/locales/et.yml b/config/locales/et.yml index c4c0486d9..6ac3607a4 100644 --- a/config/locales/et.yml +++ b/config/locales/et.yml @@ -4,6 +4,7 @@ # Author: AivoK # Author: Avjoska # Author: Kanne +# Author: Kareyac # Author: Luckas # Author: Macofe # Author: MidnightRaver @@ -702,6 +703,7 @@ et: university: Ülikoolihoone "yes": Hoone craft: + blacksmith: Sepana brewery: Pruulikoda carpenter: Puusepp electrician: Elektrik diff --git a/config/locales/fr.yml b/config/locales/fr.yml index 96948c3eb..4f848d6f0 100644 --- a/config/locales/fr.yml +++ b/config/locales/fr.yml @@ -1574,6 +1574,7 @@ fr: issue_comments: create: comment_created: Votre commentaire a bien été créé. + issue_reassigned: Votre commentaire a été créé et le problème a été réattribué reports: new: title_html: Rapport %{link} diff --git a/config/locales/ia.yml b/config/locales/ia.yml index c3b889600..0728d1e84 100644 --- a/config/locales/ia.yml +++ b/config/locales/ia.yml @@ -1474,6 +1474,8 @@ ia: issue_comments: create: comment_created: Tu commento ha essite create + issue_reassigned: Tu commento ha essite create e le reporto de problema ha essite + reassignate reports: new: title_html: Reportar %{link} diff --git a/config/locales/is.yml b/config/locales/is.yml index 224a8e586..cda9cdee5 100644 --- a/config/locales/is.yml +++ b/config/locales/is.yml @@ -473,7 +473,7 @@ is: reopened_by_html: Endurvirkjað af %{user} %{when} reopened_by_anonymous_html: Endurvirkjað af nafnlausum notanda fyrir %{when} hidden_by_html: Falið af %{user} %{when} - report: Tilkynna þennan minnispunkt + report: tilkynnt þennan minnispunkt coordinates_html: '%{latitude}, %{longitude}' query: title: Rannsaka fitjur @@ -3073,6 +3073,9 @@ is: reactivate: Virkja aftur comment_and_resolve: Athugasemd & leysa comment: Athugasemd + report_link_html: Ef þessi minnispunktur inniheldur viðkvæmar upplýsingar + sem þarf að fjarlægja geturðu %{link}. Fyrir öll önnur vandamál með minnispunktinn, + skaltu leysa það sjálf/ur með athugasemd. edit_help: Færðu kortið og stilltu aðdrátt inn á staðinn sem þú vilt breyta, smelltu síðan hér. directions: diff --git a/config/locales/my.yml b/config/locales/my.yml index 0b2cb28fe..86981247d 100644 --- a/config/locales/my.yml +++ b/config/locales/my.yml @@ -8,6 +8,8 @@ --- my: helpers: + file: + prompt: ဖိုင်ရွေးပါ submit: diary_comment: create: သိမ်းရန် @@ -21,6 +23,9 @@ my: client_application: create: မှတ်ပုံတင်ရန် update: မွမ်းမံ + doorkeeper_application: + create: မှတ်ပုံတင်ရန် + update: မွမ်းမံ trace: create: တင်ရန် update: ပြောင်းလဲမှုများကို သိမ်းရန် @@ -107,6 +112,12 @@ my: editor: remote: name: အဝေး ထိန်းချုပ် + auth: + providers: + none: တစ်ခုမှမဟုတ် + google: ဂူဂဲလ် + facebook: ဖေ့ဘုတ် + wikipedia: ဝီကီပီးဒီးယား api: notes: comment: @@ -115,8 +126,14 @@ my: entry: comment: မှတ်ချက် full: မှတ်စု အပြည့်အစုံ + account: + deletions: + show: + confirm_delete: သေချာပါသလား + cancel: မလုပ်တော့ပါ accounts: edit: + title: အကောင့်ကို ပြင်ဆင်ရန် current email address: လက်ရှိ အီးမေးလ်လိပ်စာ save changes button: ပြောင်းလဲမှုများကို သိမ်းရန် browse: @@ -268,7 +285,9 @@ my: grave_yard: သုဿန် hospital: ဆေးရုံ ice_cream: ရေခဲမုန့် + internet_cafe: အင်တာနက်ကဖေး kindergarten: မူလတန်းကျောင်း + language_school: ဘာသာစကားကျောင်း library: စာကြည့်တိုက် marketplace: စျေးတန်း monastery: ဘုန်းကြီးကျောင်း @@ -299,6 +318,8 @@ my: viaduct: တောင်ကြားလမ်း "yes": တံတား building: + house: အိမ် + roof: ခေါင်မိုး "yes": အဆောက်ဦး craft: brewery: ဘီယာချက်စက်ရုံ @@ -365,6 +386,7 @@ my: embankment: တာရိုး lighthouse: မီးပြတိုက် pipeline: ပိုက်လိုင်း + telescope: အဝေးကြည့်မှန်ပြောင်း tower: မျှော်စင် watermill: ရေဒလက်စက် water_well: ရေတွင်း diff --git a/config/locales/nl.yml b/config/locales/nl.yml index 76edaeec9..21b1a6588 100644 --- a/config/locales/nl.yml +++ b/config/locales/nl.yml @@ -1532,6 +1532,8 @@ nl: issue_comments: create: comment_created: Uw reactie is succesvol aangemaakt + issue_reassigned: Uw commentaar is aangemaakt en de probleemrapportage is opnieuw + toegewezen reports: new: title_html: Rapporteer %{link} diff --git a/config/locales/sc.yml b/config/locales/sc.yml index 5c85f0a47..c6928eaa7 100644 --- a/config/locales/sc.yml +++ b/config/locales/sc.yml @@ -31,6 +31,7 @@ sc: update: Agiorna redaction: create: Crea una revisione + update: Sarva sa cuadura trace: create: Càrriga update: Sarva sas modìficas @@ -41,14 +42,21 @@ sc: errors: messages: invalid_email_address: non paret èssere un'indiritzu de posta eletrònica vàlidu + email_address_not_routable: non si podet incarrerare models: acl: Lista de Controllu de Atzessu + changeset: Grupu de modìficas + changeset_tag: Eticheta de su grupu de modìficas country: Istadu + diary_comment: Cummentu in su diàriu + diary_entry: Intrada in su diàriu friend: Amigu + issue: Problema language: Limba message: Messàgiu node: Nodu node_tag: Etichetta de su nodu + notifier: Notificadore old_node: Nodu betzu old_node_tag: Etichetta betza de su nodu old_relation: Relata betza @@ -60,37 +68,48 @@ sc: relation: Relata relation_member: Membru de sa relata relation_tag: Eticheta de sa relata + report: Informe session: Sessione trace: Sestadu tracepoint: Puntu de su sestadu tracetag: Eticheta de su sestadu - user: Impreadore - user_preference: Preferèntzias de s'impreadore - user_token: Còdighe de s'impreadore + user: Utente + user_preference: Preferèntzias de s'utente + user_token: Còdighe de s'utente way: Caminu way_node: Nodu de su caminu way_tag: Eticheta de sa bia attributes: client_application: + name: Nùmene (obligatòriu) + url: URL printzipale de s'aplicatzione (obligatòriu) + callback_url: URL de torrada support_url: URL de apògiu + allow_read_prefs: lèghere sas preferèntzias tuas de utente + allow_write_prefs: modificare sas preferèntzias tuas de utente. allow_write_diary: iscrii pàginas de cuotidianu, cumentus e fai amigus allow_write_api: modìfica sa mapa + allow_read_gpx: lèghere sas rastas GPS privadas issoro + allow_write_gpx: carrigare rastas GPS + allow_write_notes: modificare sas notas diary_comment: body: Corpus diary_entry: - user: Impreadore + user: Utente title: 'Sugetu:' latitude: Latitùdine longitude: Longitùdine language: Limba doorkeeper/application: name: Nùmene + redirect_uri: Torrare a indiritzare URIs + confidential: Aplicatzione cunfidentziale? scopes: Permissus friend: - user: Impreadore + user: Utente friend: Amigu trace: - user: Impreadore + user: Utente visible: Visìbile name: Nùmene de su documentu size: Mannesa @@ -111,7 +130,10 @@ sc: description: Descritzione report: category: Scèbera unu motivu po sa denùntzia bostra + details: Fruni prus detàllios subra de su problema (obligatòriu). user: + auth_provider: Frunidore de autenticatzione + auth_uid: UID de autenticatzione email: E-lìtera email_confirmation: Cunfirma de su curreu eletrònicu new_email: Indiritzu nou de su curreu eletrònicu @@ -121,6 +143,7 @@ sc: home_lat: Latitùdine home_lon: Longitùdine languages: Limbas preferidas + preferred_editor: Editore preferidu pass_crypt: Crae pass_crypt_confirmation: Cunfirma sa password help: @@ -128,10 +151,66 @@ sc: confidential: S'aplicatzione at a èssere impreada ue su segretu de su cliente potzat èssere mantentu cunfidentziale (sas aplicatziones nadias de telefoneddu e sas aplicatziones de una pàgina sola non sunt cunfidentziales) + redirect_uri: Imprea una lìnia pro URI + trace: + tagstring: separadu dae vìrgulas + user_block: + reason: Sa resone de su blocu de s'utente. Chirca de mantènnere sa calma e + de abarrare resonile su prus chi podes, frunende su nùmeru de detàllios + prus mannu chi podes subra de sa situatzione e ammentende·ti chi su messàgiu + at a èssere visìbile in manera pùblica. Tene in contu chi non totu sos utentes + cumprendent su suspu de sa comunidade, duncas chirca de impreare tèrmines + comunes. + needs_view: S'utente tenet bisòngiu de s'autenticare in antis chi custu blocu + bèngiat iscantzelladu? + user: + email_confirmation: S'indiritzu tuo no est ammustradu a manera pùblica, pòmpia·ti + sapolìtica subra de sa riservadesa pro + àteras informatziones. + new_email: (mai ammustradu a manera pùblica) datetime: distance_in_words_ago: + about_x_hours: + one: pagu prus o mancu 1 ora a como + other: pagu prus o mancu %{count} oras a como + about_x_months: + one: pagu prus o mancu 1 mese a como + other: pagu prus o mancu %{count} meses a como + about_x_years: + one: pagu prus o mancu 1 annu a como + other: pagu prus o mancu %{count} annos a como + almost_x_years: + one: belle 1 annu a como + other: belle %{count} annos a como half_a_minute: mesu minutu a como + less_than_x_seconds: + one: prus pagu de 1 segundu a como + other: prus pagu de %{count} segundos a como + less_than_x_minutes: + one: prus pagu de 1 minutu a como + other: prus pagu de %{count} minutos a como + over_x_years: + one: prus de 1 annu a como + other: prus de %{count} annos a como + x_seconds: + one: 1 segundu a como + other: '%{count} segundos a como' + x_minutes: + one: 1 minutu a como + other: '%{count} minutos a como' + x_days: + one: 1 die a como + other: '%{count} dies a como' + x_months: + one: 1 mese a como + other: '%{count} meses a como' + x_years: + one: 1 annu a como + other: '%{count} annos a como' editor: + default: Predefinidu (in custu momentu %{name}) id: name: |2- @@ -156,25 +235,62 @@ sc: opened_at_by_html: Creadu %{when} dae %{user} commented_at_html: Agiornadu %{when} commented_at_by_html: Agiornadu %{when} dae %{user} + closed_at_html: Risòlvidu %{when} + closed_at_by_html: Risòlvidu %{when} dae %{user} reopened_at_html: Torradu a ativare %{when} reopened_at_by_html: Torradu a ativare %{when} dae %{user} rss: title: Notas de OpenStreetMap + description_area: Una lista de notas, cummentadas o tancadas in s'àrea tua + [(%{min_lat}|%{min_lon}) -- (%{max_lat}|%{max_lon})] + description_item: Unu flussu de informatziones rss pro sa nota %{id} + opened: nota noa (a curtzu de %{place}) + commented: cummentu nou (a curtzu de %{place}) + closed: nota serrada ( a curtzu de %{place}) + reopened: nota torrada a ativare (a curtzu de %{place}) entry: comment: Cummentu full: Nota intrea account: deletions: show: + title: Iscantzella su contu meu + warning: Dae cara! Su protzessu de iscantzelladura de su contu est finale, + e non si podet annullare. + delete_account: Iscantzella su contu + delete_introduction: 'Podes iscantzellare su contu tuo de OpenStreetMap impreende + su butone inoghe in suta. Tene in contu sos detàllios chi sighint:' + delete_profile: Sas informatziones de su profilu tuo, chi incluint s'àvatar + tuo, sa descritzione tua e sa positzione de domo tua s'ant a iscantzellare. + delete_display_name: Su nùmene ammustradu tuo s'at a iscantzellare, e àteros + contos l'ant a pòdere impreare. + retain_caveats: 'Nointames custu, unas cantas informatziones chi ti pertocant + ant a s''ant a cunservare in OpenStreetMap, fintzas a pustis de s''iscantzelladura + de su contu tuo:' + retain_edits: Sas modìficas tuas a sa base de datos de sa mapa, si nd'as fatu, + s'ant a cunservare. + retain_traces: Sas rastas carrigadas tuas, si bi nde sunt, s'ant a cunservare. + retain_diary_entries: Sas boghes e sos cummentos in su diàriu, si bi nd'at, + ant a èssere cunservados ma cuados a sa vista. + retain_notes: Sas notas de sa mapa e sos cummentos a sas notas, si bi nd'at, + ant a èssere cunservados ma cuados a sa vista. + retain_changeset_discussions: Sos arresonos tuos in sos grupos de modìficas, + si bi nd'at, s'ant a cunservare. + retain_email: S'indiritzu tuo de posta eletrònica s'at a cunservare. confirm_delete: Seguru ses? + cancel: Annulla accounts: edit: + title: Modìfica su profilu my settings: Preferèntzias meas + current email address: Indiritzu de posta eletrònica atuale + external auth: Autenticatzione esterna openid: link: https://wiki.openstreetmap.org/wiki/OpenID link text: ite est custu? public editing: heading: Modificatzione pùblica + enabled: Abilitada. No anònimu e podet modificare datos. enabled link: https://wiki.openstreetmap.org/wiki/Anonymous_edits enabled link text: ite est custu? disabled: Inabilitadu e chene permissu de mudare sos datos; totu sas modìficas @@ -182,35 +298,101 @@ sc: disabled link text: pro ite non potzo fàghere modìficas? public editing note: heading: Modificatzione pùblica + html: In custu momentu sas modìficas tuas sunt anònimas e sa gente non ti + podet imbiare messàgios o bìdere sa positzione tua. Pro ammustrare su chi + as modificadu e permìtere a sa gente de ti cuntatare pro mèdiu de su situ + web incarca su butone inoghe in suta.. Dae su cambiamentu 0.6 de s'API, + petzi sos utentes pùblicos podent modificare sos datos de sa mapa. (impara su proite).
  • S'indiritzu + de posta eletrònica tuo no at a èssere riveladu divenende pùblicu.
  • Custa + atzione non si podet annullare e totu sos utentes noos como sunt pùblicos + comente impostatzione predefinida.
contributor terms: heading: Règulas po contribuire agreed: As atzetadu sos tèrmines noos de collaboratzione. not yet agreed: No as galu atzetadu sos tèrmines noos de collaboratzione. + review link text: Cando podes pro praghere sighi custu ligàmene pro revisionare + e atzetare sas cunditziones noas pro sa contributzione. + agreed_with_pd: As fintzas decraradu chi cunsìderas sas modìficas tuas de + domìniu pùblicu. + link: https://wiki.osmfoundation.org/wiki/Licence/Contributor_Terms link text: ite est custu? save changes button: Sarva sas modìficas make edits public button: Fais totu sas modìficas meas pùblicas delete_account: Boga su contu... + update: + success_confirm_needed: Informatziones de s'utente atualizadas. Controlla s'indiritzu + de posta eletrònica tuo pro cunfirmare s'indiritzu de posta nou tuo. + success: Informatzione de s'utente atualizadas. destroy: success: Contu bogau. browse: created: Creadu closed: Serradu + created_html: Creadu %{time} + closed_html: Serradu %{time} + created_by_html: Creadu %{time} dae %{user} + deleted_by_html: Iscantzelladu %{time} dae %{user} + edited_by_html: Modificadu %{time} dae %{user} + closed_by_html: Serradu %{time} dae %{user} version: Versione + in_changeset: Grupu de modìficas anonymous: anònimu + no_comment: (perunu cummentu) part_of: Parte de + part_of_relations: + one: 1 relatzione + other: '%{count} relatziones' + part_of_ways: + one: 1 lìnia + other: '%{count} lìnias' download_xml: Iscàrriga XML view_history: Càstia Istòria view_details: Mustra Detàllios location: 'Logu:' changeset: + title: 'Grupu de modìficas: %{id}' belongs_to: Autore + node: Nodos (%{count}) + node_paginated: Nodos (%{x}-%{y} de %{count}) + way: Lìnias (%{count}) + way_paginated: Lìnias (%{x}-%{y} de %{count}) + relation: Relatziones (%{count}) + relation_paginated: Relatziones (%{x}-%{y} de %{count}) + comment: Cummentos (%{count}) + hidden_commented_by_html: Cummentu cuadu de %{user} %{when} + commented_by_html: Cummentu de %{user} %{when} + changesetxml: XML de su grupu de modìficas + osmchangexml: XML in formadu osmChange + feed: + title: Grupu de modìficas %{id} + title_comment: Grupu de modìficas %{id} - %{comment} join_discussion: Intra pro t'aunire a s'arresonu discussion: Arresonu + still_open: Grupu de modìficas galu abertu - s'arresonu s'at a abèrrere cando + su grupu de modìficas s'at a serrare. + node: + title_html: 'Nodu: %{name}' + history_title_html: 'Istòria de su nodu: %{name}' way: + title_html: 'Lìnia: %{name}' + history_title_html: 'Istòria de sa lìnia: %{name}' nodes: Nodos + nodes_count: + one: 1 nodu + other: '%{count} nodos' + also_part_of_html: + one: parte de sa lìnia %{related_ways} + other: parte de sas lìnias %{related_ways} relation: + title_html: 'Relatzione: %{name}' + history_title_html: 'Istòria de sa relatzione: %{name}' members: Membros + members_count: + one: 1 membru + other: '%{count} membros' relation_member: + entry_role_html: '%{type} %{name} comente %{role}' type: node: Nodu way: Caminu @@ -220,16 +402,22 @@ sc: entry_role_html: Relata %{relation_name} (as %{relation_role}) not_found: title: No agatadu + sorry: 'No at fatu a agatare %{type} #%{id}' type: node: nodu way: caminu relation: relata + changeset: grupu de modìficas note: nota timeout: + title: Errore de lìmite de tempus de isetu barigadu + sorry: S'est istentadu tropu a otènnere sos datos pro sa casta %{type} cun s'identificadore + %{id}. type: node: nodu way: caminu relation: relata + changeset: grupu de modìficas note: nota redacted: redaction: Revisione %{id} @@ -241,14 +429,43 @@ sc: way: caminu relation: relata start_rjs: + feature_warning: Carrighende %{num_features} funtzionalidades, chi diant pòdere + fàghere in manera chi su navigadore siat lentu o non rispondat. Ses seguru + de bòlere ammustrare custos datos? load_data: Càrriga Datos loading: Carrigamentu... tag_details: tags: Etichetas + wiki_link: + key: Sa pàgina de descritzione de sa wiki pro s'eticheta %{key} + tag: Sa pàgina de descritzione de sa wiki pro s'eticheta %{key}=%{value} + wikidata_link: S'elementu %{page} in Wikidata + wikipedia_link: S'artìculu %{page} in Wikipedia + wikimedia_commons_link: S'elementu %{page} in Wikimedia Commons + telephone_link: Muti a su %{phone_number} + colour_preview: Anteprima de su colore %{colour_value} note: title: 'Nota: %{id}' new_note: Nota noa description: Descritzione + open_title: 'Nota non risòlvida #%{note_name}' + closed_title: 'Nota risòlvida #%{note_name}' + hidden_title: 'Nota cuada #%{note_name}' + opened_by_html: Creada dae %{user} %{when} + opened_by_anonymous_html: Creada dae un'anònimu %{when} + commented_by_html: Cummentu de %{user} %{when} + commented_by_anonymous_html: Cummentu de un'anònimu %{when} + closed_by_html: Risòlvida dae %{user} %{when} + closed_by_anonymous_html: Risòlvida dae un'anònimu %{when} + reopened_by_html: Torrada a ativare dae %{user} %{when} + reopened_by_anonymous_html: Torrada a ativare dae un'anònimu %{when} + hidden_by_html: Cuada dae %{user} %{when} + report: sinnala custa nota + query: + title: Chirca de elementos + introduction: Incarca in sa mapa pro agatare elementos a curtzu. + nearby: Elementos a curtzu + enclosing: Elementos chi inserrant custu puntu changesets: changeset_paging_nav: showing_page: Pàgina %{page} @@ -256,8 +473,11 @@ sc: previous: « Pretzedente changeset: anonymous: Anònimu + no_edits: (peruna modìfica) + view_changeset_details: Pòmpia sos detàllios de su grupu de modìficas changesets: id: ID + saved_at: Sarvadu su user: Impitadore comment: Cummentu area: Àrea @@ -266,12 +486,40 @@ sc: title_user: Trumas de modìficas de %{user} title_friend: Trumas de modìficas de sos amigus meus title_nearby: Trumas de modìficas de utentes acanta + empty: Perunu grupu de modìficas agatadu. + empty_area: Perunu grupu de modìficas in custa àrea. + empty_user: Perunu grupu de modìficas de custu utente. + no_more: Perunu àteru grupu de modìficas agatadu. + no_more_area: Perunu àteru grupu de modìficas in custa àrea. + no_more_user: Perunu àteru grupu de modìficas de custu utente. load_more: Càrriga·nde prus + timeout: + sorry: S'elencu de grupos de modìficas chi as pedidu at bisongiadu de tropu + tempus pro lu recuperare. + changeset_comments: + comment: + comment: 'Cummentu nou a su grupu de modìficas #%{changeset_id} de %{author}' + commented_at_by_html: Atualizadu %{when} dae %{user} + comments: + comment: 'Cummentu nou a su grupu de modìficas #%{changeset_id} de %{author}' + index: + title_all: Arresonu subra su grupu de modìficas de OpenStreetMap + title_particular: 'Arresonu de su grupu de modìficas de OpenStreetMap #%{changeset_id}' + timeout: + sorry: S'elencu de grupos de modìficas chi as pedidu at bisongiadu de tropu + tempus pro lu recuperare. dashboards: + contact: + km away: ' a %{count} km de distàntzia' + m away: ' a %{count} m de distàntzia' popup: + your location: Sa positzione tua + nearby mapper: Mapadore a curtzu friend: Amigu show: title: Sa dashboard mea + no_home_location_html: '%{edit_profile_link} e imposta sa positzione de domo + tua pro bìdere sos utentes a curtzu.' edit_your_profile: Modìfica su profìlu tuu my friends: Amigus meus diary_entries: @@ -1045,6 +1293,7 @@ sc: legale_names: france: Frantza italy: Itàlia + rest_of_world: Restu de su mundu show: my profile: Su profilu meu edits: Modìficas diff --git a/config/locales/zh-TW.yml b/config/locales/zh-TW.yml index 5f0ad4589..a62ffa684 100644 --- a/config/locales/zh-TW.yml +++ b/config/locales/zh-TW.yml @@ -1484,6 +1484,7 @@ zh-TW: issue_comments: create: comment_created: 您的評論已成功建立 + issue_reassigned: 已建立您的評論，並重新分配問題 reports: new: title_html: 回報 %{link} From eedd1ec783257c3f1cfc97ec0d6f64d51883a09a Mon Sep 17 00:00:00 2001 From: Tom Hughes Date: Thu, 25 Aug 2022 20:22:22 +0100 Subject: [PATCH 38/68] Run migration under bundler Fixes #3662 --- .github/workflows/docker.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml index cc2420730..a96b576ff 100644 --- a/.github/workflows/docker.yml +++ b/.github/workflows/docker.yml @@ -26,7 +26,7 @@ jobs: sleep 15 # let the DB warm up a little - name: Prepare Database run: | - docker-compose run --rm web rake db:migrate + docker-compose run --rm web bundle exec rake db:migrate docker-compose run web bundle exec rake i18n:js:export docker-compose run --rm web osmosis --rx docker/null-island.osm.xml --wd host=db database=openstreetmap user=openstreetmap password=openstreetmap validateSchemaVersion=no - name: Test Basic Website From 5abccc2e5e848dcc76cdaa87e83f5320f5b6385b Mon Sep 17 00:00:00 2001 From: Tom Hughes Date: Thu, 25 Aug 2022 20:23:51 +0100 Subject: [PATCH 39/68] Use rails instead of rake --- .github/workflows/docker.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml index a96b576ff..6f88614ab 100644 --- a/.github/workflows/docker.yml +++ b/.github/workflows/docker.yml @@ -26,8 +26,8 @@ jobs: sleep 15 # let the DB warm up a little - name: Prepare Database run: | - docker-compose run --rm web bundle exec rake db:migrate - docker-compose run web bundle exec rake i18n:js:export + docker-compose run --rm web bundle exec rails db:migrate + docker-compose run --rm web bundle exec rails i18n:js:export docker-compose run --rm web osmosis --rx docker/null-island.osm.xml --wd host=db database=openstreetmap user=openstreetmap password=openstreetmap validateSchemaVersion=no - name: Test Basic Website run: | From cd5b793dca4356aa039fddfc01193ba6744e057f Mon Sep 17 00:00:00 2001 From: Tom Hughes Date: Fri, 26 Aug 2022 13:45:25 +0100 Subject: [PATCH 40/68] Redirect to open issues when an issue is reassigned --- app/controllers/issue_comments_controller.rb | 2 +- test/system/issues_test.rb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/controllers/issue_comments_controller.rb b/app/controllers/issue_comments_controller.rb index a4bb6a5ed..7b935665f 100644 --- a/app/controllers/issue_comments_controller.rb +++ b/app/controllers/issue_comments_controller.rb @@ -19,7 +19,7 @@ class IssueCommentsController < ApplicationController if current_user.has_role? @issue.assigned_role redirect_to @issue else - redirect_to issues_path + redirect_to issues_path(:status => "open") end else flash[:notice] = t(".comment_created") diff --git a/test/system/issues_test.rb b/test/system/issues_test.rb index e93e92a69..b9b989c07 100644 --- a/test/system/issues_test.rb +++ b/test/system/issues_test.rb @@ -126,7 +126,7 @@ class IssuesTest < ApplicationSystemTestCase click_on "Add Comment" assert_content "and the issue was reassigned" - assert_current_path issues_path + assert_current_path issues_path(:status => "open") issue.reload assert_equal "moderator", issue.assigned_role From 33f7f44329e9c1bbb67f08d81f419406605f8585 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 26 Aug 2022 23:01:04 +0000 Subject: [PATCH 41/68] Bump eslint from 8.22.0 to 8.23.0 Bumps [eslint](https://github.com/eslint/eslint) from 8.22.0 to 8.23.0. - [Release notes](https://github.com/eslint/eslint/releases) - [Changelog](https://github.com/eslint/eslint/blob/main/CHANGELOG.md) - [Commits](https://github.com/eslint/eslint/compare/v8.22.0...v8.23.0) --- updated-dependencies: - dependency-name: eslint dependency-type: direct:development update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- yarn.lock | 40 ++++++++++++++++++++-------------------- 1 file changed, 20 insertions(+), 20 deletions(-) diff --git a/yarn.lock b/yarn.lock index f4acb0bd2..72312b045 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2,14 +2,14 @@ # yarn lockfile v1 -"@eslint/eslintrc@^1.3.0": - version "1.3.0" - resolved "https://registry.yarnpkg.com/@eslint/eslintrc/-/eslintrc-1.3.0.tgz#29f92c30bb3e771e4a2048c95fa6855392dfac4f" - integrity sha512-UWW0TMTmk2d7hLcWD1/e2g5HDM/HQ3csaLSqXCfqwh4uNDuNqlaKWXmEsL4Cs41Z0KnILNvwbHAah3C2yt06kw== +"@eslint/eslintrc@^1.3.1": + version "1.3.1" + resolved "https://registry.yarnpkg.com/@eslint/eslintrc/-/eslintrc-1.3.1.tgz#de0807bfeffc37b964a7d0400e0c348ce5a2543d" + integrity sha512-OhSY22oQQdw3zgPOOwdoj01l/Dzl1Z+xyUP33tkSN+aqyEhymJCcPHyXt+ylW8FSe0TfRC2VG+ROQOapD0aZSQ== dependencies: ajv "^6.12.4" debug "^4.3.2" - espree "^9.3.2" + espree "^9.4.0" globals "^13.15.0" ignore "^5.2.0" import-fresh "^3.2.1" @@ -31,6 +31,11 @@ resolved "https://registry.yarnpkg.com/@humanwhocodes/gitignore-to-minimatch/-/gitignore-to-minimatch-1.0.2.tgz#316b0a63b91c10e53f242efb4ace5c3b34e8728d" integrity sha512-rSqmMJDdLFUsyxR6FMtD00nfQKKLFb1kv+qBbOVKqErvloEIJLo5bDTJTQNTYgeyp78JsA7u/NPi5jT1GR/MuA== +"@humanwhocodes/module-importer@^1.0.1": + version "1.0.1" + resolved "https://registry.yarnpkg.com/@humanwhocodes/module-importer/-/module-importer-1.0.1.tgz#af5b2691a22b44be847b0ca81641c5fb6ad0172c" + integrity sha512-bxveV4V8v5Yb4ncFTT3rPSgZBOpCkjfK0y4oVVVJwIuDVBRMDXrPyXRL988i5ap9m9bnyEEjWfm5WkBmtffLfA== + "@humanwhocodes/object-schema@^1.2.1": version "1.2.1" resolved "https://registry.yarnpkg.com/@humanwhocodes/object-schema/-/object-schema-1.2.1.tgz#b520529ec21d8e5945a1851dfd1c32e94e39ff45" @@ -234,13 +239,14 @@ eslint-visitor-keys@^3.3.0: integrity sha512-mQ+suqKJVyeuwGYHAdjMFqjCyfl8+Ldnxuyp3ldiMBFKkvytrXUZWaiPCEav8qDHKty44bD+qV1IP4T+w+xXRA== eslint@^8.0.0: - version "8.22.0" - resolved "https://registry.yarnpkg.com/eslint/-/eslint-8.22.0.tgz#78fcb044196dfa7eef30a9d65944f6f980402c48" - integrity sha512-ci4t0sz6vSRKdmkOGmprBo6fmI4PrphDFMy5JEq/fNS0gQkJM3rLmrqcp8ipMcdobH3KtUP40KniAE9W19S4wA== + version "8.23.0" + resolved "https://registry.yarnpkg.com/eslint/-/eslint-8.23.0.tgz#a184918d288820179c6041bb3ddcc99ce6eea040" + integrity sha512-pBG/XOn0MsJcKcTRLr27S5HpzQo4kLr+HjLQIyK4EiCsijDl/TB+h5uEuJU6bQ8Edvwz1XWOjpaP2qgnXGpTcA== dependencies: - "@eslint/eslintrc" "^1.3.0" + "@eslint/eslintrc" "^1.3.1" "@humanwhocodes/config-array" "^0.10.4" "@humanwhocodes/gitignore-to-minimatch" "^1.0.2" + "@humanwhocodes/module-importer" "^1.0.1" ajv "^6.10.0" chalk "^4.0.0" cross-spawn "^7.0.2" @@ -250,7 +256,7 @@ eslint@^8.0.0: eslint-scope "^7.1.1" eslint-utils "^3.0.0" eslint-visitor-keys "^3.3.0" - espree "^9.3.3" + espree "^9.4.0" esquery "^1.4.0" esutils "^2.0.2" fast-deep-equal "^3.1.3" @@ -276,12 +282,11 @@ eslint@^8.0.0: strip-ansi "^6.0.1" strip-json-comments "^3.1.0" text-table "^0.2.0" - v8-compile-cache "^2.0.3" -espree@^9.3.2, espree@^9.3.3: - version "9.3.3" - resolved "https://registry.yarnpkg.com/espree/-/espree-9.3.3.tgz#2dd37c4162bb05f433ad3c1a52ddf8a49dc08e9d" - integrity sha512-ORs1Rt/uQTqUKjDdGCyrtYxbazf5umATSf/K4qxjmZHORR6HJk+2s/2Pqe+Kk49HHINC/xNIrGfgh8sZcll0ng== +espree@^9.4.0: + version "9.4.0" + resolved "https://registry.yarnpkg.com/espree/-/espree-9.4.0.tgz#cd4bc3d6e9336c433265fc0aa016fc1aaf182f8a" + integrity sha512-DQmnRpLj7f6TgN/NYb0MTzJXL+vJF9h3pHy4JhCIs3zwcgez8xmGg3sXHcEO97BrmO2OSvCwMdfdlyl+E9KjOw== dependencies: acorn "^8.8.0" acorn-jsx "^5.3.2" @@ -812,11 +817,6 @@ uri-js@^4.2.2: dependencies: punycode "^2.1.0" -v8-compile-cache@^2.0.3: - version "2.1.0" - resolved "https://registry.yarnpkg.com/v8-compile-cache/-/v8-compile-cache-2.1.0.tgz#e14de37b31a6d194f5690d67efc4e7f6fc6ab30e" - integrity sha512-usZBT3PW+LOjM25wbqIlZwPeJV+3OSz3M1k1Ws8snlW39dZyYL9lOGC5FgPVHfk0jKmjiDV8Z0mIbVQPiwFs7g== - which@^2.0.1: version "2.0.2" resolved "https://registry.yarnpkg.com/which/-/which-2.0.2.tgz#7c6a8dd0a636a0327e10b59c9286eee93f3f51b1" From 8d9ec2642133ed46a9a229d7a2f82924807265a1 Mon Sep 17 00:00:00 2001 From: Anton Khorev Date: Sat, 27 Aug 2022 19:24:54 +0300 Subject: [PATCH 42/68] Fix reverse directions button closing tag --- app/views/layouts/_search.html.erb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/views/layouts/_search.html.erb b/app/views/layouts/_search.html.erb index 922cd4b24..47e9ad557 100644 --- a/app/views/layouts/_search.html.erb +++ b/app/views/layouts/_search.html.erb @@ -47,7 +47,7 @@
-
From 8a02bd67d9d20c4a6b01b58e88b8d65163a3798e Mon Sep 17 00:00:00 2001 From: Anton Khorev Date: Sat, 27 Aug 2022 20:33:44 +0300 Subject: [PATCH 43/68] Create Leaflet sidebar pane control with header writer fn --- app/assets/javascripts/index.js | 1 + app/assets/javascripts/leaflet.key.js | 16 ++----------- app/assets/javascripts/leaflet.layers.js | 16 ++----------- app/assets/javascripts/leaflet.share.js | 16 ++----------- .../javascripts/leaflet.sidebar-pane.js | 23 +++++++++++++++++++ 5 files changed, 30 insertions(+), 42 deletions(-) create mode 100644 app/assets/javascripts/leaflet.sidebar-pane.js diff --git a/app/assets/javascripts/index.js b/app/assets/javascripts/index.js index 40f546009..5ba36a455 100644 --- a/app/assets/javascripts/index.js +++ b/app/assets/javascripts/index.js @@ -1,5 +1,6 @@ //= require_self //= require leaflet.sidebar +//= require leaflet.sidebar-pane //= require leaflet.locatecontrol/src/L.Control.Locate //= require leaflet.layers //= require leaflet.key diff --git a/app/assets/javascripts/leaflet.key.js b/app/assets/javascripts/leaflet.key.js index 367c39c14..46c4661d2 100644 --- a/app/assets/javascripts/leaflet.key.js +++ b/app/assets/javascripts/leaflet.key.js @@ -1,5 +1,5 @@ L.OSM.key = function (options) { - var control = L.control(options); + var control = L.OSM.sidebarPane(options); control.onAdd = function (map) { var $container = $("
") @@ -12,19 +12,7 @@ L.OSM.key = function (options) { .on("click", toggle) .appendTo($container); - var $ui = $("
") - .attr("class", "key-ui"); - - $("
") - .attr("class", "sidebar_heading") - .appendTo($ui) - .append( - $("
From 5a256a6f2bf13d8d364b4f8daa6c4f6577de1540 Mon Sep 17 00:00:00 2001 From: Anton Khorev Date: Sat, 27 Aug 2022 23:50:23 +0300 Subject: [PATCH 48/68] Position 'too many features' close button with flex --- app/assets/javascripts/index/browse.js | 29 +++++++++++++------------- 1 file changed, 14 insertions(+), 15 deletions(-) diff --git a/app/assets/javascripts/index/browse.js b/app/assets/javascripts/index/browse.js index 8ef859d85..61319f7b4 100644 --- a/app/assets/javascripts/index/browse.js +++ b/app/assets/javascripts/index/browse.js @@ -48,21 +48,20 @@ OSM.initializeBrowse = function (map) { function displayFeatureWarning(count, limit, add, cancel) { $("#browse_status").html( - $("
") - .append( - $("" + - "

" + I18n.t("javascripts.directions.directions") + "

" + - "

" + + var distanceText = $("

").append( I18n.t("javascripts.directions.distance") + ": " + formatDistance(route.distance) + ". " + - I18n.t("javascripts.directions.time") + ": " + formatTime(route.time) + "."; + I18n.t("javascripts.directions.time") + ": " + formatTime(route.time) + "."); if (typeof route.ascend !== "undefined" && typeof route.descend !== "undefined") { - html += "
" + + distanceText.append( + $("
"), I18n.t("javascripts.directions.ascend") + ": " + Math.round(route.ascend) + "m. " + - I18n.t("javascripts.directions.descend") + ": " + Math.round(route.descend) + "m."; + I18n.t("javascripts.directions.descend") + ": " + Math.round(route.descend) + "m."); } - html += "

"; + + var turnByTurnTable = $("
"); $("#sidebar_content") - .html(html); + .empty() + .append( + $("
").append( + $("
").append( + $("

") + .text(I18n.t("javascripts.directions.directions"))), + $(" +
From 2da8855cc2d6a0dd9be8e5eebd96c1f7df277135 Mon Sep 17 00:00:00 2001 From: Anton Khorev Date: Sun, 28 Aug 2022 00:53:53 +0300 Subject: [PATCH 50/68] Fix eslint errors --- app/assets/javascripts/leaflet.sidebar-pane.js | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/app/assets/javascripts/leaflet.sidebar-pane.js b/app/assets/javascripts/leaflet.sidebar-pane.js index 365a93213..8403c7bc3 100644 --- a/app/assets/javascripts/leaflet.sidebar-pane.js +++ b/app/assets/javascripts/leaflet.sidebar-pane.js @@ -1,16 +1,16 @@ L.OSM.sidebarPane = function (options, uiClass, buttonTitle, paneTitle) { var control = L.control(options); - + control.onAdd = function (map) { var $container = $("
") .attr("class", "control-" + uiClass); - var button = $("") + var button = $("") .attr("class", "control-button") .attr("href", "#") .html("") .on("click", toggle); - + if (buttonTitle) { button.attr("title", I18n.t(buttonTitle)); } @@ -44,7 +44,7 @@ L.OSM.sidebarPane = function (options, uiClass, buttonTitle, paneTitle) { } return $container[0]; - } + }; // control.onAddPane = function (map, button, $ui, toggle) { // } From a9b77d60c8aa821202ff945c0f60af80dfb25d73 Mon Sep 17 00:00:00 2001 From: "translatewiki.net" Date: Mon, 29 Aug 2022 13:13:01 +0200 Subject: [PATCH 51/68] Localisation updates from https://translatewiki.net. --- config/locales/eo.yml | 1 + config/locales/es.yml | 13 +++++++------ config/locales/fi.yml | 4 ++-- config/locales/fy.yml | 3 ++- config/locales/is.yml | 5 +++-- config/locales/mk.yml | 1 + config/locales/ne.yml | 3 ++- config/locales/ta.yml | 1 + config/locales/tr.yml | 3 ++- config/locales/uk.yml | 1 + 10 files changed, 22 insertions(+), 13 deletions(-) diff --git a/config/locales/eo.yml b/config/locales/eo.yml index e6d21cb56..882b880ad 100644 --- a/config/locales/eo.yml +++ b/config/locales/eo.yml @@ -1486,6 +1486,7 @@ eo: issue_comments: create: comment_created: Vi sukcese aldonis komenton + issue_reassigned: Vi aldonis komenton kaj la problemo estis reasignita reports: new: title_html: Raporti %{link} diff --git a/config/locales/es.yml b/config/locales/es.yml index 267017323..3a7de5e11 100644 --- a/config/locales/es.yml +++ b/config/locales/es.yml @@ -7,6 +7,7 @@ # Author: Aguslr # Author: Alberto Chung # Author: Anarhistička Maca +# Author: Angoca # Author: Armando-Martin # Author: BnSrSa # Author: Carlosmg.dg @@ -2532,15 +2533,15 @@ es: index: public_traces: Trazas GPS públicas public_traces_from: Trazas GPS públicas de %{user} - description: Explorar los itinerarios GPS recién subidos + description: Explorar las trazas GPS recién subidas tagged_with: etiquetado con %{tags} empty_html: Todavía no hay nada aquí. Sube una nueva traza o aprende más sobre trazas GPS en la página wiki. upload_trace: Subir una traza - all_traces: Todos los trazos - my_traces: Mis rastros - traces_from: Trazos Públicos de %{user} + all_traces: Todas las trazas + my_traces: Mis trazas + traces_from: Trazas Públicos de %{user} remove_tag_filter: Eliminar Filtro de Etiquetas destroy: scheduled_for_deletion: Traza programada para eliminación @@ -2612,8 +2613,8 @@ es: write_prefs: modificar sus preferencias de usuario. write_diary: Crea entradas diarias, comentarios y haz amigos write_api: modificar el mapa. - read_gpx: leer sus trazas de GPS privadas - write_gpx: subir trazas de GPS + read_gpx: Leer sus trazas de GPS privadas + write_gpx: Subir trazas de GPS write_notes: Modifica notas read_email: Leer dirección de correo electrónico del usuario skip_authorization: Auto aprobar aplicación diff --git a/config/locales/fi.yml b/config/locales/fi.yml index 921658025..7fa7cbcb3 100644 --- a/config/locales/fi.yml +++ b/config/locales/fi.yml @@ -1524,8 +1524,8 @@ fi: edit_with: 'Muokkaa: %{editor}' tag_line: Avoin wikimaailmankartta intro_header: Tervetuloa OpenStreetMapiin! - intro_text: OpenStreetMap on kaltaistesi ihmisten luoma maailmankartta, jota voi - vapaasti avoimen lisenssin ansiosta. + intro_text: OpenStreetMap on vapaaehtoisten luoma maailmankartta, jota voi käyttää + vapaasti avoimella lisenssillä. intro_2_create_account: luomalla ensin käyttäjätunnuksen hosting_partners_html: Palvelinkapasiteettia meille tarjoaa %{ucl}, %{fastly}, %{bytemark} ja muut %{partners}. diff --git a/config/locales/fy.yml b/config/locales/fy.yml index da54a190c..115743cc3 100644 --- a/config/locales/fy.yml +++ b/config/locales/fy.yml @@ -658,7 +658,7 @@ fy: atm: Jildautomaat bank: Bank bar: Bar - bbq: BBQ + bbq: Barbekjû bench: Bankje bicycle_parking: Fytsestalling bicycle_rental: Fytsferhier @@ -1465,6 +1465,7 @@ fy: issue_comments: create: comment_created: It oanmeitsjen fan jo reäksje is slagge + issue_reassigned: Jo reäksje is oanmakke, en it probleem is weryndield reports: new: title_html: '%{link} melde' diff --git a/config/locales/is.yml b/config/locales/is.yml index cda9cdee5..668628eeb 100644 --- a/config/locales/is.yml +++ b/config/locales/is.yml @@ -1496,6 +1496,7 @@ is: issue_comments: create: comment_created: Það tókst að búa til athugasemdina þína + issue_reassigned: Athugasemdin þín var útbúin og málinu var endurúthlutað reports: new: title_html: Tilkynna %{link} @@ -1652,11 +1653,11 @@ is: click_the_link: Ef þú óskaðir eftir þessari breytingu fylgdu tenglinum hér fyrir neðan til að staðfesta breytinguna. lost_password: - subject: '[OpenStreetMap] Beðni um að endurstilla lykilorð' + subject: '[OpenStreetMap] Beiðni um að endurstilla lykilorð' greeting: Hæ, hopefully_you: Einhver (vonandi þú) hefur beðið um að endurstilla lykilorðið á reikningnum með þetta netfang á openstreetmap.org - click_the_link: Ef þú óskaðir eftir þessari endurstillingu fylgdu tenglinum + click_the_link: Ef þú óskaðir eftir þessari endurstillingu, skaltu fylgja tenglinum hér fyrir neðan til að staðfesta breytinguna. note_comment_notification: anonymous: Nafnlaus notandi diff --git a/config/locales/mk.yml b/config/locales/mk.yml index a576129ce..996760fe3 100644 --- a/config/locales/mk.yml +++ b/config/locales/mk.yml @@ -1478,6 +1478,7 @@ mk: issue_comments: create: comment_created: Коментарот е успешно создаден + issue_reassigned: Вашиот коментар беше создаден и проблемот беше преназначен reports: new: title_html: Пријава %{link} diff --git a/config/locales/ne.yml b/config/locales/ne.yml index 84913c77e..18c661548 100644 --- a/config/locales/ne.yml +++ b/config/locales/ne.yml @@ -1,6 +1,7 @@ # Messages for Nepali (नेपाली) # Exported from translatewiki.net # Export driver: phpyaml +# Author: Bada Kaji # Author: Danieldegroot2 # Author: Drjpoudel # Author: Haribanshi @@ -302,7 +303,7 @@ ne: title: परिवर्नहरू title_user: '%{user}द्वरा गरिएका परिवर्तनहरू' title_friend: तपाईको मित्रहरूद्वारा गरिएका परिवर्तनहरू - title_nearby: तपाई नजिक हुनुभएका प्रयोगकर्ताहरूद्वारा गरिएका परिवर्तनहरू + title_nearby: तपाईं नजिक हुनुभएका प्रयोगकर्ताहरूद्वारा गरिएका परिवर्तनहरू empty: कुनै पनि परिवर्तनहरू भेटिएनन्। empty_area: यो क्षेत्रमा कुनै परिवर्तनहरू छैनन्। empty_user: यस प्रयोगकर्ताद्वारा कुनै परिवर्तनहरू गरिएका छैनन्। diff --git a/config/locales/ta.yml b/config/locales/ta.yml index bf294e77b..33b342259 100644 --- a/config/locales/ta.yml +++ b/config/locales/ta.yml @@ -50,6 +50,7 @@ ta: errors: messages: invalid_email_address: செல்லுபடியாகும் மின்னஞ்சல் முகவரியாகத் தெரியவில்லை + email_address_not_routable: திசைதிருப்பக்கூடியது அல்ல models: acl: அனுமதிக் கட்டுப்பாட்டுப் பட்டியல் changeset: மாற்றங்கள் diff --git a/config/locales/tr.yml b/config/locales/tr.yml index 786c8cf1f..49f908de8 100644 --- a/config/locales/tr.yml +++ b/config/locales/tr.yml @@ -1532,6 +1532,7 @@ tr: issue_comments: create: comment_created: Yorumunuz başarıyla oluşturuldu + issue_reassigned: Yorumunuz oluşturuldu ve problem, aktarıldı reports: new: title_html: 'Bildir: %{link}' @@ -2710,7 +2711,7 @@ tr: about: header: Ücretsiz ve düzenlenebilir html: |- -

Diğer haritaların aksine, OpenStreetMap tamamıyla sizin gibi insanlar tarafından oluşturulur ve düzeltme, güncelleme, indirme ve kullanma herkes için ücretsizdir.

+

OpenStreetMap, diğer haritaların aksine tamamıyla sizin gibi kişiler tarafından oluşturulur ve düzenleme, güncelleme, indirme ve kullanma işlemleri herkes için ücretsizdir.

Katkıda bulunmaya başlamak için kaydolun. Hesabınızın onaylanması için size bir e-posta göndereceğiz.

email address: 'E-posta Adresi:' confirm email address: E-posta Adresini Onayla diff --git a/config/locales/uk.yml b/config/locales/uk.yml index a4876c060..bccc6099c 100644 --- a/config/locales/uk.yml +++ b/config/locales/uk.yml @@ -1559,6 +1559,7 @@ uk: issue_comments: create: comment_created: Коментар створено + issue_reassigned: Ваш коментар створено, а питання перепризначено reports: new: title_html: Скарга %{link} From f6dd80e87d6c4ef868d0173ac4baa98ceffc30bd Mon Sep 17 00:00:00 2001 From: Andy Allan Date: Wed, 31 Aug 2022 14:40:01 +0100 Subject: [PATCH 52/68] Use named arguments for button-variant mixins This is much clearer than relying on positional arguments, and is also required for future upgrades to bootstrap. --- app/assets/stylesheets/common.scss | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/app/assets/stylesheets/common.scss b/app/assets/stylesheets/common.scss index 9ec7fb3f4..ad0cf48ef 100644 --- a/app/assets/stylesheets/common.scss +++ b/app/assets/stylesheets/common.scss @@ -145,7 +145,7 @@ header { nav.primary { .btn-outline-primary { - @include button-outline-variant($green, $white); + @include button-outline-variant($green, $color-hover: $white, $active-color: $white); } .disabled { @@ -190,21 +190,18 @@ nav.secondary { .login-menu { .btn-outline-secondary { - @include button-outline-variant($darkgrey, $white, null, null, $white); + @include button-outline-variant($darkgrey, $color-hover: $white, $active-color: $white); } } .user-menu { .btn-outline-secondary { - @include button-outline-variant($darkgrey, $darkgrey, white, $darkgrey); + @include button-outline-variant($darkgrey, $color-hover: $darkgrey, $active-background: white, $active-border: $darkgrey); border-color: $grey; &:hover { border-color: $grey; } } - &.show .btn-outline-secondary { - background-color: white; - } } #inboxanchor { @@ -650,15 +647,15 @@ legend { reconsider our colours at some point with that in mind. */ .btn-primary { - @include button-variant($primary, $primary, $white, null, null, $white, null, null, $white, null, null, $white); + @include button-variant($primary, $primary, $color: $white, $hover-color: $white, $active-color: $white, $disabled-color: $white); } .btn-secondary { - @include button-variant($secondary, $secondary, $white, null, null, $white, null, null, $white, null, null, $white); + @include button-variant($secondary, $secondary, $color: $white, $hover-color: $white, $active-color: $white, $disabled-color: $white); } .btn-outline-secondary { - @include button-outline-variant($secondary, $white, null, null, $white); + @include button-outline-variant($secondary, $color-hover: $white, $active-color: $white); } /* Rules for the search and direction forms */ From 351a7859498065ada18927a4847baaf09d425b58 Mon Sep 17 00:00:00 2001 From: Anton Khorev Date: Thu, 1 Sep 2022 00:42:50 +0300 Subject: [PATCH 53/68] Remove geolink and close button nesting --- app/assets/javascripts/index/directions.js | 8 +++----- app/views/application/_sidebar_header.html.erb | 4 +--- 2 files changed, 4 insertions(+), 8 deletions(-) diff --git a/app/assets/javascripts/index/directions.js b/app/assets/javascripts/index/directions.js index 0c867a97d..c5bd31940 100644 --- a/app/assets/javascripts/index/directions.js +++ b/app/assets/javascripts/index/directions.js @@ -265,6 +265,7 @@ OSM.Directions = function (map) { } var turnByTurnTable = $("

"); + var directionsCloseButton = $(" - + From 7d2206393bf6cc83bf8bf05197446276c026a2b2 Mon Sep 17 00:00:00 2001 From: Grant Slater Date: Mon, 1 Aug 2022 18:10:37 +0300 Subject: [PATCH 54/68] Add Link and text for the new community forum --- app/views/site/help.html.erb | 2 +- config/locales/en.yml | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/app/views/site/help.html.erb b/app/views/site/help.html.erb index 640c59773..414381101 100644 --- a/app/views/site/help.html.erb +++ b/app/views/site/help.html.erb @@ -4,7 +4,7 @@

<%= t ".introduction" %>

-<% sites = %w[beginners_guide help mailing_lists forums irc switch2osm welcomemat wiki] %> +<% sites = %w[beginners_guide help mailing_lists forums community irc switch2osm welcomemat wiki] %> <% sites.prepend("welcome") if current_user %>
diff --git a/config/locales/en.yml b/config/locales/en.yml index ea85cef19..55bd1c0a8 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -2125,8 +2125,12 @@ en: description: Ask a question or discuss interesting matters on a wide range of topical or regional mailing lists. forums: url: https://forum.openstreetmap.org/ - title: Forums + title: Forums (Legacy) description: Questions and discussions for those that prefer a bulletin board style interface. + community: + url: https://community.openstreetmap.org/ + title: Community forum + description: A shared place for conversations about OpenStreetMap. irc: url: https://irc.openstreetmap.org/ title: IRC From d2b3fe71c8209df84ef3f3f9d4ef5a49e4cf56cf Mon Sep 17 00:00:00 2001 From: Abijeet Patro Date: Thu, 1 Sep 2022 15:51:18 +0530 Subject: [PATCH 55/68] Delete zh-hk.yml file that has been mapped to zh-HK.yml See: https://gerrit.wikimedia.org/r/c/translatewiki/+/828590 as per #3669 --- config/locales/zh-hk.yml | 1187 -------------------------------------- 1 file changed, 1187 deletions(-) delete mode 100644 config/locales/zh-hk.yml diff --git a/config/locales/zh-hk.yml b/config/locales/zh-hk.yml deleted file mode 100644 index b2ea1ba74..000000000 --- a/config/locales/zh-hk.yml +++ /dev/null @@ -1,1187 +0,0 @@ -# Messages for Chinese (Hong Kong) (中文（香港）) -# Exported from translatewiki.net -# Export driver: phpyaml -# Author: C933103 -# Author: Hkjacksonhk -# Author: Liuxinyu970226 -# Author: LuciferianThomas -# Author: StarrySky ---- -zh-hk: - time: - formats: - friendly: '%Y年%m月%e日 %H:%M' - helpers: - file: - prompt: 選擇檔案 - submit: - diary_comment: - create: 儲存 - diary_entry: - create: 發佈 - update: 更新 - issue_comment: - create: 添加評論 - message: - create: 傳送 - client_application: - create: 註冊 - update: 更新 - doorkeeper_application: - create: 註冊 - update: 更新 - redaction: - create: 建立修訂 - update: 儲存修訂 - trace: - create: 上載 - update: 儲存變更 - user_block: - create: 創建封鎖 - update: 更新封鎖 - activerecord: - errors: - messages: - invalid_email_address: 不像是有效的電郵地址。 - email_address_not_routable: 不可繞送 - models: - acl: 存取控制清單 - changeset: 變更集 - changeset_tag: 變更集標籤 - country: 國家 - diary_comment: 日記註解 - diary_entry: 日記項目 - friend: 朋友 - issue: 問題 - language: 語言 - message: 訊息 - node: 節點 - node_tag: 節點標籤 - notifier: 通知 - old_node: 舊節點 - old_node_tag: 舊節點標籤 - old_relation: 舊關聯 - old_relation_member: 舊關聯成員 - old_relation_tag: 舊關聯標籤 - old_way: 舊路徑 - old_way_node: 舊路徑節點 - old_way_tag: 舊路徑標籤 - relation: 關聯 - relation_member: 關聯成員 - relation_tag: 關聯標籤 - report: 報告 - session: 作業階段 - trace: 軌跡 - tracepoint: 軌跡點 - tracetag: 軌跡標籤 - user: 用戶 - user_preference: 用戶設定 - user_token: 用戶令牌 - way: 路徑 - way_node: 路徑節點 - way_tag: 路徑標籤 - attributes: - client_application: - name: 名稱（必需） - url: 主程式URL（必需） - callback_url: 回呼 (Callback) URL - support_url: 支援URL - allow_read_prefs: 讀取他們的用戶設定。 - allow_write_prefs: 修改他們的用戶設定。 - allow_write_diary: 建立日記項目、評論和加入好友 - allow_write_api: 修改地圖 - allow_read_gpx: 讀取他們的私人GPS軌跡 - allow_write_gpx: 上載GPS軌跡 - allow_write_notes: 修改註記 - diary_comment: - body: 內文 - diary_entry: - user: 用戶 - title: 主題 - latitude: 緯度 - longitude: 經度 - language: 語言 - doorkeeper/application: - name: 名稱 - redirect_uri: 重新導向 URI - confidential: 保密的應用程式？ - friend: - user: 用戶 - friend: 朋友 - trace: - user: 用戶 - name: 檔案名稱 - size: 大小 - latitude: 緯度 - longitude: 經度 - public: 公開 - description: 描述 - gpx_file: 上載GPX檔案 - visibility: 可見度 - tagstring: 標籤 - message: - sender: 寄件者 - title: 主題 - body: 內文 - recipient: 收件者 - report: - details: 請就這問題提供多點詳情（必需）。 - user: - email: 電郵 - active: 活躍 - display_name: 顯示名稱 - description: 描述 - languages: 語言 - pass_crypt: 密碼 - pass_crypt_confirmation: 確認密碼 - help: - trace: - tagstring: 以逗號分隔 - datetime: - distance_in_words_ago: - about_x_hours: - one: 約1小時前 - other: 約%{count}小時前 - about_x_months: - one: 約1個月前 - other: 約%{count}個月前 - about_x_years: - one: 約1年前 - other: 約%{count}年前 - almost_x_years: - one: 差不多1年前 - other: 差不多%{count}年前 - half_a_minute: 半分鐘前 - less_than_x_seconds: - one: 不到1秒前 - other: 不到%{count}秒前 - less_than_x_minutes: - one: 不到1分鐘前 - other: 不到%{count}分鐘前 - over_x_years: - one: 超過1年前 - other: 超過%{count}年前 - x_seconds: - one: 1秒前 - other: '%{count}秒前' - x_minutes: - one: 1分鐘前 - other: '%{count}分鐘前' - x_days: - one: 1日前 - other: '%{count}日前' - x_months: - one: 1個月前 - other: '%{count}個月前' - x_years: - one: 1年前 - other: '%{count}年前' - editor: - default: 預設（現為%{name}） - id: - name: iD - description: iD (瀏覽器內的編輯器) - remote: - name: 遙遠控制 - description: 遙遠控制 (JOSM 或 Merkaartor) - auth: - providers: - none: 無 - openid: OpenID - google: Google - facebook: Facebook - windowslive: Windows Live - github: GitHub - wikipedia: 維基百科 - api: - notes: - comment: - opened_at_html: 於%{when}建立 - opened_at_by_html: 由%{user}於%{when}建立 - commented_at_html: 於%{when}更新 - commented_at_by_html: 由%{user}於%{when}更新 - closed_at_html: 已於%{when}解決 - closed_at_by_html: 已由%{user}於%{when}解決 - reopened_at_html: 於%{when}重新開啟 - reopened_at_by_html: 由%{user}於%{when}重新開啟 - entry: - comment: 評論 - accounts: - edit: - my settings: 我的設定 - browse: - version: 版本 - in_changeset: 變更集 - anonymous: 匿名 - no_comment: （沒有評論） - part_of: 屬於： - download_xml: 下載 XML - view_history: 檢視歷史 - view_details: 檢視詳細資料 - location: 位置： - changeset: - title: 變更集：%{id} - belongs_to: 製作者 - feed: - title: 變更集 %{id} - relation_member: - type: - node: 節點 - way: 路徑 - not_found: - sorry: '抱歉，找不到 %{type} #%{id}。' - type: - node: 節點 - way: 路徑 - changeset: 變更集 - timeout: - type: - node: 節點 - way: 路徑 - changeset: 變更集 - redacted: - type: - node: 節點 - way: 路徑 - start_rjs: - feature_warning: 正在載入%{num_features}項地圖特徵，可能會拖慢您的瀏覽器或導致瀏覽器未能回應。您是否肯定想要顯示這些資料？ - query: - title: 查詢地圖特徴 - introduction: 點擊地圖以尋找附近的地圖特徵。 - enclosing: 包圍着的地圖特徵 - changesets: - changeset_paging_nav: - showing_page: 第%{page}頁 - next: 下一頁 » - previous: « 上一頁 - changeset: - anonymous: 匿名 - changesets: - id: ID - saved_at: 已儲存於 - user: 用戶 - comment: 評論 - area: 區域 - index: - title: 變更集 - title_user: '%{user}的變更集' - title_nearby: 附近用戶的變更集 - empty_area: 此區域沒有變更集。 - empty_user: 此用戶沒有變更集。 - no_more_area: 此區域沒有更多變更集。 - no_more_user: 此用戶沒有更多變更集。 - load_more: 載入更多 - dashboards: - show: - nearby users: 其他附近的用戶 - no nearby users: 附近還沒有已加入製圖的用戶。 - diary_entries: - form: - location: 位置： - use_map_link: 使用地圖 - index: - title: 用戶日記 - title_nearby: 附近用戶的日記 - new_title: 在我的用戶日記中撰寫新文章 - my_diary: 我的日記 - no_entries: 沒有日記項目 - show: - title: '%{user}的日記 | %{title}' - login: 登入 - diary_entry: - confirm: 確認 - report: 回報此項目 - diary_comment: - confirm: 確認 - location: - location: 位置： - view: 檢視 - edit: 編輯 - feed: - user: - title: '%{user}的OpenStreetMap日記文章' - description: 近期由%{user}所寫的OpenStreetMap日記文章 - language: - description: 近期以%{language_name}撰寫的OpenStreetMap用戶日記文章 - all: - description: 近期的OpenStreetMap用戶日記文章 - comments: - post: 貼文 - when: 於 - comment: 評論 - newer_comments: 較新評論 - older_comments: 較舊評論 - friendships: - make_friend: - heading: 將%{user}加為好友？ - button: 加入為好友 - remove_friend: - heading: 刪除好友%{user}？ - geocoder: - search_osm_nominatim: - prefix: - aerialway: - cable_car: 大型纜車 - chair_lift: 升降吊椅 - drag_lift: 上山牽引梯 - gondola: 小型纜車 - magic_carpet: 滑雪升降機 - platter: 纜椅 - pylon: 高壓電塔 - station: 空中纜車車站 - t-bar: T 字纜椅 - "yes": 空中纜線 - aeroway: - aerodrome: 機場 - airstrip: 飛機跑道 - apron: 停機坪 - gate: 閘口 - hangar: 機庫 - helipad: 直升機坪 - holding_position: 等待位置 - navigationaid: 航空導航輔助 - parking_position: 停車位置 - runway: 跑道 - taxilane: 滑行道 - taxiway: 滑行道 - terminal: 客運大樓 - windsock: 布製風標 - amenity: - animal_boarding: 動物寄養 - animal_shelter: 動物收容所 - arts_centre: 藝術中心 - atm: 自動櫃員機 - bank: 銀行 - bar: 酒吧 - bbq: 燒烤場 - bench: 長椅 - bicycle_parking: 單車停泊處 - bicycle_rental: 單車租貸 - bicycle_repair_station: 單車維修站 - biergarten: 啤酒庭園 - blood_bank: 血庫 - boat_rental: 船艇租貸 - brothel: 妓院 - bureau_de_change: 找換店 - bus_station: 巴士總站 - cafe: Cafe - car_rental: 汽車租貸 - car_sharing: 汽車共乘 - car_wash: 洗車 - casino: 賭場 - charging_station: 充電站 - childcare: 托兒所 - cinema: 戲院 - clinic: 診所 - clock: 時鐘 - college: 學院 - community_centre: 社區中心 - conference_centre: 會議中心 - courthouse: 法院 - crematorium: 火葬場 - dentist: 牙醫 - doctors: 醫生 - drinking_water: 飲用水 - driving_school: 駕駛學校 - embassy: 大使館 - events_venue: 活動場地 - fast_food: 快餐店 - ferry_terminal: 渡輪碼頭 - fire_station: 消防局 - food_court: 美食廣場 - fountain: 噴泉 - fuel: 加油站 - gambling: 博彩 - grave_yard: 墳場 - grit_bin: 砂礫箱 - hospital: 醫院 - hunting_stand: 狩獵站 - ice_cream: 雪糕 - internet_cafe: 網吧 - kindergarten: 幼稚園 - language_school: 語言學校 - library: 圖書館 - loading_dock: 卸貨平台 - love_hotel: 恋爱賓館 - marketplace: 墟市/市集 - mobile_money_agent: 行動支付代理 - monastery: 修道院 - money_transfer: 匯款 - motorcycle_parking: 電單車停車場 - music_school: 音樂學校 - nightclub: 夜總會 - nursing_home: 看護中心 - parking: 停車場 - parking_entrance: 停車場入口 - parking_space: 停車位 - payment_terminal: 支付終端 - pharmacy: 藥房 - place_of_worship: 宗教場所 - police: 警察 - post_box: 郵箱 - post_office: 郵局 - prison: 監獄 - pub: 酒館 - public_bath: 公眾浴場 - public_bookcase: 公共書櫃 - public_building: 公共建築 - ranger_station: 護林員站 - recycling: 回收點 - restaurant: 餐廳 - sanitary_dump_station: 衛生排污站 - school: 學校 - shelter: 涼亭 - shower: 淋浴 - social_centre: 非盈利團體會所 - social_facility: 社會福利設施 - studio: 工作室 - swimming_pool: 游泳池 - taxi: 的士 - telephone: 公眾電話 - theatre: 劇院 - toilets: 廁所 - townhall: 市政廳 - training: 訓練設施 - university: 大學 - vehicle_inspection: 車輛檢查 - vending_machine: 自動售賣機 - veterinary: 獸醫診所 - village_hall: 村公所 - waste_basket: 垃圾桶 - waste_disposal: 垃圾收集站 - waste_dump_site: 垃圾掩埋場 - watering_place: 集水地點 - water_point: 取水點 - weighbridge: 地磅 - "yes": 便利設施 - boundary: - aboriginal_lands: 原住民土地 - administrative: 行政邊界 - census: 人口普查邊界 - national_park: 國家公園 - political: 選區分界 - protected_area: 保護區 - "yes": 邊界 - bridge: - aqueduct: 高架水道 - boardwalk: 木板走道 - suspension: 吊橋 - swing: 平旋橋 - viaduct: 高架橋 - "yes": 橋 - building: - apartment: 公寓 - apartments: 公寓 - barn: 穀倉 - 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: 製造業建築 - office: 辦公建築 - public: 公共建築 - residential: 住宅建築 - retail: 零售建築 - roof: 屋頂 - ruins: 已毀損建築 - school: 學校建築 - semidetached_house: 半獨立房 - service: 服務建築 - shed: 棚 - stable: 馬廄 - static_caravan: 旅行拖車 - temple: 廟宇建築 - terrace: 陽台建築 - train_station: 車站建物 - university: 大學建築 - warehouse: 倉庫 - "yes": 建築物 - club: - scout: 童軍團團部 - sport: 体育俱樂部 - "yes": 俱樂部 - craft: - beekeeper: 養蜂人之家 - blacksmith: 鐵匠鋪 - brewery: 釀酒 - carpenter: 木匠工坊 - caterer: 外燴承辦 - confectionery: 糖果店 - dressmaker: 女裝裁縫工作室 - electrician: 電工工坊 - electronics_repair: 電子產品維修 - gardener: 園丁工坊 - glaziery: 玻璃工坊 - handicraft: 手工藝工坊 - hvac: 暖通空調工坊 - metal_construction: 金屬結構坊 - painter: 畫家 - photographer: 摄影室 - plumber: 管道工坊 - roofer: 屋顶工作室 - sawmill: 鋸木廠 - shoemaker: 鞋匠工坊 - stonemason: 石匠鋪 - tailor: 裁缝 - window_construction: 窗戶建設 - winery: 釀酒廠 - "yes": 工藝品商店 - emergency: - access_point: 進入點 - ambulance_station: 急救站 - assembly_point: 集合處 - defibrillator: 除顫器 - fire_extinguisher: 滅火器 - fire_water_pond: 消防水塘 - landing_site: 緊急著陸點 - life_ring: 緊急救生圈 - phone: 緊急電話 - siren: 防空警報 - suction_point: 消防吸水點 - water_tank: 緊急水箱 - highway: - abandoned: 廢棄道路 - bridleway: 馬車路 - bus_guideway: 導軌巴士專線 - bus_stop: 巴士站 - construction: 建造中公路 - corridor: 走廊 - crossing: 十字路口 - cycleway: 單車徑 - elevator: 電梯 - emergency_access_point: 緊急聯絡點 - emergency_bay: 緊急停車灣 - footway: 行人徑 - ford: 河床便道 - give_way: 讓路標誌 - living_street: 生活街道 - milestone: 里程碑 - motorway: 高速公路 - motorway_junction: 高速公路出口 - motorway_link: 高速公路聯絡道 - passing_place: 避車彎 - path: 小徑 - pedestrian: 人行道 - platform: 月台 - primary: 一級道路 - primary_link: 一級道路聯絡道 - proposed: 計畫中道路 - raceway: 賽道 - residential: 住宅區道路 - rest_area: 休息區 - road: 路 - secondary: 二級道路 - secondary_link: 二級道路聯絡道 - service: 服務道路 - services: 高速公路服務區 - speed_camera: 測速照相機 - steps: 階梯 - stop: 停止標誌 - street_lamp: 路燈 - tertiary: 三級道路 - tertiary_link: 地區道路聯絡道 - track: 軌跡 - traffic_mirror: 道路反射鏡 - traffic_signals: 交通號誌 - trailhead: 小徑入口處 - trunk: 快速道路 - trunk_link: 快速道路聯絡道 - turning_circle: 回轉圈 - turning_loop: 環形迴車道 - unclassified: 無編制道路 - "yes": 路 - historic: - aircraft: 歷史飛行機 - archaeological_site: 考古遺址 - bomb_crater: 彈坑遺跡 - battlefield: 戰場 - boundary_stone: 界石 - building: 歷史建築 - bunker: 掩體 - cannon: 古砲 - castle: 城堡 - charcoal_pile: 歷史木炭堆 - church: 教堂 - city_gate: 城門 - citywalls: 城牆 - fort: 堡壘 - heritage: 遺蹟 - hollow_way: 低窪道路 - house: 房屋 - manor: 莊園 - memorial: 紀念館 - milestone: 歷史里程碑 - mine: 礦場 - mine_shaft: 礦井 - monument: 古蹟 - railway: 歷史鐵路 - roman_road: 羅馬道路 - ruins: 廢墟 - rune_stone: 盧恩符文石 - stone: 石造史蹟 - tomb: 墳墓 - tower: 塔 - wayside_chapel: 路邊教堂 - wayside_cross: 路邊十字架 - wayside_shrine: 路邊神龕 - wreck: 殘骸 - "yes": 古蹟 - junction: - "yes": 路口 - landuse: - allotments: 社區農園 - aquaculture: 水產養殖 - basin: 盆地 - brownfield: 棕地 - cemetery: 墓地 - commercial: 商業區 - conservation: 保護區 - construction: 地盤 - farmland: 農地 - farmyard: 農舍 - forest: 森林 - garages: 車庫 - grass: 草地 - greenfield: 空地 - industrial: 工業區 - landfill: 堆填區 - meadow: 牧草地 - military: 軍事區 - mine: 礦場 - orchard: 果園 - plant_nursery: 植物苗圃 - quarry: 石礦場 - railway: 鐵路 - recreation_ground: 休憩用地 - religious: 宗教場所 - reservoir: 水庫 - reservoir_watershed: 水庫集水區 - residential: 住宅區 - retail: 零售用地 - village_green: 社區綠化空間 - vineyard: 葡萄園 - "yes": 土地利用 - leisure: - adult_gaming_centre: 成人遊戲中心 - amusement_arcade: 電子遊樂場 - bandstand: 演奏台 - beach_resort: 海灘度假村 - bird_hide: 賞鳥亭 - bleachers: 露天看台 - bowling_alley: 保齡球場 - common: 公共用地 - dance: 舞廳 - dog_park: 狗公園 - firepit: 火山坑 - fishing: 垂釣區 - fitness_centre: 健身中心 - fitness_station: 健身設施 - garden: 花園 - golf_course: 哥爾夫球場 - horse_riding: 馬場 - ice_rink: 溜冰場 - marina: 小船塢 - miniature_golf: 小型高爾夫球場 - nature_reserve: 自然保護區 - outdoor_seating: 戶外座椅 - park: 公園 - picnic_table: 野餐桌 - pitch: 運動場 - playground: 兒童遊樂場 - recreation_ground: 遊樂場 - resort: 度假村 - sauna: 桑拿 - slipway: 船臺 - sports_centre: 運動中心 - stadium: 體育館 - swimming_pool: 游泳池 - track: 跑道 - water_park: 水上樂園 - "yes": 休閒 - man_made: - adit: 坑道 - advertising: 廣告 - antenna: 天線 - avalanche_protection: 雪崩護欄 - beacon: 浮標 - beam: 梁柱 - beehive: 蜂巢 - breakwater: 防波堤 - bridge: 橋 - bunker_silo: 碉堡 - cairn: 石標 - chimney: 煙囪 - clearcut: 皆伐區域 - communications_tower: 通訊塔 - crane: 起重機 - cross: 十字架 - dolphin: 繫船柱 - dyke: 堤 - embankment: 堤 - flagpole: 旗竿 - gasometer: 儲氣槽 - groyne: 丁壩 - kiln: 窯 - lighthouse: 燈塔 - manhole: 人孔 - mast: 柱杆 - mine: 礦場 - mineshaft: 礦井 - monitoring_station: 監控站台 - petroleum_well: 油井 - pier: 碼頭 - pipeline: 管線 - pumping_station: 泵站 - reservoir_covered: 有蓋蓄水槽 - silo: 筒倉 - snow_cannon: 雪砲 - snow_fence: 雪欄 - storage_tank: 儲油罐 - street_cabinet: 街櫃 - surveillance: 監視攝影機 - telescope: 望遠鏡 - tower: 塔 - utility_pole: 電線桿 - wastewater_plant: 污水處理廠 - watermill: 水車 - water_tap: 水龍頭 - water_tower: 水塔 - water_well: 井 - water_works: 供水設施 - windmill: 風車 - works: 工廠 - "yes": 人造設施 - military: - airfield: 軍用機場 - barracks: 軍營 - bunker: 碉堡 - checkpoint: 檢查站 - trench: 壕溝 - "yes": 軍事 - mountain_pass: - "yes": 埡口 - natural: - atoll: 環礁 - bare_rock: 裸岩 - bay: 灣 - beach: 沙灘 - cape: 海角 - cave_entrance: 洞穴入口 - cliff: 懸崖 - coastline: 海岸線 - crater: 火山口 - dune: 沙丘 - fell: 高原荒地 - fjord: 峽灣 - forest: 森林 - geyser: 間歇泉 - glacier: 冰河 - grassland: 草地 - heath: 石楠荒地 - hill: 小山 - hot_spring: 溫泉 - island: 島嶼 - isthmus: 地峽 - land: 陸地 - marsh: 河川濕地 - moor: 停泊處 - mud: 泥地 - peak: 山頂 - peninsula: 半島 - point: 點 - reef: 礁 - ridge: 山脊 - rock: 獨立岩 - volcano: 火山 - "yes": 自然特徵 - office: - travel_agent: 旅行社 - "yes": 辦公室 - place: - city: 城市 - city_block: 街區 - country: 國家 - county: 縣 - farm: 農田 - hamlet: 村莊 - house: 房屋 - island: 島嶼 - islet: 小島 - postcode: 郵政編號 - region: 區域 - sea: 海 - square: 廣場 - suburb: 市郊 - town: 鎮 - village: 村落 - "yes": 地點 - railway: - abandoned: 廢棄鐵路 - disused: 已停用鐵路 - funicular: 纜索鐵路 - light_rail: 輕便鐵路 - monorail: 單軌鐵路 - narrow_gauge: 窄軌鐵路 - platform: 鐵路月臺 - preserved: 保留鐵路 - proposed: 規劃中鐵路 - rail: 鐵路 - spur: 鐵路支線 - station: 火車站 - stop: 鐵路招呼站 - subway: 地鐵 - subway_entrance: 地鐵出入口 - switch: 鐵路道岔 - tram: 路面電車軌道 - tram_stop: 路面電車站 - turntable: 轉車台 - yard: 鐵路站場 - shop: - agrarian: 農業商品店 - bakery: 麵包店 - beauty: 美容店 - beverages: 飲料店 - bicycle: 單車店 - bookmaker: 投注站 - books: 書店 - boutique: 精品店 - car_parts: 汽車零件店 - charity: 慈善商店 - computer: 電腦商店 - copyshop: 影印店 - cosmetics: 化妝品店 - deli: 高級食品店 - department_store: 百貨公司 - doityourself: DIY用品店 - dry_cleaning: 乾洗店 - e-cigarette: 電子煙店 - erotic: 情趣用品店 - estate_agent: 地產代理 - fashion: 時裝店 - fishing: 釣魚用品店 - florist: 花店 - hairdresser: 理髮店 - hifi: Hi-Fi - houseware: 生活用品店 - ice_cream: 冰淇淋店 - interior_decoration: 室內裝潢 - jewelry: 珠寶店 - laundry: 洗衣店 - lottery: 彩票 - mall: 商場 - massage: 按摩 - mobile_phone: 手機店 - optician: 視光師 - organic: 有機食品店 - pet: 寵物店 - seafood: 海鮮店 - second_hand: 二手商店 - shoes: 鞋店 - stationery: 文具店 - supermarket: 超級市場 - tobacco: 煙草店 - toys: 玩具店 - travel_agency: 旅行社 - "yes": 商店 - tourism: - museum: 博物館 - picnic_site: 野餐地點 - theme_park: 主題公園 - viewpoint: 觀景點 - zoo: 動物園 - tunnel: - "yes": 隧道 - waterway: - canal: 運河 - dam: 水壩 - river: 河流 - stream: 小溪 - waterfall: 瀑布 - admin_levels: - level2: 國界 - level4: 省界 - level5: 區界 - level6: 縣界 - level8: 市界 - level9: 村界 - level10: 市郊邊界 - types: - cities: 城市 - towns: 市鎮 - places: 地點 - results: - no_results: 找不到結果 - more_results: 更多結果 - issues: - index: - reported_user: 曾經舉報的用戶 - user_not_found: 用戶並不存在 - show: - resolve: 解決 - ignore: 忽略 - reopen: 重新開啟 - reports: - new: - categories: - user: - spam_label: 此用戶個人檔案為/含有垃圾信息 - threat_label: 此用戶個人檔案含有威脅或恐嚇內容 - create: - provide_details: 請提供所需要的詳情 - layouts: - logo: - alt_text: OpenStreetMap標誌 - logout: 登出 - log_in: 登入 - log_in_tooltip: 登入既有賬戶 - sign_up: 註冊 - start_mapping: 開始繪圖 - sign_up_tooltip: 建立帳號以進行編輯 - edit: 編輯 - history: 歷史 - export: 匯出 - gps_traces: GPS軌跡 - gps_traces_tooltip: 管理GPS軌跡 - user_diaries: 用戶日記 - user_diaries_tooltip: 檢視用戶日記 - edit_with: 用%{editor}來編輯 - intro_header: 歡迎來到 OpenStreetMap！ - intro_2_create_account: 建立用戶帳號 - tou: 使用條款 - help: 幫助 - copyright: 版權 - foundation: 基金會 - foundation_title: OpenStreetMap基金會 - user_mailer: - diary_comment_notification: - subject: '[OpenStreetMap] %{user}在日記中留下了評論' - friendship_notification: - subject: '[OpenStreetMap] %{user} 添加了您成為好友' - see_their_profile: 您可以在 %{userurl} 查看他的個人檔案。 - email_confirm: - greeting: 您好， - lost_password: - subject: '[OpenStreetMap] 密碼重設請求' - greeting: 您好， - hopefully_you: 有人 (或許是您) 要求將以此電子郵件地址註冊的openstreetmap.org帳號的密碼重設。 - click_the_link: 如果是您請求的話，請按下列連結重設您的密碼。 - note_comment_notification: - anonymous: 一位匿名用戶 - greeting: 您好， - confirmations: - confirm_resend: - failure: 找不到用戶%{name}。 - messages: - outbox: - title: 寄件匣 - passwords: - lost_password: - title: 忘記密碼 - heading: 忘記密碼？ - email address: 電郵地址： - new password button: 重設密碼 - help_text: 輸入您註冊時用的電郵地址，我們會將可用於重設密碼的連結發送至該地址。 - reset_password: - title: 重設密碼 - heading: 重設%{user}的密碼 - reset: 重設密碼 - flash changed: 您的密碼已經變更。 - sessions: - new: - email or username: 電郵地址或用戶名稱： - password: 密碼： - lost password link: 忘記您的密碼？ - with username: 已經有OpenStreetMap的帳號了嗎？請使用您的用戶名稱和密碼登入： - destroy: - title: 登出 - site: - edit: - not_public: 您尚未把編輯公開。 - not_public_description_html: 您不這樣設定的話就將再無法編輯地圖。您可以在%{user_page}將閣下的編輯設為公開。 - no_iframe_support: 閣下的瀏覽器並未支援此功能所必需的HTML iframes。 - export: - title: 匯出 - area_to_export: 要匯出的範圍 - manually_select: 手動選擇另一範圍 - format_to_export: 匯出格式 - map_image: 地圖影像 (顯示標準圖層) - embeddable_html: 可內嵌的HTML - licence: 授權 - options: 選項 - format: 格式 - scale: 比例 - max: 最大 - latitude: 緯度： - longitude: 經度： - help: - beginners_guide: - description: 由社群編修的新手指南。 - help: - description: 在OpenStreetMap的問答網站上提問或搜尋答案。 - mailing_lists: - description: 在有着各式各樣主題或地域分類的郵件列表中發問或討論有趣的事。 - forums: - description: 給喜好論壇界面的人提問和討論。 - irc: - title: IRC - welcomemat: - url: https://welcome.openstreetmap.org/ - sidebar: - search_results: 搜尋結果 - close: 關閉 - search: - search: 搜尋 - where_am_i: 這是哪裡？ - reverse_directions_text: 反轉方向 - key: - table: - entry: - motorway: 高速公路 - rail: 鐵路 - subway: 地鐵 - tram: - - 輕便鐵路 - - 電車 - runway: - - 機場跑道 - apron: - - 機場停機坪 - - 客運大樓 - admin: 行政邊界 - forest: 森林 - golf: 哥爾夫球場 - park: 公園 - resident: 住宅區 - industrial: 工業區 - commercial: 商業區 - lake: - - 湖泊 - - 水庫 - brownfield: 棕地 - cemetery: 墓地 - pitch: 運動場 - centre: 運動中心 - reserve: 自然保護區 - military: 軍事區 - school: - - 學校 - - 大學 - station: 火車站 - bicycle_shop: 單車店 - bicycle_parking: 單車停泊處 - toilets: 廁所 - welcome: - introduction_html: 歡迎來到OpenStreetMap，自由而可以編輯的世界地圖。現在您已經注冊完成，繪製地圖所需要的準備已經就緒。以下是一份快速指南，裡面包含着您所需要知道的最重要事項。 - rules: - paragraph_1_html: OpenStreetMap沒多少正式規則，但我們期望所有參與者都會與社群合作，也會和社群溝通。如果你想用任何不只是純人手編輯的方式做任何事的話，請先閱讀並遵循匯入以及自動化編輯規範。 - add_a_note: - title: 沒時間編輯？加一個註記吧！ - paragraph_1_html: 如果你只想讓一些小問題得以更正，而沒有時間注冊並學習如何編輯，那麼加入註記是非常容易的。 - traces: - create: - traces_waiting: 您有%{count}條軌跡等待上傳。請考慮先讓目前的軌跡處理完成後，再來繼續上傳其他軌跡，以免阻礙其他用戶的排程。 - index: - public_traces_from: '%{user}的公開GPS軌跡' - oauth: - authorize: - allow_read_prefs: 讀取您的用戶設定。 - oauth_clients: - show: - requests: 向用戶要求下列權限： - index: - revoke: 撤銷！ - oauth: OAuth - form: - requests: 向用戶要求下列權限： - users: - new: - title: 註冊 - no_auto_account_create: 很不幸地我們目前無法為您自動建立帳號。 - contact_support_html: 請聯絡網站管理員以安排建立帳號，我們會儘快嘗試並處理相關要求。 - about: - header: 自由而可編輯 - email address: 電郵地址： - confirm email address: 確認電郵地址： - display name: 顯示名稱： - display name description: 您公開顯示的用戶名稱。以後還可以在設定中更換。 - external auth: 第三方身份認證： - auth no password: 啟用第三方認證後密碼並非必須，但一些額外的工具或伺服器可能仍需要使用密碼。 - continue: 註冊 - terms accepted: 感謝您接受新的貢獻條款！ - terms: - title: 條款 - heading: 條款 - heading_ct: 貢獻者條款 - read_tou: 我已經閱讀過並同意使用條款 - consider_pd: 除上述條款之外，我會把我的貢獻釋放到公共領域(Public Domain) - guidance_html: 幫助理解這些條款的資料：一個給普通人閱讀的摘要和一些非正式翻譯 - continue: 繼續 - decline: 拒絕 - legale_select: 請選擇您的居住地： - legale_names: - france: 法國 - italy: 意大利 - rest_of_world: 世界其他地方 - no_such_user: - title: 沒有這用戶 - body: 抱歉，沒有名為%{user}的用戶。請檢查您的拼寫，或者您可能按到了錯誤的連結。 - show: - my settings: 我的設定 - user location: 用戶位置 - report: 舉報此用戶 - index: - title: 用戶 - heading: 用戶 - auth_association: - option_2: 如果您已經有帳號，您可以用該帳號的用戶名稱和密碼登入，然後到用戶設定中把您的ID和帳號關聯到一起。 - javascripts: - share: - embed: HTML - download: 下載 - center_marker: 將地圖置中於標記處 - map: - zoom: - in: 放大 - out: 縮小 - locate: - title: 顯示我的位置 - base: - standard: 標準 - cycle_map: 單車地圖 - transport_map: 交通地圖 - hot: 人道地圖 - opnvkarte: ÖPNVKarte - layers: - header: 地圖圖層 - title: 圖層 - site: - queryfeature_tooltip: 查詢地圖特徴 - queryfeature_disabled_tooltip: 放大以查詢地圖特徴 - query: - nothing_found: 沒找到地圖特徵 - context: - query_features: 查詢地圖特徴 - centre_map: 將地圖置中於此 -... From 5da7215873152fd52a93c3d91bc38c5dbb32ddce Mon Sep 17 00:00:00 2001 From: Anton Khorev Date: Thu, 1 Sep 2022 22:45:09 +0300 Subject: [PATCH 56/68] Stretch changeset links in history lists --- app/assets/javascripts/index/history.js | 12 ------------ app/assets/stylesheets/common.scss | 7 +++++-- app/views/changesets/_changeset.html.erb | 2 +- 3 files changed, 6 insertions(+), 15 deletions(-) diff --git a/app/assets/javascripts/index/history.js b/app/assets/javascripts/index/history.js index 7f0fdf848..c20d342c5 100644 --- a/app/assets/javascripts/index/history.js +++ b/app/assets/javascripts/index/history.js @@ -10,18 +10,6 @@ OSM.History = function (map) { }) .on("mouseout", "[data-changeset]", function () { unHighlightChangeset($(this).data("changeset").id); - }) - .on("mousedown", "[data-changeset]", function () { - var moved = false; - $(this) - .one("click", function (e) { - if (!moved && !$(e.target).is("a")) { - clickChangeset($(this).data("changeset").id, e); - } - }) - .one("mousemove", function () { - moved = true; - }); }); var group = L.featureGroup() diff --git a/app/assets/stylesheets/common.scss b/app/assets/stylesheets/common.scss index ad0cf48ef..75ed514ee 100644 --- a/app/assets/stylesheets/common.scss +++ b/app/assets/stylesheets/common.scss @@ -742,10 +742,13 @@ tr.turn:hover { #sidebar .changesets { li { - cursor: pointer; - &.selected { background: $list-highlight; } /* color is derived from changeset bbox fillColor in history.js */ + + a:not(.stretched-link), [title] { + position: relative; + z-index: 1; + } } .comments { diff --git a/app/views/changesets/_changeset.html.erb b/app/views/changesets/_changeset.html.erb index 40ee4212a..f3aaf38ea 100644 --- a/app/views/changesets/_changeset.html.erb +++ b/app/views/changesets/_changeset.html.erb @@ -12,7 +12,7 @@ <%= tag.li :id => "changeset_#{changeset.id}", :data => { :changeset => changeset_data }, :class => "list-group-item" do %>

- + <%= changeset.tags["comment"].to_s.presence || t("browse.no_comment") %>

From f1cf1be64a11e739300c1d54247451efbb9c7018 Mon Sep 17 00:00:00 2001 From: Anton Khorev Date: Fri, 2 Sep 2022 16:03:52 +0300 Subject: [PATCH 57/68] Put span inside stretched link to improve text selection --- app/assets/stylesheets/common.scss | 5 +++++ app/views/changesets/_changeset.html.erb | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/app/assets/stylesheets/common.scss b/app/assets/stylesheets/common.scss index 75ed514ee..bc2533c17 100644 --- a/app/assets/stylesheets/common.scss +++ b/app/assets/stylesheets/common.scss @@ -745,6 +745,11 @@ tr.turn:hover { &.selected { background: $list-highlight; } /* color is derived from changeset bbox fillColor in history.js */ + a.stretched-link > span { + position: relative; + z-index: 2; + } + a:not(.stretched-link), [title] { position: relative; z-index: 1; diff --git a/app/views/changesets/_changeset.html.erb b/app/views/changesets/_changeset.html.erb index f3aaf38ea..fa1761954 100644 --- a/app/views/changesets/_changeset.html.erb +++ b/app/views/changesets/_changeset.html.erb @@ -13,7 +13,7 @@ <%= tag.li :id => "changeset_#{changeset.id}", :data => { :changeset => changeset_data }, :class => "list-group-item" do %>

- <%= changeset.tags["comment"].to_s.presence || t("browse.no_comment") %> + <%= changeset.tags["comment"].to_s.presence || t("browse.no_comment") %>

From a0f52e8b4f3c392891fcff31d039a926a318ee68 Mon Sep 17 00:00:00 2001 From: Anton Khorev Date: Fri, 2 Sep 2022 16:13:52 +0300 Subject: [PATCH 58/68] Make changeset id also a link so it can be displayed over the stretched link and be text-selectable --- app/views/changesets/_changeset.html.erb | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/app/views/changesets/_changeset.html.erb b/app/views/changesets/_changeset.html.erb index fa1761954..a59c85ec4 100644 --- a/app/views/changesets/_changeset.html.erb +++ b/app/views/changesets/_changeset.html.erb @@ -20,7 +20,9 @@
<%= changeset_details(changeset) %> · - #<%= changeset.id %> + + #<%= changeset.id %> +
<%= changeset.comments.length %> From 78b4ff4a290073223bd483240720f1656e6f8367 Mon Sep 17 00:00:00 2001 From: Anton Khorev Date: Fri, 2 Sep 2022 16:22:54 +0300 Subject: [PATCH 59/68] Simplify css for text selection with stretched link --- app/assets/stylesheets/common.scss | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/app/assets/stylesheets/common.scss b/app/assets/stylesheets/common.scss index bc2533c17..ce83a1d93 100644 --- a/app/assets/stylesheets/common.scss +++ b/app/assets/stylesheets/common.scss @@ -745,14 +745,9 @@ tr.turn:hover { &.selected { background: $list-highlight; } /* color is derived from changeset bbox fillColor in history.js */ - a.stretched-link > span { + a.stretched-link > span, a:not(.stretched-link), [title] { position: relative; - z-index: 2; - } - - a:not(.stretched-link), [title] { - position: relative; - z-index: 1; + z-index: 2; /* needs to be higher than Bootstrap's stretched link ::after z-index */ } } From 1795407caa8491c931aad11b24432761d6924462 Mon Sep 17 00:00:00 2001 From: "translatewiki.net" Date: Mon, 5 Sep 2022 13:13:01 +0200 Subject: [PATCH 60/68] Localisation updates from https://translatewiki.net. --- config/locales/bg.yml | 41 +- config/locales/br.yml | 6 +- config/locales/en-GB.yml | 1 - config/locales/es.yml | 8 +- config/locales/et.yml | 47 +- config/locales/fa.yml | 8 +- config/locales/fr.yml | 196 ++++--- config/locales/fy.yml | 6 +- config/locales/he.yml | 1 + config/locales/ia.yml | 6 +- config/locales/it.yml | 7 +- config/locales/mk.yml | 6 +- config/locales/nb.yml | 3 + config/locales/ne.yml | 11 +- config/locales/nl.yml | 6 +- config/locales/pt-PT.yml | 45 +- config/locales/ru.yml | 7 +- config/locales/sc.yml | 123 +++- config/locales/tr.yml | 8 +- config/locales/vi.yml | 10 +- config/locales/zh-CN.yml | 7 +- config/locales/zh-HK.yml | 1187 ++++++++++++++++++++++++++++++++++++++ 22 files changed, 1552 insertions(+), 188 deletions(-) create mode 100644 config/locales/zh-HK.yml diff --git a/config/locales/bg.yml b/config/locales/bg.yml index c7579bc0a..65e68cc70 100644 --- a/config/locales/bg.yml +++ b/config/locales/bg.yml @@ -24,10 +24,10 @@ bg: friendly: '%e %B %Y в %H:%M' helpers: file: - prompt: Избери файл + prompt: Избиране на файл submit: diary_comment: - create: Съхраняване + create: Запазване diary_entry: create: Публикуване update: Обновяване @@ -37,9 +37,10 @@ bg: create: Изпращане client_application: create: Регистриране - update: Обнови + update: Обновяване doorkeeper_application: create: Регистриране + update: Обновяване redaction: create: Създаване на поправка update: Запазване на поправка @@ -90,8 +91,8 @@ bg: way_tag: Етикет на път attributes: client_application: - name: Име (Задължително) - url: Основно приложение URL(Задължително) + name: Име (задължително) + url: Адрес на основното приложение (задължително) allow_read_prefs: прочетете потребителските предпочитания allow_write_prefs: променете потребителските им предпочитания allow_write_diary: създай дневник на бележките, коментарите и новите приятелства @@ -230,6 +231,12 @@ bg: entry: comment: Коментар full: Цялата бележка + account: + deletions: + show: + title: Изтриване на профила + delete_account: Изтриване на профила + cancel: Отказ accounts: edit: title: Промяна на профил @@ -250,7 +257,7 @@ bg: heading: Условия за сътрудничество agreed: Приели сте новите условия за сътрудничество. not yet agreed: Все още не сте приели новите Условия за участие. - link: https://www.osmfoundation.org/wiki/License/Contributor_Terms + link: https://wiki.osmfoundation.org/wiki/Licence/Contributor_Terms link text: Какво е това? save changes button: Съхраняване на промените make edits public button: Всички мои промени да са публично достъпни @@ -538,14 +545,14 @@ bg: t-bar: Седалков лифт aeroway: aerodrome: Летище - apron: Перон - gate: Врата + apron: Самолетна писта + gate: Врата на летище hangar: Хангар helipad: Вертолетна площадка runway: Писта taxilane: Таксилента taxiway: Път за рулиране - terminal: Терминал + terminal: Летищен терминал amenity: animal_shelter: Приют за животни arts_centre: Център на изкуствата @@ -586,7 +593,7 @@ bg: ferry_terminal: Фериботен терминал fire_station: Пожарна станция fountain: Фонтан - fuel: Гориво + fuel: Бензиностанция gambling: Хазартни игри grave_yard: Гробище hospital: Болница @@ -594,7 +601,7 @@ bg: ice_cream: Сладолед internet_cafe: Интернет Кафе kindergarten: Детска градина - language_school: Училище за езици + language_school: Езиково училище library: Библиотека loading_dock: Товарна рампа marketplace: Пазар @@ -789,7 +796,7 @@ bg: cemetery: Гробище commercial: Търговска зона conservation: Резерват - construction: Строителство + construction: Строителен обект farmland: Обработваема земя farmyard: Стопански двор forest: Гора @@ -994,7 +1001,7 @@ bg: curtain: Магазин за завеси deli: Деликатесен магазин department_store: Универсален магазин - doityourself: Направи сам + doityourself: Магазин направи сам dry_cleaning: Химическо чистене e-cigarette: Магазин е-цигари electronics: Магазин за електроника @@ -1016,7 +1023,7 @@ bg: hairdresser: Фризьорски салон hardware: Железария health_food: Магазин Здравословна храна - hifi: Аудиосистеми + hifi: Аудиомагазин houseware: Домашни потреби ice_cream: Магазин за Сладолед jewelry: Бижутериен магазин @@ -1058,7 +1065,7 @@ bg: apartment: Ваканционен апартамент artwork: Произведениe на изкуството attraction: Атракция - cabin: Кабина + cabin: Заслон camp_site: Лагер caravan_site: Къмпинг chalet: Бунгало @@ -1764,7 +1771,7 @@ bg: public_traces_from: Публични следи от GPS от потребител %{user} tagged_with: с етикет %{tags} upload_trace: Качване на следи от GPS - my_traces: Моите следи от GPS + my_traces: Моите следи georss: title: OpenStreetMap GPS трасета description: @@ -1833,7 +1840,7 @@ bg: heading: Условия heading_ct: Условия за сътрудничество consider_pd_why: какво е това? - consider_pd_why_url: https://www.osmfoundation.org/wiki/License/Why_would_I_want_my_contributions_to_be_public_domain + consider_pd_why_url: https://wiki.osmfoundation.org/wiki/Licence_and_Legal_FAQ/Why_would_I_want_my_contributions_to_be_public_domain continue: Продължаване declined: https://wiki.openstreetmap.org/wiki/Contributor_Terms_Declined decline: Отхвърли diff --git a/config/locales/br.yml b/config/locales/br.yml index 2de1f0829..0e0ef0aed 100644 --- a/config/locales/br.yml +++ b/config/locales/br.yml @@ -324,7 +324,7 @@ br: review link text: Heuilhit al liamm-mañ evel ma karot evit sellet ouzh diferadennoù nevez ar c'henlabourer hag asantiñ dezho. agreed_with_pd: Disklêriet hoc'h eus ivez emañ ho tegasadennoù en domani foran. - link: https://www.osmfoundation.org/wiki/License/Contributor_Terms + link: https://wiki.osmfoundation.org/wiki/Licence/Contributor_Terms link text: Petra eo se ? save changes button: Enrollañ ar c'hemmoù make edits public button: Lakaat ma holl aozadennoù da vezañ foran @@ -701,7 +701,7 @@ br: fire_station: Kazarn pomperien food_court: ↓Predva fountain: Feunteun - fuel: Dour-tan + fuel: Porzh Servij gambling: C'hoari arc'hant grave_yard: Bered grit_bin: Bailh holen @@ -2544,7 +2544,7 @@ br: consider_pd: Ouzhpenn an asant amañ a-us, ez anavezan emañ ma zegasadennoù en domani foran consider_pd_why: petra eo se ? - consider_pd_why_url: https://www.osmfoundation.org/wiki/License/Why_would_I_want_my_contributions_to_be_public_domain + consider_pd_why_url: https://wiki.osmfoundation.org/wiki/Licence_and_Legal_FAQ/Why_would_I_want_my_contributions_to_be_public_domain guidance_html: 'Titouroù da skoazellañ kompren an termenoù-mañ : a diverradenn lennus gant mab-den hag un nebeud troidigezhioù anfurmel' diff --git a/config/locales/en-GB.yml b/config/locales/en-GB.yml index 55aeb8d72..30640be9a 100644 --- a/config/locales/en-GB.yml +++ b/config/locales/en-GB.yml @@ -416,7 +416,6 @@ en-GB: reopened_by_html: Reactivated by %{user} %{when} reopened_by_anonymous_html: Reactivated by anonymous %{when} hidden_by_html: Hidden by %{user} %{when} - report: Report this note coordinates_html: '%{latitude}, %{longitude}' query: title: Query Features diff --git a/config/locales/es.yml b/config/locales/es.yml index 3a7de5e11..6fb4fe5f0 100644 --- a/config/locales/es.yml +++ b/config/locales/es.yml @@ -8,6 +8,7 @@ # Author: Alberto Chung # Author: Anarhistička Maca # Author: Angoca +# Author: AnupamM # Author: Armando-Martin # Author: BnSrSa # Author: Carlosmg.dg @@ -17,6 +18,7 @@ # Author: Danieldegroot2 # Author: Danniel07 # Author: DannyS712 +# Author: DarkGames26 # Author: Dcapillae # Author: Destinid10 2 # Author: Dgstranz @@ -2293,9 +2295,13 @@ es: description: Haga una pregunta o discuta asuntos interesantes en una amplia gama de listas de correo regionales o temáticas. forums: - title: Foros + title: Foros (Legado) description: Preguntas y discusiones para aquellos que prefieren una interfaz del estilo cartelera de anuncios. + community: + url: https://community.openstreetmap.org/ + title: Foro de la Comunidad + description: Un lugar compartido para conversaciones sobre OpenStreetMap. irc: title: IRC description: Chat interactivo en muchos idiomas diferentes y sobre muchos diff --git a/config/locales/et.yml b/config/locales/et.yml index 6ac3607a4..06645d7fc 100644 --- a/config/locales/et.yml +++ b/config/locales/et.yml @@ -425,7 +425,7 @@ et: reopened_by_html: Taasaktiveerinud %{user} %{when} reopened_by_anonymous_html: Taasaktiveerinud anonüümne kasutaja %{when} hidden_by_html: Peitnud %{user} %{when} - report: Teata sellest märkusest + report: sellest märkusest teada anda query: title: Info objektide kohta introduction: Klõpsa kaardil, et leida läheduses asuvad objektid. @@ -703,7 +703,7 @@ et: university: Ülikoolihoone "yes": Hoone craft: - blacksmith: Sepana + blacksmith: Sepp brewery: Pruulikoda carpenter: Puusepp electrician: Elektrik @@ -1498,28 +1498,28 @@ et: Meie dokumentatsioon kuulub Creative Commonsi litsentsi "Autorile viitamine + jagamine samadel tingimustel 2.0" (CC BY-SA 2.0) alla. credit_title_html: OpenStreetMapile viitamine - credit_1_html: |- - Nõuame, et kasutad omistamiseks teksti “© OpenStreetMapi - kaastöölised”. + credit_1_html: 'Seal, kus kasutad OpenStreetMapi andmeid, tuleb sul teha kaht + järgmist asja:' credit_2_1_html: |- - Samuti pead selgelt välja tooma, et andmed kuuluvad litsentsi Open - Database License alla ja kui kasutatakse kaardipaane, siis et kujutised - kuuluvad litsentsi CC BY-SA alla. Üks võimalus selleks on linkida - siia autoriõiguse leheküljele. - Teine võimalus ja samas ka nõue, kui levitad OSM-i - andmete kujul, on nimetada litsentsid ja linkida otse neile. Esitusvormis, - kus lingid pole võimalikud (nt trükises), soovitame suunata lugejad - aadressidele openstreetmap.org (võimalik, et laiendades teksti - "OpenStreetMap" täisaadressiks), opendatacommons.org ja - kui vaja, siis ka aadressile creativecommons.org. +
    +
  • Viidata OpenStreetMapile, kuvades meie autoriõiguse teatist.
    • +
  • Näidata selgelt, et andmed on saadaval litsentsi Open Database License all.
    • +
credit_3_1_html: |- - Standardse kujundusega kaardipaanid asukohas www.openstreetmap.org on - litsentsi Open Database License alla kuuluvatest andmetest loodud teos, - mille autor on OpenStreetMap Foundation. Kui kasutad neid kaardipaane, - siis tuleb need autorile omistada samamoodi nagu kaardiandmed. + Nõuded selle kohta, kuidas autoriõiguse teatist kuvada, sõltuvad sellest, + kuidas andmeid kasutad. Näiteks kohalduvad erinevad reeglid sõltuvalt + sellest, kas oled teinud sirvitava kaardi, trükikaardi või staatilise pildi. + Kõik üksikasjad nõuete kohta leiad omistamisjuhendist. credit_4_html: |- - Sirvitaval elektroonilisel kaardil peaks viide olema näha kaardi nurgas. - Näiteks: + Näitamaks selgelt, et andmed on saadaval litsentsi Open + Database License all, võid linkida + sellele autoriõiguse leheküljele. + Teise võimalusena ning ka nõudena, kui levitad OSM-i andmete kujul, + saad nimetada litsentsi(d) ja linkida otse sellele. Meediumites, + kus see pole võimalik (nt trükiteostes), soovitame juhatada + lugejad aadressidele openstreetmap.org (võid näiteks asendada nime + "OpenStreetMap" selle täieliku aadressiga) ja opendatacommons.org. + Selles näites on viide autoritele kaardi nurgas. attribution_example: alt: Näide, kuidas tunnustada OpenStreetMapi veebilehel title: Omistamise näide @@ -2342,7 +2342,7 @@ et: custom_dimensions: Vali suurus käsitsi format: 'Vorming:' scale: 'Mõõtkava:' - image_dimensions: Pildil näeb tavakaarti suurusega %{width} x %{height} + image_dimensions: Pildil näeb tavakaarti suurusega %{width} × %{height} download: Laadi alla short_url: Lühilink include_marker: Lisa marker @@ -2410,6 +2410,9 @@ et: reactivate: Aktiveeri uuesti comment_and_resolve: Kommenteeri ja lahenda comment: Kommenteeri + report_link_html: Kui see märkus sisaldab tundlikku teavet, mis tuleks eemaldada, + saad %{link}. Kõigi märkusega seotud muude probleemide korral lahenda see + ise kommentaariga. edit_help: Nihuta kaarti ja suumi sisse asukohta mida soovid redigeerida ja seejärel kliki siia. directions: diff --git a/config/locales/fa.yml b/config/locales/fa.yml index 98157a181..b9ca5e043 100644 --- a/config/locales/fa.yml +++ b/config/locales/fa.yml @@ -157,7 +157,7 @@ fa: longitude: طول جغرافیایی public: عمومی description: توضیح - gpx_file: آپلود فایل GPX + gpx_file: بارگذاری فایل GPX visibility: پدیداری tagstring: برچسب‌ها message: @@ -184,7 +184,7 @@ fa: home_lon: طول جغرافیایی languages: زبان‌های مورد ترجیح preferred_editor: ویرایش‌گر مورد ترجیح - pass_crypt: اسم رمز + pass_crypt: رمز عبور pass_crypt_confirmation: تأیید رمز عبور help: doorkeeper/application: @@ -1260,7 +1260,7 @@ fa: greengrocer: سبزی فروش grocery: فروشگاه خواروبار hairdresser: سلمانی - hardware: فروشگاه سخت افزار + hardware: فروشگاه ابزار آلات herbalist: عطاری hifi: فروشگاه Hi-Fi houseware: فروشگاه لوازم خانگی @@ -2495,7 +2495,7 @@ fa: write_diary: ایجاد روزنوشت، نظردهی و افزودن دوست write_api: اصلاح نقشه read_gpx: خواندن ردهای جی‌پی‌اس خصوصی - write_gpx: آپلود ردهای جی‌پی‌اس + write_gpx: بارگذاری ردهای جی‌پی‌اس write_notes: اصلاح یادداشت‌ها read_email: خواندن نشانی ایمیل کاربر skip_authorization: اپلیکیشن با تأیید خودکار diff --git a/config/locales/fr.yml b/config/locales/fr.yml index 4f848d6f0..be1781fb7 100644 --- a/config/locales/fr.yml +++ b/config/locales/fr.yml @@ -69,6 +69,7 @@ # Author: Rémi Bovard # Author: Seb35 # Author: Sherbrooke +# Author: StephaneP # Author: Syl # Author: The RedBurn # Author: Thibaut120094 @@ -131,7 +132,7 @@ fr: changeset_tag: Attribut du groupe de modifications country: Pays diary_comment: Commentaire du journal - diary_entry: Entrée du journal + diary_entry: Entrée de carnet friend: Ami(e) issue: Problème language: Langue @@ -169,8 +170,8 @@ fr: support_url: URL de l’assistance allow_read_prefs: lire les préférences de l’utilisateur allow_write_prefs: modifier les préférences de l’utilisateur - allow_write_diary: créer des entrées d’agenda, des commentaires et se faire - des amis + allow_write_diary: créer des entrées de carnet, des commentaires et des liens + d’amitié allow_write_api: modifier la carte allow_read_gpx: lire ses traces GPS privées allow_write_gpx: téléverser des traces GPS @@ -185,7 +186,7 @@ fr: language: Langue doorkeeper/application: name: Nom - redirect_uri: Rediriger les URIs + redirect_uri: Rediriger les URI confidential: Application confidentielle ? scopes: Autorisations friend: @@ -356,7 +357,7 @@ fr: retain_notes: Vos notes sur la cartes et les commentaires de notes, s’il y en a, seront conservés mais masqués au public. retain_changeset_discussions: Vos discussions sur les groupes de modification, - s’il y en a, seront conservés. + s’il y en a, seront conservées. retain_email: Votre adresse de courriel sera conservée. confirm_delete: Êtes-vous sûr(e) ? cancel: Annuler @@ -396,7 +397,7 @@ fr: contribution. review link text: Veuillez suivre ce lien à votre convenance pour examiner et accepter les nouvelles Conditions de contribution. - agreed_with_pd: Vous avez également déclaré que vous considériez vos modifications + agreed_with_pd: Vous avez également déclaré que vous considérez vos modifications comme relevant du domaine public. link: https://wiki.osmfoundation.org/wiki/Licence/Contributor_Terms link text: qu’est-ce que ceci ? @@ -423,7 +424,7 @@ fr: in_changeset: Groupe de modifications anonymous: anonyme no_comment: (aucun commentaire) - part_of: Appartient à + part_of: Partie de part_of_relations: one: 1 relation other: '%{count} relations' @@ -497,7 +498,7 @@ fr: changeset: groupe de modifications note: note timeout: - title: Erreur de dépassement de temps + title: Erreur de dépassement du délai d’attente sorry: Désolé, les données pour le type %{type} avec l’id %{id} prennent trop de temps à être récupérées. type: @@ -549,14 +550,14 @@ fr: report: signaler cette note coordinates_html: '%{latitude}, %{longitude}' query: - title: Requête sur les objets - introduction: Cliquer sur la carte pour trouver les objets à proximité. + title: Interroger les objets + introduction: Cliquer sur la carte pour trouver des objets à proximité. nearby: Objets à proximité enclosing: Objets englobants changesets: changeset_paging_nav: showing_page: Page %{page} - next: Suivant ›› + next: Suivant ▸ previous: ◂ Précédent changeset: anonymous: Anonyme @@ -579,7 +580,7 @@ fr: no_more: Aucun autre groupe de modifications trouvé. no_more_area: Aucun autre groupe de modifications dans cette zone. no_more_user: Aucun autre groupe de modifications par cet utilisateur. - load_more: Charger plus + load_more: Charger davantage timeout: sorry: Désolé, la liste des groupes de modifications que vous avez demandée met trop de temps pour être chargée. @@ -634,7 +635,7 @@ fr: new: Nouvelle entrée du journal new_title: Écrire une nouvelle entrée dans mon journal utilisateur my_diary: Mon journal - no_entries: Aucune entrée de journal + no_entries: Aucune entrée de carnet recent_entries: Entrées récentes du journal older_entries: Entrées plus anciennes newer_entries: Entrées plus récentes @@ -648,9 +649,9 @@ fr: login_to_leave_a_comment_html: '%{login_link} pour laisser un commentaire' login: Se connecter no_such_entry: - title: Aucune entrée du journal correspondante + title: Aucune entrée de carnet correspondante heading: 'Aucune entrée avec l’id : %{id}' - body: Désolé, il n’y a aucune entrée ou commentaire dans le journal avec l’id + body: Désolé, il n’y a aucune entrée ni commentaire de carnet avec l’identifiant %{id}. Veuillez vérifier votre orthographe ou la validité du lien que vous avez cliqué. diary_entry: @@ -711,8 +712,8 @@ fr: success: '%{name} est désormais votre ami(e) !' failed: Désolé, échec lors de l’ajout de %{name} en tant qu’ami(e). already_a_friend: Vous et %{name} êtes déjà ami(e)s. - limit_exceeded: Vous avez déclaré récemment beaucoup d’utilisateurs comme amis. - Veuillez attendre un peu avant d’essayer de déclarer de nouveaux amis. + limit_exceeded: Vous avez récemment déclaré beaucoup d’utilisateurs comme ami(e)s. + Veuillez attendre un peu avant d’essayer d’en déclarer d’autres. remove_friend: heading: Supprimer %{user} en tant qu’ami(e) ? button: Supprimer en tant qu’ami(e) @@ -890,7 +891,7 @@ fr: chapel: Chapelle church: Bâtiment d’église civic: Bâtiment municipal - college: Bâtiment de collège + college: Bâtiment d’enseignement supérieur commercial: Bâtiment de bureaux construction: Bâtiment en construction detached: Maison isolée @@ -937,7 +938,7 @@ fr: blacksmith: Forgeron brewery: Brasserie carpenter: Charpentier - caterer: Réfectoire / cantine + caterer: Traiteur confectionery: Confiserie dressmaker: Couturier electrician: Électricien @@ -978,7 +979,7 @@ fr: bus_stop: Arrêt de bus construction: Route en construction corridor: Couloir - crossing: Carrefour + crossing: Intersection / carrefour cycleway: Piste cyclable elevator: Ascenseur emergency_access_point: Point d’accès d’urgence @@ -1086,8 +1087,8 @@ fr: railway: Voie ferrée recreation_ground: Aire de jeux religious: Terrain religieux - reservoir: Réservoir - reservoir_watershed: Bassin versant de réservoir + reservoir: Bassin de retenue + reservoir_watershed: Bassin versant d’une retenue residential: Zone résidentielle retail: Zone commerciale village_green: Pré communal @@ -1164,7 +1165,7 @@ fr: pier: Jetée pipeline: Pipeline pumping_station: Station de pompage - reservoir_covered: Réservoir couvert + reservoir_covered: Bassin de retenue couvert silo: Silo snow_cannon: Canon à neige snow_fence: Barrière à neige @@ -1233,7 +1234,7 @@ fr: stone: Pierre strait: Détroit tree: Arbre - tree_row: Ligne d’arbres + tree_row: Rangée d’arbres tundra: Toundra valley: Vallée volcano: Volcan @@ -1517,7 +1518,7 @@ fr: not_updated: Non mis à jour search: Rechercher search_guidance: 'Problèmes de recherche :' - user_not_found: L’utilisateur n’existe pas + user_not_found: L’utilisateur ou l’utilisatrice n’existe pas issues_not_found: Aucun problème trouvé de ce type status: État reports: Rapports @@ -1699,10 +1700,10 @@ fr: befriend_them: 'Vous pouvez également l’ajouter comme ami(e) ici : %{befriendurl}.' befriend_them_html: Vous pouvez aussi l’ajouter comme ami à l’adresse %{befriendurl}. gpx_description: - description_with_tags_html: 'Il semblerait que votre fichier GPX %{trace_name} - avec la description %{trace_description} et les balises suivantes : %{tags}' - description_with_no_tags_html: Il semblerait que votre fichier GPX %{trace_name} - avec la description %{trace_description} et sans balises + description_with_tags_html: 'Cela ressemble à votre fichier GPX « %{trace_name} » + avec la description « %{trace_description}«» et les balises suivantes : %{tags}' + description_with_no_tags_html: Cela ressemble à votre fichier GPX « %{trace_name} » + avec la description « %{trace_description} » et sans balises gpx_failure: hi: Bonjour %{to_user}, failed_to_import: 'n’a pas pu être importé. Voici l’erreur :' @@ -1782,18 +1783,18 @@ fr: hi: Bonjour %{to_user}, greeting: Bonjour, commented: - subject_own: '[OpenStreetMap] %{commenter} a commenté un de vos ensembles - de changements' - subject_other: '[OpenStreetMap] %{commenter} a commenté un ensemble de changements + subject_own: '[OpenStreetMap] %{commenter} a commenté un de vos groupes de + modifications' + subject_other: '[OpenStreetMap] %{commenter} a commenté un groupe de modifications auquel vous vous intéressez' your_changeset: '%{commenter} a laissé un commentaire le %{time} sur un de - vos ensembles de changements' + vos groupes de modifications' your_changeset_html: '%{commenter} a laissé un commentaire à %{time} sur un - de vos ensembles de modifications' + de vos groupes de modifications' commented_changeset: '%{commenter} a laissé un commentaire le %{time} sur - un ensemble de changements créé par %{changeset_author} et que vous suivez' + un groupe de modifications que vous suivez et créé par %{changeset_author}' commented_changeset_html: '%{commenter} a laissé un commentaire à %{time} - sur un ensemble de modifications que vous suivez créé par %{changeset_author}.' + sur un groupe de modifications que vous suivez et créé par %{changeset_author}.' partial_changeset_with_comment: avec le commentaire « %{changeset_comment} » partial_changeset_with_comment_html: avec le commentaire « %{changeset_comment} » partial_changeset_without_comment: sans commentaire @@ -1867,8 +1868,8 @@ fr: back_to_inbox: Revenir à la boîte de réception create: message_sent: Message envoyé - limit_exceeded: Vous avez envoyé trop de messages récemment, attendez un moment - avant d’essayer d’en envoyer de nouveaux. + limit_exceeded: Vous avez récemment envoyé beaucoup de messages. Veuillez attendre + un moment avant d’essayer d’en envoyer d’autres. no_such_message: title: Message introuvable heading: Message introuvable @@ -2297,7 +2298,7 @@ fr: add_a_note: instructions_html: |- Cliquez simplement sur ou cette même icône sur l’affichage de la carte. - Cela placera un marqueur sur la carte, que vous pourrez déplacer en le glissant. Ajoutez votre message, puis cliquez sur Enregistrer, et d’autres cartographes l’étudieront. + Cela placera un marqueur sur la carte, que vous pourrez déplacer en faisant glisser la carte. Ajoutez votre message, puis cliquez sur « Enregistrer » ; alors d’autres cartographes iront enquêter. other_concerns: title: Autres préoccupations explanation_html: Si vous êtes préoccupé par la manière dont nos données sont @@ -2328,9 +2329,13 @@ fr: description: Poser une question ou discuter de questions intéressantes sur un large éventail de listes de diffusion thématiques ou régionales. forums: - title: Forums + title: Forums (hérités) description: Des questions et des discussions pour ceux qui préfèrent une interface sous forme de tableau d’affichage. + community: + url: https://community.openstreetmap.org/ + title: Forum de la communauté + description: Un lieu partagé pour les conversations sur OpenStreetMap. irc: title: IRC description: Discussion interactive dans de nombreuses langues différentes @@ -2436,7 +2441,7 @@ fr: tunnel: Bordure pointillée = tunnel bridge: Bord noir = pont private: Accès privé - destination: Réservé aux riverains + destination: Accès réservé aux riverains construction: Routes en construction bicycle_shop: Magasin de vélos bicycle_parking: Parking à vélos @@ -2487,12 +2492,12 @@ fr: start_mapping: Commencer à cartographier add_a_note: title: Pas le temps d’effectuer les modifications ? Ajoutez une note ! - paragraph_1_html: |- - Si vous voulez juste une petite correction et n’avez pas le temps de vous - enregistrer sur le projet et d’apprendre à effectuer les modifications, il est facile d’ajouter une note. + paragraph_1_html: Si vous voulez juste une petite correction et n’avez pas + le temps de vous inscrire sur le projet et d’apprendre à effectuer des modifications, + il est facile d’ajouter une note. paragraph_2_html: |- Allez simplement sur la carte et cliquez sur l’icône note : - . Cela ajoutera un marqueur sur la carte, que vous pouvez déplacer en faisant glisser la carte. Ajoutez votre message puis cliquez sur Enregistrer, alors d’autres contributeurs iront enquêter. + . Cela placera un marqueur sur la carte, que vous pourrez déplacer en faisant glisser la carte. Ajoutez votre message puis cliquez sur « Enregistrer » ; alors d’autres cartographes iront enquêter. traces: visibility: private: Privé (partagé anonymement, points non ordonnés) @@ -2508,7 +2513,7 @@ fr: help: Aide help_url: https://wiki.openstreetmap.org/wiki/FR:Upload create: - upload_trace: Envoyer la trace GPS + upload_trace: Téléverser la trace GPS trace_uploaded: Votre fichier GPX a été téléversé et est en attente de son intégration dans la base de données. Ceci prend en général moins d’une demi-heure et un courriel vous sera envoyé lorsque ce sera terminé. @@ -2523,12 +2528,12 @@ fr: afin de ne pas bloquer la file d’attente pour les autres utilisateurs. edit: cancel: Annuler - title: Modifier la trace %{name} - heading: Modifier la trace %{name} + title: Modification de la trace %{name} + heading: Modification de la trace %{name} visibility_help: qu’est-ce que cela signifie ? visibility_help_url: https://wiki.openstreetmap.org/wiki/FR:Visibilit%C3%A9_des_traces_GPS update: - updated: Traces mises à jour + updated: Trace mise à jour trace_optionals: tags: Mots-clés show: @@ -2547,19 +2552,19 @@ fr: description: 'Description :' tags: 'Mots-clés :' none: Aucun - edit_trace: Modifier cette piste - delete_trace: Supprimer cette piste + edit_trace: Modifier cette trace + delete_trace: Supprimer cette trace trace_not_found: Trace non trouvée ! visibility: 'Visibilité :' confirm_delete: Supprimer cette trace ? trace_paging_nav: showing_page: Page %{page} - older: Anciennes traces - newer: Nouvelles traces + older: Traces plus anciennes + newer: Traces plus récentes trace: pending: EN ATTENTE count_points: - one: 1 point + one: '%{count} point' other: '%{count} points' more: plus trace_details: Voir les détails de la trace @@ -2575,19 +2580,19 @@ fr: public_traces: Traces GPS publiques my_gps_traces: Mes traces GPS public_traces_from: Traces GPS publiques de %{user} - description: Parcourir les traces GPS récemment téléversées + description: Parcourir les téléversements récents de traces GPS tagged_with: balisée avec %{tags} empty_html: Il n’y a encore rien ici. Téléverser une nouvelle trace ou pour en savoir plus sur le traçage GPS, consultez la page wiki. - upload_trace: Envoyer une trace + upload_trace: Téléverser une trace all_traces: Toutes les traces my_traces: Mes traces traces_from: Traces publiques de %{user} - remove_tag_filter: Supprimer le filtre de balise + remove_tag_filter: Retirer le filtre de balises destroy: - scheduled_for_deletion: Trace prévue pour la suppression + scheduled_for_deletion: Trace planifiée pour suppression make_public: made_public: Trace rendue publique offline_warning: @@ -2633,11 +2638,11 @@ fr: allow_to: 'Autoriser l’application cliente à :' allow_read_prefs: lire vos préférences utilisateur ; allow_write_prefs: modifier vos préférences utilisateur ; - allow_write_diary: créer pour vous des entrées dans votre carnet, faire des - commentaires et ajouter des amis ; + allow_write_diary: créer des entrées dans votre carnet, faire des commentaires + et ajouter des ami(e)s ; allow_write_api: modifier la carte. allow_read_gpx: lire vos traces GPS privées ; - allow_write_gpx: envoyer des traces GPS en votre nom ; + allow_write_gpx: téléverser des traces GPS. allow_write_notes: modifier des notes. grant_access: Accorder l’accès authorize_success: @@ -2666,7 +2671,7 @@ fr: skip_authorization: Demande d’approbation automatique oauth_clients: new: - title: Enregistrer une nouvelle application + title: Inscrire une nouvelle application edit: title: Modifier votre application show: @@ -2690,12 +2695,11 @@ fr: issued_at: Émis le revoke: Révoquer ! my_apps: Mes applications clientes - no_apps_html: Avez-vous une application qui aimerait s’enregistrer pour utiliser - le standard %{oauth} ? Vous devez enregistrer votre application web avant - qu’elle ne puisse faire des requêtes OAuth sur ce service. + no_apps_html: Avez-vous une application que vous aimeriez inscrire pour son + utilisation avec nous via le standard %{oauth} ? Vous devez inscrire votre + application web avant qu’elle puisse faire des requêtes OAuth sur ce service. oauth: OAuth - registered_apps: 'Vous avez les applications clientes suivantes enregistrées - :' + registered_apps: 'Vous avez inscrit les applications clientes suivantes :' register_new: Enregistrez votre application form: requests: 'Demander les permissions suivantes à l’utilisateur :' @@ -2710,11 +2714,11 @@ fr: oauth2_applications: index: title: Mes applications clientes - no_applications_html: Avez-vous une application que vous aimeriez enregistrer - pour utiliser avec nous via le standard %{oauth2} ? Vous devez enregistrer + no_applications_html: Avez-vous une application que vous aimeriez inscrire pour + son utilisation avec nous via le standard %{oauth2} ? Vous devez inscrire votre application avant qu’elle puisse faire des requêtes OAuth à ce service. oauth_2: OAuth 2 - new: Enregistrer une nouvelle application + new: Inscrire une nouvelle application name: Nom permissions: Autorisations application: @@ -2722,19 +2726,19 @@ fr: delete: Supprimer confirm_delete: Supprimer cette application ? new: - title: Enregistrer une nouvelle application + title: Inscrire une nouvelle application edit: title: Modifier votre application show: edit: Modifier delete: Supprimer confirm_delete: Supprimer cette application ? - client_id: ID client + client_id: Identifiant du client client_secret: Secret du client - client_secret_warning: Assurez-vous de sauvegarder ce secret — il ne sera plus + client_secret_warning: Assurez-vous d’enregistrer ce secret — il ne sera plus accessible permissions: Autorisations - redirect_uris: Rediriger les URIs + redirect_uris: Rediriger les URI not_found: sorry: Désolé, cette application n’a pas pu être trouvée. oauth2_authorizations: @@ -2760,15 +2764,15 @@ fr: users: new: title: S’inscrire - no_auto_account_create: Malheureusement, nous sommes actuellement dans l’impossibilité - de vous créer un compte automatiquement. + no_auto_account_create: Malheureusement, nous ne sommes actuellement pas en + mesure de vous créer un compte automatiquement. contact_support_html: Veuillez contacter l’assistance pour qu’elle vous crée un compte — nous essaierons de traiter votre demande le plus rapidement possible. about: header: Libre et modifiable html: |- -

À la différence des autres cartes, OpenStreetMap est entièrement créé par des gens comme vous, et chacun est libre de le modifier, le mettre à jour, le télécharger et l’utiliser.

+

À la différence des autres cartes, OpenStreetMap est entièrement créé par des gens comme vous, et chacun est libre de le corriger, le mettre à jour, le télécharger et l’utiliser.

Inscrivez-vous pour commencer à participer. Nous vous enverrons un courriel pour confirmer votre compte.

email address: 'Adresse de courriel :' confirm email address: 'Confirmez l’adresse de courriel :' @@ -2788,8 +2792,8 @@ fr: heading: Conditions heading_ct: Conditions de contribution read and accept with tou: Veuillez lire l’accord du contributeur et les conditions - d’utilisation ; une fois ceci fait cochez les deux cases, puis appuyer sur - le bouton Continuer. + d’utilisation ; une fois cela fait, cochez les deux cases et appuyez alors + sur le bouton « Continuer ». contributor_terms_explain: Cet accord impose les conditions de vos contributions existantes et à venir. read_ct: J’ai lu et j’accepte les Conditions de contribution ci-dessus. @@ -2821,13 +2825,13 @@ fr: terms_declined_url: https://wiki.openstreetmap.org/wiki/Contributor_Terms_Declined no_such_user: title: Utilisateur inexistant - heading: L’utilisateur %{user} n’existe pas - body: Désolé, il n’y a aucun utilisateur avec le nom %{user}. Veuillez vérifier - l’orthographe, ou bien le lien que vous avez cliqué n’est pas correct. + heading: L’utilisateur ou l’utilisatrice « %{user} » n’existe pas + body: Désolé, il n’y a aucun(e) utilisateur ou utilisatrice avec le nom « %{user} ». + Veuillez vérifier votre orthographe ou la validité du lien que vous avez cliqué. deleted: supprimé show: my diary: Mon journal - new diary entry: nouvelle entrée du journal + new diary entry: nouvelle entrée du carnet my edits: Mes modifications my traces: Mes traces my notes: Mes notes @@ -2958,7 +2962,7 @@ fr: title: Création d’un blocage sur « %{name} » heading_html: Création d’un blocage sur « %{name} » period: Pendant combien de temps, à partir de maintenant, l’utilisateur ou l’utilisatrice - doit être bloqué(e) sur l’API ? + doit être bloqué(e) sur l’API. tried_contacting: J’ai contacté l’utilisateur ou l’utilisatrice et lui ai demandé d’arrêter. tried_waiting: J’ai donné un temps raisonnable à l’utilisateur ou l’utilisatrice @@ -2967,8 +2971,8 @@ fr: edit: title: Modification d’un blocage sur « %{name} » heading_html: Modification d’un blocage sur « %{name} » - period: Combien de temps, à partir de maintenant, l’utilisateur ou l’utilisatrice - doit être bloqué(e) sur l’API ? + period: Pendant combien de temps, à partir de maintenant, l’utilisateur ou l’utilisatrice + doit être bloqué(e) sur l’API. show: Afficher ce blocage back: Voir tous les blocages filter: @@ -2993,7 +2997,7 @@ fr: heading_html: Annulation d’un blocage sur « %{block_on} » par « %{block_by} » time_future: Ce blocage se terminera dans %{time}. past: Ce blocage s’est terminé à %{time} et ne peut plus être annulé. - confirm: Êtes-vous sûr de vouloir annuler ce blocage ? + confirm: Êtes-vous sûr(e) de vouloir annuler ce blocage ? revoke: Révoquer ! flash: Ce blocage a été annulé. helper: @@ -3052,7 +3056,7 @@ fr: revoker_name: Révoqué par showing_page: Page %{page} next: Suivant » - previous: « Précédent + previous: ◂ Précédent notes: index: title: Notes soumises ou commentées par « %{user} » @@ -3100,7 +3104,7 @@ fr: title: Afficher mon emplacement metersPopup: one: Vous êtes à moins d’un mètre de ce point - other: Vous êtes à %{count} mètres de ce point + other: Vous êtes à moins de %{count} mètres de ce point feetPopup: one: Vous êtes à moins d’un pied de ce point other: Vous êtes à moins de %{count} pieds de ce point @@ -3119,7 +3123,7 @@ fr: overlays: Autoriser les superpositions pour réparer la carte title: Couches copyright: © Contributeurs d’OpenStreetMap - donate_link_text: + donate_link_text: terms: Conditions du site web et de l’API cyclosm: Style de briques par CyclOSM hébergé par OpenStreetMap France @@ -3136,7 +3140,7 @@ fr: createnote_disabled_tooltip: Zoomer pour ajouter une note sur la carte map_notes_zoom_in_tooltip: Zoomez pour lire les notes sur la carte map_data_zoom_in_tooltip: Zoomez pour lire voir les données sur la carte - queryfeature_tooltip: Requête sur les objets + queryfeature_tooltip: Interroger les objets queryfeature_disabled_tooltip: Zoomer plus pour rechercher des objets changesets: show: @@ -3171,11 +3175,11 @@ fr: ascend: Croissant engines: fossgis_osrm_bike: À vélo (OSRM) - fossgis_osrm_car: En voiture (OSRM) - fossgis_osrm_foot: À pied (OSRM) + fossgis_osrm_car: En voiture (OSRM) + fossgis_osrm_foot: À pied (OSRM) graphhopper_bicycle: À vélo (GraphHopper) - graphhopper_car: En voiture (GraphHopper) - graphhopper_foot: À pied (GraphHopper) + graphhopper_car: En voiture (GraphHopper) + graphhopper_foot: À pied (GraphHopper) descend: Décroissant directions: Itinéraire distance: Distance @@ -3248,7 +3252,7 @@ fr: courtesy: Itinéraire fourni par %{link} exit_counts: first: 1er - second: 2nd + second: 2e third: 3e fourth: 4e fifth: 5e diff --git a/config/locales/fy.yml b/config/locales/fy.yml index 115743cc3..5a9077b35 100644 --- a/config/locales/fy.yml +++ b/config/locales/fy.yml @@ -2223,9 +2223,13 @@ fy: description: Stel in fraach of bepraat nijsgjirrige saken op útienrinnende tematyske as regionale mailinglisten. forums: - title: Foarums + title: Foarums (âld) description: Fragen en oerlis foar dejingen dy't leaver yn pripboerd-styl wurkje. + community: + url: https://community.openstreetmap.org/ + title: Mienskipsfoarum + description: In mienskiplik plak foar petear oer OpenStreetMap. irc: title: IRC description: Ynteraktyf tsjetten yn ferskate talen en op alderlei mêd. diff --git a/config/locales/he.yml b/config/locales/he.yml index 1e9ae4924..1a3342bce 100644 --- a/config/locales/he.yml +++ b/config/locales/he.yml @@ -1523,6 +1523,7 @@ he: issue_comments: create: comment_created: המודעה שלך נוצרה בהצלחה + issue_reassigned: ההערה שלך נוצרה והבעיה הוקצתה מחדש reports: new: title_html: דיווח על %{link} diff --git a/config/locales/ia.yml b/config/locales/ia.yml index 0728d1e84..ec0b82780 100644 --- a/config/locales/ia.yml +++ b/config/locales/ia.yml @@ -2223,9 +2223,13 @@ ia: description: Pone un question o discute cosas interessante sur un varietate de listas de diffusion thematic o regional. forums: - title: Foros + title: Foros (ancian) description: Questiones e discussiones pro qui prefere un interfacie in stilo de tabuliero de bulletines. + community: + url: https://community.openstreetmap.org/ + title: Foro del communitate + description: Un sito commun de conversation sur OpenStreetMap. irc: title: IRC description: Conversation interactive in multe linguas differente e sur multe diff --git a/config/locales/it.yml b/config/locales/it.yml index 46dd65ae2..853c113fc 100644 --- a/config/locales/it.yml +++ b/config/locales/it.yml @@ -56,6 +56,7 @@ # Author: Sorcrosc # Author: Toa # Author: Tuxfuzz +# Author: Vivbod # Author: Ximo17 # Author: ZioNicco --- @@ -1531,6 +1532,7 @@ it: issue_comments: create: comment_created: Il tuo commento è stato creato con successo + issue_reassigned: Il tuo commento è stato creato e il problema è stato riassegnato reports: new: title_html: Segnala %{link} @@ -2278,9 +2280,12 @@ it: description: Poni la tua domanda o discuti questioni di interesse su una vasta gamma di mailing list tematiche o regionali. forums: - title: Forum + title: Forum (vecchio) description: Domande e discussioni per coloro che preferiscono un'interfaccia in stile bacheca (BBS). + community: + url: https://community.openstreetmap.org/ + description: Un luogo condiviso per le conversazioni su OpenStreetMap. irc: title: IRC description: Chat interattiva in molte lingue diverse e su molti argomenti. diff --git a/config/locales/mk.yml b/config/locales/mk.yml index 996760fe3..36efe0108 100644 --- a/config/locales/mk.yml +++ b/config/locales/mk.yml @@ -2217,8 +2217,12 @@ mk: description: Поставете прашање или разговарајте за интересни прашања на широк опсег на тематски и регионални поштенски списоци. forums: - title: Форуми + title: Форуми (наследени) description: Прашања и разговори за оние кои претпочитаат да општат со објави. + community: + url: https://community.openstreetmap.org/ + title: Форум на заедницата + description: Заедничко место за разговори за OpenStreetMap. irc: title: IRC description: Разговор во живо на најразлични јазици и на многу теми. diff --git a/config/locales/nb.yml b/config/locales/nb.yml index 7bc393f02..f2aef8605 100644 --- a/config/locales/nb.yml +++ b/config/locales/nb.yml @@ -8,6 +8,7 @@ # Author: Dittaeva # Author: EvenT # Author: Event +# Author: Gabriel Kielland # Author: Gustavf # Author: Haakon K # Author: Hansfn @@ -1955,6 +1956,8 @@ nb: title: Forumer description: Spørsmål og diskusjoner for de som foretrekker et oppslagstavlelignende grensesnitt. + community: + url: https://community.openstreetmap.org/ irc: title: IRC description: Interaktiv sludrekanal på flere ulike språk som dekker mange diff --git a/config/locales/ne.yml b/config/locales/ne.yml index 18c661548..ce84cd733 100644 --- a/config/locales/ne.yml +++ b/config/locales/ne.yml @@ -11,6 +11,7 @@ # Author: Njsubedi # Author: RajeshPandey # Author: पर्वत सुबेदी +# Author: बडा काजी # Author: राम प्रसाद जोशी # Author: सरोज कुमार ढकाल # Author: हिमाल सुबेदी @@ -375,7 +376,7 @@ ne: other: '%{count} टिप्पणीहरू' edit_link: यो प्रविष्टी सम्पादन गर्ने hide_link: यो प्रविष्टी लुकाउने - confirm: निश्चित गर्ने + confirm: निश्चित गर्नुहोस् report: यो प्रविष्टीको उजुरी गर्ने diary_comment: comment_from_html: '%{link_user}द्वारा %{comment_created_at}मा गरिएको टिप्पणी' @@ -863,7 +864,7 @@ ne: greeting: नमस्ते, confirmations: confirm: - button: निश्चित गर्ने + button: निश्चित गर्नुहोस् confirm_email: heading: इमेल परिवर्तन भएको निश्चित गर्नुहोस् press confirm button: इमेल निश्चित गर्नको लागि निश्चितमा क्लिक गर्नुहोस् । @@ -1175,7 +1176,7 @@ ne: role: administrator: यी प्रयोगकर्ता प्रबन्धक हुनुहुन्छ comments: टिप्पणी - confirm: निश्चित गर्ने + confirm: निश्चित गर्नुहोस् go_public: flash success: तपाईंका सबै सम्पादनहरू सार्वाजनिक छन् , तपाईं अब सम्पादन लायक हुनु भयो । @@ -1192,7 +1193,7 @@ ne: heading: भूमिका प्रदान निश्चित गर्ने are_you_sure: भूमिका `%{role}' प्रयोगकर्ता `%{name}'लाई प्रदान गर्न निश्चित हुनुहुन्छ? - confirm: निश्चित गर्ने + confirm: निश्चित गर्नुहोस् fail: भूमिका `%{role}' प्रयोगकर्ता `%{name}'लाई प्रदान गर्न सकिएन । कृपया प्रयोगकर्ता र भूमिका दुबै मान्य छन् भनि जाँच गर्नुहोस् । revoke: @@ -1200,7 +1201,7 @@ ne: heading: भूमिका फिर्ता निश्चित गर्ने are_you_sure: तपाईँ भूमिका `%{role}' , `%{name} प्रोगकर्ताबाट फिर्ता लिने कुरामा निश्चित हुनुहुन्छ'? - confirm: निश्चित गर्ने + confirm: निश्चित गर्नुहोस् fail: भूमिका `%{role}' ,`%{name}'बाट फिर्ता लिन सकिएन । प्रोगकर्ता नाम र भूमिका दुबै मान्य छन् भन्ने खुलाउनु होस् । user_blocks: diff --git a/config/locales/nl.yml b/config/locales/nl.yml index 21b1a6588..c3b29ff06 100644 --- a/config/locales/nl.yml +++ b/config/locales/nl.yml @@ -2291,9 +2291,13 @@ nl: description: Stel een vraag of bespreek interessante zaken op een hele reeks onderwerpsgebonden of regionale mailinglijsten. forums: - title: Forums + title: Forums (verouderd) description: Vragen en overleg voor als u liever met een interface in bulletin boardstijl werkt. + community: + url: https://community.openstreetmap.org/ + title: Gemeenschapsforum + description: Een gedeelde plek voor conversaties over OpenStreetMap. irc: title: IRC description: Interactieve chat in vele verschillende talen en over tal van diff --git a/config/locales/pt-PT.yml b/config/locales/pt-PT.yml index 4fafb890d..2586145be 100644 --- a/config/locales/pt-PT.yml +++ b/config/locales/pt-PT.yml @@ -496,7 +496,7 @@ pt-PT: reopened_by_html: Reaberto por %{user} %{when} reopened_by_anonymous_html: Reaberto por um anónimo %{when} hidden_by_html: Ocultada por %{user} %{when} - report: Denunciar esta nota + report: denunciar esta nota coordinates_html: '%{latitude}, %{longitude}' query: title: Consultar elementos @@ -1272,7 +1272,7 @@ pt-PT: switch: Agulha ferroviária tram: Linha de elétrico tram_stop: Paragem de elétrico - turntable: Girador ferroviário + turntable: Rotunda ferroviária yard: Pátio de manobras ferroviário shop: agrarian: Loja agrícola @@ -1523,6 +1523,7 @@ pt-PT: issue_comments: create: comment_created: O comentário foi criado com sucesso + issue_reassigned: O teu comentário foi criado e o problema foi reatribuído reports: new: title_html: Denunciar %{link} @@ -1890,7 +1891,7 @@ pt-PT: cancel: Cancelar image: Imagem gravatar: - gravatar: Usar imagem Gravatar + gravatar: Usar Gravatar link: https://wiki.openstreetmap.org/wiki/Gravatar what_is_gravatar: O que é o Gravatar? disabled: O Gravatar foi desativado. @@ -1899,7 +1900,7 @@ pt-PT: keep image: Manter a imagem atual delete image: Remover a imagem atual replace image: Substituir a imagem atual - image size hint: (as imagens quadradas com pelo menos 100x100 píxeis, funcionam + image size hint: (as imagens quadradas com, pelo menos, 100x100 píxeis funcionam melhor) home location: Localização principal no home location: Não definiste a tua localização principal. @@ -2048,24 +2049,19 @@ pt-PT: credit_title_html: Como creditar o OpenStreetMap credit_1_html: 'Onde usar dados do OpenStreetMap, é necessário fazer as duas coisas seguintes:' - credit_2_1_html: "
    \n
  • Fornecer crédito ao OpenStreetMap exibindo o - nosso aviso de direitos autorais.
    • \n
  • Deixar claro que os dados - estão disponíveis sob a Open Database License.
    • \n
" - credit_3_1_html: "Para o aviso de direitos autorais, temos requisitos diferentes - sobre como isso deve ser \nexibido, dependendo de como usa os nossos dados. - Por exemplo, diferentes \nregras se aplicam sobre como mostrar o aviso de - direitos de autor dependendo se\ncriou um mapa navegável, um mapa impresso - ou uma imagem estática. Detalhes completos sobre os requisitos \n podem - ser encontrados nas\n Diretrizes - de atribuição ." - credit_4_html: "Para deixar claro que os dados estão disponíveis sob a Licença - Open\nDatabase, é possível criar um link para\n esta - página de direitos de autor.\nAlternativamente, e como requisito, se - estiver distribuindo OSM num\nformato de dados, pode nomear e vincular diretamente - à(s) licença(s). Em mídia\nonde ligações não são possíveis (por exemplo, - trabalhos impressos), sugerimos que\ndirecione os seus leitores para openstreetmap.org - (talvez expandindo\n'OpenStreetMap' para este endereço completo) e para - opendatacommons.org. \nNeste exemplo, o crédito aparece no canto do mapa." + credit_2_1_html: "
    \n
  • Atribuir os créditos ao OpenStreetMap exibindo + o nosso aviso de direitos de autor.
    • \n
  • Deixar claro que os dados + estão disponíveis sob a Licença Open Database.
    • \n
" + credit_3_1_html: Para o aviso de direitos de autor, temos vários requisitos + para a sua exibição, dependendo da forma como usa os nossos dados. Por exemplo, + aplicam-se regras diferentes para a exibição do aviso de direitos de autor + conforme usar um mapa navegável, um mapa impresso ou uma imagem estática. + Poderá encontrar toda a informação sobre os requisitos nas Diretrizes + de Atribuição. + credit_4_html: |- + Para deixar claro que os dados estão disponíveis sob a Licença Open + Database, é possível criar uma ligação para esta página de direitos de autor. + Em alternativa, e como requisito, se estiver a distribuir o OSM num formato de dados, pode nomear e ligar diretamente à(s) licença(s). Em plataformas multimédia onde as ligações não são possíveis (por exemplo, trabalhos impressos), sugerimos que direcione os seus utilizadores para openstreetmap.org (talvez expandindo 'OpenStreetMap' para este endereço completo) e para opendatacommons.org. Neste exemplo, os créditos aparecem no canto do mapa. attribution_example: alt: Exemplo de como indicar os créditos do OpenStreetMap numa página eletrónica title: Exemplo de atribuição @@ -2497,7 +2493,7 @@ pt-PT: in: em index: public_traces: Rotas de GPS Públicas - my_gps_traces: Meus rastreamentos de GPS + my_gps_traces: As minhas rotas GPS public_traces_from: Rotas GPS públicas do utilizador %{user} description: Explorar as rotas GPS enviadas recentemente tagged_with: etiquetada com %{tags} @@ -3079,6 +3075,9 @@ pt-PT: reactivate: Reabrir comment_and_resolve: Comentar e resolver comment: Comentar + report_link_html: Se esta nota contiver informação sensível que tenha de ser + removida, podes %{link}. Para qualquer outro problema com a nota, por favor, + resolve-a com um comentário. edit_help: Move o mapa, amplia-o no local que pretendes editar e clica aqui. directions: ascend: Ascenção diff --git a/config/locales/ru.yml b/config/locales/ru.yml index 8f8210d56..2a4a9fff9 100644 --- a/config/locales/ru.yml +++ b/config/locales/ru.yml @@ -2276,8 +2276,12 @@ ru: description: Задайте вопрос или обсудите насущные вопросы в списке рассылок (количество активных пользователей зависит от языка). forums: - title: Форумы + title: Форумы (устаревшее) description: Вопросы и обсуждения для тех, кто предпочитает форумы для общения. + community: + url: https://community.openstreetmap.org/ + title: Форум сообщества + description: Общедоступное место для разговоров об OpenStreetMap. irc: title: IRC description: Интерактивный чат на разных языках и на разные темы. @@ -2356,6 +2360,7 @@ ru: common: - Общественная земля - луг + - сад retail: Торговый район industrial: Промышленный район commercial: Коммерческий район diff --git a/config/locales/sc.yml b/config/locales/sc.yml index c6928eaa7..fd4ab7357 100644 --- a/config/locales/sc.yml +++ b/config/locales/sc.yml @@ -522,48 +522,146 @@ sc: tua pro bìdere sos utentes a curtzu.' edit_your_profile: Modìfica su profìlu tuu my friends: Amigus meus + no friends: No as galu annantu perunu amigu. + nearby users: Àteros utentes a curtzu + no nearby users: Non b'at perunu àteru utente chi ammitat de mapare a curtzu + a inoghe. + friends_changesets: grupos de modìficas de sos amigos + friends_diaries: intradas de diàriu de sos amigos + nearby_changesets: grupos de modìficas de utentes a curtzu + nearby_diaries: intradas de diàriu de utentes a curtzu diary_entries: + new: + title: Intrada de diàriu noa form: location: Logu + use_map_link: Imprea sa mapa index: + title: Diàrios de sos utentes + title_friends: Diàrios de sos amigos + title_nearby: Diàrios de sos utentes a curtzu + user_title: Diàriu de %{user} + in_language_title: Intradas de diàriu in %{language} + new: Intrada de diàriu noa + new_title: Cumpone un'intrada noa in su diàriu de utente meu my_diary: Cuotidianu meu + no_entries: Peruna intrada in su diàriu + recent_entries: Intradas reghentes in su diàriu + older_entries: Intradas prus antigas + newer_entries: Intradas prus noas + edit: + title: Modìfica s'intrada de su diàriu + marker_text: Positzione de s'intrada de su diàriu show: + title: Diàriu de %{user} | %{title} + user_title: Diàriu de %{user} leave_a_comment: Lassa unu cummentu + login_to_leave_a_comment_html: '%{login_link} pro lassare unu cummentu' login: Intra + no_such_entry: + title: In su diàriu non b'at peruna intrada gasi + heading: 'Non b''at peruna intrada cun s''id: %{id}' + body: Non b'at peruna intrada o cummentu in su diàriu cun s'id %{id}. Verìfica + s'ortografia tua. O forsis su ligàmene chi as incarcadu est isballiadu. diary_entry: + posted_by_html: Publicadu dae %{link_user} su %{created} in %{language_link}. + updated_at_html: Ùrtimu agiornamentu su %{updated}. + comment_link: Cummenta custa intrada + reply_link: Imbia unu messàgiu a s'autore + edit_link: Modìfica custa intrada + hide_link: Cua custa intrada + unhide_link: Ammustra custa intrada confirm: Cunfirma + report: Sinnala custa intrada diary_comment: + comment_from_html: Cummentu dae %{link_user} de su %{comment_created_at} + hide_link: Cua custu cummentu + unhide_link: Ammustra custu cummentu confirm: Cunfirma + report: Sinnala custu cummentu location: location: 'Logu:' + view: Ammustra edit: Càmbia + feed: + user: + title: Intradas de diàriu de OpenStreetMap de %{user} + description: Intradas de diàriu reghentes de OpenStreetMap de %{user} + language: + title: Intradas de diàriu de OpenStreetMap in %{language_name} + description: Intradas de diàriu reghentes de sos utentes de OpenStreetMap + in %{language_name} + all: + title: Intradas de diàriu de OpenStreetMap + description: Intradas de diàriu reghentes de sos utentes de OpenStreetMap comments: + title: Cummentos de su diàriu annantos dae %{user} + heading: Cummentos de su diàriu de %{user} + subheading_html: Cummentos de su diàriu annantos dae %{user} + no_comments: Perunu cummentu a su diàriu + post: Publicatzione when: Cando comment: Cummentu newer_comments: Cummentos prus noos older_comments: Cummentos prus antigos + doorkeeper: + flash: + applications: + create: + notice: Aplicatzione registrada. + friendships: + make_friend: + heading: Annànghere %{user} a sos amigos? + button: Annanghe a sos amigos + success: '%{name} como est amigu tuo!' + failed: Annanta de %{name} a sos amigos fallida. + already_a_friend: Ses giai amigu de %{name}. + limit_exceeded: In custu ùrtimu perìodu as annantu utentes medas a sos amigos + tuos. Iseta unu pagu in antis de proare a nde annànghere àteros. + remove_friend: + heading: Bogare %{user} dae sos amigos? + button: Boga dae sos amigos + success: '%{name} est istadu bogadu dae sos amigos tuos.' + not_a_friend: '%{name} no est unu de sos amigos tuos.' geocoder: + search: + title: + latlon_html: Resurtados internos + ca_postcode_html: Resurtados dae Geocoder.CA + osm_nominatim_html: Resurtados dae OpenStreetMap + Nominatim + geonames_html: Resurtados dae GeoNames + osm_nominatim_reverse_html: Resurtados dae OpenStreetMap + Nominatim + geonames_reverse_html: Resurtados dae GeoNames search_osm_nominatim: prefix: aerialway: cable_car: Funivia chair_lift: Ascensore carrotzina drag_lift: Sciovia + gondola: Telecabina magic_carpet: Cinta Trasportadora platter: Sciovia a piatellu pylon: Turre de sa funivia station: Istatzione sciovia t-bar: Sciovia a àncora + "yes": Isciovia aeroway: aerodrome: Aeròdromu + airstrip: Aeròdromu + apron: Àrea de arreada de aeroportu gate: Gate de aeroportu hangar: Hangar helipad: Eliportu + holding_position: Positzione de isetu + navigationaid: Agiudu de navigatzione aèrea parking_position: Positzione parchègiu runway: Pista taxilane: Carrera de rullàgiu taxiway: Carrera de furriada terminal: Terminal de aeroportu + windsock: Màniga a bentu amenity: animal_boarding: Domo po animales animal_shelter: Imbaru pro animales @@ -575,6 +673,8 @@ sc: bench: Panchita/banchina bicycle_parking: Parchègiu pro Bitzicletas bicycle_rental: Afitu de Bitzicletas + bicycle_repair_station: Istatzione de acontzadura de bitzicletas + biergarten: Birreria a s'abertu blood_bank: Bancu de sàmbene boat_rental: Afitu de Imbarcatziones brothel: Casinu @@ -600,7 +700,8 @@ sc: drinking_water: Abba Potàbile driving_school: Autoiscola embassy: Ambasciada - fast_food: Fast Food + events_venue: Sala pro eventos + fast_food: Màndigu lestru (Fast Food) ferry_terminal: Terminale navios fire_station: Pompieres food_court: Corte de màndigu (Food court) @@ -612,12 +713,16 @@ sc: hospital: Ispidale hunting_stand: Posta de cassa ice_cream: Geladeria + internet_cafe: Ìnternet cafè kindergarten: Parcu de giogos language_school: Iscola de limbas library: Biblioteca + loading_dock: Dàrsena de càrriga love_hotel: Love hotel marketplace: Mercadu + mobile_money_agent: Agente de dinare mòbile monastery: Monastèriu + money_transfer: Tramudòngiu de dinare motorcycle_parking: Parchègiu pro Mototzicletas music_school: Iscola de mùsica nightclub: Locale noturnu @@ -625,6 +730,7 @@ sc: parking: Parchègiu parking_entrance: Intrada de su Parchègiu parking_space: Parchègiu + payment_terminal: Terminale de pagamentu pharmacy: Apotecaria place_of_worship: Logu de cultu police: Politzia @@ -635,8 +741,10 @@ sc: public_bath: Còmudu pùblicu public_bookcase: Libreria pùblica public_building: Telèfonu Pùblicu + ranger_station: Istatzione de sas guàrdias forestales recycling: Puntu de Retziclàgiu restaurant: Ristorante + sanitary_dump_station: Istatzione de discàrriga sanitària school: Iscola shelter: Imbaru shower: Dòtzia @@ -649,6 +757,7 @@ sc: theatre: Teatru toilets: Còmodu townhall: Munitzìpiu + training: Istrutura de annestru university: Universidade vending_machine: Distribudore automàticu veterinary: Chirurgia veterinària @@ -674,6 +783,8 @@ sc: bungalow: Bungalow chapel: Capella church: Crésia + garage: Garàgiu + garages: Garàgios hangar: Hangar hospital: Ospidale house: Domo @@ -681,7 +792,10 @@ sc: university: Edifìtziu universitàriu warehouse: Magasinu "yes": Edifitziu + club: + "yes": Tzìrculu craft: + blacksmith: Mastru de ferru brewery: Fàbrica de birra carpenter: Mastru de linna electrician: Eletritzista @@ -1017,6 +1131,7 @@ sc: boatyard: Cantiere navale canal: Canale dam: Diga + dock: Dàrsena lock_gate: Ghenna de serradura mooring: Ormègiu rapids: Tràinos @@ -1257,14 +1372,14 @@ sc: rules: title: Règulas! add_a_note: - title: No Time To Edit? Annanghe una nota! + title: Non tenes tempus pro fàghere modìficas? Annanghe una nota! traces: new: visibility_help: ite cheret nàrrere? help: Agiudu create: - upload_failed: Sorry, the GPX upload failed. An administrator has been alerted - to the error. Torra·bi a proare. + upload_failed: Su carrigamentu de su GPX est fallidu. Un'amministradore est + istadu avisadu de s'errore. Torra·bi a proare. edit: visibility_help: ite cheret nàrrere? trace_optionals: diff --git a/config/locales/tr.yml b/config/locales/tr.yml index 49f908de8..2ca9126b6 100644 --- a/config/locales/tr.yml +++ b/config/locales/tr.yml @@ -57,7 +57,7 @@ tr: dir: ltr time: formats: - friendly: '%e %B %Y saat %H:%M' + friendly: '%e %B %Y saat %H.%M' helpers: file: prompt: Dosya seç @@ -102,7 +102,7 @@ tr: issue: Sorun language: Dil message: Mesaj - node: Düğüm + node: Nokta node_tag: Düğüm Etiketi notifier: Bildiren old_node: Eski Nokta @@ -2419,7 +2419,7 @@ tr: ya da bir ağaç olabilir. way_html: Yol, bir çizgi ya da alan, bir cadde, akarsu, göl ya da bina olabilir. - tag_html: Etiket, bir düğümün ya da yolun veri parçasıdır. + tag_html: Etiket, bir noktanın ya da yolun veri parçasıdır. Bu bir restoranın ismi ya da yolun hız sınırı olabilir. rules: title: Kuralları! @@ -3196,7 +3196,7 @@ tr: tenth: onuncu time: Zaman query: - node: Düğüm + node: Nokta way: Yol relation: İlişki nothing_found: Özellik bulunamadı diff --git a/config/locales/vi.yml b/config/locales/vi.yml index fa1324d7a..020dcb446 100644 --- a/config/locales/vi.yml +++ b/config/locales/vi.yml @@ -467,7 +467,7 @@ vi: reopened_by_html: Mở lại bởi %{user} %{when} reopened_by_anonymous_html: Mở lại vô danh %{when} hidden_by_html: Ẩn bởi %{user} %{when} - report: Báo cáo ghi chú này + report: báo cáo ghi chú này coordinates_html: '%{latitude}, %{longitude}' query: title: Thăm dò Yếu tố @@ -1403,6 +1403,7 @@ vi: issue_comments: create: comment_created: Bình luận của bạn đã được tạo ra thành công + issue_reassigned: Đã tạo bình luận của bạn và chỉ định lại vấn đề reports: new: title_html: Báo cáo %{link} @@ -2199,6 +2200,7 @@ vi: common: - Đất công - bãi cỏ + - vườn retail: Khu vực buôn bán industrial: Khu vực công nghiệp commercial: Khu vực thương mại @@ -2354,6 +2356,7 @@ vi: in: trong index: public_traces: Tuyến đường GPS công khai + my_gps_traces: Tuyến GPS của Tôi public_traces_from: Tuyến đường GPS công khai của %{user} description: Xem những tuyến đường GPS được tải lên gần đây tagged_with: ' có thẻ %{tags}' @@ -2642,6 +2645,8 @@ vi: activate_user: Kích hoạt Tài khoản Này deactivate_user: Vô hiệu hóa Tài khoản Này confirm_user: Xác nhận Người dùng Này + unconfirm_user: Bỏ Xác nhận Người dùng Này + unsuspend_user: Bỏ cấm Người dùng Này hide_user: Ẩn Tài khoản Này unhide_user: Hiện Tài khoản Này delete_user: Xóa Tài khoản Này @@ -2926,6 +2931,9 @@ vi: reactivate: Mở lại comment_and_resolve: Bình luận & Giải quyết comment: Bình luận + report_link_html: Nếu ghi chú này chứa thông tin nhạy cảm có thể cần xóa, + bạn có thể %{link}. Còn nếu ghi chú có vấn đề khác, xin vui lòng giải quyết + lấy bằng cách để lại lời bình luận. edit_help: Di chuyển bản đồ và phóng to một vị trí mà bạn muốn sửa đổi, rồi nhấn chuột vào đây. directions: diff --git a/config/locales/zh-CN.yml b/config/locales/zh-CN.yml index fd8fd478c..9304a98f1 100644 --- a/config/locales/zh-CN.yml +++ b/config/locales/zh-CN.yml @@ -1516,6 +1516,7 @@ zh-CN: issue_comments: create: comment_created: 已成功创建评论 + issue_reassigned: 已创建您的评论，并重新分配问题 reports: new: title_html: 举报%{link} @@ -2104,8 +2105,12 @@ zh-CN: title: 邮件列表 description: 询问问题或在广泛或局部的邮件列表中讨论有趣事件 forums: - title: 论坛 + title: 论坛（旧版） description: 面向更喜欢电子公告栏样式界面的用户的问题和讨论。 + community: + url: https://community.openstreetmap.org/ + title: 社区论坛 + description: 用于讨论 OpenStreetMap 的共享场所。 irc: title: IRC description: 在很多不同的语言和在很多话题间交互聊天。 diff --git a/config/locales/zh-HK.yml b/config/locales/zh-HK.yml new file mode 100644 index 000000000..b0f9a3109 --- /dev/null +++ b/config/locales/zh-HK.yml @@ -0,0 +1,1187 @@ +# Messages for Chinese (Hong Kong) (中文（香港）) +# Exported from translatewiki.net +# Export driver: phpyaml +# Author: C933103 +# Author: Hkjacksonhk +# Author: Liuxinyu970226 +# Author: LuciferianThomas +# Author: StarrySky +--- +zh-HK: + time: + formats: + friendly: '%Y年%m月%e日 %H:%M' + helpers: + file: + prompt: 選擇檔案 + submit: + diary_comment: + create: 儲存 + diary_entry: + create: 發佈 + update: 更新 + issue_comment: + create: 添加評論 + message: + create: 傳送 + client_application: + create: 註冊 + update: 更新 + doorkeeper_application: + create: 註冊 + update: 更新 + redaction: + create: 建立修訂 + update: 儲存修訂 + trace: + create: 上載 + update: 儲存變更 + user_block: + create: 創建封鎖 + update: 更新封鎖 + activerecord: + errors: + messages: + invalid_email_address: 不像是有效的電郵地址。 + email_address_not_routable: 不可繞送 + models: + acl: 存取控制清單 + changeset: 變更集 + changeset_tag: 變更集標籤 + country: 國家 + diary_comment: 日記註解 + diary_entry: 日記項目 + friend: 朋友 + issue: 問題 + language: 語言 + message: 訊息 + node: 節點 + node_tag: 節點標籤 + notifier: 通知 + old_node: 舊節點 + old_node_tag: 舊節點標籤 + old_relation: 舊關聯 + old_relation_member: 舊關聯成員 + old_relation_tag: 舊關聯標籤 + old_way: 舊路徑 + old_way_node: 舊路徑節點 + old_way_tag: 舊路徑標籤 + relation: 關聯 + relation_member: 關聯成員 + relation_tag: 關聯標籤 + report: 報告 + session: 作業階段 + trace: 軌跡 + tracepoint: 軌跡點 + tracetag: 軌跡標籤 + user: 用戶 + user_preference: 用戶設定 + user_token: 用戶令牌 + way: 路徑 + way_node: 路徑節點 + way_tag: 路徑標籤 + attributes: + client_application: + name: 名稱（必需） + url: 主程式URL（必需） + callback_url: 回呼 (Callback) URL + support_url: 支援URL + allow_read_prefs: 讀取他們的用戶設定。 + allow_write_prefs: 修改他們的用戶設定。 + allow_write_diary: 建立日記項目、評論和加入好友 + allow_write_api: 修改地圖 + allow_read_gpx: 讀取他們的私人GPS軌跡 + allow_write_gpx: 上載GPS軌跡 + allow_write_notes: 修改註記 + diary_comment: + body: 內文 + diary_entry: + user: 用戶 + title: 主題 + latitude: 緯度 + longitude: 經度 + language: 語言 + doorkeeper/application: + name: 名稱 + redirect_uri: 重新導向 URI + confidential: 保密的應用程式？ + friend: + user: 用戶 + friend: 朋友 + trace: + user: 用戶 + name: 檔案名稱 + size: 大小 + latitude: 緯度 + longitude: 經度 + public: 公開 + description: 描述 + gpx_file: 上載GPX檔案 + visibility: 可見度 + tagstring: 標籤 + message: + sender: 寄件者 + title: 主題 + body: 內文 + recipient: 收件者 + report: + details: 請就這問題提供多點詳情（必需）。 + user: + email: 電郵 + active: 活躍 + display_name: 顯示名稱 + description: 描述 + languages: 語言 + pass_crypt: 密碼 + pass_crypt_confirmation: 確認密碼 + help: + trace: + tagstring: 以逗號分隔 + datetime: + distance_in_words_ago: + about_x_hours: + one: 約1小時前 + other: 約%{count}小時前 + about_x_months: + one: 約1個月前 + other: 約%{count}個月前 + about_x_years: + one: 約1年前 + other: 約%{count}年前 + almost_x_years: + one: 差不多1年前 + other: 差不多%{count}年前 + half_a_minute: 半分鐘前 + less_than_x_seconds: + one: 不到1秒前 + other: 不到%{count}秒前 + less_than_x_minutes: + one: 不到1分鐘前 + other: 不到%{count}分鐘前 + over_x_years: + one: 超過1年前 + other: 超過%{count}年前 + x_seconds: + one: 1秒前 + other: '%{count}秒前' + x_minutes: + one: 1分鐘前 + other: '%{count}分鐘前' + x_days: + one: 1日前 + other: '%{count}日前' + x_months: + one: 1個月前 + other: '%{count}個月前' + x_years: + one: 1年前 + other: '%{count}年前' + editor: + default: 預設（現為%{name}） + id: + name: iD + description: iD (瀏覽器內的編輯器) + remote: + name: 遙遠控制 + description: 遙遠控制 (JOSM 或 Merkaartor) + auth: + providers: + none: 無 + openid: OpenID + google: Google + facebook: Facebook + windowslive: Windows Live + github: GitHub + wikipedia: 維基百科 + api: + notes: + comment: + opened_at_html: 於%{when}建立 + opened_at_by_html: 由%{user}於%{when}建立 + commented_at_html: 於%{when}更新 + commented_at_by_html: 由%{user}於%{when}更新 + closed_at_html: 已於%{when}解決 + closed_at_by_html: 已由%{user}於%{when}解決 + reopened_at_html: 於%{when}重新開啟 + reopened_at_by_html: 由%{user}於%{when}重新開啟 + entry: + comment: 評論 + accounts: + edit: + my settings: 我的設定 + browse: + version: 版本 + in_changeset: 變更集 + anonymous: 匿名 + no_comment: （沒有評論） + part_of: 屬於： + download_xml: 下載 XML + view_history: 檢視歷史 + view_details: 檢視詳細資料 + location: 位置： + changeset: + title: 變更集：%{id} + belongs_to: 製作者 + feed: + title: 變更集 %{id} + relation_member: + type: + node: 節點 + way: 路徑 + not_found: + sorry: '抱歉，找不到 %{type} #%{id}。' + type: + node: 節點 + way: 路徑 + changeset: 變更集 + timeout: + type: + node: 節點 + way: 路徑 + changeset: 變更集 + redacted: + type: + node: 節點 + way: 路徑 + start_rjs: + feature_warning: 正在載入%{num_features}項地圖特徵，可能會拖慢您的瀏覽器或導致瀏覽器未能回應。您是否肯定想要顯示這些資料？ + query: + title: 查詢地圖特徴 + introduction: 點擊地圖以尋找附近的地圖特徵。 + enclosing: 包圍着的地圖特徵 + changesets: + changeset_paging_nav: + showing_page: 第%{page}頁 + next: 下一頁 » + previous: « 上一頁 + changeset: + anonymous: 匿名 + changesets: + id: ID + saved_at: 已儲存於 + user: 用戶 + comment: 評論 + area: 區域 + index: + title: 變更集 + title_user: '%{user}的變更集' + title_nearby: 附近用戶的變更集 + empty_area: 此區域沒有變更集。 + empty_user: 此用戶沒有變更集。 + no_more_area: 此區域沒有更多變更集。 + no_more_user: 此用戶沒有更多變更集。 + load_more: 載入更多 + dashboards: + show: + nearby users: 其他附近的用戶 + no nearby users: 附近還沒有已加入製圖的用戶。 + diary_entries: + form: + location: 位置： + use_map_link: 使用地圖 + index: + title: 用戶日記 + title_nearby: 附近用戶的日記 + new_title: 在我的用戶日記中撰寫新文章 + my_diary: 我的日記 + no_entries: 沒有日記項目 + show: + title: '%{user}的日記 | %{title}' + login: 登入 + diary_entry: + confirm: 確認 + report: 回報此項目 + diary_comment: + confirm: 確認 + location: + location: 位置： + view: 檢視 + edit: 編輯 + feed: + user: + title: '%{user}的OpenStreetMap日記文章' + description: 近期由%{user}所寫的OpenStreetMap日記文章 + language: + description: 近期以%{language_name}撰寫的OpenStreetMap用戶日記文章 + all: + description: 近期的OpenStreetMap用戶日記文章 + comments: + post: 貼文 + when: 於 + comment: 評論 + newer_comments: 較新評論 + older_comments: 較舊評論 + friendships: + make_friend: + heading: 將%{user}加為好友？ + button: 加入為好友 + remove_friend: + heading: 刪除好友%{user}？ + geocoder: + search_osm_nominatim: + prefix: + aerialway: + cable_car: 大型纜車 + chair_lift: 升降吊椅 + drag_lift: 上山牽引梯 + gondola: 小型纜車 + magic_carpet: 滑雪升降機 + platter: 纜椅 + pylon: 高壓電塔 + station: 空中纜車車站 + t-bar: T 字纜椅 + "yes": 空中纜線 + aeroway: + aerodrome: 機場 + airstrip: 飛機跑道 + apron: 停機坪 + gate: 閘口 + hangar: 機庫 + helipad: 直升機坪 + holding_position: 等待位置 + navigationaid: 航空導航輔助 + parking_position: 停車位置 + runway: 跑道 + taxilane: 滑行道 + taxiway: 滑行道 + terminal: 客運大樓 + windsock: 布製風標 + amenity: + animal_boarding: 動物寄養 + animal_shelter: 動物收容所 + arts_centre: 藝術中心 + atm: 自動櫃員機 + bank: 銀行 + bar: 酒吧 + bbq: 燒烤場 + bench: 長椅 + bicycle_parking: 單車停泊處 + bicycle_rental: 單車租貸 + bicycle_repair_station: 單車維修站 + biergarten: 啤酒庭園 + blood_bank: 血庫 + boat_rental: 船艇租貸 + brothel: 妓院 + bureau_de_change: 找換店 + bus_station: 巴士總站 + cafe: Cafe + car_rental: 汽車租貸 + car_sharing: 汽車共乘 + car_wash: 洗車 + casino: 賭場 + charging_station: 充電站 + childcare: 托兒所 + cinema: 戲院 + clinic: 診所 + clock: 時鐘 + college: 學院 + community_centre: 社區中心 + conference_centre: 會議中心 + courthouse: 法院 + crematorium: 火葬場 + dentist: 牙醫 + doctors: 醫生 + drinking_water: 飲用水 + driving_school: 駕駛學校 + embassy: 大使館 + events_venue: 活動場地 + fast_food: 快餐店 + ferry_terminal: 渡輪碼頭 + fire_station: 消防局 + food_court: 美食廣場 + fountain: 噴泉 + fuel: 加油站 + gambling: 博彩 + grave_yard: 墳場 + grit_bin: 砂礫箱 + hospital: 醫院 + hunting_stand: 狩獵站 + ice_cream: 雪糕 + internet_cafe: 網吧 + kindergarten: 幼稚園 + language_school: 語言學校 + library: 圖書館 + loading_dock: 卸貨平台 + love_hotel: 恋爱賓館 + marketplace: 墟市/市集 + mobile_money_agent: 行動支付代理 + monastery: 修道院 + money_transfer: 匯款 + motorcycle_parking: 電單車停車場 + music_school: 音樂學校 + nightclub: 夜總會 + nursing_home: 看護中心 + parking: 停車場 + parking_entrance: 停車場入口 + parking_space: 停車位 + payment_terminal: 支付終端 + pharmacy: 藥房 + place_of_worship: 宗教場所 + police: 警察 + post_box: 郵箱 + post_office: 郵局 + prison: 監獄 + pub: 酒館 + public_bath: 公眾浴場 + public_bookcase: 公共書櫃 + public_building: 公共建築 + ranger_station: 護林員站 + recycling: 回收點 + restaurant: 餐廳 + sanitary_dump_station: 衛生排污站 + school: 學校 + shelter: 涼亭 + shower: 淋浴 + social_centre: 非盈利團體會所 + social_facility: 社會福利設施 + studio: 工作室 + swimming_pool: 游泳池 + taxi: 的士 + telephone: 公眾電話 + theatre: 劇院 + toilets: 廁所 + townhall: 市政廳 + training: 訓練設施 + university: 大學 + vehicle_inspection: 車輛檢查 + vending_machine: 自動售賣機 + veterinary: 獸醫診所 + village_hall: 村公所 + waste_basket: 垃圾桶 + waste_disposal: 垃圾收集站 + waste_dump_site: 垃圾掩埋場 + watering_place: 集水地點 + water_point: 取水點 + weighbridge: 地磅 + "yes": 便利設施 + boundary: + aboriginal_lands: 原住民土地 + administrative: 行政邊界 + census: 人口普查邊界 + national_park: 國家公園 + political: 選區分界 + protected_area: 保護區 + "yes": 邊界 + bridge: + aqueduct: 高架水道 + boardwalk: 木板走道 + suspension: 吊橋 + swing: 平旋橋 + viaduct: 高架橋 + "yes": 橋 + building: + apartment: 公寓 + apartments: 公寓 + barn: 穀倉 + 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: 製造業建築 + office: 辦公建築 + public: 公共建築 + residential: 住宅建築 + retail: 零售建築 + roof: 屋頂 + ruins: 已毀損建築 + school: 學校建築 + semidetached_house: 半獨立房 + service: 服務建築 + shed: 棚 + stable: 馬廄 + static_caravan: 旅行拖車 + temple: 廟宇建築 + terrace: 陽台建築 + train_station: 車站建物 + university: 大學建築 + warehouse: 倉庫 + "yes": 建築物 + club: + scout: 童軍團團部 + sport: 体育俱樂部 + "yes": 俱樂部 + craft: + beekeeper: 養蜂人之家 + blacksmith: 鐵匠鋪 + brewery: 釀酒 + carpenter: 木匠工坊 + caterer: 外燴承辦 + confectionery: 糖果店 + dressmaker: 女裝裁縫工作室 + electrician: 電工工坊 + electronics_repair: 電子產品維修 + gardener: 園丁工坊 + glaziery: 玻璃工坊 + handicraft: 手工藝工坊 + hvac: 暖通空調工坊 + metal_construction: 金屬結構坊 + painter: 畫家 + photographer: 摄影室 + plumber: 管道工坊 + roofer: 屋顶工作室 + sawmill: 鋸木廠 + shoemaker: 鞋匠工坊 + stonemason: 石匠鋪 + tailor: 裁缝 + window_construction: 窗戶建設 + winery: 釀酒廠 + "yes": 工藝品商店 + emergency: + access_point: 進入點 + ambulance_station: 急救站 + assembly_point: 集合處 + defibrillator: 除顫器 + fire_extinguisher: 滅火器 + fire_water_pond: 消防水塘 + landing_site: 緊急著陸點 + life_ring: 緊急救生圈 + phone: 緊急電話 + siren: 防空警報 + suction_point: 消防吸水點 + water_tank: 緊急水箱 + highway: + abandoned: 廢棄道路 + bridleway: 馬車路 + bus_guideway: 導軌巴士專線 + bus_stop: 巴士站 + construction: 建造中公路 + corridor: 走廊 + crossing: 十字路口 + cycleway: 單車徑 + elevator: 電梯 + emergency_access_point: 緊急聯絡點 + emergency_bay: 緊急停車灣 + footway: 行人徑 + ford: 河床便道 + give_way: 讓路標誌 + living_street: 生活街道 + milestone: 里程碑 + motorway: 高速公路 + motorway_junction: 高速公路出口 + motorway_link: 高速公路聯絡道 + passing_place: 避車彎 + path: 小徑 + pedestrian: 人行道 + platform: 月台 + primary: 一級道路 + primary_link: 一級道路聯絡道 + proposed: 計畫中道路 + raceway: 賽道 + residential: 住宅區道路 + rest_area: 休息區 + road: 路 + secondary: 二級道路 + secondary_link: 二級道路聯絡道 + service: 服務道路 + services: 高速公路服務區 + speed_camera: 測速照相機 + steps: 階梯 + stop: 停止標誌 + street_lamp: 路燈 + tertiary: 三級道路 + tertiary_link: 地區道路聯絡道 + track: 軌跡 + traffic_mirror: 道路反射鏡 + traffic_signals: 交通號誌 + trailhead: 小徑入口處 + trunk: 快速道路 + trunk_link: 快速道路聯絡道 + turning_circle: 回轉圈 + turning_loop: 環形迴車道 + unclassified: 無編制道路 + "yes": 路 + historic: + aircraft: 歷史飛行機 + archaeological_site: 考古遺址 + bomb_crater: 彈坑遺跡 + battlefield: 戰場 + boundary_stone: 界石 + building: 歷史建築 + bunker: 掩體 + cannon: 古砲 + castle: 城堡 + charcoal_pile: 歷史木炭堆 + church: 教堂 + city_gate: 城門 + citywalls: 城牆 + fort: 堡壘 + heritage: 遺蹟 + hollow_way: 低窪道路 + house: 房屋 + manor: 莊園 + memorial: 紀念館 + milestone: 歷史里程碑 + mine: 礦場 + mine_shaft: 礦井 + monument: 古蹟 + railway: 歷史鐵路 + roman_road: 羅馬道路 + ruins: 廢墟 + rune_stone: 盧恩符文石 + stone: 石造史蹟 + tomb: 墳墓 + tower: 塔 + wayside_chapel: 路邊教堂 + wayside_cross: 路邊十字架 + wayside_shrine: 路邊神龕 + wreck: 殘骸 + "yes": 古蹟 + junction: + "yes": 路口 + landuse: + allotments: 社區農園 + aquaculture: 水產養殖 + basin: 盆地 + brownfield: 棕地 + cemetery: 墓地 + commercial: 商業區 + conservation: 保護區 + construction: 地盤 + farmland: 農地 + farmyard: 農舍 + forest: 森林 + garages: 車庫 + grass: 草地 + greenfield: 空地 + industrial: 工業區 + landfill: 堆填區 + meadow: 牧草地 + military: 軍事區 + mine: 礦場 + orchard: 果園 + plant_nursery: 植物苗圃 + quarry: 石礦場 + railway: 鐵路 + recreation_ground: 休憩用地 + religious: 宗教場所 + reservoir: 水庫 + reservoir_watershed: 水庫集水區 + residential: 住宅區 + retail: 零售用地 + village_green: 社區綠化空間 + vineyard: 葡萄園 + "yes": 土地利用 + leisure: + adult_gaming_centre: 成人遊戲中心 + amusement_arcade: 電子遊樂場 + bandstand: 演奏台 + beach_resort: 海灘度假村 + bird_hide: 賞鳥亭 + bleachers: 露天看台 + bowling_alley: 保齡球場 + common: 公共用地 + dance: 舞廳 + dog_park: 狗公園 + firepit: 火山坑 + fishing: 垂釣區 + fitness_centre: 健身中心 + fitness_station: 健身設施 + garden: 花園 + golf_course: 哥爾夫球場 + horse_riding: 馬場 + ice_rink: 溜冰場 + marina: 小船塢 + miniature_golf: 小型高爾夫球場 + nature_reserve: 自然保護區 + outdoor_seating: 戶外座椅 + park: 公園 + picnic_table: 野餐桌 + pitch: 運動場 + playground: 兒童遊樂場 + recreation_ground: 遊樂場 + resort: 度假村 + sauna: 桑拿 + slipway: 船臺 + sports_centre: 運動中心 + stadium: 體育館 + swimming_pool: 游泳池 + track: 跑道 + water_park: 水上樂園 + "yes": 休閒 + man_made: + adit: 坑道 + advertising: 廣告 + antenna: 天線 + avalanche_protection: 雪崩護欄 + beacon: 浮標 + beam: 梁柱 + beehive: 蜂巢 + breakwater: 防波堤 + bridge: 橋 + bunker_silo: 碉堡 + cairn: 石標 + chimney: 煙囪 + clearcut: 皆伐區域 + communications_tower: 通訊塔 + crane: 起重機 + cross: 十字架 + dolphin: 繫船柱 + dyke: 堤 + embankment: 堤 + flagpole: 旗竿 + gasometer: 儲氣槽 + groyne: 丁壩 + kiln: 窯 + lighthouse: 燈塔 + manhole: 人孔 + mast: 柱杆 + mine: 礦場 + mineshaft: 礦井 + monitoring_station: 監控站台 + petroleum_well: 油井 + pier: 碼頭 + pipeline: 管線 + pumping_station: 泵站 + reservoir_covered: 有蓋蓄水槽 + silo: 筒倉 + snow_cannon: 雪砲 + snow_fence: 雪欄 + storage_tank: 儲油罐 + street_cabinet: 街櫃 + surveillance: 監視攝影機 + telescope: 望遠鏡 + tower: 塔 + utility_pole: 電線桿 + wastewater_plant: 污水處理廠 + watermill: 水車 + water_tap: 水龍頭 + water_tower: 水塔 + water_well: 井 + water_works: 供水設施 + windmill: 風車 + works: 工廠 + "yes": 人造設施 + military: + airfield: 軍用機場 + barracks: 軍營 + bunker: 碉堡 + checkpoint: 檢查站 + trench: 壕溝 + "yes": 軍事 + mountain_pass: + "yes": 埡口 + natural: + atoll: 環礁 + bare_rock: 裸岩 + bay: 灣 + beach: 沙灘 + cape: 海角 + cave_entrance: 洞穴入口 + cliff: 懸崖 + coastline: 海岸線 + crater: 火山口 + dune: 沙丘 + fell: 高原荒地 + fjord: 峽灣 + forest: 森林 + geyser: 間歇泉 + glacier: 冰河 + grassland: 草地 + heath: 石楠荒地 + hill: 小山 + hot_spring: 溫泉 + island: 島嶼 + isthmus: 地峽 + land: 陸地 + marsh: 河川濕地 + moor: 停泊處 + mud: 泥地 + peak: 山頂 + peninsula: 半島 + point: 點 + reef: 礁 + ridge: 山脊 + rock: 獨立岩 + volcano: 火山 + "yes": 自然特徵 + office: + travel_agent: 旅行社 + "yes": 辦公室 + place: + city: 城市 + city_block: 街區 + country: 國家 + county: 縣 + farm: 農田 + hamlet: 村莊 + house: 房屋 + island: 島嶼 + islet: 小島 + postcode: 郵政編號 + region: 區域 + sea: 海 + square: 廣場 + suburb: 市郊 + town: 鎮 + village: 村落 + "yes": 地點 + railway: + abandoned: 廢棄鐵路 + disused: 已停用鐵路 + funicular: 纜索鐵路 + light_rail: 輕便鐵路 + monorail: 單軌鐵路 + narrow_gauge: 窄軌鐵路 + platform: 鐵路月臺 + preserved: 保留鐵路 + proposed: 規劃中鐵路 + rail: 鐵路 + spur: 鐵路支線 + station: 火車站 + stop: 鐵路招呼站 + subway: 地鐵 + subway_entrance: 地鐵出入口 + switch: 鐵路道岔 + tram: 路面電車軌道 + tram_stop: 路面電車站 + turntable: 轉車台 + yard: 鐵路站場 + shop: + agrarian: 農業商品店 + bakery: 麵包店 + beauty: 美容店 + beverages: 飲料店 + bicycle: 單車店 + bookmaker: 投注站 + books: 書店 + boutique: 精品店 + car_parts: 汽車零件店 + charity: 慈善商店 + computer: 電腦商店 + copyshop: 影印店 + cosmetics: 化妝品店 + deli: 高級食品店 + department_store: 百貨公司 + doityourself: DIY用品店 + dry_cleaning: 乾洗店 + e-cigarette: 電子煙店 + erotic: 情趣用品店 + estate_agent: 地產代理 + fashion: 時裝店 + fishing: 釣魚用品店 + florist: 花店 + hairdresser: 理髮店 + hifi: Hi-Fi + houseware: 生活用品店 + ice_cream: 冰淇淋店 + interior_decoration: 室內裝潢 + jewelry: 珠寶店 + laundry: 洗衣店 + lottery: 彩票 + mall: 商場 + massage: 按摩 + mobile_phone: 手機店 + optician: 視光師 + organic: 有機食品店 + pet: 寵物店 + seafood: 海鮮店 + second_hand: 二手商店 + shoes: 鞋店 + stationery: 文具店 + supermarket: 超級市場 + tobacco: 煙草店 + toys: 玩具店 + travel_agency: 旅行社 + "yes": 商店 + tourism: + museum: 博物館 + picnic_site: 野餐地點 + theme_park: 主題公園 + viewpoint: 觀景點 + zoo: 動物園 + tunnel: + "yes": 隧道 + waterway: + canal: 運河 + dam: 水壩 + river: 河流 + stream: 小溪 + waterfall: 瀑布 + admin_levels: + level2: 國界 + level4: 省界 + level5: 區界 + level6: 縣界 + level8: 市界 + level9: 村界 + level10: 市郊邊界 + types: + cities: 城市 + towns: 市鎮 + places: 地點 + results: + no_results: 找不到結果 + more_results: 更多結果 + issues: + index: + reported_user: 曾經舉報的用戶 + user_not_found: 用戶並不存在 + show: + resolve: 解決 + ignore: 忽略 + reopen: 重新開啟 + reports: + new: + categories: + user: + spam_label: 此用戶個人檔案為/含有垃圾信息 + threat_label: 此用戶個人檔案含有威脅或恐嚇內容 + create: + provide_details: 請提供所需要的詳情 + layouts: + logo: + alt_text: OpenStreetMap標誌 + logout: 登出 + log_in: 登入 + log_in_tooltip: 登入既有賬戶 + sign_up: 註冊 + start_mapping: 開始繪圖 + sign_up_tooltip: 建立帳號以進行編輯 + edit: 編輯 + history: 歷史 + export: 匯出 + gps_traces: GPS軌跡 + gps_traces_tooltip: 管理GPS軌跡 + user_diaries: 用戶日記 + user_diaries_tooltip: 檢視用戶日記 + edit_with: 用%{editor}來編輯 + intro_header: 歡迎來到 OpenStreetMap！ + intro_2_create_account: 建立用戶帳號 + tou: 使用條款 + help: 幫助 + copyright: 版權 + foundation: 基金會 + foundation_title: OpenStreetMap基金會 + user_mailer: + diary_comment_notification: + subject: '[OpenStreetMap] %{user}在日記中留下了評論' + friendship_notification: + subject: '[OpenStreetMap] %{user} 添加了您成為好友' + see_their_profile: 您可以在 %{userurl} 查看他的個人檔案。 + email_confirm: + greeting: 您好， + lost_password: + subject: '[OpenStreetMap] 密碼重設請求' + greeting: 您好， + hopefully_you: 有人 (或許是您) 要求將以此電子郵件地址註冊的openstreetmap.org帳號的密碼重設。 + click_the_link: 如果是您請求的話，請按下列連結重設您的密碼。 + note_comment_notification: + anonymous: 一位匿名用戶 + greeting: 您好， + confirmations: + confirm_resend: + failure: 找不到用戶%{name}。 + messages: + outbox: + title: 寄件匣 + passwords: + lost_password: + title: 忘記密碼 + heading: 忘記密碼？ + email address: 電郵地址： + new password button: 重設密碼 + help_text: 輸入您註冊時用的電郵地址，我們會將可用於重設密碼的連結發送至該地址。 + reset_password: + title: 重設密碼 + heading: 重設%{user}的密碼 + reset: 重設密碼 + flash changed: 您的密碼已經變更。 + sessions: + new: + email or username: 電郵地址或用戶名稱： + password: 密碼： + lost password link: 忘記您的密碼？ + with username: 已經有OpenStreetMap的帳號了嗎？請使用您的用戶名稱和密碼登入： + destroy: + title: 登出 + site: + edit: + not_public: 您尚未把編輯公開。 + not_public_description_html: 您不這樣設定的話就將再無法編輯地圖。您可以在%{user_page}將閣下的編輯設為公開。 + no_iframe_support: 閣下的瀏覽器並未支援此功能所必需的HTML iframes。 + export: + title: 匯出 + area_to_export: 要匯出的範圍 + manually_select: 手動選擇另一範圍 + format_to_export: 匯出格式 + map_image: 地圖影像 (顯示標準圖層) + embeddable_html: 可內嵌的HTML + licence: 授權 + options: 選項 + format: 格式 + scale: 比例 + max: 最大 + latitude: 緯度： + longitude: 經度： + help: + beginners_guide: + description: 由社群編修的新手指南。 + help: + description: 在OpenStreetMap的問答網站上提問或搜尋答案。 + mailing_lists: + description: 在有着各式各樣主題或地域分類的郵件列表中發問或討論有趣的事。 + forums: + description: 給喜好論壇界面的人提問和討論。 + irc: + title: IRC + welcomemat: + url: https://welcome.openstreetmap.org/ + sidebar: + search_results: 搜尋結果 + close: 關閉 + search: + search: 搜尋 + where_am_i: 這是哪裡？ + reverse_directions_text: 反轉方向 + key: + table: + entry: + motorway: 高速公路 + rail: 鐵路 + subway: 地鐵 + tram: + - 輕便鐵路 + - 電車 + runway: + - 機場跑道 + apron: + - 機場停機坪 + - 客運大樓 + admin: 行政邊界 + forest: 森林 + golf: 哥爾夫球場 + park: 公園 + resident: 住宅區 + industrial: 工業區 + commercial: 商業區 + lake: + - 湖泊 + - 水庫 + brownfield: 棕地 + cemetery: 墓地 + pitch: 運動場 + centre: 運動中心 + reserve: 自然保護區 + military: 軍事區 + school: + - 學校 + - 大學 + station: 火車站 + bicycle_shop: 單車店 + bicycle_parking: 單車停泊處 + toilets: 廁所 + welcome: + introduction_html: 歡迎來到OpenStreetMap，自由而可以編輯的世界地圖。現在您已經注冊完成，繪製地圖所需要的準備已經就緒。以下是一份快速指南，裡面包含着您所需要知道的最重要事項。 + rules: + paragraph_1_html: OpenStreetMap沒多少正式規則，但我們期望所有參與者都會與社群合作，也會和社群溝通。如果你想用任何不只是純人手編輯的方式做任何事的話，請先閱讀並遵循匯入以及自動化編輯規範。 + add_a_note: + title: 沒時間編輯？加一個註記吧！ + paragraph_1_html: 如果你只想讓一些小問題得以更正，而沒有時間注冊並學習如何編輯，那麼加入註記是非常容易的。 + traces: + create: + traces_waiting: 您有%{count}條軌跡等待上傳。請考慮先讓目前的軌跡處理完成後，再來繼續上傳其他軌跡，以免阻礙其他用戶的排程。 + index: + public_traces_from: '%{user}的公開GPS軌跡' + oauth: + authorize: + allow_read_prefs: 讀取您的用戶設定。 + oauth_clients: + show: + requests: 向用戶要求下列權限： + index: + revoke: 撤銷！ + oauth: OAuth + form: + requests: 向用戶要求下列權限： + users: + new: + title: 註冊 + no_auto_account_create: 很不幸地我們目前無法為您自動建立帳號。 + contact_support_html: 請聯絡網站管理員以安排建立帳號，我們會儘快嘗試並處理相關要求。 + about: + header: 自由而可編輯 + email address: 電郵地址： + confirm email address: 確認電郵地址： + display name: 顯示名稱： + display name description: 您公開顯示的用戶名稱。以後還可以在設定中更換。 + external auth: 第三方身份認證： + auth no password: 啟用第三方認證後密碼並非必須，但一些額外的工具或伺服器可能仍需要使用密碼。 + continue: 註冊 + terms accepted: 感謝您接受新的貢獻條款！ + terms: + title: 條款 + heading: 條款 + heading_ct: 貢獻者條款 + read_tou: 我已經閱讀過並同意使用條款 + consider_pd: 除上述條款之外，我會把我的貢獻釋放到公共領域(Public Domain) + guidance_html: 幫助理解這些條款的資料：一個給普通人閱讀的摘要和一些非正式翻譯 + continue: 繼續 + decline: 拒絕 + legale_select: 請選擇您的居住地： + legale_names: + france: 法國 + italy: 意大利 + rest_of_world: 世界其他地方 + no_such_user: + title: 沒有這用戶 + body: 抱歉，沒有名為%{user}的用戶。請檢查您的拼寫，或者您可能按到了錯誤的連結。 + show: + my settings: 我的設定 + user location: 用戶位置 + report: 舉報此用戶 + index: + title: 用戶 + heading: 用戶 + auth_association: + option_2: 如果您已經有帳號，您可以用該帳號的用戶名稱和密碼登入，然後到用戶設定中把您的ID和帳號關聯到一起。 + javascripts: + share: + embed: HTML + download: 下載 + center_marker: 將地圖置中於標記處 + map: + zoom: + in: 放大 + out: 縮小 + locate: + title: 顯示我的位置 + base: + standard: 標準 + cycle_map: 單車地圖 + transport_map: 交通地圖 + hot: 人道地圖 + opnvkarte: ÖPNVKarte + layers: + header: 地圖圖層 + title: 圖層 + site: + queryfeature_tooltip: 查詢地圖特徴 + queryfeature_disabled_tooltip: 放大以查詢地圖特徴 + query: + nothing_found: 沒找到地圖特徵 + context: + query_features: 查詢地圖特徴 + centre_map: 將地圖置中於此 +... From d4da1dce975d5f1cc7adcee2c51bf4b10a2dcf83 Mon Sep 17 00:00:00 2001 From: Tom Hughes Date: Tue, 6 Sep 2022 18:14:11 +0100 Subject: [PATCH 61/68] Update bundle --- Gemfile.lock | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index 6b5a62a4e..23dba086e 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -86,8 +86,8 @@ GEM autoprefixer-rails (10.4.7.0) execjs (~> 2) aws-eventstream (1.2.0) - aws-partitions (1.621.0) - aws-sdk-core (3.134.0) + aws-partitions (1.626.0) + aws-sdk-core (3.140.0) aws-eventstream (~> 1, >= 1.0.2) aws-partitions (~> 1, >= 1.525.0) aws-sigv4 (~> 1.1) @@ -260,7 +260,7 @@ GEM railties (>= 4.2.0) thor (>= 0.14, < 2.0) json (2.6.2) - jwt (2.4.1) + jwt (2.5.0) kgio (2.11.4) kramdown (2.4.0) rexml @@ -408,7 +408,7 @@ GEM zeitwerk (~> 2.5) rainbow (3.1.1) rake (13.0.6) - rb-fsevent (0.11.1) + rb-fsevent (0.11.2) rb-inotify (0.10.1) ffi (~> 1.0) regexp_parser (2.5.0) @@ -417,7 +417,7 @@ GEM rexml (3.2.5) rinku (2.0.6) rotp (6.2.0) - rubocop (1.35.1) + rubocop (1.36.0) json (~> 2.3) parallel (~> 1.10) parser (>= 3.1.2.1) @@ -429,7 +429,7 @@ GEM unicode-display_width (>= 1.4.0, < 3.0) rubocop-ast (1.21.0) parser (>= 3.1.1.0) - rubocop-minitest (0.21.0) + rubocop-minitest (0.21.1) rubocop (>= 0.90, < 2.0) rubocop-performance (1.14.3) rubocop (>= 1.7.0, < 2.0) @@ -481,7 +481,7 @@ GEM actionpack (>= 5.2) activesupport (>= 5.2) sprockets (>= 3.0.0) - strong_migrations (1.2.0) + strong_migrations (1.3.0) activerecord (>= 5.2) strscan (3.0.4) terser (1.1.12) From fa93526f76cf08445e910a5f81053db1bed87d70 Mon Sep 17 00:00:00 2001 From: Tom Hughes Date: Wed, 7 Sep 2022 08:45:27 +0100 Subject: [PATCH 62/68] Use nominatim_url setting more consistently --- app/controllers/geocoder_controller.rb | 6 ++++-- lib/nominatim.rb | 2 +- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/app/controllers/geocoder_controller.rb b/app/controllers/geocoder_controller.rb index 48d3505dc..02f00ff7f 100644 --- a/app/controllers/geocoder_controller.rb +++ b/app/controllers/geocoder_controller.rb @@ -167,7 +167,8 @@ class GeocoderController < ApplicationController render :action => "results" rescue StandardError => e - @error = "Error contacting nominatim.openstreetmap.org: #{e}" + host = URI(Settings.nominatim_url).host + @error = "Error contacting #{host}: #{e}" render :action => "error" end @@ -231,7 +232,8 @@ class GeocoderController < ApplicationController render :action => "results" rescue StandardError => e - @error = "Error contacting nominatim.openstreetmap.org: #{e}" + host = URI(Settings.nominatim_url).host + @error = "Error contacting #{host}: #{e}" render :action => "error" end diff --git a/lib/nominatim.rb b/lib/nominatim.rb index fd0855fc9..f847ec84e 100644 --- a/lib/nominatim.rb +++ b/lib/nominatim.rb @@ -8,7 +8,7 @@ module Nominatim language ||= http_accept_language.user_preferred_languages.join(",") Rails.cache.fetch "/nominatim/location/#{lat}/#{lon}/#{zoom}/#{language}" do - url = "https://nominatim.openstreetmap.org/reverse?lat=#{lat}&lon=#{lon}&zoom=#{zoom}&accept-language=#{language}" + url = "#{Settings.nominatim_url}reverse?lat=#{lat}&lon=#{lon}&zoom=#{zoom}&accept-language=#{language}" begin response = Timeout.timeout(4) do From 88cec0880b92f1ffc538248069370e51c2b32b2b Mon Sep 17 00:00:00 2001 From: "translatewiki.net" Date: Thu, 8 Sep 2022 13:13:36 +0200 Subject: [PATCH 63/68] Localisation updates from https://translatewiki.net. --- config/locales/de.yml | 7 +- config/locales/hi.yml | 6 +- config/locales/ko.yml | 4 +- config/locales/pa.yml | 15 +- config/locales/sc.yml | 334 +++++++++++++++++++++++++++++++++++++++ config/locales/zh-TW.yml | 6 +- 6 files changed, 361 insertions(+), 11 deletions(-) diff --git a/config/locales/de.yml b/config/locales/de.yml index 8d6dd3aa1..9bab1f3d1 100644 --- a/config/locales/de.yml +++ b/config/locales/de.yml @@ -90,6 +90,7 @@ # Author: Unkn0wnCat # Author: Wolfdietmann # Author: Woodpeck +# Author: Wuzzy # Author: Zauberzunge2000 --- de: @@ -2318,9 +2319,13 @@ de: description: Stelle eine Frage und diskutiere interessante Sachen zu einem weiten Bereich von thematischen oder regionalen Mailinglisten. forums: - title: Foren + title: Foren (veraltet) description: Fragen und Diskussionen für diejenigen, die eine Oberfläche in der Art einer Anschlagstafel bevorzugen. + community: + url: https://community.openstreetmap.org/ + title: Community-Forum + description: Ein gemeinsamer Ort für Gespräche über OpenStreetMap. irc: title: IRC description: Interaktiver Chat in vielen unterschiedlichen Sprachen und zu diff --git a/config/locales/hi.yml b/config/locales/hi.yml index 1ca1feb5c..71faa5bd2 100644 --- a/config/locales/hi.yml +++ b/config/locales/hi.yml @@ -979,7 +979,11 @@ hi: title: समुदाय से जुड़ें help: forums: - title: मंच + title: फ़ोरम (लिगेसी) + community: + url: https://community.openstreetmap.org/ + title: सामुदायिक फ़ोरम + description: OpenStreetMap के बारे में चर्चा के लिए सार्वजनिक स्थान। wiki: url: http://wiki.openstreetmap.org/ title: ओपनस्ट्रीटमैप विकि diff --git a/config/locales/ko.yml b/config/locales/ko.yml index 72b9426af..164b88fb9 100644 --- a/config/locales/ko.yml +++ b/config/locales/ko.yml @@ -1996,8 +1996,10 @@ ko: title: 메일링 리스트 description: 국소 또는 지역의 메일링 리스트의 넓은 범위에서 관심사에 대해 질문하거나 토론을 합니다. forums: - title: 포럼들 + title: 포럼 (레거시) description: 게시판 스타일 인터페이스를 선호하는 것에 대한 질문과 토론입니다. + community: + url: https://community.openstreetmap.org/ irc: title: IRC description: 다양한 주제에서 많은 다른 언어로 된 대화형 채트입니다. diff --git a/config/locales/pa.yml b/config/locales/pa.yml index 05029d421..85c6a2b90 100644 --- a/config/locales/pa.yml +++ b/config/locales/pa.yml @@ -52,12 +52,12 @@ pa: notifier: ਨੋਟੀਫਾਇਰ old_node: ਪੁਰਾਣੀ ਨੋਡ old_node_tag: ਪੁਰਾਣਾ ਨੋਡ ਟੈਗ - old_relation: ਪੁਰਾਣਾ ਨਾਤਾ + old_relation: ਪੁਰਾਣਾ ਸਬੰਧ old_relation_member: ਪੁਰਾਣਾ ਸਬੰਧ ਮੈਂਬਰ old_relation_tag: ਪੁਰਾਣਾ ਸਬੰਧ ਟੈਗ - old_way: ਪੁਰਾਣਾ ਢੰਗ - old_way_node: ਪੁਰਾਣਾ ਢੰਗ ਨੋਡ - old_way_tag: ਪੁਰਾਣਾ ਢੰਗ ਟੈਗ + old_way: ਪੁਰਾਣਾ ਰਾਹ + old_way_node: ਪੁਰਾਣਾ ਰਾਹ ਨੋਡ + old_way_tag: ਪੁਰਾਣਾ ਰਾਹ ਟੈਗ relation: ਸਬੰਧ relation_member: ਸਬੰਧ ਮੈਂਬਰ relation_tag: ਸਬੰਧ ਟੈਗ @@ -80,7 +80,7 @@ pa: diary_entry: user: ਵਰਤੋਂਕਾਰ title: ਵਿਸ਼ਾ - latitude: ਲੰਬਕਾਰ + latitude: ਅਕਸ਼ਾਂਸ਼ longitude: ਲੰਬਕਾਰ language: ਬੋਲੀ doorkeeper/application: @@ -93,7 +93,7 @@ pa: visible: ਵਿਖਣਯੋਗ name: ਨਾਂ size: ਅਕਾਰ - latitude: ਵਿਧਕਾਰ + latitude: ਅਕਸ਼ਾਂਸ਼ longitude: ਲੰਬਕਾਰ public: ਜਨਤਕ description: ਵੇਰਵਾ @@ -112,7 +112,7 @@ pa: active: ਸਰਗਰਮ display_name: ਵਿਖਾਉਣ ਨਾਂ description: ਵੇਰਵਾ - home_lat: 'ਅਕਸ਼ਾਂਸ਼:' + home_lat: ਅਕਸ਼ਾਂਸ਼ home_lon: 'ਰੇਖਾਂਸ਼:' languages: ਬੋਲੀਆਂ pass_crypt: ਪਛਾਣ-ਸ਼ਬਦ @@ -1022,6 +1022,7 @@ pa: uploaded: 'ਅੱਪਲੋਡ ਹੋਇਆ:' points: ਬਿੰਦੂ start_coordinates: 'ਸ਼ੁਰੂਆਤੀ ਗੁਣਕ:' + coordinates_html: '%{latitude}; %{longitude}' map: ਨਕਸ਼ਾ edit: ਸੋਧੋ owner: 'ਮਾਲਕ:' diff --git a/config/locales/sc.yml b/config/locales/sc.yml index fd4ab7357..e63dbfd46 100644 --- a/config/locales/sc.yml +++ b/config/locales/sc.yml @@ -759,15 +759,23 @@ sc: townhall: Munitzìpiu training: Istrutura de annestru university: Universidade + vehicle_inspection: Tzentru de revisiones vending_machine: Distribudore automàticu veterinary: Chirurgia veterinària village_hall: Munitzìpiu waste_basket: Cuntenidore de Arga waste_disposal: Cuntenidore de Arga + waste_dump_site: Muntonàrgiu + watering_place: Abbadòrgiu water_point: Puntu de abba + weighbridge: Bilàntzia a ponte + "yes": Servìtziu boundary: + aboriginal_lands: Terras aborìgenas administrative: Lìmite Amministrativu + census: Làcana de tzensimentu national_park: Parcu Natzionale + political: Distretu eletorale protected_area: Àrea amparada "yes": Làcana bridge: @@ -780,57 +788,120 @@ sc: building: apartment: Aposentu apartments: Aposentus + barn: Òrriu bungalow: Bungalow + cabin: Pinnetu chapel: Capella church: Crésia + civic: Edifìtziu tzìvicu + college: Edifìtziu universitàriu + commercial: Edifìtziu cummertziale + construction: Edifìtziu in fràigu + detached: Domo unifamiliare + dormitory: Dormitòriu + duplex: Domo dòpia (duplex) + farm: Domo de fatoria + farm_auxiliary: Fràigu ausiliàriu de una fatoria garage: Garàgiu garages: Garàgios + greenhouse: Serra hangar: Hangar hospital: Ospidale + hotel: Edifìtziu de un'albergu house: Domo + houseboat: Domo chi gallègiat hut: Barraca + industrial: Edifìtziu industriale + kindergarten: Edifìtziu de un'asilu + manufacture: Edifìtziu de una fàbrica + office: Ufìtzios + public: Edifìtziu pùblicu + residential: Edifìtziu residentziale + retail: Edifìtziu cummertziale + roof: Coberta + ruins: Edifìtziu in ruinas + school: Edifìtziu iscolàsticu + semidetached_house: Domo bifamiliare + service: Edifìtziu de servìtziu + shed: Capannone + stable: Istalla + static_caravan: Caravana + temple: Edifìtziu de unu tèmpiu + terrace: Domos a ischiera + train_station: Istatzione ferroviària university: Edifìtziu universitàriu warehouse: Magasinu "yes": Edifitziu club: + scout: Base scout + sport: Tzìrculu isportivu "yes": Tzìrculu craft: + beekeeper: Mojaresu blacksmith: Mastru de ferru brewery: Fàbrica de birra carpenter: Mastru de linna + caterer: Servìtziu de ristorazione + confectionery: Cofituria + dressmaker: Draperi electrician: Eletritzista + electronics_repair: Acontzadura de trastes eletrònicos gardener: Giardinere + glaziery: Bidraju + handicraft: Artesania + hvac: Fabricante de climatizadores + metal_construction: Azienda metalmecànica painter: Pintore photographer: Fotògrafu plumber: Idràulicu + roofer: Fraigadore de cobertas + sawmill: Segheria shoemaker: Cartzeraju + stonemason: Picapedreri tailor: Draperi + window_construction: Fraigadore de ventanas + winery: Cantina de binos "yes": Butega de artesania emergency: + access_point: Puntu de atzessu ambulance_station: Istatzione ambulàntzias assembly_point: Puntu de reunione defibrillator: Defibrillatore + fire_extinguisher: Estintore + fire_water_pond: Riserva de abba anti-fogos landing_site: Logu de aterràgiu de emergèntzia + life_ring: Sarvagente phone: Telèfonu de Emergèntzias + siren: Sirena de emergèntzia + suction_point: Puntu de aspiratzione de emergèntzia water_tank: Depòsitu de Abba de Emergèntzia highway: abandoned: Ferrovia abbandonada bridleway: Caminu pro caddos + bus_guideway: Corsia de postales a ghia vinculada bus_stop: Firmada de su Postale construction: Caminu in costrutzione + corridor: Passadissu + crossing: Coladòrgiu cycleway: Pista Tziclàbile elevator: Ascensore emergency_access_point: Logu de intrada de emergèntzia + emergency_bay: Pratzita de pàsida + footway: Caminera pedonale ford: Badu give_way: Sinnale de Tzèdere su Passu living_street: Carrera Residentziale + milestone: Perda miliare motorway: Autostrada motorway_junction: Nodu Viàriu + motorway_link: Autostrada passing_place: Logu de coladòrgiu path: Caminu + pedestrian: Caminu pedonale platform: Andana pro postale o tramvia primary: Caminu printzipale primary_link: Caminu printzipale + proposed: Caminu propostu raceway: Tzircùitu automobilìsticu residential: Carrera residentziale rest_area: Àrea de Pasu @@ -838,6 +909,7 @@ sc: secondary: Carrera segundària secondary_link: Carrera segundària service: Carrera de Servìtziu + services: Istatzione de servìtziu speed_camera: Autovelox steps: Iscalinos stop: Signale de istop @@ -845,28 +917,46 @@ sc: tertiary: Carrera Tertziària tertiary_link: Carrera Tertziària track: Sestadu + traffic_mirror: Ispigru de tràficu + traffic_signals: Semàforu + trailhead: Intrada de un'àndala + trunk: Superstrada + trunk_link: Superstrada turning_loop: Rotonda de cambiamentu de sensu unclassified: Carrera senza classificatzione "yes": Carrera historic: + aircraft: Aeroplanu istòricu archaeological_site: Sìtiu Archeològicu + bomb_crater: Cratere de bomba istòricu battlefield: Campu de Batalla boundary_stone: Pedra de làcana + building: Edifìtziu istòricu + bunker: Bunker + cannon: Cannone istòricu castle: Casteddu + charcoal_pile: Carbonera istòrica church: Crèsia city_gate: Porta de sa Tzitade citywalls: Murallas de sa Tzitade fort: Forte heritage: Patrimoniu de s'umanidade + hollow_way: Caminu afundadu house: Domo manor: Villa memorial: Memoriale + milestone: Perda miliare istòrica + mine: Mina + mine_shaft: Putzu mineràriu monument: Monumentu + railway: Ferrovia istòrica roman_road: Carreggiada romana ruins: Ruinas + rune_stone: Perda rùnica stone: Pedra tomb: Tumba tower: Turre + wayside_chapel: Capella votiva wayside_cross: Rughe istòrica wayside_shrine: Tabernàculu istòricu wreck: Relitu @@ -875,7 +965,9 @@ sc: "yes": Giuntura de su caminu landuse: allotments: Giardinos familiares + aquaculture: Abbacultura basin: Batzinu + brownfield: Terrinu abbandonadu cemetery: Campusantu commercial: Zona Cummertziale conservation: Ispàtziu de cunservatzione @@ -885,24 +977,37 @@ sc: forest: Litu garages: Garàgios grass: Erva + greenfield: Terrinu egadu industrial: Zona Industriale landfill: Muntonàrgiu meadow: Pradu military: Zona Militare + mine: Miniera orchard: Frutedu + plant_nursery: Vivaju quarry: Cava railway: Ferrovia recreation_ground: Zona de recreu + religious: Terrinu religiosu reservoir: Batzinu + reservoir_watershed: Presetu de unu serbatoju de abba residential: Àrea residentziale retail: Àrea cummertziale village_green: Àrea birde comune de sa bidda vineyard: Bìngia "yes": Impreu de su terrinu leisure: + adult_gaming_centre: Sala de giogos pro adultos + amusement_arcade: Sala de giogos + bandstand: Chioscu de sa mùsica beach_resort: Cumplessu turìsticu de marina + bird_hide: Logu pro pompiare pugiones + bleachers: Gradinadas + bowling_alley: Sala de bowling common: Terrinu comunale + dance: Sala de ballu dog_park: Parcu pro sos Canes + firepit: Brasieri fishing: Àrea de Pisca fitness_centre: Palestra fitness_station: Palestra a s'abertu @@ -913,7 +1018,10 @@ sc: marina: Marina (portu minore) miniature_golf: Minigolf nature_reserve: Reserva naturale + outdoor_seating: Logos pro si sètzere in foras park: Parcu + picnic_table: Mesa de picnic + pitch: Campu isportivu playground: Parcu pro Pitzinnos recreation_ground: Zona de recreu resort: Cumplessu turìsticu @@ -927,28 +1035,51 @@ sc: "yes": Tempus lìberu man_made: adit: Intrada de una galleria minerària + advertising: Publitzidade + antenna: Antenna + avalanche_protection: Protetzione anti-valanga beacon: Sinnale marinu + beam: Trae + beehive: Moju breakwater: Paraundas bridge: Ponte + bunker_silo: Bunker + cairn: Tùmulu (cairn) chimney: Fumajolu + clearcut: Padente isboscadu + communications_tower: Torre de comunicatziones crane: Grue + cross: Rughe + dolphin: Puntu de ormègiu dyke: Àrgine + embankment: Terraprenu flagpole: Palu de bandera gasometer: Gasòmetru groyne: Paraundas (Groyne) kiln: Furru (kiln) lighthouse: Faru + manhole: Tumbinu mast: Àrbore (de sa nave) + mine: Miniera + mineshaft: Putzu mineràriu monitoring_station: Istatzione de cuntrollu petroleum_well: Putzu petrolìferu pier: Pontinu pipeline: Tubadura + pumping_station: Istatzione de pompàgiu + reservoir_covered: Serbatoju cobertu silo: Lòssia + snow_cannon: Cannone de nie + snow_fence: Cresura pro sa nie storage_tank: Serbatòiu + street_cabinet: Tzentralina surveillance: Videobardiamentu + telescope: Telescòpiu tower: Turre + utility_pole: Palu de suportu wastewater_plant: Depuradore watermill: Mulinu a abba + water_tap: Càntaru de s'abba water_tower: Turre ìdrica water_well: Putzu petrolìferu water_works: Istrutura idràulica @@ -958,23 +1089,32 @@ sc: military: airfield: Aeroportu militare barracks: Caserma + bunker: Bunker + checkpoint: Puntu de controllu + trench: Trintzea "yes": Militare mountain_pass: "yes": Coladòrgiu montanu natural: + atoll: Atollu + bare_rock: Roca nuda bay: Baja beach: Marina cape: Cabu cave_entrance: Intrada de sa gruta cliff: Iscameddu + coastline: Costera crater: Cratere dune: Duna + fell: Fell (ambiente de monte) fjord: Costera forest: Litu + geyser: Geyser glacier: Niera grassland: Pradu heath: Ghiddostraju hill: Montigru + hot_spring: Fonte termale island: Ìsula isthmus: Istmu land: Terra @@ -989,28 +1129,45 @@ sc: rock: Roca saddle: Sedda sand: Arena + scree: Giarrone scrub: Prunitzàrgiu + shingle: Praja de perdas de riu spring: Bena stone: Pedra strait: Astrintura tree: Àrbore + tree_row: Fila de àrbores + tundra: Tundra valley: Badde volcano: Vulcanu water: Abba wetland: Paule wood: Buscu + "yes": Elementu naturale office: accountant: Contàbile administrative: Amministratzione + advertising_agency: Agentzia publitzitària architect: Architetu association: Assòtziu company: Azienda + diplomatic: Ufìtziu diplomàticu educational_institution: Istitutzione educativa employment_agency: Agèntzia pro su traballu + energy_supplier: Ufìtziu de fornidura elètrica estate_agent: Butega immobiliare + financial: Ufìtziu finantziàriu government: Ufìtziu guvernativu + insurance: Ufìtziu de asseguratziones it: Ufìtziu IT lawyer: Abogadu + logistics: Ufìtziu logìsticu + newspaper: Ufìtziu de redatzione de unu cuotidianu + ngo: Ufìtziu de una ONG + notary: Notaju + religion: Ufìtziu religiosu + research: Ufìtziu de chirca + tax_advisor: Consulente fiscale telecommunication: Ufìtziu de telecomunicatziones travel_agent: Agèntzia de biàgios "yes": Ufìtziu @@ -1018,6 +1175,7 @@ sc: allotments: Giardinos familiares archipelago: Artzipèlagu city: Tzitade + city_block: Isoladu urbanu country: Paisu county: Contea farm: Fatoria @@ -1030,6 +1188,7 @@ sc: locality: Localidade municipality: Munitzìpiu neighbourhood: Bighinadu + plot: Lotu de terrinu postcode: Còdighe postale quarter: Bighinadu region: Regione @@ -1043,106 +1202,210 @@ sc: "yes": Logu railway: abandoned: Ferrovia abbandonada + buffer_stop: Paraurti ferroviàriu construction: Ferrandeu in costrutzione disused: Ferrandeu in disavesu + funicular: Funiculare halt: Firmada de sos trenos junction: Nodu ferruviàriu level_crossing: passagiù a livellu light_rail: Trenu lèbiu + miniature: Ferrovia in miniadura monorail: Monorotàia narrow_gauge: Ferrovia abbandonada + platform: Banchina ferroviària + preserved: Ferrovia cunservada + proposed: Ferrovia proposta rail: Caminu de ferru + spur: Mascada ferroviària curtza + station: Istatzione ferroviària + stop: Firmada de sa ferrovia subway: Metropolitana subway_entrance: Intrada de sa metropolitana + switch: Cuncàmbios ferroviàrios + tram: Tramvia tram_stop: Firmada de su tram + turntable: Prataforma chi girat + yard: Zona de manovra ferroviària shop: + agrarian: Butega agrària alcohol: Licorista antiques: Anticuàriu + appliance: Butega de eletrodomèsticos art: Butega de arte + baby_goods: Butega de artìculos pro crios + bag: Butega de bursas bakery: Paneteri + bathroom_furnishing: Arredu de bagnu beauty: Salone de bellesa + bed: Produtos pro su letu beverages: Butega de bèvidas bicycle: Butega de bitzicletas bookmaker: Iscummissas books: Libreria boutique: Boutique butcher: Carnitzeria + car: Butega de màchinas car_parts: Cantos de ricàmbiu pro automòbiles car_repair: Riparatzione màchina + carpet: Butega de tapetes + charity: Butega de benefitzèntzia + cheese: Butega de casu + chemist: Potecaria + chocolate: Tziculateria clothes: Butega de bestires coffee: Butega de cafei computer: Butega de informàtica + confectionery: Butega de durches convenience: Buteghedda copyshop: Copisteria + cosmetics: Butega de cosmèticos + craft: Butega de artìculos pro s'artesania + curtain: Butega de tendas + dairy: Lateria deli: Gastronomia department_store: Supermercadu + discount: Butega de artìculos iscontados (discount) doityourself: Butega de bricolage dry_cleaning: Sabunadura "a sicu" + e-cigarette: Butega de sigaretas eletrònicas electronics: Butega de eletrònica + erotic: Butega eròtica estate_agent: Butega immobiliare + fabric: Butega de tessutos + farm: Butega de produtos agrìculos + fashion: Butega de moda + fishing: Butega de trastes de pisca florist: Froraju food: Alimentares + frame: Butega de curnisas funeral_directors: Pompas fùnebres furniture: Mòbiles + garden_centre: Tzentru de giardinàgiu + gas: Butega de combustìbile general: Empòriu gift: Butega de donos + greengrocer: Butega de fruteri + grocery: Fruteri hairdresser: Pilucheri hardware: Ferramenta + health_food: Butega de alimentos pro sa salude + hearing_aids: Butega de aparèchios acùsticos + herbalist: Erbolàriu + hifi: Butega de Hi-Fi + houseware: Butega de artìculos pro sa domo + ice_cream: Gelateria interior_decoration: Decoradura de internos jewelry: Butega de prendas + kiosk: Chioscu + kitchen: Butega de coghina laundry: Samunadòrgiu + locksmith: Mastru de ferru lottery: Loteria mall: Tzentru cummertziale massage: Messàgiu + medical_supply: Butega de artìculos mèigos + mobile_phone: Butega de telèfonos mòbiles + money_lender: Imprestadore de dinare motorcycle: Butega de mototzicletas + motorcycle_repair: Butega de acontzadura de mototzicletas + music: Butega de mùsica + musical_instrument: Istrumentos musicales newsagent: Agentzia de imprenta + nutrition_supplements: Integradores alimentares optician: Òticu + organic: Butega de alimentos biològicos + outdoor: Butega de artìculos pro s'atividade a s'abertu paint: Butega de Pinturas + pastry: Pastisseria pawnbroker: Monte de piedade + perfumery: Butega de profumos + pet: Butega de animales + pet_grooming: Toeletadura pro animales domèsticos photo: Fotògrafu + seafood: Pischeria second_hand: Ogetos de segunda manu + sewing: Mertzeria + shoes: Butega de iscarpas + sports: Butega de isport + stationery: Cartoleria + storage_rental: Afitu de depòsitos supermarket: Supermercadu tailor: Draperi + tattoo: Butega de tatuàgios + tea: Butega de te + ticket: Billeteria tobacco: Istancu + toys: Butega de giogos travel_agency: Agèntzia de biàgios tyres: Butega de pneumàticos + vacant: Logu pro butega bòidu variety_store: Butega de ogetos baratos + video: Butega de vìdeos + video_games: Butega de video-giogos + wholesale: Butega a s'ingrussu wine: Butega de binos "yes": Butega tourism: alpine_hut: Pinnetu alpinu + apartment: Apartamentu pro vacàntzias artwork: Òpera de arte attraction: Atratzione bed_and_breakfast: Bed and Breakfast cabin: Cabina turìstica + camp_pitch: Pratzita de campègiu camp_site: Campègiu caravan_site: Campeggio pro roulotte + chalet: Masu (Chalet) gallery: Galleria guest_house: Pensione hostel: Ostellu + hotel: Albergu information: Informatziones + motel: Motel museum: Museu picnic_site: Àrea de recreu theme_park: Parcu temàticu viewpoint: Puntu panoràmicu + wilderness_hut: Imbaru rurale + zoo: Zoo tunnel: + building_passage: Coladòrgiu peri unu fràigu + culvert: Canale suta terra "yes": Galleria waterway: + artificial: Cursu de abba artifitziale boatyard: Cantiere navale canal: Canale dam: Diga + derelict_canal: Canale abbandonadu + ditch: Fossu dock: Dàrsena + drain: Canale de drenàgiu + lock: Serrada (isbarramentu idràulicu) lock_gate: Ghenna de serradura mooring: Ormègiu rapids: Tràinos river: Riu stream: Traghinu/Trainu + wadi: Uadì waterfall: Istrampu weir: Nassàrgiu + "yes": Cursu de abba admin_levels: level2: Làcana Aministrativa 2u Livellu - Istadu Natzionale level3: Làcana de regione + level4: Làcana de 4u livellu (regione, provìntzia o istadu federadu de unu + paisu) level5: Làcana aministrativa su de 5 livellus - àrea regionale + level6: Làcana de 6u livellu - suta-regionale (provìntzia, tzitade metropolitana + o contea) + level7: Làcana de 7u livellu - subra-munitzipale (unione de comunes, comunidade + montana) + level8: Làcana munitzipale (livellu 8) + level9: Làcana de 9u livellu - sutamunitzipale (distretu tzitadinu) + level10: Làcana de livellu 10 (bighinadu) + level11: Làcana de trighìngiu types: cities: Tzitades towns: Tzitadinas @@ -1153,17 +1416,87 @@ sc: issues: index: title: Problemas + select_status: Seletziona un'istadu + select_type: Seletziona una casta + select_last_updated_by: Seletzionare s'ùrtima atualizatzione de + reported_user: Utente sinnaladu + not_updated: No atualizadu search: Chirca + search_guidance: 'Chirca problemas:' + user_not_found: S'utente no esistit + issues_not_found: Perunu problema de custa casta agatadu status: Istadu reports: Raportos last_updated: Ùrtimu agiornamentu + last_updated_time_html: %{time} + last_updated_time_user_html: %{time} dae %{user} link_to_reports: Abbàida su raportu + reports_count: + one: 1 sinnalatzione + other: '%{count} sinnalatziones' + reported_item: Elementu sinnaladu + states: + ignored: Ignoradu + open: Abertu + resolved: Risoltu + update: + new_report: Sa sinnalatzione tua est istada registrada + successful_update: Sa sinnalatzione tua est istada atualizada + provide_details: Fruni sos detàllios pedidos + show: + title: '%{status} Problema #%{issue_id}' + report_created_at: Sinnaladu pro sa prima borta su %{datetime} + last_resolved_at: Risoltu pro s'ùrtima borta su %{datetime} + last_updated_at: Ùrtima atualizatzione de %{displayname} su %{datetime} + resolve: Risolve + ignore: Ignora + reopen: Torra a abèrrere + reports_of_this_issue: Sinnalatziones de custu problema + read_reports: Leghe sas sinnalatziones + new_reports: Sinnalatziones noas + other_issues_against_this_user: Àteras sinnalatziones contra a custu utente + no_other_issues: Non b'at perunu àteru problema chi pertochet a custu utente. + comments_on_this_issue: Cummentos subra de custu problema + resolve: + resolved: S'istadu de su problema est istadu impostadu comente ‘Risoltu' + ignore: + ignored: S'istadu de su problema est istadu impostadu comente ‘Ignoradu' + reopen: + reopened: S'istadu de su problema est istadu impostadu comente ‘Abertu' + comments: + comment_from_html: Cummentu de %{user_link} de su %{comment_created_at} + reassign_param: Torrare a assignare su problema? + reports: + reported_by_html: Sinnaladu comente %{category} dae %{user} su %{updated_at} + helper: + reportable_title: + diary_comment: '%{entry_title}, cummentu #%{comment_id}' + note: 'Nota #%{note_id}' + issue_comments: + create: + comment_created: Su cummentu tuo est istadu creadu + issue_reassigned: Su cummentu tuo est istadu creadu e su problema est istadu + torradu a assignare reports: new: + title_html: Sinnala %{link} + missing_params: Non faghet a creare una sinnalatzione noa + disclaimer: + intro: 'In antis de imbiare sa sinnalatzione tua a sos moderadores de su situ + web assegura·ti chi:' + not_just_mistake: Sias seguru chi su problema non siat petzi una faddina + unable_to_fix: Non sias in gradu de acontzare su problema a sa sola o cun + s'agiudu de sos membros de sa comunidade tua + resolve_with_user: Apas giai proadu a risòlvere su problema cun s'utente in + chistione categories: diary_entry: + spam_label: Custa intrada de diàriu est/cuntenet arga + offensive_label: Custa intrada de diàriu est ofensiva/truzosa + threat_label: Custa intrada de diàriu cuntenet una minetza other_label: Àteru diary_comment: + spam_label: Custu cummentu a su diàriu est/cuntenet arga other_label: Àteru user: other_label: Àteru @@ -1182,6 +1515,7 @@ sc: export: Esporta issues: Problemas data: Datos + export_data: Esporta sos datos gps_traces: Trassas GPS intro_header: Bene benius in OpenStreetMap! intro_text: OpenStreetMap est una mapa de su mundu, creadu dae persones comente diff --git a/config/locales/zh-TW.yml b/config/locales/zh-TW.yml index a62ffa684..202dbef98 100644 --- a/config/locales/zh-TW.yml +++ b/config/locales/zh-TW.yml @@ -2107,8 +2107,12 @@ zh-TW: title: 郵件論壇 description: 在不同主題或是地區的郵件論壇問問題或是討論有趣的事物。 forums: - title: 論壇 + title: 論壇（舊版） description: 給習慣論壇型式的地方問問題和討論 + community: + url: https://community.openstreetmap.org/ + title: 社群論壇 + description: 討論有關 OpenStreetMap 的分享場所。 irc: title: IRC description: 使用各種不同語言在各種主題聊天互動。 From 7df4a7f8a3858d9fdb92f5df4c7056181bf91046 Mon Sep 17 00:00:00 2001 From: Tom Hughes Date: Fri, 9 Sep 2022 11:01:20 +0100 Subject: [PATCH 64/68] Fix background colour for badges on GPS traces Fixes #3681 --- app/views/traces/_trace.html.erb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/views/traces/_trace.html.erb b/app/views/traces/_trace.html.erb index ba14f214e..832187b79 100644 --- a/app/views/traces/_trace.html.erb +++ b/app/views/traces/_trace.html.erb @@ -25,7 +25,7 @@ when "public", "identifiable" then "success" else "danger" end %> - <%= t(".#{trace.visibility}") %> + <%= t(".#{trace.visibility}") %>

From f7e168b8e12cebf84490278c5ba5610821e7bdde Mon Sep 17 00:00:00 2001 From: Tom Hughes Date: Fri, 9 Sep 2022 22:34:29 +0100 Subject: [PATCH 65/68] Update to rails 7.0.4 --- Gemfile | 4 +- Gemfile.lock | 120 +++++++++++++++++++++++++-------------------------- 2 files changed, 62 insertions(+), 62 deletions(-) diff --git a/Gemfile b/Gemfile index 1b2b60864..718bd262b 100644 --- a/Gemfile +++ b/Gemfile @@ -1,7 +1,7 @@ source "https://rubygems.org" # Require rails -gem "rails", "7.0.3.1" +gem "rails", "7.0.4" # Require json for multi_json gem "json" @@ -76,7 +76,7 @@ gem "omniauth-rails_csrf_protection", "~> 1.0" gem "omniauth-windowslive" # Doorkeeper for OAuth2 -gem "doorkeeper" +gem "doorkeeper", "~> 5.5.4" gem "doorkeeper-i18n" # Markdown formatting support diff --git a/Gemfile.lock b/Gemfile.lock index 23dba086e..4de9076ef 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -3,73 +3,73 @@ GEM specs: aasm (5.3.0) concurrent-ruby (~> 1.0) - actioncable (7.0.3.1) - actionpack (= 7.0.3.1) - activesupport (= 7.0.3.1) + actioncable (7.0.4) + actionpack (= 7.0.4) + activesupport (= 7.0.4) nio4r (~> 2.0) websocket-driver (>= 0.6.1) - actionmailbox (7.0.3.1) - actionpack (= 7.0.3.1) - activejob (= 7.0.3.1) - activerecord (= 7.0.3.1) - activestorage (= 7.0.3.1) - activesupport (= 7.0.3.1) + actionmailbox (7.0.4) + actionpack (= 7.0.4) + activejob (= 7.0.4) + activerecord (= 7.0.4) + activestorage (= 7.0.4) + activesupport (= 7.0.4) mail (>= 2.7.1) net-imap net-pop net-smtp - actionmailer (7.0.3.1) - actionpack (= 7.0.3.1) - actionview (= 7.0.3.1) - activejob (= 7.0.3.1) - activesupport (= 7.0.3.1) + actionmailer (7.0.4) + actionpack (= 7.0.4) + actionview (= 7.0.4) + activejob (= 7.0.4) + activesupport (= 7.0.4) mail (~> 2.5, >= 2.5.4) net-imap net-pop net-smtp rails-dom-testing (~> 2.0) - actionpack (7.0.3.1) - actionview (= 7.0.3.1) - activesupport (= 7.0.3.1) + actionpack (7.0.4) + actionview (= 7.0.4) + activesupport (= 7.0.4) rack (~> 2.0, >= 2.2.0) rack-test (>= 0.6.3) rails-dom-testing (~> 2.0) rails-html-sanitizer (~> 1.0, >= 1.2.0) actionpack-page_caching (1.2.4) actionpack (>= 4.0.0) - actiontext (7.0.3.1) - actionpack (= 7.0.3.1) - activerecord (= 7.0.3.1) - activestorage (= 7.0.3.1) - activesupport (= 7.0.3.1) + actiontext (7.0.4) + actionpack (= 7.0.4) + activerecord (= 7.0.4) + activestorage (= 7.0.4) + activesupport (= 7.0.4) globalid (>= 0.6.0) nokogiri (>= 1.8.5) - actionview (7.0.3.1) - activesupport (= 7.0.3.1) + actionview (7.0.4) + activesupport (= 7.0.4) 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 (7.0.3.1) - activesupport (= 7.0.3.1) + activejob (7.0.4) + activesupport (= 7.0.4) globalid (>= 0.3.6) - activemodel (7.0.3.1) - activesupport (= 7.0.3.1) - activerecord (7.0.3.1) - activemodel (= 7.0.3.1) - activesupport (= 7.0.3.1) + activemodel (7.0.4) + activesupport (= 7.0.4) + activerecord (7.0.4) + activemodel (= 7.0.4) + activesupport (= 7.0.4) activerecord-import (1.4.0) activerecord (>= 4.2) - activestorage (7.0.3.1) - actionpack (= 7.0.3.1) - activejob (= 7.0.3.1) - activerecord (= 7.0.3.1) - activesupport (= 7.0.3.1) + activestorage (7.0.4) + actionpack (= 7.0.4) + activejob (= 7.0.4) + activerecord (= 7.0.4) + activesupport (= 7.0.4) marcel (~> 1.0) mini_mime (>= 1.1.0) - activesupport (7.0.3.1) + activesupport (7.0.4) concurrent-ruby (~> 1.0, >= 1.0.2) i18n (>= 1.6, < 2) minitest (>= 5.1) @@ -86,8 +86,8 @@ GEM autoprefixer-rails (10.4.7.0) execjs (~> 2) aws-eventstream (1.2.0) - aws-partitions (1.626.0) - aws-sdk-core (3.140.0) + aws-partitions (1.628.0) + aws-sdk-core (3.144.0) aws-eventstream (~> 1, >= 1.0.2) aws-partitions (~> 1, >= 1.525.0) aws-sigv4 (~> 1.1) @@ -373,20 +373,20 @@ GEM rack-test (2.0.2) rack (>= 1.3) rack-uri_sanitizer (0.0.2) - rails (7.0.3.1) - actioncable (= 7.0.3.1) - actionmailbox (= 7.0.3.1) - actionmailer (= 7.0.3.1) - actionpack (= 7.0.3.1) - actiontext (= 7.0.3.1) - actionview (= 7.0.3.1) - activejob (= 7.0.3.1) - activemodel (= 7.0.3.1) - activerecord (= 7.0.3.1) - activestorage (= 7.0.3.1) - activesupport (= 7.0.3.1) + rails (7.0.4) + actioncable (= 7.0.4) + actionmailbox (= 7.0.4) + actionmailer (= 7.0.4) + actionpack (= 7.0.4) + actiontext (= 7.0.4) + actionview (= 7.0.4) + activejob (= 7.0.4) + activemodel (= 7.0.4) + activerecord (= 7.0.4) + activestorage (= 7.0.4) + activesupport (= 7.0.4) bundler (>= 1.15.0) - railties (= 7.0.3.1) + railties (= 7.0.4) rails-controller-testing (1.0.5) actionpack (>= 5.0.1.rc1) actionview (>= 5.0.1.rc1) @@ -399,9 +399,9 @@ GEM rails-i18n (7.0.5) i18n (>= 0.7, < 2) railties (>= 6.0.0, < 8) - railties (7.0.3.1) - actionpack (= 7.0.3.1) - activesupport (= 7.0.3.1) + railties (7.0.4) + actionpack (= 7.0.4) + activesupport (= 7.0.4) method_source rake (>= 12.2) thor (~> 1.0) @@ -429,15 +429,15 @@ GEM unicode-display_width (>= 1.4.0, < 3.0) rubocop-ast (1.21.0) parser (>= 3.1.1.0) - rubocop-minitest (0.21.1) + rubocop-minitest (0.22.0) rubocop (>= 0.90, < 2.0) rubocop-performance (1.14.3) rubocop (>= 1.7.0, < 2.0) rubocop-ast (>= 0.4.0) - rubocop-rails (2.15.2) + rubocop-rails (2.16.0) activesupport (>= 4.2.0) rack (>= 1.1) - rubocop (>= 1.7.0, < 2.0) + rubocop (>= 1.33.0, < 2.0) rubocop-rake (0.6.0) rubocop (~> 1.0) ruby-openid (2.9.2) @@ -536,7 +536,7 @@ DEPENDENCIES dalli debug_inspector delayed_job_active_record - doorkeeper + doorkeeper (~> 5.5.4) doorkeeper-i18n erb_lint factory_bot_rails @@ -575,7 +575,7 @@ DEPENDENCIES r2 (~> 0.2.7) rack-cors rack-uri_sanitizer - rails (= 7.0.3.1) + rails (= 7.0.4) rails-controller-testing rails-i18n (~> 7.0.0) rinku (>= 2.0.6) From 9cd96bd452415918be77d6d2094c021b652c9048 Mon Sep 17 00:00:00 2001 From: Tom Hughes Date: Fri, 9 Sep 2022 22:36:39 +0100 Subject: [PATCH 66/68] Fix new rubocop warnings --- app/controllers/preferences_controller.rb | 2 +- app/controllers/profiles_controller.rb | 2 +- app/controllers/reports_controller.rb | 2 +- app/mailers/user_mailer.rb | 4 ++-- config/initializers/config.rb | 2 +- lib/country.rb | 2 +- test/models/trace_test.rb | 4 ++-- 7 files changed, 9 insertions(+), 9 deletions(-) diff --git a/app/controllers/preferences_controller.rb b/app/controllers/preferences_controller.rb index e098a8acc..dcf0d8b64 100644 --- a/app/controllers/preferences_controller.rb +++ b/app/controllers/preferences_controller.rb @@ -26,7 +26,7 @@ class PreferencesController < ApplicationController flash[:notice] = { :partial => "preferences/update_success_flash" } redirect_to preferences_path else - flash[:error] = t ".failure" + flash.now[:error] = t ".failure" render :edit end end diff --git a/app/controllers/profiles_controller.rb b/app/controllers/profiles_controller.rb index b48d08ad2..4005176ce 100644 --- a/app/controllers/profiles_controller.rb +++ b/app/controllers/profiles_controller.rb @@ -36,7 +36,7 @@ class ProfilesController < ApplicationController flash[:notice] = t ".success" redirect_to user_path(current_user) else - flash[:error] = t ".failure" + flash.now[:error] = t ".failure" render :edit end end diff --git a/app/controllers/reports_controller.rb b/app/controllers/reports_controller.rb index 30cb9da7c..6d05e6a57 100644 --- a/app/controllers/reports_controller.rb +++ b/app/controllers/reports_controller.rb @@ -28,7 +28,7 @@ class ReportsController < ApplicationController redirect_to helpers.reportable_url(@report.issue.reportable), :notice => t(".successful_report") else - flash[:notice] = t(".provide_details") + flash.now[:notice] = t(".provide_details") render :action => "new" end end diff --git a/app/mailers/user_mailer.rb b/app/mailers/user_mailer.rb index 7bbe65ec5..33fcc7465 100644 --- a/app/mailers/user_mailer.rb +++ b/app/mailers/user_mailer.rb @@ -183,7 +183,7 @@ class UserMailer < ApplicationMailer end def attach_project_logo - attachments.inline["logo.png"] = File.read(Rails.root.join("app/assets/images/osm_logo_30.png")) + attachments.inline["logo.png"] = Rails.root.join("app/assets/images/osm_logo_30.png").read end def attach_user_avatar(user) @@ -199,7 +199,7 @@ class UserMailer < ApplicationMailer avatar.blob.download end else - File.read(Rails.root.join("app/assets/images/avatar_small.png")) + Rails.root.join("app/assets/images/avatar_small.png").read end end diff --git a/config/initializers/config.rb b/config/initializers/config.rb index e51281e11..7fc488635 100644 --- a/config/initializers/config.rb +++ b/config/initializers/config.rb @@ -2,7 +2,7 @@ # Otherwise, admins might not be aware that they are now silently ignored # and major problems could occur # rubocop:disable Rails/Output, Rails/Exit -if File.exist?(Rails.root.join("config/application.yml")) +if Rails.root.join("config/application.yml").exist? puts "The config/application.yml file is no longer supported." puts "" puts "Default settings are now found in config/settings.yml and you" diff --git a/lib/country.rb b/lib/country.rb index f6f679125..ca547a972 100644 --- a/lib/country.rb +++ b/lib/country.rb @@ -19,7 +19,7 @@ class Country def self.load_countries countries = {} - xml = REXML::Document.new(File.read(Rails.root.join("config/countries.xml"))) + xml = REXML::Document.new(Rails.root.join("config/countries.xml").read) xml.elements.each("geonames/country") do |ele| code = ele.get_text("countryCode").to_s diff --git a/test/models/trace_test.rb b/test/models/trace_test.rb index 8fa09f4d7..762df6648 100644 --- a/test/models/trace_test.rb +++ b/test/models/trace_test.rb @@ -166,14 +166,14 @@ class TraceTest < ActiveSupport::TestCase end def test_large_picture - picture = File.read(Rails.root.join("test/gpx/fixtures/a.gif"), :mode => "rb") + picture = Rails.root.join("test/gpx/fixtures/a.gif").read(:mode => "rb") trace = create(:trace, :fixture => "a") assert_equal picture, trace.large_picture end def test_icon_picture - picture = File.read(Rails.root.join("test/gpx/fixtures/a_icon.gif"), :mode => "rb") + picture = Rails.root.join("test/gpx/fixtures/a_icon.gif").read(:mode => "rb") trace = create(:trace, :fixture => "a") assert_equal picture, trace.icon_picture From 0abd8ea78d8ea37f14145c973a523ef53bca84ef Mon Sep 17 00:00:00 2001 From: "translatewiki.net" Date: Mon, 12 Sep 2022 13:13:55 +0200 Subject: [PATCH 67/68] Localisation updates from https://translatewiki.net. --- config/locales/fa.yml | 110 +++++------ config/locales/he.yml | 5 +- config/locales/kk-cyrl.yml | 7 + config/locales/lb.yml | 2 +- config/locales/ne.yml | 2 +- config/locales/ru.yml | 2 - config/locales/sc.yml | 383 ++++++++++++++++++++++++++++++++++--- config/locales/sk.yml | 2 +- config/locales/zh-HK.yml | 144 ++++++++++++-- 9 files changed, 557 insertions(+), 100 deletions(-) diff --git a/config/locales/fa.yml b/config/locales/fa.yml index b9ca5e043..469517c9a 100644 --- a/config/locales/fa.yml +++ b/config/locales/fa.yml @@ -31,6 +31,7 @@ # Author: Mohammad ebz # Author: Mojtabakd # Author: Movyn +# Author: Mskf1383 # Author: Nbi # Author: Omidh # Author: Pirehelokan @@ -52,36 +53,36 @@ fa: friendly: '%e %B %Y ساعت %H:%M' helpers: file: - prompt: انتخاب فایل + prompt: انتخاب پرونده submit: diary_comment: create: ذخیره diary_entry: create: انتشار - update: روزآمدسازی + update: به‌روز رسانی issue_comment: - create: نظر دهید + create: افزودن نظر message: create: ارسال client_application: - create: ثبت نام - update: روزآمدسازی + create: نام‌نویسی + update: به‌روز رسانی doorkeeper_application: - create: ثبت‌نام - update: روزآمدسازی + create: نام‌نویسی + update: به‌روز رسانی redaction: create: ایجاد پاک‌سازی - update: ذخیره‌کردن پاک‌سازی + update: ذخیرهٔ پاک‌سازی trace: create: بارگذاری - update: ذخیره‌کردن تغییرات + update: ذخیرهٔ تغییرات user_block: create: ایجاد مسدودی - update: روزآمدسازی مسدودی + update: به‌روز رسانی مسدودی activerecord: errors: messages: - invalid_email_address: نشانی ایمیل نامعتبر به نظر می‌رسد + invalid_email_address: نشانی رایانامه نامعتبر به نظر می‌رسد email_address_not_routable: قابل مسیریابی نیست models: acl: فهرست کنترل دسترسی @@ -122,7 +123,7 @@ fa: attributes: client_application: name: نام (الزامی) - url: نشانی اینترنتی برنامه اصلی (الزامی) + url: نشانی اینترنتی برنامهٔ اصلی (الزامی) callback_url: Callback URL support_url: URL پشتیبانی allow_read_prefs: ترجیحات کاربری او را بخواند @@ -143,7 +144,7 @@ fa: doorkeeper/application: name: نام redirect_uri: URIهای تغییرمسیر - confidential: اپلیکیشن محرمانه؟ + confidential: برنامهٔ محرمانه؟ scopes: اجازه‌ها friend: user: کاربر @@ -151,13 +152,13 @@ fa: trace: user: کاربر visible: نمایان - name: نام فایل + name: نام پرونده size: اندازه latitude: عرض جغرافیایی longitude: طول جغرافیایی public: عمومی description: توضیح - gpx_file: بارگذاری فایل GPX + gpx_file: بارگذاری پروندهٔ GPX visibility: پدیداری tagstring: برچسب‌ها message: @@ -794,7 +795,7 @@ fa: village_hall: دهیاری waste_basket: سطل زباله waste_disposal: دفع زباله - waste_dump_site: سایت تخلیه زباله + waste_dump_site: پایگاه تخلیهٔ زباله watering_place: مکان آبیاری water_point: منطقه دارای آب "yes": تسهیلات @@ -1130,6 +1131,7 @@ fa: stone: سنگ strait: تنگه tree: درخت + tree_row: ردیف درخت valley: دره volcano: آتشفشان water: اب @@ -1314,7 +1316,7 @@ fa: artwork: آثار هنری attraction: جاذبه bed_and_breakfast: تخت‌خواب و صبحانه - cabin: کابین + cabin: اتاقک گردشگر camp_site: محل اردوگاه caravan_site: مکان خودرو کاروان chalet: کلبه ییلاقی @@ -1441,7 +1443,7 @@ fa: title_html: گزارش %{link} missing_params: ایجاد گزارش تازه ممکن نیست disclaimer: - intro: 'پیش از اینکه گزارش خود را برای مدیران سایت ارسال کنید، مطمئن شوید + intro: 'پیش از اینکه گزارش خود را برای مدیران وبگاه ارسال کنید، مطمئن شوید که:' not_just_mistake: قطعاً این مسئله سهوی نبوده unable_to_fix: به‌تنهایی یا با کمک نقشه‌کش‌های همکارتان نمی‌توانید مشکل را @@ -1487,10 +1489,10 @@ fa: sign_up_tooltip: ساخت حساب کاربری برای ویرایش edit: ویرایش history: تاریخچه - export: برون‌برد + export: برون‌ریزی issues: مسئله‌ها data: داده - export_data: برون‌برد داده + export_data: برون‌ریزی داده gps_traces: ردهای GPS gps_traces_tooltip: مدیریت ردهای GPS user_diaries: روزنوشت‌های کاربر @@ -1562,14 +1564,14 @@ fa: %{befriendurl} ‬' gpx_description: description_with_tags_html: |- - به‌نظر می‌رسد فایل GPX شما: + به‌نظر می‌رسد پروندهٔ GPX شما: %{trace_name} با این توصیف: %{trace_description} و برچسب‌های زیر: %{tags} description_with_no_tags_html: |- - به‌نظر می‌رسد فایل GPX شما: + به‌نظر می‌رسد پروندهٔ GPX شما: %{trace_name} با این توصیف: %{trace_description} @@ -1941,7 +1943,7 @@ fa: حق‌نشر و پروانه را ببینید.' legal_title: قانونی legal_1_html: |- - این سایت و خدمات فراوان دیگری که به آن وابسته‌اند به‌طور رسمی و به‌نمایندگی از جامعه تحت رهبری بنیاد OpenStreetMap ‏(OSMF) دایر است. استفاده از همهٔ خدماتی که تحت رهبری OSMF قرار دارد منوط به پذیرش + این وبگاه و خدمات فراوان دیگری که به آن وابسته‌اند به‌طور رسمی و به نمایندگی از جامعه، تحت رهبری بنیاد OpenStreetMap ‏(OSMF) دایر است. استفاده از همهٔ خدماتی که تحت رهبری OSMF قرار دارد منوط به پذیرش سیاست استفادهٔ قابل‌قبول، شرایط استفاده و سیاست حریم خصوصی ماست.
اگر در رابطه با پروانه، حق‌نشر یا سایر موارد قانونی سؤالی دارید لطفاً با OSMF تماس بگیرید. @@ -1981,19 +1983,13 @@ fa: مستندات ما تحت پروانهٔ Creative Commons Attribution-ShareAlike 2.0 (CC BY-SA 2.0) است. credit_title_html: چگونه از OpenStreetMap یاد کنیم - credit_1_html: |- - بایسته است که این‌گونه از ما یاد کنید: - “©مشارکت‌کنندگان OpenStreetMap”. - credit_2_1_html: همچنین باید روشن کنید که داده‌ها تحت پروانهٔ پایگاه‌دادهٔ - باز (Open Database License) قرار دارند و اگر کاشی‌های نقشهٔ ما را استفاده - کردید باید به‌روشنی بیان کنید که نقشه‌نگاری‌ها تحت پروانهٔ CC BY-SA است. - این کار را با پیونددادن به - این صفحهٔ حق‌نشر انجام دهید. به‌عنوان جایگزین، می‌توانید با نام و پیوند - مستقیماً به پروانه(ها) ارجاع بدهید (اگر OSM را در قالب داده توزیع می‌کنید - انجام این کار ضروری است). در رسانه‌هایی که درج پیوند ممکن نیست ( مثلاً کارهای - چاپی)، توصیه می‌کنیم که خوانندگان خود را به openstreetmap.org (شاید با - گسترش OpenStreetMap به این نشانی کامل)، به opendatacommons.org و در صورت - تناسب به creativecommons.org هدایت کنید. + credit_1_html: 'جایی که دارید از داده‌های اوپن‌استریت‌مپ استفاده می‌کنید، + لازم است دو کار زیر را انجام دهید:' + credit_2_1_html: |- +

    +
  • ارائهٔ اعبار به اوپن‌استریت‌مپ با نمایش اطلاعیهٔ کپی‌رایت‌مان.
    • +
  • مشخص کنید که داده‌ها تحت پروانهٔ آزاد پایگاه داده هستند.
    • +
credit_3_1_html: کاشی‌های نقشه با «سبک استاندارد» در www.openstreetmap.org کار تولیدی (Produced Work) محسوب می‌شوند که بنیاد اوپن‌استریت‌مپ با استفاده از دادهٔ اوپن‌استریت‌مپ تحت پروانهٔ پایگاه‌دادهٔ باز (ODbL) ساخته‌است. هنگام @@ -2101,10 +2097,10 @@ fa: no_iframe_support: مرورگر شما فریم‌های HTML را، که برای این ویژگی لازم است، پشتیبانی نمی‌کند. export: - title: برون‌برد - area_to_export: محدوده برای برون‌برد + title: برون‌ریزی + area_to_export: محدوده برای برون‌ریزی manually_select: به‌صورت دستی منطقهٔ دیگری انتخاب کنید - format_to_export: قالب برون‌برد + format_to_export: قالب برون‌ریزی osm_xml_data: OpenStreetMap XML Data map_image: تصویر نقشه (لایهٔ استاندارد را نشان می‌دهد) embeddable_html: HTML توکار @@ -2112,9 +2108,9 @@ fa: export_details_html: دادهٔ OpenStreetMap تحت پروانهٔ دادهٔ همگانی باز، پایگاه‌دادهٔ باز (ODbL) قرار دارد. too_large: - advice: 'اگر برون‌برد بالا انجام نشد، لطفاً یکی از منابع زیر را استفاده کنید:' - body: این محدوده برای برون‌برد در قالب OpenStreetMap XML خیلی بزرگ است. لطفاً - بزرگنمایی کنید یا منطقهٔ کوچکتری را انتخاب کنید، یا برای دریافت داده‌های + advice: 'اگر برون‌ریزی بالا انجام نشد، لطفاً یکی از منابع زیر را استفاده کنید:' + body: این محدوده برای برون‌ریزی در قالب OpenStreetMap XML خیلی بزرگ است. لطفاً + بزرگ‌نمایی کنید یا منطقهٔ کوچک‌تری را انتخاب کنید، یا برای دریافت داده‌های انبوه یکی از منابع فهرست زیر را استفاده کنید. planet: title: سیارهٔ OSM @@ -2144,7 +2140,7 @@ fa: longitude: 'طول:' output: خروجی paste_html: برای استفادهٔ توکار در وب‌سایت، HTML بچسبانید - export_button: برون‌برد + export_button: برون‌ریزی fixthemap: title: گزارش مشکل / اصلاح نقشه how_to_help: @@ -2180,7 +2176,7 @@ fa: help: url: https://help.openstreetmap.org/ title: انجمن کمک - description: در سایت پرسش‌وپاسخ OSM سؤال بپرسید یا بین پاسخ‌ها بگردید. + description: در وبگاه پرسش‌وپاسخ OSM سؤال بپرسید یا بین پاسخ‌ها بگردید. mailing_lists: title: فهرست‌های پستی description: در فهرست‌های پستی متنوعِ موضوعی یا منطقه‌ای سوال بپرسید یا دربارهٔ @@ -2354,9 +2350,9 @@ fa: help_url: https://wiki.openstreetmap.org/wiki/Fa:Upload create: upload_trace: بارگذاری رد جی‌پی‌اس - trace_uploaded: فایل GPX شما بارگذاری شده و در انتظار درج در پایگاه‌داده است. - این کار معمولاً کمتر از نیم ساعت طول می‌کشد. هنگامی که انجام شد ایمیلی برای - شما فرستاده می‌شود. + trace_uploaded: پروندهٔ GPX شما بارگذاری شده و در انتظار درج در پایگاه داده + است. این کار معمولاً کمتر از نیم ساعت طول می‌کشد. هنگامی که انجام شد رایانامه‌ای + برای شما فرستاده می‌شود. upload_failed: شوربختانه بارگذاری GPX انجام نشد. به یکی از مدیران دربارهٔ این خطا اطلاع‌رسانی شد. لطفاً دوباره تلاش کنید traces_waiting: @@ -2378,7 +2374,7 @@ fa: title: در حال دیدن رد %{name} heading: در حال دیدن رد %{name} pending: در انتظار - filename: 'نام فایل:' + filename: 'نام پرونده:' download: بارگیری uploaded: 'تاریخ بارگذاری:' points: 'نقاط:' @@ -2434,14 +2430,14 @@ fa: message: سامانهٔ بارگذاری GPX در حال حاضر در دسترس نیست offline: heading: ذخیره‌گاه GPX آفلاین است - message: ذخیره‌گاه فایل GPX و سامانهٔ بارگذاری هم‌اکنون در دسترس نیستند. + message: ذخیره‌گاه پروندهٔ GPX و سامانهٔ بارگذاری هم‌اکنون در دسترس نیستند. georss: title: ‫ردهای جی‌پی‌اس OpenStreetMap‬ description: description_with_count: one: ‫فایل GPX با %{count} نقطه از %{user}‬ other: ' ‫فایل GPX با %{count} نقطه از %{user}‬' - description_without_count: فایل GPX از %{user} + description_without_count: پروندهٔ GPX از %{user} application: permission_denied: شما اجازهٔ دسترسی به آن کنش را ندارید. require_cookies: @@ -2908,7 +2904,7 @@ fa: tooltip_disabled: کلید نقشه برای این لایه در دسترس نیست map: zoom: - in: بزرگنمایی + in: بزرگ‌نمایی out: کوچک‌نمایی locate: title: نمایش مکان من @@ -2943,13 +2939,13 @@ fa: فرانسه site: edit_tooltip: ویرایش نقشه - edit_disabled_tooltip: برای ویرایش نقشه بزرگنمایی کنید + edit_disabled_tooltip: برای ویرایش نقشه بزرگ‌نمایی کنید createnote_tooltip: افزودن یادداشت به نقشه - createnote_disabled_tooltip: برای افزودن یادداشت به نقشه بزرگنمایی کنید - map_notes_zoom_in_tooltip: برای دیدن یادداشت‌های نقشه بزرگنمایی کنید - map_data_zoom_in_tooltip: برای دیدن دادهٔ نقشه بزرگنمایی کنید + createnote_disabled_tooltip: برای افزودن یادداشت به نقشه بزرگ‌نمایی کنید + map_notes_zoom_in_tooltip: برای دیدن یادداشت‌های نقشه بزرگ‌نمایی کنید + map_data_zoom_in_tooltip: برای دیدن دادهٔ نقشه بزرگ‌نمایی کنید queryfeature_tooltip: پرس‌وجوی عارضه‌ها - queryfeature_disabled_tooltip: برای پرس‌وجوی عارضه‌ها بزرگنمایی کنید + queryfeature_disabled_tooltip: برای پرس‌وجوی عارضه‌ها بزرگ‌نمایی کنید changesets: show: comment: نظر @@ -2976,7 +2972,7 @@ fa: report_link_html: اگر این یادداشت حاوی اطلاعات حساسی است که باید حذف شود، می‌توانید %{link}. برای سایر مشکلات مربوط به این یادداشت لطفاً خودتان همراه با نوشتن نظر آن را حل کنید. - edit_help: نقشه را جابه‌جا کنید و روی مکانی که می‌خواهید ویرایش نمایید بزرگنمایی + edit_help: نقشه را جابه‌جا کنید و روی مکانی که می‌خواهید ویرایش نمایید بزرگ‌نمایی کنید. سپس اینجا کلیک کنید. directions: ascend: فراز diff --git a/config/locales/he.yml b/config/locales/he.yml index 1a3342bce..b6f84e14e 100644 --- a/config/locales/he.yml +++ b/config/locales/he.yml @@ -33,6 +33,7 @@ # Author: Zstadler # Author: יאיר מן # Author: ישראל קלר +# Author: מקף # Author: נדב ס # Author: תומר ט --- @@ -2233,8 +2234,10 @@ he: description: לשאול שאלה או לדון בדברים מעניינים ברשימות תפוצה נושאים ואזוריות רבות. forums: - title: פורומים + title: פורומים (היסטוריים) description: שאלות ודיונים לאנשים שמעדיפים ממשק בסגנון פורום. + community: + title: פורום קהילתי irc: title: IRC description: שיחה אינטראקטיבית בשפות שונות רבות ובנושאים רבים. diff --git a/config/locales/kk-cyrl.yml b/config/locales/kk-cyrl.yml index 900fb3328..7c3568b3c 100644 --- a/config/locales/kk-cyrl.yml +++ b/config/locales/kk-cyrl.yml @@ -134,6 +134,7 @@ kk-cyrl: link text: бұл не? save changes button: Өзгерістерді сақтау browse: + closed: Жабық created_html: %{time} жасалған closed_html: %{time} жабылған created_by_html: %{time} %{user} жасаған @@ -146,10 +147,16 @@ kk-cyrl: comment: Пікірлер (%{count}) osmchangexml: osmChange XML discussion: Талқылау + relation_member: + type: + node: Нүкте not_found: title: Табылмады type: node: нүкте + redacted: + type: + node: нүкте start_rjs: loading: Жүктелуде… tag_details: diff --git a/config/locales/lb.yml b/config/locales/lb.yml index 350c0c22d..dc16dfd24 100644 --- a/config/locales/lb.yml +++ b/config/locales/lb.yml @@ -2015,7 +2015,7 @@ lb: mailing_lists: title: Mailing-Lëschten forums: - title: Forumen + title: Forumen (vereelzt) irc: title: IRC welcomemat: diff --git a/config/locales/ne.yml b/config/locales/ne.yml index ce84cd733..78d761103 100644 --- a/config/locales/ne.yml +++ b/config/locales/ne.yml @@ -1199,7 +1199,7 @@ ne: revoke: title: भूमिका फिर्ता निश्चित गर्ने heading: भूमिका फिर्ता निश्चित गर्ने - are_you_sure: तपाईँ भूमिका `%{role}' , `%{name} प्रोगकर्ताबाट फिर्ता लिने कुरामा + are_you_sure: तपाईं भूमिका `%{role}' , `%{name} प्रोगकर्ताबाट फिर्ता लिने कुरामा निश्चित हुनुहुन्छ'? confirm: निश्चित गर्नुहोस् fail: भूमिका `%{role}' ,`%{name}'बाट फिर्ता लिन सकिएन । प्रोगकर्ता नाम र भूमिका diff --git a/config/locales/ru.yml b/config/locales/ru.yml index 2a4a9fff9..6a3133efd 100644 --- a/config/locales/ru.yml +++ b/config/locales/ru.yml @@ -715,7 +715,6 @@ ru: heading: Комментарии к записям в дневнике пользователя %{user} subheading_html: Комментарии к записям в дневнике, добавленные пользователем %{user} - no_comments: Никаких комментариев в дневнике post: Сообщение when: Когда comment: Комментарий @@ -3000,7 +2999,6 @@ ru: title: Заметки, созданные или прокомментированный участником %{user} heading: Заметки участника %{user} subheading_html: Заметки, созданные или прокомментированные участником %{user} - no_notes: Нет заметок id: Идентификатор creator: Автор description: Описание diff --git a/config/locales/sc.yml b/config/locales/sc.yml index e63dbfd46..d073d3b54 100644 --- a/config/locales/sc.yml +++ b/config/locales/sc.yml @@ -45,7 +45,7 @@ sc: email_address_not_routable: non si podet incarrerare models: acl: Lista de Controllu de Atzessu - changeset: Grupu de modìficas + changeset: Annantu de modìficas changeset_tag: Eticheta de su grupu de modìficas country: Istadu diary_comment: Cummentu in su diàriu @@ -274,7 +274,7 @@ sc: ant a èssere cunservados ma cuados a sa vista. retain_notes: Sas notas de sa mapa e sos cummentos a sas notas, si bi nd'at, ant a èssere cunservados ma cuados a sa vista. - retain_changeset_discussions: Sos arresonos tuos in sos grupos de modìficas, + retain_changeset_discussions: Sos arresonos tuos in sos annantos de modìficas, si bi nd'at, s'ant a cunservare. retain_email: S'indiritzu tuo de posta eletrònica s'at a cunservare. confirm_delete: Seguru ses? @@ -336,7 +336,7 @@ sc: edited_by_html: Modificadu %{time} dae %{user} closed_by_html: Serradu %{time} dae %{user} version: Versione - in_changeset: Grupu de modìficas + in_changeset: Annantu de modìficas anonymous: anònimu no_comment: (perunu cummentu) part_of: Parte de @@ -351,7 +351,7 @@ sc: view_details: Mustra Detàllios location: 'Logu:' changeset: - title: 'Grupu de modìficas: %{id}' + title: 'Annantu de modìficas: %{id}' belongs_to: Autore node: Nodos (%{count}) node_paginated: Nodos (%{x}-%{y} de %{count}) @@ -362,15 +362,15 @@ sc: comment: Cummentos (%{count}) hidden_commented_by_html: Cummentu cuadu de %{user} %{when} commented_by_html: Cummentu de %{user} %{when} - changesetxml: XML de su grupu de modìficas + changesetxml: XML de s'annantu de modìficas osmchangexml: XML in formadu osmChange feed: - title: Grupu de modìficas %{id} + title: Annantu de modìficas %{id} title_comment: Grupu de modìficas %{id} - %{comment} join_discussion: Intra pro t'aunire a s'arresonu discussion: Arresonu - still_open: Grupu de modìficas galu abertu - s'arresonu s'at a abèrrere cando - su grupu de modìficas s'at a serrare. + still_open: Annantu de modìficas galu abertu - s'arresonu s'at a abèrrere cando + s'annantu de modìficas s'at a serrare. node: title_html: 'Nodu: %{name}' history_title_html: 'Istòria de su nodu: %{name}' @@ -407,7 +407,7 @@ sc: node: nodu way: caminu relation: relata - changeset: grupu de modìficas + changeset: annantu de modìficas note: nota timeout: title: Errore de lìmite de tempus de isetu barigadu @@ -417,7 +417,7 @@ sc: node: nodu way: caminu relation: relata - changeset: grupu de modìficas + changeset: annantu de modìficas note: nota redacted: redaction: Revisione %{id} @@ -474,7 +474,7 @@ sc: changeset: anonymous: Anònimu no_edits: (peruna modìfica) - view_changeset_details: Pòmpia sos detàllios de su grupu de modìficas + view_changeset_details: Pòmpia sos detàllios de s'annantu de modìficas changesets: id: ID saved_at: Sarvadu su @@ -482,29 +482,29 @@ sc: comment: Cummentu area: Àrea index: - title: Trumas de modìficas + title: Annantos de modìficas title_user: Trumas de modìficas de %{user} - title_friend: Trumas de modìficas de sos amigus meus + title_friend: Annantos de modìficas de sos amigos meos title_nearby: Trumas de modìficas de utentes acanta - empty: Perunu grupu de modìficas agatadu. + empty: Perunu annantu de modìficas agatadu. empty_area: Perunu grupu de modìficas in custa àrea. - empty_user: Perunu grupu de modìficas de custu utente. + empty_user: Perunu annantu de modìficas de custu utente. no_more: Perunu àteru grupu de modìficas agatadu. - no_more_area: Perunu àteru grupu de modìficas in custa àrea. + no_more_area: Perunu àteru annantu de modìficas in custa àrea. no_more_user: Perunu àteru grupu de modìficas de custu utente. load_more: Càrriga·nde prus timeout: - sorry: S'elencu de grupos de modìficas chi as pedidu at bisongiadu de tropu + sorry: S'elencu de annantos de modìficas chi as pedidu at bisongiadu de tropu tempus pro lu recuperare. changeset_comments: comment: - comment: 'Cummentu nou a su grupu de modìficas #%{changeset_id} de %{author}' + comment: 'Cummentu nou a s''annantu de modìficas #%{changeset_id} de %{author}' commented_at_by_html: Atualizadu %{when} dae %{user} comments: - comment: 'Cummentu nou a su grupu de modìficas #%{changeset_id} de %{author}' + comment: 'Cummentu nou a s''annantu de modìficas #%{changeset_id} de %{author}' index: title_all: Arresonu subra su grupu de modìficas de OpenStreetMap - title_particular: 'Arresonu de su grupu de modìficas de OpenStreetMap #%{changeset_id}' + title_particular: 'Arresonu de s''annantu de modìficas de OpenStreetMap #%{changeset_id}' timeout: sorry: S'elencu de grupos de modìficas chi as pedidu at bisongiadu de tropu tempus pro lu recuperare. @@ -526,9 +526,9 @@ sc: nearby users: Àteros utentes a curtzu no nearby users: Non b'at perunu àteru utente chi ammitat de mapare a curtzu a inoghe. - friends_changesets: grupos de modìficas de sos amigos + friends_changesets: annantos de modìficas de sos amigos friends_diaries: intradas de diàriu de sos amigos - nearby_changesets: grupos de modìficas de utentes a curtzu + nearby_changesets: annantos de modìficas de utentes a curtzu nearby_diaries: intradas de diàriu de utentes a curtzu diary_entries: new: @@ -1426,11 +1426,11 @@ sc: user_not_found: S'utente no esistit issues_not_found: Perunu problema de custa casta agatadu status: Istadu - reports: Raportos + reports: Informes last_updated: Ùrtimu agiornamentu last_updated_time_html: %{time} last_updated_time_user_html: %{time} dae %{user} - link_to_reports: Abbàida su raportu + link_to_reports: Abbàida sos informes reports_count: one: 1 sinnalatzione other: '%{count} sinnalatziones' @@ -1497,19 +1497,33 @@ sc: other_label: Àteru diary_comment: spam_label: Custu cummentu a su diàriu est/cuntenet arga + offensive_label: Custu cummentu a su diàriu est ofensivu/truzosu + threat_label: Custu cummentu a su diàriu cuntenet una minetza other_label: Àteru user: + spam_label: Custu profilu de utente est/cuntenet arga + offensive_label: Custu profilu de utente est ofensivu/truzosu + threat_label: Custu profilu de utente cuntenet una minetza + vandal_label: Custu utente est unu vàndalu other_label: Àteru note: spam_label: Custa nota est àliga + personal_label: Custa nota cuntenet datos personales + abusive_label: Custa nota est ingiuliosa other_label: Àteru + create: + successful_report: Sa sinnalatzione tua est istada registrada + provide_details: Fruni sos detàllios pedidos layouts: logo: alt_text: Logotipu de OpenStreetMap + home: Bae a sa positzione de incumintzu logout: Essi log_in: Intra + log_in_tooltip: Intra cun unu contu chi esistit sign_up: Iscrie·ti start_mapping: Cumintzat a mapare + sign_up_tooltip: Crea unu contu pro modificare edit: Modìfica history: Cronologia export: Esporta @@ -1517,29 +1531,61 @@ sc: data: Datos export_data: Esporta sos datos gps_traces: Trassas GPS + gps_traces_tooltip: Amministra sas rastas GPS + user_diaries: Diàrios de sos utentes + user_diaries_tooltip: Pòmpia sos diàrios de sos utentes + edit_with: Modìfica cun %{editor} + tag_line: Sa mapa wiki lìbera de su mundu intro_header: Bene benius in OpenStreetMap! intro_text: OpenStreetMap est una mapa de su mundu, creadu dae persones comente tue e de impreu lìberu suta una litzèntzia aberta. + intro_2_create_account: Crea unu contu de utente + hosting_partners_html: S'allògiu est a càrrigu de %{ucl}, %{fastly}, %{bytemark} + e de àteros %{partners}. + partners_ucl: UCL + partners_fastly: Fastly + partners_bytemark: Bytemark Hosting + partners_partners: sòtzios tou: Conditziones de impreu + osm_offline: In custu momentu sa base de datos de OpenStreetMap est foras de lìnia, + ca sunt faghende traballos essentziales de mantenimentu. + osm_read_only: In custu momentu sa base de datos de OpenStreetMap est in modalidade + de leghidura ebbia, ca sunt faghende traballos essentziales de mantenimentu. + donate: Agiuda a OpenStreetMap %{link} a su Fundu de Modernizatzione de s'Hardware. help: Agiudu about: Informatziones copyright: Deretu de autore community: Comunidade + community_blogs: Blogs de sa comunidade + community_blogs_title: Blogs de sos membros de sa comunidade de OpenStreetMap foundation: Fundatzione foundation_title: Sa Fundatzione OpenStreetMap + make_a_donation: + title: Agiuda a OpenStreetMap cun una donatzione econòmica + text: Faghe una donatzione learn_more: Leghe àteru more: Àteru user_mailer: diary_comment_notification: + subject: '[OpenStreetMap] %{user} at cummentadu un''intrada de su diàriu' hi: Salude %{to_user}, header: '%{from_user} at cummentadu s''intrada cuotidiana de OpenStreetMap cun su tema %{subject}:' + header_html: '%{from_user} at cummentadu s''intrada de su diàriu de OpenStreetMap + cun s''ogetu %{subject}:' footer: Podes lèghere su cummentu fintzas in %{readurl} e cummentare in %{commenturl} o rispònnere in %{replyurl} + footer_html: Podes lèghere su cummentu tuo fintzas in %{readurl} e cummentare + in %{commenturl} o mandare unu messàgiu a s'autore in %{replyurl} message_notification: + subject: '[OpenStreetMap] %{message_title}' hi: Salude %{to_user}, header: '%{from_user} at imbiadu unu messàgiu a traessu de OpenStreetMap cun su tema %{subject}:' + header_html: '%{from_user} t''at imbiadu unu messàgiu pro mèdiu OpenStreetMap + cun s''ogetu %{subject}:' + footer: Podes lèghere su messàgiu fintzas in %{readurl} e podes imbiare unu + messàgiu a s'autore in %{replyurl} footer_html: Podes lèghere su messàgiu fintzas in %{readurl} e podes rispònnere in %{replyurl} friendship_notification: @@ -1547,10 +1593,20 @@ sc: subject: '[OpenStreetMap] %{user} t''at annànghidu a sa lista de amigos' had_added_you: '%{user} t''at annantu comente a amigu in OpenStreetMap.' see_their_profile: Podes bìdere su profilu suo in %{userurl}. + see_their_profile_html: Podes bìdere su profilu suo in %{userurl}. befriend_them: Lu/a podes fintzas annànghere comente a amigu/a in %{befriendurl}. + befriend_them_html: Lu podes fintzas annànghere comente amigu in %{befriendurl}. + gpx_description: + description_with_tags_html: 'Paret s''archìviu GPX tuo %{trace_name} cun sa + descritzione %{trace_description} e sas etichetas chi sighint: %{tags}' + description_with_no_tags_html: Paret s'archìviu GPX tuo %{trace_name} cun sa + descritzione %{trace_description} e chene etichetas gpx_failure: hi: Salude %{to_user}, failed_to_import: 'non si podet importare. Sa faddina est istada:' + more_info_html: Podes agatare àteras informatzione subra sos fallimentos de + importatzione de sos GPX e de comente los evitare in %{url}. + import_failures_url: https://wiki.openstreetmap.org/wiki/GPX_Import_Failures subject: '[OpenStreetMap] Faddina de importatzione de GPX' gpx_success: hi: Salude %{to_user}, @@ -1565,28 +1621,139 @@ sc: confirm: 'Primu de totu, depimus cunfirmare chi custa petitzione de creatzione de contu est bostra; si l''est, incarcades subra su ligàmene imbeniente pro la cunfirmare:' + welcome: A pustis de àere cunfirmadu su contu tuo t'amus a frunire unas cantas + informatziones additzionales pro ti permìtere de incumintzare. email_confirm: subject: '[OpenStreetMap] Cunfirma s''indiritzu de posta' greeting: Salude, hopefully_you: Calicunu (isperamus tue matessi) cheret cambiare s'indiritzu eletrònicu tuo dae %{server_url} cun %{new_address}. + click_the_link: Si ses istadu tue incarca in su ligàmene inoghe in suta pro + cunfirmare sa modìfica. lost_password: + subject: '[OpenStreetMap] Dimanda de riprìstinu de sa crae de intrada' greeting: Salude, + hopefully_you: Calicunu (forsis tue) at pedidu de ripristinare sa crae de intrada + de su contu de openstreetmap.org assotziadu a custu indiritzu de posta eletrònica. + click_the_link: Si ses istadu tue incarca in su ligàmene inoghe in suta pro + ripristinare sa crae de intrada tua. note_comment_notification: + anonymous: Un'utente anònimu greeting: Salude, + commented: + subject_own: '[OpenStreetMap] %{commenter} at cummentadu una de sas notas + tuas' + subject_other: '[OpenStreetMap] %{commenter} at cummentadu una nota chi t''interessat' + your_note: '%{commenter} at lassadu unu cummentu a una de sas notas tuas in + sa mapa a curtzu a %{place}.' + your_note_html: '%{commenter} at lassadu unu cummentu a una de sas notas tuas + in sa mapa a curtzu a %{place}.' + commented_note: '%{commenter} at lassadu unu cummentu a una de sas notas in + sa mapa chi as cummentadu. Sa nota est a curtzu a %{place}.' + commented_note_html: '%{commenter} at lassadu unu cummentu a una de sas notas + in sa mapa chi as cummentadu. Sa nota est a curtzu a %{place}.' + closed: + subject_own: '[OpenStreetMap] %{commenter} at risòlvidu una de sas notas tuas' + subject_other: '[OpenStreetMap] %{commenter} at risòlvidu una nota chi t''interessat' + your_note: '%{commenter} at risòlvidu una de sas notas tuas in sa mapa a curtzu + a %{place}.' + your_note_html: '%{commenter} at risòlvidu una de sas notas tuas in sa mapa + a curtzu a %{place}.' + commented_note: '%{commenter} at risòlvidu una de sas notas in sa mapa chi + aias cummentadu. Sa nota est a curtzu a %{place}.' + commented_note_html: '%{commenter} at risòlvidu una de sas notas in sa mapa + chi aias cummentadu. Sa nota est a curtzu a %{place}.' + reopened: + subject_own: '[OpenStreetMap] %{commenter} at torradu a ativare una de sas + notas tuas' + subject_other: '[OpenStreetMap] %{commenter} at torradu a ativare una nota + chi t''interessat' + your_note: '[OpenStreetMap] %{commenter} at torradu a ativare una de sas notas + de sa mapa tuas a curtzu a %{place}.' + your_note_html: '[OpenStreetMap] %{commenter} at torradu a ativare una de + sas notas de sa mapa tuas a curtzu a %{place}.' + commented_note: '[OpenStreetMap] %{commenter} at torradu a ativare una de + sas notas de sa mapa chi as cummentadu. Sa nota est a curtzu a %{place}.' + commented_note_html: '[OpenStreetMap] %{commenter} at torradu a ativare una + de sas notas de sa mapa chi as cummentadu. Sa nota est a curtzu a %{place}.' + details: Podes agatare detàllios in prus subra de sa nota in %{url}. + details_html: Podes agatare detàllios in prus subra de sa nota in %{url}. changeset_comment_notification: hi: Salude %{to_user}, greeting: Salude, + commented: + subject_own: '[OpenStreetMap] %{commenter} at cummentadu unu de sos annantos + de modìficas tuos' + subject_other: '[OpenStreetMap] %{commenter} at cummentadu un''annantu de + modìficas chi t''interessat' + your_changeset: '%{commenter} at lassadu unu cummentu a sas %{time} a unu + de sos annantos de modìficas tuos' + your_changeset_html: '%{commenter} at lassadu unu cummentu a sas %{time} a + unu de sos annantos de modìficas tuos' + commented_changeset: '%{commenter} at lassadu unu cummentu a sas %{time} a + unu de sos annantos de modìficas chi ses sighende creadu dae %{changeset_author}' + commented_changeset_html: '%{commenter} at lassadu unu cummentu a sas %{time} + a unu de sos annantos de modìficas chi ses sighende creadu dae %{changeset_author}' + partial_changeset_with_comment: cun su cummentu '%{changeset_comment}' + partial_changeset_with_comment_html: cun su cummentu '%{changeset_comment}' + partial_changeset_without_comment: chene cummentos + details: Podes agatare detàllios in prus subra de s'annantu de modìficas in + %{url}. + details_html: Podes agatare detàllios in prus subra de s'annantu de modìficas + in %{url}. + unsubscribe: Pro annullare s'iscritzione a sas atualizatzione de custu annantu + de modìficas bìsita %{url} e incarca in "Annulla s'iscritzione". + unsubscribe_html: Pro annullare s'iscritzione a sas atualizatzione de custu + annantu de modìficas bìsita %{url} e incarca in "Annulla s'iscritzione". confirmations: confirm: + heading: Controlla sa posta eletrònica tua! + introduction_1: T'amus imbiadu una lìtera eletrònica de cunfirma. + introduction_2: Cunfirma su contu tuo incarchende in su ligàmene in sa lìtera + eletrònica chi t'amus imbiadu e as a pòdere incumintzare a modificare sa mapa. + press confirm button: Incarca su butone de cunfirma inoghe in suta pro ativare + su contu tuo. button: Cunfirma + success: As cunfirmadu su contu tuo, gràtzias pro t'èssere registradu! + already active: Custu contu est istadu giai cunfirmadu. + unknown token: Custu còdighe de cunfirma est iscadidu o no esistet. + reconfirm_html: Si tenes bisòngiu chi ti torremus a imbiare sa lìtera de cunfirma, + incarca inoghe. + confirm_resend: + failure: Utente %{name} no agatadu. confirm_email: + heading: Cunfirma una modìfica de indiritzu de posta eletrònica + press confirm button: Incarca su butone de cunfirma inoghe in suta pro cunfirmare + s'indiritzu de posta nou tuo. button: Cunfirma + success: As cunfirmadu su cambiamentu de s'indiritzu de posta eletrònica tuo! + failure: Un'indiritzu de posta eletrònica est istadu giai cunfirmadu cun custu + getone de autenticatzione. + unknown_token: Custu còdighe de cunfirma est iscadidu o no esistet. + resend_success_flash: + confirmation_sent: T'amus imbiadu una nota de cunfirma a %{email}, e cando as + a cunfirmare su contu tuo as a pòdere incumintzare a mapare. + whitelist: Si impreas unu sistema anti-arga chi imbiat rechestas de cunfirma + tando assegura·ti de annànghere %{sender} a sa lista bianca tua, dae chi no + amus a pòdere rispòndere a peruna rechesta de cunfirma. messages: inbox: + title: Posta in intrada + my_inbox: Posta in intrada mea + my_outbox: Posta in essida mea + messages: Tenes %{new_messages} e %{old_messages} + new_messages: + one: '%{count} messàgiu nou' + other: '%{count} messàgios noos' + old_messages: + one: '%{count} messàgiu betzu' + other: '%{count} messàgios betzos' from: Dae subject: 'Sugetu:' date: Data + no_messages_yet_html: Non tenes galu messàgios. Proite non chircas a calicuna + de sas %{people_mapping_nearby_link}? + people_mapping_nearby: persones chi mapant a curtzu a tie message_summary: unread_button: Sinna comente no lèghidu read_button: Sinna comente lèghidu @@ -1597,13 +1764,34 @@ sc: send_message_to_html: Imbia unu messàgiu nou a %{name} subject: 'Sugetu:' body: Corpus + back_to_inbox: Torra a sa posta in intrada create: message_sent: Messàgiu imbiadu + limit_exceeded: In custos ùrtimos tempos as imbiadu messàgios medas. Iseta unu + pagu in antis de proare a nd'imbiare àteros. + no_such_message: + title: Non b'at perunu messàgiu gasi + heading: Non b'at perunu messàgiu gasi + body: Non b'at perunu messàgiu cun custu id. outbox: + title: Posta in essida + my_inbox: Posta in intrada mea + my_outbox: Posta in essida mea + messages: + one: Tenes %{count} messàgiu imbiadu + other: Tenes %{count} messàgios imbiados to: Cara a subject: 'Sugetu:' date: Data + no_sent_messages_html: Non tenes galu messàgios imbiados. Proite non chircas + a calicuna de sas %{people_mapping_nearby_link}? + people_mapping_nearby: persones chi mapant a curtzu a tie + reply: + wrong_user: Ti ses autenticadu comente `%{user}', ma su messàgiu a su cale cheres + rispòndere no est istadu imbiadu a cussu utente. Faghe s'atzessu comente s'utente + curretu pro li torrare risposta. show: + title: Leghe su messàgiu from: Dae subject: 'Sugetu:' date: Data @@ -1612,16 +1800,161 @@ sc: destroy_button: Cantzella back: In palas to: Cara a + wrong_user: Ti ses autenticadu comente `%{user}', ma su messàgiu chi as pedidu + de pòdere lèghere no est istadu imbiadu a cussu utente. Faghe s'atzessu comente + s'utente curretu pro lu lèghere. sent_message_summary: destroy_button: Cantzella + mark: + as_read: Messàgiu marcadu comente lèghidu + as_unread: Messàgiu marcadu comente non lèghidu destroy: destroyed: Messàgiu iscantzelladu + passwords: + lost_password: + title: Crae de intrada pèrdida + heading: Ais ismentigadu sa crae de intrada? + email address: 'Indiritzu de posta eletrònica:' + new password button: Riprìstina sa crae de intrada + help_text: Inserta s'indiritzu de posta chi as impreadu pro ti registrare, l'amus + a imbiare unu ligàmene chi as a pòdere impreare pro ripristinare sa crae de + intrada tua. + notice email on way: Nos dispraghet chi l'apas pèrdida :-( ma t'amus imbiadu + unu messàgiu de posta eletrònica pro chi la potzas ripristinare. + notice email cannot find: A dolu mannu non semus resèssidos a agatare custu + indiritzu de posta eletrònica. + reset_password: + title: Riprìstina sa crae de intrada + heading: Riprìstina sa crae de intrada pro %{user} + reset: Riprìstina sa crae de intrada + flash changed: Sa crae de intrada tua est istada mudada. + flash token bad: No amus agatadu custu getone, proa a verificare s'URL. + preferences: + show: + title: Preferèntzias meas + preferred_editor: Editore preferidu + preferred_languages: Limbas preferidas + edit_preferences: Modìfica sas preferèntzias + edit: + title: Modìfica sas preferèntzias + save: Atualiza sas preferèntzias + cancel: Annulla + update: + failure: No at fatu a atualizare sas preferèntzias. + update_success_flash: + message: Preferèntzias atualizadas. + profiles: + edit: + title: Modìfica su profilu + save: Atualiza su profilu + cancel: Annulla + image: Immàgine + gravatar: + gravatar: Imprea Gravatar + link: https://wiki.openstreetmap.org/wiki/Gravatar + what_is_gravatar: Ite est Gravatar? + disabled: Gravatar est istadu inabilitadu. + enabled: Sa visualizatzione de su Gravatar tuo est istada abilitada. + new image: Annanghe un'immàgine + keep image: Mantene s'immàgine atuale + delete image: Boga s'immàgine atuale + replace image: Remplasa s'immàgine atuale + image size hint: (sas immàgines cuadradas de a su nessi 100x100 funtzionant + mègius) + home location: Positzione de incumintzu + no home location: No as insertadu sa positzione de incumintzu tua. + update home location on click: Atualizare sa positzione de incumintzu incarchende + in sa mapa? + update: + success: Profilu atualizadu. + failure: Non s'est pòdidu atualizare su profilu. sessions: new: title: Intra heading: Intra + email or username: 'Indiritzu de posta o nùmene de utente:' + password: 'Crae:' + openid_html: '%{logo} OpenID:' + remember: Ammenta·ti de mene + lost password link: Ais pèrdidu sa crae de intrada tua? login_button: Intra + register now: Registra·ti como + with username: 'Tenes giai unu contu de OpenStreetMap? Intra cun su nùmene utente + tuo e sa crae de intrada tua:' + with external: 'In alternativa, intra impreende unu servìtziu esternu:' + new to osm: Ses nou in OpenStreetMap? + to make changes: Pro fàghere modìficas a sos datos de OpenStreetMap, depes tènnere + unu contu. + create account minute: Crea unu contu. Bi bolet petzi unu minutu. + no account: Non tenes unu contu? + account not active: Su contu tuo no est galu ativu.
Imprea su ligàmene + in sa lìtera eletrònica de cunfirma pro ativare su contu tuo, o pedi + una lìtera de cunfirma noa. + account is suspended: Su contu tuo est istadu suspèndidu pro neghe de atividades + suspetas.
Cuntata s'assistèntzia si nde cheres + chistionare. + auth failure: Non podes intrare cun custos detàllios. + openid_logo_alt: Intra cun un'OpenID + auth_providers: + openid: + title: Intra cun OpenID + alt: Intra cun un'URL de OpenID + google: + title: Intra cun Google + alt: Intra cun un'OpenID de Google + facebook: + title: Intra cun Facebook + alt: Intra cun unu contu de Facebook + windowslive: + title: Intra cun Windows Live + alt: Intra cun unu contu de Windows Live + github: + title: Intra cun GitHub + alt: Intra cun unu contu de GitHub + wikipedia: + title: Intra cun Wikipedia + alt: Intra cun unu contu de Wikipedia + wordpress: + title: Intra cun Wordpress + alt: Intra cun un'OpenID de Wordpress + aol: + title: Intra cun AOL + alt: Intra cun un'OpenID de AOL + destroy: + title: Essi + heading: Essi dae OpenStreetMap + logout_button: Essi + shared: + markdown_help: + title_html: Analizadu cun kramdown + headings: Intestatziones + heading: Intestatzione + subheading: Sutatìtulu + unordered: Lista no ordinada + ordered: Lista ordinada + first: Primu elementu + second: Segundu elementu + link: Ligàmene + text: Testu + image: Immàgine + alt: Testu alternativu + url: URL + richtext_field: + edit: Modìfica + preview: Antiprima site: + about: + next: Imbeniente + copyright_html: ©Contribuidores
de OpenStreetMap + used_by_html: '%{name} frunit datos cartogràficos a mìgias de sitos web, aplicatziones + pro telefoneddos e dispositivos fìsicos' + lede_text: OpenStreetMap est fraigadu dae una comunidade de mapadores chi frunint + e agiornant datos subra de caminos, camineras, cafeterias, istatziones de + ferrovia e meda de prus in totu su mundu. + local_knowledge_title: Connoschèntzia locale + local_knowledge_html: |- + OpenStreetMap daet valore a sa connoschèntzia locale. Sos collaboradores impreant immàgines aèreas, dispositivos GPS e mapas clàssicas de su terrinu pro verificare chi OSM + siat pretzisas e atualizadas. index: createnote: Annanghe una nota export: @@ -1789,7 +2122,7 @@ sc: show: comment: Cummentu subscribe: Sutaiscrie·ti - unsubscribe: Annulla sa sutiscritzione + unsubscribe: Annulla s'iscritzione hide_comment: cua unhide_comment: ammustra notes: diff --git a/config/locales/sk.yml b/config/locales/sk.yml index 2931bceb8..2b86107c1 100644 --- a/config/locales/sk.yml +++ b/config/locales/sk.yml @@ -496,7 +496,7 @@ sk: reopened_by_html: Opätovne aktivoval používateľ %{user} %{when} reopened_by_anonymous_html: Opätovne aktivoval anonymný používateľ %{when} hidden_by_html: Skryl %{user} %{when} - report: Nahlásiť túto poznámku + report: nahlásiť túto poznámku query: title: Prieskum prvkov introduction: Pre nájdenie okolitých prvkov kliknite na mapu. diff --git a/config/locales/zh-HK.yml b/config/locales/zh-HK.yml index b0f9a3109..cc9335fea 100644 --- a/config/locales/zh-HK.yml +++ b/config/locales/zh-HK.yml @@ -10,7 +10,7 @@ zh-HK: time: formats: - friendly: '%Y年%m月%e日 %H:%M' + friendly: '%Y年%-m月%-d日%H:%M' helpers: file: prompt: 選擇檔案 @@ -49,7 +49,7 @@ zh-HK: changeset: 變更集 changeset_tag: 變更集標籤 country: 國家 - diary_comment: 日記註解 + diary_comment: 日記評論 diary_entry: 日記項目 friend: 朋友 issue: 問題 @@ -105,11 +105,13 @@ zh-HK: name: 名稱 redirect_uri: 重新導向 URI confidential: 保密的應用程式？ + scopes: 權限 friend: user: 用戶 friend: 朋友 trace: user: 用戶 + visible: 能見度 name: 檔案名稱 size: 大小 latitude: 緯度 @@ -124,19 +126,39 @@ zh-HK: title: 主題 body: 內文 recipient: 收件者 + redaction: + title: 標題 + description: 描述 report: + category: 選擇您舉報的原因 details: 請就這問題提供多點詳情（必需）。 user: + auth_provider: 認證提供者 + auth_uid: 認證UID email: 電郵 + email_confirmation: 電郵確認 + new_email: 新電郵地址 active: 活躍 display_name: 顯示名稱 - description: 描述 - languages: 語言 + description: 個人檔案描述 + home_lat: 緯度 + home_lon: 經度 + languages: 偏好的語言 + preferred_editor: 偏好的編輯軟件 pass_crypt: 密碼 pass_crypt_confirmation: 確認密碼 help: + doorkeeper/application: + redirect_uri: 每個URI位址各開一行輸入 trace: tagstring: 以逗號分隔 + user_block: + reason: 使用者被封鎖的理由。請盡可能保持平靜和理性的態度，寫下有關事件狀況你所能夠提供最詳盡的細節，並考慮到這訊息會公開給公眾讀取。謹記並非所有使用者都能夠明白社群的專用術語，所以請嘗試使用通俗的表達方式。 + needs_view: 是否需要使用者先登入後才讓此封鎖得以清除？ + user: + email_confirmation: 閣下的電郵地址並不會被公開展示，請參閱我們的私隱政策頁面以獲取進一步的資訊。 + new_email: （永遠不會公開展示） datetime: distance_in_words_ago: about_x_hours: @@ -183,7 +205,7 @@ zh-HK: description: iD (瀏覽器內的編輯器) remote: name: 遙遠控制 - description: 遙遠控制 (JOSM 或 Merkaartor) + description: 遙遠控制 (JOSM、Potlatch、Merkaartor) auth: providers: none: 無 @@ -204,11 +226,64 @@ zh-HK: closed_at_by_html: 已由%{user}於%{when}解決 reopened_at_html: 於%{when}重新開啟 reopened_at_by_html: 由%{user}於%{when}重新開啟 + rss: + title: OpenStreetMap註記 entry: comment: 評論 + account: + deletions: + show: + title: 刪除我的帳號 + warning: 警告！帳號刪除程序不可逆轉，無法復原。 + delete_account: 刪除帳號 + delete_introduction: 您可以用以下按鈕來刪除閣下的OpenStreetMap帳號。請注意這些細節： + delete_profile: 您的個人檔案資訊，包含頭像圖片、描述、住家位置，將會被刪除。 + delete_display_name: 您的顯示名稱將會被刪除，並且可以被其他帳號重新使用。 + retain_caveats: 但，在刪除帳號後，OpenStreetMap內依然會保留一些關於閣下的資料，包括： + retain_edits: 如果您曾經編輯過地圖數據庫的話，這些編輯將會被保留。 + retain_traces: 您曾經上載過軌跡的話，如有的話也會被保留。 + retain_diary_entries: 如果您有日記和日記評論的話，會被保留但會隱藏起來。 + retain_notes: 您如曾在地圖上的註記和對註記所發表的評論會被保留，但會隱藏起來。 + retain_changeset_discussions: 您的變更集的討論，如有的話將會被保留。 + retain_email: 您的電郵地址會繼續保留下來。 + confirm_delete: 您確定嗎？ + cancel: 取消 accounts: edit: + title: 編輯帳號 my settings: 我的設定 + current email address: 現在的電郵地址 + external auth: 外部認證 + openid: + link: https://wiki.openstreetmap.org/wiki/OpenID + link text: 這是什麼？ + public editing: + heading: 公開編輯 + enabled: 已啟用。並非匿名而可以編輯資料。 + enabled link: https://wiki.openstreetmap.org/wiki/Anonymous_edits + enabled link text: 這是什麼？ + disabled: 已停用而不能編輯資料，所有以往的編輯為匿名。 + disabled link text: 為什麼我不能編輯？ + public editing note: + heading: 公開編輯 + html: 目前您的編輯是匿名的，人們不能發送訊息給您或看到您的位置。要顯示你的編輯以及讓別人能透過網站與您聯繫，請點選下面的按鈕。自從0.6 + API更新，只有公開使用者可以編輯地圖資料。（了解原因）。
  • 成為公開使用者不會令您的電郵地址被透露。
  • 這個動作不能逆轉，所有新的使用者現在都預設為公開的。
+ contributor terms: + heading: 貢獻者條款 + agreed: 您已同意新的貢獻者條款。 + not yet agreed: 您尚未同意新的貢獻者條款。 + review link text: 請在有空時按此連結查閱並接受新的貢獻者條款。 + agreed_with_pd: 您亦同意將您的編輯放到公共領域。 + link: https://wiki.osmfoundation.org/wiki/Licence/Contributor_Terms + link text: 這是什麼？ + save changes button: 儲存變更 + make edits public button: 將我所有的編輯設為公開 + delete_account: 刪除帳號…… + update: + success_confirm_needed: 使用者資訊更新成功。請檢查電郵，以確認新電郵地址。 + success: 使用者資訊更新成功。 + destroy: + success: 帳號已刪除。 browse: version: 版本 in_changeset: 變更集 @@ -222,6 +297,8 @@ zh-HK: changeset: title: 變更集：%{id} belongs_to: 製作者 + changesetxml: 變更集XML + osmchangexml: osmChange格式XML feed: title: 變更集 %{id} relation_member: @@ -234,17 +311,25 @@ zh-HK: node: 節點 way: 路徑 changeset: 變更集 + note: 註記 timeout: type: node: 節點 way: 路徑 changeset: 變更集 + note: 註記 redacted: type: node: 節點 way: 路徑 start_rjs: feature_warning: 正在載入%{num_features}項地圖特徵，可能會拖慢您的瀏覽器或導致瀏覽器未能回應。您是否肯定想要顯示這些資料？ + note: + title: 註記：%{id} + new_note: 新增註記 + open_title: 未解決的註記：#%{note_name} + closed_title: 已解決的註記：#%{note_name} + report: 舉報此註記 query: title: 查詢地圖特徴 introduction: 點擊地圖以尋找附近的地圖特徵。 @@ -277,7 +362,7 @@ zh-HK: no nearby users: 附近還沒有已加入製圖的用戶。 diary_entries: form: - location: 位置： + location: 位置 use_map_link: 使用地圖 index: title: 用戶日記 @@ -318,6 +403,9 @@ zh-HK: remove_friend: heading: 刪除好友%{user}？ geocoder: + search: + title: + ca_postcode_html: 來自 Geocoder.CA 的結果 search_osm_nominatim: prefix: aerialway: @@ -334,8 +422,8 @@ zh-HK: aeroway: aerodrome: 機場 airstrip: 飛機跑道 - apron: 停機坪 - gate: 閘口 + apron: 機場停機坪 + gate: 機場閘口 hangar: 機庫 helipad: 直升機坪 holding_position: 等待位置 @@ -344,7 +432,7 @@ zh-HK: runway: 跑道 taxilane: 滑行道 taxiway: 滑行道 - terminal: 客運大樓 + terminal: 機場客運大樓 windsock: 布製風標 amenity: animal_boarding: 動物寄養 @@ -749,7 +837,7 @@ zh-HK: mineshaft: 礦井 monitoring_station: 監控站台 petroleum_well: 油井 - pier: 碼頭 + pier: 棧橋/碼頭（Pier） pipeline: 管線 pumping_station: 泵站 reservoir_covered: 有蓋蓄水槽 @@ -812,7 +900,14 @@ zh-HK: reef: 礁 ridge: 山脊 rock: 獨立岩 + sand: 沙地 + stone: 岩石 + strait: 海峽 + tree: 樹木 + valley: 山谷 volcano: 火山 + water: 水 + wetland: 濕地 "yes": 自然特徵 office: travel_agent: 旅行社 @@ -881,7 +976,7 @@ zh-HK: fishing: 釣魚用品店 florist: 花店 hairdresser: 理髮店 - hifi: Hi-Fi + hifi: Hi-Fi店 houseware: 生活用品店 ice_cream: 冰淇淋店 interior_decoration: 室內裝潢 @@ -893,15 +988,19 @@ zh-HK: mobile_phone: 手機店 optician: 視光師 organic: 有機食品店 + outdoor: 戶外用品店 pet: 寵物店 seafood: 海鮮店 second_hand: 二手商店 shoes: 鞋店 + sports: 運動用品店 stationery: 文具店 supermarket: 超級市場 + tattoo: 紋身店 tobacco: 煙草店 toys: 玩具店 travel_agency: 旅行社 + vacant: 空置店舖 "yes": 商店 tourism: museum: 博物館 @@ -940,12 +1039,17 @@ zh-HK: resolve: 解決 ignore: 忽略 reopen: 重新開啟 + helper: + reportable_title: + note: 註記#%{note_id} reports: new: categories: user: spam_label: 此用戶個人檔案為/含有垃圾信息 threat_label: 此用戶個人檔案含有威脅或恐嚇內容 + note: + spam_label: 此註記是垃圾訊息 create: provide_details: 請提供所需要的詳情 layouts: @@ -1015,6 +1119,8 @@ zh-HK: destroy: title: 登出 site: + index: + createnote: 添加註記 edit: not_public: 您尚未把編輯公開。 not_public_description_html: 您不這樣設定的話就將再無法編輯地圖。您可以在%{user_page}將閣下的編輯設為公開。 @@ -1107,6 +1213,9 @@ zh-HK: oauth: authorize: allow_read_prefs: 讀取您的用戶設定。 + allow_write_notes: 修改註記。 + scopes: + write_notes: 修改註記 oauth_clients: show: requests: 向用戶要求下列權限： @@ -1119,7 +1228,7 @@ zh-HK: new: title: 註冊 no_auto_account_create: 很不幸地我們目前無法為您自動建立帳號。 - contact_support_html: 請聯絡網站管理員以安排建立帳號，我們會儘快嘗試並處理相關要求。 + contact_support_html: 請聯絡支援人員以安排建立帳號，我們會儘快嘗試並處理相關要求。 about: header: 自由而可編輯 email address: 電郵地址： @@ -1148,7 +1257,9 @@ zh-HK: title: 沒有這用戶 body: 抱歉，沒有名為%{user}的用戶。請檢查您的拼寫，或者您可能按到了錯誤的連結。 show: + my notes: 我的註記 my settings: 我的設定 + notes: 地圖註記 user location: 用戶位置 report: 舉報此用戶 index: @@ -1156,6 +1267,11 @@ zh-HK: heading: 用戶 auth_association: option_2: 如果您已經有帳號，您可以用該帳號的用戶名稱和密碼登入，然後到用戶設定中把您的ID和帳號關聯到一起。 + notes: + index: + title: 由%{user}提交或評論過的註記 + heading: '%{user}的註記' + no_notes: 沒有註記 javascripts: share: embed: HTML @@ -1175,13 +1291,17 @@ zh-HK: opnvkarte: ÖPNVKarte layers: header: 地圖圖層 + notes: 地圖註記 title: 圖層 site: + createnote_tooltip: 在地圖加入註記 + createnote_disabled_tooltip: 放大以在地圖加入註記 queryfeature_tooltip: 查詢地圖特徴 queryfeature_disabled_tooltip: 放大以查詢地圖特徴 query: nothing_found: 沒找到地圖特徵 context: + add_note: 在此加入註記 query_features: 查詢地圖特徴 centre_map: 將地圖置中於此 ... From 00112700d780c621b59fee364217d9ef25275d86 Mon Sep 17 00:00:00 2001 From: Tom Hughes Date: Mon, 12 Sep 2022 19:27:33 +0100 Subject: [PATCH 68/68] Update doorkeeper to 5.6.0 --- Gemfile | 2 +- Gemfile.lock | 4 +- config/initializers/doorkeeper.rb | 960 +++++++++++++++--------------- 3 files changed, 483 insertions(+), 483 deletions(-) diff --git a/Gemfile b/Gemfile index 718bd262b..020cc9166 100644 --- a/Gemfile +++ b/Gemfile @@ -76,7 +76,7 @@ gem "omniauth-rails_csrf_protection", "~> 1.0" gem "omniauth-windowslive" # Doorkeeper for OAuth2 -gem "doorkeeper", "~> 5.5.4" +gem "doorkeeper" gem "doorkeeper-i18n" # Markdown formatting support diff --git a/Gemfile.lock b/Gemfile.lock index 4de9076ef..925d57d06 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -163,7 +163,7 @@ GEM delayed_job (>= 3.0, < 5) digest (3.1.0) docile (1.4.0) - doorkeeper (5.5.4) + doorkeeper (5.6.0) railties (>= 5) doorkeeper-i18n (5.2.4) doorkeeper (>= 5.2) @@ -536,7 +536,7 @@ DEPENDENCIES dalli debug_inspector delayed_job_active_record - doorkeeper (~> 5.5.4) + doorkeeper doorkeeper-i18n erb_lint factory_bot_rails diff --git a/config/initializers/doorkeeper.rb b/config/initializers/doorkeeper.rb index 8dce1c870..a2df9167f 100644 --- a/config/initializers/doorkeeper.rb +++ b/config/initializers/doorkeeper.rb @@ -1,486 +1,486 @@ # frozen_string_literal: true -Rails.application.reloader.to_prepare do - Doorkeeper.configure do - # Change the ORM that doorkeeper will use (requires ORM extensions installed). - # Check the list of supported ORMs here: https://github.com/doorkeeper-gem/doorkeeper#orms - orm :active_record +require_relative "../../lib/oauth" - # This block will be called to check whether the resource owner is authenticated or not. - resource_owner_authenticator do - current_user - end +Doorkeeper.configure do + # Change the ORM that doorkeeper will use (requires ORM extensions installed). + # Check the list of supported ORMs here: https://github.com/doorkeeper-gem/doorkeeper#orms + orm :active_record - # If you didn't skip applications controller from Doorkeeper routes in your application routes.rb - # file then you need to declare this block in order to restrict access to the web interface for - # adding oauth authorized applications. In other case it will return 403 Forbidden response - # every time somebody will try to access the admin web interface. - - admin_authenticator do - current_user - end - - # You can use your own model classes if you need to extend (or even override) default - # Doorkeeper models such as `Application`, `AccessToken` and `AccessGrant. - # - # Be default Doorkeeper ActiveRecord ORM uses it's own classes: - # - # access_token_class "Doorkeeper::AccessToken" - # access_grant_class "Doorkeeper::AccessGrant" - # application_class "Doorkeeper::Application" - # - # Don't forget to include Doorkeeper ORM mixins into your custom models: - # - # * ::Doorkeeper::Orm::ActiveRecord::Mixins::AccessToken - for access token - # * ::Doorkeeper::Orm::ActiveRecord::Mixins::AccessGrant - for access grant - # * ::Doorkeeper::Orm::ActiveRecord::Mixins::Application - for application (OAuth2 clients) - # - # For example: - # - # access_token_class "MyAccessToken" - # - # class MyAccessToken < ApplicationRecord - # include ::Doorkeeper::Orm::ActiveRecord::Mixins::AccessToken - # - # self.table_name = "hey_i_wanna_my_name" - # - # def destroy_me! - # destroy - # end - # end - - application_class "Oauth2Application" unless Settings.status == "database_offline" - - # Enables polymorphic Resource Owner association for Access Tokens and Access Grants. - # By default this option is disabled. - # - # Make sure you properly setup you database and have all the required columns (run - # `bundle exec rails generate doorkeeper:enable_polymorphic_resource_owner` and execute Rails - # migrations). - # - # If this option enabled, Doorkeeper will store not only Resource Owner primary key - # value, but also it's type (class name). See "Polymorphic Associations" section of - # Rails guides: https://guides.rubyonrails.org/association_basics.html#polymorphic-associations - # - # [NOTE] If you apply this option on already existing project don't forget to manually - # update `resource_owner_type` column in the database and fix migration template as it will - # set NOT NULL constraint for Access Grants table. - # - # use_polymorphic_resource_owner - - # If you are planning to use Doorkeeper in Rails 5 API-only application, then you might - # want to use API mode that will skip all the views management and change the way how - # Doorkeeper responds to a requests. - # - # api_only - - # Enforce token request content type to application/x-www-form-urlencoded. - # It is not enabled by default to not break prior versions of the gem. - - enforce_content_type - - # Authorization Code expiration time (default: 10 minutes). - # - # authorization_code_expires_in 10.minutes - - # Access token expiration time (default: 2 hours). - # If you want to disable expiration, set this to `nil`. - - access_token_expires_in nil - - # Assign custom TTL for access tokens. Will be used instead of access_token_expires_in - # option if defined. In case the block returns `nil` value Doorkeeper fallbacks to - # +access_token_expires_in+ configuration option value. If you really need to issue a - # non-expiring access token (which is not recommended) then you need to return - # Float::INFINITY from this block. - # - # `context` has the following properties available: - # - # * `client` - the OAuth client application (see Doorkeeper::OAuth::Client) - # * `grant_type` - the grant type of the request (see Doorkeeper::OAuth) - # * `scopes` - the requested scopes (see Doorkeeper::OAuth::Scopes) - # * `resource_owner` - authorized resource owner instance (if present) - # - # custom_access_token_expires_in do |context| - # context.client.additional_settings.implicit_oauth_expiration - # end - - # Use a custom class for generating the access token. - # See https://doorkeeper.gitbook.io/guides/configuration/other-configurations#custom-access-token-generator - # - # access_token_generator '::Doorkeeper::JWT' - - # The controller +Doorkeeper::ApplicationController+ inherits from. - # Defaults to +ActionController::Base+ unless +api_only+ is set, which changes the default to - # +ActionController::API+. The return value of this option must be a stringified class name. - # See https://doorkeeper.gitbook.io/guides/configuration/other-configurations#custom-controllers - - base_controller "ApplicationController" - - # Reuse access token for the same resource owner within an application (disabled by default). - # - # This option protects your application from creating new tokens before old valid one becomes - # expired so your database doesn't bloat. Keep in mind that when this option is `on` Doorkeeper - # doesn't updates existing token expiration time, it will create a new token instead. - # Rationale: https://github.com/doorkeeper-gem/doorkeeper/issues/383 - # - # You can not enable this option together with +hash_token_secrets+. - - reuse_access_token - - # In case you enabled `reuse_access_token` option Doorkeeper will try to find matching - # token using `matching_token_for` Access Token API that searches for valid records - # in batches in order not to pollute the memory with all the database records. By default - # Doorkeeper uses batch size of 10 000 records. You can increase or decrease this value - # depending on your needs and server capabilities. - # - # token_lookup_batch_size 10_000 - - # Set a limit for token_reuse if using reuse_access_token option - # - # This option limits token_reusability to some extent. - # If not set then access_token will be reused unless it expires. - # Rationale: https://github.com/doorkeeper-gem/doorkeeper/issues/1189 - # - # This option should be a percentage(i.e. (0,100]) - # - # token_reuse_limit 100 - - # Only allow one valid access token obtained via client credentials - # per client. If a new access token is obtained before the old one - # expired, the old one gets revoked (disabled by default) - # - # When enabling this option, make sure that you do not expect multiple processes - # using the same credentials at the same time (e.g. web servers spanning - # multiple machines and/or processes). - # - # revoke_previous_client_credentials_token - - # Hash access and refresh tokens before persisting them. - # This will disable the possibility to use +reuse_access_token+ - # since plain values can no longer be retrieved. - # - # Note: If you are already a user of doorkeeper and have existing tokens - # in your installation, they will be invalid without adding 'fallback: :plain'. - # - # hash_token_secrets - # By default, token secrets will be hashed using the - # +Doorkeeper::Hashing::SHA256+ strategy. - # - # If you wish to use another hashing implementation, you can override - # this strategy as follows: - - hash_token_secrets :using => "::Doorkeeper::SecretStoring::Plain", - :fallback => "::Doorkeeper::SecretStoring::Sha256Hash" - - # Keep in mind that changing the hashing function will invalidate all existing - # secrets, if there are any. - - # Hash application secrets before persisting them. - - hash_application_secrets - - # By default, applications will be hashed - # with the +Doorkeeper::SecretStoring::SHA256+ strategy. - # - # If you wish to use bcrypt for application secret hashing, uncomment - # this line instead: - # - # hash_application_secrets using: '::Doorkeeper::SecretStoring::BCrypt' - - # When the above option is enabled, and a hashed token or secret is not found, - # you can allow to fall back to another strategy. For users upgrading - # doorkeeper and wishing to enable hashing, you will probably want to enable - # the fallback to plain tokens. - # - # This will ensure that old access tokens and secrets - # will remain valid even if the hashing above is enabled. - # - # This can be done by adding 'fallback: plain', e.g. : - # - # hash_application_secrets using: '::Doorkeeper::SecretStoring::BCrypt', fallback: :plain - - # Issue access tokens with refresh token (disabled by default), you may also - # pass a block which accepts `context` to customize when to give a refresh - # token or not. Similar to +custom_access_token_expires_in+, `context` has - # the following properties: - # - # `client` - the OAuth client application (see Doorkeeper::OAuth::Client) - # `grant_type` - the grant type of the request (see Doorkeeper::OAuth) - # `scopes` - the requested scopes (see Doorkeeper::OAuth::Scopes) - # - # use_refresh_token - - # Provide support for an owner to be assigned to each registered application (disabled by default) - # Optional parameter confirmation: true (default: false) if you want to enforce ownership of - # a registered application - # NOTE: you must also run the rails g doorkeeper:application_owner generator - # to provide the necessary support - - enable_application_owner :confirmation => true - - # Define access token scopes for your provider - # For more information go to - # https://doorkeeper.gitbook.io/guides/ruby-on-rails/scopes - - # default_scopes :public - optional_scopes(*Oauth::SCOPES, *Oauth::PRIVILEGED_SCOPES) - - # Allows to restrict only certain scopes for grant_type. - # By default, all the scopes will be available for all the grant types. - # - # Keys to this hash should be the name of grant_type and - # values should be the array of scopes for that grant type. - # Note: scopes should be from configured_scopes (i.e. default or optional) - # - # scopes_by_grant_type password: [:write], client_credentials: [:update] - - # Forbids creating/updating applications with arbitrary scopes that are - # not in configuration, i.e. +default_scopes+ or +optional_scopes+. - # (disabled by default) - - enforce_configured_scopes - - # Change the way client credentials are retrieved from the request object. - # By default it retrieves first from the `HTTP_AUTHORIZATION` header, then - # falls back to the `:client_id` and `:client_secret` params from the `params` object. - # Check out https://github.com/doorkeeper-gem/doorkeeper/wiki/Changing-how-clients-are-authenticated - # for more information on customization - # - # client_credentials :from_basic, :from_params - - # Change the way access token is authenticated from the request object. - # By default it retrieves first from the `HTTP_AUTHORIZATION` header, then - # falls back to the `:access_token` or `:bearer_token` params from the `params` object. - # Check out https://github.com/doorkeeper-gem/doorkeeper/wiki/Changing-how-clients-are-authenticated - # for more information on customization - - access_token_methods :from_bearer_authorization - - # Forces the usage of the HTTPS protocol in non-native redirect uris (enabled - # by default in non-development environments). OAuth2 delegates security in - # communication to the HTTPS protocol so it is wise to keep this enabled. - # - # Callable objects such as proc, lambda, block or any object that responds to - # #call can be used in order to allow conditional checks (to allow non-SSL - # redirects to localhost for example). - - force_ssl_in_redirect_uri do |uri| - !Rails.env.development? && uri.host != "127.0.0.1" - end - - # Specify what redirect URI's you want to block during Application creation. - # Any redirect URI is whitelisted by default. - # - # You can use this option in order to forbid URI's with 'javascript' scheme - # for example. - # - # forbid_redirect_uri { |uri| uri.scheme.to_s.downcase == 'javascript' } - - # Allows to set blank redirect URIs for Applications in case Doorkeeper configured - # to use URI-less OAuth grant flows like Client Credentials or Resource Owner - # Password Credentials. The option is on by default and checks configured grant - # types, but you **need** to manually drop `NOT NULL` constraint from `redirect_uri` - # column for `oauth_applications` database table. - # - # You can completely disable this feature with: - # - # allow_blank_redirect_uri false - # - # Or you can define your custom check: - # - # allow_blank_redirect_uri do |grant_flows, client| - # client.superapp? - # end - - # Specify how authorization errors should be handled. - # By default, doorkeeper renders json errors when access token - # is invalid, expired, revoked or has invalid scopes. - # - # If you want to render error response yourself (i.e. rescue exceptions), - # set +handle_auth_errors+ to `:raise` and rescue Doorkeeper::Errors::InvalidToken - # or following specific errors: - # - # Doorkeeper::Errors::TokenForbidden, Doorkeeper::Errors::TokenExpired, - # Doorkeeper::Errors::TokenRevoked, Doorkeeper::Errors::TokenUnknown - # - # handle_auth_errors :raise - - # Customize token introspection response. - # Allows to add your own fields to default one that are required by the OAuth spec - # for the introspection response. It could be `sub`, `aud` and so on. - # This configuration option can be a proc, lambda or any Ruby object responds - # to `.call` method and result of it's invocation must be a Hash. - # - # custom_introspection_response do |token, context| - # { - # "sub": "Z5O3upPC88QrAjx00dis", - # "aud": "https://protected.example.net/resource", - # "username": User.find(token.resource_owner_id).username - # } - # end - # - # or - # - # custom_introspection_response CustomIntrospectionResponder - - # Specify what grant flows are enabled in array of Strings. The valid - # strings and the flows they enable are: - # - # "authorization_code" => Authorization Code Grant Flow - # "implicit" => Implicit Grant Flow - # "password" => Resource Owner Password Credentials Grant Flow - # "client_credentials" => Client Credentials Grant Flow - # - # If not specified, Doorkeeper enables authorization_code and - # client_credentials. - # - # implicit and password grant flows have risks that you should understand - # before enabling: - # http://tools.ietf.org/html/rfc6819#section-4.4.2 - # http://tools.ietf.org/html/rfc6819#section-4.4.3 - - grant_flows %w[authorization_code] - - # Allows to customize OAuth grant flows that +each+ application support. - # You can configure a custom block (or use a class respond to `#call`) that must - # return `true` in case Application instance supports requested OAuth grant flow - # during the authorization request to the server. This configuration +doesn't+ - # set flows per application, it only allows to check if application supports - # specific grant flow. - # - # For example you can add an additional database column to `oauth_applications` table, - # say `t.array :grant_flows, default: []`, and store allowed grant flows that can - # be used with this application there. Then when authorization requested Doorkeeper - # will call this block to check if specific Application (passed with client_id and/or - # client_secret) is allowed to perform the request for the specific grant type - # (authorization, password, client_credentials, etc). - # - # Example of the block: - # - # ->(flow, client) { client.grant_flows.include?(flow) } - # - # In case this option invocation result is `false`, Doorkeeper server returns - # :unauthorized_client error and stops the request. - # - # @param allow_grant_flow_for_client [Proc] Block or any object respond to #call - # @return [Boolean] `true` if allow or `false` if forbid the request - # - # allow_grant_flow_for_client do |grant_flow, client| - # # `grant_flows` is an Array column with grant - # # flows that application supports - # - # client.grant_flows.include?(grant_flow) - # end - - # If you need arbitrary Resource Owner-Client authorization you can enable this option - # and implement the check your need. Config option must respond to #call and return - # true in case resource owner authorized for the specific application or false in other - # cases. - # - # Be default all Resource Owners are authorized to any Client (application). - # - # authorize_resource_owner_for_client do |client, resource_owner| - # resource_owner.admin? || client.owners_whitelist.include?(resource_owner) - # end - - # Hook into the strategies' request & response life-cycle in case your - # application needs advanced customization or logging: - # - # before_successful_strategy_response do |request| - # puts "BEFORE HOOK FIRED! #{request}" - # end - # - # after_successful_strategy_response do |request, response| - # puts "AFTER HOOK FIRED! #{request}, #{response}" - # end - - # Hook into Authorization flow in order to implement Single Sign Out - # or add any other functionality. Inside the block you have an access - # to `controller` (authorizations controller instance) and `context` - # (Doorkeeper::OAuth::Hooks::Context instance) which provides pre auth - # or auth objects with issued token based on hook type (before or after). - # - # before_successful_authorization do |controller, context| - # Rails.logger.info(controller.request.params.inspect) - # - # Rails.logger.info(context.pre_auth.inspect) - # end - # - # after_successful_authorization do |controller, context| - # controller.session[:logout_urls] << - # Doorkeeper::Application - # .find_by(controller.request.params.slice(:redirect_uri)) - # .logout_uri - # - # Rails.logger.info(context.auth.inspect) - # Rails.logger.info(context.issued_token) - # end - - # Under some circumstances you might want to have applications auto-approved, - # so that the user skips the authorization step. - # For example if dealing with a trusted application. - - skip_authorization do |_, client| - client.scopes.include?("skip_authorization") - end - - # Configure custom constraints for the Token Introspection request. - # By default this configuration option allows to introspect a token by another - # token of the same application, OR to introspect the token that belongs to - # authorized client (from authenticated client) OR when token doesn't - # belong to any client (public token). Otherwise requester has no access to the - # introspection and it will return response as stated in the RFC. - # - # Block arguments: - # - # @param token [Doorkeeper::AccessToken] - # token to be introspected - # - # @param authorized_client [Doorkeeper::Application] - # authorized client (if request is authorized using Basic auth with - # Client Credentials for example) - # - # @param authorized_token [Doorkeeper::AccessToken] - # Bearer token used to authorize the request - # - # In case the block returns `nil` or `false` introspection responses with 401 status code - # when using authorized token to introspect, or you'll get 200 with { "active": false } body - # when using authorized client to introspect as stated in the - # RFC 7662 section 2.2. Introspection Response. - # - # Using with caution: - # Keep in mind that these three parameters pass to block can be nil as following case: - # `authorized_client` is nil if and only if `authorized_token` is present, and vice versa. - # `token` will be nil if and only if `authorized_token` is present. - # So remember to use `&` or check if it is present before calling method on - # them to make sure you doesn't get NoMethodError exception. - # - # You can define your custom check: - # - # allow_token_introspection do |token, authorized_client, authorized_token| - # if authorized_token - # # customize: require `introspection` scope - # authorized_token.application == token&.application || - # authorized_token.scopes.include?("introspection") - # elsif token.application - # # `protected_resource` is a new database boolean column, for example - # authorized_client == token.application || authorized_client.protected_resource? - # else - # # public token (when token.application is nil, token doesn't belong to any application) - # true - # end - # end - # - # Or you can completely disable any token introspection: - # - # allow_token_introspection false - # - # If you need to block the request at all, then configure your routes.rb or web-server - # like nginx to forbid the request. - - # WWW-Authenticate Realm (default: "Doorkeeper"). - # - # realm "Doorkeeper" + # This block will be called to check whether the resource owner is authenticated or not. + resource_owner_authenticator do + current_user end + + # If you didn't skip applications controller from Doorkeeper routes in your application routes.rb + # file then you need to declare this block in order to restrict access to the web interface for + # adding oauth authorized applications. In other case it will return 403 Forbidden response + # every time somebody will try to access the admin web interface. + + admin_authenticator do + current_user + end + + # You can use your own model classes if you need to extend (or even override) default + # Doorkeeper models such as `Application`, `AccessToken` and `AccessGrant. + # + # Be default Doorkeeper ActiveRecord ORM uses it's own classes: + # + # access_token_class "Doorkeeper::AccessToken" + # access_grant_class "Doorkeeper::AccessGrant" + # application_class "Doorkeeper::Application" + # + # Don't forget to include Doorkeeper ORM mixins into your custom models: + # + # * ::Doorkeeper::Orm::ActiveRecord::Mixins::AccessToken - for access token + # * ::Doorkeeper::Orm::ActiveRecord::Mixins::AccessGrant - for access grant + # * ::Doorkeeper::Orm::ActiveRecord::Mixins::Application - for application (OAuth2 clients) + # + # For example: + # + # access_token_class "MyAccessToken" + # + # class MyAccessToken < ApplicationRecord + # include ::Doorkeeper::Orm::ActiveRecord::Mixins::AccessToken + # + # self.table_name = "hey_i_wanna_my_name" + # + # def destroy_me! + # destroy + # end + # end + + application_class "Oauth2Application" unless Settings.status == "database_offline" + + # Enables polymorphic Resource Owner association for Access Tokens and Access Grants. + # By default this option is disabled. + # + # Make sure you properly setup you database and have all the required columns (run + # `bundle exec rails generate doorkeeper:enable_polymorphic_resource_owner` and execute Rails + # migrations). + # + # If this option enabled, Doorkeeper will store not only Resource Owner primary key + # value, but also it's type (class name). See "Polymorphic Associations" section of + # Rails guides: https://guides.rubyonrails.org/association_basics.html#polymorphic-associations + # + # [NOTE] If you apply this option on already existing project don't forget to manually + # update `resource_owner_type` column in the database and fix migration template as it will + # set NOT NULL constraint for Access Grants table. + # + # use_polymorphic_resource_owner + + # If you are planning to use Doorkeeper in Rails 5 API-only application, then you might + # want to use API mode that will skip all the views management and change the way how + # Doorkeeper responds to a requests. + # + # api_only + + # Enforce token request content type to application/x-www-form-urlencoded. + # It is not enabled by default to not break prior versions of the gem. + + enforce_content_type + + # Authorization Code expiration time (default: 10 minutes). + # + # authorization_code_expires_in 10.minutes + + # Access token expiration time (default: 2 hours). + # If you want to disable expiration, set this to `nil`. + + access_token_expires_in nil + + # Assign custom TTL for access tokens. Will be used instead of access_token_expires_in + # option if defined. In case the block returns `nil` value Doorkeeper fallbacks to + # +access_token_expires_in+ configuration option value. If you really need to issue a + # non-expiring access token (which is not recommended) then you need to return + # Float::INFINITY from this block. + # + # `context` has the following properties available: + # + # * `client` - the OAuth client application (see Doorkeeper::OAuth::Client) + # * `grant_type` - the grant type of the request (see Doorkeeper::OAuth) + # * `scopes` - the requested scopes (see Doorkeeper::OAuth::Scopes) + # * `resource_owner` - authorized resource owner instance (if present) + # + # custom_access_token_expires_in do |context| + # context.client.additional_settings.implicit_oauth_expiration + # end + + # Use a custom class for generating the access token. + # See https://doorkeeper.gitbook.io/guides/configuration/other-configurations#custom-access-token-generator + # + # access_token_generator '::Doorkeeper::JWT' + + # The controller +Doorkeeper::ApplicationController+ inherits from. + # Defaults to +ActionController::Base+ unless +api_only+ is set, which changes the default to + # +ActionController::API+. The return value of this option must be a stringified class name. + # See https://doorkeeper.gitbook.io/guides/configuration/other-configurations#custom-controllers + + base_controller "ApplicationController" + + # Reuse access token for the same resource owner within an application (disabled by default). + # + # This option protects your application from creating new tokens before old valid one becomes + # expired so your database doesn't bloat. Keep in mind that when this option is `on` Doorkeeper + # doesn't updates existing token expiration time, it will create a new token instead. + # Rationale: https://github.com/doorkeeper-gem/doorkeeper/issues/383 + # + # You can not enable this option together with +hash_token_secrets+. + + reuse_access_token + + # In case you enabled `reuse_access_token` option Doorkeeper will try to find matching + # token using `matching_token_for` Access Token API that searches for valid records + # in batches in order not to pollute the memory with all the database records. By default + # Doorkeeper uses batch size of 10 000 records. You can increase or decrease this value + # depending on your needs and server capabilities. + # + # token_lookup_batch_size 10_000 + + # Set a limit for token_reuse if using reuse_access_token option + # + # This option limits token_reusability to some extent. + # If not set then access_token will be reused unless it expires. + # Rationale: https://github.com/doorkeeper-gem/doorkeeper/issues/1189 + # + # This option should be a percentage(i.e. (0,100]) + # + # token_reuse_limit 100 + + # Only allow one valid access token obtained via client credentials + # per client. If a new access token is obtained before the old one + # expired, the old one gets revoked (disabled by default) + # + # When enabling this option, make sure that you do not expect multiple processes + # using the same credentials at the same time (e.g. web servers spanning + # multiple machines and/or processes). + # + # revoke_previous_client_credentials_token + + # Hash access and refresh tokens before persisting them. + # This will disable the possibility to use +reuse_access_token+ + # since plain values can no longer be retrieved. + # + # Note: If you are already a user of doorkeeper and have existing tokens + # in your installation, they will be invalid without adding 'fallback: :plain'. + # + # hash_token_secrets + # By default, token secrets will be hashed using the + # +Doorkeeper::Hashing::SHA256+ strategy. + # + # If you wish to use another hashing implementation, you can override + # this strategy as follows: + + hash_token_secrets :using => "::Doorkeeper::SecretStoring::Plain", + :fallback => "::Doorkeeper::SecretStoring::Sha256Hash" + + # Keep in mind that changing the hashing function will invalidate all existing + # secrets, if there are any. + + # Hash application secrets before persisting them. + + hash_application_secrets + + # By default, applications will be hashed + # with the +Doorkeeper::SecretStoring::SHA256+ strategy. + # + # If you wish to use bcrypt for application secret hashing, uncomment + # this line instead: + # + # hash_application_secrets using: '::Doorkeeper::SecretStoring::BCrypt' + + # When the above option is enabled, and a hashed token or secret is not found, + # you can allow to fall back to another strategy. For users upgrading + # doorkeeper and wishing to enable hashing, you will probably want to enable + # the fallback to plain tokens. + # + # This will ensure that old access tokens and secrets + # will remain valid even if the hashing above is enabled. + # + # This can be done by adding 'fallback: plain', e.g. : + # + # hash_application_secrets using: '::Doorkeeper::SecretStoring::BCrypt', fallback: :plain + + # Issue access tokens with refresh token (disabled by default), you may also + # pass a block which accepts `context` to customize when to give a refresh + # token or not. Similar to +custom_access_token_expires_in+, `context` has + # the following properties: + # + # `client` - the OAuth client application (see Doorkeeper::OAuth::Client) + # `grant_type` - the grant type of the request (see Doorkeeper::OAuth) + # `scopes` - the requested scopes (see Doorkeeper::OAuth::Scopes) + # + # use_refresh_token + + # Provide support for an owner to be assigned to each registered application (disabled by default) + # Optional parameter confirmation: true (default: false) if you want to enforce ownership of + # a registered application + # NOTE: you must also run the rails g doorkeeper:application_owner generator + # to provide the necessary support + + enable_application_owner :confirmation => true + + # Define access token scopes for your provider + # For more information go to + # https://doorkeeper.gitbook.io/guides/ruby-on-rails/scopes + + # default_scopes :public + optional_scopes(*Oauth::SCOPES, *Oauth::PRIVILEGED_SCOPES) + + # Allows to restrict only certain scopes for grant_type. + # By default, all the scopes will be available for all the grant types. + # + # Keys to this hash should be the name of grant_type and + # values should be the array of scopes for that grant type. + # Note: scopes should be from configured_scopes (i.e. default or optional) + # + # scopes_by_grant_type password: [:write], client_credentials: [:update] + + # Forbids creating/updating applications with arbitrary scopes that are + # not in configuration, i.e. +default_scopes+ or +optional_scopes+. + # (disabled by default) + + enforce_configured_scopes + + # Change the way client credentials are retrieved from the request object. + # By default it retrieves first from the `HTTP_AUTHORIZATION` header, then + # falls back to the `:client_id` and `:client_secret` params from the `params` object. + # Check out https://github.com/doorkeeper-gem/doorkeeper/wiki/Changing-how-clients-are-authenticated + # for more information on customization + # + # client_credentials :from_basic, :from_params + + # Change the way access token is authenticated from the request object. + # By default it retrieves first from the `HTTP_AUTHORIZATION` header, then + # falls back to the `:access_token` or `:bearer_token` params from the `params` object. + # Check out https://github.com/doorkeeper-gem/doorkeeper/wiki/Changing-how-clients-are-authenticated + # for more information on customization + + access_token_methods :from_bearer_authorization + + # Forces the usage of the HTTPS protocol in non-native redirect uris (enabled + # by default in non-development environments). OAuth2 delegates security in + # communication to the HTTPS protocol so it is wise to keep this enabled. + # + # Callable objects such as proc, lambda, block or any object that responds to + # #call can be used in order to allow conditional checks (to allow non-SSL + # redirects to localhost for example). + + force_ssl_in_redirect_uri do |uri| + !Rails.env.development? && uri.host != "127.0.0.1" + end + + # Specify what redirect URI's you want to block during Application creation. + # Any redirect URI is whitelisted by default. + # + # You can use this option in order to forbid URI's with 'javascript' scheme + # for example. + # + # forbid_redirect_uri { |uri| uri.scheme.to_s.downcase == 'javascript' } + + # Allows to set blank redirect URIs for Applications in case Doorkeeper configured + # to use URI-less OAuth grant flows like Client Credentials or Resource Owner + # Password Credentials. The option is on by default and checks configured grant + # types, but you **need** to manually drop `NOT NULL` constraint from `redirect_uri` + # column for `oauth_applications` database table. + # + # You can completely disable this feature with: + # + # allow_blank_redirect_uri false + # + # Or you can define your custom check: + # + # allow_blank_redirect_uri do |grant_flows, client| + # client.superapp? + # end + + # Specify how authorization errors should be handled. + # By default, doorkeeper renders json errors when access token + # is invalid, expired, revoked or has invalid scopes. + # + # If you want to render error response yourself (i.e. rescue exceptions), + # set +handle_auth_errors+ to `:raise` and rescue Doorkeeper::Errors::InvalidToken + # or following specific errors: + # + # Doorkeeper::Errors::TokenForbidden, Doorkeeper::Errors::TokenExpired, + # Doorkeeper::Errors::TokenRevoked, Doorkeeper::Errors::TokenUnknown + # + # handle_auth_errors :raise + + # Customize token introspection response. + # Allows to add your own fields to default one that are required by the OAuth spec + # for the introspection response. It could be `sub`, `aud` and so on. + # This configuration option can be a proc, lambda or any Ruby object responds + # to `.call` method and result of it's invocation must be a Hash. + # + # custom_introspection_response do |token, context| + # { + # "sub": "Z5O3upPC88QrAjx00dis", + # "aud": "https://protected.example.net/resource", + # "username": User.find(token.resource_owner_id).username + # } + # end + # + # or + # + # custom_introspection_response CustomIntrospectionResponder + + # Specify what grant flows are enabled in array of Strings. The valid + # strings and the flows they enable are: + # + # "authorization_code" => Authorization Code Grant Flow + # "implicit" => Implicit Grant Flow + # "password" => Resource Owner Password Credentials Grant Flow + # "client_credentials" => Client Credentials Grant Flow + # + # If not specified, Doorkeeper enables authorization_code and + # client_credentials. + # + # implicit and password grant flows have risks that you should understand + # before enabling: + # http://tools.ietf.org/html/rfc6819#section-4.4.2 + # http://tools.ietf.org/html/rfc6819#section-4.4.3 + + grant_flows %w[authorization_code] + + # Allows to customize OAuth grant flows that +each+ application support. + # You can configure a custom block (or use a class respond to `#call`) that must + # return `true` in case Application instance supports requested OAuth grant flow + # during the authorization request to the server. This configuration +doesn't+ + # set flows per application, it only allows to check if application supports + # specific grant flow. + # + # For example you can add an additional database column to `oauth_applications` table, + # say `t.array :grant_flows, default: []`, and store allowed grant flows that can + # be used with this application there. Then when authorization requested Doorkeeper + # will call this block to check if specific Application (passed with client_id and/or + # client_secret) is allowed to perform the request for the specific grant type + # (authorization, password, client_credentials, etc). + # + # Example of the block: + # + # ->(flow, client) { client.grant_flows.include?(flow) } + # + # In case this option invocation result is `false`, Doorkeeper server returns + # :unauthorized_client error and stops the request. + # + # @param allow_grant_flow_for_client [Proc] Block or any object respond to #call + # @return [Boolean] `true` if allow or `false` if forbid the request + # + # allow_grant_flow_for_client do |grant_flow, client| + # # `grant_flows` is an Array column with grant + # # flows that application supports + # + # client.grant_flows.include?(grant_flow) + # end + + # If you need arbitrary Resource Owner-Client authorization you can enable this option + # and implement the check your need. Config option must respond to #call and return + # true in case resource owner authorized for the specific application or false in other + # cases. + # + # Be default all Resource Owners are authorized to any Client (application). + # + # authorize_resource_owner_for_client do |client, resource_owner| + # resource_owner.admin? || client.owners_whitelist.include?(resource_owner) + # end + + # Hook into the strategies' request & response life-cycle in case your + # application needs advanced customization or logging: + # + # before_successful_strategy_response do |request| + # puts "BEFORE HOOK FIRED! #{request}" + # end + # + # after_successful_strategy_response do |request, response| + # puts "AFTER HOOK FIRED! #{request}, #{response}" + # end + + # Hook into Authorization flow in order to implement Single Sign Out + # or add any other functionality. Inside the block you have an access + # to `controller` (authorizations controller instance) and `context` + # (Doorkeeper::OAuth::Hooks::Context instance) which provides pre auth + # or auth objects with issued token based on hook type (before or after). + # + # before_successful_authorization do |controller, context| + # Rails.logger.info(controller.request.params.inspect) + # + # Rails.logger.info(context.pre_auth.inspect) + # end + # + # after_successful_authorization do |controller, context| + # controller.session[:logout_urls] << + # Doorkeeper::Application + # .find_by(controller.request.params.slice(:redirect_uri)) + # .logout_uri + # + # Rails.logger.info(context.auth.inspect) + # Rails.logger.info(context.issued_token) + # end + + # Under some circumstances you might want to have applications auto-approved, + # so that the user skips the authorization step. + # For example if dealing with a trusted application. + + skip_authorization do |_, client| + client.scopes.include?("skip_authorization") + end + + # Configure custom constraints for the Token Introspection request. + # By default this configuration option allows to introspect a token by another + # token of the same application, OR to introspect the token that belongs to + # authorized client (from authenticated client) OR when token doesn't + # belong to any client (public token). Otherwise requester has no access to the + # introspection and it will return response as stated in the RFC. + # + # Block arguments: + # + # @param token [Doorkeeper::AccessToken] + # token to be introspected + # + # @param authorized_client [Doorkeeper::Application] + # authorized client (if request is authorized using Basic auth with + # Client Credentials for example) + # + # @param authorized_token [Doorkeeper::AccessToken] + # Bearer token used to authorize the request + # + # In case the block returns `nil` or `false` introspection responses with 401 status code + # when using authorized token to introspect, or you'll get 200 with { "active": false } body + # when using authorized client to introspect as stated in the + # RFC 7662 section 2.2. Introspection Response. + # + # Using with caution: + # Keep in mind that these three parameters pass to block can be nil as following case: + # `authorized_client` is nil if and only if `authorized_token` is present, and vice versa. + # `token` will be nil if and only if `authorized_token` is present. + # So remember to use `&` or check if it is present before calling method on + # them to make sure you doesn't get NoMethodError exception. + # + # You can define your custom check: + # + # allow_token_introspection do |token, authorized_client, authorized_token| + # if authorized_token + # # customize: require `introspection` scope + # authorized_token.application == token&.application || + # authorized_token.scopes.include?("introspection") + # elsif token.application + # # `protected_resource` is a new database boolean column, for example + # authorized_client == token.application || authorized_client.protected_resource? + # else + # # public token (when token.application is nil, token doesn't belong to any application) + # true + # end + # end + # + # Or you can completely disable any token introspection: + # + # allow_token_introspection false + # + # If you need to block the request at all, then configure your routes.rb or web-server + # like nginx to forbid the request. + + # WWW-Authenticate Realm (default: "Doorkeeper"). + # + # realm "Doorkeeper" end