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

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

diff --git a/config/locales/gsw.yml b/config/locales/gsw.yml
index 7535996d4ac0b9c3b68626f25339b7ef64061e71..595b47f34248bff4c853e01858664d08fea45d24 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
@@ -24,7 +24,6 @@ gsw:
       message: Nochricht
       node: Gnode
       node_tag: Gnode-Attribuet
-      notifier: Bnoochrichtiger
       old_node: Alder Gnode
       old_node_tag: Alds Gnode-Attribuet
       old_relation: Aldi Relation
@@ -54,7 +53,7 @@ gsw:
         title: Beträff
         latitude: Geografischi Breit
         longitude: Geografischi Läng
-        language: Sprooch
+        language_code: Sprooch
       friend:
         user: Benutzer
         friend: Fraind
@@ -94,14 +93,6 @@ gsw:
       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
@@ -111,27 +102,6 @@ gsw:
     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}'
@@ -178,6 +148,31 @@ gsw:
       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
+      nearby mapper: Mapper in dr Nechi
   friendships:
     make_friend:
       success: '%{name} isch jetz Dyy Frynd.'
@@ -192,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:
-    reset_password:
+    edit:
       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.
+    update:
+      flash changed: Dyy Passwort isch gänderet wore.
   traces:
     visibility:
       private: Privat (nume as anonymi, nit sortierti Pinkt ohni Zytstämpfel aazeigt)
@@ -262,9 +258,6 @@ gsw:
     make_public:
       made_public: Track, wu vereffetligt isch
   users:
-    popup:
-      your location: Dyy Standort
-      nearby mapper: Mapper in dr Nechi
     go_public:
       flash success: Alli Dyyni Bearbeitige sion jetz effetlig, un Du derfsch jetz
         Bearbeitige mache.