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

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

diff --git a/config/locales/gcf.yml b/config/locales/gcf.yml
index 3fd0fd75f30962522bbacbca6c2f8ed94c48da46..247206245e8823fc9bbfbbc4dc91b0aa80a68815 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:


@@ -150,11 +156,6 @@ gcf:
       introduction: Pijé asi kat-la pou jwenn biten toupréla.
       nearby: Biten pa lwen
   changesets:
       introduction: Pijé asi kat-la pou jwenn biten toupréla.
       nearby: Biten pa lwen
   changesets:

-    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
     show:
       discussion: Bokantaj
       join_discussion: Konèkté-w pou jwenn bokantaj-la


@@ -186,9 +187,8 @@ 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é:'
       recent_entries: 'Nouvel fré:'

-      older_entries: Nouvèl rasi
-      newer_entries: Nouvèl pi fré

     edit:
       marker_text: Ola jounal la ka koumansé
     show:
     edit:
       marker_text: Ola jounal la ka koumansé
     show:


@@ -214,10 +214,8 @@ gcf:
     location:
       view: Vwè
   diary_comments:
     location:
       view: Vwè
   diary_comments:

-    index:
+    page:

       comment: Komantasyon
       comment: Komantasyon

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

   doorkeeper:
     scopes:
       phone: Vwè liméwo a téléfòn a-w
   doorkeeper:
     scopes:
       phone: Vwè liméwo a téléfòn a-w


@@ -422,9 +420,6 @@ gcf:
         level8: Lizyè a konmin
         level9: Lizyè a vilaj
         level10: Lizyè a sèksyon
         level8: Lizyè a konmin
         level9: Lizyè a vilaj
         level10: Lizyè a sèksyon

-      types:
-        cities: Vil prensipal
-        towns: Vil

     results:
       no_results: Yo pa jwenn p'on rézilta
   issues:
     results:
       no_results: Yo pa jwenn p'on rézilta
   issues:


@@ -456,7 +451,6 @@ gcf:
     export: Voyé déwò
     gps_traces: Chimen GPS
     user_diaries: Jounal
     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.
     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.


@@ -464,10 +458,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.
       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é
     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:


@@ -501,7 +492,6 @@ gcf:
           ou konmanté. Maké-la ora a %{place}.'
     changeset_comment_notification:
       hi: Yéla %{to_user},
           ou konmanté. Maké-la ora a %{place}.'
     changeset_comment_notification:
       hi: Yéla %{to_user},

-      greeting: Yéla,

       commented:
         subject_own: '[OpenStreetMap] %{commenter} voyé on komantasyon asi yonn a
           krèy a modifikasyon a-w'
       commented:
         subject_own: '[OpenStreetMap] %{commenter} voyé on komantasyon asi yonn a
           krèy a modifikasyon a-w'


@@ -552,9 +542,15 @@ gcf:
       remember: Sonjé-mwen
       lost password link: Ou pèd kòd a-w?
       login_button: Konnékté-w
       remember: Sonjé-mwen
       lost password link: Ou pèd kòd a-w?
       login_button: Konnékté-w

+  shared:
+    pagination:
+      diary_comments:
+        older: Pli vyé komantasyon
+        newer: Sé komantasyon pli nèf la
+      diary_entries:
+        older: Nouvèl rasi
+        newer: Nouvèl pi fré

   site:
   site:

-    about:
-      next: Jousapré

     copyright:
       native:
         mapping_link: koumansé kataj-la
     copyright:
       native:
         mapping_link: koumansé kataj-la


@@ -630,13 +626,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é


@@ -671,9 +662,6 @@ gcf:
       flash success: Tou sa ou fè jis alè ki lé piblik ou pa otorizé édité.
     suspended:
       support: janmdifòs
       flash success: Tou sa ou fè jis alè ki lé piblik ou pa otorizé édité.
     suspended:
       support: janmdifòs

-  user_role:
-    revoke:
-      confirm: Konfirmé

   user_blocks:
     show:
       confirm: Ès ou sèkten?
   user_blocks:
     show:
       confirm: Ès ou sèkten?


@@ -685,6 +673,8 @@ gcf:
   notes:
     index:
       last_changed: Dènyé lèwvwè yo modifyé-y
   notes:
     index:
       last_changed: Dènyé lèwvwè yo modifyé-y

+    notes_paging_nav:
+      showing_page: Kotéfèy %{page}

   javascripts:
     close: Fèmé
     share:
   javascripts:
     close: Fèmé
     share: