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

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

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


@@ -535,7 +533,6 @@ 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:'
       tab_title: Konnékté-w
       email or username: 'Adrès imél oben nom itilizatè a-w :'
       password: 'Kòd a''w:'


@@ -578,7 +575,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é?


@@ -662,9 +658,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_blocks:
-    show:
-      confirm: Ès ou sèkten?

   user_mutes:
     index:
       table:
   user_mutes:
     index:
       table: