Change submit button on block edit page when can only revoke

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

diff --git a/config/locales/en.yml b/config/locales/en.yml
index 4c743b03353487a3db53bb9de125f29d8e596eac..80811cd1ff7e23177d759769e9d96d38666c28a2 100644 (file)
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -386,7 +386,7 @@ en:
         way: "way"
         relation: "relation"
     start_rjs:
         way: "way"
         relation: "relation"
     start_rjs:

-      feature_warning: "Loading %{num_features} features, which may make your browser slow or unresponsive. Are sure you want to display this data?"
+      feature_warning: "Loading %{num_features} features, which may make your browser slow or unresponsive. Are you sure you want to display this data?"

       load_data: "Load Data"
       loading: "Loading..."
     tag_details:
       load_data: "Load Data"
       loading: "Loading..."
     tag_details:


@@ -538,6 +538,7 @@ en:
       new_title: Compose a new entry in my user diary
       my_diary: My Diary
       no_entries: No diary entries
       new_title: Compose a new entry in my user diary
       my_diary: My Diary
       no_entries: No diary entries

+    page:

       recent_entries: "Recent diary entries"
       older_entries: Older Entries
       newer_entries: Newer Entries
       recent_entries: "Recent diary entries"
       older_entries: Older Entries
       newer_entries: Newer Entries


@@ -604,11 +605,14 @@ en:
       heading: "%{user}'s Diary Comments"
       subheading_html: "Diary Comments added by %{user}"
       no_comments: "No diary comments"
       heading: "%{user}'s Diary Comments"
       subheading_html: "Diary Comments added by %{user}"
       no_comments: "No diary comments"

+    page:

       post: Post
       when: When
       comment: Comment
       newer_comments: "Newer Comments"
       older_comments: "Older Comments"
       post: Post
       when: When
       comment: Comment
       newer_comments: "Newer Comments"
       older_comments: "Older Comments"

+    new:
+      heading: Add a comment to the following diary entry discussion?

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


@@ -1584,6 +1588,7 @@ en:
     tou: "Terms of Use"
     osm_offline: "The OpenStreetMap database is currently offline while essential database maintenance work is carried out."
     osm_read_only: "The OpenStreetMap database is currently in read-only mode while essential database maintenance work is carried out."
     tou: "Terms of Use"
     osm_offline: "The OpenStreetMap database is currently offline while essential database maintenance work is carried out."
     osm_read_only: "The OpenStreetMap database is currently in read-only mode while essential database maintenance work is carried out."

+    nothing_to_preview: "Nothing to preview."

     donate: "Support OpenStreetMap by %{link} to the Hardware Upgrade Fund."
     help: Help
     about: About
     donate: "Support OpenStreetMap by %{link} to the Hardware Upgrade Fund."
     help: Help
     about: About


@@ -1624,11 +1629,14 @@ 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_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"
     gpx_failure:
       hi: "Hi %{to_user},"
       failed_to_import: "failed to import. Here is the error:"
       description_with_no_tags_html: "It looks like your GPX file %{trace_name} with the description %{trace_description} and no tags"
     gpx_failure:
       hi: "Hi %{to_user},"
       failed_to_import: "failed to import. Here is the 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"
       subject: "[OpenStreetMap] GPX Import failure"
       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"
       subject: "[OpenStreetMap] GPX Import failure"


@@ -1637,6 +1645,8 @@ 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."

+      trace_location: "Your trace is available at %{trace_url}"
+      all_your_traces: "All your successfully uploaded GPX traces can be found at %{url}"

       all_your_traces_html: "All your successfully uploaded GPX traces can be found at %{url}."
       subject: "[OpenStreetMap] GPX Import success"
     signup_confirm:
       all_your_traces_html: "All your successfully uploaded GPX traces can be found at %{url}."
       subject: "[OpenStreetMap] GPX Import success"
     signup_confirm:


@@ -1897,6 +1907,7 @@ en:
     richtext_field:
       edit: Edit
       preview: Preview
     richtext_field:
       edit: Edit
       preview: Preview

+      help: Help

   site:
     about:
       next: Next
   site:
     about:
       next: Next


@@ -2513,9 +2524,6 @@ en:
       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?"

-    trace_paging_nav:
-      older: "Older Traces"
-      newer: "Newer Traces"

     trace:
       pending: "PENDING"
       count_points:
     trace:
       pending: "PENDING"
       count_points:


@@ -2547,6 +2555,9 @@ en:
       my_traces: "My Traces"
       traces_from: "Public Traces from %{user}"
       remove_tag_filter: "Remove Tag Filter"
       my_traces: "My Traces"
       traces_from: "Public Traces from %{user}"
       remove_tag_filter: "Remove Tag Filter"

+    page:
+      older: "Older Traces"
+      newer: "Newer Traces"

     destroy:
       scheduled_for_deletion: "Trace scheduled for deletion"
     make_public:
     destroy:
       scheduled_for_deletion: "Trace scheduled for deletion"
     make_public:


@@ -2583,8 +2594,7 @@ en:
       oauth2_authorizations: OAuth 2 authorizations
       muted_users: Muted Users
     auth_providers:
       oauth2_authorizations: OAuth 2 authorizations
       muted_users: Muted Users
     auth_providers:

-      openid_logo_alt: "Log in with an OpenID"
-      openid_html: "%{logo} OpenID"
+      openid_url: "OpenID URL"

       openid_login_button: "Continue"
       openid:
         title: Log in with OpenID
       openid_login_button: "Continue"
       openid:
         title: Log in with OpenID


@@ -2640,6 +2650,8 @@ en:
       write_notes: Modify notes
       write_redactions: Redact map data
       read_email: Read user email address
       write_notes: Modify notes
       write_redactions: Redact map data
       read_email: Read user email address

+      consume_messages: Read, update status and delete user messages
+      send_messages: Send private messages to other users

       skip_authorization: Auto approve application
     for_roles:
       moderator: This permission is for actions available only to moderators
       skip_authorization: Auto approve application
     for_roles:
       moderator: This permission is for actions available only to moderators


@@ -2865,16 +2877,17 @@ en:
     index:
       title: Users
       heading: Users
     index:
       title: Users
       heading: Users

+      summary_html: "%{name} created from %{ip_address} on %{date}"
+      summary_no_ip_html: "%{name} created on %{date}"
+      empty: No matching users found
+    page:

       older: "Older Users"
       newer: "Newer Users"
       found_users:
         one: "%{count} user found"
         other: "%{count} users found"
       older: "Older Users"
       newer: "Newer Users"
       found_users:
         one: "%{count} user found"
         other: "%{count} users found"

-      summary_html: "%{name} created from %{ip_address} on %{date}"
-      summary_no_ip_html: "%{name} created on %{date}"

       confirm: Confirm Selected Users
       hide: Hide Selected Users
       confirm: Confirm Selected Users
       hide: Hide Selected Users

-      empty: No matching users found

     suspended:
       title: Account Suspended
       heading: Account Suspended
     suspended:
       title: Account Suspended
       heading: Account Suspended


@@ -2926,20 +2939,20 @@ en:
       title: "Creating block on %{name}"
       heading_html: "Creating block on %{name}"
       period: "How long, starting now, the user will be blocked from the API for."
       title: "Creating block on %{name}"
       heading_html: "Creating block on %{name}"
       period: "How long, starting now, the user will be blocked from the API for."

-      back: "View all blocks"

     edit:
       title: "Editing block on %{name}"
       heading_html: "Editing block on %{name}"
       period: "How long, starting now, the user will be blocked from the API for."
     edit:
       title: "Editing block on %{name}"
       heading_html: "Editing block on %{name}"
       period: "How long, starting now, the user will be blocked from the API for."

-      show: "View this block"
-      back: "View all blocks"
+      revoke: "Revoke block"

     filter:
     filter:

-      block_expired: "The block has already expired and cannot be edited."

       block_period: "The blocking period must be one of the values selectable in the drop-down list."
     create:
       flash: "Created a block on user %{name}."
     update:
       only_creator_can_edit: "Only the moderator who created this block can edit it."
       block_period: "The blocking period must be one of the values selectable in the drop-down list."
     create:
       flash: "Created a block on user %{name}."
     update:
       only_creator_can_edit: "Only the moderator who created this block can edit it."

+      only_creator_can_edit_without_revoking: "Only the moderator who created this block can edit it without revoking."
+      only_creator_or_revoker_can_edit: "Only the moderators who created or revoked this block can edit it."
+      inactive_block_cannot_be_reactivated: "This block is inactive and cannot be reactivated."

       success: "Block updated."
     index:
       title: "User blocks"
       success: "Block updated."
     index:
       title: "User blocks"


@@ -3025,6 +3038,7 @@ en:
       blocks_by_me: "Blocks by Me"
       blocks_by_user: "Blocks by %{user}"
       block: "Block #%{id}"
       blocks_by_me: "Blocks by Me"
       blocks_by_user: "Blocks by %{user}"
       block: "Block #%{id}"

+      new_block: "New Block"

   user_mutes:
     index:
       title: "Muted Users"
   user_mutes:
     index:
       title: "Muted Users"


@@ -3111,14 +3125,14 @@ en:
       custom_dimensions: "Set custom dimensions"
       format: "Format:"
       scale: "Scale:"
       custom_dimensions: "Set custom dimensions"
       format: "Format:"
       scale: "Scale:"

-      image_dimensions: "Image will show standard layer at %{width} x %{height}"
+      image_dimensions: "Image will show the %{layer} layer at %{width} x %{height}"

       download: "Download"
       short_url: "Short URL"
       include_marker: "Include marker"
       center_marker: "Center map on marker"
       paste_html: "Paste HTML to embed in website"
       view_larger_map: "View Larger Map"
       download: "Download"
       short_url: "Short URL"
       include_marker: "Include marker"
       center_marker: "Center map on marker"
       paste_html: "Paste HTML to embed in website"
       view_larger_map: "View Larger Map"

-      only_standard_layer: "Only the standard layer can be exported as an image"
+      only_standard_layer: "Only the Standard, Cycle Map and Transport layers can be exported as an image"

     embed:
       report_problem: "Report a problem"
     key:
     embed:
       report_problem: "Report a problem"
     key: