X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/0d5be22cb517ebaaab5eb7af13150bf61e41df56..7b14b5b6d4ee2e6558305a86afcefecc47d8a9fc:/config/locales/en.yml?ds=sidebyside diff --git a/config/locales/en.yml b/config/locales/en.yml index 2cf7a3aa8..42fa072d1 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -87,6 +87,9 @@ en: download: "Download {{changeset_xml_link}} or {{osmchange_xml_link}}" changesetxml: "Changeset XML" osmchangexml: "osmChange XML" + feed: + title: "Changeset {{id}}" + title_comment: "Changeset {{id}} - {{comment}}" changeset_navigation: user: name_tooltip: "View edits by {{user}}" @@ -317,6 +320,16 @@ en: edit_link: Edit this entry diary_comment: comment_from: "Comment from {{link_user}} at {{comment_created_at}}" + feed: + user: + title: "OpenStreetMap diary entries for {{user}}" + description: "Recent OpenStreetmap diary entries from {{user}}" + language: + title: "OpenStreetMap diary entries in {{language_name}}" + description: "Recent diary entries from users of OpenStreetMap in {{language_name}}" + all: + title: "OpenStreetMap diary entries" + description: "Recent diary entries from users of OpenStreetMap" export: start: area_to_export: "Area to Export" @@ -690,6 +703,11 @@ en: destination: "Destination access" construction: "Roads under construction" trace: + visibility: + private: "Private (only shared as anonymous, unordered points)" + public: "Public (shown in trace list and as anonymous, unordered points)" + trackable: "Trackable (only shared as anonymous, ordered points with timestamps)" + identifiable: "Identifiable (shown in trace list and as identifiable, ordered points with timestamps)" 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." @@ -708,6 +726,9 @@ en: tags: "Tags:" tags_help: "comma delimited" save_button: "Save Changes" + visibility: "Visibility:" + visibility_help: "what does this mean?" + visibility_help_url: "http://wiki.openstreetmap.org/wiki/Visibility_of_GPS_traces" no_such_user: title: "No such user" heading: "The user {{user}} does not exist" @@ -717,9 +738,9 @@ en: description: "Description" tags: "Tags" tags_help: "comma delimited" - public: "Public?" - public_help: "what does this mean?" - public_help_url: "http://wiki.openstreetmap.org/wiki/Visibility_of_GPS_traces" + visibility: "Visibility" + visibility_help: "what does this mean?" + visibility_help_url: "http://wiki.openstreetmap.org/wiki/Visibility_of_GPS_traces" upload_button: "Upload" help: "Help" help_url: "http://wiki.openstreetmap.org/wiki/Upload" @@ -745,10 +766,10 @@ en: description: "Description:" tags: "Tags:" none: "None" - make_public: "Make this track public permanently" edit_track: "Edit this track" delete_track: "Delete this track" trace_not_found: "Trace not found!" + visibility: "Visibility:" trace_paging_nav: showing: "Showing page" of: "of" @@ -776,7 +797,7 @@ en: make_public: made_public: "Track made public" oauth: - client_application: + oauthorize: request_access: "The application {{app_name}} is requesting access to your account. 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." @@ -785,53 +806,63 @@ en: allow_write_api: "modify the map." allow_read_gpx: "read your private GPS traces." allow_write_gpx: "upload GPS traces." - new: - title: "Register a new application" - submit: "Register" - edit: - title: "Edit your application" - submit: "Edit" - 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) as well as plain text in ssl mode." - edit: "Edit Details" - requests: "Requesting the following permissions from the user:" - allow_read_prefs: "read their user preferences." - allow_write_prefs: "modify their user preferences." - allow_write_diary: "create diary entries, comments and make friends." - allow_write_api: "modify the map." - allow_read_gpx: "read their private GPS traces." - allow_write_gpx: "upload GPS traces." - 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: "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." - registered_apps: "You have the following client applications registered:" - register_new: "Register your application" - form: - name: "Name" - required: "Required" - url: "Main Application URL" - callback_url: "Callback URL" - support_url: "Support URL" - requests: "Request the following permissions from the user:" - allow_read_prefs: "read their user preferences." - allow_write_prefs: "modify their user preferences." - allow_write_diary: "create diary entries, comments and make friends." - allow_write_api: "modify the map." - allow_read_gpx: "read their private GPS traces." - allow_write_gpx: "upload GPS traces." - not_found: "Sorry, that {{type}} could not be found." + revoke: + flash: "You've revoked the token for {{application}}" + oauth_clients: + new: + title: "Register a new application" + submit: "Register" + edit: + title: "Edit your application" + submit: "Edit" + 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) as well as plain text in ssl mode." + edit: "Edit Details" + requests: "Requesting the following permissions from the user:" + allow_read_prefs: "read their user preferences." + allow_write_prefs: "modify their user preferences." + allow_write_diary: "create diary entries, comments and make friends." + allow_write_api: "modify the map." + allow_read_gpx: "read their private GPS traces." + allow_write_gpx: "upload GPS traces." + 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: "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." + registered_apps: "You have the following client applications registered:" + register_new: "Register your application" + form: + name: "Name" + required: "Required" + url: "Main Application URL" + callback_url: "Callback URL" + support_url: "Support URL" + requests: "Request the following permissions from the user:" + allow_read_prefs: "read their user preferences." + allow_write_prefs: "modify their user preferences." + allow_write_diary: "create diary entries, comments and make friends." + allow_write_api: "modify the map." + allow_read_gpx: "read their private GPS traces." + allow_write_gpx: "upload GPS traces." + 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" user: login: title: "Login"