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

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

diff --git a/config/locales/gcf.yml b/config/locales/gcf.yml
index 3fd0fd75f30962522bbacbca6c2f8ed94c48da46..05f4db3363a3ac7263069e49cb7c45c36ded030f 100644 (file)
--- a/config/locales/gcf.yml
+++ b/config/locales/gcf.yml
@@ -5,12 +5,18 @@
 # Author: Léon973
 ---
 gcf:
 # Author: Léon973
 ---
 gcf:

+  time:
+    formats:
+      friendly: '%e %B %Y at %H:%M'

   helpers:
   helpers:

+    file:
+      prompt: Chwazi on fichyé

     submit:
       diary_comment:
         create: Komantasyon
       diary_entry:
         create: Voyé
     submit:
       diary_comment:
         create: Komantasyon
       diary_entry:
         create: Voyé

+        update: Mizajou

       issue_comment:
         create: Jouté komantasyon
       message:
       issue_comment:
         create: Jouté komantasyon
       message:


@@ -186,6 +192,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
       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é
       recent_entries: 'Nouvel fré:'
       older_entries: Nouvèl rasi
       newer_entries: Nouvèl pi fré


@@ -214,7 +221,7 @@ gcf:
     location:
       view: Vwè
   diary_comments:
     location:
       view: Vwè
   diary_comments:

-    index:
+    page:

       comment: Komantasyon
       newer_comments: Sé komantasyon pli nèf la
       older_comments: Pli vyé komantasyon
       comment: Komantasyon
       newer_comments: Sé komantasyon pli nèf la
       older_comments: Pli vyé komantasyon


@@ -466,8 +473,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é
       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:
     more: Plis
   user_mailer:
     diary_comment_notification:


@@ -630,13 +635,8 @@ gcf:
       wikipedia:
         title: Konèkté-w épi Wikipédya
   oauth:
       wikipedia:
         title: Konèkté-w épi Wikipédya
   oauth:

-    authorize:
-      allow_write_api: modifyé kat-la.

     scopes:
       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é
   oauth2_applications:
     show:
       delete: Néyantizé