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 b042370dccc3f0cef9cf9cb71ae5cfbf5d887881..425983318cbd28c7609d935dafe02af475dce851 100644 (file)
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -1844,7 +1844,6 @@ en:
       failure: Couldn't update profile.
   sessions:
     new:
       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"
       tab_title: "Log in"
       login_to_authorize_html: "Log in to OpenStreetMap to access %{client_app_name}."
       email or username: "Email Address or Username"


@@ -2054,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_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}.
         contributors_au_credit_html: |
           %{australia}: Incorporates or developed using Administrative Boundaries © %{geoscape_australia_link}
           licensed by the Commonwealth of Australia under %{cc_licence_link}.


@@ -2292,7 +2291,6 @@ en:
       welcome_mat_url: https://welcome.openstreetmap.org/
     sidebar:
       search_results: Search Results
       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"
     search:
       search: Search
       get_directions_title: "Find directions between two points"


@@ -2911,12 +2909,9 @@ en:
       created: "Created:"
       duration: "Duration:"
       status: "Status:"
       created: "Created:"
       duration: "Duration:"
       status: "Status:"

-      show: "Show"

       edit: "Edit"
       edit: "Edit"

-      confirm: "Are you sure?"

       reason: "Reason for block:"
       revoker: "Revoker:"
       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"
     block:
       not_revoked: "(not revoked)"
       show: "Show"