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

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

diff --git a/config/locales/gcf.yml b/config/locales/gcf.yml
index b4f35e515526dc3545c47d55db0db5dc0fdf1742..a3daecefc3ef76ea79893864963062dcc3c0c813 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,13 +159,12 @@ 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
       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:
@@ -185,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é
@@ -212,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
@@ -464,8 +471,6 @@ gcf:
       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:
@@ -566,7 +571,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é
@@ -629,13 +633,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é
@@ -696,9 +695,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)