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

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

diff --git a/config/locales/gcf.yml b/config/locales/gcf.yml
index bb82283a036ab2fd2450168cc39cb82b336d9623..204332d2e4d5cf68d1d01328abbd7a103654ab53 100644 (file)
--- a/config/locales/gcf.yml
+++ b/config/locales/gcf.yml
@@ -3,6 +3,7 @@
 # Export driver: phpyaml
 # Author: Istwalezanti
 # Author: Léon973
+# Author: Marwin H.H.
 ---
 gcf:
   time:
@@ -79,9 +80,8 @@ gcf:
       entry:
         comment: Komantasyon
   accounts:
-    edit:
+    show:
       title: Modifyé kont a-w la
-      my settings: Mes options
       openid:
         link text: Ka sa yé?
       contributor terms:
@@ -148,7 +148,8 @@ gcf:
     tag_details:
       wikipedia_link: Kotéfèy %{page} asi Wikipégya
       telephone_link: Kriyé %{phone_number}
-    query:
+  feature_queries:
+    show:
       introduction: Pijé asi kat-la pou jwenn biten toupréla.
       nearby: Biten pa lwen
   changesets:
@@ -546,6 +547,8 @@ gcf:
       search: Chèché
       where_am_i: Ola sa yé?
       submit_text: Voyé
+      modes:
+        bicycle: biskèt
     key:
       table:
         entry:
@@ -605,7 +608,6 @@ gcf:
       my edits: Édision an mwen
       my traces: Chimen an mwen
       my messages: Sé mésaj a-w la
-      my settings: Opsion an mwen
       my_preferences: Sa ou simyé
       send message: Voyé on mésaj
       diary: Jounal
@@ -643,8 +645,6 @@ gcf:
       edit_tooltip: Modifyé kat-la
       createnote_tooltip: Jouté on komantasyon asi kat-la
     directions:
-      engines:
-        fossgis_valhalla_bicycle: biskèt (Valhalla)
       errors:
         no_place: Malérèzsò, yo pa sav ola '%{place}' yé.
       instructions: