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

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

diff --git a/config/locales/gsw.yml b/config/locales/gsw.yml
index 4b16988f57c1e92f6d1a08e7f0c77915089fc59e..ffd78b12b47924c0c869885dec54ace483e28a44 100644 (file)
--- a/config/locales/gsw.yml
+++ b/config/locales/gsw.yml
@@ -1,4 +1,4 @@
-# Messages for Swiss German (Alemannisch)
+# Messages for Alemannic (Alemannisch)

 # Exported from translatewiki.net
 # Export driver: phpyaml
 # Author: Als-Chlämens
 # Exported from translatewiki.net
 # Export driver: phpyaml
 # Author: Als-Chlämens


@@ -93,14 +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
-    created_html: <abbr title='%{title}'>%{time} vor </abbr> aagleit
-    closed_html: <abbr title='%{title}'>%{time} vor </abbr> zuegmacht
-    created_by_html: <abbr title='%{title}'>%{time} vor </abbr> vum %{user} aagleit
-    deleted_by_html: <abbr title='%{title}'>%{time} vor </abbr> vum %{user} glescht.
-    edited_by_html: <abbr title='%{title}'>%{time} vor </abbr> vum %{user} bearbeitet.
-    closed_by_html: <abbr title='%{title}'>%{time} vor </abbr> vum %{user} zuegmacht

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


@@ -110,27 +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})
-      comment: Kommendar (%{count})
-      hidden_commented_by_html: Varschtäckder Kommendar vum  %{user} <abbr title='%{exact_time}'>%{when}
-        vor </abbr>
-      commented_by_html: Kommenmdar vom %{user} <abbr title='%{exact_time}'>%{when}
-        vor </abbr>
-      changesetxml: Changeset-XML
-      osmchangexml: osmChange XML
-      feed:
-        title: Changeset %{id}
-        title_comment: Changeset %{id} - %{comment}
-      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}'


@@ -177,6 +148,27 @@ gsw:
       loading: Am Lade ...
     tag_details:
       tags: 'Tags:'
       loading: Am Lade ...
     tag_details:
       tags: 'Tags:'

+  changesets:
+    index:
+      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


@@ -195,12 +187,13 @@ gsw:
       success: Dyy E-Mail-Adräss isch bstetigt wore, dankschen fir s Regischtriere!
       failure: E E-Mail-Adräss isch scho mit däm Link bstetigt wore.
   passwords:
       success: Dyy E-Mail-Adräss isch bstetigt wore, dankschen fir s Regischtriere!
       failure: E E-Mail-Adräss isch scho mit däm Link bstetigt wore.
   passwords:

-    reset_password:
+    edit:

       title: Passwort zrucksetze
       heading: Passwort fir %{user} zrucksetze
       reset: Passwort zrucksetze
       title: Passwort zrucksetze
       heading: Passwort fir %{user} zrucksetze
       reset: Passwort zrucksetze

-      flash changed: Dyy Passwort isch gänderet wore.

       flash token bad: Mir hän des Chirzel leider nit chenne finde. Iberprief d URL.
       flash token bad: Mir hän des Chirzel leider nit chenne finde. Iberprief d URL.

+    update:
+      flash changed: Dyy Passwort isch gänderet wore.

   traces:
     visibility:
       private: Privat (nume as anonymi, nit sortierti Pinkt ohni Zytstämpfel aazeigt)
   traces:
     visibility:
       private: Privat (nume as anonymi, nit sortierti Pinkt ohni Zytstämpfel aazeigt)


@@ -254,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}