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

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

diff --git a/config/locales/gcf.yml b/config/locales/gcf.yml
index 69b8b8c94e7f2fb88500be3acefa18f3ff89881e..3c8f8805e2ddda1ab46bd81db2f201fbee99c754 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:
@@ -153,8 +159,6 @@ gcf:
     changeset_paging_nav:
       showing_page: Kotéfèy %{page}
       previous: Pwochenn
-    changesets:
-      comment: Komantasyon
     show:
       discussion: Bokantaj
       join_discussion: Konèkté-w pou jwenn bokantaj-la
@@ -186,6 +190,7 @@ gcf:
       new_title: Mèt on nouvèl nèf an jounal a-w
       my_diary: Jounal a-w la
       no_entries: Pa ni nouvèl an jounal a-w
+    page:
       recent_entries: 'Nouvel fré:'
       older_entries: Nouvèl rasi
       newer_entries: Nouvèl pi fré
@@ -213,7 +218,8 @@ gcf:
       confirm: Konfirmé
     location:
       view: Vwè
-    comments:
+  diary_comments:
+    page:
       comment: Komantasyon
       newer_comments: Sé komantasyon pli nèf la
       older_comments: Pli vyé komantasyon
@@ -455,7 +461,6 @@ gcf:
     export: Voyé déwò
     gps_traces: Chimen GPS
     user_diaries: Jounal
-    tag_line: Lyannaj pou kat lib
     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.
@@ -463,10 +468,7 @@ gcf:
       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.
-    donate: Ba OpenStreetMap on Fòs, %{link} Pou fè matériel la vansé.
     help: Anmwé
-    make_a_donation:
-      text: Ba OpenStreetMap On Fòs
     more: Plis
   user_mailer:
     diary_comment_notification:
@@ -552,8 +554,6 @@ gcf:
       lost password link: Ou pèd kòd a-w?
       login_button: Konnékté-w
   site:
-    about:
-      next: Jousapré
     copyright:
       native:
         mapping_link: koumansé kataj-la
@@ -629,13 +629,8 @@ gcf:
       wikipedia:
         title: Konèkté-w épi Wikipédya
   oauth:
-    authorize:
-      allow_write_api: modifyé kat-la.
     scopes:
       write_api: Modifyé kat-la
-  oauth_clients:
-    show:
-      confirm: Ès ou sèkten?
   oauth2_applications:
     show:
       delete: Néyantizé