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

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

diff --git a/config/locales/gcf.yml b/config/locales/gcf.yml
index c87a81354284bde6c82682dc8e85606287b6c135..3414ad73df49a6800dc1eee302dc5a0666591e0d 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:
@@ -427,10 +427,6 @@ gcf:
     intro_header: Kontan vwè-w asi OpenStreetMap!
     intro_text: Openstreetmap, sé on kat a lèmonn-la ki fèt parapòt a moun kon-w é
       lib pou sèvi épi-y évè on lisans lib.
-    osm_offline: Base a doné a OpenStreetMap dékonekté atchelman ; Yo ka fè on gwo
-      travay enpòtan asi-y pou-y maché bien.
-    osm_read_only: Atchelman ou pé li selamn base a doné a OpenStreetMap ; Yo ka fè
-      on gwo travay enpòtan asi-y pou-y maché bien.
     help: Anmwé
     more: Plis
   user_mailer:
@@ -532,7 +528,7 @@ gcf:
       js_1: Ou ka sèvi èvè on navigatè ki pa ka sipòté Javascript ouben Javascript
         éten.
       js_2: OpenStreetMap ka sèvi èvè Javascript pou kat glisad.
-    edit:
+    not_public_flash:
       not_public: Ou pé pa réglé édision aw pou yo piblik.
       not_public_description_html: Pou modifié kat la fok édision aw piblik. Ou pé
         rann édision aw piblik asi %{user_page}.
@@ -550,6 +546,8 @@ gcf:
       search: Chèché
       where_am_i: Ola sa yé?
       submit_text: Voyé
+      modes:
+        bicycle: biskèt
     key:
       table:
         entry:
@@ -609,7 +607,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
@@ -647,8 +644,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: