Merge branch 'master' into openID

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

diff --git a/config/locales/ia.yml b/config/locales/ia.yml
index 6cb88d1e790b8a7ceb5cdeaa73cf545fd946db2c..b7ffd96ee75383b864ca8cff1506eb8b4bf5c2da 100644 (file)
--- a/config/locales/ia.yml
+++ b/config/locales/ia.yml
@@ -1256,6 +1256,10 @@ ia:
       please login: Per favor aperi un session o {{create_user_link}}.
       remember: "Memorar me:"
       title: Aperir session
       please login: Per favor aperi un session o {{create_user_link}}.
       remember: "Memorar me:"
       title: Aperir session

+    logout: 
+      heading: Clauder le session de OpenStreetMap
+      logout_button: Clauder session
+      title: Clauder session

     lost_password: 
       email address: "Adresse de e-mail:"
       heading: Contrasigno oblidate?
     lost_password: 
       email address: "Adresse de e-mail:"
       heading: Contrasigno oblidate?


@@ -1268,10 +1272,6 @@ ia:
       already_a_friend: Tu es ja amico de {{name}}.
       failed: Pardono, non poteva adder {{name}} como amico.
       success: "{{name}} es ora tu amico."
       already_a_friend: Tu es ja amico de {{name}}.
       failed: Pardono, non poteva adder {{name}} como amico.
       success: "{{name}} es ora tu amico."

-    map: 
-      friend: "Amico: [[friend_user]]"
-      nearby mapper: "Cartographo vicin: [[nearby_user]]"
-      your location: Tu position

     new: 
       confirm email address: "Confirmar adresse de e-mail:"
       confirm password: "Confirmar contrasigno:"
     new: 
       confirm email address: "Confirmar adresse de e-mail:"
       confirm password: "Confirmar contrasigno:"


@@ -1292,6 +1292,10 @@ ia:
       body: Non existe un usator con le nomine {{user}}. Per favor verifica le orthographia, o pote esser que le ligamine que tu sequeva es incorrecte.
       heading: Le usator {{user}} non existe
       title: Nulle tal usator
       body: Non existe un usator con le nomine {{user}}. Per favor verifica le orthographia, o pote esser que le ligamine que tu sequeva es incorrecte.
       heading: Le usator {{user}} non existe
       title: Nulle tal usator

+    popup: 
+      friend: Amico
+      nearby mapper: Cartographo vicin
+      your location: Tu position

     remove_friend: 
       not_a_friend: "{{name}} non es un de tu amicos."
       success: "{{name}} ha essite removite de tu amicos."
     remove_friend: 
       not_a_friend: "{{name}} non es un de tu amicos."
       success: "{{name}} ha essite removite de tu amicos."