Move changeset show action to changesets controller

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

diff --git a/config/locales/en.yml b/config/locales/en.yml
index 25cb6c21e5cb473ee064b31503ca52242a8ab6e3..616e350d3056a877107d156c5b7eec163cd3ad95 100644 (file)
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -40,6 +40,7 @@ en:
       messages:
         invalid_email_address: does not appear to be a valid e-mail address
         email_address_not_routable: is not routable
       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:
           attributes:
       models:
         user_mute:
           attributes:


@@ -203,9 +204,9 @@ en:
         one: "%{count} year ago"
         other: "%{count} years ago"
   printable_name:
         one: "%{count} year ago"
         other: "%{count} years ago"
   printable_name:

-    with_id: "%{id}"
-    with_version: "%{id}, v%{version}"
+    version: "v%{version}"

     with_name_html: "%{name} (%{id})"
     with_name_html: "%{name} (%{id})"

+    current_and_old_links_html: "%{current_link}, %{old_link}"

   editor:
     default: "Default (currently %{name})"
     id:
   editor:
     default: "Default (currently %{name})"
     id:


@@ -333,7 +334,6 @@ en:
     common_details:
       coordinates_html: "%{latitude}, %{longitude}"
     changeset:
     common_details:
       coordinates_html: "%{latitude}, %{longitude}"
     changeset:

-      title: "Changeset: %{id}"

       belongs_to: "Author"
       node: "Nodes (%{count})"
       node_paginated: "Nodes (%{x}-%{y} of %{count})"
       belongs_to: "Author"
       node: "Nodes (%{count})"
       node_paginated: "Nodes (%{x}-%{y} of %{count})"


@@ -341,17 +341,6 @@ en:
       way_paginated: "Ways (%{x}-%{y} of %{count})"
       relation: "Relations (%{count})"
       relation_paginated: "Relations (%{x}-%{y} of %{count})"
       way_paginated: "Ways (%{x}-%{y} of %{count})"
       relation: "Relations (%{count})"
       relation_paginated: "Relations (%{x}-%{y} of %{count})"

-      comment: "Comments (%{count})"
-      hidden_comment_by_html: "Hidden comment from %{user} %{time_ago}"
-      comment_by_html: "Comment from %{user} %{time_ago}"
-      changesetxml: "Changeset XML"
-      osmchangexml: "osmChange XML"
-      feed:
-        title: "Changeset %{id}"
-        title_comment: "Changeset %{id} - %{comment}"
-      join_discussion: "Log in to join the discussion"
-      discussion: Discussion
-      still_open: "Changeset still open - discussion will open once the changeset is closed."

     node:
       title_html: "Node: %{name}"
       history_title_html: "Node History: %{name}"
     node:
       title_html: "Node: %{name}"
       history_title_html: "Node History: %{name}"


@@ -427,6 +416,15 @@ 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"

+  old_nodes:
+    not_found:
+      sorry: "Sorry, node #%{id} version %{version} could not be found."
+  old_ways:
+    not_found:
+      sorry: "Sorry, way #%{id} version %{version} could not be found."
+  old_relations:
+    not_found:
+      sorry: "Sorry, relation #%{id} version %{version} could not be found."

   changesets:
     changeset_paging_nav:
       showing_page: "Page %{page}"
   changesets:
     changeset_paging_nav:
       showing_page: "Page %{page}"


@@ -455,6 +453,31 @@ en:
       no_more_area: "No more changesets in this area."
       no_more_user: "No more changesets by this user."
       load_more: "Load more"
       no_more_area: "No more changesets in this area."
       no_more_user: "No more changesets by this user."
       load_more: "Load more"

+      feed:
+        title: "Changeset %{id}"
+        title_comment: "Changeset %{id} - %{comment}"
+    subscribe:
+      heading: Subscribe to the following changeset discussion?
+      button: Subscribe to discussion
+    unsubscribe:
+      heading: Unsubscribe from the following changeset discussion?
+      button: Unsubscribe from discussion
+    heading:
+      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:
+      title: "Changeset: %{id}"
+      discussion: Discussion
+      join_discussion: "Log in to join the discussion"
+      still_open: "Changeset still open - discussion will open once the changeset is closed."
+      comment_by_html: "Comment from %{user} %{time_ago}"
+      hidden_comment_by_html: "Hidden comment from %{user} %{time_ago}"
+      changesetxml: "Changeset XML"
+      osmchangexml: "osmChange XML"

     timeout:
       sorry: "Sorry, the list of changesets you requested took too long to retrieve."
   changeset_comments:
     timeout:
       sorry: "Sorry, the list of changesets you requested took too long to retrieve."
   changeset_comments:


@@ -514,6 +537,7 @@ en:
     show:
       title: "%{user}'s Diary | %{title}"
       user_title: "%{user}'s Diary"
     show:
       title: "%{user}'s Diary | %{title}"
       user_title: "%{user}'s Diary"

+      discussion: "Discussion"

       leave_a_comment: "Leave a comment"
       login_to_leave_a_comment_html: "%{login_link} to leave a comment"
       login: "Login"
       leave_a_comment: "Leave a comment"
       login_to_leave_a_comment_html: "%{login_link} to leave a comment"
       login: "Login"


@@ -566,6 +590,12 @@ en:
       comment: Comment
       newer_comments: "Newer Comments"
       older_comments: "Older Comments"
       comment: Comment
       newer_comments: "Newer Comments"
       older_comments: "Older Comments"

+    subscribe:
+      heading: Subscribe to the following diary entry discussion?
+      button: Subscribe to discussion
+    unsubscribe:
+      heading: Unsubscribe from the following diary entry discussion?
+      button: Unsubscribe from discussion

   doorkeeper:
     errors:
       messages:
   doorkeeper:
     errors:
       messages:


@@ -1439,9 +1469,9 @@ en:
         one: "%{count} report"
         other: "%{count} reports"
       no_reports: No reports
         one: "%{count} report"
         other: "%{count} reports"
       no_reports: No reports

-      report_created_at: "First reported at %{datetime}"
-      last_resolved_at: "Last resolved at %{datetime}"
-      last_updated_at: "Last updated at %{datetime} by %{displayname}"
+      report_created_at_html: "First reported at %{datetime}"
+      last_resolved_at_html: "Last resolved at %{datetime}"
+      last_updated_at_html: "Last updated at %{datetime} by %{displayname}"

       resolve: Resolve
       ignore: Ignore
       reopen: Reopen
       resolve: Resolve
       ignore: Ignore
       reopen: Reopen


@@ -1555,12 +1585,15 @@ en:
     more: More
   user_mailer:
     diary_comment_notification:
     more: More
   user_mailer:
     diary_comment_notification:

+      description: "OpenStreetMap Diary Entry #%{id}"

       subject: "[OpenStreetMap] %{user} commented on a diary entry"
       hi: "Hi %{to_user},"
       header: "%{from_user} has commented on the OpenStreetMap diary entry with the subject %{subject}:"
       header_html: "%{from_user} has commented on the OpenStreetMap diary entry with the subject %{subject}:"
       footer: "You can also read the comment at %{readurl} and you can comment at %{commenturl} or send a message to the author at %{replyurl}"
       footer_html: "You can also read the comment at %{readurl} and you can comment at %{commenturl} or send a message to the author at %{replyurl}"
       subject: "[OpenStreetMap] %{user} commented on a diary entry"
       hi: "Hi %{to_user},"
       header: "%{from_user} has commented on the OpenStreetMap diary entry with the subject %{subject}:"
       header_html: "%{from_user} has commented on the OpenStreetMap diary entry with the subject %{subject}:"
       footer: "You can also read the comment at %{readurl} and you can comment at %{commenturl} or send a message to the author at %{replyurl}"
       footer_html: "You can also read the comment at %{readurl} and you can comment at %{commenturl} or send a message to the author at %{replyurl}"

