Merge branch 'master' into terms

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

diff --git a/config/locales/eu.yml b/config/locales/eu.yml
index 1a6dad4b21d18cd022fea7865863ada093778212..62213b5892fb190093e407c609a3f721fa339080 100644 (file)
--- a/config/locales/eu.yml
+++ b/config/locales/eu.yml
@@ -697,9 +697,6 @@ eu:
       heading: Pasahitza ahaztuta?
       new password button: Pasahitza berrezarri
       title: Ahaztutako pasahitza
-    map: 
-      nearby mapper: "Hurbileko mapeatzaileak: [[nearby_user]]"
-      your location: Zure kokapena
     new: 
       confirm email address: "Eposta Helbidea baieztatu:"
       confirm password: "Pasahitza berretsi:"
@@ -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: