X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/09d5ae68ddae20abc653d0d6b2cf3ef9dc12da2e..17bc0853a05cc392c335cc8637e901fa33dd75bd:/config/locales/en.yml diff --git a/config/locales/en.yml b/config/locales/en.yml index a6bde26a1..2aa69699f 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -246,18 +246,6 @@ en: entry: comment: Comment full: Full note - feeds: - 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." account: deletions: show: @@ -426,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}" @@ -1468,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" @@ -1483,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: @@ -2590,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 @@ -2616,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: @@ -2656,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" @@ -2959,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}" @@ -3014,7 +2951,6 @@ en: status: "Status:" show: "Show" edit: "Edit" - revoke: "Revoke!" confirm: "Are you sure?" reason: "Reason for block:" revoker: "Revoker:" @@ -3023,7 +2959,6 @@ en: not_revoked: "(not revoked)" show: "Show" edit: "Edit" - revoke: "Revoke!" blocks: display_name: "Blocked User" creator_name: "Creator"