Merge pull request #333 from bitcoin/warning

Increase warnings against online wallets in "Secure your wallet"

_templates/secure-your-wallet.html

@@ -5,6 +5,9 @@ id: secure-your-wallet
 <h1>{% translate pagetitle %}</h1>
 <p class="summarytxt">{% translate summary %}</p>
 
+<h2><img src="/img/ico_warning.svg" class="titleicon" alt="warning">{% translate online %}</h2>
+<p>{% translate onlinetxt %}</p>
+
 {% case page.lang %}
 {% when 'ar' or 'fa' or 'pl' or 'zh_TW' %}
 {% else %}
@@ -12,9 +15,6 @@ id: secure-your-wallet
 <p>{% translate everydaytxt %}</p>
 {% endcase %}
 
-<h2>{% translate online %}</h2>
-<p>{% translate onlinetxt %}</p>
-
 <h2>{% translate backup %}</h2>
 <p>{% translate backuptxt %}</p>
 

_translations/en.yml

@@ -431,7 +431,7 @@ en:
     everyday: "Small amounts for everyday uses"
     everydaytxt: "A Bitcoin wallet is like a wallet with cash. If you wouldn't keep a thousand dollars in your pocket, you might want to have the same consideration for your Bitcoin wallet. In general, it is a good practice to keep only small amounts of bitcoins on your computer, mobile, or server for everyday uses and to keep the remaining part of your funds in a safer environment."
     online: "Be careful with online services"
-    onlinetxt: "Online wallets and exchanges look like online banks. However, you should always choose such services carefully. As of today, these services generally don't provide enough insurance and security to be used to store your money like a bank. Using security features like two-factor authentication can help to increase the security of your accounts."
+    onlinetxt: "You should be wary of any service designed to store your money online. Many exchanges and online wallets suffered from security breaches in the past and such services generally still do not provide enough insurance and security to be used to store money like a bank. Accordingly, you might want to use other types of <a href=\"#choose-your-wallet#\">Bitcoin wallets</a>. Otherwise, you should choose such services very carefully. Additionally, using two-factor authentication is recommended."
     backup: "Backup your wallet"
     backuptxt: "Stored in a safe place, a backup of your wallet can protect you against computer failures and many human mistakes.  It can also allow you to recover your wallet after your mobile or computer was stolen if you keep your wallet encrypted."
     backupwhole: "Backup your entire wallet"

img/ico_warning.svg

@@ -0,0 +1,74 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="32"
+   height="32"
+   id="svg2"
+   version="1.1"
+   inkscape:version="0.48.4 r9939"
+   sodipodi:docname="ico_warning.svg"
+   inkscape:export-filename="/media/X/bitcoin.org/current/img/ico_warning.png"
+   inkscape:export-xdpi="90"
+   inkscape:export-ydpi="90">
+  <defs
+     id="defs4" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="11.2"
+     inkscape:cx="15.368938"
+     inkscape:cy="18.322975"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="false"
+     inkscape:window-width="1215"
+     inkscape:window-height="1000"
+     inkscape:window-x="1745"
+     inkscape:window-y="24"
+     inkscape:window-maximized="1" />
+  <metadata
+     id="metadata7">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Calque 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(0,-1020.3622)">
+    <path
+       style="fill:#ee9209;fill-opacity:1;stroke:#ee9209;stroke-width:6.53955507;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+       d="m 15.909373,1027.3467 -10.6281908,17.4352 21.2988738,0 z"
+       id="path2985"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="cccc" />
+    <g
+       style="font-size:28.56415749px;font-style:normal;font-variant:normal;font-weight:500;font-stretch:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#ffffff;fill-opacity:1;stroke:none;font-family:Ubuntu;-inkscape-font-specification:Ubuntu Medium"
+       id="text3755"
+       transform="matrix(0.73062558,0,0,0.73062558,0.60705536,282.44878)">
+      <path
+         d="m 23.025738,1029.1502 c -6e-6,1.5805 -0.05713,3.0278 -0.171385,4.3417 -0.114262,1.314 -0.257083,2.6375 -0.428462,3.9704 l -2.456518,0 c -0.19043,-1.3329 -0.342772,-2.6564 -0.457026,-3.9704 -0.114259,-1.333 -0.171388,-2.7802 -0.171385,-4.3417 l 0,-5.313 3.684776,0 0,5.313 m 0.428463,12.5968 c -7e-6,0.6665 -0.218999,1.2092 -0.656976,1.6281 -0.437989,0.419 -0.980708,0.6284 -1.628157,0.6284 -0.628415,0 -1.171134,-0.2094 -1.628157,-0.6284 -0.437986,-0.4189 -0.656978,-0.9616 -0.656976,-1.6281 -2e-6,-0.6665 0.21899,-1.2092 0.656976,-1.6282 0.457023,-0.438 0.999742,-0.657 1.628157,-0.657 0.647449,0 1.190168,0.219 1.628157,0.657 0.437977,0.419 0.656969,0.9617 0.656976,1.6282"
+         id="path3779"
+         inkscape:connector-curvature="0" />
+    </g>
+  </g>
+</svg>