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

[rails.git] / config / locales / fur.yml

diff --git a/config/locales/fur.yml b/config/locales/fur.yml
index 6da404a40f84b57b78c14ed71729fb79fdc952ee..324b6a3ce0ecb885eb2b2927bb59ff9ccb14184f 100644 (file)
--- a/config/locales/fur.yml
+++ b/config/locales/fur.yml
@@ -92,6 +92,29 @@ fur:
     remote:
       name: Remote Control
       description: Remote Control (JOSM o Merkaartor)
+  api:
+    notes:
+      comment:
+        opened_at_html: Creât %{when} indaûr
+        opened_at_by_html: Creât %{when} indaûr di %{user}
+        commented_at_html: Inzornade %{when} indaûr
+        commented_at_by_html: Inzornade %{when} indaûr di %{user}
+        closed_at_html: Risolte %{when} indaûr
+        closed_at_by_html: Risolte %{when} indaûr di %{user}
+        reopened_at_html: Tornade a ativâ %{when} indaûr
+        reopened_at_by_html: Tornade a ativâ %{when} indaûr di %{user}
+      rss:
+        title: Notis di OpenStreetMap
+        description_area: Une liste des notis segnaladis, comentadis o risoltis inte
+          tô zone [(%{min_lat}|%{min_lon}) -- (%{max_lat}|%{max_lon})]
+        description_item: Un canâl RSS per note %{id}
+        opened: gnove note (dongje di %{place})
+        commented: gnûf coment (dongje di %{place})
+        closed: note sierade (dongje di %{place})
+        reopened: note tornade a ativâ (dongje di %{place})
+      entry:
+        comment: Coment
+        full: Note complete
   browse:
     created: Creât
     closed: Sierât
@@ -208,7 +231,7 @@ fur:
       introduction: Frache su la mape par cjatâ lis robis dongje.
       nearby: Elements dongje
       enclosing: Elements includûts
-  changeset:
+  changesets:
     changeset_paging_nav:
       showing_page: Pagjine %{page}
       next: Sucessîf »
@@ -238,14 +261,14 @@ fur:
     timeout:
       sorry: Nus displâs, la liste dai grups di cambiaments che tu âs domandât e je
         stade masse timp a cjamâsi.
-    rss:
-      title_all: Discussion sul grup di cambiaments di OpenStreetMap
-      title_particular: 'Discussion sul grup di cambiaments #%{changeset_id} di OpenStreetMap'
+  changeset_comments:
+    comment:
       comment: 'Gnûf coment sul grup di cambiaments #%{changeset_id} di %{author}'
-      commented_at_html: Inzornât %{when} indaûr
       commented_at_by_html: Inzornât %{when} indaûr di %{user}
-      full: Dute la discussion
-  diary_entry:
+    index:
+      title_all: Discussion sul grup di cambiaments di OpenStreetMap
+      title_particular: 'Discussion sul grup di cambiaments #%{changeset_id} di OpenStreetMap'
+  diary_entries:
     new:
       title: Gnove vôs dal diari
     index:
@@ -1362,27 +1385,6 @@ fur:
       next: Sucessîf »
       previous: « Precedent
   notes:
-    comment:
-      opened_at_html: Creât %{when} indaûr
-      opened_at_by_html: Creât %{when} indaûr di %{user}
-      commented_at_html: Inzornade %{when} indaûr
-      commented_at_by_html: Inzornade %{when} indaûr di %{user}
-      closed_at_html: Risolte %{when} indaûr
-      closed_at_by_html: Risolte %{when} indaûr di %{user}
-      reopened_at_html: Tornade a ativâ %{when} indaûr
-      reopened_at_by_html: Tornade a ativâ %{when} indaûr di %{user}
-    rss:
-      title: Notis di OpenStreetMap
-      description_area: Une liste des notis segnaladis, comentadis o risoltis inte
-        tô zone [(%{min_lat}|%{min_lon}) -- (%{max_lat}|%{max_lon})]
-      description_item: Un canâl RSS per note %{id}
-      opened: gnove note (dongje di %{place})
-      commented: gnûf coment (dongje di %{place})
-      closed: note sierade (dongje di %{place})
-      reopened: note tornade a ativâ (dongje di %{place})
-    entry:
-      comment: Coment
-      full: Note complete
     mine:
       title: Note inseride o comentade di %{user}
       heading: Lis notis di %{user}