X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/85f4441311e5c18b1cebf082da72b2aa73bd337d..c599f2bfafac868eaf61709fb99f5bad92e0e7a5:/config/locales/en.yml

diff --git a/config/locales/en.yml b/config/locales/en.yml
index 0d52e59a7..b1752834b 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -10,7 +10,7 @@ en:
       prompt: Choose file
     submit:
       diary_comment:
-        create: Save
+        create: Comment
       diary_entry:
         create: "Publish"
         update: "Update"
@@ -21,7 +21,7 @@ en:
       client_application:
         create: Register
         update: Update
-      doorkeeper_application:
+      oauth2_application:
         create: Register
         update: Update
       redaction:
@@ -95,9 +95,10 @@ en:
       diary_entry:
         user: "User"
         title: "Subject"
+        body: "Body"
         latitude: "Latitude"
         longitude: "Longitude"
-        language: "Language"
+        language_code: "Language"
       doorkeeper/application:
         name: Name
         redirect_uri: Redirect URIs
@@ -572,6 +573,21 @@ en:
       applications:
         create:
           notice: Application Registered.
+  errors:
+    contact:
+      contact_url: https://wiki.openstreetmap.org/wiki/Contact
+      contact_url_title: Various contact channels explained
+      contact: contact
+      contact_the_community_html: Feel free to %{contact_link} the OpenStreetMap community if you have found a broken link / bug. Make a note of the exact URL of your request.
+    forbidden:
+      title: Forbidden
+      description: The operation you requested on the OpenStreetMap server is only available to administrators (HTTP 403)
+    internal_server_error:
+      title: Application error
+      description: The OpenStreetMap server encountered an unexpected condition that prevented it from fulfilling the request (HTTP 500)
+    not_found:
+      title: File not found
+      description: Couldn't find a file/directory/API operation by that name on the OpenStreetMap server (HTTP 404)
   friendships:
     make_friend:
       heading: "Add %{user} as a friend?"
@@ -589,11 +605,8 @@ en:
     search:
       title:
         latlon_html: 'Results from <a href="https://openstreetmap.org/">Internal</a>'
-        ca_postcode_html: 'Results from <a href="https://geocoder.ca/">Geocoder.CA</a>'
         osm_nominatim_html: 'Results from <a href="https://nominatim.openstreetmap.org/">OpenStreetMap Nominatim</a>'
-        geonames_html: 'Results from <a href="http://www.geonames.org/">GeoNames</a>'
         osm_nominatim_reverse_html: 'Results from <a href="https://nominatim.openstreetmap.org/">OpenStreetMap Nominatim</a>'
-        geonames_reverse_html: 'Results from <a href="http://www.geonames.org/">GeoNames</a>'
     search_osm_nominatim:
       prefix_format: "%{name}"
       prefix:
@@ -2927,9 +2940,14 @@ en:
         graphhopper_bicycle: "Bicycle (GraphHopper)"
         graphhopper_car: "Car (GraphHopper)"
         graphhopper_foot: "Foot (GraphHopper)"
+        fossgis_valhalla_bicycle: "Bicycle (Valhalla)"
+        fossgis_valhalla_car: "Car (Valhalla)"
+        fossgis_valhalla_foot: "Foot (Valhalla)"
       descend: "Descend"
       directions: "Directions"
       distance: "Distance"
+      distance_m: "%{distance}m"
+      distance_km: "%{distance}km"
       errors:
         no_route: "Couldn't find a route between those two places."
         no_place: "Sorry - couldn't locate '%{place}'."