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

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

diff --git a/config/locales/gsw.yml b/config/locales/gsw.yml
index ac44d7f59f06954676e245ce86cdd2b3d234d444..cf3854f93e07c9621cf4257437e0f727004417ce 100644 (file)
--- a/config/locales/gsw.yml
+++ b/config/locales/gsw.yml
@@ -113,12 +113,8 @@ gsw:
       way_paginated: Wäg (%{x}-%{y} von %{count})
       relation: Relatione (%{count})
       relation_paginated: Relatione (%{x}-%{y} of %{count})
-      comment: Kommendar (%{count})
       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:
@@ -167,6 +163,11 @@ gsw:
       loading: Am Lade ...
     tag_details:
       tags: 'Tags:'
+  changesets:
+    index:
+      feed:
+        title: Changeset %{id}
+        title_comment: Changeset %{id} - %{comment}
   dashboards:
     popup:
       your location: Dyy Standort
@@ -185,12 +186,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)