Merge branch 'pull/5035'

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

diff --git a/config/locales/gcf.yml b/config/locales/gcf.yml
index c662fb049b19396ad5b3ed7fbd01c993557c9f0d..f62054492f9d426a747c3725f4f6f392147b7452 100644 (file)
--- a/config/locales/gcf.yml
+++ b/config/locales/gcf.yml
@@ -5,12 +5,18 @@
 # Author: Léon973
 ---
 gcf:
+  time:
+    formats:
+      friendly: '%e %B %Y at %H:%M'
   helpers:
+    file:
+      prompt: Chwazi on fichyé
     submit:
       diary_comment:
         create: Komantasyon
       diary_entry:
         create: Voyé
+        update: Mizajou
       issue_comment:
         create: Jouté komantasyon
       message:
@@ -160,6 +166,7 @@ gcf:
       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}
+      comment: Komantasyon
       changesetxml: Niméwo Chanjeman XML
       osmchangexml: osmChanjeman XML
   dashboards:
@@ -212,7 +219,8 @@ gcf:
       confirm: Konfirmé
     location:
       view: Vwè
-    comments:
+  diary_comments:
+    index:
       comment: Komantasyon
       newer_comments: Sé komantasyon pli nèf la
       older_comments: Pli vyé komantasyon
@@ -544,15 +552,12 @@ gcf:
   sessions:
     new:
       title: Konnékté-w
-      heading: Konnékté-w
+      tab_title: Konnékté-w
       email or username: 'Adrès imél oben nom itilizatè a-w :'
       password: 'Kòd a''w:'
       remember: Sonjé-mwen
       lost password link: Ou pèd kòd a-w?
       login_button: Konnékté-w
-      auth_providers:
-        wikipedia:
-          title: Konèkté-w épi Wikipédya
   site:
     about:
       next: Jousapré
@@ -569,7 +574,6 @@ 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.
-      permalink: Permalink
     edit:
       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é
@@ -627,6 +631,10 @@ gcf:
       more: plis
     index:
       empty_title: Ayen pò-ò la
+  application:
+    auth_providers:
+      wikipedia:
+        title: Konèkté-w épi Wikipédya
   oauth:
     authorize:
       allow_write_api: modifyé kat-la.
@@ -695,9 +703,6 @@ gcf:
     site:
       edit_tooltip: Modifyé kat-la
       createnote_tooltip: Jouté on komantasyon asi kat-la
-    changesets:
-      show:
-        comment: Komantasyon
     directions:
       engines:
         fossgis_valhalla_bicycle: biskèt (Valhalla)