X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/73c95847a6680bea7f35fe5b3da6eb4e52757b9c..a8c63724f64ef47e94ed739193314161bbdf9e1b:/config/locales/en.yml

diff --git a/config/locales/en.yml b/config/locales/en.yml
index 173fc158e..1ee3f2378 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -42,6 +42,7 @@ en:
       diary_comment: "Diary Comment"
       diary_entry: "Diary Entry"
       friend: "Friend"
+      issue: "Issue"
       language: "Language"
       message: "Message"
       node: "Node"
@@ -58,6 +59,7 @@ en:
       relation: "Relation"
       relation_member: "Relation Member"
       relation_tag: "Relation Tag"
+      report: "Report"
       session: "Session"
       trace: "Trace"
       tracepoint: "Trace Point"
@@ -160,6 +162,15 @@ en:
     remote:
       name: "Remote Control"
       description: "Remote Control (JOSM or Merkaartor)"
+  auth:
+    providers:
+      none: None
+      openid: OpenID
+      google: Google
+      facebook: Facebook
+      windowslive: Windows Live
+      github: GitHub
+      wikipedia: Wikipedia
   api:
     notes:
       comment:
@@ -362,6 +373,7 @@ en:
       in_language_title: "Diary Entries in %{language}"
       new: New Diary Entry
       new_title: Compose a new entry in my user diary
+      my_diary: My Diary
       no_entries: No diary entries
       recent_entries: "Recent diary entries"
       older_entries: Older Entries
@@ -1199,7 +1211,9 @@ en:
         import_failures_url: "https://wiki.openstreetmap.org/wiki/GPX_Import_Failures"
       success:
         subject: "[OpenStreetMap] GPX Import success"
-        loaded_successfully: loaded successfully with %{trace_points} out of a possible %{possible_points} points.
+        loaded_successfully:
+          one: loaded successfully with %{trace_points} out of a possible 1 point.
+          other: loaded successfully with %{trace_points} out of a possible %{possible_points} points.
     signup_confirm:
       subject: "[OpenStreetMap] Welcome to OpenStreetMap"
       greeting: "Hi there!"
@@ -2472,9 +2486,12 @@ en:
         out: Zoom Out
       locate:
         title: Show My Location
-        metersUnit: meters
-        feetUnit: feet
-        popup: You are within {distance} {unit} of this point
+        metersPopup:
+          one: You are within one meter of this point
+          other: You are within %{count} meters of this point
+        feetPopup:
+          one: You are within one foot of this point
+          other: You are within %{count} feet of this point
       base:
         standard: Standard
         cycle_map: Cycle Map
@@ -2490,6 +2507,8 @@ en:
       copyright: "© <a href='%{copyright_url}'>OpenStreetMap contributors</a>"
       donate_link_text: "<a class='donate-attr' href='%{donate_url}'>Make a Donation</a>"
       terms: "<a href='%{terms_url}' target='_blank'>Website and API terms</a>"
+      thunderforest: "Tiles courtesy of <a href='%{thunderforest_url}' target='_blank'>Andy Allan</a>"
+      hotosm: "Tiles style by <a href='%{hotosm_url}' target='_blank'>Humanitarian OpenStreetMap Team</a> hosted by <a href='%{osmfrance_url}' target='_blank'>OpenStreetMap France</a>"
     site:
       edit_tooltip: Edit the map
       edit_disabled_tooltip: Zoom in to edit the map