Merge pull request #4488 from AntonKhorev/no-login-label-colons

Remove ":" from login form input labels

diff --combined config/locales/en.yml
index 6620c594f47942d98e99e39e133d1f34eb270475,dd7e80d0541a9d87778d3d04174ec4a925449336..a2347d4bc66c2cdfc1aca343218014fe66241679
--- 1/config/locales/en.yml
--- 2/config/locales/en.yml
+++ b/config/locales/en.yml
@@@ -1753,7 -1753,7 +1753,7 @@@ en
      new:
        title: "Lost password"
        heading: "Forgotten Password?"
-       email address: "Email Address:"
+       email address: "Email Address"
        new password button: "Reset password"
        help_text: "Enter the email address you used to sign up, we will send a link to it that you can use to reset your password."
      create:
@@@ -1811,8 -1811,8 +1811,8 @@@
      new:
        title: "Login"
        heading: "Login"
-       email or username: "Email Address or Username:"
-       password: "Password:"
+       email or username: "Email Address or Username"
+       password: "Password"
        openid_html: "%{logo} OpenID:"
        remember: "Remember me"
        lost password link: "Lost your password?"
@@@ -2163,7 -2163,12 +2163,7 @@@
        no_iframe_support: "Your browser doesn't support HTML iframes, which are necessary for this feature."
      export:
        title: "Export"
 -      area_to_export: "Area to Export"
        manually_select: "Manually select a different area"
 -      format_to_export: "Format to Export"
 -      osm_xml_data: "OpenStreetMap XML Data"
 -      map_image: "Map Image (shows standard layer)"
 -      embeddable_html: "Embeddable HTML"
        licence: "Licence"
        licence_details_html: OpenStreetMap data is licensed under the %{odbl_link} (ODbL).
        odbl: Open Data Commons Open Database License
@@@ -2183,6 -2188,17 +2183,6 @@@
          other:
            title: "Other Sources"
            description: "Additional sources listed on the OpenStreetMap Wiki"
 -      options: "Options"
 -      format: "Format"
 -      scale: "Scale"
 -      max: "max"
 -      image_size: "Image Size"
 -      zoom: "Zoom"
 -      add_marker: "Add a marker to the map"
 -      latitude: "Lat:"
 -      longitude: "Lon:"
 -      output: "Output"
 -      paste_html: "Paste HTML to embed in website"
        export_button: "Export"
      fixthemap:
        title: Report a problem / Fix the map