Update Potlatch 2 to 2.5-57-gaa163622 build

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

diff --git a/config/locales/en.yml b/config/locales/en.yml
index 17549940a59b0a24cef04964173e4028f2350c9d..197c6308ccb3385c0250396a5ad791bd8c2cce00 100644 (file)
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -228,7 +228,7 @@ en:
       user: "User"
       comment: "Comment"
       area: "Area"
       user: "User"
       comment: "Comment"
       area: "Area"

-    list:
+    index:

       title: "Changesets"
       title_user: "Changesets by %{user}"
       title_friend: "Changesets by my friends"
       title: "Changesets"
       title_user: "Changesets by %{user}"
       title_friend: "Changesets by my friends"


@@ -242,18 +242,22 @@ en:
       load_more: "Load more"
     timeout:
       sorry: "Sorry, the list of changesets you requested took too long to retrieve."
       load_more: "Load more"
     timeout:
       sorry: "Sorry, the list of changesets you requested took too long to retrieve."

-    rss:
-      title_all: OpenStreetMap changeset discussion
-      title_particular: "OpenStreetMap changeset #%{changeset_id} discussion"
+  changeset_comments:
+    comment:

       comment: "New comment on changeset #%{changeset_id} by %{author}"
       comment: "New comment on changeset #%{changeset_id} by %{author}"

-      commented_at_html: "Updated %{when} ago"

       commented_at_by_html: "Updated %{when} ago by %{user}"
       commented_at_by_html: "Updated %{when} ago by %{user}"

-      full: Full discussion
-  diary_entry:
+    comments:
+      comment: "New comment on changeset #%{changeset_id} by %{author}"
+    index:
+      title_all: OpenStreetMap changeset discussion
+      title_particular: "OpenStreetMap changeset #%{changeset_id} discussion"
+    timeout:
+      sorry: "Sorry, the list of changeset comments you requested took too long to retrieve."
+  diary_entries:

     new:
       title: New Diary Entry
       publish_button: "Publish"
     new:
       title: New Diary Entry
       publish_button: "Publish"

-    list:
+    index:

       title: "Users' diaries"
       title_friends: "Friends' diaries"
       title_nearby: "Nearby Users' diaries"
       title: "Users' diaries"
       title_friends: "Friends' diaries"
       title_nearby: "Nearby Users' diaries"


@@ -276,7 +280,7 @@ en:
       use_map_link: "use map"
       save_button: "Save"
       marker_text: Diary entry location
       use_map_link: "use map"
       save_button: "Save"
       marker_text: Diary entry location

-    view:
+    show:

       title: "%{user}'s diary | %{title}"
       user_title: "%{user}'s diary"
       leave_a_comment: "Leave a comment"
       title: "%{user}'s diary | %{title}"
       user_title: "%{user}'s diary"
       leave_a_comment: "Leave a comment"


@@ -982,6 +986,10 @@ en:
     reports:
       updated_at: "On %{datetime}"
       reported_by_html: "Reported as %{category} by %{user}"
     reports:
       updated_at: "On %{datetime}"
       reported_by_html: "Reported as %{category} by %{user}"

+    helper:
+      reportable_title:
+        diary_comment: "%{entry_title}, comment #%{comment_id}"
+        note: "Note #%{note_id}"

   issue_comments:
     create:
       comment_created: Your comment was successfully created
   issue_comments:
     create:
       comment_created: Your comment was successfully created


@@ -998,29 +1006,29 @@ en:
         resolve_with_user: You have already tried to resolve the problem with the user concerned
       categories:
         diary_entry:
         resolve_with_user: You have already tried to resolve the problem with the user concerned
       categories:
         diary_entry:

-          spam: This diary entry is/contains spam
-          offensive: This diary entry is obscene/offensive
-          threat: This diary entry contains a threat
-          other: Other
+          spam_label: This diary entry is/contains spam
+          offensive_label: This diary entry is obscene/offensive
+          threat_label: This diary entry contains a threat
+          other_label: Other

         diary_comment:
         diary_comment:

-          spam: This diary comment is/contains spam
-          offensive: This diary comment is obscene/offensive
-          threat: This diary comment contains a threat
-          other: Other
+          spam_label: This diary comment is/contains spam
+          offensive_label: This diary comment is obscene/offensive
+          threat_label: This diary comment contains a threat
+          other_label: Other

         user:
         user:

-          spam: This user profile is/contains spam
-          offensive: This user profile is obscene/offensive
-          threat: This user profile contains a threat
-          vandal: This user is a vandal
-          other: Other
+          spam_label: This user profile is/contains spam
+          offensive_label: This user profile is obscene/offensive
+          threat_label: This user profile contains a threat
+          vandal_label: This user is a vandal
+          other_label: Other

         note:
         note:

