Merge branch 'master' into openstreetbugs

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

diff --git a/config/locales/eu.yml b/config/locales/eu.yml
index a02d9870f61dedc3cdc1a63afdf4c415c7d1eb95..bbe52ad33cfe14fd2b732298ccb23fb0c46c9daf 100644 (file)
--- a/config/locales/eu.yml
+++ b/config/locales/eu.yml
@@ -383,6 +383,7 @@ eu:
           rock: Arroka
           scree: Harritza
           shoal: Hondar-banku
           rock: Arroka
           scree: Harritza
           shoal: Hondar-banku

+          strait: Itsasertza

           tree: Zuhaitza
           valley: Haran
           volcano: Sumendi
           tree: Zuhaitza
           valley: Haran
           volcano: Sumendi


@@ -624,6 +625,8 @@ eu:
           secondary: Bigarren mailako errepidea
           station: Tren geltokia
           subway: Metroa
           secondary: Bigarren mailako errepidea
           station: Tren geltokia
           subway: Metroa

+          summit: 
+            - Tontorra

           tram: 
             1: tranbia
     search: 
           tram: 
             1: tranbia
     search: 


@@ -739,6 +742,10 @@ eu:
       password: "Pasahitza:"
       reset: Pasahitza berrezarri
       title: Pasahitza berrezarri
       password: "Pasahitza:"
       reset: Pasahitza berrezarri
       title: Pasahitza berrezarri

+    terms: 
+      legale_names: 
+        france: Frantzia
+        italy: Italy

     view: 
       activate_user: erabiltzaile hau gaitu
       add as friend: lagun bezala
     view: 
       activate_user: erabiltzaile hau gaitu
       add as friend: lagun bezala