+      footer_unsubscribe: "You can unsubscribe from the discussion at %{unsubscribeurl}"
+      footer_unsubscribe_html: "You can unsubscribe from the discussion at %{unsubscribeurl}"

     message_notification:
       subject: "[OpenStreetMap] %{message_title}"
       hi: "Hi %{to_user},"
     message_notification:
       subject: "[OpenStreetMap] %{message_title}"
       hi: "Hi %{to_user},"


@@ -1590,6 +1623,7 @@ en:
       loaded:
         one: "loaded successfully with %{trace_points} out of a possible %{count} point."
         other: "loaded successfully with %{trace_points} out of a possible %{count} points."
       loaded:
         one: "loaded successfully with %{trace_points} out of a possible %{count} point."
         other: "loaded successfully with %{trace_points} out of a possible %{count} points."

+      all_your_traces_html: "All your successfully uploaded GPX traces can be found at %{url}."

       subject: "[OpenStreetMap] GPX Import success"
     signup_confirm:
       subject: "[OpenStreetMap] Welcome to OpenStreetMap"
       subject: "[OpenStreetMap] GPX Import success"
     signup_confirm:
       subject: "[OpenStreetMap] Welcome to OpenStreetMap"


@@ -1608,6 +1642,7 @@ en:
       hopefully_you: "Someone (possibly you) has asked for the password to be reset on this email address's openstreetmap.org account."
       click_the_link: "If this is you, please click the link below to reset your password."
     note_comment_notification:
       hopefully_you: "Someone (possibly you) has asked for the password to be reset on this email address's openstreetmap.org account."
       click_the_link: "If this is you, please click the link below to reset your password."
     note_comment_notification:

+      description: "OpenStreetMap Note #%{id}"

       anonymous: An anonymous user
       greeting: "Hi,"
       commented:
       anonymous: An anonymous user
       greeting: "Hi,"
       commented:


@@ -1634,6 +1669,7 @@ en:
       details: "More details about the note can be found at %{url}."
       details_html: "More details about the note can be found at %{url}."
     changeset_comment_notification:
       details: "More details about the note can be found at %{url}."
       details_html: "More details about the note can be found at %{url}."
     changeset_comment_notification:

+      description: "OpenStreetMap Changeset #%{id}"

       hi: "Hi %{to_user},"
       greeting: "Hi,"
       commented:
       hi: "Hi %{to_user},"
       greeting: "Hi,"
       commented:


@@ -1648,8 +1684,8 @@ en:
         partial_changeset_without_comment: "without comment"
       details: "More details about the changeset can be found at %{url}."
       details_html: "More details about the changeset can be found at %{url}."
         partial_changeset_without_comment: "without comment"
       details: "More details about the changeset can be found at %{url}."
       details_html: "More details about the changeset can be found at %{url}."

-      unsubscribe: 'To unsubscribe from updates to this changeset, visit %{url} and click "Unsubscribe".'
-      unsubscribe_html: 'To unsubscribe from updates to this changeset, visit %{url} and click "Unsubscribe".'
+      unsubscribe: "You can unsubscribe from updates to this changeset at %{url}."
+      unsubscribe_html: "You can unsubscribe from updates to this changeset at %{url}."

   confirmations:
     confirm:
       heading: Check your email!
   confirmations:
     confirm:
       heading: Check your email!


@@ -1751,7 +1787,7 @@ en:
     new:
       title: "Lost password"
       heading: "Forgotten Password?"
     new:
       title: "Lost password"
       heading: "Forgotten Password?"

-      email address: "Email Address:"
+      email address: "Email Address"

       new password button: "Reset password"
       help_text: "Enter the email address you used to sign up, we will send a link to it that you can use to reset your password."
     create:
       new password button: "Reset password"
       help_text: "Enter the email address you used to sign up, we will send a link to it that you can use to reset your password."
     create:


@@ -1809,9 +1845,9 @@ en:
     new:
       title: "Login"
       heading: "Login"
     new:
       title: "Login"
       heading: "Login"

-      email or username: "Email Address or Username:"
-      password: "Password:"
-      openid_html: "%{logo} OpenID:"
+      email or username: "Email Address or Username"
+      password: "Password"
+      openid_html: "%{logo} OpenID"

       remember: "Remember me"
       lost password link: "Lost your password?"
       login_button: "Login"
       remember: "Remember me"
       lost password link: "Lost your password?"
       login_button: "Login"


@@ -2161,12 +2197,7 @@ en:
       no_iframe_support: "Your browser doesn't support HTML iframes, which are necessary for this feature."
     export:
       title: "Export"
       no_iframe_support: "Your browser doesn't support HTML iframes, which are necessary for this feature."
     export:
       title: "Export"

-      area_to_export: "Area to Export"

       manually_select: "Manually select a different area"
       manually_select: "Manually select a different area"

-      format_to_export: "Format to Export"
-      osm_xml_data: "OpenStreetMap XML Data"
-      map_image: "Map Image (shows standard layer)"
-      embeddable_html: "Embeddable HTML"

       licence: "Licence"
       licence_details_html: OpenStreetMap data is licensed under the %{odbl_link} (ODbL).
       odbl: Open Data Commons Open Database License
       licence: "Licence"
       licence_details_html: OpenStreetMap data is licensed under the %{odbl_link} (ODbL).
       odbl: Open Data Commons Open Database License


@@ -2186,17 +2217,6 @@ en:
         other:
           title: "Other Sources"
           description: "Additional sources listed on the OpenStreetMap Wiki"
         other:
           title: "Other Sources"
           description: "Additional sources listed on the OpenStreetMap Wiki"

-      options: "Options"
-      format: "Format"
-      scale: "Scale"
-      max: "max"
-      image_size: "Image Size"
-      zoom: "Zoom"
-      add_marker: "Add a marker to the map"
-      latitude: "Lat:"
-      longitude: "Lon:"
-      output: "Output"
-      paste_html: "Paste HTML to embed in website"

       export_button: "Export"
     fixthemap:
       title: Report a problem / Fix the map
       export_button: "Export"
     fixthemap:
       title: Report a problem / Fix the map


@@ -2233,18 +2253,14 @@ en:
         url: https://wiki.openstreetmap.org/wiki/Beginners%27_guide
         title: Beginners' Guide
         description: Community maintained guide for beginners.
         url: https://wiki.openstreetmap.org/wiki/Beginners%27_guide
         title: Beginners' Guide
         description: Community maintained guide for beginners.

-      help:
-        url: https://help.openstreetmap.org/
-        title: Help Forum
-        description: Ask a question or look up answers on OpenStreetMap's question-and-answer site.
+      community:
+        url: https://community.openstreetmap.org/
+        title: Help & Community Forum
+        description: A shared place for to seek help and have conversations about OpenStreetMap.

       mailing_lists:
         url: https://lists.openstreetmap.org/
         title: Mailing Lists
         description: Ask a question or discuss interesting matters on a wide range of topical or regional mailing lists.
       mailing_lists:
         url: https://lists.openstreetmap.org/
         title: Mailing Lists
         description: Ask a question or discuss interesting matters on a wide range of topical or regional mailing lists.

-      community:
-        url: https://community.openstreetmap.org/
-        title: Community forum
-        description: A shared place for conversations about OpenStreetMap.

       irc:
         url: https://irc.openstreetmap.org/
         title: IRC
       irc:
         url: https://irc.openstreetmap.org/
         title: IRC


@@ -2306,35 +2322,36 @@ en:
           cycleway_national: "National cycleway"
           cycleway_regional: "Regional cycleway"
           cycleway_local: "Local cycleway"
           cycleway_national: "National cycleway"
           cycleway_regional: "Regional cycleway"
           cycleway_local: "Local cycleway"

+          cycleway_mtb: "Mountain bike route"

           footway: "Footway"
           rail: "Railway"
           train: "Train"
           subway: "Subway"
           ferry: "Ferry"
           light_rail: "Light rail"
           footway: "Footway"
           rail: "Railway"
           train: "Train"
           subway: "Subway"
           ferry: "Ferry"
           light_rail: "Light rail"

-          tram_only: "Tram"
+          tram: "Tram"

           trolleybus: "Trolleybus"
           bus: "Bus"
           cable_car: "Cable car"
           chair_lift: "Chair lift"
           trolleybus: "Trolleybus"
           bus: "Bus"
           cable_car: "Cable car"
           chair_lift: "Chair lift"

-          runway_only: "Airport Runway"
+          runway: "Airport Runway"

           taxiway: "Taxiway"
           taxiway: "Taxiway"

-          apron_only: "Airport apron"
+          apron: "Airport apron"

           admin: "Administrative boundary"
           capital: "Capital"
           city: "City"
           admin: "Administrative boundary"
           capital: "Capital"
           city: "City"

-          orchard_only: "Orchard"
+          orchard: "Orchard"

           vineyard: "Vineyard"
           vineyard: "Vineyard"

-          forest_only: "Forest"
+          forest: "Forest"

           wood: "Wood"
           farmland: "Farmland"
           wood: "Wood"
           farmland: "Farmland"

-          grass_only: "Grass"
+          grass: "Grass"

           meadow: "Meadow"
           bare_rock: "Bare rock"
           sand: "Sand"
           golf: "Golf course"
           park: "Park"
           meadow: "Meadow"
           bare_rock: "Bare rock"
           sand: "Sand"
           golf: "Golf course"
           park: "Park"

-          common_only: "Common"
+          common: "Common"

           built_up: "Built-up area"
           resident: "Residential area"
           retail: "Retail area"
           built_up: "Built-up area"
           resident: "Residential area"
           retail: "Retail area"


@@ -2342,7 +2359,7 @@ en:
           commercial: "Commercial area"
           heathland: "Heathland"
           scrubland: "Scrubland"
           commercial: "Commercial area"
           heathland: "Heathland"
           scrubland: "Scrubland"

-          lake_only: "Lake"
+          lake: "Lake"

           reservoir: "Reservoir"
           intermittent_water: "Intermittent waterbody"
           glacier: "Glacier"
           reservoir: "Reservoir"
           intermittent_water: "Intermittent waterbody"
           glacier: "Glacier"


@@ -2354,14 +2371,15 @@ en:
           allotments: "Allotments"
           pitch: "Sports pitch"
           centre: "Sports centre"
           allotments: "Allotments"
           pitch: "Sports pitch"
           centre: "Sports centre"

+          beach: "Beach"

           reserve: "Nature reserve"
           military: "Military area"
           reserve: "Nature reserve"
           military: "Military area"

-          school_only: "School"
+          school: "School"

           university: "University"
           hospital: "Hospital"
           building: "Significant building"
           station: "Railway station"
           university: "University"
           hospital: "Hospital"
           building: "Significant building"
           station: "Railway station"

-          summit_only: "Summit"
+          summit: "Summit"

           peak: "Peak"
           tunnel: "Dashed casing = tunnel"
           bridge: "Black casing = bridge"
           peak: "Peak"
           tunnel: "Dashed casing = tunnel"
           bridge: "Black casing = bridge"


@@ -2371,7 +2389,9 @@ en:
           bus_stop: "Bus stop"
           stop: "Stop"
           bicycle_shop: "Bicycle shop"
           bus_stop: "Bus stop"
           stop: "Stop"
           bicycle_shop: "Bicycle shop"

+          bicycle_rental: "Bicycle rental"

           bicycle_parking: "Bicycle parking"
           bicycle_parking: "Bicycle parking"

+          bicycle_parking_small: "Small bicycle parking"

           toilets: "Toilets"
     welcome:
       title: Welcome!
           toilets: "Toilets"
     welcome:
       title: Welcome!


@@ -2607,6 +2627,7 @@ en:
   oauth_clients:
     new:
       title: "Register a new application"
   oauth_clients:
     new:
       title: "Register a new application"

+      disabled: "Registration of OAuth 1 applications has been disabled"

     edit:
       title: "Edit your application"
     show:
     edit:
       title: "Edit your application"
     show:


