Use "Desktop wallet" instead of "Software wallet" (fixes #300)

This commit is contained in:
Saivann 2014-01-23 10:56:38 -05:00
parent cb53f08abd
commit 40d2eeaab5
8 changed files with 146 additions and 87 deletions

View file

@ -97,7 +97,7 @@ id: choose-your-wallet
</div>
{% endcase %}
<h2><img class="titleicon" src="/img/ico_software.svg" alt="Software wallets" />{% translate walletdesk %}</h2>
<h2><img class="titleicon" src="/img/ico_desktop.svg" alt="Desktop wallets" />{% translate walletdesk %}</h2>
<p>{% translate walletdesktxt %}</p>
<div>
@ -208,7 +208,7 @@ id: choose-your-wallet
<div class="previewcol">
<div class="previewrow">
<h2><img class="titleicon" src="/img/ico_software.svg" alt="Software wallets" />{% translate walletdesk %}</h2>
<h2><img class="titleicon" src="/img/ico_desktop.svg" alt="Desktop wallets" />{% translate walletdesk %}</h2>
<p class="hyphenate">{% translate walletdesktxt %}</p>
</div>
<div class="previewrow">

View file

@ -104,8 +104,8 @@ en:
getstartedmobi: "<a href=\"https://play.google.com/store/apps/details?id=de.schildbach.wallet\"><b>Bitcoin Wallet</b></a> for Android runs on your phone or tablet."
bethenetwork: "Be part of the Bitcoin network"
bethenetworktxt: "Do you have a computer that you keep switched on all the time, that's connected to the Internet? You can help the community by simply running the <a href=\"#download#\"><b>full Bitcoin client</b></a> on it. The full client is more resource intensive and will take a complete day to synchronize. After that your computer will contribute to the network by checking and relaying transactions."
walletdesk: "Software wallets"
walletdesktxt: "Software wallets are installed on your computer. They give you complete control over your wallet. You are responsible for protecting your money and doing backups."
walletdesk: "Desktop wallets"
walletdesktxt: "Desktop wallets are installed on your computer. They give you complete control over your wallet. You are responsible for protecting your money and doing backups."
walletmobi: "Mobile wallets"
walletmobitxt: "Mobile wallets allow you to bring Bitcoin with you in your pocket. You can exchange coins easily and pay in physical stores by scanning a QR code or using NFC \"tap to pay\"."
walletweb: "Web wallets"

BIN
img/ico_desktop.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 460 B

124
img/ico_desktop.svg Normal file
View file

@ -0,0 +1,124 @@
<?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_desktop.svg"
inkscape:export-filename="/media/X/bitcoin.org/current/img/ico_desktop.png"
inkscape:export-xdpi="90"
inkscape:export-ydpi="90">
<defs
id="defs4">
<inkscape:perspective
sodipodi:type="inkscape:persp3d"
inkscape:vp_x="0 : 0.5 : 1"
inkscape:vp_y="0 : 1000 : 0"
inkscape:vp_z="1 : 0.5 : 1"
inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
id="perspective7704" />
<inkscape:perspective
id="perspective7731"
inkscape:persp3d-origin="372.04724 : 350.78739 : 1"
inkscape:vp_z="744.09448 : 526.18109 : 1"
inkscape:vp_y="0 : 1000 : 0"
inkscape:vp_x="0 : 526.18109 : 1"
sodipodi:type="inkscape:persp3d" />
</defs>
<sodipodi:namedview
id="base"
pagecolor="#ffffff"
bordercolor="#666666"
borderopacity="1.0"
inkscape:pageopacity="0.0"
inkscape:pageshadow="2"
inkscape:zoom="14.481547"
inkscape:cx="-5.3827545"
inkscape:cy="18.224262"
inkscape:document-units="px"
inkscape:current-layer="layer1"
showgrid="false"
inkscape:window-width="1680"
inkscape:window-height="1026"
inkscape:window-x="0"
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)">
<text
xml:space="preserve"
style="font-size:40px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans"
x="64.649765"
y="69.669914"
id="text4329"
sodipodi:linespacing="125%"
transform="translate(0,452.36218)"><tspan
sodipodi:role="line"
id="tspan4331"
x="64.649765"
y="69.669914" /></text>
<text
xml:space="preserve"
style="font-size:40px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans"
x="67"
y="73"
id="text4367"
sodipodi:linespacing="125%"
transform="translate(0,452.36218)"><tspan
sodipodi:role="line"
id="tspan4369"
x="67"
y="73" /></text>
<rect
style="fill:#646464;fill-opacity:0;stroke:#000000;stroke-width:3;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
id="rect5357"
width="24.392694"
height="16.57453"
x="3.8835781"
y="1025.5691" />
<path
style="fill:#000000;fill-opacity:1;stroke:#000000;stroke-width:0.72969627px;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1"
d="m 13.515455,1043.3791 5.419236,0.026 -0.169392,3.7106 -5.015303,0.04 c 0,0 -0.233117,-3.7762 -0.234541,-3.7759 z"
id="path5359"
inkscape:connector-curvature="0"
sodipodi:nodetypes="ccccc" />
<path
style="fill:#000000;fill-opacity:1;stroke:#000000;stroke-width:0.84554929px;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1"
d="m 10.571085,1048.6233 c -0.521422,0.5454 -0.135451,0.5514 -0.135451,0.5514 l 11.566699,-0.014 c 0,0 0.461678,0 -0.105221,-0.5766 -2.646548,-2.3617 -8.880141,-2.3406 -11.325992,0.031 z"
id="path5937"
inkscape:connector-curvature="0"
sodipodi:nodetypes="ccccc" />
<rect
style="fill:#000000;fill-opacity:1;stroke:none"
id="rect6033"
width="23.337198"
height="1.795169"
x="4.5002475"
y="1039.6589" />
</g>
</svg>

