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

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

diff --git a/config/locales/gsw.yml b/config/locales/gsw.yml
index cf3854f93e07c9621cf4257437e0f727004417ce..ffd78b12b47924c0c869885dec54ace483e28a44 100644 (file)
--- a/config/locales/gsw.yml
+++ b/config/locales/gsw.yml
@@ -93,8 +93,6 @@ gsw:
       name: externer Editor
       description: externer Editor (JOSM odda Merkaartor)
   browse:
       name: externer Editor
       description: externer Editor (JOSM odda Merkaartor)
   browse:

-    created: Aagleit
-    closed: Zue

     version: Version
     in_changeset: Änderige
     anonymous: anonym
     version: Version
     in_changeset: Änderige
     anonymous: anonym


@@ -104,19 +102,6 @@ gsw:
     view_history: Versionsgschicht
     view_details: Details aagucke
     location: 'Ort:'
     view_history: Versionsgschicht
     view_details: Details aagucke
     location: 'Ort:'

-    changeset:
-      title: 'Änderigssatz: %{id}'
-      belongs_to: Autor
-      node: Gnode (%{count})
-      node_paginated: Gnode (%{x}-%{y} of %{count})
-      way: Wäg (%{count})
-      way_paginated: Wäg (%{x}-%{y} von %{count})
-      relation: Relatione (%{count})
-      relation_paginated: Relatione (%{x}-%{y} of %{count})
-      changesetxml: Changeset-XML
-      osmchangexml: osmChange XML
-      join_discussion: Meld dich aa, wennd mitdiskutiere willsch.
-      discussion: Diskussion

     node:
       title_html: 'Gnode: %{name}'
       history_title_html: 'Versionsgschicht vum Gnote: %{name}'
     node:
       title_html: 'Gnode: %{name}'
       history_title_html: 'Versionsgschicht vum Gnote: %{name}'


@@ -168,6 +153,22 @@ gsw:
       feed:
         title: Changeset %{id}
         title_comment: Changeset %{id} - %{comment}
       feed:
         title: Changeset %{id}
         title_comment: Changeset %{id} - %{comment}

+        created: Aagleit
+        closed: Zue
+        belongs_to: Autor
+    show:
+      title: 'Änderigssatz: %{id}'
+      discussion: Diskussion
+      join_discussion: Meld dich aa, wennd mitdiskutiere willsch.
+      changesetxml: Changeset-XML
+      osmchangexml: osmChange XML
+    paging_nav:
+      nodes: Gnode (%{count})
+      nodes_paginated: Gnode (%{x}-%{y} of %{count})
+      ways: Wäg (%{count})
+      ways_paginated: Wäg (%{x}-%{y} von %{count})
+      relations: Relatione (%{count})
+      relations_paginated: Relatione (%{x}-%{y} of %{count})

   dashboards:
     popup:
       your location: Dyy Standort
   dashboards:
     popup:
       your location: Dyy Standort


@@ -246,8 +247,6 @@ gsw:
       edit_map: Charte bearbeite
       public: EFFETLI
       private: PRIVAT
       edit_map: Charte bearbeite
       public: EFFETLI
       private: PRIVAT

-      by: vu
-      in: in

     index:
       public_traces: Effetligi GPS-Track
       public_traces_from: Effetligi GPS-Track vu %{user}
     index:
       public_traces: Effetligi GPS-Track
       public_traces_from: Effetligi GPS-Track vu %{user}