Fixed unused translation keys in diary_entries.*

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

diff --git a/config/locales/en.yml b/config/locales/en.yml
index 395cb3bf7e867c6ff817686940d25cd0815a0ada..28698fa522787766f63afbd153c8de37c7a5d489 100644 (file)
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -38,8 +38,6 @@ en:
   activerecord:
     errors:
       messages:
   activerecord:
     errors:
       messages:

-        invalid_email_address: does not appear to be a valid e-mail address
-        email_address_not_routable: is not routable

         display_name_is_user_n: can't be user_n unless n is your user id
       models:
         user_mute:
         display_name_is_user_n: can't be user_n unless n is your user id
       models:
         user_mute:


@@ -124,7 +122,7 @@ en:
         longitude: "Longitude"
         public: "Public"
         description: "Description"
         longitude: "Longitude"
         public: "Public"
         description: "Description"

-        gpx_file: Upload GPX File
+        gpx_file: Choose GPS Trace File

         visibility: Visibility
         tagstring: Tags
       message:
         visibility: Visibility
         tagstring: Tags
       message:


@@ -371,7 +369,7 @@ en:
         note: note
     timeout:
       title: Timeout Error
         note: note
     timeout:
       title: Timeout Error

-      sorry: "Sorry, the data for the %{type} with the id %{id}, took too long to retrieve."
+      sorry: "Sorry, the data for the %{type} with the id %{id} took too long to retrieve."

       type:
         node: node
         way: way
       type:
         node: node
         way: way


@@ -405,15 +403,30 @@ en:
       introduction: "Click on the map to find nearby features."
       nearby: "Nearby features"
       enclosing: "Enclosing features"
       introduction: "Click on the map to find nearby features."
       nearby: "Nearby features"
       enclosing: "Enclosing features"

+  nodes:
+    timeout:
+      sorry: "Sorry, the data for the node with the id %{id} took too long to retrieve."

   old_nodes:
     not_found:
       sorry: "Sorry, node #%{id} version %{version} could not be found."
   old_nodes:
     not_found:
       sorry: "Sorry, node #%{id} version %{version} could not be found."

+    timeout:
+      sorry: "Sorry, the history of the node with the id %{id} took too long to retrieve."
+  ways:
+    timeout:
+      sorry: "Sorry, the data for the way with the id %{id} took too long to retrieve."

   old_ways:
     not_found:
       sorry: "Sorry, way #%{id} version %{version} could not be found."
   old_ways:
     not_found:
       sorry: "Sorry, way #%{id} version %{version} could not be found."

+    timeout:
+      sorry: "Sorry, the history of the way with the id %{id} took too long to retrieve."
+  relations:
+    timeout:
+      sorry: "Sorry, the data for the relation with the id %{id} took too long to retrieve."

   old_relations:
     not_found:
       sorry: "Sorry, relation #%{id} version %{version} could not be found."
   old_relations:
     not_found:
       sorry: "Sorry, relation #%{id} version %{version} could not be found."

+    timeout:
+      sorry: "Sorry, the history of the relation with the id %{id} took too long to retrieve."

   changeset_comments:
     feeds:
       comment:
   changeset_comments:
     feeds:
       comment:


@@ -428,7 +441,6 @@ en:
         sorry: "Sorry, the list of changeset comments you requested took too long to retrieve."
   changesets:
     changeset:
         sorry: "Sorry, the list of changeset comments you requested took too long to retrieve."
   changesets:
     changeset:

-      anonymous: "Anonymous"

       no_edits: "(no edits)"
       view_changeset_details: "View changeset details"
     index:
       no_edits: "(no edits)"
       view_changeset_details: "View changeset details"
     index:


@@ -460,7 +472,6 @@ en:
       title: "Changeset %{id}"
       created_by_html: "Created by %{link_user} on %{created}."
     no_such_entry:
       title: "Changeset %{id}"
       created_by_html: "Created by %{link_user} on %{created}."
     no_such_entry:

-      title: "No such changeset"

       heading: "No entry with the id: %{id}"
       body: "Sorry, there is no changeset with the id %{id}. Please check your spelling, or maybe the link you clicked is wrong."
     show:
       heading: "No entry with the id: %{id}"
       body: "Sorry, there is no changeset with the id %{id}. Please check your spelling, or maybe the link you clicked is wrong."
     show:


@@ -569,8 +580,6 @@ en:
       report: Report this comment
     location:
       location: "Location:"
       report: Report this comment
     location:
       location: "Location:"

-      view: "View"
-      edit: "Edit"

       coordinates: "%{latitude}; %{longitude}"
     feed:
       user:
       coordinates: "%{latitude}; %{longitude}"
     feed:
       user:


@@ -1436,10 +1445,6 @@ en:
         level9: "Village Boundary"
         level10: "Suburb Boundary"
         level11: "Neighbourhood Boundary"
         level9: "Village Boundary"
         level10: "Suburb Boundary"
         level11: "Neighbourhood Boundary"

-      types:
-        cities: Cities
-        towns: Towns
-        places: Places

     results:
       no_results: "No results found"
       more_results: "More results"
     results:
       no_results: "No results found"
       more_results: "More results"


@@ -1608,13 +1613,13 @@ en:
       befriend_them: "You can also add them as a friend at %{befriendurl}."
       befriend_them_html: "You can also add them as a friend at %{befriendurl}."
     gpx_description:
       befriend_them: "You can also add them as a friend at %{befriendurl}."
       befriend_them_html: "You can also add them as a friend at %{befriendurl}."
     gpx_description:

-      description_with_tags: "It looks like your GPX file %{trace_name} with the description %{trace_description} and the following tags: %{tags}"
-      description_with_tags_html: "It looks like your GPX file %{trace_name} with the description %{trace_description} and the following tags: %{tags}"
-      description_with_no_tags: "It looks like your GPX file %{trace_name} with the description %{trace_description} and no tags"
-      description_with_no_tags_html: "It looks like your GPX file %{trace_name} with the description %{trace_description} and no tags"
+      description_with_tags: "It looks like your file %{trace_name} with the description %{trace_description} and the following tags: %{tags}"
+      description_with_tags_html: "It looks like your file %{trace_name} with the description %{trace_description} and the following tags: %{tags}"
+      description_with_no_tags: "It looks like your file %{trace_name} with the description %{trace_description} and no tags"
+      description_with_no_tags_html: "It looks like your file %{trace_name} with the description %{trace_description} and no tags"

     gpx_failure:
       hi: "Hi %{to_user},"
     gpx_failure:
       hi: "Hi %{to_user},"

-      failed_to_import: "failed to import. Here is the error:"
+      failed_to_import: "failed to be imported as a GPS trace file. Please verify that your file is a valid GPX file or an archive containing GPX file(s) in the supported format (.tar.gz, .tar.bz2, .tar, .zip, .gpx.gz, .gpx.bz2). Could there be a format or syntax issue with your file? Here is the importing error:"

       more_info: "More information about GPX import failures and how to avoid them can be found at %{url}."
       more_info_html: "More information about GPX import failures and how to avoid them can be found at %{url}."
       import_failures_url: "https://wiki.openstreetmap.org/wiki/GPX_Import_Failures"
       more_info: "More information about GPX import failures and how to avoid them can be found at %{url}."
       more_info_html: "More information about GPX import failures and how to avoid them can be found at %{url}."
       import_failures_url: "https://wiki.openstreetmap.org/wiki/GPX_Import_Failures"


@@ -1674,7 +1679,6 @@ en:
     changeset_comment_notification:
       description: "OpenStreetMap Changeset #%{id}"
       hi: "Hi %{to_user},"
     changeset_comment_notification:
       description: "OpenStreetMap Changeset #%{id}"
       hi: "Hi %{to_user},"

-      greeting: "Hi,"

       commented:
         subject_own: "[OpenStreetMap] %{commenter} has commented on one of your changesets"
         subject_other: "[OpenStreetMap] %{commenter} has commented on a changeset you are interested in"
       commented:
         subject_own: "[OpenStreetMap] %{commenter} has commented on one of your changesets"
         subject_other: "[OpenStreetMap] %{commenter} has commented on a changeset you are interested in"


@@ -2375,6 +2379,9 @@ en:
           hospital: "Hospital"
           building: "Significant building"
           station: "Railway station"
           hospital: "Hospital"
           building: "Significant building"
           station: "Railway station"

+          railway_halt: "Railway halt"
+          subway_station: "Subway station"
+          tram_stop: "Tram stop"

           summit: "Summit"
           peak: "Peak"
           tunnel: "Dashed casing = tunnel"
           summit: "Summit"
           peak: "Peak"
           tunnel: "Dashed casing = tunnel"


@@ -2383,7 +2390,6 @@ en:
           destination: "Destination access"
           construction: "Roads under construction"
           bus_stop: "Bus stop"
           destination: "Destination access"
           construction: "Roads under construction"
           bus_stop: "Bus stop"

-          stop: "Stop"

           bicycle_shop: "Bicycle shop"
           bicycle_rental: "Bicycle rental"
           bicycle_parking: "Bicycle parking"
           bicycle_shop: "Bicycle shop"
           bicycle_rental: "Bicycle rental"
           bicycle_parking: "Bicycle parking"


@@ -2684,7 +2690,6 @@ en:
         contributor_terms_url: "https://wiki.osmfoundation.org/wiki/Licence/Contributor_Terms"
         contributor_terms: "contributor terms"
       tou: "terms of use"
         contributor_terms_url: "https://wiki.osmfoundation.org/wiki/Licence/Contributor_Terms"
         contributor_terms: "contributor terms"
       tou: "terms of use"

-      external auth: "Third Party Authentication:"

       continue: Sign Up
       terms accepted: "Thanks for accepting the new contributor terms!"
       email_help:
       continue: Sign Up
       terms accepted: "Thanks for accepting the new contributor terms!"
       email_help:


@@ -2833,15 +2838,9 @@ en:
       doesnt_have_role: "The user does not have role %{role}."
       not_revoke_admin_current_user: "Cannot revoke administrator role from current user."
     grant:
       doesnt_have_role: "The user does not have role %{role}."
       not_revoke_admin_current_user: "Cannot revoke administrator role from current user."
     grant:

-      title: Confirm role granting
-      heading: Confirm role granting

       are_you_sure: "Are you sure you want to grant the role `%{role}' to the user `%{name}'?"
       are_you_sure: "Are you sure you want to grant the role `%{role}' to the user `%{name}'?"

-      confirm: "Confirm"

     revoke:
     revoke:

-      title: Confirm role revoking
-      heading: Confirm role revoking

       are_you_sure: "Are you sure you want to revoke the role `%{role}' from the user `%{name}'?"
       are_you_sure: "Are you sure you want to revoke the role `%{role}' from the user `%{name}'?"

-      confirm: "Confirm"

   user_blocks:
     model:
       non_moderator_update: "Must be a moderator to create or update a block."
   user_blocks:
     model:
       non_moderator_update: "Must be a moderator to create or update a block."


@@ -2927,7 +2926,7 @@ en:
       not_revoked: "(not revoked)"
       show: "Show"
       edit: "Edit"
       not_revoked: "(not revoked)"
       show: "Show"
       edit: "Edit"

-    blocks:
+    page:

       display_name: "Blocked User"
       creator_name: "Creator"
       reason: "Reason for block"
       display_name: "Blocked User"
       creator_name: "Creator"
       reason: "Reason for block"