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

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

diff --git a/config/locales/gcf.yml b/config/locales/gcf.yml
index 5cccf0156cd538d9f6497a6645b80870f8e0d399..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,11 +234,13 @@ gcf:
           police: Manblo
           prison: Lajòl
           school: Lékòl
+          toilets: Kakatwa
           townhall: Lanméri
           waste_basket: Bwètazòdi
         bridge:
           "yes": Pon
         building:
+          chapel: Chapèl
           church: Batiman a Légliz
           hospital: Batiman a lopital
           hotel: Batiman a Lotèl
@@ -308,20 +309,30 @@ gcf:
           island: Lilèt
           mud: Labou
           peninsula: Pwent
+          reef: Kay
           rock: Wòch
           sand: Sab
+          scrub: Zèb-razyé
+          shingle: Wòch-galèt
+          spring: Sous
           tree: Pyébwa
+          valley: Koulé
           volcano: Vòlkan
           water: Glo
+          wood: Granbwa
+        office:
+          lawyer: Avoka
         place:
           archipelago: bann-zil
           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é
@@ -335,12 +346,15 @@ gcf:
           bicycle: Boutik a bisiklèt
           books: Boutik a liv
           cheese: Boutik a fomaj
+          clothes: Boutik a lenj
           florist: Boutik a flè
           mall: bann-boutik
+          massage: Fòtman
           optician: Boutik a linèt
           perfumery: Boutik a losyon
           seafood: Manjé lannè
           shoes: Boutik a Soulyé
+          ticket: Boutik a bon
           "yes": Lolo
         tourism:
           hotel: Lotèl
@@ -354,9 +368,15 @@ gcf:
           river: Rivyè
           stream: Ravin
           waterfall: Sodo
+      admin_levels:
+        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:
     index:
       search: Chaché
@@ -457,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:
@@ -467,6 +487,12 @@ gcf:
     copyright:
       native:
         mapping_link: koumansé kataj-la
+      legal_babble:
+        contributors_ca_canada: Kanada
+        contributors_fi_finland: Fenlann
+        contributors_fr_france: Frans
+        contributors_nl_netherlands: Nédèlann
+        contributors_es_spain: Èspany
     index:
       js_1: Ou ka sèvi èvè on navigatè ki pa ka sipòté Javascript ouben Javascript
         éten.
@@ -478,23 +504,41 @@ gcf:
         rann édision aw piblik asi %{user_page}.
       user_page_link: paj_itilizatè
       anon_edits_link_text: Ka y ni la.
+    fixthemap:
+      how_to_help:
+        title: Kijan pou ba on pal
+    help:
+      welcome:
+        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: 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
+          taxiway: Koulwa a avyon
+          city: Vil prensipal
           forest: Granbwa
           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:
@@ -502,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?
@@ -530,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?
@@ -541,6 +593,7 @@ gcf:
   javascripts:
     share:
       title: Simé
+      download: Chantyé
     map:
       locate:
         title: Montré la ou yé