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

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

diff --git a/config/locales/gcf.yml b/config/locales/gcf.yml
index a3daecefc3ef76ea79893864963062dcc3c0c813..247206245e8823fc9bbfbbc4dc91b0aa80a68815 100644 (file)
--- a/config/locales/gcf.yml
+++ b/config/locales/gcf.yml
@@ -156,9 +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

     show:
       discussion: Bokantaj
       join_discussion: Konèkté-w pou jwenn bokantaj-la
     show:
       discussion: Bokantaj
       join_discussion: Konèkté-w pou jwenn bokantaj-la


@@ -192,8 +189,6 @@ gcf:
       no_entries: Pa ni nouvèl an jounal a-w
     page:
       recent_entries: 'Nouvel fré:'
       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é

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


@@ -221,8 +216,6 @@ gcf:
   diary_comments:
     page:
       comment: Komantasyon
   diary_comments:
     page:
       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


@@ -427,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:


@@ -461,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.


@@ -469,7 +458,6 @@ 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é
     more: Plis
   user_mailer:
     help: Anmwé
     more: Plis
   user_mailer:


@@ -504,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'


@@ -555,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


@@ -669,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?


@@ -683,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: