Merge branch 'master' into openid

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

diff --git a/config/locales/ia.yml b/config/locales/ia.yml
index 0f8de1fba5cce76620e62c86c012e86ef98eb7e2..0b878e574e3eb5a6b99fdb3577c6ac19ebfc7f64 100644 (file)
--- a/config/locales/ia.yml
+++ b/config/locales/ia.yml
@@ -341,7 +341,7 @@ ia:
     no_such_user: 
       body: Pardono, il non ha un usator con le nomine {{user}}. Verifica le orthographia, o pote esser que le ligamine que tu sequeva es incorrecte.
       heading: Le usator {{user}} non existe
-      title: Nulle tal usator
+      title: Iste usator non existe
     view: 
       leave_a_comment: Lassar un commento
       login: Aperir session
@@ -880,8 +880,9 @@ ia:
     export_tooltip: Exportar datos cartographic
     gps_traces: Tracias GPS
     gps_traces_tooltip: Gerer tracias GPS
-    help_wiki: Adjuta & Wiki
-    help_wiki_tooltip: Adjuta & sito Wiki pro le projecto
+    help: Adjuta
+    help_and_wiki: "{{help}} & {{wiki}}"
+    help_title: Sito de adjuta pro le projecto
     history: Historia
     home: initio
     home_tooltip: Ir al position de origine
@@ -922,6 +923,8 @@ ia:
     view_tooltip: Vider le carta
     welcome_user: Benvenite, {{user_link}}
     welcome_user_link_tooltip: Tu pagina de usator
+    wiki: Wiki
+    wiki_title: Sito wiki pro le projecto
   license_page: 
     foreign: 
       english_link: le original in anglese
@@ -1054,6 +1057,7 @@ ia:
     signup_confirm: 
       subject: "[OpenStreetMap] Confirma tu adresse de e-mail"
     signup_confirm_html: 
+      ask_questions: Tu pote poner qualcunque questiones super OpenStreetMap a nostre <a href="http://help.openstreetmap.org/">sito de questiones e responsas</a>.
       click_the_link: Si isto es tu, benvenite! Per favor clicca super le ligamine ci infra pro confirmar iste conto e continua a leger pro ulterior informationes super OpenStreetMap
       current_user: Un lista de usatores actual in categorias, a base de lor position geographic, es disponibile de <a href="http://wiki.openstreetmap.org/wiki/Category:Users_by_geographical_region">Category:Users_by_geographical_region</a>.
       get_reading: Informa te super OpenStreetMap per <a href="http://wiki.openstreetmap.org/wiki/Beginners%27_Guide">leger le wiki</a>, tene te al currente con le ultime novas via le <a href="http://blog.openstreetmap.org/">blog de OpenStreetMap</a> o con <a href="http://twitter.com/openstreetmap">Twitter</a>, o percurre le <a href="http://www.opengeodata.org/">blog OpenGeoData</a> del fundator de OpenStreetMap Steve Coast pro le historia compendiose del projecto, le qual include tamben <a href="http://www.opengeodata.org/?cat=13">podcasts a ascoltar</a>!
@@ -1066,6 +1070,7 @@ ia:
       video_to_openstreetmap: video de introduction a OpenStreetMap
       wiki_signup: Considera tamben <a href="http://wiki.openstreetmap.org/index.php?title=Special:Userlogin&type=signup&returnto=Main_Page">inscriber te al wiki de OpenStreetMap</a>.
     signup_confirm_plain: 
+      ask_questions: "Tu pote poner qualcunque questiones super OpenStreetMap a nostre sito de questiones e responsas:"
       blog_and_twitter: "Tene te al currente con le ultime novas al blog de OpenStreetMap o con Twitter:"
       click_the_link_1: Si isto es tu, benvenite! Per favor clicca super le ligamine ci infra pro confirmar tu
       click_the_link_2: conto. Continua a leger pro plus informationes a proposito de OpenStreetMap.
@@ -1107,7 +1112,7 @@ ia:
       allow_write_diary: crear entratas de diario, commentos e adder amicos.
       allow_write_gpx: incargar tracias GPS.
       allow_write_prefs: modificar su preferentias de usator.
-      callback_url: URL de reappello
+      callback_url: URL de retorno
       name: Nomine
       requests: "Requestar le sequente permissiones del usator:"
       required: Requirite
@@ -1280,7 +1285,7 @@ ia:
     no_such_user: 
       body: Pardono, il non ha un usator con le nomine {{user}}. Verifica le orthographia, o pote esser que le ligamine que tu sequeva es incorrecte.
       heading: Le usator {{user}} non existe
-      title: Nulle tal usator
+      title: Iste usator non existe
     offline: 
       heading: Immagazinage GPX foras de linea
       message: Le systema pro immagazinar e incargar files GPX es actualmente indisponibile.
@@ -1411,8 +1416,8 @@ ia:
       heading: Usatores
       hide: Celar usatores seligite
       showing: 
-        one: Presentation del pagina {{page}} ({{page}} de {{page}})
-        other: Presentation del pagina {{page}} ({{page}}-{{page}} de {{page}})
+        one: Presentation del pagina {{page}} ({{first_item}} de {{items}})
+        other: Presentation del pagina {{page}} ({{first_item}}-{{last_item}} de {{items}})
       summary: "{{name}} create ab {{ip_address}} le {{date}}"
       summary_no_ip: "{{name}} create le {{date}}"
       title: Usatores
@@ -1467,7 +1472,7 @@ ia:
     no_such_user: 
       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
+      title: Iste usator non existe
     popup: 
       friend: Amico
       nearby mapper: Cartographo vicin