After

Width:  |  Height:  |  Size: 4.4 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 579 B

After

Width:  |  Height:  |  Size: 542 B

Before After
Before After

View file

@ -13,8 +13,8 @@
height="32px"
id="svg4913"
version="1.1"
inkscape:version="0.48.3.1 r9886"
inkscape:export-filename="/media/X/bitcoin.org/bitcoin.org_icon/img/for_mobile.png"
inkscape:version="0.48.4 r9939"
inkscape:export-filename="/media/X/bitcoin.org/current/img/ico_mobile.png"
inkscape:export-xdpi="90"
inkscape:export-ydpi="90"
sodipodi:docname="ico_mobile.svg">
@ -47,7 +47,7 @@
<dc:format>image/svg+xml</dc:format>
<dc:type
rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
<dc:title />
<dc:title></dc:title>
</cc:Work>
</rdf:RDF>
</metadata>
@ -56,23 +56,23 @@
inkscape:label="Layer 1"
inkscape:groupmode="layer">
<rect
style="opacity:0.98999999;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:0.47499257;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
style="opacity:0.98999999;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:0.49351057;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
id="rect4921"
width="18.239902"
height="26.89325"
x="6.5245485"
y="2.7353716"
ry="1.0198069"
transform="matrix(0.99999848,-0.00174534,0.00174534,0.99999848,0,0)" />
width="19.381687"
height="27.32081"
x="6.462266"
y="2.3872876"
ry="1.03602"
transform="matrix(0.99999861,-0.00166863,0.00182557,0.99999833,0,0)" />
<rect
style="opacity:0.98999999;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:0.51979363;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
style="opacity:0.98999999;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:0.50169826;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
id="rect4923"
width="13.746132"
height="19.57445"
x="8.831171"
y="4.4849062"
ry="1.037932"
transform="matrix(0.99999848,-0.00174534,0.00174534,0.99999848,0,0)" />
width="13.461034"
height="18.621511"
x="9.481184"
y="5.1101866"
ry="0.98740274"
transform="matrix(0.99999856,-0.00169554,0.0017966,0.99999839,0,0)" />
<path
sodipodi:type="arc"
style="opacity:0.98999999;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:0.5;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
@ -82,6 +82,6 @@
sodipodi:rx="2.3338561"
sodipodi:ry="2.3338561"
d="m 18.497743,25.92738 a 2.3338561,2.3338561 0 1 1 -4.667712,0 2.3338561,2.3338561 0 1 1 4.667712,0 z"
transform="matrix(0.74683203,-0.00130346,0.00130346,0.74683203,3.9909799,7.8606135)" />
transform="matrix(0.84935655,-0.0014824,0.0014824,0.84935655,2.8298035,4.7727403)" />
</g>
</svg>

Before

Width:  |  Height:  |  Size: 3.2 KiB

After

Width:  |  Height:  |  Size: 3.2 KiB

Before After
Before After

Binary file not shown.

Before

Width:  |  Height:  |  Size: 630 B

View file

@ -1,65 +0,0 @@
<?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="32px"
height="32px"
id="svg4357"
version="1.1"
inkscape:version="0.48.3.1 r9886"
sodipodi:docname="software-wallet.svg"
inkscape:export-filename="/media/X/bitcoin.org/bitcoin.org/img/icon-software-wallet.png"
inkscape:export-xdpi="90"
inkscape:export-ydpi="90">
<defs
id="defs4359" />
<sodipodi:namedview
id="base"
pagecolor="#ffffff"
bordercolor="#666666"
borderopacity="1.0"
inkscape:pageopacity="0.0"
inkscape:pageshadow="2"
inkscape:zoom="11.197802"
inkscape:cx="-16.843058"
inkscape:cy="21.497874"
inkscape:current-layer="layer1"
showgrid="true"
inkscape:grid-bbox="true"
inkscape:document-units="px"
inkscape:window-width="1680"
inkscape:window-height="1026"
inkscape:window-x="0"
inkscape:window-y="24"
inkscape:window-maximized="1" />
<metadata
id="metadata4362">
<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
id="layer1"
inkscape:label="Layer 1"
inkscape:groupmode="layer">
<path
style="fill:#000000;stroke:#000000;stroke-width:0.60850519;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
d="m 5.4456104,23.650477 5.4467866,4.578896 4.05649,-6.876143 4.139322,5.316118 L 27.236759,4.0399616 5.2847524,14.860057 11.14656,18.394074 z"
id="path4365"
inkscape:connector-curvature="0"
sodipodi:nodetypes="cccccccc" />
</g>
</svg>

Before

Width:  |  Height:  |  Size: 2.1 KiB