X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/41b81bd393cafe8fb0d25ccdc3afb08fb695bb52..17bc0853a05cc392c335cc8637e901fa33dd75bd:/config/locales/en.yml diff --git a/config/locales/en.yml b/config/locales/en.yml index a97eca9c0..2aa69699f 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -414,6 +414,18 @@ en: old_relations: not_found: sorry: "Sorry, relation #%{id} version %{version} could not be found." + changeset_comments: + feeds: + comment: + comment: "New comment on changeset #%{changeset_id} by %{author}" + commented_at_by_html: "Updated %{when} by %{user}" + comments: + comment: "New comment on changeset #%{changeset_id} by %{author}" + show: + 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." changesets: changeset_paging_nav: showing_page: "Page %{page}" @@ -490,17 +502,6 @@ en: relations_paginated: "Relations (%{x}-%{y} of %{count})" timeout: sorry: "Sorry, the list of changesets you requested took too long to retrieve." - changeset_comments: - comment: - comment: "New comment on changeset #%{changeset_id} by %{author}" - commented_at_by_html: "Updated %{when} by %{user}" - 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." dashboards: contact: km away: "%{count}km away" @@ -538,6 +539,7 @@ en: 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 @@ -604,6 +606,7 @@ en: heading: "%{user}'s Diary Comments" subheading_html: "Diary Comments added by %{user}" no_comments: "No diary comments" + page: post: Post when: When comment: Comment @@ -1465,13 +1468,19 @@ en: not_updated: Not Updated search: Search search_guidance: "Search Issues:" + link_to_reports: View Reports + states: + ignored: Ignored + open: Open + resolved: Resolved + page: user_not_found: User does not exist issues_not_found: No such issues found + reported_user: Reported User status: Status reports: Reports last_updated: Last Updated last_updated_time_ago_user_html: "%{time_ago} by %{user}" - link_to_reports: View Reports reports_count: one: "%{count} Report" other: "%{count} Reports" @@ -1480,6 +1489,8 @@ en: ignored: Ignored open: Open resolved: Resolved + older_issues: Older Issues + newer_issues: Newer Issues show: title: "%{status} Issue #%{issue_id}" reports: @@ -2522,9 +2533,6 @@ en: 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: @@ -2556,6 +2564,9 @@ en: 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: @@ -2587,7 +2598,6 @@ en: need_to_see_terms: "Your access to the API is temporarily suspended. Please log-in to the web interface to view the Contributor Terms. You do not need to agree, but you must view them." settings_menu: account_settings: Account Settings - oauth1_settings: OAuth 1 settings oauth2_applications: OAuth 2 applications oauth2_authorizations: OAuth 2 authorizations muted_users: Muted Users @@ -2613,28 +2623,6 @@ en: title: Log in with Wikipedia alt: Wikipedia logo oauth: - authorize: - title: "Authorize access to your account" - request_access_html: "The application %{app_name} is requesting access to your account, %{user}. Please check whether you would like the application to have the following capabilities. You may choose as many or as few as you like." - allow_to: "Allow the client application to:" - allow_read_prefs: "read your user preferences." - allow_write_prefs: "modify your user preferences." - allow_write_diary: "create diary entries, comments and make friends." - allow_write_api: "modify the map." - allow_read_gpx: "read your private GPS traces." - allow_write_gpx: "upload GPS traces." - allow_write_notes: "modify notes." - grant_access: "Grant Access" - authorize_success: - title: "Authorization request allowed" - allowed_html: "You have granted application %{app_name} access to your account." - verification: "The verification code is %{code}." - authorize_failure: - title: "Authorization request failed" - denied: "You have denied application %{app_name} access to your account." - invalid: "The authorization token is not valid." - revoke: - flash: "You've revoked the token for %{application}" permissions: missing: "You have not permitted the application access to this facility" scopes: @@ -2653,46 +2641,6 @@ en: skip_authorization: Auto approve application for_roles: moderator: This permission is for actions available only to moderators - oauth_clients: - new: - title: "Register a new application" - disabled: "Registration of OAuth 1 applications has been disabled" - edit: - title: "Edit your application" - show: - title: "OAuth details for %{app_name}" - key: "Consumer Key:" - secret: "Consumer Secret:" - url: "Request Token URL:" - access_url: "Access Token URL:" - authorize_url: "Authorise URL:" - support_notice: "We support HMAC-SHA1 (recommended) and RSA-SHA1 signatures." - edit: "Edit Details" - delete: "Delete Client" - confirm: "Are you sure?" - requests: "Requesting the following permissions from the user:" - index: - title: "My OAuth Details" - my_tokens: "My Authorised Applications" - list_tokens: "The following tokens have been issued to applications in your name:" - application: "Application Name" - issued_at: "Issued At" - revoke: "Revoke!" - my_apps: "My Client Applications" - no_apps_html: "Do you have an application you would like to register for use with us using the %{oauth} standard? You must register your web application before it can make OAuth requests to this service." - oauth: OAuth - registered_apps: "You have the following client applications registered:" - register_new: "Register your application" - form: - requests: "Request the following permissions from the user:" - not_found: - sorry: "Sorry, that %{type} could not be found." - create: - flash: "Registered the information successfully" - update: - flash: "Updated the client information successfully" - destroy: - flash: "Destroyed the client application registration" oauth2_applications: index: title: "My Client Applications" @@ -2875,16 +2823,17 @@ en: 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" - 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 - empty: No matching users found suspended: title: Account Suspended heading: Account Suspended @@ -2936,17 +2885,18 @@ 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." - 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." + revoke: "Revoke block" filter: 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." @@ -2954,14 +2904,6 @@ en: title: "User blocks" heading: "List of user blocks" empty: "No blocks have been made yet." - revoke: - title: "Revoking block on %{block_on}" - heading_html: "Revoking block on %{block_on} by %{block_by}" - time_future_html: "This block will end in %{time}." - past_html: "This block ended %{time} and cannot be revoked now." - 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}" @@ -3009,7 +2951,6 @@ en: status: "Status:" show: "Show" edit: "Edit" - revoke: "Revoke!" confirm: "Are you sure?" reason: "Reason for block:" revoker: "Revoker:" @@ -3018,7 +2959,6 @@ en: not_revoked: "(not revoked)" show: "Show" edit: "Edit" - revoke: "Revoke!" blocks: display_name: "Blocked User" creator_name: "Creator" @@ -3034,6 +2974,7 @@ en: 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"