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

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

diff --git a/config/locales/ast.yml b/config/locales/ast.yml
index 7bd5834046f2544e2523d9b32fbf9c3d4ac7b85c..e08f22a7ff441da0d8944912128ac4c989c673e0 100644 (file)
--- a/config/locales/ast.yml
+++ b/config/locales/ast.yml
@@ -1,6 +1,7 @@
 # Messages for Asturian (asturianu)
 # Exported from translatewiki.net
 # Export driver: phpyaml
+# Author: Amire80
 # Author: Danieldegroot2
 # Author: Enolp
 # Author: Fitoschido
@@ -285,7 +286,7 @@ ast:
       relation: Rellaciones (%{count})
       relation_paginated: Rellaciones (%{x}-%{y} de %{count})
       comment: Comentarios (%{count})
-      hidden_commented_by_html: Comentariu tapecíu de %{user} <abbr title='%{exact_time}'>%{when}</abbr>
+      hidden_commented_by_html: Comentariu anubríu de %{user} <abbr title='%{exact_time}'>%{when}</abbr>
       commented_by_html: Comentariu de %{user} <abbr title='%{exact_time}'>%{when}</abbr>
       changesetxml: Conxuntu de cambeos XML
       osmchangexml: osmChange XML
@@ -780,7 +781,6 @@ ast:
           commercial: Área de negocios
           conservation: Conservación
           construction: Construcción
-          farm: Granxa
           farmland: Tierra de llabranza
           farmyard: Antoxana
           forest: Área forestal
@@ -1485,7 +1485,7 @@ ast:
       image: Imaxe
       gravatar:
         gravatar: Usar Gravatar
-        link: http://wiki.openstreetmap.org/wiki/Gravatar
+        link: https://wiki.openstreetmap.org/wiki/Gravatar
         disabled: Desactivóse Gravatar.
         enabled: Activóse la vista del to Gravatar.
       new image: Amestar una imaxe
@@ -2056,7 +2056,6 @@ ast:
       in: en
     index:
       public_traces: Traces GPS públiques
-      my_traces: Les mios traces GPS
       public_traces_from: Traces GPS públiques de %{user}
       description: Ver les xubes más nueves de traces GPS
       tagged_with: ' etiquetaes con %{tags}'
@@ -2064,6 +2063,7 @@ ast:
         traza</a> o depriende más tocante a cómo trazar col GPS na <a href='https://wiki.openstreetmap.org/wiki/Beginners_Guide_1.2'>páxina
         de la wiki</a>.
       upload_trace: Xubir una traza
+      my_traces: Les mios traces GPS
     destroy:
       scheduled_for_deletion: Traza marcada pa desaniciar
     make_public: