Merge branch 'master' into openID

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

diff --git a/config/locales/gcf.yml b/config/locales/gcf.yml
index 8f0a6d1d0696a7b293cb3aec5a14c9a53a5a51eb..cc62af43ed607da844d1245318984b57e80a12a9 100644 (file)
--- a/config/locales/gcf.yml
+++ b/config/locales/gcf.yml
@@ -133,14 +133,6 @@ gcf:
     user_diaries: Jounal
     view: Vwè
     welcome_user: Bienvini, {{user_link}}
     user_diaries: Jounal
     view: Vwè
     welcome_user: Bienvini, {{user_link}}

-  map: 
-    coordinates: Sitiyasion
-    edit: Édité
-    view: Kat
-  notifier: 
-    diary_comment_notification: 
-      banner1: "*            Souplé pa réponn a mésaj la sa.             *"
-      banner2: "*           Sèvi èvè sit a OpenStreetMap pou réponn.           *"

   site: 
     edit: 
       anon_edits_link_text: Ka y ni la.
   site: 
     edit: 
       anon_edits_link_text: Ka y ni la.


@@ -198,9 +190,6 @@ gcf:
       button: Konfirmé
       heading: Konfirmé chanjman a adres imél aw
       press confirm button: Apiyé asi bouton la ki an ba pou konfirmé nouvo adres imél aw.
       button: Konfirmé
       heading: Konfirmé chanjman a adres imél aw
       press confirm button: Apiyé asi bouton la ki an ba pou konfirmé nouvo adres imél aw.

-    friend_map: 
-      nearby mapper: "Arpantè owa aw: [[nearby_user]]"
-      your location: Koté ou yé

     go_public: 
       flash success: Tou sa ou fè jis alè ki lé piblik ou pa otorizé édité.
     login: 
     go_public: 
       flash success: Tou sa ou fè jis alè ki lé piblik ou pa otorizé édité.
     login: 


@@ -231,13 +220,13 @@ gcf:
       signup: Enskriw
     no_such_user: 
       body: Malérezman, pa ti ni pon itilisatè èvè non la sa {{user}}. Kontrolé lòtograf la ouben lien la ou kliké asiy la pa bon.
       signup: Enskriw
     no_such_user: 
       body: Malérezman, pa ti ni pon itilisatè èvè non la sa {{user}}. Kontrolé lòtograf la ouben lien la ou kliké asiy la pa bon.

+    popup: 
+      nearby mapper: Arpantè owa aw
+      your location: Koté ou yé

     set_home: 
       flash success: La ou ka rété la bien anrèjistré
     view: 
       add as friend: Ajouté on zanmi
     set_home: 
       flash success: La ou ka rété la bien anrèjistré
     view: 
       add as friend: Ajouté on zanmi

-      add image: Ajouté on imaj
-      change your settings: Chanjé opsion aw
-      delete image: Woté on imaj

       description: Deskription
       diary: Jounal
       edits: Édision
       description: Deskription
       diary: Jounal
       edits: Édision


@@ -251,13 +240,10 @@ gcf:
       nearby users: "Itilizatè owa aw :"
       new diary entry: On dot nouvel an jounal la
       no friends: Ou poko ni pon zanmi
       nearby users: "Itilizatè owa aw :"
       new diary entry: On dot nouvel an jounal la
       no friends: Ou poko ni pon zanmi

-      no home location: Pa ni pon koté défini.

       no nearby users: Ou poko ni itilizatè owa aw.
       remove as friend: Woté on zanmi
       send message: Voyé on mésaj
       settings_link_text: Opsion
       traces: Chimen
       no nearby users: Ou poko ni itilizatè owa aw.
       remove as friend: Woté on zanmi
       send message: Voyé on mésaj
       settings_link_text: Opsion
       traces: Chimen

-      upload an image: Voyé on imaj
-      user image heading: Foto itilizatè

       user location: Ola itilizatè yé
       your friends: Kanmarad aw
       user location: Ola itilizatè yé
       your friends: Kanmarad aw