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

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

diff --git a/config/locales/gcf.yml b/config/locales/gcf.yml
index f62054492f9d426a747c3725f4f6f392147b7452..3c8f8805e2ddda1ab46bd81db2f201fbee99c754 100644 (file)
--- a/config/locales/gcf.yml
+++ b/config/locales/gcf.yml
@@ -159,8 +159,6 @@ gcf:
     changeset_paging_nav:
       showing_page: Kotéfèy %{page}
       previous: Pwochenn
     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


@@ -192,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
       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é


@@ -220,7 +219,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


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


@@ -470,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.
       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:


@@ -559,8 +554,6 @@ gcf:
       lost password link: Ou pèd kòd a-w?
       login_button: Konnékté-w
   site:
       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
     copyright:
       native:
         mapping_link: koumansé kataj-la


@@ -636,13 +629,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é