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

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

diff --git a/config/locales/ia.yml b/config/locales/ia.yml
index 55f5ed3c31845218e3b18dfced61119463e31d0a..844165122f852ee1982441bc7b335a25516f10ca 100644 (file)
--- a/config/locales/ia.yml
+++ b/config/locales/ia.yml
@@ -441,7 +441,8 @@ ia:
       body: Pardono, il non ha un entrata de diario o commento con le ID %{id}. Verifica
         le orthographia, o pote esser que le ligamine que tu sequeva es incorrecte.
     diary_entry:
-      posted_by_html: Publicate per %{link_user} le %{created} in %{language_link}
+      posted_by_html: Publicate per %{link_user} le %{created} in %{language_link}.
+      updated_at_html: Ultime actualisation le %{updated}.
       comment_link: Commentar iste entrata
       reply_link: Inviar un message al autor
       comment_count:
@@ -712,8 +713,11 @@ ia:
           carpenter: Carpentero
           caterer: Catering
           confectionery: Confecteria
+          dressmaker: Modista
           electrician: Electricista
+          electronics_repair: Reparation de electronica
           gardener: Jardinero
+          glaziery: Vitreria
           painter: Pictor
           photographer: Photographo
           plumber: Plumbero
@@ -1348,32 +1352,18 @@ ia:
         supplementari pro adjutar te a comenciar.
     email_confirm:
       subject: '[OpenStreetMap] Confirma tu adresse de e-mail'
-    email_confirm_plain:
       greeting: Salute,
       hopefully_you: Alcuno (probabilemente tu) vole cambiar su adresse de e-mail
         in %{server_url} a %{new_address}.
       click_the_link: Si isto es tu, per favor clicca super le ligamine ci infra pro
         confirmar le alteration.
-    email_confirm_html:
-      greeting: Salute,
-      hopefully_you: Alcuno (sperabilemente tu) vole cambiar su adresse de e-mail
-        in %{server_url} a %{new_address}.
-      click_the_link: Si isto es tu, per favor clicca super le ligamine ci infra pro
-        confirmar le alteration.
     lost_password:
       subject: '[OpenStreetMap] Requesta de reinitialisation del contrasigno'
-    lost_password_plain:
       greeting: Salute,
       hopefully_you: Alcuno (probabilemente tu) ha demandate que le contrasigno del
         conto openstreetmap.org associate con iste adresse de e-mail sia reinitialisate.
       click_the_link: Si isto es tu, per favor clicca super le ligamine ci infra pro
         reinitialisar tu contrasigno.
-    lost_password_html:
-      greeting: Salute,
-      hopefully_you: Alcuno (possibilemente tu) ha demandate que le contrasigno del
-        conto openstreetmap.org associate con iste adresse de e-mail sia reinitialisate.
-      click_the_link: Si isto es tu, per favor clicca super le ligamine ci infra pro
-        reinitialisar tu contrasigno.
     note_comment_notification:
       anonymous: Un usator anonyme
       greeting: Salute,