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

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

diff --git a/config/locales/gcf.yml b/config/locales/gcf.yml
index 05513dbe4e6f379b05744821a58146916cdc3f95..7881b7087b9d34c156778f4abb194c2a05adc939 100644 (file)
--- a/config/locales/gcf.yml
+++ b/config/locales/gcf.yml
@@ -104,13 +104,6 @@ gcf:
     no_comment: (pon komantasyon)
     download_xml: Chantyé XML
     location: 'Ki koté:'
-    changeset:
-      hidden_comment_by_html: Komantasyon ou dévwè a %{user} %{time_ago}
-      comment_by_html: Komantasyon a %{user} %{time_ago}
-      changesetxml: Niméwo Chanjeman XML
-      osmchangexml: osmChanjeman XML
-      join_discussion: Konèkté-w pou jwenn bokantaj-la
-      discussion: Bokantaj
     containing_relation:
       entry_html: Rèlasion %{relation_name}
       entry_role_html: Rèlasion %{relation_name} (adan wol %{relation_role})
@@ -131,6 +124,13 @@ gcf:
       previous: Pwochenn
     changesets:
       comment: Komantasyon
+    show:
+      discussion: Bokantaj
+      join_discussion: Konèkté-w pou jwenn bokantaj-la
+      comment_by_html: Komantasyon a %{user} %{time_ago}
+      hidden_comment_by_html: Komantasyon ou dévwè a %{user} %{time_ago}
+      changesetxml: Niméwo Chanjeman XML
+      osmchangexml: osmChanjeman XML
   dashboards:
     contact:
       km away: '%{count} km'