-          spam: This note is spam
-          personal: This note contains personal data
-          abusive: This note is abusive
-          other: Other
+          spam_label: This note is spam
+          personal_label: This note contains personal data
+          abusive_label: This note is abusive
+          other_label: Other

     create:
       successful_report: Your report has been registered sucessfully
     create:
       successful_report: Your report has been registered sucessfully

-      provide_details: Please provide the required details      
+      provide_details: Please provide the required details

   layouts:
     project_name:
       # in <title>
   layouts:
     project_name:
       # in <title>


@@ -1051,9 +1059,8 @@ en:
     intro_header: Welcome to OpenStreetMap!
     intro_text: OpenStreetMap is a map of the world, created by people like you and free to use under an open license.
     intro_2_create_account: "Create a user account"
     intro_header: Welcome to OpenStreetMap!
     intro_text: OpenStreetMap is a map of the world, created by people like you and free to use under an open license.
     intro_2_create_account: "Create a user account"

-    partners_html: "Hosting is supported by %{ucl}, %{bytemark}, %{ic}, and other %{partners}."
+    hosting_partners_html: "Hosting is supported by %{ucl}, %{bytemark}, and other %{partners}."

     partners_ucl: "UCL"
     partners_ucl: "UCL"

-    partners_ic: "Imperial College London"

     partners_bytemark: "Bytemark Hosting"
     partners_partners: "partners"
     osm_offline: "The OpenStreetMap database is currently offline while essential database maintenance work is carried out."
     partners_bytemark: "Bytemark Hosting"
     partners_partners: "partners"
     osm_offline: "The OpenStreetMap database is currently offline while essential database maintenance work is carried out."


@@ -1190,6 +1197,7 @@ en:
       body: "Body"
       send_button: "Send"
       back_to_inbox: "Back to inbox"
       body: "Body"
       send_button: "Send"
       back_to_inbox: "Back to inbox"

+    create:

       message_sent: "Message sent"
       limit_exceeded: "You have sent a lot of messages recently. Please wait a while before trying to send any more."
     no_such_message:
       message_sent: "Message sent"
       limit_exceeded: "You have sent a lot of messages recently. Please wait a while before trying to send any more."
     no_such_message:


@@ -1343,6 +1351,11 @@ en:
           <a href="https://creativecommons.org/licenses/by/3.0/at/deed.de">CC BY</a>),
           <a href="https://www.vorarlberg.at/vorarlberg/bauen_wohnen/bauen/vermessung_geoinformation/weitereinformationen/services/wmsdienste.htm">Land Vorarlberg</a> and
           Land Tirol (under <a href="https://www.tirol.gv.at/applikationen/e-government/data/nutzungsbedingungen/">CC BY AT with amendments</a>).
           <a href="https://creativecommons.org/licenses/by/3.0/at/deed.de">CC BY</a>),
           <a href="https://www.vorarlberg.at/vorarlberg/bauen_wohnen/bauen/vermessung_geoinformation/weitereinformationen/services/wmsdienste.htm">Land Vorarlberg</a> and
           Land Tirol (under <a href="https://www.tirol.gv.at/applikationen/e-government/data/nutzungsbedingungen/">CC BY AT with amendments</a>).

+        contributors_au_html: |
+          <strong>Australia</strong>: Contains data sourced from
+          <a href="https://www.psma.com.au/psma-data-copyright-and-disclaimer">PSMA Australia Limited</a>
+          licensed by the Commonwealth of Australia under
+          <a href="https://creativecommons.org/licenses/by/4.0/">CC BY 4.0</a>.

         contributors_ca_html: |
           <strong>Canada</strong>: Contains data from
           GeoBase&reg;, GeoGratis (&copy; Department of Natural
         contributors_ca_html: |
           <strong>Canada</strong>: Contains data from
           GeoBase&reg;, GeoGratis (&copy; Department of Natural


@@ -1696,6 +1709,7 @@ en:
     create:
       upload_trace: "Upload GPS Trace"
       trace_uploaded: "Your GPX file has been uploaded and is awaiting insertion in to the database. This will usually happen within half an hour, and an email will be sent to you on completion."
     create:
       upload_trace: "Upload GPS Trace"
       trace_uploaded: "Your GPX file has been uploaded and is awaiting insertion in to the database. This will usually happen within half an hour, and an email will be sent to you on completion."

+      upload_failed: "Sorry, the GPX upload failed. An administrator has been alerted to the error. Please try again"

       traces_waiting:
         one: "You have %{count} trace waiting for upload. Please consider waiting for these to finish before uploading any more, so as not to block the queue for other users."
         other: "You have %{count} traces waiting for upload. Please consider waiting for these to finish before uploading any more, so as not to block the queue for other users."
       traces_waiting:
         one: "You have %{count} trace waiting for upload. Please consider waiting for these to finish before uploading any more, so as not to block the queue for other users."
         other: "You have %{count} traces waiting for upload. Please consider waiting for these to finish before uploading any more, so as not to block the queue for other users."


@@ -1717,9 +1731,11 @@ en:
       visibility: "Visibility:"
       visibility_help: "what does this mean?"
       visibility_help_url: "https://wiki.openstreetmap.org/wiki/Visibility_of_GPS_traces"
       visibility: "Visibility:"
       visibility_help: "what does this mean?"
       visibility_help_url: "https://wiki.openstreetmap.org/wiki/Visibility_of_GPS_traces"

+    update:
+      updated: Trace updated

     trace_optionals:
       tags: "Tags"
     trace_optionals:
       tags: "Tags"

-    view:
+    show:

       title: "Viewing trace %{name}"
       heading: "Viewing trace %{name}"
       pending: "PENDING"
       title: "Viewing trace %{name}"
       heading: "Viewing trace %{name}"
       pending: "PENDING"


@@ -1734,8 +1750,8 @@ en:
       description: "Description:"
       tags: "Tags:"
       none: "None"
       description: "Description:"
       tags: "Tags:"
       none: "None"

-      edit_track: "Edit this trace"
-      delete_track: "Delete this trace"
+      edit_trace: "Edit this trace"
+      delete_trace: "Delete this trace"

       trace_not_found: "Trace not found!"
       visibility: "Visibility:"
       confirm_delete: "Delete this trace?"
       trace_not_found: "Trace not found!"
       visibility: "Visibility:"
       confirm_delete: "Delete this trace?"


@@ -1759,7 +1775,7 @@ en:
       by: "by"
       in: "in"
       map: "map"
       by: "by"
       in: "in"
       map: "map"

-    list:
+    index:

       public_traces: "Public GPS traces"
       my_traces: "My GPS traces"
       public_traces_from: "Public GPS traces from %{user}"
       public_traces: "Public GPS traces"
       my_traces: "My GPS traces"
       public_traces_from: "Public GPS traces from %{user}"


@@ -1786,6 +1802,7 @@ en:
         other: "GPX file with %{count} points from %{user}"
       description_without_count: "GPX file from %{user}"
   application:
         other: "GPX file with %{count} points from %{user}"
       description_without_count: "GPX file from %{user}"
   application:

+    permission_denied: You do not have permission to access that action

     require_cookies:
       cookies_needed: "You appear to have cookies disabled - please enable cookies in your browser before continuing."
     require_admin:
     require_cookies:
       cookies_needed: "You appear to have cookies disabled - please enable cookies in your browser before continuing."
     require_admin:


@@ -1882,7 +1899,7 @@ en:
       flash: "Updated the client information successfully"
     destroy:
       flash: "Destroyed the client application registration"
       flash: "Updated the client information successfully"
     destroy:
       flash: "Destroyed the client application registration"

-  user:
+  users:

     login:
       title: "Login"
       heading: "Login"
     login:
       title: "Login"
       heading: "Login"


@@ -1998,7 +2015,7 @@ en:
       heading: "The user %{user} does not exist"
       body: "Sorry, there is no user with the name %{user}. Please check your spelling, or maybe the link you clicked is wrong."
       deleted: "deleted"
       heading: "The user %{user} does not exist"
       body: "Sorry, there is no user with the name %{user}. Please check your spelling, or maybe the link you clicked is wrong."
       deleted: "deleted"

-    view:
+    show:

       my diary: My Diary
       new diary entry: new diary entry
       my edits: My Edits
       my diary: My Diary
       new diary entry: new diary entry
       my edits: My Edits


@@ -2160,7 +2177,7 @@ en:
       not_a_friend: "%{name} is not one of your friends."
     filter:
       not_an_administrator: "You need to be an administrator to perform that action."
       not_a_friend: "%{name} is not one of your friends."
     filter:
       not_an_administrator: "You need to be an administrator to perform that action."

-    list:
+    index:

       title: Users
       heading: Users
       showing:
       title: Users
       heading: Users
       showing:


@@ -2549,3 +2566,8 @@ en:
       not_empty: "Redaction is not empty. Please un-redact all versions belonging to this redaction before destroying it."
       flash: "Redaction destroyed."
       error: "There was an error destroying this redaction."
       not_empty: "Redaction is not empty. Please un-redact all versions belonging to this redaction before destroying it."
       flash: "Redaction destroyed."
       error: "There was an error destroying this redaction."

+  validations:
+    leading_whitespace: "has leading whitespace"
+    trailing_whitespace: "has trailing whitespace"
+    invalid_characters: "contains invalid characters"
+    url_characters: "contains special URL characters (%{characters})"