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 9c925f6a3136b0a47585a1906b010efe3a5757c2..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
@@ -1327,25 +1331,16 @@ ia:
       had_added_you: '%{user} te ha addite como amico in OpenStreetMap.'
       see_their_profile: Tu pote vider su profilo a %{userurl}.
       befriend_them: Tu pote equalmente adder le/la como amico a %{befriendurl}.
-    gpx_notification:
-      greeting: Salute,
-      your_gpx_file: Il pare que tu file GPX
-      with_description: con le description
-      and_the_tags: 'e le sequente etiquettas:'
-      and_no_tags: e sin etiquettas.
-      failure:
-        subject: '[OpenStreetMap] Importation GPX fallite'
-        failed_to_import: 'ha fallite de importar. Ecce le error:'
-        more_info_1: Plus informationes super le fallimentos de importation GPX e
-          como evitar
-        more_info_2: 'los se trova a:'
-      success:
-        subject: '[OpenStreetMap] Importation GPX succedite'
-        loaded_successfully:
-          one: ha essite cargate con successo con %{trace_points} ex un maximo de
-            1 puncto.
-          other: ha essite cargate con successo con %{trace_points} ex un maximo de
-            %{possible_points} punctos.
+    gpx_failure:
+      failed_to_import: 'ha fallite de importar. Ecce le error:'
+      subject: '[OpenStreetMap] Importation GPX fallite'
+    gpx_success:
+      loaded_successfully:
+        one: ha essite cargate con successo con %{trace_points} ex un maximo de 1
+          puncto.
+        other: ha essite cargate con successo con %{trace_points} ex un maximo de
+          %{possible_points} punctos.
+      subject: '[OpenStreetMap] Importation GPX succedite'
     signup_confirm:
       subject: '[OpenStreetMap] Benvenite a OpenStreetMap'
       greeting: Bon die!
@@ -1357,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,