X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/7141d5d84606a498055661cf3f3d1d6706870a04..b0ffe17cec6fdd9bb27c1e8a3deb37f46d2d37bf:/config/locales/en.yml diff --git a/config/locales/en.yml b/config/locales/en.yml index fc2ab125e..425983318 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -122,7 +122,7 @@ en: longitude: "Longitude" public: "Public" description: "Description" - gpx_file: Upload GPX File + gpx_file: Choose GPS Trace File visibility: Visibility tagstring: Tags message: @@ -432,8 +432,6 @@ en: 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" @@ -441,7 +439,6 @@ en: sorry: "Sorry, the list of changeset comments you requested took too long to retrieve." changesets: changeset: - anonymous: "Anonymous" no_edits: "(no edits)" view_changeset_details: "View changeset details" index: @@ -473,7 +470,6 @@ en: title: "Changeset %{id}" created_by_html: "Created by %{link_user} on %{created}." no_such_entry: - title: "No such changeset" heading: "No entry with the id: %{id}" body: "Sorry, there is no changeset with the id %{id}. Please check your spelling, or maybe the link you clicked is wrong." show: @@ -582,8 +578,6 @@ en: report: Report this comment location: location: "Location:" - view: "View" - edit: "Edit" coordinates: "%{latitude}; %{longitude}" feed: user: @@ -1462,7 +1456,6 @@ en: not_updated: Not Updated search: Search search_guidance: "Search Issues:" - link_to_reports: View Reports states: ignored: Ignored open: Open @@ -1617,13 +1610,13 @@ 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: - 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_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" + description_with_tags: "It looks like your file %{trace_name} with the description %{trace_description} and the following tags: %{tags}" + description_with_tags_html: "It looks like your file %{trace_name} with the description %{trace_description} and the following tags: %{tags}" + description_with_no_tags: "It looks like your file %{trace_name} with the description %{trace_description} and no tags" + description_with_no_tags_html: "It looks like your 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:" + failed_to_import: "failed to be imported as a GPS trace file. Please verify that your file is a valid GPX file or an archive containing GPX file(s) in the supported format (.tar.gz, .tar.bz2, .tar, .zip, .gpx.gz, .gpx.bz2). Could there be a format or syntax issue with your file? Here is the importing 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" @@ -1851,7 +1844,6 @@ en: failure: Couldn't update profile. sessions: new: - title: "Log in" tab_title: "Log in" login_to_authorize_html: "Log in to OpenStreetMap to access %{client_app_name}." email or username: "Email Address or Username" @@ -1859,7 +1851,6 @@ en: remember: "Remember me" lost password link: "Lost your password?" login_button: "Log in" - register now: Register now with external: "or log in with a third party" or: "or" auth failure: "Sorry, could not log in with those details." @@ -2062,7 +2053,7 @@ en: contributors_at_land_vorarlberg: Land Vorarlberg contributors_at_land_vorarlberg_url: https://www.vorarlberg.at/vorarlberg/bauen_wohnen/bauen/vermessung_geoinformation/weitereinformationen/services/wmsdienste.htm contributors_at_cc_by_at_with_amendments: CC BY AT with amendments - contributors_at_cc_by_at_with_amendments_url: https://www.tirol.gv.at/applikationen/e-government/data/nutzungsbedingungen/ + contributors_at_cc_by_at_with_amendments_url: https://www.tirol.gv.at/data/nutzungsbedingungen/ contributors_au_credit_html: | %{australia}: Incorporates or developed using Administrative Boundaries © %{geoscape_australia_link} licensed by the Commonwealth of Australia under %{cc_licence_link}. @@ -2300,7 +2291,6 @@ en: welcome_mat_url: https://welcome.openstreetmap.org/ sidebar: search_results: Search Results - close: Close search: search: Search get_directions_title: "Find directions between two points" @@ -2693,7 +2683,6 @@ en: privacy_policy_title: OSMF privacy policy including section on email addresses contributor_terms_url: "https://wiki.osmfoundation.org/wiki/Licence/Contributor_Terms" contributor_terms: "contributor terms" - tou: "terms of use" continue: Sign Up terms accepted: "Thanks for accepting the new contributor terms!" email_help: @@ -2721,9 +2710,9 @@ en: guidance_info_html: "Information to help understand these terms: a %{readable_summary_link} and some %{informal_translations_link}" readable_summary: human readable summary informal_translations: informal translations - continue: Continue + continue: "Continue" declined: "https://wiki.openstreetmap.org/wiki/Contributor_Terms_Declined" - decline: "Decline" + cancel: "Cancel" you need to accept or decline: "Please read and then either accept or decline the new Contributor Terms to continue." legale_select: "Country of residence:" legale_names: @@ -2920,12 +2909,9 @@ en: created: "Created:" duration: "Duration:" status: "Status:" - show: "Show" edit: "Edit" - confirm: "Are you sure?" reason: "Reason for block:" revoker: "Revoker:" - needs_view: "The user needs to log in before this block will be cleared." block: not_revoked: "(not revoked)" show: "Show"