Merge pull request #4988 from nenad-vujicic/issue_4912_pr_labeling

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

diff --git a/config/locales/en.yml b/config/locales/en.yml
index 28698fa522787766f63afbd153c8de37c7a5d489..425983318cbd28c7609d935dafe02af475dce851 100644 (file)
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -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"
@@ -1458,7 +1456,6 @@ en:
       not_updated: Not Updated
       search: Search
       search_guidance: "Search Issues:"
-      link_to_reports: View Reports
       states:
         ignored: Ignored
         open: Open
@@ -1847,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"
@@ -1855,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."
@@ -2058,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}.
@@ -2296,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"
@@ -2689,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:
@@ -2717,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:
@@ -2916,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"