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

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

diff --git a/config/locales/gcf.yml b/config/locales/gcf.yml
index 237cf9406c2007e02464089a01f2ff03902f4893..9e9b57ea76d96cc5801dc3ea4a66d032663da4b5 100644 (file)
--- a/config/locales/gcf.yml
+++ b/config/locales/gcf.yml
@@ -12,6 +12,23 @@ gcf:
     help:
       user:
         new_email: (Pa janmen maké piblikman)
+  accounts:
+    edit:
+      my settings: Mes options
+      public editing:
+        enabled: Aktif. Y pa anonnim, y pé édité doné.
+        enabled link: http://wiki.openstreetmap.org/wiki/Disabling_anonymous_edits
+        enabled link text: Ka sa yé?
+        disabled: Inaktif y pé pa édité doné ; tout édision pasé anonim.
+        disabled link text: Poukwa an pé pa édité?
+      public editing note:
+        heading: 'Édision piblik:'
+      save changes button: Enrèjisré tout chanjman
+      make edits public button: Mèt tou sa an fè piblik
+    update:
+      success_confirm_needed: Enfowmasion asi itilisatè la bien anrèjistré. Gadé bwet
+        imél aw pou konfirmé adres nouvo imél aw
+      success: Efowmasion asi itilisatè la bien anrejistré.
   browse:
     changeset:
       changesetxml: Niméwo Chanjeman XML
@@ -24,6 +41,16 @@ gcf:
     start_rjs:
       load_data: Chajé sé doné la
       loading: Y ka chajé...
+  dashboards:
+    contact:
+      km away: '%{count} km'
+    popup:
+      your location: Koté ou yé
+      nearby mapper: Arpantè owa aw
+    show:
+      no friends: Ou poko ni pon zanmi
+      nearby users: 'Itilizatè owa aw :'
+      no nearby users: Ou poko ni itilizatè owa aw.
   diary_entries:
     new:
       title: Nouvel nèf an jounal la
@@ -144,28 +171,6 @@ gcf:
       mapper since: 'Arpantè dèpi:'
       description: Deskription
       user location: Ola itilizatè yé
-      no friends: Ou poko ni pon zanmi
-      km away: '%{count} km'
-      nearby users: 'Itilizatè owa aw :'
-      no nearby users: Ou poko ni itilizatè owa aw.
-    popup:
-      your location: Koté ou yé
-      nearby mapper: Arpantè owa aw
-    account:
-      my settings: Mes options
-      public editing:
-        heading: 'Édision piblik:'
-        enabled: Aktif. Y pa anonnim, y pé édité doné.
-        enabled link: http://wiki.openstreetmap.org/wiki/Disabling_anonymous_edits
-        enabled link text: Ka sa yé?
-        disabled: Inaktif y pé pa édité doné ; tout édision pasé anonim.
-        disabled link text: Poukwa an pé pa édité?
-      save changes button: Enrèjisré tout chanjman
-      make edits public button: Mèt tou sa an fè piblik
-      return to profile: Rouvin' asi pwofil la
-      flash update success confirm needed: Enfowmasion asi itilisatè la bien anrèjistré.
-        Gadé bwet imél aw pou konfirmé adres nouvo imél aw
-      flash update success: Efowmasion asi itilisatè la bien anrejistré.
     set_home:
       flash success: La ou ka rété la bien anrèjistré
     go_public: