Merge remote-tracking branch 'upstream/pull/5892'

diff --git a/Gemfile.lock b/Gemfile.lock
index 925eebe3c68b72f76aac88eb618a413ed30bb811..eee8346e97cfe59a8f2b6118a03d027421caa546 100644 (file)
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -96,8 +96,8 @@ GEM
     autoprefixer-rails (10.4.19.0)
       execjs (~> 2)
     aws-eventstream (1.3.2)
     autoprefixer-rails (10.4.19.0)
       execjs (~> 2)
     aws-eventstream (1.3.2)

-    aws-partitions (1.1073.0)
-    aws-sdk-core (3.221.0)
+    aws-partitions (1.1078.0)
+    aws-sdk-core (3.222.1)

       aws-eventstream (~> 1, >= 1.3.0)
       aws-partitions (~> 1, >= 1.992.0)
       aws-sigv4 (~> 1.9)
       aws-eventstream (~> 1, >= 1.3.0)
       aws-partitions (~> 1, >= 1.992.0)
       aws-sigv4 (~> 1.9)


@@ -107,7 +107,7 @@ GEM
     aws-sdk-kms (1.99.0)
       aws-sdk-core (~> 3, >= 3.216.0)
       aws-sigv4 (~> 1.5)
     aws-sdk-kms (1.99.0)
       aws-sdk-core (~> 3, >= 3.216.0)
       aws-sigv4 (~> 1.5)

-    aws-sdk-s3 (1.182.0)
+    aws-sdk-s3 (1.183.0)

       aws-sdk-core (~> 3, >= 3.216.0)
       aws-sdk-kms (~> 1)
       aws-sigv4 (~> 1.5)
       aws-sdk-core (~> 3, >= 3.216.0)
       aws-sdk-kms (~> 1)
       aws-sigv4 (~> 1.5)


@@ -365,7 +365,7 @@ GEM
     listen (3.9.0)
       rb-fsevent (~> 0.10, >= 0.10.3)
       rb-inotify (~> 0.9, >= 0.9.10)
     listen (3.9.0)
       rb-fsevent (~> 0.10, >= 0.10.3)
       rb-inotify (~> 0.9, >= 0.9.10)

-    logger (1.6.6)
+    logger (1.7.0)

     logstasher (2.1.5)
       activesupport (>= 5.2)
       request_store
     logstasher (2.1.5)
       activesupport (>= 5.2)
       request_store


@@ -407,7 +407,7 @@ GEM
     net-smtp (0.5.1)
       net-protocol
     nio4r (2.7.4)
     net-smtp (0.5.1)
       net-protocol
     nio4r (2.7.4)

-    nokogiri (1.18.6)
+    nokogiri (1.18.7)

       mini_portile2 (~> 2.8.2)
       racc (~> 1.4)
     oauth (1.1.0)
       mini_portile2 (~> 2.8.2)
       racc (~> 1.4)
     oauth (1.1.0)


@@ -469,7 +469,7 @@ GEM
       iniparse (~> 1.4)
       rexml (>= 3.3.9)
     parallel (1.26.3)
       iniparse (~> 1.4)
       rexml (>= 3.3.9)
     parallel (1.26.3)

-    parser (3.3.7.2)
+    parser (3.3.7.4)

       ast (~> 2.4.1)
       racc
     pg (1.5.9)
       ast (~> 2.4.1)
       racc
     pg (1.5.9)


@@ -550,7 +550,7 @@ GEM
     rb-inotify (0.11.1)
       ffi (~> 1.0)
     rchardet (1.9.0)
     rb-inotify (0.11.1)
       ffi (~> 1.0)
     rchardet (1.9.0)

-    rdoc (6.13.0)
+    rdoc (6.13.1)

       psych (>= 4.0.0)
     regexp_parser (2.10.0)
     reline (0.6.0)
       psych (>= 4.0.0)
     regexp_parser (2.10.0)
     reline (0.6.0)


@@ -563,7 +563,7 @@ GEM
     rouge (4.5.1)
     rtlcss (0.2.1)
       mini_racer (>= 0.6.3)
     rouge (4.5.1)
     rtlcss (0.2.1)
       mini_racer (>= 0.6.3)

-    rubocop (1.74.0)
+    rubocop (1.75.1)

       json (~> 2.3)
       language_server-protocol (~> 3.17.0.2)
       lint_roller (~> 1.1.0)
       json (~> 2.3)
       language_server-protocol (~> 3.17.0.2)
       lint_roller (~> 1.1.0)


@@ -571,7 +571,7 @@ GEM
       parser (>= 3.3.0.2)
       rainbow (>= 2.2.2, < 4.0)
       regexp_parser (>= 2.9.3, < 3.0)
       parser (>= 3.3.0.2)
       rainbow (>= 2.2.2, < 4.0)
       regexp_parser (>= 2.9.3, < 3.0)

-      rubocop-ast (>= 1.38.0, < 2.0)
+      rubocop-ast (>= 1.43.0, < 2.0)

       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 2.4.0, < 4.0)
     rubocop-ast (1.43.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 2.4.0, < 4.0)
     rubocop-ast (1.43.0)


@@ -583,19 +583,19 @@ GEM
     rubocop-factory_bot (2.27.1)
       lint_roller (~> 1.1)
       rubocop (~> 1.72, >= 1.72.1)
     rubocop-factory_bot (2.27.1)
       lint_roller (~> 1.1)
       rubocop (~> 1.72, >= 1.72.1)

-    rubocop-minitest (0.37.1)
+    rubocop-minitest (0.38.0)

       lint_roller (~> 1.1)
       lint_roller (~> 1.1)

-      rubocop (>= 1.72.1, < 2.0)
+      rubocop (>= 1.75.0, < 2.0)

       rubocop-ast (>= 1.38.0, < 2.0)
       rubocop-ast (>= 1.38.0, < 2.0)

-    rubocop-performance (1.24.0)
+    rubocop-performance (1.25.0)

       lint_roller (~> 1.1)
       lint_roller (~> 1.1)

-      rubocop (>= 1.72.1, < 2.0)
+      rubocop (>= 1.75.0, < 2.0)

       rubocop-ast (>= 1.38.0, < 2.0)
       rubocop-ast (>= 1.38.0, < 2.0)

-    rubocop-rails (2.30.3)
+    rubocop-rails (2.31.0)

       activesupport (>= 4.2.0)
       lint_roller (~> 1.1)
       rack (>= 1.1)
       activesupport (>= 4.2.0)
       lint_roller (~> 1.1)
       rack (>= 1.1)

-      rubocop (>= 1.72.1, < 2.0)
+      rubocop (>= 1.75.0, < 2.0)

       rubocop-ast (>= 1.38.0, < 2.0)
     rubocop-rake (0.7.1)
       lint_roller (~> 1.1)
       rubocop-ast (>= 1.38.0, < 2.0)
     rubocop-rake (0.7.1)
       lint_roller (~> 1.1)

diff --git a/app/assets/javascripts/diary_entry.js b/app/assets/javascripts/diary_entry.js
index bfc3fc0128a70470324f68117f7789d1316d8584..041e49f7e3976f793767dadc2e9466c7e90eec32 100644 (file)
--- a/app/assets/javascripts/diary_entry.js
+++ b/app/assets/javascripts/diary_entry.js
@@ -11,7 +11,7 @@ $(function () {
       map.removeLayer(marker);
     }
 
       map.removeLayer(marker);
     }
 

-    marker = L.marker(e.latlng, { icon: OSM.getUserIcon() }).addTo(map)
+    marker = L.marker(e.latlng, { icon: OSM.getMarker({}) }).addTo(map)

       .bindPopup(OSM.i18n.t("diary_entries.edit.marker_text"));
   }
 
       .bindPopup(OSM.i18n.t("diary_entries.edit.marker_text"));
   }
 


@@ -30,13 +30,12 @@ $(function () {
       zoomControl: false
     }).addLayer(new L.OSM.Mapnik());
 
       zoomControl: false
     }).addLayer(new L.OSM.Mapnik());
 

-    L.OSM.zoom({ position: position })
-      .addTo(map);
+    L.OSM.zoom({ position }).addTo(map);

 
     map.setView(centre, params.zoom);
 
     if ($("#latitude").val() && $("#longitude").val()) {
 
     map.setView(centre, params.zoom);
 
     if ($("#latitude").val() && $("#longitude").val()) {

-      marker = L.marker(centre, { icon: OSM.getUserIcon() }).addTo(map)
+      marker = L.marker(centre, { icon: OSM.getMarker({}) }).addTo(map)

         .bindPopup(OSM.i18n.t("diary_entries.edit.marker_text"));
     }
 
         .bindPopup(OSM.i18n.t("diary_entries.edit.marker_text"));
     }
 

diff --git a/app/assets/javascripts/id.js b/app/assets/javascripts/id.js
index d60d4b82d0d0b709335d77aed1d32e7cca19ea10..b5c8a41539559122fdb3454bb1b3d34822c6e363 100644 (file)
--- a/app/assets/javascripts/id.js
+++ b/app/assets/javascripts/id.js
@@ -76,5 +76,10 @@ document.addEventListener("DOMContentLoaded", function () {
       const data = parent.OSM.mapParams();
       goToLocation(data);
     });
       const data = parent.OSM.mapParams();
       goToLocation(data);
     });

+
+    const projectTitle = parent.document.title;
+    new MutationObserver(() =>
+      parent.document.title = [document.title, projectTitle].filter(t => t).join(" | ")
+    ).observe(document.querySelector("title"), { childList: true, subtree: true, characterData: true });

   }
 });
   }
 });

diff --git a/app/assets/javascripts/index.js b/app/assets/javascripts/index.js
index b3ec71b9266f69d73bebfa57673bf36c97c9f289..be2a015b344d27a5faaf8db44d0359741d26b788 100644 (file)
--- a/app/assets/javascripts/index.js
+++ b/app/assets/javascripts/index.js
@@ -1,7 +1,6 @@
 //= require_self
 //= require leaflet.sidebar
 //= require leaflet.sidebar-pane
 //= require_self
 //= require leaflet.sidebar
 //= require leaflet.sidebar-pane

-//= require leaflet.locatecontrol/dist/L.Control.Locate.umd

 //= require leaflet.locate
 //= require leaflet.layers
 //= require leaflet.key
 //= require leaflet.locate
 //= require leaflet.layers
 //= require leaflet.key


@@ -111,39 +110,30 @@ $(function () {
   }
 
   addControlGroup([
   }
 
   addControlGroup([

-    L.OSM.zoom({ position: position }),
-    L.OSM.locate({ position: position })
+    L.OSM.zoom({ position }),
+    L.OSM.locate({ position })

   ]);
 
   addControlGroup([
     L.OSM.layers({
   ]);
 
   addControlGroup([
     L.OSM.layers({

-      position: position,
-      layers: map.baseLayers,
-      sidebar: sidebar
-    }),
-    L.OSM.key({
-      position: position,
-      sidebar: sidebar
+      position,
+      sidebar,
+      layers: map.baseLayers

     }),
     }),

+    L.OSM.key({ position, sidebar }),

     L.OSM.share({
     L.OSM.share({

-      "position": position,
-      "sidebar": sidebar,
+      position,
+      sidebar,

       "short": true
     })
   ]);
 
   addControlGroup([
       "short": true
     })
   ]);
 
   addControlGroup([

-    L.OSM.note({
-      position: position,
-      sidebar: sidebar
-    })
+    L.OSM.note({ position, sidebar })

   ]);
 
   addControlGroup([
   ]);
 
   addControlGroup([

-    L.OSM.query({
-      position: position,
-      sidebar: sidebar
-    })
+    L.OSM.query({ position, sidebar })

   ]);
 
   L.control.scale()
   ]);
 
   L.control.scale()

diff --git a/app/assets/javascripts/index/directions-endpoint.js b/app/assets/javascripts/index/directions-endpoint.js
index a4b3a928bbbfa85a68eb5a7647bcaaaa8490efa8..97b841f1443c6dceae67daeb7845a167708159e2 100644 (file)
--- a/app/assets/javascripts/index/directions-endpoint.js
+++ b/app/assets/javascripts/index/directions-endpoint.js
@@ -1,15 +1,8 @@
-OSM.DirectionsEndpoint = function Endpoint(map, input, iconUrl, dragCallback, changeCallback) {
+OSM.DirectionsEndpoint = function Endpoint(map, input, marker, dragCallback, changeCallback) {

   const endpoint = {};
 
   endpoint.marker = L.marker([0, 0], {
   const endpoint = {};
 
   endpoint.marker = L.marker([0, 0], {

-    icon: L.icon({
-      iconUrl: iconUrl,
-      iconSize: [25, 41],
-      iconAnchor: [12, 41],
-      popupAnchor: [1, -34],
-      shadowUrl: OSM.MARKER_SHADOW,
-      shadowSize: [41, 41]
-    }),
+    icon: OSM.getMarker(marker),

     draggable: true,
     autoPan: true
   });
     draggable: true,
     autoPan: true
   });

diff --git a/app/assets/javascripts/index/directions.js b/app/assets/javascripts/index/directions.js
index 05793345327d42714b6d23f308135f83cff528b2..57def249ac68d1d58800a0a8798e6a986b7e3c56 100644 (file)
--- a/app/assets/javascripts/index/directions.js
+++ b/app/assets/javascripts/index/directions.js
@@ -33,8 +33,8 @@ OSM.Directions = function (map) {
   };
 
   const endpoints = [
   };
 
   const endpoints = [

-    OSM.DirectionsEndpoint(map, $("input[name='route_from']"), OSM.MARKER_GREEN, endpointDragCallback, endpointChangeCallback),
-    OSM.DirectionsEndpoint(map, $("input[name='route_to']"), OSM.MARKER_RED, endpointDragCallback, endpointChangeCallback)
+    OSM.DirectionsEndpoint(map, $("input[name='route_from']"), { icon: "MARKER_GREEN" }, endpointDragCallback, endpointChangeCallback),
+    OSM.DirectionsEndpoint(map, $("input[name='route_to']"), { icon: "MARKER_RED" }, endpointDragCallback, endpointChangeCallback)

   ];
 
   let downloadURL = null;
   ];
 
   let downloadURL = null;

diff --git a/app/assets/javascripts/index/history.js b/app/assets/javascripts/index/history.js
index 9f883367a799393be5cc2d2b3a20dfbda48271e7..1a23ac7b1198188e0c7cfaaa1a10cb09ca9ce1d5 100644 (file)
--- a/app/assets/javascripts/index/history.js
+++ b/app/assets/javascripts/index/history.js
@@ -104,6 +104,10 @@ OSM.History = function (map) {
 
   function displayFirstChangesets(html) {
     $("#sidebar_content .changesets").html(html);
 
   function displayFirstChangesets(html) {
     $("#sidebar_content .changesets").html(html);

+
+    if (location.pathname === "/history") {
+      setPaginationMapHashes();
+    }

   }
 
   function displayMoreChangesets(div, html) {
   }
 
   function displayMoreChangesets(div, html) {


@@ -130,29 +134,34 @@ OSM.History = function (map) {
       nextNewList.children().appendTo(oldList);
       nextNewList.remove();
     }
       nextNewList.children().appendTo(oldList);
       nextNewList.remove();
     }

+
+    if (location.pathname === "/history") {
+      setPaginationMapHashes();
+    }
+  }
+
+  function setPaginationMapHashes() {
+    $("#sidebar .pagination a").each(function () {
+      $(this).prop("hash", OSM.formatHash({
+        center: map.getCenter(),
+        zoom: map.getZoom()
+      }));
+    });

   }
 
   function loadFirstChangesets() {
     const data = new URLSearchParams();
   }
 
   function loadFirstChangesets() {
     const data = new URLSearchParams();

-    const params = new URLSearchParams(location.search);

 
     disableChangesetIntersectionObserver();
 
     if (location.pathname === "/history") {
 
     disableChangesetIntersectionObserver();
 
     if (location.pathname === "/history") {

-      data.set("bbox", map.getBounds().wrap().toBBoxString());
+      setBboxFetchData(data);

       const feedLink = $("link[type=\"application/atom+xml\"]"),
             feedHref = feedLink.attr("href").split("?")[0];
       feedLink.attr("href", feedHref + "?" + data);
     }
 
       const feedLink = $("link[type=\"application/atom+xml\"]"),
             feedHref = feedLink.attr("href").split("?")[0];
       feedLink.attr("href", feedHref + "?" + data);
     }
 

-    data.set("list", "1");
-
-    if (params.has("before")) {
-      data.set("before", params.get("before"));
-    }
-    if (params.has("after")) {
-      data.set("after", params.get("after"));
-    }
+    setListFetchData(data, location);

 
     fetch(location.pathname + "?" + data)
       .then(response => response.text())
 
     fetch(location.pathname + "?" + data)
       .then(response => response.text())


@@ -160,13 +169,15 @@ OSM.History = function (map) {
         displayFirstChangesets(html);
         enableChangesetIntersectionObserver();
 
         displayFirstChangesets(html);
         enableChangesetIntersectionObserver();
 

-        if (params.has("before")) {
+        if (data.has("before")) {

           const [firstItem] = $("#sidebar_content .changesets ol").children().first();
           firstItem?.scrollIntoView();
           const [firstItem] = $("#sidebar_content .changesets ol").children().first();
           firstItem?.scrollIntoView();

-        }
-        if (params.has("after")) {
+        } else if (data.has("after")) {

           const [lastItem] = $("#sidebar_content .changesets ol").children().last();
           lastItem?.scrollIntoView(false);
           const [lastItem] = $("#sidebar_content .changesets ol").children().last();
           lastItem?.scrollIntoView(false);

+        } else {
+          const [sidebar] = $("#sidebar");
+          sidebar.scrollTop = 0;

         }
 
         updateMap();
         }
 
         updateMap();


@@ -179,14 +190,51 @@ OSM.History = function (map) {
 
     const div = $(this).parents(".changeset_more");
 
 
     const div = $(this).parents(".changeset_more");
 

-    $(this).hide();
-    div.find(".loader").show();
+    div.find(".pagination").addClass("invisible");
+    div.find("[hidden]").prop("hidden", false);

 
 

-    $.get($(this).attr("href"), function (html) {
-      displayMoreChangesets(div, html);
-      enableChangesetIntersectionObserver();
-      updateMap();
-    });
+    const data = new URLSearchParams();
+
+    if (location.pathname === "/history") {
+      setBboxFetchData(data);
+    }
+
+    const url = new URL($(this).attr("href"), location);
+    setListFetchData(data, url);
+
+    fetch(url.pathname + "?" + data)
+      .then(response => response.text())
+      .then(function (html) {
+        displayMoreChangesets(div, html);
+        enableChangesetIntersectionObserver();
+
+        updateMap();
+      });
+  }
+
+  function setBboxFetchData(data) {
+    const crs = map.options.crs;
+    const sw = map.getBounds().getSouthWest();
+    const ne = map.getBounds().getNorthEast();
+    const swClamped = crs.unproject(crs.project(sw));
+    const neClamped = crs.unproject(crs.project(ne));
+
+    if (sw.lat >= swClamped.lat || ne.lat <= neClamped.lat || ne.lng - sw.lng < 360) {
+      data.set("bbox", map.getBounds().wrap().toBBoxString());
+    }
+  }
+
+  function setListFetchData(data, url) {
+    const params = new URLSearchParams(url.search);
+
+    data.set("list", "1");
+
+    if (params.has("before")) {
+      data.set("before", params.get("before"));
+    }
+    if (params.has("after")) {
+      data.set("after", params.get("after"));
+    }

   }
 
   function reloadChangesetsBecauseOfMapMovement() {
   }
 
   function reloadChangesetsBecauseOfMapMovement() {

diff --git a/app/assets/javascripts/index/home.js b/app/assets/javascripts/index/home.js
index 597b68eff4a7216e81cb1c39eacf101cbb1cb8bd..1cc644cf2bc64b32ad514e1e66036ba94db6f2b6 100644 (file)
--- a/app/assets/javascripts/index/home.js
+++ b/app/assets/javascripts/index/home.js
@@ -17,7 +17,7 @@ OSM.Home = function (map) {
         map.setView(OSM.home, 15, { reset: true });
       });
       marker = L.marker(OSM.home, {
         map.setView(OSM.home, 15, { reset: true });
       });
       marker = L.marker(OSM.home, {

-        icon: OSM.getUserIcon(),
+        icon: OSM.getMarker({}),

         title: OSM.i18n.t("javascripts.home.marker_title")
       }).addTo(map);
     } else {
         title: OSM.i18n.t("javascripts.home.marker_title")
       }).addTo(map);
     } else {

diff --git a/app/assets/javascripts/index/layers/data.js b/app/assets/javascripts/index/layers/data.js
index 6452c2a4163d2938a349e44e2b781c7b282e03c4..22e1a4e6849743510167a15330d372ebeef61a54 100644 (file)
--- a/app/assets/javascripts/index/layers/data.js
+++ b/app/assets/javascripts/index/layers/data.js
@@ -2,21 +2,6 @@ OSM.initializeDataLayer = function (map) {
   let dataLoader, loadedBounds;
   const dataLayer = map.dataLayer;
 
   let dataLoader, loadedBounds;
   const dataLayer = map.dataLayer;
 

-  dataLayer.setStyle({
-    way: {
-      weight: 3,
-      color: "#000000",
-      opacity: 0.4
-    },
-    area: {
-      weight: 3,
-      color: "#ff0000"
-    },
-    node: {
-      color: "#00ff00"
-    }
-  });
-

   dataLayer.isWayArea = function () {
     return false;
   };
   dataLayer.isWayArea = function () {
     return false;
   };

diff --git a/app/assets/javascripts/index/layers/notes.js b/app/assets/javascripts/index/layers/notes.js
index 104f6f2f22cbf40d226bdfe1c411cb108c6a354f..00f1fb4e93be9c561edc1b7e25566b68590551ac 100644 (file)
--- a/app/assets/javascripts/index/layers/notes.js
+++ b/app/assets/javascripts/index/layers/notes.js
@@ -3,24 +3,6 @@ OSM.initializeNotesLayer = function (map) {
   const noteLayer = map.noteLayer;
   let notes = {};
 
   const noteLayer = map.noteLayer;
   let notes = {};
 

-  const noteIcons = {
-    "new": L.icon({
-      iconUrl: OSM.NEW_NOTE_MARKER,
-      iconSize: [25, 40],
-      iconAnchor: [12, 40]
-    }),
-    "open": L.icon({
-      iconUrl: OSM.OPEN_NOTE_MARKER,
-      iconSize: [25, 40],
-      iconAnchor: [12, 40]
-    }),
-    "closed": L.icon({
-      iconUrl: OSM.CLOSED_NOTE_MARKER,
-      iconSize: [25, 40],
-      iconAnchor: [12, 40]
-    })
-  };
-

   noteLayer.on("add", () => {
     loadNotes();
     map.on("moveend", loadNotes);
   noteLayer.on("add", () => {
     loadNotes();
     map.on("moveend", loadNotes);


@@ -41,7 +23,7 @@ OSM.initializeNotesLayer = function (map) {
   function updateMarker(old_marker, feature) {
     let marker = old_marker;
     if (marker) {
   function updateMarker(old_marker, feature) {
     let marker = old_marker;
     if (marker) {

-      marker.setIcon(noteIcons[feature.properties.status]);
+      marker.setIcon(OSM.getMarker({ icon: `${feature.properties.status}_NOTE_MARKER`, shadow: false, height: 40 }));

     } else {
       let title;
       const description = feature.properties.comments[0];
     } else {
       let title;
       const description = feature.properties.comments[0];


@@ -51,7 +33,7 @@ OSM.initializeNotesLayer = function (map) {
       }
 
       marker = L.marker(feature.geometry.coordinates.reverse(), {
       }
 
       marker = L.marker(feature.geometry.coordinates.reverse(), {

-        icon: noteIcons[feature.properties.status],
+        icon: OSM.getMarker({ icon: `${feature.properties.status}_NOTE_MARKER`, shadow: false, height: 40 }),

         title,
         opacity: 0.8,
         interactive: true
         title,
         opacity: 0.8,
         interactive: true

diff --git a/app/assets/javascripts/index/new_note.js b/app/assets/javascripts/index/new_note.js
index b1457d10b0233a745b5e9c4a2736637bcfe63834..1b409846f870848fb48d9871061d71e53ce6b99f 100644 (file)
--- a/app/assets/javascripts/index/new_note.js
+++ b/app/assets/javascripts/index/new_note.js
@@ -6,24 +6,6 @@ OSM.NewNote = function (map) {
   let newNoteMarker,
       halo;
 
   let newNoteMarker,
       halo;
 

-  const noteIcons = {
-    "new": L.icon({
-      iconUrl: OSM.NEW_NOTE_MARKER,
-      iconSize: [25, 40],
-      iconAnchor: [12, 40]
-    }),
-    "open": L.icon({
-      iconUrl: OSM.OPEN_NOTE_MARKER,
-      iconSize: [25, 40],
-      iconAnchor: [12, 40]
-    }),
-    "closed": L.icon({
-      iconUrl: OSM.CLOSED_NOTE_MARKER,
-      iconSize: [25, 40],
-      iconAnchor: [12, 40]
-    })
-  };
-

   addNoteButton.on("click", function (e) {
     e.preventDefault();
     e.stopPropagation();
   addNoteButton.on("click", function (e) {
     e.preventDefault();
     e.stopPropagation();


@@ -49,7 +31,7 @@ OSM.NewNote = function (map) {
 
   function addCreatedNoteMarker(feature) {
     const marker = L.marker(feature.geometry.coordinates.reverse(), {
 
   function addCreatedNoteMarker(feature) {
     const marker = L.marker(feature.geometry.coordinates.reverse(), {

-      icon: noteIcons[feature.properties.status],
+      icon: OSM.getMarker({ icon: `${feature.properties.status}_NOTE_MARKER`, shadow: false, height: 40 }),

       opacity: 0.9,
       interactive: true
     });
       opacity: 0.9,
       interactive: true
     });


@@ -79,7 +61,7 @@ OSM.NewNote = function (map) {
     if (newNoteMarker) map.removeLayer(newNoteMarker);
 
     newNoteMarker = L.marker(latlng, {
     if (newNoteMarker) map.removeLayer(newNoteMarker);
 
     newNoteMarker = L.marker(latlng, {

-      icon: noteIcons.new,
+      icon: OSM.getMarker({ icon: "NEW_NOTE_MARKER", shadow: false, height: 40 }),

       opacity: 0.9,
       draggable: true
     });
       opacity: 0.9,
       draggable: true
     });

diff --git a/app/assets/javascripts/index/note.js b/app/assets/javascripts/index/note.js
index f0b7dae273d9b02a0ac812d36125b4dd2bbe5fd5..a77735c95966890a66eab7c0b3e52ff8995d04bf 100644 (file)
--- a/app/assets/javascripts/index/note.js
+++ b/app/assets/javascripts/index/note.js
@@ -2,24 +2,6 @@ OSM.Note = function (map) {
   const content = $("#sidebar_content"),
         page = {};
 
   const content = $("#sidebar_content"),
         page = {};
 

-  const noteIcons = {
-    "new": L.icon({
-      iconUrl: OSM.NEW_NOTE_MARKER,
-      iconSize: [25, 40],
-      iconAnchor: [12, 40]
-    }),
-    "open": L.icon({
-      iconUrl: OSM.OPEN_NOTE_MARKER,
-      iconSize: [25, 40],
-      iconAnchor: [12, 40]
-    }),
-    "closed": L.icon({
-      iconUrl: OSM.CLOSED_NOTE_MARKER,
-      iconSize: [25, 40],
-      iconAnchor: [12, 40]
-    })
-  };
-

   page.pushstate = page.popstate = function (path, id) {
     OSM.loadSidebarContent(path, function () {
       const data = $(".details").data();
   page.pushstate = page.popstate = function (path, id) {
     OSM.loadSidebarContent(path, function () {
       const data = $(".details").data();


@@ -87,7 +69,7 @@ OSM.Note = function (map) {
         type: "note",
         id: parseInt(id, 10),
         latLng: L.latLng(data.coordinates.split(",")),
         type: "note",
         id: parseInt(id, 10),
         latLng: L.latLng(data.coordinates.split(",")),

-        icon: noteIcons[data.status]
+        icon: OSM.getMarker({ icon: `${data.status}_NOTE_MARKER`, shadow: false, height: 40 })

       }, function () {
         if (!hashParams.center && !skipMoveToNote) {
           const latLng = L.latLng(data.coordinates.split(","));
       }, function () {
         if (!hashParams.center && !skipMoveToNote) {
           const latLng = L.latLng(data.coordinates.split(","));

diff --git a/app/assets/javascripts/index/search.js b/app/assets/javascripts/index/search.js
index b3ef3ceb3c13de3d4a7dbad7b4d8f7a313719000..4c1213320a70672bbe7f2c72e44ecee242ddf857 100644 (file)
--- a/app/assets/javascripts/index/search.js
+++ b/app/assets/javascripts/index/search.js
@@ -63,7 +63,7 @@ OSM.Search = function (map) {
     if (!marker) {
       const data = $(this).find("a.set_position").data();
 
     if (!marker) {
       const data = $(this).find("a.set_position").data();
 

-      marker = L.marker([data.lat, data.lon], { icon: OSM.getUserIcon() });
+      marker = L.marker([data.lat, data.lon], { icon: OSM.getMarker({}) });

 
       $(this).data("marker", marker);
     }
 
       $(this).data("marker", marker);
     }

diff --git a/app/assets/javascripts/leaflet.locate.js b/app/assets/javascripts/leaflet.locate.js
index d270d6499af98485c4984ae6a6ee55030eb3985b..8fc182f38e3161d8f5e18c3e2c7b3ee5d4db554c 100644 (file)
--- a/app/assets/javascripts/leaflet.locate.js
+++ b/app/assets/javascripts/leaflet.locate.js
@@ -1,3 +1,5 @@
+//= require leaflet.locatecontrol/dist/L.Control.Locate.umd
+

 L.OSM.locate = function (options) {
   const control = L.control.locate({
     icon: "icon geolocate",
 L.OSM.locate = function (options) {
   const control = L.control.locate({
     icon: "icon geolocate",

diff --git a/app/assets/javascripts/leaflet.map.js b/app/assets/javascripts/leaflet.map.js
index ac31f79416034e1f894e7cefbedcfdd678606b0c..b301711a2679758deea332603d34acf13acc363d 100644 (file)
--- a/app/assets/javascripts/leaflet.map.js
+++ b/app/assets/javascripts/leaflet.map.js
@@ -391,13 +391,17 @@ OSM.isDarkMap = function () {
   return window.matchMedia("(prefers-color-scheme: dark)").matches;
 };
 
   return window.matchMedia("(prefers-color-scheme: dark)").matches;
 };
 

-OSM.getUserIcon = function (url) {
-  return L.icon({
-    iconUrl: url || OSM.MARKER_RED,
-    iconSize: [25, 41],
-    iconAnchor: [12, 41],
-    popupAnchor: [1, -34],
-    shadowUrl: OSM.MARKER_SHADOW,
-    shadowSize: [41, 41]
-  });
+OSM.getMarker = function ({ icon = "MARKER_RED", shadow = true, height = 41 }) {
+  const options = {
+    iconUrl: OSM[icon.toUpperCase()] || OSM.MARKER_RED,
+    iconSize: [25, height],
+    iconAnchor: [12, height],
+    popupAnchor: [1, -34]
+  };
+  if (shadow) {
+    options.shadowUrl = OSM.MARKER_SHADOW;
+    options.shadowSize = [41, 41];
+    options.shadowAnchor = [12, 41];
+  }
+  return L.icon(options);

 };
 };

diff --git a/app/assets/javascripts/osm.js.erb b/app/assets/javascripts/osm.js.erb
index 4f0bd8f777c608986d65c4e1d7ab1589dad8d07c..d73d1c16302d5c9b64017a885b4e07a04f2d90b9 100644 (file)
--- a/app/assets/javascripts/osm.js.erb
+++ b/app/assets/javascripts/osm.js.erb
@@ -30,6 +30,7 @@ OSM = {
   LAYER_DEFINITIONS: <%= MapLayers::full_definitions("config/layers.yml").to_json %>,
   LAYERS_WITH_MAP_KEY: <%= YAML.load_file(Rails.root.join("config/key.yml")).keys.to_json %>,
 
   LAYER_DEFINITIONS: <%= MapLayers::full_definitions("config/layers.yml").to_json %>,
   LAYERS_WITH_MAP_KEY: <%= YAML.load_file(Rails.root.join("config/key.yml")).keys.to_json %>,
 

+  MARKER_BLUE: <%= image_path("marker-blue.png").to_json %>,

   MARKER_GREEN: <%= image_path("marker-green.png").to_json %>,
   MARKER_RED: <%= image_path("marker-red.png").to_json %>,
 
   MARKER_GREEN: <%= image_path("marker-green.png").to_json %>,
   MARKER_RED: <%= image_path("marker-red.png").to_json %>,
 


@@ -157,11 +158,11 @@ OSM = {
       layers = args.getLayersCode();
     } else if (args instanceof URLSearchParams) {
       center = args.get("center") || L.latLng(args.get("lat"), args.get("lon"));
       layers = args.getLayersCode();
     } else if (args instanceof URLSearchParams) {
       center = args.get("center") || L.latLng(args.get("lat"), args.get("lon"));

-      zoom = args.get("zoom");
+      zoom = Number(args.get("zoom"));

       layers = args.get("layers") || "";
     } else {
       center = args.center || L.latLng(args.lat, args.lon);
       layers = args.get("layers") || "";
     } else {
       center = args.center || L.latLng(args.lat, args.lon);

-      zoom = args.zoom;
+      zoom = Number(args.zoom);

       layers = args.layers || "";
     }
 
       layers = args.layers || "";
     }
 

diff --git a/app/assets/javascripts/user.js b/app/assets/javascripts/user.js
index 77a71097b1d41d899372c043e5341ba8f1ce2e27..5f8a931e3956132583e8a9f52734b9621b698a70 100644 (file)
--- a/app/assets/javascripts/user.js
+++ b/app/assets/javascripts/user.js
@@ -1,4 +1,4 @@
-//= require leaflet.locatecontrol/dist/L.Control.Locate.umd
+//= require leaflet.locate

 
 (function () {
   $(document).on("change", "#user_all", function () {
 
 (function () {
   $(document).on("change", "#user_all", function () {


@@ -18,30 +18,9 @@ $(function () {
 
     const position = $("html").attr("dir") === "rtl" ? "topleft" : "topright";
 
 
     const position = $("html").attr("dir") === "rtl" ? "topleft" : "topright";
 

-    L.OSM.zoom({ position: position })
-      .addTo(map);
-
-    const locate = L.control.locate({
-      position: position,
-      icon: "icon geolocate",
-      iconLoading: "icon geolocate",
-      strings: {
-        title: OSM.i18n.t("javascripts.map.locate.title"),
-        popup: function (options) {
-          return OSM.i18n.t("javascripts.map.locate." + options.unit + "Popup", { count: options.distance });
-        }
-      }
-    }).addTo(map);
-
-    const locateContainer = locate.getContainer();
+    L.OSM.zoom({ position }).addTo(map);

 
 

-    $(locateContainer)
-      .removeClass("leaflet-control-locate leaflet-bar")
-      .addClass("control-locate")
-      .children("a")
-      .attr("href", "#")
-      .removeClass("leaflet-bar-part leaflet-bar-part-single")
-      .addClass("control-button");
+    L.OSM.locate({ position }).addTo(map);

 
     if (OSM.home) {
       map.setView([OSM.home.lat, OSM.home.lon], defaultHomeZoom);
 
     if (OSM.home) {
       map.setView([OSM.home.lat, OSM.home.lon], defaultHomeZoom);


@@ -51,7 +30,7 @@ $(function () {
 
     if ($("#map").hasClass("set_location")) {
       marker = L.marker([0, 0], {
 
     if ($("#map").hasClass("set_location")) {
       marker = L.marker([0, 0], {

-        icon: OSM.getUserIcon(),
+        icon: OSM.getMarker({}),

         keyboard: false,
         interactive: false
       });
         keyboard: false,
         interactive: false
       });


@@ -124,7 +103,7 @@ $(function () {
       $("[data-user]").each(function () {
         const user = $(this).data("user");
         if (user.lon && user.lat) {
       $("[data-user]").each(function () {
         const user = $(this).data("user");
         if (user.lon && user.lat) {

-          L.marker([user.lat, user.lon], { icon: OSM.getUserIcon(user.icon) }).addTo(map)
+          L.marker([user.lat, user.lon], { icon: OSM.getMarker({ icon: user.icon }) }).addTo(map)

             .bindPopup(user.description, { minWidth: 200 });
         }
       });
             .bindPopup(user.description, { minWidth: 200 });
         }
       });

diff --git a/app/assets/javascripts/welcome.js b/app/assets/javascripts/welcome.js
index 5ce6afdccbf2afca90a437fa04d11c732c371bba..dc269a31088c5493488b4df3cf173c8976f0df74 100644 (file)
--- a/app/assets/javascripts/welcome.js
+++ b/app/assets/javascripts/welcome.js
@@ -15,10 +15,6 @@ $(function () {
       $(".start-mapping").addClass("loading");
 
       if (navigator.geolocation) {
       $(".start-mapping").addClass("loading");
 
       if (navigator.geolocation) {

-        // handle firefox's weird implementation
-        // https://bugzilla.mozilla.org/show_bug.cgi?id=675533
-        window.setTimeout(manualEdit, 4000);
-

         navigator.geolocation.getCurrentPosition(geoSuccess, manualEdit);
       } else {
         manualEdit();
         navigator.geolocation.getCurrentPosition(geoSuccess, manualEdit);
       } else {
         manualEdit();

diff --git a/app/assets/stylesheets/common.scss b/app/assets/stylesheets/common.scss
index 27d58f84ea3e963025b531ee2d9c12b061ce3513..9fff025d0242947b78cf7e4eaaaf73b351197794 100644 (file)
--- a/app/assets/stylesheets/common.scss
+++ b/app/assets/stylesheets/common.scss
@@ -620,11 +620,6 @@ tr.turn {
       z-index: 2; /* needs to be higher than Bootstrap's stretched link ::after z-index */
     }
   }
       z-index: 2; /* needs to be higher than Bootstrap's stretched link ::after z-index */
     }
   }

-
-  .changeset_more .loader {
-    display: none;
-    width: 100%;
-  }

 }
 
 /* Rules for the browse sidebar */
 }
 
 /* Rules for the browse sidebar */


@@ -679,12 +674,6 @@ tr.turn {
     > * {
         margin: -1px;
     }
     > * {
         margin: -1px;
     }

-    #minlon {
-      /*rtl:ignore*/ float: left;
-    }
-    #maxlon {
-      /*rtl:ignore*/ float: right;
-    }

   }
 }
 
   }
 }
 

diff --git a/app/views/changesets/index.html.erb b/app/views/changesets/index.html.erb
index 3f25cf134bfbf7bce96fe25afd0c2bb1d599d59d..cd59d14c81afc422579bb4ec366d1733f9f24efb 100644 (file)
--- a/app/views/changesets/index.html.erb
+++ b/app/views/changesets/index.html.erb
@@ -1,11 +1,15 @@
 <% if @newer_changesets_id %>
 <% if @newer_changesets_id %>

-  <div class="changeset_more my-3 text-center">
-    <%= link_to t(".load_more"), url_for(@params.merge(:before => nil, :after => @newer_changesets_id)), :class => "btn btn-primary" %>
-    <div class="text-center loader">
+  <div class="changeset_more my-3">
+    <div class="text-center position-absolute start-0 end-0" hidden>

       <div class="spinner-border" role="status">
         <span class="visually-hidden"><%= t("browse.start_rjs.loading") %></span>
       </div>
     </div>
       <div class="spinner-border" role="status">
         <span class="visually-hidden"><%= t("browse.start_rjs.loading") %></span>
       </div>
     </div>

+    <ul class="pagination justify-content-center">
+      <li class="page-item">
+        <%= link_to t(".newer_changesets"), url_for(:after => @newer_changesets_id), :class => "page-link" %>
+      </li>
+    </ul>

   </div>
 <% end %>
 <% if @changesets.present? %>
   </div>
 <% end %>
 <% if @changesets.present? %>


@@ -20,12 +24,16 @@
   <p class="mx-3"><%= params[:before] ? t(".no_more") : t(".empty") %></p>
 <% end %>
 <% if @older_changesets_id -%>
   <p class="mx-3"><%= params[:before] ? t(".no_more") : t(".empty") %></p>
 <% end %>
 <% if @older_changesets_id -%>

-  <div class="changeset_more my-3 text-center">
-    <%= link_to t(".load_more"), url_for(@params.merge(:before => @older_changesets_id, :after => nil)), :class => "btn btn-primary" %>
-    <div class="text-center loader">
+  <div class="changeset_more my-3">
+    <div class="text-center position-absolute start-0 end-0" hidden>

       <div class="spinner-border" role="status">
         <span class="visually-hidden"><%= t("browse.start_rjs.loading") %></span>
       </div>
     </div>
       <div class="spinner-border" role="status">
         <span class="visually-hidden"><%= t("browse.start_rjs.loading") %></span>
       </div>
     </div>

+    <ul class="pagination justify-content-center">
+      <li class="page-item">
+        <%= link_to t(".older_changesets"), url_for(:before => @older_changesets_id), :class => "page-link" %>
+      </li>
+    </ul>

   </div>
 <% end -%>
   </div>
 <% end -%>

diff --git a/app/views/dashboards/_contact.html.erb b/app/views/dashboards/_contact.html.erb
index 0dda0b35481f98d146f563974105a6120224c86e..cea6c2b2910cadba6c81212f9f9d7f5522c4cc90 100644 (file)
--- a/app/views/dashboards/_contact.html.erb
+++ b/app/views/dashboards/_contact.html.erb
@@ -1,10 +1,10 @@
 <% user_data = {
      :lon => contact.home_lon,
      :lat => contact.home_lat,
 <% user_data = {
      :lon => contact.home_lon,
      :lat => contact.home_lat,

-     :icon => image_path(type == "following" ? "marker-blue.png" : "marker-green.png"),
+     :icon => type == "following" ? "MARKER_BLUE" : "MARKER_GREEN",

      :description => render(:partial => "popup", :object => contact, :locals => { :type => type })
    } %>
      :description => render(:partial => "popup", :object => contact, :locals => { :type => type })
    } %>

-<%= tag.div :class => "clearfix row", :data => { :user => user_data } do %>
+<%= tag.div :class => "row", :data => { :user => user_data } do %>

   <div class="col-auto">
     <%= user_thumbnail contact %>
   </div>
   <div class="col-auto">
     <%= user_thumbnail contact %>
   </div>


@@ -32,7 +32,7 @@
     </p>
 
     <nav class='secondary-actions'>
     </p>
 
     <nav class='secondary-actions'>

-      <ul class='clearfix text-body-secondary'>
+      <ul class='text-body-secondary'>

         <li><%= link_to t("users.show.send message"), new_message_path(contact) %></li>
         <li>
           <% if current_user.follows?(contact) %>
         <li><%= link_to t("users.show.send message"), new_message_path(contact) %></li>
         <li>
           <% if current_user.follows?(contact) %>

diff --git a/app/views/dashboards/show.html.erb b/app/views/dashboards/show.html.erb
index e110ad531f1f11ad66b4464e24a39a3e52f7ead9..78ff0560fbc1acad98a900597a6b78d0e0478945 100644 (file)
--- a/app/views/dashboards/show.html.erb
+++ b/app/views/dashboards/show.html.erb
@@ -15,7 +15,7 @@
       <% user_data = {
            :lon => current_user.home_lon,
            :lat => current_user.home_lat,
       <% user_data = {
            :lon => current_user.home_lon,
            :lat => current_user.home_lat,

-           :icon => image_path("marker-red.png"),
+           :icon => "MARKER_RED",

            :description => render(:partial => "popup", :object => current_user, :locals => { :type => "your location" })
          } %>
       <%= tag.div "", :id => "map", :class => "content_map border border-secondary-subtle rounded z-0", :data => { :user => user_data } %>
            :description => render(:partial => "popup", :object => current_user, :locals => { :type => "your location" })
          } %>
       <%= tag.div "", :id => "map", :class => "content_map border border-secondary-subtle rounded z-0", :data => { :user => user_data } %>


@@ -29,7 +29,7 @@
       <%= t ".no followings" %>
     <% else %>
       <nav class='secondary-actions mb-3'>
       <%= t ".no followings" %>
     <% else %>
       <nav class='secondary-actions mb-3'>

-        <ul class='clearfix'>
+        <ul>

           <li><%= link_to t(".followed_changesets"), friend_changesets_path %></li>
           <li><%= link_to t(".followed_diaries"), friends_diary_entries_path %></li>
         </ul>
           <li><%= link_to t(".followed_changesets"), friend_changesets_path %></li>
           <li><%= link_to t(".followed_diaries"), friends_diary_entries_path %></li>
         </ul>


@@ -47,7 +47,7 @@
       <%= t ".no nearby users" %>
     <% else %>
       <nav class='secondary-actions mb-3'>
       <%= t ".no nearby users" %>
     <% else %>
       <nav class='secondary-actions mb-3'>

-        <ul class='clearfix'>
+        <ul>

           <li><%= link_to t(".nearby_changesets"), nearby_changesets_path %></li>
           <li><%= link_to t(".nearby_diaries"), nearby_diary_entries_path %></li>
         </ul>
           <li><%= link_to t(".nearby_changesets"), nearby_changesets_path %></li>
           <li><%= link_to t(".nearby_diaries"), nearby_diary_entries_path %></li>
         </ul>

diff --git a/app/views/diary_entries/_diary_entry.html.erb b/app/views/diary_entries/_diary_entry.html.erb
index 2d8243d1b23bf68af5ca3935c175bc398ffc0c1a..a4fb347830e7c2bdfca0c48facadd5f1300ad533 100644 (file)
--- a/app/views/diary_entries/_diary_entry.html.erb
+++ b/app/views/diary_entries/_diary_entry.html.erb
@@ -10,7 +10,7 @@
   <% end %>
 
   <nav class='secondary-actions'>
   <% end %>
 
   <nav class='secondary-actions'>

-    <ul class='clearfix'>
+    <ul>

       <% if params[:action] == 'index' %>
         <li><%= link_to t(".comment_link"), diary_entry_path(diary_entry.user, diary_entry, :anchor => "newcomment") %></li>
         <li><%= link_to t(".reply_link"), new_message_path(diary_entry.user, :message => { :title => "Re: #{diary_entry.title}" }) %></li>
       <% if params[:action] == 'index' %>
         <li><%= link_to t(".comment_link"), diary_entry_path(diary_entry.user, diary_entry, :anchor => "newcomment") %></li>
         <li><%= link_to t(".reply_link"), new_message_path(diary_entry.user, :message => { :title => "Re: #{diary_entry.title}" }) %></li>

diff --git a/app/views/diary_entries/index.html.erb b/app/views/diary_entries/index.html.erb
index 0457cc4a21b7fa4a951e9df8197099c952124d29..f6ef9bb593ad54d04cd4fa1c1db1f237de7c1589 100644 (file)
--- a/app/views/diary_entries/index.html.erb
+++ b/app/views/diary_entries/index.html.erb
@@ -11,7 +11,7 @@
       <h1><%= @title %></h1>
 
       <nav class="secondary-actions">
       <h1><%= @title %></h1>
 
       <nav class="secondary-actions">

-        <ul class="clearfix">
+        <ul>

           <% unless params[:friends] or params[:nearby] -%>
             <li><%= rss_link_to :action => "rss", :language => params[:language] %></li>
           <% end -%>
           <% unless params[:friends] or params[:nearby] -%>
             <li><%= rss_link_to :action => "rss", :language => params[:language] %></li>
           <% end -%>

diff --git a/app/views/issues/show.html.erb b/app/views/issues/show.html.erb
index 111f5d0d67f899a3f1d258af9c0f186dc3b82fe5..b8f07f1989e3a8b4722ec22981e744a7596c3ce1 100644 (file)
--- a/app/views/issues/show.html.erb
+++ b/app/views/issues/show.html.erb
@@ -26,7 +26,7 @@
   </small>
 </p>
 <nav class="secondary-actions">
   </small>
 </p>
 <nav class="secondary-actions">

-  <ul class="clearfix">
+  <ul>

     <% if @issue.may_resolve? %>
       <li><%= link_to t(".resolve"), resolve_issue_url(@issue), :method => :post %></li>
     <% end %>
     <% if @issue.may_resolve? %>
       <li><%= link_to t(".resolve"), resolve_issue_url(@issue), :method => :post %></li>
     <% end %>

diff --git a/app/views/site/export.html.erb b/app/views/site/export.html.erb
index d277f344e4530a3a3f6dd467ff35fd5d192daeb3..248fea8cd6a1ab97532e12dbad3ce8988cca9c8b 100644 (file)
--- a/app/views/site/export.html.erb
+++ b/app/views/site/export.html.erb
@@ -8,7 +8,7 @@
   <div class='export_area_inputs text-center mb-3'>
     <div class='export_boxy border border-secondary-subtle rounded bg-body-secondary' dir='ltr'>
       <%= text_field_tag("maxlat", nil, :size => 10, :autocomplete => "off", :class => "form-control text-center mx-auto") %>
   <div class='export_area_inputs text-center mb-3'>
     <div class='export_boxy border border-secondary-subtle rounded bg-body-secondary' dir='ltr'>
       <%= text_field_tag("maxlat", nil, :size => 10, :autocomplete => "off", :class => "form-control text-center mx-auto") %>

-      <div class="clearfix">
+      <div class="d-flex justify-content-between">

         <%= text_field_tag("minlon", nil, :size => 10, :autocomplete => "off", :class => "form-control text-center my-2") %>
         <%= text_field_tag("maxlon", nil, :size => 10, :autocomplete => "off", :class => "form-control text-center my-2") %>
       </div>
         <%= text_field_tag("minlon", nil, :size => 10, :autocomplete => "off", :class => "form-control text-center my-2") %>
         <%= text_field_tag("maxlon", nil, :size => 10, :autocomplete => "off", :class => "form-control text-center my-2") %>
       </div>

diff --git a/app/views/site/fixthemap.html.erb b/app/views/site/fixthemap.html.erb
index 9d9ef9232bc8d5f3728df5fa117915d7fa6c824a..c4951f7cc50d32eeaaf36ffadd018d6be6eee4e3 100644 (file)
--- a/app/views/site/fixthemap.html.erb
+++ b/app/views/site/fixthemap.html.erb
@@ -22,7 +22,8 @@
   <div class='col-sm'>
     <h3 class='fs-5'><%= t "site.welcome.add_a_note.title" %></h3>
     <p><%= t "site.welcome.add_a_note.para_1" %></p>
   <div class='col-sm'>
     <h3 class='fs-5'><%= t "site.welcome.add_a_note.title" %></h3>
     <p><%= t "site.welcome.add_a_note.para_1" %></p>

-    <p><%= t ".how_to_help.add_a_note.instructions_1_html", :note_icon => tag.a(:class => "icon note bg-dark rounded-1") %></p>
+    <p><%= t ".how_to_help.add_a_note.instructions_1_html", :note_icon => tag.a(:class => "icon note bg-dark rounded-1",
+                                                                                :title => t("javascripts.site.createnote_tooltip")) %></p>

   </div>
 </div>
 
   </div>
 </div>
 

diff --git a/app/views/site/id.html.erb b/app/views/site/id.html.erb
index 64cb4fd58e84be24042079846fb0364899454b72..52f2de937cff4e4d0d71f2d843d9b3ef6eaef289 100644 (file)
--- a/app/views/site/id.html.erb
+++ b/app/views/site/id.html.erb
@@ -6,6 +6,7 @@
   <!--[if !IE || gte IE 9]><!-->
   <%= javascript_include_tag "id" %>
   <!-- <![endif]-->
   <!--[if !IE || gte IE 9]><!-->
   <%= javascript_include_tag "id" %>
   <!-- <![endif]-->

+  <title></title>

 </head>
 <body>
 <% data = {}
 </head>
 <body>
 <% data = {}

diff --git a/app/views/site/welcome.html.erb b/app/views/site/welcome.html.erb
index 33c9a7e24609f10427ef84759a89bec893d3d5b7..a27e3faa0b0564870c753c489bf378e6aabed4e5 100644 (file)
--- a/app/views/site/welcome.html.erb
+++ b/app/views/site/welcome.html.erb
@@ -85,7 +85,7 @@
 <% end %>
 </div>
 
 <% end %>
 </div>
 

-<div class='alert alert-primary'>
+<div class='alert alert-secondary'>

   <h2><%= t ".add_a_note.title" %></h2>
   <p><%= t ".add_a_note.para_1" %></p>
   <p><%= t ".add_a_note.para_2_html", :map_link => link_to(t(".add_a_note.the_map"), root_path),
   <h2><%= t ".add_a_note.title" %></h2>
   <p><%= t ".add_a_note.para_1" %></p>
   <p><%= t ".add_a_note.para_2_html", :map_link => link_to(t(".add_a_note.the_map"), root_path),

diff --git a/app/views/users/show.html.erb b/app/views/users/show.html.erb
index 5ee0c190081ba4ebad035c5f6ec9f235d6e6d55f..da6ddfb9deff2e9998cdc0eaa156e32426df7c0a 100644 (file)
--- a/app/views/users/show.html.erb
+++ b/app/views/users/show.html.erb
@@ -12,7 +12,7 @@
       <% if current_user and @user.id == current_user.id %>
         <!-- Displaying user's own profile page -->
         <nav class='secondary-actions'>
       <% if current_user and @user.id == current_user.id %>
         <!-- Displaying user's own profile page -->
         <nav class='secondary-actions'>

-          <ul class='clearfix'>
+          <ul>

             <li>
               <%= link_to t(".my edits"), :controller => "changesets", :action => "index", :display_name => current_user.display_name %>
               <span class='badge count-number'><%= number_with_delimiter(current_user.changesets.size) %></span>
             <li>
               <%= link_to t(".my edits"), :controller => "changesets", :action => "index", :display_name => current_user.display_name %>
               <span class='badge count-number'><%= number_with_delimiter(current_user.changesets.size) %></span>


@@ -57,7 +57,7 @@
         <% else %>
         <!-- Displaying user profile page to the public -->
         <nav class='secondary-actions'>
         <% else %>
         <!-- Displaying user profile page to the public -->
         <nav class='secondary-actions'>

-          <ul class='clearfix'>
+          <ul>

 
             <li>
               <%= link_to t(".edits"), :controller => "changesets", :action => "index", :display_name => @user.display_name %>
 
             <li>
               <%= link_to t(".edits"), :controller => "changesets", :action => "index", :display_name => @user.display_name %>


@@ -167,7 +167,7 @@
 
       <% if can?(:update, :user_status) %>
         <nav class='secondary-actions'>
 
       <% if can?(:update, :user_status) %>
         <nav class='secondary-actions'>

-          <ul class='clearfix'>
+          <ul>

             <% if @user.may_activate? %>
               <li>
                 <%= link_to t(".activate_user"), user_status_path(@user, :event => "activate"), :method => :put, :data => { :confirm => t(".confirm") } %>
             <% if @user.may_activate? %>
               <li>
                 <%= link_to t(".activate_user"), user_status_path(@user, :event => "activate"), :method => :put, :data => { :confirm => t(".confirm") } %>


@@ -235,7 +235,7 @@
   </div>
 <% end %>
 
   </div>
 <% end %>
 

-<div class="richtext text-break clearfix"><%= @user.description.to_html %></div>
+<div class="richtext text-break"><%= @user.description.to_html %></div>

 
 <% if @heatmap_data.present? %>
   <div class="row">
 
 <% if @heatmap_data.present? %>
   <div class="row">

diff --git a/config/locales/af.yml b/config/locales/af.yml
index 0ab6ae96ec264e0ce39a7001d46305d8d136de5d..29765baf784b9b3c3120d4e31a68ee9d58003dc1 100644 (file)
--- a/config/locales/af.yml
+++ b/config/locales/af.yml
@@ -389,7 +389,6 @@ af:
       no_more: Geen meer wysigingstelle gevind nie.
       no_more_area: Geen wysigingstelle in hierdie gebied nie.
       no_more_user: Geen ander wysigingstelle deur hierdie gebruiker nie.
       no_more: Geen meer wysigingstelle gevind nie.
       no_more_area: Geen wysigingstelle in hierdie gebied nie.
       no_more_user: Geen ander wysigingstelle deur hierdie gebruiker nie.

-      load_more: Laai nog

       feed:
         title: Wysigingstel %{id}
         title_comment: Wysigingstel %{id} - %{comment}
       feed:
         title: Wysigingstel %{id}
         title_comment: Wysigingstel %{id} - %{comment}

diff --git a/config/locales/ar.yml b/config/locales/ar.yml
index f28f27fea578edcf9613fe44c5784095480256cb..4dd0b10cda57c0507f700c2fce0beb2b69eacf6d 100644 (file)
--- a/config/locales/ar.yml
+++ b/config/locales/ar.yml
@@ -538,7 +538,6 @@ ar:
       no_more: لم يُعثَر على مجموعات تغييرات أخرى.
       no_more_area: لم يُعثَر على مجموعات تغييرات أخرى في هذه المنطقة.
       no_more_user: لم يُعثَر على مجموعات تغييرات أخرى بواسطة هذا المستخدم.
       no_more: لم يُعثَر على مجموعات تغييرات أخرى.
       no_more_area: لم يُعثَر على مجموعات تغييرات أخرى في هذه المنطقة.
       no_more_user: لم يُعثَر على مجموعات تغييرات أخرى بواسطة هذا المستخدم.

-      load_more: تحميل المزيد؟

       feed:
         title: حزمة التغييرات %{id}
         title_comment: حزمة التغييرات %{id} - %{comment}
       feed:
         title: حزمة التغييرات %{id}
         title_comment: حزمة التغييرات %{id} - %{comment}

diff --git a/config/locales/ast.yml b/config/locales/ast.yml
index 5cc623863981bcab07500e00d11dcd63086723d8..9611a9c0c31d09c115f482c80830fa06dd34b0f6 100644 (file)
--- a/config/locales/ast.yml
+++ b/config/locales/ast.yml
@@ -363,7 +363,6 @@ ast:
       no_more: Nun s'alcontraron más conxuntos de cambeos.
       no_more_area: Nun hai más conxuntos de cambeos nesta área.
       no_more_user: Nun hai más conxuntos de cambeos d'esti usuariu.
       no_more: Nun s'alcontraron más conxuntos de cambeos.
       no_more_area: Nun hai más conxuntos de cambeos nesta área.
       no_more_user: Nun hai más conxuntos de cambeos d'esti usuariu.

-      load_more: Cargar más

       feed:
         title: Conxuntu de cambeos %{id}
         title_comment: Conxuntu de cambeos %{id} - %{comment}
       feed:
         title: Conxuntu de cambeos %{id}
         title_comment: Conxuntu de cambeos %{id} - %{comment}

diff --git a/config/locales/ba.yml b/config/locales/ba.yml
index 834373713535d6b5a00781266c281b7a41bb1073..6e592699b2770300b4afcdc9fdef3c9662dba31a 100644 (file)
--- a/config/locales/ba.yml
+++ b/config/locales/ba.yml
@@ -444,7 +444,6 @@ ba:
       no_more: Башҡа төҙәтмәләр пакеттары табылманы.
       no_more_area: Был өлкәлә башҡа төҙәтмәләр пакеты юҡ.
       no_more_user: Был ҡулланыусынан башҡа төҙәтмәләр пакеты юҡ.
       no_more: Башҡа төҙәтмәләр пакеттары табылманы.
       no_more_area: Был өлкәлә башҡа төҙәтмәләр пакеты юҡ.
       no_more_user: Был ҡулланыусынан башҡа төҙәтмәләр пакеты юҡ.

-      load_more: Күберәк тейәү

       feed:
         title: 'Төҙәтеүҙәр пакеты: %{id}'
         title_comment: Төҙәтеүҙәр пакеты %{id} — %{comment}
       feed:
         title: 'Төҙәтеүҙәр пакеты: %{id}'
         title_comment: Төҙәтеүҙәр пакеты %{id} — %{comment}

diff --git a/config/locales/be.yml b/config/locales/be.yml
index bba191d68b9979132f563dc4833d5d03a5f80356..55fbe8f73a0d08c00f398da88be8c4ea6fb99ba8 100644 (file)
--- a/config/locales/be.yml
+++ b/config/locales/be.yml
@@ -528,7 +528,6 @@ be:
       no_more: Больш ніякіх пакетаў правак не знойдзена.
       no_more_area: Больш няма пакетаў правак у гэтай вобласці.
       no_more_user: Больш няма пакетаў правак ад гэтага карыстальніка.
       no_more: Больш ніякіх пакетаў правак не знойдзена.
       no_more_area: Больш няма пакетаў правак у гэтай вобласці.
       no_more_user: Больш няма пакетаў правак ад гэтага карыстальніка.

-      load_more: Загрузіць больш

       feed:
         title: Набор змен %{id}
         title_comment: Набор змен %{id} - %{comment}
       feed:
         title: Набор змен %{id}
         title_comment: Набор змен %{id} - %{comment}

diff --git a/config/locales/bg.yml b/config/locales/bg.yml
index cc4e8a9f3edfa5ce950dc8e20ae31d6209b0f972..b34ebb58cd2caa61022c267b2237a02178db68b2 100644 (file)
--- a/config/locales/bg.yml
+++ b/config/locales/bg.yml
@@ -386,7 +386,6 @@ bg:
       no_more: Няма повече списъци с промени.
       no_more_area: Няма повече списъци с промени в този район.
       no_more_user: Няма повече списъци с промени от потребителя.
       no_more: Няма повече списъци с промени.
       no_more_area: Няма повече списъци с промени в този район.
       no_more_user: Няма повече списъци с промени от потребителя.

-      load_more: Зареждане на още

       feed:
         title: Списък с промени %{id}
         title_comment: Списък с промени %{id} - %{comment}
       feed:
         title: Списък с промени %{id}
         title_comment: Списък с промени %{id} - %{comment}

diff --git a/config/locales/bn.yml b/config/locales/bn.yml
index 863b1e7ba43d80c16d2aacc60147dd80be20b2cc..1f74e8f5edb3aab698db8a385a0053bd0d06c8a1 100644 (file)
--- a/config/locales/bn.yml
+++ b/config/locales/bn.yml
@@ -512,7 +512,6 @@ bn:
       no_more: আর কোনো পরিবর্তনসেট পাওয়া যায়নি।
       no_more_area: এই এলাকায় কোনো পরিবর্তনসেট নেই।
       no_more_user: এই ব্যবহারকারীর দ্বারা আর কোনো পরিবর্তনসেট নেই।
       no_more: আর কোনো পরিবর্তনসেট পাওয়া যায়নি।
       no_more_area: এই এলাকায় কোনো পরিবর্তনসেট নেই।
       no_more_user: এই ব্যবহারকারীর দ্বারা আর কোনো পরিবর্তনসেট নেই।

-      load_more: আরও লোড করুন

       feed:
         title: পরিবর্তনধার্য %{id}
         title_comment: পরিবর্তনধার্য %{id} - %{comment}
       feed:
         title: পরিবর্তনধার্য %{id}
         title_comment: পরিবর্তনধার্য %{id} - %{comment}

diff --git a/config/locales/br.yml b/config/locales/br.yml
index 153fa3f6463e4ab2802cba5b9b05f4d4cf0d136d..8db934b5ebb351940b6df153204a95c86c0b5dd8 100644 (file)
--- a/config/locales/br.yml
+++ b/config/locales/br.yml
@@ -104,6 +104,7 @@ br:
         allow_write_prefs: kemmañ o fenndibaboù implijer.
         allow_write_diary: skrivit en ho teizlevr ha skrivit evezhiadennoù
         allow_write_api: kemmañ ar gartenn
         allow_write_prefs: kemmañ o fenndibaboù implijer.
         allow_write_diary: skrivit en ho teizlevr ha skrivit evezhiadennoù
         allow_write_api: kemmañ ar gartenn

+        allow_write_changeset_comments: skrivañ un evezhiadenn diwar-benn ar c'hemmoù

         allow_read_gpx: lenn o roudoù GPS prevez
         allow_write_gpx: kas roudoù GPS
         allow_write_notes: kemmañ an notennoù
         allow_read_gpx: lenn o roudoù GPS prevez
         allow_write_gpx: kas roudoù GPS
         allow_write_notes: kemmañ an notennoù


@@ -303,6 +304,7 @@ br:
           nevez ar c'henlabourer hag asantiñ dezho.
         agreed_with_pd: Disklêriet hoc'h eus ivez emañ ho tegasadennoù en domani foran.
         link text: petra eo an dra-se ?
           nevez ar c'henlabourer hag asantiñ dezho.
         agreed_with_pd: Disklêriet hoc'h eus ivez emañ ho tegasadennoù en domani foran.
         link text: petra eo an dra-se ?

+        pd_link_text: disklêriañ

       save changes button: Enrollañ ar c'hemmoù
       delete_account: Dilemel ar gont...
     go_public:
       save changes button: Enrollañ ar c'hemmoù
       delete_account: Dilemel ar gont...
     go_public:


@@ -472,6 +474,8 @@ br:
       relation:
         title_html: 'Istor an darempred: %{name}'
   nodes:
       relation:
         title_html: 'Istor an darempred: %{name}'
   nodes:

+    not_found_message:
+      sorry: 'Hon digarezit, n''eo ket bet kavet ar skoulm #%{id}.'

     timeout:
       sorry: Hon digarezit, ar roadennoù evit ar skoulm gant an id %{id} a zo re hir
         da adtapout.
     timeout:
       sorry: Hon digarezit, ar roadennoù evit ar skoulm gant an id %{id} a zo re hir
         da adtapout.


@@ -479,10 +483,16 @@ br:
     not_found_message:
       sorry: 'Hon digarezit, n''eo ket bet kavet ar stumm %{version} eus ar skoulm
         #%{id}.'
     not_found_message:
       sorry: 'Hon digarezit, n''eo ket bet kavet ar stumm %{version} eus ar skoulm
         #%{id}.'

+  ways:
+    not_found_message:
+      sorry: 'Hon digarezit, n''eo ket bet kavet ar roudenn #%{id}.'

   old_ways:
     not_found_message:
       sorry: 'Hon digarezit, n''eo ket bet kavet ar stumm %{version} eus ar roudenn
         #%{id}.'
   old_ways:
     not_found_message:
       sorry: 'Hon digarezit, n''eo ket bet kavet ar stumm %{version} eus ar roudenn
         #%{id}.'

+  relations:
+    not_found_message:
+      sorry: 'Hon digarezit, n''eo ket bet kavet an darempred #%{id}.'

   old_relations:
     not_found_message:
       sorry: 'Hon digarezit, n''eo ket bet kavet ar stumm %{version} eus an darempred
   old_relations:
     not_found_message:
       sorry: 'Hon digarezit, n''eo ket bet kavet ar stumm %{version} eus an darempred


@@ -499,6 +509,13 @@ br:
       timeout:
         sorry: Ho tigarez, re hir eo adtapout ar roll evezhiadennoù ho peus goulennet.
   changesets:
       timeout:
         sorry: Ho tigarez, re hir eo adtapout ar roll evezhiadennoù ho peus goulennet.
   changesets:

+    changeset:
+      changes:
+        one: '%{count} cheñchamant'
+        two: '%{count} cheñchamant'
+        few: '%{count} cheñchamant'
+        many: '%{count} cheñchamant'
+        other: '%{count} cheñchamant'

     index:
       title: Hollad cheñchamantoù
       title_user: Hollad cheñchamantoù %{user}
     index:
       title: Hollad cheñchamantoù
       title_user: Hollad cheñchamantoù %{user}


@@ -510,7 +527,6 @@ br:
       no_more: N'eus bet kavet hollad cheñchamantoù ouzhpenn.
       no_more_area: Hollad cheñchamant ouzhpenn ebet ken en takad-mañ.
       no_more_user: Hollad cheñchamant ouzhpenn ebet ken gant an implijer-mañ.
       no_more: N'eus bet kavet hollad cheñchamantoù ouzhpenn.
       no_more_area: Hollad cheñchamant ouzhpenn ebet ken en takad-mañ.
       no_more_user: Hollad cheñchamant ouzhpenn ebet ken gant an implijer-mañ.

-      load_more: Kargañ muioc'h

       feed:
         title: Hollad cheñchamantoù %{id}
         title_comment: Hollad cheñchamantoù %{id} - %{comment}
       feed:
         title: Hollad cheñchamantoù %{id}
         title_comment: Hollad cheñchamantoù %{id} - %{comment}


@@ -539,9 +555,13 @@ br:
       changesetxml: Hollad cheñchamantoù XML
       osmchangexml: Cheñchoùosm XML
     paging_nav:
       changesetxml: Hollad cheñchamantoù XML
       osmchangexml: Cheñchoùosm XML
     paging_nav:

+      nodes_title: Skoulmoù

       nodes_paginated: Skoulmoù (%{x}-%{y} diwar %{count})
       nodes_paginated: Skoulmoù (%{x}-%{y} diwar %{count})

+      ways_title: Hentoù

       ways_paginated: Hentoù (%{x}-%{y} diwar %{count})
       ways_paginated: Hentoù (%{x}-%{y} diwar %{count})

+      relations_title: Darempredoù

       relations_paginated: Darempredoù (%{x}-%{y} diwar %{count})
       relations_paginated: Darempredoù (%{x}-%{y} diwar %{count})

+      range: '%{x}-%{y} diwar %{count}'

     not_found_message:
       sorry: 'Hon digarezit, n''eo ket bet kavet an hollad cheñchamantoù #%{id}.'
     timeout:
     not_found_message:
       sorry: 'Hon digarezit, n''eo ket bet kavet an hollad cheñchamantoù #%{id}.'
     timeout:


@@ -1452,6 +1472,7 @@ br:
           reservoir: Mirlenn
           basin: Oglenn
           fishpond: Poull-pesked
           reservoir: Mirlenn
           basin: Oglenn
           fishpond: Poull-pesked

+          lagoon: Loc'h

           wastewater: Dour lous
           oxbow: Brec'h marv
           lock: Skluz
           wastewater: Dour lous
           oxbow: Brec'h marv
           lock: Skluz


@@ -1475,16 +1496,37 @@ br:
           weir: Stankell
           "yes": Hent bageal
       admin_levels:
           weir: Stankell
           "yes": Hent bageal
       admin_levels:

-        level2: Bevenn ar vro
-        level3: Harzoù Rannvro
-        level4: Bevenn ar Stad
-        level5: Bevenn ar rannvro
-        level6: Bevenn ar gontelezh
-        level7: Bevenn kêr
-        level8: Bevenn kêr
-        level9: Bevenn ar gumun
-        level10: Bevenn ar bannlev
-        level11: Harzoù amezegezh
+        level2: Harzoù etrebroadel
+        level3: Harzoù melestradurel (live 3)
+        level4: Harzoù melestradurel (live 4)
+        level5: Harzoù melestradurel (live 5)
+        level6: Harzoù melestradurel (live 6)
+        level7: Harzoù melestradurel (live 7)
+        level8: Harzoù melestradurel (live 8)
+        level9: Harzoù melestradurel (live 9)
+        level10: Harzoù melestradurel (live 10)
+        level11: Harzoù melestradurel (live 11)
+      border_types:
+        arrondissement: Harzoù an arondisamant
+        city: Bevenn kêr
+        county: Harzoù ar gontelezh
+        departement: Harzoù an departamant
+        department: Harzoù an departamant
+        district: Harzoù an distrig
+        distrito: Harzoù an distrig
+        freguesia: Harzoù ar Freguesia (parrez)
+        municipality: Bevenn kêr
+        municipi: Bevenn kêr
+        município: Bevenn kêr
+        nation: Harzoù etrebroadel
+        national: Harzoù etrebroadel
+        neighbourhood: Harzoù ar c'harter
+        parish: Harzoù ar barrez
+        province: Harzoù ar broviñs
+        região: Harzoù ar rannvro
+        region: Harzoù ar rannvro
+        state: Harzoù ar stad
+        village: Harzoù ar gêriadenn

     results:
       no_results: N'eus bet kavet respont ebet
       more_results: Disoc'hoù all
     results:
       no_results: N'eus bet kavet respont ebet
       more_results: Disoc'hoù all


@@ -1497,6 +1539,7 @@ br:
       select_status: Diuzañ ur statud
       select_type: Diuzañ ur seurt
       reported_user: Implijer diskêriet
       select_status: Diuzañ ur statud
       select_type: Diuzañ ur seurt
       reported_user: Implijer diskêriet

+      not_managed: N'eo ket meret

       search: Klask
       search_guidance: 'Kudennoù enklask :'
       states:
       search: Klask
       search_guidance: 'Kudennoù enklask :'
       states:


@@ -1668,8 +1711,8 @@ br:
       imported_points: Niver a boentoù enporzhiet
     gpx_failure:
       hi: Demat %{to_user},
       imported_points: Niver a boentoù enporzhiet
     gpx_failure:
       hi: Demat %{to_user},

-      failed_to_import: 'n''en deus ket gallet bezañ enporzhiet. Setu amañ ar fazi
-        :'
+      failed_to_import: War a seblant n'haller ket enporzhiañ ho restr evel ur roudenn
+        GPS.

       subject: '[OpenStreetMap] fazi e-pad an enporzhiadur GPX'
     gpx_success:
       hi: Demat %{to_user},
       subject: '[OpenStreetMap] fazi e-pad an enporzhiadur GPX'
     gpx_success:
       hi: Demat %{to_user},


@@ -2736,10 +2779,17 @@ br:
       show:
         title: Implijerien
         heading: Implijerien
       show:
         title: Implijerien
         heading: Implijerien

+        select_status: Diuzañ ur statud

         states:
         states:

+          pending: O c'hortoz
+          active: Oberiant
+          confirmed: Kadarnaet

           deleted: Dilamet
         name_or_email: Anv pe postel
         ip_address: Chomlec'h IP
           deleted: Dilamet
         name_or_email: Anv pe postel
         ip_address: Chomlec'h IP

+        edits: Kemmoù?
+        has_edits: Kemmoù en/he deus graet
+        no_edits: Kemm ebet

         search: Klask
       page:
         found_users:
         search: Klask
       page:
         found_users:


@@ -2877,6 +2927,7 @@ br:
         ended: echu
         revoked_html: nullet gant %{name}
         active: oberiant
         ended: echu
         revoked_html: nullet gant %{name}
         active: oberiant

+        active_until_read: oberiant betek ma vefe lennet

         read_html: bet lennet da %{time}
         time_in_future_title: '%{time_absolute}; e %{time_relative}'
         time_in_past_title: '%{time_absolute}; %{time_relative}'
         read_html: bet lennet da %{time}
         time_in_future_title: '%{time_absolute}; e %{time_relative}'
         time_in_past_title: '%{time_absolute}; %{time_relative}'


@@ -2988,6 +3039,8 @@ br:
         ha skrivit un notenn da zisplegañ ar gudenn.
       anonymous_warning_log_in: kevreañ
       anonymous_warning_sign_up: en em enskrivañ
         ha skrivit un notenn da zisplegañ ar gudenn.
       anonymous_warning_log_in: kevreañ
       anonymous_warning_sign_up: en em enskrivañ

+      counter_warning_guide_link:
+        text: kemerit perzh c'hwi hoc'h-unan

       counter_warning_forum_link:
         text: ar gumuniezh a c'hall sikour ac'hanoc'h
       advice: Foran eo ho notenn ha ne c'hall ket bezañ implijet evit hizivaat ar
       counter_warning_forum_link:
         text: ar gumuniezh a c'hall sikour ac'hanoc'h
       advice: Foran eo ho notenn ha ne c'hall ket bezañ implijet evit hizivaat ar


@@ -3068,6 +3121,7 @@ br:
       thunderforest_credit: Teol pourchaset gant %{thunderforest_link}
       andy_allan: Andy Allan
       tracestrack_credit: Teol pourchaset gant %{tracestrack_link}
       thunderforest_credit: Teol pourchaset gant %{thunderforest_link}
       andy_allan: Andy Allan
       tracestrack_credit: Teol pourchaset gant %{tracestrack_link}

+      hotosm_name: Skipailh dengar OpenStreetMap

     site:
       edit_tooltip: Kemmañ ar gartenn
       edit_disabled_tooltip: Zoumañ da zegas kemmoù war ar gartenn
     site:
       edit_tooltip: Kemmañ ar gartenn
       edit_disabled_tooltip: Zoumañ da zegas kemmoù war ar gartenn


@@ -3181,6 +3235,15 @@ br:
       centre_map: Kreizañ ar gartenn amañ
     home:
       marker_title: Lec'hiadur ma zi
       centre_map: Kreizañ ar gartenn amañ
     home:
       marker_title: Lec'hiadur ma zi

+    heatmap:
+      tooltip:
+        no_contributions: Degasadenn ebet d'an %{date}
+        contributions:
+          one: '%{count} degasadenn d''an %{date}'
+          two: '%{count} zegasadenn d''an %{date}'
+          few: '%{count} degasadenn d''an %{date}'
+          many: '%{count} degasadenn d''an %{date}'
+          other: '%{count} a zegasadennoù d''an %{date}'

   redactions:
     edit:
       heading: Aozañ ar skridaozadenn
   redactions:
     edit:
       heading: Aozañ ar skridaozadenn

diff --git a/config/locales/bs.yml b/config/locales/bs.yml
index 71fe2635f19f8987a3bd4c6c1da2e5f45b2b5683..bab2ffd67427d04e5b3c1e768baab5a452777a01 100644 (file)
--- a/config/locales/bs.yml
+++ b/config/locales/bs.yml
@@ -243,7 +243,6 @@ bs:
       title: Setovi promjena
       title_user: Setovi promjena od %{user}
       title_nearby: Setovi promjena obližnjih korisnika
       title: Setovi promjena
       title_user: Setovi promjena od %{user}
       title_nearby: Setovi promjena obližnjih korisnika

-      load_more: Učitaj više

       feed:
         title: Set promjena %{id}
         title_comment: Set promjena %{id} - %{comment}
       feed:
         title: Set promjena %{id}
         title_comment: Set promjena %{id} - %{comment}

diff --git a/config/locales/ca.yml b/config/locales/ca.yml
index 710d8b47c423909e9197693c1295e5c522506125..37889e6b275057fc6667af135bf7952f7eb788fa 100644 (file)
--- a/config/locales/ca.yml
+++ b/config/locales/ca.yml
@@ -498,7 +498,6 @@ ca:
       no_more: No s'ha trobat cap altre conjunt de canvis.
       no_more_area: No hi ha cap altre conjunt de canvis en aquesta àrea.
       no_more_user: No hi ha cap altre conjunt de canvis d'aquest usuari.
       no_more: No s'ha trobat cap altre conjunt de canvis.
       no_more_area: No hi ha cap altre conjunt de canvis en aquesta àrea.
       no_more_user: No hi ha cap altre conjunt de canvis d'aquest usuari.

-      load_more: Carrega'n més

       feed:
         title: Conjunt de canvis %{id}
         title_comment: Conjunt de canvis %{id} - %{comment}
       feed:
         title: Conjunt de canvis %{id}
         title_comment: Conjunt de canvis %{id} - %{comment}

diff --git a/config/locales/ce.yml b/config/locales/ce.yml
index 2292df19aa39c28c302a921c710ca767fe4a1b84..3240fafd24610e0dc4238b8f42bce6287811c4d1 100644 (file)
--- a/config/locales/ce.yml
+++ b/config/locales/ce.yml
@@ -465,7 +465,6 @@ ce:
       no_more: Кхи цхьа нисдарш цакарий.
       no_more_area: Кхи кхузахь нисдарш дина дац.
       no_more_user: Кхи кхузахь хӀокху декъашхочо нисдарш дина дац.
       no_more: Кхи цхьа нисдарш цакарий.
       no_more_area: Кхи кхузахь нисдарш дина дац.
       no_more_user: Кхи кхузахь хӀокху декъашхочо нисдарш дина дац.

-      load_more: Чуйаха кхин а

       feed:
         title: 'Нисдарш: %{id}'
         title_comment: Нисдарш %{id} — %{comment}
       feed:
         title: 'Нисдарш: %{id}'
         title_comment: Нисдарш %{id} — %{comment}

diff --git a/config/locales/cs.yml b/config/locales/cs.yml
index 662530b1263b91fd43f9cead2df80990f4a37f09..6e1b37249207ccbf8367e23ea378a4b59b846d92 100644 (file)
--- a/config/locales/cs.yml
+++ b/config/locales/cs.yml
@@ -604,7 +604,6 @@ cs:
       no_more: Nebyly nalezeny žádné další sady změn.
       no_more_area: Pro tuto oblast nebyly nalezeny žádné další sady změn.
       no_more_user: Nebyly nalezeny žádné další sady změn tohoto uživatele.
       no_more: Nebyly nalezeny žádné další sady změn.
       no_more_area: Pro tuto oblast nebyly nalezeny žádné další sady změn.
       no_more_user: Nebyly nalezeny žádné další sady změn tohoto uživatele.

-      load_more: Načíst další

       feed:
         title: Sada změn %{id}
         title_comment: Sada změn %{id} - %{comment}
       feed:
         title: Sada změn %{id}
         title_comment: Sada změn %{id} - %{comment}

diff --git a/config/locales/cy.yml b/config/locales/cy.yml
index f920491c275047129aa37927313bbcb6683d42ff..900d660ff09fa2413a9b39be7d8e8c611805eea7 100644 (file)
--- a/config/locales/cy.yml
+++ b/config/locales/cy.yml
@@ -577,7 +577,6 @@ cy:
       no_more: Heb ganfod rhagor o grwpiau newid.
       no_more_area: Heb ganfod rhagor o grwpiau newid yn yr ardal hon.
       no_more_user: Heb ganfod rhagor o grwpiau newid gan y defnyddiwr hwn.
       no_more: Heb ganfod rhagor o grwpiau newid.
       no_more_area: Heb ganfod rhagor o grwpiau newid yn yr ardal hon.
       no_more_user: Heb ganfod rhagor o grwpiau newid gan y defnyddiwr hwn.

-      load_more: Llwytho rhagor

       feed:
         title: Grŵp newid %{id}
         title_comment: Grŵp newid %{id} - %{comment}
       feed:
         title: Grŵp newid %{id}
         title_comment: Grŵp newid %{id} - %{comment}

diff --git a/config/locales/da.yml b/config/locales/da.yml
index 1de2ac3880067537a43caf035b7ccaf6a238e648..92ce219621aa69179ed7360c076a53ba9bc278a1 100644 (file)
--- a/config/locales/da.yml
+++ b/config/locales/da.yml
@@ -545,7 +545,7 @@ da:
       title: Ændringssæt
       title_user: Ændringssæt af %{user}
       title_user_link_html: Ændringssæt af %{user_link}
       title: Ændringssæt
       title_user: Ændringssæt af %{user}
       title_user_link_html: Ændringssæt af %{user_link}

-      title_followed: Ændringssæt af dem, du følger
+      title_followed: Ændringssæt af brugere, du følger

       title_nearby: Ændringssæt af brugere i nærheden
       empty: Ingen ændringssæt fundet.
       empty_area: Ingen ændringssæt i dette område.
       title_nearby: Ændringssæt af brugere i nærheden
       empty: Ingen ændringssæt fundet.
       empty_area: Ingen ændringssæt i dette område.


@@ -553,7 +553,8 @@ da:
       no_more: Ikke flere ændringssæt fundet.
       no_more_area: Ikke flere ændringssæt i dette område.
       no_more_user: Ikke flere ændringssæt af denne bruger.
       no_more: Ikke flere ændringssæt fundet.
       no_more_area: Ikke flere ændringssæt i dette område.
       no_more_user: Ikke flere ændringssæt af denne bruger.

-      load_more: Indlæs mere
+      older_changesets: Ældre ændringssæt
+      newer_changesets: Nyere ændringssæt

       feed:
         title: Ændringssæt %{id}
         title_comment: Ændringssæt %{id} - %{comment}
       feed:
         title: Ændringssæt %{id}
         title_comment: Ændringssæt %{id} - %{comment}


@@ -625,7 +626,7 @@ da:
       no_home_location_html: '%{edit_profile_link} og angiv din hjemmeposition for
         at se brugere i nærheden.'
       edit_your_profile: Rediger din profil
       no_home_location_html: '%{edit_profile_link} og angiv din hjemmeposition for
         at se brugere i nærheden.'
       edit_your_profile: Rediger din profil

-      followings: Følger
+      followings: Brugere du følger

       no followings: Du har ikke fulgt nogen bruger endnu.
       nearby users: 'Andre brugere i nærheden:'
       no nearby users: Der er ingen andre brugere der har angivet at de kortlægger
       no followings: Du har ikke fulgt nogen bruger endnu.
       nearby users: 'Andre brugere i nærheden:'
       no nearby users: Der er ingen andre brugere der har angivet at de kortlægger


@@ -642,7 +643,7 @@ da:
       use_map_link: Brug kort
     index:
       title: Brugerblogs
       use_map_link: Brug kort
     index:
       title: Brugerblogs

-      title_followed: Blogindlæg fra dem, du følger
+      title_followed: Blogindlæg fra brugere, du følger

       title_nearby: Blogs fra brugere i nærheden
       user_title: Blog for %{user}
       in_language_title: Blogindlæg på %{language}
       title_nearby: Blogs fra brugere i nærheden
       user_title: Blog for %{user}
       in_language_title: Blogindlæg på %{language}

diff --git a/config/locales/de.yml b/config/locales/de.yml
index 8de219b01c6b038501dc2ee6b84cf7b715992df3..ee86ac3edbd57937c5f2ca1b2691626599533455 100644 (file)
--- a/config/locales/de.yml
+++ b/config/locales/de.yml
@@ -647,7 +647,6 @@ de:
       no_more: Keine weiteren Änderungssätze gefunden.
       no_more_area: Keine weiteren Änderungssätze in diesem Bereich.
       no_more_user: Keine weiteren Änderungssätze von diesem Benutzer.
       no_more: Keine weiteren Änderungssätze gefunden.
       no_more_area: Keine weiteren Änderungssätze in diesem Bereich.
       no_more_user: Keine weiteren Änderungssätze von diesem Benutzer.

-      load_more: Mehr laden

       feed:
         title: Änderungssatz %{id}
         title_comment: Änderungssatz %{id} - %{comment}
       feed:
         title: Änderungssatz %{id}
         title_comment: Änderungssatz %{id} - %{comment}


@@ -676,9 +675,13 @@ de:
       changesetxml: Änderungssatz-XML
       osmchangexml: osmChange-XML
     paging_nav:
       changesetxml: Änderungssatz-XML
       osmchangexml: osmChange-XML
     paging_nav:

+      nodes_title: Knoten

       nodes_paginated: Knoten (%{x}–%{y} von %{count})
       nodes_paginated: Knoten (%{x}–%{y} von %{count})

+      ways_title: Wege

       ways_paginated: Wege (%{x}–%{y} von %{count})
       ways_paginated: Wege (%{x}–%{y} von %{count})

+      relations_title: Relationen

       relations_paginated: Relationen (%{x}–%{y} von %{count})
       relations_paginated: Relationen (%{x}–%{y} von %{count})

+      range: '%{x}–%{y} von %{count}'

     not_found_message:
       sorry: 'Leider konnte das Changeset #%{id} nicht gefunden werden.'
     timeout:
     not_found_message:
       sorry: 'Leider konnte das Changeset #%{id} nicht gefunden werden.'
     timeout:

diff --git a/config/locales/diq.yml b/config/locales/diq.yml
index ec096ab94b3159e1bcee6ef1093d2312a7cc94c5..919feb03a7322cec6001212e60540f3559b8480b 100644 (file)
--- a/config/locales/diq.yml
+++ b/config/locales/diq.yml
@@ -286,7 +286,6 @@ diq:
       title: Qeydê vurnayışan
       title_user: Vurriyayışê qeydi %{user}
       title_nearby: Nezdıra vurriyayışê setê karberi
       title: Qeydê vurnayışan
       title_user: Vurriyayışê qeydi %{user}
       title_nearby: Nezdıra vurriyayışê setê karberi

-      load_more: Tayêna bar ke

       feed:
         title: 'Koma vurnayışi: %{id}'
         title_comment: '%{id} - %{comment} vurniyayışi'
       feed:
         title: 'Koma vurnayışi: %{id}'
         title_comment: '%{id} - %{comment} vurniyayışi'

diff --git a/config/locales/dsb.yml b/config/locales/dsb.yml
index a0331b2b1888470f67839754f7134b6e925f487d..5f04923ea930208d7cb663671357d71efc58389c 100644 (file)
--- a/config/locales/dsb.yml
+++ b/config/locales/dsb.yml
@@ -272,7 +272,6 @@ dsb:
       no_more: Žedne dalšne sajźby změnow namakane.
       no_more_area: Žedne dalšne sajźby změnow w toś tom wobcerku.
       no_more_user: Žedne dalšne sajźby změnow wót toś togo wužywarja.
       no_more: Žedne dalšne sajźby změnow namakane.
       no_more_area: Žedne dalšne sajźby změnow w toś tom wobcerku.
       no_more_user: Žedne dalšne sajźby změnow wót toś togo wužywarja.

-      load_more: Wěcej zacytaś

       feed:
         title: Sajźba změnow %{id}
         title_comment: Sajźba změnow %{id} - %{comment}
       feed:
         title: Sajźba změnow %{id}
         title_comment: Sajźba změnow %{id} - %{comment}

diff --git a/config/locales/el.yml b/config/locales/el.yml
index 22fb7325d62047101e354f581b0c9036b152d1b6..70e32199715ab0cb22b1ba8ad424636a8745e730 100644 (file)
--- a/config/locales/el.yml
+++ b/config/locales/el.yml
@@ -573,7 +573,6 @@ el:
       no_more: Δεν βρέθηκαν άλλα σύνολα αλλαγών.
       no_more_area: Δεν υπάρχουν άλλα σύνολα αλλαγών σε αυτήν την περιοχή.
       no_more_user: Δεν υπάρχουν άλλα σύνολα αλλαγών από αυτόν τον χρήστη.
       no_more: Δεν βρέθηκαν άλλα σύνολα αλλαγών.
       no_more_area: Δεν υπάρχουν άλλα σύνολα αλλαγών σε αυτήν την περιοχή.
       no_more_user: Δεν υπάρχουν άλλα σύνολα αλλαγών από αυτόν τον χρήστη.

-      load_more: Φόρτωση περισσότερων

       feed:
         title: Σύνολο αλλαγών %{id}
         title_comment: Σύνολο αλλαγών %{id} - %{comment}
       feed:
         title: Σύνολο αλλαγών %{id}
         title_comment: Σύνολο αλλαγών %{id} - %{comment}


@@ -602,9 +601,13 @@ el:
       changesetxml: XML συνόλου αλλαγών
       osmchangexml: osmChange XML
     paging_nav:
       changesetxml: XML συνόλου αλλαγών
       osmchangexml: osmChange XML
     paging_nav:

+      nodes_title: Κόμβοι

       nodes_paginated: Κόμβοι (%{x}-%{y} από %{count})
       nodes_paginated: Κόμβοι (%{x}-%{y} από %{count})

+      ways_title: Γραμμές

       ways_paginated: Γραμμές (%{x}-%{y} από %{count})
       ways_paginated: Γραμμές (%{x}-%{y} από %{count})

+      relations_title: Σχέσεις

       relations_paginated: Σχέσεις (%{x}-%{y} από %{count})
       relations_paginated: Σχέσεις (%{x}-%{y} από %{count})

+      range: '%{x}-%{y} από %{count}'

     not_found_message:
       sorry: 'Λυπούμαστε, το σύνολο αλλαγών #%{id} δεν βρέθηκε.'
     timeout:
     not_found_message:
       sorry: 'Λυπούμαστε, το σύνολο αλλαγών #%{id} δεν βρέθηκε.'
     timeout:

diff --git a/config/locales/en-GB.yml b/config/locales/en-GB.yml
index 329027d5e7993851364d782000ecb0a13d638324..c751fb508f649ec3400f1d3769fd58c33eb1073d 100644 (file)
--- a/config/locales/en-GB.yml
+++ b/config/locales/en-GB.yml
@@ -367,7 +367,6 @@ en-GB:
       no_more: No more changesets found.
       no_more_area: No more changesets in this area.
       no_more_user: No more changesets by this user.
       no_more: No more changesets found.
       no_more_area: No more changesets in this area.
       no_more_user: No more changesets by this user.

-      load_more: Load more

       feed:
         title: Changeset %{id}
         title_comment: Changeset %{id} - %{comment}
       feed:
         title: Changeset %{id}
         title_comment: Changeset %{id} - %{comment}

diff --git a/config/locales/en.yml b/config/locales/en.yml
index aba37e9344ea41d983f004d2fbdade2849d4a88f..16b967ead238558d2e84b69e0462f1c392b6e8b2 100644 (file)
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -486,7 +486,7 @@ en:
       title: "Changesets"
       title_user: "Changesets by %{user}"
       title_user_link_html: "Changesets by %{user_link}"
       title: "Changesets"
       title_user: "Changesets by %{user}"
       title_user_link_html: "Changesets by %{user_link}"

-      title_followed: "Changesets by followings"
+      title_followed: "Changesets by users you follow"

       title_nearby: "Changesets by nearby users"
       empty: "No changesets found."
       empty_area: "No changesets in this area."
       title_nearby: "Changesets by nearby users"
       empty: "No changesets found."
       empty_area: "No changesets in this area."


@@ -494,7 +494,8 @@ en:
       no_more: "No more changesets found."
       no_more_area: "No more changesets in this area."
       no_more_user: "No more changesets by this user."
       no_more: "No more changesets found."
       no_more_area: "No more changesets in this area."
       no_more_user: "No more changesets by this user."

-      load_more: "Load more"
+      older_changesets: Older Changesets
+      newer_changesets: Newer Changesets

       feed:
         title: "Changeset %{id}"
         title_comment: "Changeset %{id} - %{comment}"
       feed:
         title: "Changeset %{id}"
         title_comment: "Changeset %{id} - %{comment}"


@@ -562,7 +563,7 @@ en:
       title: My Dashboard
       no_home_location_html: "%{edit_profile_link} and set your home location to see nearby users."
       edit_your_profile: Edit your profile
       title: My Dashboard
       no_home_location_html: "%{edit_profile_link} and set your home location to see nearby users."
       edit_your_profile: Edit your profile

-      followings: Followings
+      followings: Users you follow

       no followings: You have not followed any user yet.
       nearby users: "Other nearby users"
       no nearby users: "There are no other users who admit to mapping nearby yet."
       no followings: You have not followed any user yet.
       nearby users: "Other nearby users"
       no nearby users: "There are no other users who admit to mapping nearby yet."


@@ -578,7 +579,7 @@ en:
       use_map_link: Use Map
     index:
       title: "Users' Diaries"
       use_map_link: Use Map
     index:
       title: "Users' Diaries"

-      title_followed: "Followings' Diaries"
+      title_followed: "Followed Users' diaries"

       title_nearby: "Nearby Users' Diaries"
       user_title: "%{user}'s Diary"
       in_language_title: "Diary Entries in %{language}"
       title_nearby: "Nearby Users' Diaries"
       user_title: "%{user}'s Diary"
       in_language_title: "Diary Entries in %{language}"

diff --git a/config/locales/eo.yml b/config/locales/eo.yml
index 854a328a3f424842c9c2c78370db8e4e5bdacebb..ed677a006da58eb3b0bb735b4f2c514fd75c9ae6 100644 (file)
--- a/config/locales/eo.yml
+++ b/config/locales/eo.yml
@@ -546,7 +546,6 @@ eo:
       no_more: Neniu plia trovita ŝanĝaro.
       no_more_area: Neniu plia ŝanĝaro en tiu ĉi areo.
       no_more_user: Neniaj pliaj ŝanĝaroj de tiu ĉi uzanto.
       no_more: Neniu plia trovita ŝanĝaro.
       no_more_area: Neniu plia ŝanĝaro en tiu ĉi areo.
       no_more_user: Neniaj pliaj ŝanĝaroj de tiu ĉi uzanto.

-      load_more: Pli

       feed:
         title: Ŝanĝaro %{id}
         title_comment: Ŝanĝaro %{id} - %{comment}
       feed:
         title: Ŝanĝaro %{id}
         title_comment: Ŝanĝaro %{id} - %{comment}

diff --git a/config/locales/es.yml b/config/locales/es.yml
index bec3a94afd04672a9e5cf9da65f79aaf8c8930e6..370b618daa7cd3800232190f72d8262e0c725157 100644 (file)
--- a/config/locales/es.yml
+++ b/config/locales/es.yml
@@ -593,7 +593,6 @@ es:
       no_more: No se han encontrado más conjuntos de cambios.
       no_more_area: No hay más conjuntos de cambios en este área.
       no_more_user: No hay más conjuntos de cambios por este usuario.
       no_more: No se han encontrado más conjuntos de cambios.
       no_more_area: No hay más conjuntos de cambios en este área.
       no_more_user: No hay más conjuntos de cambios por este usuario.

-      load_more: Cargar más

       feed:
         title: Conjunto de Cambios %{id}
         title_comment: Conjunto de cambios %{id} - %{comment}
       feed:
         title: Conjunto de Cambios %{id}
         title_comment: Conjunto de cambios %{id} - %{comment}

diff --git a/config/locales/et.yml b/config/locales/et.yml
index e599097eaebc703e00c877b167e85ff58d0ae132..cab7dad956607aa5b6379e69e2f52e954ebc9710 100644 (file)
--- a/config/locales/et.yml
+++ b/config/locales/et.yml
@@ -473,6 +473,13 @@ et:
         sorry: Vabandust, sinu päritud muudatuskogumi kommetaaride loendi laadimiseks
           kulus liiga kaua aega.
   changesets:
         sorry: Vabandust, sinu päritud muudatuskogumi kommetaaride loendi laadimiseks
           kulus liiga kaua aega.
   changesets:

+    changeset:
+      comments:
+        one: '%{count} kommentaar'
+        other: '%{count} kommentaari'
+      changes:
+        one: '%{count} muudatus'
+        other: '%{count} muudatust'

     index:
       title: Muudatuskogumid
       title_user: Kasutaja %{user} muudatuskogumid
     index:
       title: Muudatuskogumid
       title_user: Kasutaja %{user} muudatuskogumid


@@ -485,7 +492,6 @@ et:
       no_more: Rohkem muudatuskogumeid ei leitud.
       no_more_area: Sellest alast ei leitud rohkem muudatuskogumeid.
       no_more_user: Sellelt kasutajalt ei leitud rohkem muudatuskogumeid.
       no_more: Rohkem muudatuskogumeid ei leitud.
       no_more_area: Sellest alast ei leitud rohkem muudatuskogumeid.
       no_more_user: Sellelt kasutajalt ei leitud rohkem muudatuskogumeid.

-      load_more: Laadi veel

       feed:
         title: Muudatuskogum %{id}
         title_comment: Muudatuskogum %{id} – %{comment}
       feed:
         title: Muudatuskogum %{id}
         title_comment: Muudatuskogum %{id} – %{comment}


@@ -514,9 +520,13 @@ et:
       changesetxml: Muudatuskogumi XML
       osmchangexml: osmChange XML
     paging_nav:
       changesetxml: Muudatuskogumi XML
       osmchangexml: osmChange XML
     paging_nav:

+      nodes_title: Sõlmed

       nodes_paginated: Sõlmed (%{x}–%{y} %{count}-st)
       nodes_paginated: Sõlmed (%{x}–%{y} %{count}-st)

+      ways_title: Jooned

       ways_paginated: Jooned (%{x}–%{y} %{count}-st)
       ways_paginated: Jooned (%{x}–%{y} %{count}-st)

+      relations_title: Relatsioonid

       relations_paginated: Relatsioonid (%{x}–%{y} %{count}-st)
       relations_paginated: Relatsioonid (%{x}–%{y} %{count}-st)

+      range: '%{x}–%{y} %{count}-st'

     timeout:
       sorry: Kahjuks võttis taotletud muudatuskogumite laadimine liiga kaua aega.
   changeset_subscriptions:
     timeout:
       sorry: Kahjuks võttis taotletud muudatuskogumite laadimine liiga kaua aega.
   changeset_subscriptions:


@@ -646,14 +656,14 @@ et:
       profile: Vaata oma profiili
   errors:
     contact:
       profile: Vaata oma profiili
   errors:
     contact:

-      contact: kontaktide
-      contact_the_community_html: Kui avastad katkise lingi või vea, palun kirjuta
-        sellest OpenStreetMapi kogukonnale siin %{contact_link} aadressil. Palun lisa
-        teatesse ka päringu täpne URL.
+      contact: ühendust
+      contact_the_community_html: Võta OpenStreetMapi kogukonnaga julgesti %{contact_link},
+        kui oled leidnud katkise lingi või vea. Palun lisa teatesse ka päringu täpne
+        URL.

     forbidden:
       title: Keelatud
     forbidden:
       title: Keelatud

-      description: Tegevus, mida sa üritasid OpenStreetMap'i serveris teha on lubadud
-        vaid administraatoriele (HTTP 403)
+      description: Tegevus, mida üritasid OpenStreetMapi serveris teha, on lubatud
+        vaid administraatoritele (HTTP 403)

     internal_server_error:
       title: Rakenduse viga
       description: OpenStreetMapi serveris tekkis ootamatu olukord, mistõttu vastust
     internal_server_error:
       title: Rakenduse viga
       description: OpenStreetMapi serveris tekkis ootamatu olukord, mistõttu vastust


@@ -671,8 +681,8 @@ et:
     search:
       title:
         latlon: Sisemised
     search:
       title:
         latlon: Sisemised

-        osm_nominatim: OpenStreetMap Nominatimi
-        osm_nominatim_reverse: OpenStreetMap Nominatimi
+        osm_nominatim: OpenStreetMap Nominatim
+        osm_nominatim_reverse: OpenStreetMap Nominatim

     search_osm_nominatim:
       prefix:
         aerialway:
     search_osm_nominatim:
       prefix:
         aerialway:


@@ -1430,15 +1440,15 @@ et:
           "yes": Veetee
       admin_levels:
         level2: Riigipiir
           "yes": Veetee
       admin_levels:
         level2: Riigipiir

-        level3: 3. järgu piir
-        level4: 4. järgu piir
-        level5: 5. järgu piir
-        level6: 6. järgu piir
-        level7: Omavalitsusüksuse piir
-        level8: 8. järgu piir
-        level9: 9. järgu piir
-        level10: 10. järgu piir
-        level11: Naabruskonna piirjoon
+        level3: Halduspiir (3. tase)
+        level4: Halduspiir (4. tase)
+        level5: Halduspiir (5. tase)
+        level6: Halduspiir (6. tase)
+        level7: Halduspiir (7. tase)
+        level8: Halduspiir (8. tase)
+        level9: Halduspiir (9. tase)
+        level10: Halduspiir (10. tase)
+        level11: Halduspiir (11. tase)

     results:
       no_results: Ei leidnud midagi
       more_results: Veel tulemusi
     results:
       no_results: Ei leidnud midagi
       more_results: Veel tulemusi


@@ -2642,6 +2652,7 @@ et:
       my notes: Minu märkused
       my messages: Minu sõnumid
       my profile: Minu profiil
       my notes: Minu märkused
       my messages: Minu sõnumid
       my profile: Minu profiil

+      my_account: Minu konto

       my comments: Minu kommentaarid
       my_preferences: Minu eelistused
       my_dashboard: Minu andmelaud
       my comments: Minu kommentaarid
       my_preferences: Minu eelistused
       my_dashboard: Minu andmelaud


@@ -2900,6 +2911,7 @@ et:
       open_title: 'Lahendamata märkus: #%{note_name}'
       closed_title: 'Lahendatud märkus: #%{note_name}'
       hidden_title: 'Peidetud märkus #%{note_name}'
       open_title: 'Lahendamata märkus: #%{note_name}'
       closed_title: 'Lahendatud märkus: #%{note_name}'
       hidden_title: 'Peidetud märkus #%{note_name}'

+      description_when_author_is_deleted: kustutatud

       description_when_there_is_no_opening_comment: tundmatu
       event_opened_by_html: Loonud %{user} %{time_ago}
       event_opened_by_anonymous_html: Loonud anonüümne kasutaja %{time_ago}
       description_when_there_is_no_opening_comment: tundmatu
       event_opened_by_html: Loonud %{user} %{time_ago}
       event_opened_by_anonymous_html: Loonud anonüümne kasutaja %{time_ago}


@@ -3104,6 +3116,8 @@ et:
           ninth: "9"
           tenth: "10"
       time: Ajakulu
           ninth: "9"
           tenth: "10"
       time: Ajakulu

+      download: Laadi teekond alla GeoJSON-ina
+      filename: teekond

     query:
       node: Sõlm
       way: Joon
     query:
       node: Sõlm
       way: Joon


@@ -3118,6 +3132,12 @@ et:
       show_address: Kuva aadress
       query_features: Mis siin on?
       centre_map: Kuva kaardi keskel
       show_address: Kuva aadress
       query_features: Mis siin on?
       centre_map: Kuva kaardi keskel

+    heatmap:
+      tooltip:
+        no_contributions: Muudatused puuduvad – %{date}
+        contributions:
+          one: '%{count} muudatus – %{date}'
+          other: '%{count} muudatust – %{date}'

   redactions:
     edit:
       heading: Kinnikatmise redigeerimine
   redactions:
     edit:
       heading: Kinnikatmise redigeerimine

diff --git a/config/locales/eu.yml b/config/locales/eu.yml
index 217f4e34ad470180a30ceec84679c5b7bfd27e7a..9aa7be825a6506ee019b6fdda054b5283d3e3279 100644 (file)
--- a/config/locales/eu.yml
+++ b/config/locales/eu.yml
@@ -480,7 +480,6 @@ eu:
       no_more: Aldaketa gehiagorik ez da aurkitu.
       no_more_area: Inguru honetan ez dago aldaketa gehiagorik.
       no_more_user: Erabiltzaile honek ez du aldaketa gehiagorik egin.
       no_more: Aldaketa gehiagorik ez da aurkitu.
       no_more_area: Inguru honetan ez dago aldaketa gehiagorik.
       no_more_user: Erabiltzaile honek ez du aldaketa gehiagorik egin.

-      load_more: Gehiago kargatu

       feed:
         title: '%{id} aldaketak'
         title_comment: '%{id} aldaketa - %{comment}'
       feed:
         title: '%{id} aldaketak'
         title_comment: '%{id} aldaketa - %{comment}'

diff --git a/config/locales/fa.yml b/config/locales/fa.yml
index 1cd6e6cc180744f5f5689acf6b728c46243a7ee7..6b83b78c39aeaec60faefe65826ab910d7869c55 100644 (file)
--- a/config/locales/fa.yml
+++ b/config/locales/fa.yml
@@ -494,7 +494,6 @@ fa:
       no_more: بستهٔ تغییر دیگری یافت نشد.
       no_more_area: بستهٔ تغییر دیگری در این ناحیه یافت نشد.
       no_more_user: بستهٔ تغییر دیگری از این کاربر یافت نشد.
       no_more: بستهٔ تغییر دیگری یافت نشد.
       no_more_area: بستهٔ تغییر دیگری در این ناحیه یافت نشد.
       no_more_user: بستهٔ تغییر دیگری از این کاربر یافت نشد.

-      load_more: بیشتر بار کن

       feed:
         title: بستهٔ تغییر %{id}
         title_comment: بستهٔ تغییر %{id} - %{comment}
       feed:
         title: بستهٔ تغییر %{id}
         title_comment: بستهٔ تغییر %{id} - %{comment}

diff --git a/config/locales/fi.yml b/config/locales/fi.yml
index 76404be5c9b7ddd7c8768d9cf8d6dc392dfdf761..64101aece32168560ee84f2017b6385d639e2cbf 100644 (file)
--- a/config/locales/fi.yml
+++ b/config/locales/fi.yml
@@ -487,7 +487,6 @@ fi:
       no_more: Ei löytynyt enempää muutosryhmiä.
       no_more_area: Ei muita muutosryhmiä tällä alueella.
       no_more_user: Ei muita muutosryhmiä tällä käyttäjällä.
       no_more: Ei löytynyt enempää muutosryhmiä.
       no_more_area: Ei muita muutosryhmiä tällä alueella.
       no_more_user: Ei muita muutosryhmiä tällä käyttäjällä.

-      load_more: Lataa lisää

       feed:
         title: Muutoskokoelma %{id}
         title_comment: Muutoskokoelma %{id} - %{comment}
       feed:
         title: Muutoskokoelma %{id}
         title_comment: Muutoskokoelma %{id} - %{comment}

diff --git a/config/locales/fit.yml b/config/locales/fit.yml
index 795f2ca1ff2b76515010dc5be4bbc3bb470aa85f..b884d765c0edaa97fedbeb5b39df84dbfbe474d7 100644 (file)
--- a/config/locales/fit.yml
+++ b/config/locales/fit.yml
@@ -291,7 +291,6 @@ fit:
       no_more: Ei löytynyt enempää muutosryhmiä.
       no_more_area: Ei muita muutosryhmiä tällä alueella.
       no_more_user: Ei muita muutosryhmiä tällä käyttäjällä.
       no_more: Ei löytynyt enempää muutosryhmiä.
       no_more_area: Ei muita muutosryhmiä tällä alueella.
       no_more_user: Ei muita muutosryhmiä tällä käyttäjällä.

-      load_more: Lattaa lissää

       feed:
         title: Muutoskokoelma %{id}
         title_comment: Muutoskokoelma %{id} - %{comment}
       feed:
         title: Muutoskokoelma %{id}
         title_comment: Muutoskokoelma %{id} - %{comment}

diff --git a/config/locales/fr.yml b/config/locales/fr.yml
index c586058f6e39fd11201f9fe916a458bde101a343..f5d7006ea4a3f091440506e37e66d50122f322a0 100644 (file)
--- a/config/locales/fr.yml
+++ b/config/locales/fr.yml
@@ -664,7 +664,6 @@ 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.
       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 davantage

       feed:
         title: Groupe de modifications %{id}
         title_comment: 'Groupe de modifications %{id} : %{comment}'
       feed:
         title: Groupe de modifications %{id}
         title_comment: 'Groupe de modifications %{id} : %{comment}'

diff --git a/config/locales/fur.yml b/config/locales/fur.yml
index 88ecb07673a2c09a0f666f8435459b7bc0e1bbdc..b0a13760f4862895446e3cb19fa0187425934b7b 100644 (file)
--- a/config/locales/fur.yml
+++ b/config/locales/fur.yml
@@ -369,7 +369,6 @@ fur:
       no_more: Nissun altri grup di cambiaments cjatât.
       no_more_area: Nissun altri grup di cambiaments in cheste zone cjatât.
       no_more_user: Nissun altri grup di cambiaments par chest utent.
       no_more: Nissun altri grup di cambiaments cjatât.
       no_more_area: Nissun altri grup di cambiaments in cheste zone cjatât.
       no_more_user: Nissun altri grup di cambiaments par chest utent.

-      load_more: Cjame di plui

       feed:
         title: Grup di cambiaments %{id}
         title_comment: Grup di cambiaments %{id} - %{comment}
       feed:
         title: Grup di cambiaments %{id}
         title_comment: Grup di cambiaments %{id} - %{comment}

diff --git a/config/locales/fy.yml b/config/locales/fy.yml
index a89e0cdd9068cc280883528ffd790c01582b6bab..9d912d21d95b0935cf3c7e4153590d7a8d6f6c29 100644 (file)
--- a/config/locales/fy.yml
+++ b/config/locales/fy.yml
@@ -424,7 +424,6 @@ fy:
       no_more: Gjin wizigingssets mear fûn.
       no_more_area: Gjin wizigingssets mear yn dizze krite.
       no_more_user: Gjin wizigingssets mear fan dizze meidogger.
       no_more: Gjin wizigingssets mear fûn.
       no_more_area: Gjin wizigingssets mear yn dizze krite.
       no_more_user: Gjin wizigingssets mear fan dizze meidogger.

-      load_more: Mear lade

       feed:
         title: Wizigingsset %{id}
         title_comment: Wizigingsset %{id} - %{comment}
       feed:
         title: Wizigingsset %{id}
         title_comment: Wizigingsset %{id} - %{comment}

diff --git a/config/locales/ga.yml b/config/locales/ga.yml
index f3a7cf9f6f89c610710eca653ffad33543993025..438e4e3a56d564dbfcba2f40d72a754e395b6070 100644 (file)
--- a/config/locales/ga.yml
+++ b/config/locales/ga.yml
@@ -303,7 +303,6 @@ ga:
       no_more: Níor aimsíodh aon tacar athruithe eile.
       no_more_area: Níl aon tacar athruithe eile sa limistéar seo.
       no_more_user: Níl aon tacar athruithe eile ón úsáideoir seo.
       no_more: Níor aimsíodh aon tacar athruithe eile.
       no_more_area: Níl aon tacar athruithe eile sa limistéar seo.
       no_more_user: Níl aon tacar athruithe eile ón úsáideoir seo.

-      load_more: Lódáil tuilleadh

       feed:
         title: Tacar athruithe %{id}
         title_comment: Tacar athruithe %{id} - %{comment}
       feed:
         title: Tacar athruithe %{id}
         title_comment: Tacar athruithe %{id} - %{comment}

diff --git a/config/locales/gd.yml b/config/locales/gd.yml
index 049a72d33d49c8f4ffe6532677d3b37dfbd25bc9..de65a4fc9c106cc45760febb8746493601833df3 100644 (file)
--- a/config/locales/gd.yml
+++ b/config/locales/gd.yml
@@ -401,7 +401,6 @@ gd:
       no_more_area: Chan eil seata atharraichean eile san raon seo.
       no_more_user: Cha do chruthaich an cleachdaiche seo seata atharraichean sam
         bith eile.
       no_more_area: Chan eil seata atharraichean eile san raon seo.
       no_more_user: Cha do chruthaich an cleachdaiche seo seata atharraichean sam
         bith eile.

-      load_more: Luchdaich barrachd dhiubh

       feed:
         title: Seata atharraichean %{id}
         title_comment: Seata atharraichean %{id} - %{comment}
       feed:
         title: Seata atharraichean %{id}
         title_comment: Seata atharraichean %{id} - %{comment}

diff --git a/config/locales/gl.yml b/config/locales/gl.yml
index f732c58603ceee656723e145f440c53036504372..6ebfa3e7d716e1bafab9553a5875b6f1a849c0d4 100644 (file)
--- a/config/locales/gl.yml
+++ b/config/locales/gl.yml
@@ -542,7 +542,6 @@ gl:
       no_more: Non se atoparon máis conxuntos de modificacións.
       no_more_area: Non hai máis conxuntos de modificacións nesta zona.
       no_more_user: Non hai máis conxuntos de modificacións deste usuario.
       no_more: Non se atoparon máis conxuntos de modificacións.
       no_more_area: Non hai máis conxuntos de modificacións nesta zona.
       no_more_user: Non hai máis conxuntos de modificacións deste usuario.

-      load_more: Amosar máis

       feed:
         title: Conxunto de modificacións %{id}
         title_comment: Conxunto de modificacións %{id} - %{comment}
       feed:
         title: Conxunto de modificacións %{id}
         title_comment: Conxunto de modificacións %{id} - %{comment}

diff --git a/config/locales/he.yml b/config/locales/he.yml
index 2a6d1bdbe81ee8db25089a93d0411bb241a14a5b..8224becfb0c040d1ff0ffb033bb83f8b9186a6e2 100644 (file)
--- a/config/locales/he.yml
+++ b/config/locales/he.yml
@@ -525,6 +525,8 @@ he:
     timeout:
       sorry: מצטערים, אחזור ההיסטוריה של נקודה מספר %{id} ארך זמן רב מדי.
   ways:
     timeout:
       sorry: מצטערים, אחזור ההיסטוריה של נקודה מספר %{id} ארך זמן רב מדי.
   ways:

+    not_found_message:
+      sorry: מצטערים, לא ניתן למצוא את הדרך %{id}.

     timeout:
       sorry: מצטערים, אחזור הנתונים עבור הדרך מספר %{id} ארך זמן רב מדי.
   old_ways:
     timeout:
       sorry: מצטערים, אחזור הנתונים עבור הדרך מספר %{id} ארך זמן רב מדי.
   old_ways:


@@ -533,6 +535,8 @@ he:
     timeout:
       sorry: מצטערים, אחזור ההיסטוריה של דרך מספר %{id} ארך זמן רב מדי.
   relations:
     timeout:
       sorry: מצטערים, אחזור ההיסטוריה של דרך מספר %{id} ארך זמן רב מדי.
   relations:

+    not_found_message:
+      sorry: מצטערים, לא ניתן למצוא את היחס %{id}.

     timeout:
       sorry: מצטערים, אחזור הנתונים עבור היחס מספר %{id} ארך זמן רב מדי.
   old_relations:
     timeout:
       sorry: מצטערים, אחזור הנתונים עבור היחס מספר %{id} ארך זמן רב מדי.
   old_relations:


@@ -552,10 +556,22 @@ he:
         sorry: מצטערים, הזמן שלקח לרשימת ההערות על ערכת השינויים שביקשת להתקבל ארוך
           מדי.
   changesets:
         sorry: מצטערים, הזמן שלקח לרשימת ההערות על ערכת השינויים שביקשת להתקבל ארוך
           מדי.
   changesets:

+    changeset:
+      comments:
+        one: תגובה אחת
+        two: '%{count} תגובות'
+        many: '%{count} תגובות'
+        other: '%{count} תגובות'
+      changes:
+        one: שינוי אחד
+        two: '%{count} שינויים'
+        many: '%{count} שינויים'
+        other: '%{count} שינויים'

     index:
       title: ערכות שינויים
       title_user: ערכות שינויים מאת %{user}
       title_user_link_html: ערכות שינויים מאת %{user_link}
     index:
       title: ערכות שינויים
       title_user: ערכות שינויים מאת %{user}
       title_user_link_html: ערכות שינויים מאת %{user_link}

+      title_followed: ערכות שינויים של משתמשים ברישמת המעקב שלך

       title_nearby: ערכות שינויים של משתמשים בסביבה
       empty: לא נמצאה אף ערכת שינויים.
       empty_area: אין ערכות שינויים באזור הזה.
       title_nearby: ערכות שינויים של משתמשים בסביבה
       empty: לא נמצאה אף ערכת שינויים.
       empty_area: אין ערכות שינויים באזור הזה.


@@ -563,7 +579,6 @@ he:
       no_more: לא נמצאו ערכות שינויים נוספות.
       no_more_area: אין עוד ערכות שינויים באזור הזה.
       no_more_user: אין ערכות שינויים נוספות מאת המשתמש הזה.
       no_more: לא נמצאו ערכות שינויים נוספות.
       no_more_area: אין עוד ערכות שינויים באזור הזה.
       no_more_user: אין ערכות שינויים נוספות מאת המשתמש הזה.

-      load_more: לטעון עוד

       feed:
         title: ערכת שינויים %{id}
         title_comment: ערכת שינויים %{id} – %{comment}
       feed:
         title: ערכת שינויים %{id}
         title_comment: ערכת שינויים %{id} – %{comment}


@@ -591,9 +606,15 @@ he:
       changesetxml: XML של ערכת השינויים
       osmchangexml: osmChange XML
     paging_nav:
       changesetxml: XML של ערכת השינויים
       osmchangexml: osmChange XML
     paging_nav:

+      nodes_title: נקודות

       nodes_paginated: נקודות (%{x}–%{y} מתוך %{count})
       nodes_paginated: נקודות (%{x}–%{y} מתוך %{count})

+      ways_title: דרכים

       ways_paginated: קווים (%{x}–%{y} מתוך %{count})
       ways_paginated: קווים (%{x}–%{y} מתוך %{count})

+      relations_title: יחסים

       relations_paginated: יחסים (%{x}–%{y} מתוך %{count})
       relations_paginated: יחסים (%{x}–%{y} מתוך %{count})

+      range: '%{x} עד %{y} מתוך %{count}'
+    not_found_message:
+      sorry: מצטערים, לא ניתן למצוא את ערכת השינויים %{id}.

     timeout:
       sorry: מצטערים, קבלת רשימת ערכות השינויים שביקשת אורכת זמן רב מדי.
   changeset_subscriptions:
     timeout:
       sorry: מצטערים, קבלת רשימת ערכות השינויים שביקשת אורכת זמן רב מדי.
   changeset_subscriptions:


@@ -621,13 +642,18 @@ he:
     popup:
       your location: מיקומך
       nearby mapper: ממפה סמוך
     popup:
       your location: מיקומך
       nearby mapper: ממפה סמוך

+      following: משתמש ברשימת המעקב שלך

     show:
       title: לוח הבקרה שלי
       no_home_location_html: '%{edit_profile_link} והגדרת מיקום הבית שלך לצפייה במשתמשים
         קרובים.'
       edit_your_profile: עריכת הפרופיל שלך
     show:
       title: לוח הבקרה שלי
       no_home_location_html: '%{edit_profile_link} והגדרת מיקום הבית שלך לצפייה במשתמשים
         קרובים.'
       edit_your_profile: עריכת הפרופיל שלך

+      followings: משתמשים ברשימת המעקב שלך
+      no followings: לא עקבת עדיין אחרי שום משתמש

       nearby users: עוד משתמשים בסביבה
       no nearby users: אין עדיין עוד משתמשים שמודים שהם מיפו בסביבה.
       nearby users: עוד משתמשים בסביבה
       no nearby users: אין עדיין עוד משתמשים שמודים שהם מיפו בסביבה.

+      followed_changesets: ערכות שינויים
+      followed_diaries: רשומות ביומן

       nearby_changesets: ערכות השינויים של משתמשים בסביבה
       nearby_diaries: רשומות יומן של משתמשים בסביבה
   diary_entries:
       nearby_changesets: ערכות השינויים של משתמשים בסביבה
       nearby_diaries: רשומות יומן של משתמשים בסביבה
   diary_entries:


@@ -638,6 +664,7 @@ he:
       use_map_link: להשתמש במפה
     index:
       title: יומנים של המשתמש
       use_map_link: להשתמש במפה
     index:
       title: יומנים של המשתמש

+      title_followed: יומנים של משתמשים ברשימת המעקב שלך

       title_nearby: יומנים של משתמשים בסביבה
       user_title: היומן של %{user}
       in_language_title: רשומות יומן ב%{language}
       title_nearby: יומנים של משתמשים בסביבה
       user_title: היומן של %{user}
       in_language_title: רשומות יומן ב%{language}


@@ -756,6 +783,23 @@ he:
       title: הקובץ לא נמצא
       description: איתור קובץ/תיקייה/פעולת API בשם הזה בשרת של OpenStreetMap לא הצליחה
         (HTTP 404)
       title: הקובץ לא נמצא
       description: איתור קובץ/תיקייה/פעולת API בשם הזה בשרת של OpenStreetMap לא הצליחה
         (HTTP 404)

+  follows:
+    show:
+      follow:
+        heading: האם ברצונך לעקוב אחר %{user}?
+        button: לעקוב אחר משתמש
+      unfollow:
+        heading: האם ברצונך להפסיק לעקוב אחר %{user}?
+        button: להפסיק לעקוב אחר משתמש
+    create:
+      success: התחלת לעקוב אחר %{name}!
+      failed: מצטערים, בקשתך לעקוב אחר %{name} נכשלה.
+      already_followed: משתמש %{name} כבר ברשימת המעקב שלך.
+      limit_exceeded: התחלת לעקוב אחר משתמשים רבים לאחרונה. נא להמתין לפני ניסיון
+        לעקוב אחר משתמשים נוספים.
+    destroy:
+      success: הפסקת לעקוב אחר %{name}.
+      not_followed: הפסקת לעקוב אחר %{name}.

   geocoder:
     search:
       title:
   geocoder:
     search:
       title:


@@ -1010,6 +1054,7 @@ he:
           bridleway: שביל עבור סוסים
           bus_guideway: נתיב תחבורה ציבורית מודרכת
           bus_stop: תחנת אוטובוס
           bridleway: שביל עבור סוסים
           bus_guideway: נתיב תחבורה ציבורית מודרכת
           bus_stop: תחנת אוטובוס

+          busway: דרך לאוטובוסים

           construction: דרך בבנייה
           corridor: פרוזדור
           crossing: מעבר
           construction: דרך בבנייה
           corridor: פרוזדור
           crossing: מעבר


@@ -1546,15 +1591,15 @@ he:
           "yes": נתיב שיט לא מוגדר
       admin_levels:
         level2: גבול בין מדינות
           "yes": נתיב שיט לא מוגדר
       admin_levels:
         level2: גבול בין מדינות

-        level3: ×\92×\91×\95×\9c ×\9e× ×\94×\9c×\99 (רמה 3)
-        level4: ×\92×\91×\95×\9c ×\9e×\97×\95×\96×\92×\91×\95×\9c ×\9e× ×\94×\9c×\99 (רמה 4)
-        level5: ×\92×\91×\95×\9c ×\9e×\97×\95×\96×\92×\91×\95×\9c ×\9e× ×\94×\9c×\99 (רמה 5)
-        level6: ×\92×\91×\95×\9c ×\9e×\97×\95×\96×\92×\91×\95×\9c ×\9e× ×\94×\9c×\99 (רמה 6)
-        level7: ×\92×\91×\95×\9c ×\9e×\97×\95×\96×\92×\91×\95×\9c ×\9e× ×\94×\9c×\99 (רמה 7)
-        level8: ×\92×\91×\95×\9c ×\9e×\97×\95×\96×\92×\91×\95×\9c ×\9e× ×\94×\9c×\99 (רמה 8)
-        level9: ×\92×\91×\95×\9c ×\9e×\97×\95×\96×\92×\91×\95×\9c ×\9e× ×\94×\9c×\99 (רמה 9)
-        level10: ×\92×\91×\95×\9c ×\9e×\97×\95×\96×\92×\91×\95×\9c ×\9e× ×\94×\9c×\99 (רמה 10)
-        level11: ×\92×\91×\95×\9c ×\9e×\97×\95×\96×\92×\91×\95×\9c ×\9e× ×\94×\9c×\99 (רמה 11)
+        level3: ×\92×\91×\95×\9c ש×\98×\97 ש×\99פ×\95×\98 (רמה 3)
+        level4: ×\92×\91×\95×\9c ש×\98×\97 ש×\99פ×\95×\98 (רמה 4)
+        level5: ×\92×\91×\95×\9c ש×\98×\97 ש×\99פ×\95×\98 (רמה 5)
+        level6: ×\92×\91×\95×\9c ש×\98×\97 ש×\99פ×\95×\98 (רמה 6)
+        level7: ×\92×\91×\95×\9c ש×\98×\97 ש×\99פ×\95×\98 (רמה 7)
+        level8: ×\92×\91×\95×\9c ש×\98×\97 ש×\99פ×\95×\98 (רמה 8)
+        level9: ×\92×\91×\95×\9c ש×\98×\97 ש×\99פ×\95×\98 (רמה 9)
+        level10: ×\92×\91×\95×\9c ש×\98×\97 ש×\99פ×\95×\98 (רמה 10)
+        level11: ×\92×\91×\95×\9c ש×\98×\97 ש×\99פ×\95×\98 (רמה 11)

       border_types:
         arrondissement: גבול נפה (ארונדיסמן)
         borough: גבול רובע (borough)
       border_types:
         arrondissement: גבול נפה (ארונדיסמן)
         borough: גבול רובע (borough)


@@ -1593,7 +1638,9 @@ he:
       title: בעיות
       select_status: בחירת מצב
       select_type: בחירת סוג
       title: בעיות
       select_status: בחירת מצב
       select_type: בחירת סוג

+      select_last_managed_by: בחירת "נוהל לאחרונה לפי"

       reported_user: המשתמש המדוּוח
       reported_user: המשתמש המדוּוח

+      not_managed: לא מנוהל

       search: חיפוש
       search_guidance: 'חיפוש בעיות:'
       states:
       search: חיפוש
       search_guidance: 'חיפוש בעיות:'
       states:


@@ -1607,6 +1654,8 @@ he:
       status: מצב
       reports: דיווחים
       last_updated: עדכון אחרון
       status: מצב
       reports: דיווחים
       last_updated: עדכון אחרון

+      last_managed: נוהל לאחרונה
+      reporting_users: משתמשים מדווחים

       reports_count:
         one: דיווח אחד
         two: '%{count} דיווחים'
       reports_count:
         one: דיווח אחד
         two: '%{count} דיווחים'


@@ -1648,12 +1697,26 @@ he:
       reopened: מצב הבעיות שונה ל„פתוחה”
     comments:
       comment_from_html: תגובה מאת %{user_link} על %{comment_created_at}
       reopened: מצב הבעיות שונה ל„פתוחה”
     comments:
       comment_from_html: תגובה מאת %{user_link} על %{comment_created_at}

+      reassign_to_moderators: להקצות את הבעיה מחדש למפקחים
+      reassign_to_administrators: להקצות את הבעיה מחדש למנהלים

     reports:
       reported_by_html: דווח בתור %{category} על־ידי %{user} ב־%{updated_at}
     helper:
       reportable_title:
         diary_comment: '%{entry_title}, תגובה מס׳ %{comment_id}'
         note: הערה מס׳ %{note_id}
     reports:
       reported_by_html: דווח בתור %{category} על־ידי %{user} ב־%{updated_at}
     helper:
       reportable_title:
         diary_comment: '%{entry_title}, תגובה מס׳ %{comment_id}'
         note: הערה מס׳ %{note_id}

+      reportable_heading:
+        diary_comment_html: הערת היומן %{title} נוצרה ב־%{datetime_created}, עודכנה
+          ב־%{datetime_updated}
+        diary_entry_html: רשומת היומן %{title} נוצרה ב־%{datetime_created}, עודכנה
+          ב־%{datetime_updated}
+        note_html: '%{title} נוצר ב־%{datetime_created}, עודכן ב-%{datetime_updated}'
+        user_html: המשתמש %{title} נוצר ב־%{datetime_created}
+    reporters:
+      index:
+        title: 'המדווחים של הבעיה #%{issue_id}'
+      reporters:
+        more_reporters: ועוד %{count}

   issue_comments:
     create:
       comment_created: התגובה שלך נוצרה בהצלחה
   issue_comments:
     create:
       comment_created: התגובה שלך נוצרה בהצלחה


@@ -1723,6 +1786,13 @@ he:
     communities: קהילות
     learn_more: מידע נוסף
     more: עוד
     communities: קהילות
     learn_more: מידע נוסף
     more: עוד

+    offline_flash:
+      osm_offline: מסד הנתונים של אתר OpenStreetMap אינו מקוון כעת בשל ביצוע עבודות
+        תחזוקה.
+      osm_read_only: מסד הנתונים של אתר OpenStreetMap נתון כעת במצב קריאה בלבד בשל
+        עבודות תחזוקה המבוצעות בו.
+      expected_restore_html: השירותים צפויים להיות לחזור לפעילות בעוד %{time}.
+      announcement: אפשר לקרוא את ההודעה כאן.

   user_mailer:
     diary_comment_notification:
       description: רשומת יומן OpenStreetMap מס׳ %{id}
   user_mailer:
     diary_comment_notification:
       description: רשומת יומן OpenStreetMap מס׳ %{id}


@@ -1746,8 +1816,12 @@ he:
         %{replyurl}
     follow_notification:
       hi: שלום %{to_user},
         %{replyurl}
     follow_notification:
       hi: שלום %{to_user},

+      subject: '[אופן סטריט מאפ OpenStreetMap] משתמש %{user} הוסיף אותך לרשימת המעקב'
+      followed_you: המשתמש %{user} הוסיף אותך לרשימת המעקב ב־OpenStreetMap.

       see_their_profile: באפשרותך לצפות בפרופיל שלו בכתובת %{userurl}.
       see_their_profile_html: באפשרותך לצפות בפרופיל שלו בכתובת %{userurl}.
       see_their_profile: באפשרותך לצפות בפרופיל שלו בכתובת %{userurl}.
       see_their_profile_html: באפשרותך לצפות בפרופיל שלו בכתובת %{userurl}.

+      follow_them: באפשרותך להוסיף את החשבון הזה לרשימת המעקב שלך ב־%{followurl}.
+      follow_them_html: אפשר גם להוסיף את החשבון הזה לרשימת המעקב בדף %{followurl}.

     gpx_details:
       details: 'פרטי הקובץ שלך:'
       filename: שם הקובץ
     gpx_details:
       details: 'פרטי הקובץ שלך:'
       filename: שם הקובץ


@@ -1755,18 +1829,20 @@ he:
       description: תיאור
       tags: תגים
       total_points: סך הנקודות
       description: תיאור
       tags: תגים
       total_points: סך הנקודות

+      imported_points: מספר הנקודות שיובאוי

     gpx_failure:
       hi: שלום %{to_user},
     gpx_failure:
       hi: שלום %{to_user},

-      failed_to_import: 'הייבוא כקובץ מסלול GPS נכשל. נא לוודא שהקובץ שלך הוא קובץ
-        GPX תקני או ארכיון בתסדירים הנתמכים (‎.tar.gz,‏ ‎.tar.bz2,‏ ‎.tar,‏ ‎.zip,‏
-        ‎.gpx.gz,‏ ‎.gpx.bz2) שמכיל קובצי GPX. יכול להיות שיש בעיית תחביר או תסדיר
-        ×\91ק×\95×\91×¥ ש×\9c×\9a? ×\94× ×\94 ש×\92×\99×\90ת ×\94×\99יבוא:'
-      more_info: מידע נוסף על תקלות ביבוא GPX ועל איך להימנע מהן נמצא בכתובת %{url}.
+      failed_to_import: נראה שיבוא הקובץ שלך בתור מסלול GPS נכשל.
+      verify: 'נא לוודא שהקובץ שלך הוא קובץ GPX תקין או ארכיון בתסדירים הנתמכים (‎.tar.gz,‏
+        ‎.tar.bz2,‏ ‎.tar,‏ ‎.zip,‏ ‎.gpx.gz,‏ ‎.gpx.bz2) שמכיל קובצי GPX. יכול להיות
+        ש×\99ש ×\91×¢×\99×\99ת ת×\97×\91×\99ר ×\90×\95 תס×\93×\99ר ×\91ק×\95×\91×¥ ש×\9c×\9a? ×\94× ×\94 ש×\92×\99×\90ת ×\94יבוא:'
+      more_info: מידע נוסף על תקלות ביבוא GPX ועל איך להימנע מהן נמצא בכתובת %{url}

       more_info_html: מידע נוסף על תקלות ביבוא GPX ועל איך להימנע מהן נמצא בכתובת
         %{url}.
       subject: '[אופן סטריט מאפ OpenStreetMap] שגיאה בייבוא GPX'
     gpx_success:
       hi: שלום %{to_user},
       more_info_html: מידע נוסף על תקלות ביבוא GPX ועל איך להימנע מהן נמצא בכתובת
         %{url}.
       subject: '[אופן סטריט מאפ OpenStreetMap] שגיאה בייבוא GPX'
     gpx_success:
       hi: שלום %{to_user},

+      imported_successfully: נראה שהקובץ שלך יובא בהצלחה כמסלול GPS.

       all_your_traces: אפשר למצוא את כל הקלטות ה־GPX שלך בכתובת %{url}
       all_your_traces_html: אפשר למצוא את כל עקבות ה־GPX שלך שהועלו בהצלחה דרך %{url}.
       subject: '[אופן סטריט מאפ OpenStreetMap] ייבוא GPX הצליח'
       all_your_traces: אפשר למצוא את כל הקלטות ה־GPX שלך בכתובת %{url}
       all_your_traces_html: אפשר למצוא את כל עקבות ה־GPX שלך שהועלו בהצלחה דרך %{url}.
       subject: '[אופן סטריט מאפ OpenStreetMap] ייבוא GPX הצליח'


@@ -2060,6 +2136,9 @@ he:
       preview: תצוגה מקדימה
       help: עזרה
     pagination:
       preview: תצוגה מקדימה
       help: עזרה
     pagination:

+      changeset_comments:
+        older: הערות ישנות
+        newer: הערות חדשות

       diary_comments:
         older: הערות ישנות
         newer: הערות חדשות
       diary_comments:
         older: הערות ישנות
         newer: הערות חדשות


@@ -2942,6 +3021,12 @@ he:
           confirmed: מאושר
           suspended: מושהה
           deleted: מחוק
           confirmed: מאושר
           suspended: מושהה
           deleted: מחוק

+        name_or_email: שם או דוא״ל
+        ip_address: כתובת IP
+        edits: עריכות?
+        has_edits: יש עריכות
+        no_edits: אין עריכות
+        search: חיפוש

       page:
         found_users:
           one: נמצא משתמש אחד
       page:
         found_users:
           one: נמצא משתמש אחד


@@ -2954,8 +3039,17 @@ he:
       user:
         summary_html: '%{name} נוצר מכתובת %{ip_address} ב־%{date}'
         summary_no_ip_html: '%{name} נוצר ב־%{date}'
       user:
         summary_html: '%{name} נוצר מכתובת %{ip_address} ב־%{date}'
         summary_no_ip_html: '%{name} נוצר ב־%{date}'

+    comments:
+      index:
+        heading_html: הערות של %{user}
+        changesets: ערכות שינויים
+        diary_entries: רשומות ביומן
+        no_comments: אין תגובות

     changeset_comments:
     changeset_comments:

+      index:
+        title: תגובות על ערכות שינויים שנוספו על־ידי %{user}

       page:
       page:

+        changeset: ערכת שינויים

         when: מתי
         comment: תגובה
     diary_comments:
         when: מתי
         comment: תגובה
     diary_comments:


@@ -2963,6 +3057,7 @@ he:
         title: הערות יומן שנוספו על־ידי %{user}
       page:
         post: רשומה
         title: הערות יומן שנוספו על־ידי %{user}
       page:
         post: רשומה

+        when: מתי

         comment: הערה
     suspended:
       title: החשבון הושעה
         comment: הערה
     suspended:
       title: החשבון הושעה


@@ -3144,6 +3239,7 @@ he:
       closed_title: הערה פתורה מס׳ %{note_name}
       hidden_title: הערה מוסתרת מס׳ %{note_name}
       description_when_author_is_deleted: נמחק
       closed_title: הערה פתורה מס׳ %{note_name}
       hidden_title: הערה מוסתרת מס׳ %{note_name}
       description_when_author_is_deleted: נמחק

+      description_when_there_is_no_opening_comment: לא ידוע

       event_opened_by_html: נוצר על־ידי %{user} %{time_ago}
       event_opened_by_anonymous_html: נוצר על־ידי אלמוני %{time_ago}
       event_commented_by_html: הערה מאת %{user} %{time_ago}
       event_opened_by_html: נוצר על־ידי %{user} %{time_ago}
       event_opened_by_anonymous_html: נוצר על־ידי אלמוני %{time_ago}
       event_commented_by_html: הערה מאת %{user} %{time_ago}


@@ -3178,6 +3274,15 @@ he:
         על ההערה שלך ולעזור לממפים לפתור את זה.
       anonymous_warning_log_in: להיכנס לחשבון
       anonymous_warning_sign_up: להירשם
         על ההערה שלך ולעזור לממפים לפתור את זה.
       anonymous_warning_log_in: להיכנס לחשבון
       anonymous_warning_sign_up: להירשם

+      counter_warning_html: כבר פרסמת לפחות %{x_anonymous_notes}, זה נהדר עבור הקהילה,
+        תודה! כעת אנו ממליצים לך %{contribute_by_yourself}, זה לא כל־כך מסובך, ו%{community_can_help}.
+      x_anonymous_notes:
+        one: הערה אלמונית אחת
+        two: '%{count} הערות אלמוניות'
+        many: '%{count} הערות אלמוניות'
+        other: '%{count} הערות אלמוניות'
+      counter_warning_guide_link:
+        text: לתרום בעצמך

       counter_warning_forum_link:
         text: הקהילה יכולה לעזור לך
       advice: /start
       counter_warning_forum_link:
         text: הקהילה יכולה לעזור לך
       advice: /start


@@ -3190,6 +3295,8 @@ he:
       showing_page: הדף %{page}
       next: הבא
       previous: הקודם
       showing_page: הדף %{page}
       next: הבא
       previous: הקודם

+    not_found_message:
+      sorry: מצטערים, לא ניתן למצוא את ההערה %{id}.

   javascripts:
     close: סגירה
     share:
   javascripts:
     close: סגירה
     share:


@@ -3349,6 +3456,8 @@ he:
           ninth: תשיעית
           tenth: עשירית
       time: זמן
           ninth: תשיעית
           tenth: עשירית
       time: זמן

+      download: הורדת מסלול בתור GeoJSON
+      filename: מסלול

     query:
       node: נקודה
       way: דרך
     query:
       node: נקודה
       way: דרך


@@ -3363,6 +3472,17 @@ he:
       show_address: להציג כתובת
       query_features: שאילתת ישויות
       centre_map: למרכז את המפה כאן
       show_address: להציג כתובת
       query_features: שאילתת ישויות
       centre_map: למרכז את המפה כאן

+    home:
+      marker_title: מיקום הבית שלי
+      not_set: מיקום הבית לא מוגדר עבור החשבון שלך
+    heatmap:
+      tooltip:
+        no_contributions: אין תרומות ב־%{date}
+        contributions:
+          one: תרומה אחת ב־%{date}
+          two: '%{count} תרומות ב־%{date}'
+          many: '%{count} תרומות ב־%{date}'
+          other: '%{count} תרומות ב־%{date}'

   redactions:
     edit:
       heading: עריכת הסרה
   redactions:
     edit:
       heading: עריכת הסרה

diff --git a/config/locales/hi.yml b/config/locales/hi.yml
index d9328a558b72cd09799ed1d92107e9108f95d2b4..ce847c67afbfe66076fc56c6556761f124ccac8e 100644 (file)
--- a/config/locales/hi.yml
+++ b/config/locales/hi.yml
@@ -383,7 +383,6 @@ hi:
       no_more: और कोई चेंजसेट नहीं मिला।
       no_more_area: इस इलाके में और कोई चेंजसेट नहीं है।
       no_more_user: इस सदस्य द्वारा कोई चेंजसेट नहीं है।
       no_more: और कोई चेंजसेट नहीं मिला।
       no_more_area: इस इलाके में और कोई चेंजसेट नहीं है।
       no_more_user: इस सदस्य द्वारा कोई चेंजसेट नहीं है।

-      load_more: और पढ़ें

       feed:
         title: 'Changeset: %{id}'
         title_comment: Changeset %{id} - %{comment}
       feed:
         title: 'Changeset: %{id}'
         title_comment: Changeset %{id} - %{comment}

diff --git a/config/locales/hr.yml b/config/locales/hr.yml
index ee7623e094c80c042ee1aee9a33acf441d86082d..6cf44c35d3099c3be209f979f863dccd0564ddfd 100644 (file)
--- a/config/locales/hr.yml
+++ b/config/locales/hr.yml
@@ -374,7 +374,6 @@ hr:
       no_more: Nema više pronađenih setova promjena.
       no_more_area: Nema više paketa uređivanja na ovom području.
       no_more_user: Nema više setova promjena ovog korisnika.
       no_more: Nema više pronađenih setova promjena.
       no_more_area: Nema više paketa uređivanja na ovom području.
       no_more_user: Nema više setova promjena ovog korisnika.

-      load_more: Učitaj više

       feed:
         title: Set promjena %{id}
         title_comment: Set promjena %{id} - %{comment}
       feed:
         title: Set promjena %{id}
         title_comment: Set promjena %{id} - %{comment}

diff --git a/config/locales/hsb.yml b/config/locales/hsb.yml
index 3c59421b5311cfb59048eb004a2c1a8da7fd55ac..d15b667dff3acf094b08bb2e7e9722cee6c5fdba 100644 (file)
--- a/config/locales/hsb.yml
+++ b/config/locales/hsb.yml
@@ -457,7 +457,6 @@ hsb:
       no_more: Žane dalše sadźby změnow namakane.
       no_more_area: Žane dalše sadźby změnow w tutej kónčinje.
       no_more_user: Žane dalše sadźby změnow wot tutoho wužiwarja.
       no_more: Žane dalše sadźby změnow namakane.
       no_more_area: Žane dalše sadźby změnow w tutej kónčinje.
       no_more_user: Žane dalše sadźby změnow wot tutoho wužiwarja.

-      load_more: Wjace začitać

       feed:
         title: Sadźba změnow %{id}
         title_comment: Sadźba změnow %{id} - %{comment}
       feed:
         title: Sadźba změnow %{id}
         title_comment: Sadźba změnow %{id} - %{comment}

diff --git a/config/locales/hu.yml b/config/locales/hu.yml
index 59ec7cd33e1a6b0d03b4f97e613e48a385cad2fc..7329f06608e02f15ef025d5951d7ff856746ebd0 100644 (file)
--- a/config/locales/hu.yml
+++ b/config/locales/hu.yml
@@ -552,7 +552,6 @@ hu:
       no_more: Nem található több módosításcsomag.
       no_more_area: Ezen a területen nincs több módosításcsomag.
       no_more_user: Ettől a felhasználótól nincs több módosításcsomag.
       no_more: Nem található több módosításcsomag.
       no_more_area: Ezen a területen nincs több módosításcsomag.
       no_more_user: Ettől a felhasználótól nincs több módosításcsomag.

-      load_more: Továbbiak betöltése

       feed:
         title: '%{id} módosításcsomag'
         title_comment: '%{id} módosításcsomag – %{comment}'
       feed:
         title: '%{id} módosításcsomag'
         title_comment: '%{id} módosításcsomag – %{comment}'

diff --git a/config/locales/ia.yml b/config/locales/ia.yml
index aaa0ce09f265aa4a28c18db86515a9c88511e88d..d89c5aae26d259d7268922dbbc917342876ca47d 100644 (file)
--- a/config/locales/ia.yml
+++ b/config/locales/ia.yml
@@ -504,7 +504,6 @@ ia:
       no_more: Nulle altere gruppo de modificationes trovate.
       no_more_area: Nulle altere gruppo de modificationes in iste area.
       no_more_user: Nulle altere gruppo de modificationes facite per iste usator.
       no_more: Nulle altere gruppo de modificationes trovate.
       no_more_area: Nulle altere gruppo de modificationes in iste area.
       no_more_user: Nulle altere gruppo de modificationes facite per iste usator.

-      load_more: Cargar plus

       feed:
         title: Gruppo de modificationes %{id}
         title_comment: Gruppo de modificationes %{id} - %{comment}
       feed:
         title: Gruppo de modificationes %{id}
         title_comment: Gruppo de modificationes %{id} - %{comment}

diff --git a/config/locales/id.yml b/config/locales/id.yml
index 2bed5964619f099ea77d9c84fd9a8276624e4bef..84f6b8c1bde025be99d8bdb2845ba8d1a13ece5c 100644 (file)
--- a/config/locales/id.yml
+++ b/config/locales/id.yml
@@ -483,7 +483,6 @@ id:
       no_more: Tidak ada set perubahan lainnya yang ditemukan.
       no_more_area: Tidak ada set perubahan lainnya di daerah ini.
       no_more_user: Tidak ada set perubahan lainnya oleh pengguna ini.
       no_more: Tidak ada set perubahan lainnya yang ditemukan.
       no_more_area: Tidak ada set perubahan lainnya di daerah ini.
       no_more_user: Tidak ada set perubahan lainnya oleh pengguna ini.

-      load_more: Muat lebih lanjut

       feed:
         title: Set Perubahan %{id}
         title_comment: Set Perubahan %{id} - %{comment}
       feed:
         title: Set Perubahan %{id}
         title_comment: Set Perubahan %{id} - %{comment}

diff --git a/config/locales/is.yml b/config/locales/is.yml
index 1da2f6bf4f65743097ea58622dc80605d6f3bfae..bed71bafdf03c19f417aa211c8fb6de639dd3dfd 100644 (file)
--- a/config/locales/is.yml
+++ b/config/locales/is.yml
@@ -493,7 +493,6 @@ is:
       no_more: Engin fleiri breytingasett fundust.
       no_more_area: Engin fleiri breytingasett á þessu svæði.
       no_more_user: Engin fleiri breytingasett eftir þennan notanda.
       no_more: Engin fleiri breytingasett fundust.
       no_more_area: Engin fleiri breytingasett á þessu svæði.
       no_more_user: Engin fleiri breytingasett eftir þennan notanda.

-      load_more: Hlaða inn fleiri

       feed:
         title: Breytingasett %{id}
         title_comment: Breytingasett %{id} - %{comment}
       feed:
         title: Breytingasett %{id}
         title_comment: Breytingasett %{id} - %{comment}

diff --git a/config/locales/it.yml b/config/locales/it.yml
index 7d054bf6e59938bc4c20e9902257a101d6f4c546..e4b78efb33230818bc3fb942fdce0dceddc418af 100644 (file)
--- a/config/locales/it.yml
+++ b/config/locales/it.yml
@@ -593,7 +593,6 @@ it:
       no_more: Nessun altro gruppo di modifiche trovato.
       no_more_area: Nessun altro gruppo di modifiche in quest'area.
       no_more_user: Nessun altro gruppo di modifiche da quest'utente.
       no_more: Nessun altro gruppo di modifiche trovato.
       no_more_area: Nessun altro gruppo di modifiche in quest'area.
       no_more_user: Nessun altro gruppo di modifiche da quest'utente.

-      load_more: Caricane ancora

       feed:
         title: Gruppo di modifiche %{id}
         title_comment: Gruppo di modifiche %{id} - %{comment}
       feed:
         title: Gruppo di modifiche %{id}
         title_comment: Gruppo di modifiche %{id} - %{comment}

diff --git a/config/locales/ja.yml b/config/locales/ja.yml
index f65967b3fd7a944c4e90164b0f1780f34ea37eac..a9c373a48f4d3fe9334f9ad14c7a262ce8139cf8 100644 (file)
--- a/config/locales/ja.yml
+++ b/config/locales/ja.yml
@@ -511,7 +511,6 @@ ja:
       no_more: 変更セットはこれ以上ありません。
       no_more_area: この領域には変更セットはこれ以上ありません。
       no_more_user: この利用者による変更セットはこれ以上ありません。
       no_more: 変更セットはこれ以上ありません。
       no_more_area: この領域には変更セットはこれ以上ありません。
       no_more_user: この利用者による変更セットはこれ以上ありません。

-      load_more: 続きを読み込む

       feed:
         title: 変更セット %{id}
         title_comment: 変更セット %{id} - %{comment}
       feed:
         title: 変更セット %{id}
         title_comment: 変更セット %{id} - %{comment}

diff --git a/config/locales/ka.yml b/config/locales/ka.yml
index 1745e88d8471888c4dffc63ece8e4e0af99de953..97da662500cb7e699e8692623acd9629d544f07a 100644 (file)
--- a/config/locales/ka.yml
+++ b/config/locales/ka.yml
@@ -197,7 +197,6 @@ ka:
   changesets:
     index:
       title: ცვლილებების პაკეტი
   changesets:
     index:
       title: ცვლილებების პაკეტი

-      load_more: მეტის ჩატვირთვა

       feed:
         title: ცვლილებების პაკეტი %{id}
         title_comment: ცვლილებების პაკეტი %{id} - %{comment}
       feed:
         title: ცვლილებების პაკეტი %{id}
         title_comment: ცვლილებების პაკეტი %{id} - %{comment}

diff --git a/config/locales/kab.yml b/config/locales/kab.yml
index 507b1e0da2a4d4786d9d2df02947c0c292b3658f..a07cf02654dddd488420f7000c9471b86a17aa44 100644 (file)
--- a/config/locales/kab.yml
+++ b/config/locales/kab.yml
@@ -324,7 +324,6 @@ kab:
       no_more: Ulac agraw-nniḍen n usnifel yettwafen.
       no_more_area: Ulac agraw-nniḍen n usnifel yettwafen di temnaḍt-agi.
       no_more_user: Ulac agraw-nniḍen n usnifel n useqdac-agi.
       no_more: Ulac agraw-nniḍen n usnifel yettwafen.
       no_more_area: Ulac agraw-nniḍen n usnifel yettwafen di temnaḍt-agi.
       no_more_user: Ulac agraw-nniḍen n usnifel n useqdac-agi.

-      load_more: Sali ugar

       feed:
         title: Agraw n usnifel %{id}
         title_comment: Agraw n ubeddel %{id} - %{comment}
       feed:
         title: Agraw n usnifel %{id}
         title_comment: Agraw n ubeddel %{id} - %{comment}

diff --git a/config/locales/kk-cyrl.yml b/config/locales/kk-cyrl.yml
index d0e8c534a16acaa573445c1c5ffe520b2497de32..b64549a79ddb0d710b64f180048e2eb29a07b6c9 100644 (file)
--- a/config/locales/kk-cyrl.yml
+++ b/config/locales/kk-cyrl.yml
@@ -313,7 +313,6 @@ kk-cyrl:
       title: Өңдеме дестелері
       title_user: '%{user} жасаған өңдемелер дестелері'
       title_user_link_html: '%{user_link} жасаған өңдеме дестелері'
       title: Өңдеме дестелері
       title_user: '%{user} жасаған өңдемелер дестелері'
       title_user_link_html: '%{user_link} жасаған өңдеме дестелері'

-      load_more: Көбірек жүктеу

       feed:
         title: Өңдеме дестесі %{id}
         closed: Жабық
       feed:
         title: Өңдеме дестесі %{id}
         closed: Жабық

diff --git a/config/locales/km.yml b/config/locales/km.yml
index 987dc6098a842531f5e087d240a6915d4bdb86a8..2e4ce4a46662a4ce2b7999e14f7b8a25d8d9adbe 100644 (file)
--- a/config/locales/km.yml
+++ b/config/locales/km.yml
@@ -168,7 +168,6 @@ km:
       no_more: រកមិនឃើញសំណុំបន្លាស់ប្ដូរថែមទៀតទេ។
       no_more_area: គ្មានសំណុំបន្លាស់ប្ដូរថែមទៀតទេក្នុងតំបន់នេះ។
       no_more_user: គ្មានសំណុំបន្លាស់ប្ដូរដោយអ្នកប្រើប្រាស់នេះថែមទៀតទេ។
       no_more: រកមិនឃើញសំណុំបន្លាស់ប្ដូរថែមទៀតទេ។
       no_more_area: គ្មានសំណុំបន្លាស់ប្ដូរថែមទៀតទេក្នុងតំបន់នេះ។
       no_more_user: គ្មានសំណុំបន្លាស់ប្ដូរដោយអ្នកប្រើប្រាស់នេះថែមទៀតទេ។

-      load_more: ផ្ទុកបន្ថែម

       feed:
         title: សំណុំបន្លាស់ប្ដូរ​ %{id}
         title_comment: សំណុំបន្លាស់ប្តូរ​ %{id} - %{comment}
       feed:
         title: សំណុំបន្លាស់ប្ដូរ​ %{id}
         title_comment: សំណុំបន្លាស់ប្តូរ​ %{id} - %{comment}

diff --git a/config/locales/kn.yml b/config/locales/kn.yml
index 42ed6e2952c3e777e59798edd3d9d6b26676d481..baa1c9eade9d26e8b200fb05ab88b2264d3f31b2 100644 (file)
--- a/config/locales/kn.yml
+++ b/config/locales/kn.yml
@@ -283,7 +283,6 @@ kn:
       no_more: ಇನ್ಯಾವ ಬದಲಾವಣೆಗಳು ಸಿಗುತ್ತಿಲ್ಲ.
       no_more_area: ಈ ಪ್ರದೇಶದಲ್ಲಿ ಇನ್ಯಾವುದೇ ಬದಲಾವಣೆಗಳಿಲ್ಲ.
       no_more_user: ಈ ಬಳಕೆದಾರರಿಂದ ಇನ್ಯಾವುದೇ ಬದಲಾವಣೆಗಳಿಲ್ಲ.
       no_more: ಇನ್ಯಾವ ಬದಲಾವಣೆಗಳು ಸಿಗುತ್ತಿಲ್ಲ.
       no_more_area: ಈ ಪ್ರದೇಶದಲ್ಲಿ ಇನ್ಯಾವುದೇ ಬದಲಾವಣೆಗಳಿಲ್ಲ.
       no_more_user: ಈ ಬಳಕೆದಾರರಿಂದ ಇನ್ಯಾವುದೇ ಬದಲಾವಣೆಗಳಿಲ್ಲ.

-      load_more: ಇನ್ನೂ ತೋರಿಸಿ

       feed:
         title: ಬದಲಾವಣೆಗಳು %{id}
         title_comment: ಬದಲಾವಣೆಗಳು %{id} - %{comment}
       feed:
         title: ಬದಲಾವಣೆಗಳು %{id}
         title_comment: ಬದಲಾವಣೆಗಳು %{id} - %{comment}

diff --git a/config/locales/ko.yml b/config/locales/ko.yml
index 5db1bcd1538ba571100f1c06dcb381b063294706..29fa2d794a17e8085c1052b52658d44b6d1a48e1 100644 (file)
--- a/config/locales/ko.yml
+++ b/config/locales/ko.yml
@@ -37,6 +37,7 @@
 # Author: Stleamist
 # Author: Sukjong0406
 # Author: Suleiman the Magnificent Television
 # Author: Stleamist
 # Author: Sukjong0406
 # Author: Suleiman the Magnificent Television

+# Author: Tensama0415

 # Author: Theshinster123
 # Author: Twotwo2019
 # Author: Wehwei
 # Author: Theshinster123
 # Author: Twotwo2019
 # Author: Wehwei


@@ -289,6 +290,7 @@ ko:
         review link text: 원하는 시간에 이 링크를 따라 새로운 기여자 약관을 검토하고 수락하세요.
         agreed_with_pd: 또한 자신의 편집이 퍼블릭 도메인에 있어야 한다고 생각하는 것도 선언하고 있습니다.
         link text: 무엇인가요?
         review link text: 원하는 시간에 이 링크를 따라 새로운 기여자 약관을 검토하고 수락하세요.
         agreed_with_pd: 또한 자신의 편집이 퍼블릭 도메인에 있어야 한다고 생각하는 것도 선언하고 있습니다.
         link text: 무엇인가요?

+        pd_link_text: 선언

       save changes button: 변경사항 저장
       delete_account: 계정 삭제...
     go_public:
       save changes button: 변경사항 저장
       delete_account: 계정 삭제...
     go_public:


@@ -498,7 +500,6 @@ ko:
       no_more: 찾은 바뀜집합이 더 없습니다.
       no_more_area: 이 지역에서 바뀜집합이 더 없습니다.
       no_more_user: 이 사용자의 바뀜집합이 더 없습니다.
       no_more: 찾은 바뀜집합이 더 없습니다.
       no_more_area: 이 지역에서 바뀜집합이 더 없습니다.
       no_more_user: 이 사용자의 바뀜집합이 더 없습니다.

-      load_more: 더 불러오기

       feed:
         title: 바뀜집합 %{id}
         title_comment: 바뀜집합 %{id} - %{comment}
       feed:
         title: 바뀜집합 %{id}
         title_comment: 바뀜집합 %{id} - %{comment}


@@ -997,6 +998,8 @@ ko:
           wayside_shrine: 길가의 신사
           wreck: 난파선
           "yes": 유적지
           wayside_shrine: 길가의 신사
           wreck: 난파선
           "yes": 유적지

+        information:
+          map: 지도

         junction:
           "yes": 교차로
         landuse:
         junction:
           "yes": 교차로
         landuse:

diff --git a/config/locales/ku-Latn.yml b/config/locales/ku-Latn.yml
index 77574db10bd30d7e9bd5cd530e98fa340e24762a..d737f0633601afaac49a918a27af20342a4dc2b9 100644 (file)
--- a/config/locales/ku-Latn.yml
+++ b/config/locales/ku-Latn.yml
@@ -449,7 +449,6 @@ ku-Latn:
       no_more: Desteyên guhartinan zêdetir nehate dîtin.
       no_more_area: Li vê derê desteyên guhartinan zêdetir tine.
       no_more_user: Desteyên guhartinan yên vê bikarhênerê zêdetir tine.
       no_more: Desteyên guhartinan zêdetir nehate dîtin.
       no_more_area: Li vê derê desteyên guhartinan zêdetir tine.
       no_more_user: Desteyên guhartinan yên vê bikarhênerê zêdetir tine.

-      load_more: Zêdetir bar bike

       feed:
         title: Desteya guhartinan %{id}
         title_comment: Desteya guhartinan %{id} - %{comment}
       feed:
         title: Desteya guhartinan %{id}
         title_comment: Desteya guhartinan %{id} - %{comment}

diff --git a/config/locales/lb.yml b/config/locales/lb.yml
index 249dd5889cbeb26ca28f574bc569f4dfcacea713..e1def22c7f4765a0483420830eda0540739b0ec7 100644 (file)
--- a/config/locales/lb.yml
+++ b/config/locales/lb.yml
@@ -476,7 +476,6 @@ lb:
       no_more: Soss keng Gruppe vun Ännerunge fonnt.
       no_more_area: Keng weider Grupp vun Ännerungen an dëser Géigend.
       no_more_user: Keng weider Gruppe vun Ännerunge vun dësem Benotzer.
       no_more: Soss keng Gruppe vun Ännerunge fonnt.
       no_more_area: Keng weider Grupp vun Ännerungen an dëser Géigend.
       no_more_user: Keng weider Gruppe vun Ännerunge vun dësem Benotzer.

-      load_more: Méi lueden

       feed:
         title: 'Set vun Ännerungen: %{id}'
         title_comment: Set vun Ännerungen %{id} - %{comment}
       feed:
         title: 'Set vun Ännerungen: %{id}'
         title_comment: Set vun Ännerungen %{id} - %{comment}

diff --git a/config/locales/lt.yml b/config/locales/lt.yml
index 33bc812903ddd225d85e51b8efe3846bcfe6caae..c05e58900f6abb8d53369fe187b36539d7c59530 100644 (file)
--- a/config/locales/lt.yml
+++ b/config/locales/lt.yml
@@ -528,7 +528,6 @@ lt:
       no_more: Daugiau pakeitimų nerasta.
       no_more_area: Daugiau pakeitimų šioje vietoje nėra.
       no_more_user: Daugiau šio naudotojo pakeitimų nėra.
       no_more: Daugiau pakeitimų nerasta.
       no_more_area: Daugiau pakeitimų šioje vietoje nėra.
       no_more_user: Daugiau šio naudotojo pakeitimų nėra.

-      load_more: Įkelti daugiau

       feed:
         title: Pakeitimas %{id}
         title_comment: Pakeitimas %{id} - %{comment}
       feed:
         title: Pakeitimas %{id}
         title_comment: Pakeitimas %{id} - %{comment}

diff --git a/config/locales/lv.yml b/config/locales/lv.yml
index 7c1e4180bb43f98c78ddb7aca0e259d212677038..32710ea4a663bfdd75638187bd323fe14ac90f69 100644 (file)
--- a/config/locales/lv.yml
+++ b/config/locales/lv.yml
@@ -346,7 +346,6 @@ lv:
       no_more: Vairāk izmaiņu kopu neatrada.
       no_more_area: Nav vairāk izmaiņu kopu šajā apgabalā.
       no_more_user: Nav vairāk izmaiņu kopu no šī lietotāja.
       no_more: Vairāk izmaiņu kopu neatrada.
       no_more_area: Nav vairāk izmaiņu kopu šajā apgabalā.
       no_more_user: Nav vairāk izmaiņu kopu no šī lietotāja.

-      load_more: Ielādēt vairāk

       feed:
         title: Izmaiņu kopa %{id}
         title_comment: Izmaiņu kopa %{id} - %{comment}
       feed:
         title: Izmaiņu kopa %{id}
         title_comment: Izmaiņu kopa %{id} - %{comment}

diff --git a/config/locales/mk.yml b/config/locales/mk.yml
index 487c227e976e00c7c170af39d7f55bc0dfeb493f..3e419327e9afe6a2dd5e29af30dc7b218f5ce3de 100644 (file)
--- a/config/locales/mk.yml
+++ b/config/locales/mk.yml
@@ -495,7 +495,6 @@ mk:
       no_more: Нема повеќе промени.
       no_more_area: Нема повеќе промени на ова подрчаје.
       no_more_user: Нема повеќе промени од овој корисник.
       no_more: Нема повеќе промени.
       no_more_area: Нема повеќе промени на ова подрчаје.
       no_more_user: Нема повеќе промени од овој корисник.

-      load_more: Вчитај уште

       feed:
         title: Измени %{id}
         title_comment: Измени %{id} - %{comment}
       feed:
         title: Измени %{id}
         title_comment: Измени %{id} - %{comment}

diff --git a/config/locales/mr.yml b/config/locales/mr.yml
index 202807b1e0baf4a9b7f9d4ff7c3783f9abcc4471..724200e2006bf094b3e461fd7b18209f4a0d76c9 100644 (file)
--- a/config/locales/mr.yml
+++ b/config/locales/mr.yml
@@ -280,7 +280,6 @@ mr:
       no_more: अधिक बदलसंच सापडले नाहीत.
       no_more_area: या भागात अधिक बदलसंच नाहीत.
       no_more_user: या सदस्याचे अधिक बदलसंच नाहीत.
       no_more: अधिक बदलसंच सापडले नाहीत.
       no_more_area: या भागात अधिक बदलसंच नाहीत.
       no_more_user: या सदस्याचे अधिक बदलसंच नाहीत.

-      load_more: अधिक प्रभारण करा

       feed:
         title: बदलसंच %{id}
         title_comment: बदलसंच %{id} - %{comment}
       feed:
         title: बदलसंच %{id}
         title_comment: बदलसंच %{id} - %{comment}

diff --git a/config/locales/ms.yml b/config/locales/ms.yml
index 9d965ca43633d479e0c11510dabc5c017c51e5f5..3a4863030d8e70145d59adf192e56ae077b34196 100644 (file)
--- a/config/locales/ms.yml
+++ b/config/locales/ms.yml
@@ -363,7 +363,6 @@ ms:
       no_more: Tiada lagi set perubahan ditemui.
       no_more_area: Tiada lagi set perubahan di kawasan ini.
       no_more_user: Tiada lagi set perubahan oleh pengguna ini.
       no_more: Tiada lagi set perubahan ditemui.
       no_more_area: Tiada lagi set perubahan di kawasan ini.
       no_more_user: Tiada lagi set perubahan oleh pengguna ini.

-      load_more: Selanjutnya

       feed:
         title: Set Ubah %{id}
         title_comment: Set Ubah %{id} - %{comment}
       feed:
         title: Set Ubah %{id}
         title_comment: Set Ubah %{id} - %{comment}

diff --git a/config/locales/my.yml b/config/locales/my.yml
index 4d2cc38a6e22b59cb5a4a41723ca0b6dae9d2c85..bb0c30b362cea7aa3e4500e7004157292e9b27b6 100644 (file)
--- a/config/locales/my.yml
+++ b/config/locales/my.yml
@@ -171,7 +171,6 @@ my:
         commented_at_by_html: '%{user} က %{when} အကြာက မွမ်းမံခဲ့သည်'
   changesets:
     index:
         commented_at_by_html: '%{user} က %{when} အကြာက မွမ်းမံခဲ့သည်'
   changesets:
     index:

-      load_more: ပိုမိုခေါ်ယူရန်

       feed:
         created: ဖန်တီးလိုက်သည်
         closed: ပိတ်လိုက်သည်
       feed:
         created: ဖန်တီးလိုက်သည်
         closed: ပိတ်လိုက်သည်

diff --git a/config/locales/nb.yml b/config/locales/nb.yml
index 91441cab399c715bcfe08d4a2dd609d4641fbde6..0b6e65a39e65fbf1bb86a9c4fb68362ea13a86a4 100644 (file)
--- a/config/locales/nb.yml
+++ b/config/locales/nb.yml
@@ -442,7 +442,6 @@ nb:
       no_more: Fant ingen flere endringssett.
       no_more_area: Ingen flere endringssett i dette området.
       no_more_user: Ingen flere endringssett av denne brukeren.
       no_more: Fant ingen flere endringssett.
       no_more_area: Ingen flere endringssett i dette området.
       no_more_user: Ingen flere endringssett av denne brukeren.

-      load_more: Last inn mer

       feed:
         title: Endringssett %{id}
         title_comment: 'Endringsforløp: %{id} - %{comment}'
       feed:
         title: Endringssett %{id}
         title_comment: 'Endringsforløp: %{id} - %{comment}'

diff --git a/config/locales/ne.yml b/config/locales/ne.yml
index 0c843e8e027b2659c26a099af371434b8a34dac0..30d57e8387d8f83db3416596e7388a90ee990a97 100644 (file)
--- a/config/locales/ne.yml
+++ b/config/locales/ne.yml
@@ -356,7 +356,6 @@ ne:
       no_more: अन्य कुनै परिवर्तनहरू भेटिएनन्।
       no_more_area: यो क्षेत्रमा अन्य कुनै परिवर्तनहरू छैनन्।
       no_more_user: यस प्रयोगकर्तटद्वारा अन्य कुनै परिवर्तनहरू गरिएका छैनन् ।
       no_more: अन्य कुनै परिवर्तनहरू भेटिएनन्।
       no_more_area: यो क्षेत्रमा अन्य कुनै परिवर्तनहरू छैनन्।
       no_more_user: यस प्रयोगकर्तटद्वारा अन्य कुनै परिवर्तनहरू गरिएका छैनन् ।

-      load_more: अझै बढी खोल्नुहोस्

       feed:
         title: 'परिवर्तनहरू: %{id}'
         title_comment: परिवर्तनहरू %{id} - %{comment}
       feed:
         title: 'परिवर्तनहरू: %{id}'
         title_comment: परिवर्तनहरू %{id} - %{comment}

diff --git a/config/locales/nl.yml b/config/locales/nl.yml
index e779b29042d35eed372e14be51996b909dc13b95..c60e9604395f66bc1ab2759162bdbe6d9411fe05 100644 (file)
--- a/config/locales/nl.yml
+++ b/config/locales/nl.yml
@@ -590,7 +590,6 @@ nl:
       no_more: Geen wijzigingensets meer gevonden.
       no_more_area: Geen wijzigingensets meer in dit gebied.
       no_more_user: Geen wijzigingensets meer van deze gebruiker.
       no_more: Geen wijzigingensets meer gevonden.
       no_more_area: Geen wijzigingensets meer in dit gebied.
       no_more_user: Geen wijzigingensets meer van deze gebruiker.

-      load_more: Meer laden

       feed:
         title: Wijzigingenset %{id}
         title_comment: Wijzigingenset %{id} - %{comment}
       feed:
         title: Wijzigingenset %{id}
         title_comment: Wijzigingenset %{id} - %{comment}


@@ -1704,6 +1703,9 @@ nl:
       reportable_title:
         diary_comment: '%{entry_title}, reactie #%{comment_id}'
         note: 'Opmerking #%{note_id}'
       reportable_title:
         diary_comment: '%{entry_title}, reactie #%{comment_id}'
         note: 'Opmerking #%{note_id}'

+    reporters:
+      reporters:
+        more_reporters: en %{count} meer

   issue_comments:
     create:
       comment_created: Uw reactie is succesvol aangemaakt
   issue_comments:
     create:
       comment_created: Uw reactie is succesvol aangemaakt

diff --git a/config/locales/nn.yml b/config/locales/nn.yml
index e4c1219f2212b98fdf39463119379c6c487fbed7..1cd05d6a9998d6b4d8a228a7a4e5be76c86cf176 100644 (file)
--- a/config/locales/nn.yml
+++ b/config/locales/nn.yml
@@ -405,7 +405,6 @@ nn:
       no_more: Fann ikkje fleire endringssett.
       no_more_area: Ingen fleire endringssett i dette området.
       no_more_user: Ingen fleire endringssett av denne brukaren.
       no_more: Fann ikkje fleire endringssett.
       no_more_area: Ingen fleire endringssett i dette området.
       no_more_user: Ingen fleire endringssett av denne brukaren.

-      load_more: Last inn meir

       feed:
         title: Endringssett %{id}
         title_comment: 'Endringssett: %{id} - %{comment}'
       feed:
         title: Endringssett %{id}
         title_comment: 'Endringssett: %{id} - %{comment}'

diff --git a/config/locales/nqo.yml b/config/locales/nqo.yml
index 796f785eb172eafffff869bca80c65e888cc06c5..1d4d9a5d128768008f0d4827d50c242ce9a260be 100644 (file)
--- a/config/locales/nqo.yml
+++ b/config/locales/nqo.yml
@@ -382,7 +382,6 @@ nqo:
       no_more: ߡߊ߬ߦߟߍ߬ߡߊ߲߬ߠߌ߲ ߟߊ߬ߘߏ߲߬ߠߌ߲߬ ߜߘߍ߫ ߟߎ߫ ߡߊ߫ ߛߐ߬ߘߐ߲߬
       no_more_area: ߡߊ߬ߦߟߍ߬ߡߊ߲߬ߠߌ߲ ߟߊ߬ߘߏ߲߬ߠߌ߲߬ ߜߘߍ߫ ߕߍ߫ ߕߌ߲߬ߞߎߘߎ߲ ߣߌ߲߬ ߘߐ߫.
       no_more_user: ߡߊ߬ߦߟߍ߬ߡߊ߲߬ߠߌ߲߬ ߟߊߘߏ߲߬ߣߍ߲߬ ߜߘߍ߫ ߕߍ߫ ߟߊ߬ߓߊ߰ߙߊ߬ߟߊ ߣߌ߲߬ ߓߟߏ߫
       no_more: ߡߊ߬ߦߟߍ߬ߡߊ߲߬ߠߌ߲ ߟߊ߬ߘߏ߲߬ߠߌ߲߬ ߜߘߍ߫ ߟߎ߫ ߡߊ߫ ߛߐ߬ߘߐ߲߬
       no_more_area: ߡߊ߬ߦߟߍ߬ߡߊ߲߬ߠߌ߲ ߟߊ߬ߘߏ߲߬ߠߌ߲߬ ߜߘߍ߫ ߕߍ߫ ߕߌ߲߬ߞߎߘߎ߲ ߣߌ߲߬ ߘߐ߫.
       no_more_user: ߡߊ߬ߦߟߍ߬ߡߊ߲߬ߠߌ߲߬ ߟߊߘߏ߲߬ߣߍ߲߬ ߜߘߍ߫ ߕߍ߫ ߟߊ߬ߓߊ߰ߙߊ߬ߟߊ ߣߌ߲߬ ߓߟߏ߫

-      load_more: ߘߏߜߘߍ߫ ߟߎ߫ ߟߊߢߎ߲߫

       feed:
         title: ߡߊ߬ߦߟߍ߬ߡߊ߲߬ߠߌ߲߬ ߞߙߎ %{id}
         title_comment: ߡߊ߬ߦߟߍ߬ߡߊ߲߬ߠߌ߲߬ ߞߙߎ %{id} - %{comment}
       feed:
         title: ߡߊ߬ߦߟߍ߬ߡߊ߲߬ߠߌ߲߬ ߞߙߎ %{id}
         title_comment: ߡߊ߬ߦߟߍ߬ߡߊ߲߬ߠߌ߲߬ ߞߙߎ %{id} - %{comment}

diff --git a/config/locales/oc.yml b/config/locales/oc.yml
index c6cdda546eb9bf1b0e3b745d6a735d3d5121e8a4..ab9fb51707c34e0ba95d2d936f1a64a89726b72e 100644 (file)
--- a/config/locales/oc.yml
+++ b/config/locales/oc.yml
@@ -427,7 +427,6 @@ oc:
       no_more: Ges d'autre grop de modificacions trobat.
       no_more_area: Ges d'autre grop de modificacions dins aquesta zòna.
       no_more_user: Ges d'autre grop de modificacions per aqueste utilizaire.
       no_more: Ges d'autre grop de modificacions trobat.
       no_more_area: Ges d'autre grop de modificacions dins aquesta zòna.
       no_more_user: Ges d'autre grop de modificacions per aqueste utilizaire.

-      load_more: Cargar mai

       feed:
         title: Grop de modificacions %{id}
         title_comment: Grop de modificacions %{id} – %{comment}
       feed:
         title: Grop de modificacions %{id}
         title_comment: Grop de modificacions %{id} – %{comment}

diff --git a/config/locales/pa.yml b/config/locales/pa.yml
index 09af2dd292c819e90a8f141542612332333b4ffa..975136b78336577abf5017479d5e0ef31e257b83 100644 (file)
--- a/config/locales/pa.yml
+++ b/config/locales/pa.yml
@@ -61,7 +61,7 @@ pa:
       message: ਸੁਨੇਹਾ
       node: ਨੋਡ
       node_tag: ਨੋਡ ਟੈਗ
       message: ਸੁਨੇਹਾ
       node: ਨੋਡ
       node_tag: ਨੋਡ ਟੈਗ

-      note: ਨà©\8bà¨\9f
+      note: ਧਿà¨\86ਨ ਦਿà¨\93

       old_node: ਪੁਰਾਣੀ ਨੋਡ
       old_node_tag: ਪੁਰਾਣਾ ਨੋਡ ਟੈਗ
       old_relation: ਪੁਰਾਣਾ ਸਬੰਧ
       old_node: ਪੁਰਾਣੀ ਨੋਡ
       old_node_tag: ਪੁਰਾਣਾ ਨੋਡ ਟੈਗ
       old_relation: ਪੁਰਾਣਾ ਸਬੰਧ


@@ -400,7 +400,7 @@ pa:
         way: ਰਾਹ
         relation: ਸਬੰਧ
         changeset: ਤਬਦੀਲੀ-ਲੜੀ
         way: ਰਾਹ
         relation: ਸਬੰਧ
         changeset: ਤਬਦੀਲੀ-ਲੜੀ

-        note: ਨà©\8bà¨\9f
+        note: ਧਿà¨\86ਨ ਦਿà¨\93

     redacted:
       redaction: ਸੋਧ %{id}
       type:
     redacted:
       redaction: ਸੋਧ %{id}
       type:


@@ -476,7 +476,6 @@ pa:
       no_more: ਕੋਈ ਤਬਦੀਲੀ-ਲੜੀਆਂ ਨਹੀਂ ਮਿਲਿਆਂ।
       no_more_area: ਇਸ ਖੇਤਰ ਵਿੱਚ ਕੋਈ ਤਬਦੀਲੀ-ਲੜੀਆਂ ਨਹੀਂ ਹਨ।
       no_more_user: ਇਸ ਵਰਤੋਂਕਾਰ ਵੱਲੋਂ ਕੋਈ ਤਬਦੀਲੀ-ਲੜੀਆਂ ਨਹੀਂ ਜੋੜਿਆਂ ਹਨ।
       no_more: ਕੋਈ ਤਬਦੀਲੀ-ਲੜੀਆਂ ਨਹੀਂ ਮਿਲਿਆਂ।
       no_more_area: ਇਸ ਖੇਤਰ ਵਿੱਚ ਕੋਈ ਤਬਦੀਲੀ-ਲੜੀਆਂ ਨਹੀਂ ਹਨ।
       no_more_user: ਇਸ ਵਰਤੋਂਕਾਰ ਵੱਲੋਂ ਕੋਈ ਤਬਦੀਲੀ-ਲੜੀਆਂ ਨਹੀਂ ਜੋੜਿਆਂ ਹਨ।

-      load_more: ਹੋਰ ਪੜ੍ਹੋ

       feed:
         title: ਤਬਦੀਲੀ ਲੜੀ %{id}
         title_comment: ਤਬਦੀਲੀ ਲੜੀ %{id} - %{comment}
       feed:
         title: ਤਬਦੀਲੀ ਲੜੀ %{id}
         title_comment: ਤਬਦੀਲੀ ਲੜੀ %{id} - %{comment}


@@ -933,7 +932,7 @@ pa:
           castle: ਗੜ੍ਹੀ
           charcoal_pile: ਇਤਿਹਾਸਕ ਕੋਲੇ ਦਾ ਢੇਰ
           church: ਗਿਰਜਾ
           castle: ਗੜ੍ਹੀ
           charcoal_pile: ਇਤਿਹਾਸਕ ਕੋਲੇ ਦਾ ਢੇਰ
           church: ਗਿਰਜਾ

-          city_gate: ਸ਼ਹਿਰ à¨\97à©\87à¨\9f
+          city_gate: ਸ਼ਹਿਰ ਦਾ ਦਰਵਾà¨\9c਼ਾ

           citywalls: ਸ਼ਹਿਰ ਦੀਆੰ ਕੰਧਾੰ
           fort: ਕਿਲ਼ਾ
           heritage: ਵਿਰਾਸਤ ਸਥਾਨ
           citywalls: ਸ਼ਹਿਰ ਦੀਆੰ ਕੰਧਾੰ
           fort: ਕਿਲ਼ਾ
           heritage: ਵਿਰਾਸਤ ਸਥਾਨ


@@ -1399,7 +1398,7 @@ pa:
           personal_label: ਇਸ ਨੋਟ ਵਿੱਚ ਨਿੱਜੀ ਡੇਟਾ ਸ਼ਾਮਲ ਹੈ
           other_label: ਹੋਰ
     create:
           personal_label: ਇਸ ਨੋਟ ਵਿੱਚ ਨਿੱਜੀ ਡੇਟਾ ਸ਼ਾਮਲ ਹੈ
           other_label: ਹੋਰ
     create:

-      provide_details: à¨\95ਿਰਪਾ à¨\95ਰà¨\95à©\87 ਲà©\8bਡ਼à©\80à¨\82ਦà©\87 ਵà©\87ਰਵà©\87 ਪà©\8dਰਦਾਨ à¨\95ਰà©\8b
+      provide_details: à¨\95ਿਰਪਾ à¨\95ਰà¨\95à©\87 ਲà©\8bà©\9cà©\80à¨\82ਦà©\87 ਵà©\87ਰਵà©\87 ਦਿà¨\93

   layouts:
     logo:
       alt_text: ਖੁੱਲ੍ਹਾ-ਗਲੀ-ਨਕਸ਼ਾ ਮਾਰਕਾ
   layouts:
     logo:
       alt_text: ਖੁੱਲ੍ਹਾ-ਗਲੀ-ਨਕਸ਼ਾ ਮਾਰਕਾ


@@ -1719,7 +1718,7 @@ pa:
         editor: ਸੋਧਕ
         way: ਰਾਹ
       rules:
         editor: ਸੋਧਕ
         way: ਰਾਹ
       rules:

-        title: ਨਿਯਮ!
+        title: à¨\85ਸà©\82ਲ!

         imports: ਦਰਾਮਦ
       start_mapping: ਨਕਸ਼ਾਬੰਦੀ ਸ਼ੁਰੂ ਕਰੋ
       add_a_note:
         imports: ਦਰਾਮਦ
       start_mapping: ਨਕਸ਼ਾਬੰਦੀ ਸ਼ੁਰੂ ਕਰੋ
       add_a_note:

diff --git a/config/locales/pl.yml b/config/locales/pl.yml
index 05df3fe3d7cd57f9115be0346b7e7c7dfb59bc08..438711f1d500ad3331819af3c6f6c5c0ade15108 100644 (file)
--- a/config/locales/pl.yml
+++ b/config/locales/pl.yml
@@ -634,7 +634,6 @@ pl:
       no_more: Nie odnaleziono więcej zestawów zmian.
       no_more_area: Brak zestawów zmian na tym obszarze.
       no_more_user: Brak zestawów zmian tego użytkownika.
       no_more: Nie odnaleziono więcej zestawów zmian.
       no_more_area: Brak zestawów zmian na tym obszarze.
       no_more_user: Brak zestawów zmian tego użytkownika.

-      load_more: Wczytaj więcej

       feed:
         title: Zestaw zmian %{id}
         title_comment: Zestaw zmian %{id} - %{comment}
       feed:
         title: Zestaw zmian %{id}
         title_comment: Zestaw zmian %{id} - %{comment}


@@ -3655,10 +3654,10 @@ pl:
       tooltip:
         no_contributions: Brak edycji %{date}
         contributions:
       tooltip:
         no_contributions: Brak edycji %{date}
         contributions:

-          one: '%{count} edycja %{date}'
-          few: '%{count} edycje %{date}'
-          many: '%{count} edycji %{date}'
-          other: '%{count} edycji %{date}'
+          one: '%{count} edytowany obiekt %{date}'
+          few: '%{count} edytowane obiekty %{date}'
+          many: '%{count} edytowanych obiektów %{date}'
+          other: '%{count} edytowanego obiektu %{date}'

   redactions:
     edit:
       heading: Edytuj poprawkę
   redactions:
     edit:
       heading: Edytuj poprawkę

diff --git a/config/locales/pnb.yml b/config/locales/pnb.yml
index db5464ee49afa618c219f5371c1decb876d0039e..a86eb249da3c506ad9ca61b953082ac2ebe235f5 100644 (file)
--- a/config/locales/pnb.yml
+++ b/config/locales/pnb.yml
@@ -381,7 +381,6 @@ pnb:
       no_more: ہور تبدیلیاں نہیں لبھیاں
       no_more_area: اِتھے تبدیلیاں ہور نہیں اے۔
       no_more_user: ورتنوالے دیاں تبدیلیاں ہور نہیں لبھیاں۔
       no_more: ہور تبدیلیاں نہیں لبھیاں
       no_more_area: اِتھے تبدیلیاں ہور نہیں اے۔
       no_more_user: ورتنوالے دیاں تبدیلیاں ہور نہیں لبھیاں۔

-      load_more: ہور لوڈ کرو

       feed:
         title: 'تبدیلیاں: %{id}'
         title_comment: تبدیلیاں نمبر %{id} • %{comment}
       feed:
         title: 'تبدیلیاں: %{id}'
         title_comment: تبدیلیاں نمبر %{id} • %{comment}

diff --git a/config/locales/pt-PT.yml b/config/locales/pt-PT.yml
index 2d732e94436239ab6267df67a55c5a5d7e9f469a..5474a6be2f2da8ff83580f71002b8e5823480a91 100644 (file)
--- a/config/locales/pt-PT.yml
+++ b/config/locales/pt-PT.yml
@@ -570,7 +570,6 @@ pt-PT:
       no_more: Não foi encontrado mais nenhum conjunto de alterações.
       no_more_area: Não há mais conjuntos de alterações nesta área.
       no_more_user: Não há mais conjuntos de alterações deste utilizador.
       no_more: Não foi encontrado mais nenhum conjunto de alterações.
       no_more_area: Não há mais conjuntos de alterações nesta área.
       no_more_user: Não há mais conjuntos de alterações deste utilizador.

-      load_more: Ver mais

       feed:
         title: Conjunto de alterações %{id}
         title_comment: Conjunto de alterações %{id} - %{comment}
       feed:
         title: Conjunto de alterações %{id}
         title_comment: Conjunto de alterações %{id} - %{comment}

diff --git a/config/locales/pt.yml b/config/locales/pt.yml
index 9ada5552963ddffc2ed2924972b0929e61611bde..79322ce6326643a5d77da322ae890800adbe0bcf 100644 (file)
--- a/config/locales/pt.yml
+++ b/config/locales/pt.yml
@@ -582,7 +582,6 @@ pt:
       no_more: Nenhum conjunto de alterações encontrado.
       no_more_area: Não há mais conjuntos de alterações nesta área.
       no_more_user: Não há mais conjuntos de alterações para este usuário.
       no_more: Nenhum conjunto de alterações encontrado.
       no_more_area: Não há mais conjuntos de alterações nesta área.
       no_more_user: Não há mais conjuntos de alterações para este usuário.

-      load_more: Carregar mais

       feed:
         title: Conjunto de alterações %{id}
         title_comment: Conjunto de alterações %{id} - %{comment}
       feed:
         title: Conjunto de alterações %{id}
         title_comment: Conjunto de alterações %{id} - %{comment}

diff --git a/config/locales/ro.yml b/config/locales/ro.yml
index a1dbb46347c1d2b91f352d64f635bd18dd8f9324..cab04f170250be0d51176cfa9c3103b439ee74df 100644 (file)
--- a/config/locales/ro.yml
+++ b/config/locales/ro.yml
@@ -519,7 +519,6 @@ ro:
       no_more: Nu s-au mai găsit seturi de modificări.
       no_more_area: Nu s-au mai găsit seturi de modificări în această zonă.
       no_more_user: Nu s-au mai găsit seturi de modificări făcute de acest utilizator.
       no_more: Nu s-au mai găsit seturi de modificări.
       no_more_area: Nu s-au mai găsit seturi de modificări în această zonă.
       no_more_user: Nu s-au mai găsit seturi de modificări făcute de acest utilizator.

-      load_more: Încarcă mai multe

       feed:
         title: 'Set de modificări: %{id}'
         title_comment: Set de modificări %{id} — %{comment}
       feed:
         title: 'Set de modificări: %{id}'
         title_comment: Set de modificări %{id} — %{comment}

diff --git a/config/locales/ru.yml b/config/locales/ru.yml
index 80290e9299dcd9e84335c89e7f5222e1095cb5f8..92998b8db7f43c2fbe6e500805345f1b1ad83cc8 100644 (file)
--- a/config/locales/ru.yml
+++ b/config/locales/ru.yml
@@ -287,7 +287,7 @@ ru:
   datetime:
     distance_in_words_ago:
       about_x_hours:
   datetime:
     distance_in_words_ago:
       about_x_hours:

-        one: около часа назад
+        one: около %{count} часа назад

         few: около %{count} часов назад
         many: около %{count} часов назад
         other: ""
         few: около %{count} часов назад
         many: около %{count} часов назад
         other: ""


@@ -297,13 +297,13 @@ ru:
         many: около %{count} месяцев назад
         other: ""
       about_x_years:
         many: около %{count} месяцев назад
         other: ""
       about_x_years:

-        one: около года назад
+        one: около %{count} года назад

         few: около %{count} лет назад
         many: около %{count} лет назад
         other: ""
       almost_x_years:
         few: около %{count} лет назад
         many: около %{count} лет назад
         other: ""
       almost_x_years:

-        one: почти год назад
-        few: поÑ\87Ñ\82и %{count} леÑ\82 назад
+        one: почти %{count} год назад
+        few: поÑ\87Ñ\82и %{count} года назад

         many: почти %{count} лет назад
         other: ""
       half_a_minute: полминуты назад
         many: почти %{count} лет назад
         other: ""
       half_a_minute: полминуты назад


@@ -318,7 +318,7 @@ ru:
         many: менее %{count} минут назад
         other: ""
       over_x_years:
         many: менее %{count} минут назад
         other: ""
       over_x_years:

-        one: более года назад
+        one: более %{count} года назад

         few: более %{count} лет назад
         many: более %{count} лет назад
         other: ""
         few: более %{count} лет назад
         many: более %{count} лет назад
         other: ""


@@ -670,7 +670,6 @@ ru:
       no_more: Больше пакетов правок не обнаружено.
       no_more_area: Нет больше пакетов правок в этой области.
       no_more_user: Нет больше пакетов правок от этого пользователя.
       no_more: Больше пакетов правок не обнаружено.
       no_more_area: Нет больше пакетов правок в этой области.
       no_more_user: Нет больше пакетов правок от этого пользователя.

-      load_more: Загрузить ещё

       feed:
         title: Пакет правок %{id}
         title_comment: Пакет правок %{id} — %{comment}
       feed:
         title: Пакет правок %{id}
         title_comment: Пакет правок %{id} — %{comment}


@@ -699,8 +698,11 @@ ru:
       changesetxml: XML пакета правок
       osmchangexml: osmChange XML
     paging_nav:
       changesetxml: XML пакета правок
       osmchangexml: osmChange XML
     paging_nav:

+      nodes_title: Точки

       nodes_paginated: Точки (%{x}-%{y} из %{count})
       nodes_paginated: Точки (%{x}-%{y} из %{count})

+      ways_title: Линии

       ways_paginated: Линии (%{x}-%{y} из %{count})
       ways_paginated: Линии (%{x}-%{y} из %{count})

+      relations_title: Отношения

       relations_paginated: Отношения (%{x}-%{y} из %{count})
     not_found_message:
       sorry: 'К сожалению, пакет правок #%{id} не найден.'
       relations_paginated: Отношения (%{x}-%{y} из %{count})
     not_found_message:
       sorry: 'К сожалению, пакет правок #%{id} не найден.'


@@ -1845,9 +1847,17 @@ ru:
       url: URL
       description: Описание
       tags: Теги
       url: URL
       description: Описание
       tags: Теги

+      total_points: Общее количество точек
+      imported_points: Количество импортированных точек

     gpx_failure:
       hi: Здравствуйте, %{to_user},
     gpx_failure:
       hi: Здравствуйте, %{to_user},

-      failed_to_import: 'сбой импорта. Произошла ошибка:'
+      failed_to_import: Похоже, что ваш файл не удалось импортировать как GPS-трек.
+      verify: 'Пожалуйста, проверьте, что ваш файл является допустимым файлом GPX
+        или архивом файлов GPX в поддерживаемом формате (.tar.gz, .tar.bz2, .tar,
+        .zip, .gpx.gz, .gpx.bz2). Возможна ли проблема с форматом или синтаксисом
+        вашего файла? Вот ошибка импорта:'
+      more_info: Более подробную информацию об ошибках импорта GPX и о том, как их
+        избежать, можно найти на странице %{url}.

       more_info_html: Более подробную информацию об ошибках импорта GPX и о том, как
         их избежать, можно найти на %{url}.
       import_failures_url: https://wiki.openstreetmap.org/wiki/RU:GPX_Import_Failures
       more_info_html: Более подробную информацию об ошибках импорта GPX и о том, как
         их избежать, можно найти на %{url}.
       import_failures_url: https://wiki.openstreetmap.org/wiki/RU:GPX_Import_Failures


@@ -2900,13 +2910,15 @@ ru:
       role:
         administrator: Этот пользователь является администратором
         moderator: Этот пользователь является модератором
       role:
         administrator: Этот пользователь является администратором
         moderator: Этот пользователь является модератором

-        importer: Этот пользователь является импортером
+        importer: Этот пользователь является импортёром

         grant:
           administrator: Присвоить права администратора
           moderator: Присвоить права модератора
         grant:
           administrator: Присвоить права администратора
           moderator: Присвоить права модератора

+          importer: Присвоить права импортёра

         revoke:
           administrator: Отозвать права администратора
           moderator: Отозвать права модератора
         revoke:
           administrator: Отозвать права администратора
           moderator: Отозвать права модератора

+          importer: Отозвать права импортёра

       block_history: Активные блокировки
       moderator_history: Созданные блокировки
       comments: Комментарии
       block_history: Активные блокировки
       moderator_history: Созданные блокировки
       comments: Комментарии


@@ -2944,6 +2956,9 @@ ru:
           deleted: Удалено
         name_or_email: Имя или адрес эл. почты
         ip_address: IP-адрес
           deleted: Удалено
         name_or_email: Имя или адрес эл. почты
         ip_address: IP-адрес

+        edits: Правки?
+        has_edits: С правками
+        no_edits: Без правок

         search: Поиск
       page:
         confirm: Подтвердить выделенных пользователей
         search: Поиск
       page:
         confirm: Подтвердить выделенных пользователей


@@ -3362,6 +3377,7 @@ ru:
           ninth: девятый
           tenth: десятый
       time: Время
           ninth: девятый
           tenth: десятый
       time: Время

+      download: Скачать маршрут в формате GeoJSON

     query:
       node: Точка
       way: Линия
     query:
       node: Точка
       way: Линия

diff --git a/config/locales/sat.yml b/config/locales/sat.yml
index df38d063f55afa07899f13a69898b7e23f3af81d..7fa55663c41c063a024d7140327149bda4f70476 100644 (file)
--- a/config/locales/sat.yml
+++ b/config/locales/sat.yml
@@ -192,7 +192,6 @@ sat:
         title_html: 'ᱥᱟᱹᱜᱟᱹᱭ ᱱᱟᱜᱟᱢ: %{name}'
   changesets:
     index:
         title_html: 'ᱥᱟᱹᱜᱟᱹᱭ ᱱᱟᱜᱟᱢ: %{name}'
   changesets:
     index:

-      load_more: ᱟᱨᱦᱚᱸ ᱞᱟᱫᱮ ᱢᱮ

       feed:
         created: ᱛᱮᱭᱟᱨᱱᱟ
         closed: ᱵᱚᱸᱫᱚ
       feed:
         created: ᱛᱮᱭᱟᱨᱱᱟ
         closed: ᱵᱚᱸᱫᱚ

diff --git a/config/locales/sc.yml b/config/locales/sc.yml
index 8a7fa6427fc8724f752b3c769795746cd103c61b..551ab142a09cfbca4fd9ea244159c213c73cfca9 100644 (file)
--- a/config/locales/sc.yml
+++ b/config/locales/sc.yml
@@ -463,7 +463,6 @@ sc:
       no_more: Perunu àteru grupu de modìficas agatadu.
       no_more_area: Perunu àteru annantu de modìficas in custa àrea.
       no_more_user: Perunu àteru grupu de modìficas de custu utente.
       no_more: Perunu àteru grupu de modìficas agatadu.
       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 de prus

       feed:
         title: Annantu de modìficas %{id}
         title_comment: Grupu de modìficas %{id} - %{comment}
       feed:
         title: Annantu de modìficas %{id}
         title_comment: Grupu de modìficas %{id} - %{comment}

diff --git a/config/locales/scn.yml b/config/locales/scn.yml
index 74e8e5fc3f08b9a3e6508e0c3235dc1eac5c51c9..164f41b5a9f99fdd1f6aab5b7d61f577ddd56abd 100644 (file)
--- a/config/locales/scn.yml
+++ b/config/locales/scn.yml
@@ -365,7 +365,6 @@ scn:
       no_more: Nuḍḍu àutru gruppu di canciamenti attruvatu.
       no_more_area: Nuḍḍu àutru gruppu di canciamenti nta st'ària.
       no_more_user: Nuḍḍu àutru gruppu di canciamenti fattu di st’utenti.
       no_more: Nuḍḍu àutru gruppu di canciamenti attruvatu.
       no_more_area: Nuḍḍu àutru gruppu di canciamenti nta st'ària.
       no_more_user: Nuḍḍu àutru gruppu di canciamenti fattu di st’utenti.

-      load_more: Carrìcanni àutri

       feed:
         title: Gruppu di canciamenti %{id}
         title_comment: Gruppu di canciamenti %{id} - %{comment}
       feed:
         title: Gruppu di canciamenti %{id}
         title_comment: Gruppu di canciamenti %{id} - %{comment}

diff --git a/config/locales/sco.yml b/config/locales/sco.yml
index b2bc3c0bcdb4ee38f8964adb9a8140a3805012ac..9552aa80d4f0e68875c05988ee4c3562cfbe9b98 100644 (file)
--- a/config/locales/sco.yml
+++ b/config/locales/sco.yml
@@ -184,7 +184,6 @@ sco:
       no_more: No mair chyngesets foond.
       no_more_area: No mair chyngesets in this aurie.
       no_more_user: No mair chyngesets bi this uiser.
       no_more: No mair chyngesets foond.
       no_more_area: No mair chyngesets in this aurie.
       no_more_user: No mair chyngesets bi this uiser.

-      load_more: Load mair

       feed:
         title: Chyngeset %{id}
         title_comment: Chyngeset %{id} - %{comment}
       feed:
         title: Chyngeset %{id}
         title_comment: Chyngeset %{id} - %{comment}

diff --git a/config/locales/sk.yml b/config/locales/sk.yml
index 793e736192b48e9e2bf4ee056c0b8f786674f070..691551966b9d836ba6062dd774c1e9f6ef696976 100644 (file)
--- a/config/locales/sk.yml
+++ b/config/locales/sk.yml
@@ -574,7 +574,6 @@ sk:
       no_more: Nie sú ďalšie sady zmien.
       no_more_area: Nie sú ďalšie sady zmien v tejto oblasti.
       no_more_user: Nie sú ďalšie sady zmien tohoto používateľa.
       no_more: Nie sú ďalšie sady zmien.
       no_more_area: Nie sú ďalšie sady zmien v tejto oblasti.
       no_more_user: Nie sú ďalšie sady zmien tohoto používateľa.

-      load_more: Načítať ďalšie

       feed:
         title: Sada zmien %{id}
         title_comment: Sada zmien %{id} - %{comment}
       feed:
         title: Sada zmien %{id}
         title_comment: Sada zmien %{id} - %{comment}

diff --git a/config/locales/skr-arab.yml b/config/locales/skr-arab.yml
index faff6986bb6716dbe749d233dbcb0d17d658c2ff..3d9354c75d720a739860b8869809064f814c538a 100644 (file)
--- a/config/locales/skr-arab.yml
+++ b/config/locales/skr-arab.yml
@@ -242,7 +242,6 @@ skr-arab:
     index:
       title: تبدیلیاں
       empty: تبدیلیاں کائنی لبھیاں۔
     index:
       title: تبدیلیاں
       empty: تبدیلیاں کائنی لبھیاں۔

-      load_more: ٻئے لوݙ کرو

       feed:
         created: بݨ ڳیا
         closed: بند تھیا
       feed:
         created: بݨ ڳیا
         closed: بند تھیا

diff --git a/config/locales/sl.yml b/config/locales/sl.yml
index 56395a02fc438c1e949338e4cc4fd7c18ffcbab8..24491194c4a2bd73266a836d843746aaa29bb114 100644 (file)
--- a/config/locales/sl.yml
+++ b/config/locales/sl.yml
@@ -514,7 +514,6 @@ sl:
       no_more: Ni drugih najdenih naborov sprememb.
       no_more_area: Na tem območju ni drugih množic sprememb.
       no_more_user: Ni drugih naborov sprememb tega uporabnika.
       no_more: Ni drugih najdenih naborov sprememb.
       no_more_area: Na tem območju ni drugih množic sprememb.
       no_more_user: Ni drugih naborov sprememb tega uporabnika.

-      load_more: Naloži več

       feed:
         title: Nabor sprememb %{id}
         title_comment: Nabor sprememb %{id} – %{comment}
       feed:
         title: Nabor sprememb %{id}
         title_comment: Nabor sprememb %{id} – %{comment}

diff --git a/config/locales/sq.yml b/config/locales/sq.yml
index 36414aaf3680bc8f62008beba79435d45849a91b..a06975bf70401ce1f3577fa4b456986757d83476 100644 (file)
--- a/config/locales/sq.yml
+++ b/config/locales/sq.yml
@@ -250,7 +250,6 @@ sq:
       no_more: Nuk u gjetën më ndryshime.
       no_more_area: Nuk ka më ndryshime në këtë zonë.
       no_more_user: Nuk ka më ndryshime nga ky përdorues.
       no_more: Nuk u gjetën më ndryshime.
       no_more_area: Nuk ka më ndryshime në këtë zonë.
       no_more_user: Nuk ka më ndryshime nga ky përdorues.

-      load_more: Ngarko më shumë

       feed:
         title: 'Grupi i ndryshimeve: %{id}'
         title_comment: Grupi i ndryshimeve %{id} - %{comment}
       feed:
         title: 'Grupi i ndryshimeve: %{id}'
         title_comment: Grupi i ndryshimeve %{id} - %{comment}

diff --git a/config/locales/sr.yml b/config/locales/sr.yml
index 92511b1c23fa85326516db3a75073ca7cbb8c6d1..30931ed29cac1cf671accc0c02f196af5a661ef6 100644 (file)
--- a/config/locales/sr.yml
+++ b/config/locales/sr.yml
@@ -427,7 +427,6 @@ sr:
       no_more: Није пронађено још скупова промена.
       no_more_area: Нема више скупова промена у овој области.
       no_more_user: Нема више скупова промена овог корисника.
       no_more: Није пронађено још скупова промена.
       no_more_area: Нема више скупова промена у овој области.
       no_more_user: Нема више скупова промена овог корисника.

-      load_more: Учитај још

       feed:
         title: Скуп промена %{id}
         title_comment: Скуп промена %{id} – %{comment}
       feed:
         title: Скуп промена %{id}
         title_comment: Скуп промена %{id} – %{comment}

diff --git a/config/locales/sv.yml b/config/locales/sv.yml
index 78abef5dcdfab2898b60ad0cbc1cb9453e92c95e..5a179875099c5790c9bc57442feb975e8b9f914b 100644 (file)
--- a/config/locales/sv.yml
+++ b/config/locales/sv.yml
@@ -559,7 +559,6 @@ sv:
       no_more: Inga fler ändringsuppsättningar hittades.
       no_more_area: Inga fler ändringsuppsättningar i det här området.
       no_more_user: Inga fler ändringsuppsättningar av den här användaren.
       no_more: Inga fler ändringsuppsättningar hittades.
       no_more_area: Inga fler ändringsuppsättningar i det här området.
       no_more_user: Inga fler ändringsuppsättningar av den här användaren.

-      load_more: Läs in fler

       feed:
         title: Ändringsuppsättning %{id}
         title_comment: Ändringsset %{id} - %{comment}
       feed:
         title: Ändringsuppsättning %{id}
         title_comment: Ändringsset %{id} - %{comment}

diff --git a/config/locales/ta.yml b/config/locales/ta.yml
index db84461c5a4740a3575d90168d4a8811cc56e016..dec986cef4aa82888b4a5c61e50c709a82802383 100644 (file)
--- a/config/locales/ta.yml
+++ b/config/locales/ta.yml
@@ -248,7 +248,6 @@ ta:
   changesets:
     index:
       title: மாற்றங்கள்
   changesets:
     index:
       title: மாற்றங்கள்

-      load_more: மேலும் படிக்க

       feed:
         title: 'மாற்றங்கள்: %{id}'
         title_comment: மாற்றங்கள் %{id}-%{comment}
       feed:
         title: 'மாற்றங்கள்: %{id}'
         title_comment: மாற்றங்கள் %{id}-%{comment}

diff --git a/config/locales/te.yml b/config/locales/te.yml
index 37f1d91a20da774ae80850e94d5b23c7e7523f00..4ade5b937b825ae0cb0265a4c621f111e1b4ab34 100644 (file)
--- a/config/locales/te.yml
+++ b/config/locales/te.yml
@@ -405,7 +405,6 @@ te:
       no_more: మరిన్ని మార్పులసమితులు కనబడలేదు.
       no_more_area: ఈ ప్రాంతంలో మార్పులసమితులు మరి లేవు.
       no_more_user: ఈ వాడుకరి మార్పులసమితులు ఇక లేవు.
       no_more: మరిన్ని మార్పులసమితులు కనబడలేదు.
       no_more_area: ఈ ప్రాంతంలో మార్పులసమితులు మరి లేవు.
       no_more_user: ఈ వాడుకరి మార్పులసమితులు ఇక లేవు.

-      load_more: మరిన్ని చూపించు

       feed:
         title: మార్పులసమితి %{id}
         title_comment: మార్పులసమితి %{id} - %{comment}
       feed:
         title: మార్పులసమితి %{id}
         title_comment: మార్పులసమితి %{id} - %{comment}

diff --git a/config/locales/th.yml b/config/locales/th.yml
index a756263c7a39fe33c438d595e041ecb43d3392cc..c91c9e019c2174d1fad0c6c408641a051a1d2a45 100644 (file)
--- a/config/locales/th.yml
+++ b/config/locales/th.yml
@@ -440,7 +440,6 @@ th:
       no_more: ไม่พบชุดการเปลี่ยนแปลงอีก
       no_more_area: ไม่พบชุดการเปลี่ยนแปลงอีกในพื้นที่นี้
       no_more_user: ไม่พบชุดการเปลี่ยนแปลงอีกโดยผู้ใช้คนนี้
       no_more: ไม่พบชุดการเปลี่ยนแปลงอีก
       no_more_area: ไม่พบชุดการเปลี่ยนแปลงอีกในพื้นที่นี้
       no_more_user: ไม่พบชุดการเปลี่ยนแปลงอีกโดยผู้ใช้คนนี้

-      load_more: แสดงเพิ่มขึ้น

       feed:
         title: ชุดการเปลี่ยนแปลง %{id}
         title_comment: ชุดการเปลี่ยนแปลง %{id} - %{comment}
       feed:
         title: ชุดการเปลี่ยนแปลง %{id}
         title_comment: ชุดการเปลี่ยนแปลง %{id} - %{comment}

diff --git a/config/locales/tl.yml b/config/locales/tl.yml
index 49e9fdd2f195d4fbce1358c01f0bd526c4fadb12..7d413c34686b4bab8bf3620622fec52feab22bab 100644 (file)
--- a/config/locales/tl.yml
+++ b/config/locales/tl.yml
@@ -380,7 +380,6 @@ tl:
       no_more: Wala nang mga pangkat ng pagbabago ang nakita.
       no_more_area: Wala nang mga pangkat ng pagbabago sa lugar na ito.
       no_more_user: Wala nang mga pangkat ng pagbabago mula sa tagagamit na ito.
       no_more: Wala nang mga pangkat ng pagbabago ang nakita.
       no_more_area: Wala nang mga pangkat ng pagbabago sa lugar na ito.
       no_more_user: Wala nang mga pangkat ng pagbabago mula sa tagagamit na ito.

-      load_more: Magkarga pa

       feed:
         title: '%{id} ng pangkat ng pagbabago'
         title_comment: '%{id} ng angkat ng pagbabago - %{comment}'
       feed:
         title: '%{id} ng pangkat ng pagbabago'
         title_comment: '%{id} ng angkat ng pagbabago - %{comment}'

diff --git a/config/locales/tr.yml b/config/locales/tr.yml
index 79533581fcc9ae328ccf10b7a133e734afd6ce04..0f034fdff462e80d92f2190550b6b875879c2467 100644 (file)
--- a/config/locales/tr.yml
+++ b/config/locales/tr.yml
@@ -568,7 +568,6 @@ tr:
       no_more: Daha fazla değişiklik kaydı yok.
       no_more_area: Bu alanda daha fazla değişiklik kaydı bulunmuyor.
       no_more_user: Bu kullanıcı tarafından daha fazla değişiklik kaydı yok.
       no_more: Daha fazla değişiklik kaydı yok.
       no_more_area: Bu alanda daha fazla değişiklik kaydı bulunmuyor.
       no_more_user: Bu kullanıcı tarafından daha fazla değişiklik kaydı yok.

-      load_more: Daha fazla yükle

       feed:
         title: Değişiklik kaydı %{id}
         title_comment: Değişiklik takımı %{id} - %{comment}
       feed:
         title: Değişiklik kaydı %{id}
         title_comment: Değişiklik takımı %{id} - %{comment}

diff --git a/config/locales/tt.yml b/config/locales/tt.yml
index 77e525a68912f55a1043242dfdb8bbadb3b6b36b..f8743fbb19d6ac0f88c50e6aa89236f235c36998 100644 (file)
--- a/config/locales/tt.yml
+++ b/config/locales/tt.yml
@@ -373,7 +373,6 @@ tt:
   changesets:
     index:
       title: Үзгәрешләр пакетлары
   changesets:
     index:
       title: Үзгәрешләр пакетлары

-      load_more: Күбрәк төяү

       feed:
         title: '%{id} үзгәртүләр өеме'
         title_comment: '%{id} үзгәртүләр өеме  -  %{comment}'
       feed:
         title: '%{id} үзгәртүләр өеме'
         title_comment: '%{id} үзгәртүләр өеме  -  %{comment}'

diff --git a/config/locales/uk.yml b/config/locales/uk.yml
index f9474fae354e34d513494a129d48a93df98a1f6c..00e17ea6c90438d357154b9363c242bf8e1a89ea 100644 (file)
--- a/config/locales/uk.yml
+++ b/config/locales/uk.yml
@@ -615,7 +615,6 @@ uk:
       no_more: Наборів змін більше не знайдено.
       no_more_area: Наборів змін на цій ділянці більше немає.
       no_more_user: Наборів змін від цього мапера більше немає.
       no_more: Наборів змін більше не знайдено.
       no_more_area: Наборів змін на цій ділянці більше немає.
       no_more_user: Наборів змін від цього мапера більше немає.

-      load_more: Завантажити ще

       feed:
         title: Набір змін %{id}
         title_comment: Набір змін %{id} — %{comment}
       feed:
         title: Набір змін %{id}
         title_comment: Набір змін %{id} — %{comment}


@@ -640,13 +639,17 @@ uk:
       hidden_comment_by_html: Прихований коментар від %{user} %{time_ago}
       hide_comment: приховати
       unhide_comment: показати
       hidden_comment_by_html: Прихований коментар від %{user} %{time_ago}
       hide_comment: приховати
       unhide_comment: показати

-      comment: Ð\9aоменÑ\82аÑ\80
+      comment: Ð\9dадÑ\96Ñ\81лаÑ\82и

       changesetxml: Набір змін в XML
       osmchangexml: osmChange XML
     paging_nav:
       changesetxml: Набір змін в XML
       osmchangexml: osmChange XML
     paging_nav:

+      nodes_title: Точки

       nodes_paginated: Точки (%{x}-%{y} з %{count})
       nodes_paginated: Точки (%{x}-%{y} з %{count})

+      ways_title: Лінії

       ways_paginated: Лінії (%{x}-%{y} з %{count})
       ways_paginated: Лінії (%{x}-%{y} з %{count})

+      relations_title: Звʼязки

       relations_paginated: Зв’язки (%{x}-%{y} з %{count})
       relations_paginated: Зв’язки (%{x}-%{y} з %{count})

+      range: '%{x}-%{y} з %{count}'

     not_found_message:
       sorry: 'На жаль, набір змін #%{id} не знайдено.'
     timeout:
     not_found_message:
       sorry: 'На жаль, набір змін #%{id} не знайдено.'
     timeout:

diff --git a/config/locales/vi.yml b/config/locales/vi.yml
index d1c1923cef9be98de4f5ef53c5b609944e3be69e..90b98248758ea56a10ff3ba05f3da2731559b119 100644 (file)
--- a/config/locales/vi.yml
+++ b/config/locales/vi.yml
@@ -527,7 +527,6 @@ vi:
       no_more: Không tìm thấy thêm bộ thay đổi.
       no_more_area: Không có thêm bộ thay đổi trong khu vực này.
       no_more_user: Không có thêm bộ thay đổi bởi người dùng này.
       no_more: Không tìm thấy thêm bộ thay đổi.
       no_more_area: Không có thêm bộ thay đổi trong khu vực này.
       no_more_user: Không có thêm bộ thay đổi bởi người dùng này.

-      load_more: Tải thêm

       feed:
         title: Bộ thay đổi %{id}
         title_comment: Bộ thay đổi %{id} – %{comment}
       feed:
         title: Bộ thay đổi %{id}
         title_comment: Bộ thay đổi %{id} – %{comment}

diff --git a/config/locales/xmf.yml b/config/locales/xmf.yml
index a9998d708e22d94a57e47a7675191ade65b86857..8d54ef2218cc6c2f48b44a73435d2e77839ca1e7 100644 (file)
--- a/config/locales/xmf.yml
+++ b/config/locales/xmf.yml
@@ -395,7 +395,6 @@ xmf:
       no_more: უმოსი თირუეფიშ პაკეტეფქ ვეგორუ.
       no_more_area: თე ტერიტორიას თირუეფიშ პაკეტეფქ ვეგორუ.
       no_more_user: თე მახვარებუშ თირუეფიშ პაკეტეფქ ვეგორუ.
       no_more: უმოსი თირუეფიშ პაკეტეფქ ვეგორუ.
       no_more_area: თე ტერიტორიას თირუეფიშ პაკეტეფქ ვეგორუ.
       no_more_user: თე მახვარებუშ თირუეფიშ პაკეტეფქ ვეგორუ.

-      load_more: უმოსიშ გჷმოხარგუა

       feed:
         title: თირუეფიშ პაკეტი %{id}
         title_comment: თირუეფიშ პაკეტი %{id} - %{comment}
       feed:
         title: თირუეფიშ პაკეტი %{id}
         title_comment: თირუეფიშ პაკეტი %{id} - %{comment}

diff --git a/config/locales/zh-CN.yml b/config/locales/zh-CN.yml
index 29b47e82fd6960d3f45485e0ce4dbc62a76bc1ca..fbdbc57226186e37debad93d522baeabc69b70bd 100644 (file)
--- a/config/locales/zh-CN.yml
+++ b/config/locales/zh-CN.yml
@@ -549,7 +549,6 @@ zh-CN:
       no_more: 未找到更多变更集。
       no_more_area: 该区域内没有更多变更集。
       no_more_user: 该用户无更多变更集。
       no_more: 未找到更多变更集。
       no_more_area: 该区域内没有更多变更集。
       no_more_user: 该用户无更多变更集。

-      load_more: 加载更多

       feed:
         title: 变更集 %{id}
         title_comment: 变更集 %{id} - %{comment}
       feed:
         title: 变更集 %{id}
         title_comment: 变更集 %{id} - %{comment}

diff --git a/config/locales/zh-HK.yml b/config/locales/zh-HK.yml
index 7985169f197b124372bea58fa6115142251bfaf4..ca19d20be5946e4de4e2b336148a1ac57dcf42b5 100644 (file)
--- a/config/locales/zh-HK.yml
+++ b/config/locales/zh-HK.yml
@@ -313,7 +313,6 @@ zh-HK:
       empty_user: 此用戶沒有變更集。
       no_more_area: 此區域沒有更多變更集。
       no_more_user: 此用戶沒有更多變更集。
       empty_user: 此用戶沒有變更集。
       no_more_area: 此區域沒有更多變更集。
       no_more_user: 此用戶沒有更多變更集。

-      load_more: 載入更多

       feed:
         title: 變更集 %{id}
         belongs_to: 製作者
       feed:
         title: 變更集 %{id}
         belongs_to: 製作者

diff --git a/config/locales/zh-TW.yml b/config/locales/zh-TW.yml
index f70db91afb71c4832b579fc72edb0a00b32e50e0..e95ae2894982e6c756c61e5563aca08abcefea68 100644 (file)
--- a/config/locales/zh-TW.yml
+++ b/config/locales/zh-TW.yml
@@ -519,7 +519,6 @@ zh-TW:
       no_more: 查無更多變更集。
       no_more_area: 此區域沒有更多變更集。
       no_more_user: 此使用者沒有更多變更集。
       no_more: 查無更多變更集。
       no_more_area: 此區域沒有更多變更集。
       no_more_user: 此使用者沒有更多變更集。

-      load_more: 載入更多

       feed:
         title: 變更集 %{id}
         title_comment: 變更集 %{id} - %{comment}
       feed:
         title: 變更集 %{id}
         title_comment: 變更集 %{id} - %{comment}


@@ -547,9 +546,13 @@ zh-TW:
       changesetxml: 變更集 XML
       osmchangexml: osmChange 格式 XML
     paging_nav:
       changesetxml: 變更集 XML
       osmchangexml: osmChange 格式 XML
     paging_nav:

+      nodes_title: 節點

       nodes_paginated: 節點 (共 %{count} 項中的第 %{x}-%{y} 項)
       nodes_paginated: 節點 (共 %{count} 項中的第 %{x}-%{y} 項)

+      ways_title: 路徑

       ways_paginated: 路線 (%{count} 的 %{x}-%{y})
       ways_paginated: 路線 (%{count} 的 %{x}-%{y})

+      relations_title: 關聯

       relations_paginated: 關聯 (%{count} 的 %{x}-%{y})
       relations_paginated: 關聯 (%{count} 的 %{x}-%{y})

+      range: '%{x}-%{y}（共 %{count}）'

     not_found_message:
       sorry: '抱歉，找不到此變更集 #%{id}。'
     timeout:
     not_found_message:
       sorry: '抱歉，找不到此變更集 #%{id}。'
     timeout:

diff --git a/package.json b/package.json
index 17207ee4d41a26610a79b2d133e9b873cd552bac..633c8b53bbb54258932f3902f0cac4a2a86642f8 100644 (file)
--- a/package.json
+++ b/package.json
@@ -7,7 +7,7 @@
     "jquery-simulate": "^1.0.2",
     "js-cookie": "^3.0.0",
     "leaflet": "^1.8.0",
     "jquery-simulate": "^1.0.2",
     "js-cookie": "^3.0.0",
     "leaflet": "^1.8.0",

-    "leaflet.locatecontrol": "^0.83.0",
+    "leaflet.locatecontrol": "^0.84.1",

     "make-plural": "^7.4.0",
     "osm-community-index": "^5.2.0"
   },
     "make-plural": "^7.4.0",
     "osm-community-index": "^5.2.0"
   },

diff --git a/test/system/dashboard_test.rb b/test/system/dashboard_test.rb
index 12d9609383104d22402dce2c07279703f3219b7c..34c348d843a9bec3826730ff2f2f208563b15327 100644 (file)
--- a/test/system/dashboard_test.rb
+++ b/test/system/dashboard_test.rb
@@ -19,7 +19,7 @@ class DashboardSystemTest < ApplicationSystemTestCase
     visit dashboard_path
     assert_no_text "You have not followed any user yet."
 
     visit dashboard_path
     assert_no_text "You have not followed any user yet."
 

-    friends_heading = find :element, "h2", :text => "Followings"
+    friends_heading = find :element, "h2", :text => "Users you follow"

     others_heading = find :element, "h2", :text => "Other nearby users"
 
     assert_link friend_user.display_name, :below => friends_heading, :above => others_heading
     others_heading = find :element, "h2", :text => "Other nearby users"
 
     assert_link friend_user.display_name, :below => friends_heading, :above => others_heading


@@ -41,7 +41,7 @@ class DashboardSystemTest < ApplicationSystemTestCase
 
       click_on "Follow"
 
 
       click_on "Follow"
 

-      followings_heading = find :element, "h2", :text => "Followings"
+      followings_heading = find :element, "h2", :text => "Users you follow"

       others_nearby_heading = find :element, "h2", :text => "Other nearby users"
 
       assert_text "There are no other users who admit to mapping nearby yet"
       others_nearby_heading = find :element, "h2", :text => "Other nearby users"
 
       assert_text "There are no other users who admit to mapping nearby yet"

diff --git a/test/system/fixthemap_test.rb b/test/system/fixthemap_test.rb
new file mode 100644 (file)
index 0000000..77aacde
--- /dev/null
+++ b/test/system/fixthemap_test.rb
@@ -0,0 +1,11 @@
+require "application_system_test_case"
+
+class FixthemapTest < ApplicationSystemTestCase
+  test "should have 'create a note' link with correct map hash" do
+    visit fixthemap_path(:lat => 60, :lon => 30, :zoom => 10)
+
+    within_content_body do
+      assert_link "Add a note to the map", :href => %r{/note/new#map=10/60(\.\d+)?/30(\.\d+)?}
+    end
+  end
+end

diff --git a/test/system/history_test.rb b/test/system/history_test.rb
index be7700c3b893699f229feab865c56853f589eb84..5c66144c1dbe59b38dc27e8f510877637198d68e 100644 (file)
--- a/test/system/history_test.rb
+++ b/test/system/history_test.rb
@@ -35,21 +35,21 @@ class HistoryTest < ApplicationSystemTestCase
       changesets.assert_no_text "bottom-changeset-in-batch-2"
       changesets.assert_no_text "first-changeset-in-history"
       changesets.assert_selector "ol", :count => 1
       changesets.assert_no_text "bottom-changeset-in-batch-2"
       changesets.assert_no_text "first-changeset-in-history"
       changesets.assert_selector "ol", :count => 1

-      changesets.assert_selector "li", :count => PAGE_SIZE
+      changesets.assert_selector "li[data-changeset]", :count => PAGE_SIZE

 
 

-      changesets.find(".changeset_more a.btn").click
+      click_on "Older Changesets"

       changesets.assert_text "bottom-changeset-in-batch-1"
       changesets.assert_text "bottom-changeset-in-batch-2"
       changesets.assert_no_text "first-changeset-in-history"
       changesets.assert_selector "ol", :count => 1
       changesets.assert_text "bottom-changeset-in-batch-1"
       changesets.assert_text "bottom-changeset-in-batch-2"
       changesets.assert_no_text "first-changeset-in-history"
       changesets.assert_selector "ol", :count => 1

-      changesets.assert_selector "li", :count => 2 * PAGE_SIZE
+      changesets.assert_selector "li[data-changeset]", :count => 2 * PAGE_SIZE

 
 

-      changesets.find(".changeset_more a.btn").click
+      click_on "Older Changesets"

       changesets.assert_text "bottom-changeset-in-batch-1"
       changesets.assert_text "bottom-changeset-in-batch-2"
       changesets.assert_text "first-changeset-in-history"
       changesets.assert_selector "ol", :count => 1
       changesets.assert_text "bottom-changeset-in-batch-1"
       changesets.assert_text "bottom-changeset-in-batch-2"
       changesets.assert_text "first-changeset-in-history"
       changesets.assert_selector "ol", :count => 1

-      changesets.assert_selector "li", :count => (2 * PAGE_SIZE) + 1
+      changesets.assert_selector "li[data-changeset]", :count => (2 * PAGE_SIZE) + 1

     end
   end
 
     end
   end
 


@@ -133,6 +133,27 @@ class HistoryTest < ApplicationSystemTestCase
     assert_current_path history_path
   end
 
     assert_current_path history_path
   end
 

+  test "all changesets are listed when fully zoomed out" do
+    user = create(:user)
+    [-177, -90, 0, 90, 177].each do |lon|
+      create(:changeset, :user => user, :num_changes => 1,
+                         :min_lat => 0 * GeoRecord::SCALE, :min_lon => (lon - 1) * GeoRecord::SCALE,
+                         :max_lat => 1 * GeoRecord::SCALE, :max_lon => (lon + 1) * GeoRecord::SCALE) do |changeset|
+        create(:changeset_tag, :changeset => changeset, :k => "comment", :v => "changeset-at-lon(#{lon})")
+      end
+    end
+
+    visit history_path(:anchor => "map=0/0/0")
+
+    within_sidebar do
+      assert_link "changeset-at-lon(-177)", :count => 1
+      assert_link "changeset-at-lon(-90)", :count => 1
+      assert_link "changeset-at-lon(0)", :count => 1
+      assert_link "changeset-at-lon(90)", :count => 1
+      assert_link "changeset-at-lon(177)", :count => 1
+    end
+  end
+

   private
 
   def create_visible_changeset(user, comment)
   private
 
   def create_visible_changeset(user, comment)

diff --git a/yarn.lock b/yarn.lock
index b5f8e755e1d983bce6b40a17706dda70a54a65dc..cd84ccea7706c31cf1b0be72a24197546dda33f2 100644 (file)
--- a/yarn.lock
+++ b/yarn.lock
@@ -19,10 +19,10 @@
   resolved "https://registry.yarnpkg.com/@eslint-community/regexpp/-/regexpp-4.12.1.tgz#cfc6cffe39df390a3841cde2abccf92eaa7ae0e0"
   integrity sha512-CCZCDJuduB9OUkFkY2IgppNZMi2lBQgD2qzwXkEia16cge2pijY/aXi96CJMquDMn3nJdlPV1A5KrJEXwfLNzQ==
 
   resolved "https://registry.yarnpkg.com/@eslint-community/regexpp/-/regexpp-4.12.1.tgz#cfc6cffe39df390a3841cde2abccf92eaa7ae0e0"
   integrity sha512-CCZCDJuduB9OUkFkY2IgppNZMi2lBQgD2qzwXkEia16cge2pijY/aXi96CJMquDMn3nJdlPV1A5KrJEXwfLNzQ==
 

-"@eslint/config-array@^0.19.2":
-  version "0.19.2"
-  resolved "https://registry.yarnpkg.com/@eslint/config-array/-/config-array-0.19.2.tgz#3060b809e111abfc97adb0bb1172778b90cb46aa"
-  integrity sha512-GNKqxfHG2ySmJOBSHg7LxeUx4xpuCoFjacmlCoYWEbaPXLwvfIjixRI12xCQZeULksQb23uiA8F40w5TojpV7w==
+"@eslint/config-array@^0.20.0":
+  version "0.20.0"
+  resolved "https://registry.yarnpkg.com/@eslint/config-array/-/config-array-0.20.0.tgz#7a1232e82376712d3340012a2f561a2764d1988f"
+  integrity sha512-fxlS1kkIjx8+vy2SjuCB94q3htSNrufYTXubwiBFeaQHbH6Ipi43gFJq2zCMt6PHhImH3Xmr0NksKDvchWlpQQ==

   dependencies:
     "@eslint/object-schema" "^2.1.6"
     debug "^4.3.1"
   dependencies:
     "@eslint/object-schema" "^2.1.6"
     debug "^4.3.1"


@@ -55,10 +55,10 @@
     minimatch "^3.1.2"
     strip-json-comments "^3.1.1"
 
     minimatch "^3.1.2"
     strip-json-comments "^3.1.1"
 

-"@eslint/js@9.23.0":
-  version "9.23.0"
-  resolved "https://registry.yarnpkg.com/@eslint/js/-/js-9.23.0.tgz#c09ded4f3dc63b40b933bcaeb853fceddb64da30"
-  integrity sha512-35MJ8vCPU0ZMxo7zfev2pypqTwWTofFZO6m4KAtdoFhRpLJUpHTZZ+KB3C7Hb1d7bULYwO4lJXGCi5Se+8OMbw==
+"@eslint/js@9.24.0":
+  version "9.24.0"
+  resolved "https://registry.yarnpkg.com/@eslint/js/-/js-9.24.0.tgz#685277980bb7bf84ecc8e4e133ccdda7545a691e"
+  integrity sha512-uIY/y3z0uvOGX8cp1C2fiC4+ZmBhp6yZWkojtHL1YEMnRt1Y63HB9TM17proGEmeG7HeUY+UP36F0aknKYTpYA==

 
 "@eslint/object-schema@^2.1.6":
   version "2.1.6"
 
 "@eslint/object-schema@^2.1.6":
   version "2.1.6"


@@ -578,17 +578,17 @@ eslint-visitor-keys@^4.2.0:
   integrity sha512-UyLnSehNt62FFhSwjZlHmeokpRK59rcz29j+F1/aDgbkbRTk7wIc9XzdoasMUbRNKDM0qQt/+BJ4BrpFeABemw==
 
 eslint@^9.0.0:
   integrity sha512-UyLnSehNt62FFhSwjZlHmeokpRK59rcz29j+F1/aDgbkbRTk7wIc9XzdoasMUbRNKDM0qQt/+BJ4BrpFeABemw==
 
 eslint@^9.0.0:

-  version "9.23.0"
-  resolved "https://registry.yarnpkg.com/eslint/-/eslint-9.23.0.tgz#b88f3ab6dc83bcb927fdb54407c69ffe5f2441a6"
-  integrity sha512-jV7AbNoFPAY1EkFYpLq5bslU9NLNO8xnEeQXwErNibVryjk67wHVmddTBilc5srIttJDBrB0eMHKZBFbSIABCw==
+  version "9.24.0"
+  resolved "https://registry.yarnpkg.com/eslint/-/eslint-9.24.0.tgz#9a7f2e6cb2de81c405ab244b02f4584c79dc6bee"
+  integrity sha512-eh/jxIEJyZrvbWRe4XuVclLPDYSYYYgLy5zXGGxD6j8zjSAxFEzI2fL/8xNq6O2yKqVt+eF2YhV+hxjV6UKXwQ==

   dependencies:
     "@eslint-community/eslint-utils" "^4.2.0"
     "@eslint-community/regexpp" "^4.12.1"
   dependencies:
     "@eslint-community/eslint-utils" "^4.2.0"
     "@eslint-community/regexpp" "^4.12.1"

-    "@eslint/config-array" "^0.19.2"
+    "@eslint/config-array" "^0.20.0"

     "@eslint/config-helpers" "^0.2.0"
     "@eslint/core" "^0.12.0"
     "@eslint/eslintrc" "^3.3.1"
     "@eslint/config-helpers" "^0.2.0"
     "@eslint/core" "^0.12.0"
     "@eslint/eslintrc" "^3.3.1"

-    "@eslint/js" "9.23.0"
+    "@eslint/js" "9.24.0"

     "@eslint/plugin-kit" "^0.2.7"
     "@humanfs/node" "^0.16.6"
     "@humanwhocodes/module-importer" "^1.0.1"
     "@eslint/plugin-kit" "^0.2.7"
     "@humanfs/node" "^0.16.6"
     "@humanwhocodes/module-importer" "^1.0.1"


@@ -823,10 +823,10 @@ keyv@^4.5.4:
   dependencies:
     json-buffer "3.0.1"
 
   dependencies:
     json-buffer "3.0.1"
 

-leaflet.locatecontrol@^0.83.0:
-  version "0.83.1"
-  resolved "https://registry.yarnpkg.com/leaflet.locatecontrol/-/leaflet.locatecontrol-0.83.1.tgz#2e6614815d6d255e65d0ed248c7b3ab8bf57a998"
-  integrity sha512-oF5uey4GOpnw/ly379fV8JQJuUQes9eECaWo8voTIWLQERYPCudOgfUzFggUbq+kpCMNz7BxP/MsLbyf77QorA==
+leaflet.locatecontrol@^0.84.1:
+  version "0.84.1"
+  resolved "https://registry.yarnpkg.com/leaflet.locatecontrol/-/leaflet.locatecontrol-0.84.1.tgz#5c63447afa5e0245da682dbcdc54808e41006d16"
+  integrity sha512-5NGyVR/CNaugooWMnqSphuKw2CvTef8P4pA/bzeRqhZsjl3Xqh8OmA236erNE4abme33TOC8O/Wha5I05U/QJw==

 
 leaflet@^1.8.0:
   version "1.9.4"
 
 leaflet@^1.8.0:
   version "1.9.4"