@@ -2685,6 +2706,7 @@ en:
       title: "My Authorized Applications"
       application: "Application"
       permissions: "Permissions"
       title: "My Authorized Applications"
       application: "Application"
       permissions: "Permissions"

+      last_authorized: "Last Authorized"

       no_applications_html: "You have not yet authorized any %{oauth2} applications."
       oauth_2: "OAuth 2"
     application:
       no_applications_html: "You have not yet authorized any %{oauth2} applications."
       oauth_2: "OAuth 2"
     application:


@@ -2789,6 +2811,7 @@ en:
           importer: "Revoke importer access"
       block_history: "Active Blocks"
       moderator_history: "Blocks Given"
           importer: "Revoke importer access"
       block_history: "Active Blocks"
       moderator_history: "Blocks Given"

+      revoke_all_blocks: "Revoke all blocks"

       comments: "Comments"
       create_block: "Block this User"
       activate_user: "Activate this User"
       comments: "Comments"
       create_block: "Block this User"
       activate_user: "Activate this User"


@@ -2891,6 +2914,16 @@ en:
       confirm: "Are you sure you wish to revoke this block?"
       revoke: "Revoke!"
       flash: "This block has been revoked."
       confirm: "Are you sure you wish to revoke this block?"
       revoke: "Revoke!"
       flash: "This block has been revoked."

+    revoke_all:
+      title: "Revoking all blocks on %{block_on}"
+      heading_html: "Revoking all blocks on %{block_on}"
+      empty: "%{name} has no active blocks."
+      confirm: "Are you sure you wish to revoke %{active_blocks}?"
+      active_blocks:
+        one: "%{count} active block"
+        other: "%{count} active blocks"
+      revoke: "Revoke!"
+      flash: "All active blocks have been revoked."

     helper:
       time_future_html: "Ends in %{time}."
       until_login: "Active until the user logs in."
     helper:
       time_future_html: "Ends in %{time}."
       until_login: "Active until the user logs in."


@@ -3007,6 +3040,7 @@ en:
       reactivate: Reactivate
       comment_and_resolve: Comment & Resolve
       comment: Comment
       reactivate: Reactivate
       comment_and_resolve: Comment & Resolve
       comment: Comment

+      log_in_to_comment: "Log in to comment on this note"

       report_link_html: "If this note contains sensitive information that needs to be removed, you can %{link}."
       other_problems_resolve: "For all other problems with the note, please resolve it yourself with a comment."
       other_problems_resolved: "For all other problems, resolving is sufficient."
       report_link_html: "If this note contains sensitive information that needs to be removed, you can %{link}."
       other_problems_resolve: "For all other problems with the note, please resolve it yourself with a comment."
       other_problems_resolved: "For all other problems, resolving is sufficient."


@@ -3063,7 +3097,6 @@ en:
         transport_map: Transport Map
         tracestracktop_topo: Tracestrack Topo
         hot: Humanitarian
         transport_map: Transport Map
         tracestracktop_topo: Tracestrack Topo
         hot: Humanitarian

-        opnvkarte: ÖPNVKarte

       layers:
         header: Map Layers
         notes: Map Notes
       layers:
         header: Map Layers
         notes: Map Notes


@@ -3080,8 +3113,6 @@ en:
       osm_france: OpenStreetMap France
       thunderforest_credit: "Tiles courtesy of %{thunderforest_link}"
       andy_allan: Andy Allan
       osm_france: OpenStreetMap France
       thunderforest_credit: "Tiles courtesy of %{thunderforest_link}"
       andy_allan: Andy Allan

-      opnvkarte_credit: "Tiles courtesy of %{memomaps_link}"
-      memomaps: MeMoMaps

       tracestrack_credit: "Tiles courtesy of %{tracestrack_link}"
       tracestrack: Tracestrack
       hotosm_credit: "Tiles style by %{hotosm_link} hosted by %{osm_france_link}"
       tracestrack_credit: "Tiles courtesy of %{tracestrack_link}"
       tracestrack: Tracestrack
       hotosm_credit: "Tiles style by %{hotosm_link} hosted by %{osm_france_link}"