Merge remote-tracking branch 'upstream/pull/4584'

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

diff --git a/config/locales/ia.yml b/config/locales/ia.yml
index 714f6538009af7f6d4e8ed390af128456cd51ab9..b349832e88664fea2fc01494bb69f25fb161a506 100644 (file)
--- a/config/locales/ia.yml
+++ b/config/locales/ia.yml
@@ -323,12 +323,6 @@ ia:
     destroy:
       success: Conto delite.
   browse:
     destroy:
       success: Conto delite.
   browse:

-    created: Create a
-    closed: Claudite a
-    created_ago_html: Create %{time_ago}
-    closed_ago_html: Claudite %{time_ago}
-    created_ago_by_html: Create %{time_ago} per %{user}
-    closed_ago_by_html: Claudite %{time_ago} per %{user}

     deleted_ago_by_html: Delite %{time_ago} per %{user}
     edited_ago_by_html: Modificate %{time_ago} per %{user}
     version: Version
     deleted_ago_by_html: Delite %{time_ago} per %{user}
     edited_ago_by_html: Modificate %{time_ago} per %{user}
     version: Version


@@ -346,23 +340,6 @@ ia:
     view_history: Vider historia
     view_details: Vider detalios
     location: 'Loco:'
     view_history: Vider historia
     view_details: Vider detalios
     location: 'Loco:'

-    changeset:
-      title: 'Gruppo de modificationes: %{id}'
-      belongs_to: Autor
-      node: Nodos (%{count})
-      node_paginated: Nodos (%{x}-%{y} de %{count})
-      way: Vias (%{count})
-      way_paginated: Vias (%{x}-%{y} de %{count})
-      relation: Relationes (%{count})
-      relation_paginated: Relationes (%{x}-%{y} de %{count})
-      hidden_comment_by_html: Commento celate de %{user} %{time_ago}
-      comment_by_html: Commento de %{user} %{time_ago}
-      changesetxml: XML del gruppo de modificationes
-      osmchangexml: XML osmChange
-      join_discussion: Aperi session pro unir te al discussion
-      discussion: Discussion
-      still_open: Le gruppo de modificationes es ancora aperte. Le discussion se aperira
-        quando le gruppo de modificationes essera claudite.

     node:
       title_html: 'Nodo: %{name}'
       history_title_html: 'Historia del nodo: %{name}'
     node:
       title_html: 'Nodo: %{name}'
       history_title_html: 'Historia del nodo: %{name}'


@@ -480,6 +457,30 @@ ia:
       feed:
         title: Gruppo de modificationes %{id}
         title_comment: Gruppo de modificationes %{id} - %{comment}
       feed:
         title: Gruppo de modificationes %{id}
         title_comment: Gruppo de modificationes %{id} - %{comment}

+        created: Create a
+        closed: Claudite a
+        belongs_to: Autor
+    show:
+      title: 'Gruppo de modificationes: %{id}'
+      created_ago_html: Create %{time_ago}
+      closed_ago_html: Claudite %{time_ago}
+      created_ago_by_html: Create %{time_ago} per %{user}
+      closed_ago_by_html: Claudite %{time_ago} per %{user}
+      discussion: Discussion
+      join_discussion: Aperi session pro unir te al discussion
+      still_open: Le gruppo de modificationes es ancora aperte. Le discussion se aperira
+        quando le gruppo de modificationes essera claudite.
+      comment_by_html: Commento de %{user} %{time_ago}
+      hidden_comment_by_html: Commento celate de %{user} %{time_ago}
+      changesetxml: XML del gruppo de modificationes
+      osmchangexml: XML osmChange
+    paging_nav:
+      nodes: Nodos (%{count})
+      nodes_paginated: Nodos (%{x}-%{y} de %{count})
+      ways: Vias (%{count})
+      ways_paginated: Vias (%{x}-%{y} de %{count})
+      relations: Relationes (%{count})
+      relations_paginated: Relationes (%{x}-%{y} de %{count})

     timeout:
       sorry: Le lista de gruppos de modificationes que tu requestava tardava troppo
         de tempore pro esser recuperate.
     timeout:
       sorry: Le lista de gruppos de modificationes que tu requestava tardava troppo
         de tempore pro esser recuperate.


@@ -1734,10 +1735,10 @@ ia:
         %{url}.
       details_html: Plus detalios sur le gruppo de modificationes pote esser trovate
         a %{url}.
         %{url}.
       details_html: Plus detalios sur le gruppo de modificationes pote esser trovate
         a %{url}.

-      unsubscribe: Pro disabonar te del actualisationes de iste gruppo de modificationes,
-        visita %{url} e clicca sur "Disabonar".
-      unsubscribe_html: Pro disabonar te del actualisationes de iste gruppo de modificationes,
-        visita %{url} e clicca sur "Disabonar".
+      unsubscribe: Tu pote disabonar te del actualisationes de iste gruppo de modificationes
+        sur %{url}.
+      unsubscribe_html: Tu pote disabonar te del actualisationes de iste gruppo de
+        modificationes sur %{url}.

   confirmations:
     confirm:
       heading: Verifica tu e-mail!
   confirmations:
     confirm:
       heading: Verifica tu e-mail!


@@ -1854,10 +1855,6 @@ ia:
       new password button: Reinitialisar contrasigno
       help_text: Entra le adresse de e-mail que tu usava pro inscriber te, e nos te
         inviara un ligamine que tu pote usar pro reinitialisar tu contrasigno.
       new password button: Reinitialisar contrasigno
       help_text: Entra le adresse de e-mail que tu usava pro inscriber te, e nos te
         inviara un ligamine que tu pote usar pro reinitialisar tu contrasigno.

-    create:
-      notice email on way: Es infortunate que tu lo perdeva :-( ma nos te ha inviate
-        un e-mail que te permittera de reinitialisar lo.
-      notice email cannot find: Non poteva trovar iste adresse de e-mail, pardono.

     edit:
       title: Reinitialisar contrasigno
       heading: Reinitialisar le contrasigno de %{user}
     edit:
       title: Reinitialisar contrasigno
       heading: Reinitialisar le contrasigno de %{user}


@@ -2268,8 +2265,8 @@ ia:
         title: Guida pro comenciantes
         description: Guida pro comenciantes, mantenite per le communitate.
       community:
         title: Guida pro comenciantes
         description: Guida pro comenciantes, mantenite per le communitate.
       community:

-        title: Foro del communitate
-        description: Un sito commun de conversation sur OpenStreetMap.
+        title: Foro de assistentia e communitate
+        description: Un loco commun ubi cercar adjuta e conversar sur OpenStreetMap.

       mailing_lists:
         title: Listas de diffusion
         description: Pone un question o discute cosas interessante sur un varietate
       mailing_lists:
         title: Listas de diffusion
         description: Pone un question o discute cosas interessante sur un varietate