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

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

diff --git a/config/locales/ast.yml b/config/locales/ast.yml
index 550e71abb9420a051e608d4609f8abd9e8947edd..5dab9981a2c2bdd1760386908090e78bd06bd836 100644 (file)
--- a/config/locales/ast.yml
+++ b/config/locales/ast.yml
@@ -92,6 +92,29 @@ ast:
     remote:
       name: Control remotu
       description: Control remotu (JOSM o Merkaartor)
+  api:
+    notes:
+      comment:
+        opened_at_html: Creada hai %{when}
+        opened_at_by_html: Creada hai %{when} por %{user}
+        commented_at_html: Anovada hai %{when}
+        commented_at_by_html: Anovada hai %{when} por %{user}
+        closed_at_html: Resuelta hai %{when}
+        closed_at_by_html: Resuelta hai %{when} por %{user}
+        reopened_at_html: Reactivada hai %{when}
+        reopened_at_by_html: Reactivada hai %{when} por %{user}
+      rss:
+        title: Notes d'OpenStreetMap
+        description_area: Llista de notes, escrites, comentaes o zarraes en so área
+          [(%{min_lat}|%{min_lon}) -- (%{max_lat}|%{max_lon})]
+        description_item: Una canal rss pa la nota %{id}
+        opened: nota nueva (cerca de %{place})
+        commented: comentariu nuevu (cerca de %{place})
+        closed: nota zarrada (cerca de %{place})
+        reopened: nota reactivada (cerca de %{place})
+      entry:
+        comment: Comentariu
+        full: Nota completa
   browse:
     created: Creáu
     closed: Zarráu
@@ -2407,27 +2430,6 @@ ast:
       next: Siguiente »
       previous: « Anterior
   notes:
-    comment:
-      opened_at_html: Creada hai %{when}
-      opened_at_by_html: Creada hai %{when} por %{user}
-      commented_at_html: Anovada hai %{when}
-      commented_at_by_html: Anovada hai %{when} por %{user}
-      closed_at_html: Resuelta hai %{when}
-      closed_at_by_html: Resuelta hai %{when} por %{user}
-      reopened_at_html: Reactivada hai %{when}
-      reopened_at_by_html: Reactivada hai %{when} por %{user}
-    rss:
-      title: Notes d'OpenStreetMap
-      description_area: Llista de notes, escrites, comentaes o zarraes en so área
-        [(%{min_lat}|%{min_lon}) -- (%{max_lat}|%{max_lon})]
-      description_item: Una canal rss pa la nota %{id}
-      opened: nota nueva (cerca de %{place})
-      commented: comentariu nuevu (cerca de %{place})
-      closed: nota zarrada (cerca de %{place})
-      reopened: nota reactivada (cerca de %{place})
-    entry:
-      comment: Comentariu
-      full: Nota completa
     mine:
       title: Notes unviaes o comentaes por %{user}
       heading: notes de %{user}
@@ -2524,13 +2526,10 @@ ast:
     directions:
       ascend: Ascender
       engines:
+        fossgis_osrm_car: En coche (OSRM)
         graphhopper_bicycle: Bicicleta  (GraphHopper)
         graphhopper_car: En coche (GraphHopper)
         graphhopper_foot: A pie (GraphHopper)
-        mapquest_bicycle: Bicicleta (MapQuest)
-        mapquest_car: Coche (MapQuest)
-        mapquest_foot: A pie (MapQuest)
-        osrm_car: En coche (OSRM)
       descend: Descender
       directions: Indicaciones
       distance: Distancia