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

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

diff --git a/config/locales/gcf.yml b/config/locales/gcf.yml
index 3c8f8805e2ddda1ab46bd81db2f201fbee99c754..ff577e670df00290158d27dd27c16deb94955c67 100644 (file)
--- a/config/locales/gcf.yml
+++ b/config/locales/gcf.yml
@@ -134,7 +134,6 @@ gcf:
       type:
         way: Chimen
     containing_relation:
       type:
         way: Chimen
     containing_relation:

-      entry_html: Rèlasion %{relation_name}

       entry_role_html: Rèlasion %{relation_name} (adan wol %{relation_role})
     not_found:
       sorry: Désolé, l’objet %{type} nº %{id} n’a pas pu être trouvé.
       entry_role_html: Rèlasion %{relation_name} (adan wol %{relation_role})
     not_found:
       sorry: Désolé, l’objet %{type} nº %{id} n’a pas pu être trouvé.


@@ -156,9 +155,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 +188,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:


@@ -216,13 +210,9 @@ gcf:
       comment_from_html: Komantè a %{link_user} koté %{comment_created_at}
       hide_link: Dévwè komantasyon-lasa
       confirm: Konfirmé
       comment_from_html: Komantè a %{link_user} koté %{comment_created_at}
       hide_link: Dévwè komantasyon-lasa
       confirm: Konfirmé

-    location:
-      view: Vwè

   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 +417,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:


@@ -502,7 +489,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'


@@ -546,13 +532,20 @@ gcf:
       delete: Néyantizé
   sessions:
     new:
       delete: Néyantizé
   sessions:
     new:

-      title: Konnékté-w

       tab_title: Konnékté-w
       email or username: 'Adrès imél oben nom itilizatè a-w :'
       password: 'Kòd a''w:'
       remember: Sonjé-mwen
       lost password link: Ou pèd kòd a-w?
       login_button: Konnékté-w
       tab_title: Konnékté-w
       email or username: 'Adrès imél oben nom itilizatè a-w :'
       password: 'Kòd a''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:
     copyright:
       native:
   site:
     copyright:
       native:


@@ -581,7 +574,6 @@ gcf:
         title: Kontan vwè-w asi OpenStreetMap
     sidebar:
       search_results: Rézilta a chèché aw
         title: Kontan vwè-w asi OpenStreetMap
     sidebar:
       search_results: Rézilta a chèché aw

-      close: Fèmé

     search:
       search: Chèché
       where_am_i: Ola sa yé?
     search:
       search: Chèché
       where_am_i: Ola sa yé?


@@ -665,12 +657,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_mutes:
     index:
       table:
   user_mutes:
     index:
       table:


@@ -679,6 +665,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: