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

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

diff --git a/config/locales/gcf.yml b/config/locales/gcf.yml
index 5cccf0156cd538d9f6497a6645b80870f8e0d399..5f9d14cf5496385fa720ebdc65a50061774ce011 100644 (file)
--- a/config/locales/gcf.yml
+++ b/config/locales/gcf.yml
@@ -240,6 +240,7 @@ gcf:
         bridge:
           "yes": Pon
         building:
+          chapel: Chapèl
           church: Batiman a Légliz
           hospital: Batiman a lopital
           hotel: Batiman a Lotèl
@@ -310,9 +311,15 @@ gcf:
           peninsula: Pwent
           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
+        office:
+          lawyer: Avoka
         place:
           archipelago: bann-zil
           city: Vil prensipal
@@ -335,12 +342,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 +364,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é
@@ -467,6 +483,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,6 +500,12 @@ 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é
@@ -488,10 +516,18 @@ gcf:
     key:
       table:
         entry:
+          motorway: Lotowout
+          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
           cemetery: Simityè
+          beach: Bòdlanmè
           school: Lékòl
           hospital: Lopital
     welcome: