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

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

diff --git a/config/locales/gcf.yml b/config/locales/gcf.yml
index 5f9d14cf5496385fa720ebdc65a50061774ce011..7881b7087b9d34c156778f4abb194c2a05adc939 100644 (file)
--- a/config/locales/gcf.yml
+++ b/config/locales/gcf.yml
@@ -104,14 +104,6 @@ gcf:
     no_comment: (pon komantasyon)
     download_xml: Chantyé XML
     location: 'Ki koté:'
-    changeset:
-      comment: Komantasyon (%{count})
-      hidden_comment_by_html: Komantasyon ou dévwè a %{user} %{time_ago}
-      comment_by_html: Komantasyon a %{user} %{time_ago}
-      changesetxml: Niméwo Chanjeman XML
-      osmchangexml: osmChanjeman XML
-      join_discussion: Konèkté-w pou jwenn bokantaj-la
-      discussion: Bokantaj
     containing_relation:
       entry_html: Rèlasion %{relation_name}
       entry_role_html: Rèlasion %{relation_name} (adan wol %{relation_role})
@@ -132,6 +124,13 @@ gcf:
       previous: Pwochenn
     changesets:
       comment: Komantasyon
+    show:
+      discussion: Bokantaj
+      join_discussion: Konèkté-w pou jwenn bokantaj-la
+      comment_by_html: Komantasyon a %{user} %{time_ago}
+      hidden_comment_by_html: Komantasyon ou dévwè a %{user} %{time_ago}
+      changesetxml: Niméwo Chanjeman XML
+      osmchangexml: osmChanjeman XML
   dashboards:
     contact:
       km away: '%{count} km'
@@ -235,6 +234,7 @@ gcf:
           police: Manblo
           prison: Lajòl
           school: Lékòl
+          toilets: Kakatwa
           townhall: Lanméri
           waste_basket: Bwètazòdi
         bridge:
@@ -309,6 +309,7 @@ gcf:
           island: Lilèt
           mud: Labou
           peninsula: Pwent
+          reef: Kay
           rock: Wòch
           sand: Sab
           scrub: Zèb-razyé
@@ -318,6 +319,7 @@ gcf:
           valley: Koulé
           volcano: Vòlkan
           water: Glo
+          wood: Granbwa
         office:
           lawyer: Avoka
         place:
@@ -325,10 +327,12 @@ gcf:
           city: Vil prensipal
           country: Péyi
           house: Kaz
+          houses: Kaz
           island: Lilèt
           islet: Tililèt
           locality: Koté
           sea: Lanmè
+          suburb: Fobou
           town: Vil
           village: Vilaj
           "yes": Koté
@@ -473,7 +477,7 @@ gcf:
       title: Konèkté-w
       heading: Konekté
       email or username: 'Adres imél ouben nom itilizaté aw :'
-      password: 'Kòd aw:'
+      password: 'Kòd a''w:'
       lost password link: Ou pèd kòd a-w?
       login_button: Konektéw
       auth_providers:
@@ -511,12 +515,13 @@ gcf:
       close: Fèmé
     search:
       search: Chèché
-      where_am_i: Ki moun an yé?
+      where_am_i: Ola sa yé?
       submit_text: Voyé
     key:
       table:
         entry:
           motorway: Lotowout
+          main_road: Chimen a gouvèlman
           trunk: Wokad
           primary: Chimen a gouvèlman
           train: Tren
@@ -526,11 +531,14 @@ gcf:
           grass: Zèb
           sand: Sab
           reservoir: Rézèvwa
+          reef: Kay
           cemetery: Simityè
           beach: Bòdlanmè
           school: Lékòl
           hospital: Lopital
+          toilets: Kakatwa
     welcome:
+      title: Kontan vwè-w!
       rules:
         title: Larèl-la!
       add_a_note:
@@ -538,6 +546,11 @@ gcf:
   traces:
     new:
       help: Anmwé
+  oauth:
+    authorize:
+      allow_write_api: modifyé kat-la.
+    scopes:
+      write_api: Modifyé kat-la
   oauth_clients:
     show:
       confirm: Ès ou sèkten?
@@ -566,8 +579,11 @@ gcf:
       remove as friend: Woté on zanmi
       add as friend: Ajouté on zanmi
       mapper since: 'Arpantè dèpi:'
+      comments: Komantasyon
     go_public:
       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?
@@ -577,6 +593,7 @@ gcf:
   javascripts:
     share:
       title: Simé
+      download: Chantyé
     map:
       locate:
         title: Montré la ou yé