Merge branch 'master' into notes

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

diff --git a/config/locales/en.yml b/config/locales/en.yml
index 6207ca61f46ef44b548f1782c7447e74ca4f3764..5d3e6bbaeef5b980e7100b4745bdcaaba708084d 100644 (file)
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -699,6 +699,8 @@ en:
           airfield: "Military Airfield"
           barracks: "Barracks"
           bunker: "Bunker"
           airfield: "Military Airfield"
           barracks: "Barracks"
           bunker: "Bunker"

+        mountain_pass:
+          "yes" : "Mountain Pass"

         natural:
           bay: "Bay"
           beach: "Beach"
         natural:
           bay: "Bay"
           beach: "Beach"


@@ -1533,7 +1535,7 @@ en:
       url: "Request Token URL:"
       access_url: "Access Token URL:"
       authorize_url: "Authorise URL:"
       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."
+      support_notice: "We support HMAC-SHA1 (recommended) and RSA-SHA1 signatures."

       edit: "Edit Details"
       delete: "Delete Client"
       confirm: "Are you sure?"
       edit: "Edit Details"
       delete: "Delete Client"
       confirm: "Are you sure?"