Merge branch 'master' into terms

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

diff --git a/config/locales/eu.yml b/config/locales/eu.yml
index f1d0d92855ba1d57ff3e5706849d177eb62adb17..62213b5892fb190093e407c609a3f721fa339080 100644 (file)
--- a/config/locales/eu.yml
+++ b/config/locales/eu.yml
@@ -685,9 +685,6 @@ eu:
       heading: Erabiltzaile kontua baieztatu
     confirm_email: 
       button: Berretsi
-    friend_map: 
-      nearby mapper: "Hurbileko mapeatzaileak: [[nearby_user]]"
-      your location: Zure kokapena
     login: 
       create_account: kontua sortu
       email or username: "Eposta helbidea edo Erabiltzaile izena:"
@@ -708,6 +705,9 @@ eu:
       password: "Pasahitza:"
       signup: Izena eman
       title: Kontua sortu
+    popup: 
+      nearby mapper: Hurbileko mapeatzaileak
+      your location: Zure kokapena
     remove_friend: 
       not_a_friend: "{{name}} ez da zure laguna."
     reset_password: