{% translate getstarted layout %}{{ site.ALERT }}
+
+ 
+
+
+
+ {% translate menu-resources layout %}
+
+ {% translate menu-resources layout %}
+ {% translate menu-community layout %}
+ {% translate menu-development layout %}
+ {% translate menu-events layout %}
+ {% if page.lang == 'en' %}Press{% endif %}
+
+
+ {% translate menu-innovation layout %}
+ {% translate menu-support-bitcoin layout %}
+ {% translate menu-about layout %}
+
+
-
+
- {{ site.langs[page.lang] }}
+
-
+ {% for lang in site.langsorder %}{% if lang.id != page.lang %}
+
- {{ site.langs[lang.id] }} + {% endif %}{% endfor %} +
+
+
+
+
+
+
+
+
+
+
+
+{% endcase %}
diff --git a/_less/screen.less b/_less/screen.less
index e60adc67..f6819258 100644
--- a/_less/screen.less
+++ b/_less/screen.less
@@ -14,7 +14,7 @@ h1{
color:#0d579b;
font-size:160%;
margin-top:0;
- text-align:left;
+ text-align:center;
}
h2{
font-family:'Ubuntu', sans-serif;
@@ -28,10 +28,6 @@ h3{
font-size:110%;
text-align:left;
}
-h1 img,h2 img,h3 img{
- vertical-align:middle;
- margin-right:5px;
-}
p {
line-height:1.5em;
}
@@ -132,7 +128,7 @@ li p{
}
.alert-message div div{
margin:auto;
- width:960px;
+ width:850px;
padding:10px;
}
.alert-message,.alert-message a,.alert-message a:link,.alert-message a:active,.alert-message a:visited{
@@ -146,7 +142,7 @@ li p{
margin:30px 0px 30px 0px;
}
#head>div{
- max-width:1050px;
+ max-width:940px;
margin:auto;
position:relative;
z-index:100;
@@ -158,7 +154,7 @@ li p{
text-align: center;
}
#body{
- max-width:1050px;
+ max-width:940px;
margin:auto;
position:relative;
}
@@ -241,7 +237,7 @@ li p{
margin:0px;
position:absolute;
top:8px;
- left:250px;
+ left:245px;
padding:0px;
height:35px;
}
@@ -250,7 +246,7 @@ li p{
display:inline-block;
position:relative;
padding:0px;
- margin:0px 6px;
+ margin:0px 3px;
border-radius:5px;
-webkit-border-radius:5px;
}
@@ -316,9 +312,8 @@ li p{
#content{
position:relative;
- padding:20px 265px 30px 30px;
+ padding:30px 40px 40px 40px;
margin: 0px 5px;
- max-width:780px;
text-align:justify;
background-color:#fff;
min-height:400px;
@@ -327,65 +322,6 @@ li p{
-webkit-border-radius: 6px;
-moz-border-radius: 6px;
}
-#content.wide{
- padding:20px 40px 30px 30px;
- max-width:990px;
-}
-
-#rightbox{
- width:210px;
- position:absolute;
- right:30px;
- top:20px;
- border-radius:5px;
- -webkit-border-radius:5px;
- padding:5px;
-}
-#rightbox.wide{
- display:none;
-}
-
-#choose a,#before a,#support a{
- font-family:'Ubuntu', sans-serif;
- font-weight:300;
- padding:10px 8px 10px 48px;
- color:#fff;
- display:block;
- text-align:left;
- margin-bottom:10px;
- text-decoration:none;
- border-radius:5px;
- -webkit-border-radius:5px;
-}
-#choose img,#before img,#support img{
- vertical-align:middle;
- margin-right:8px;
- margin-left:-40px;
- width:32px;
- height:32px;
-}
-#before a,#support a{
- background-color:#2c6fad;
- border:1px solid #20598f;
- background-image:linear-gradient(bottom, #20598f 14%, #2c6fad 70%);
- background-image:-o-linear-gradient(bottom, #20598f 14%, #2c6fad 70%);
- background-image:-moz-linear-gradient(bottom, #20598f 14%, #2c6fad 70%);
- background-image:-webkit-linear-gradient(bottom, #20598f 14%, #2c6fad 70%);
- background-image:-ms-linear-gradient(bottom, #20598f 14%, #2c6fad 70%);
-}
-#choose a{
- padding:12px 8px 12px 48px;
- background-color:#e78406;
- border:1px solid #d57700;
- background-image:linear-gradient(bottom, #d57700 14%, #e78406 70%);
- background-image:-o-linear-gradient(bottom, #d57700 14%, #e78406 70%);
- background-image:-moz-linear-gradient(bottom, #d57700 14%, #e78406 70%);
- background-image:-webkit-linear-gradient(bottom, #d57700 14%, #e78406 70%);
- background-image:-ms-linear-gradient(bottom, #d57700 14%, #e78406 70%);
-}
-#choose a:hover,#before a:hover,#support a:hover{
- background-image:none;
-}
#footer{
position:relative;
@@ -393,20 +329,196 @@ li p{
padding:20px 0px 20px 40px;
text-align:left;
font-size:94%;
- max-width:1050px;
+ max-width:940px;
}
#footer div{
padding-top:6px;
}
#footer>div>a{
margin-right:15px;
+ white-space:nowrap;
+}
+#footer>div>span{
+ margin-top:15px;
+ display:block;
}
/*Styles specific to elements in pages*/
+.mainsummary, .mainvideo, .mainlist{
+ text-align:center;
+}
+.mainsummary{
+ font-size:145%;
+ color:#7b7c7c;
+ margin:20px auto 45px auto;
+}
+.mainvideo iframe{
+ width:640px;
+ height:360px;
+}
+.mainlist{
+ font-size:125%;
+ margin:30px 0px;
+}
+.mainlist>div{
+ width:250px;
+ display:inline-block;
+}
+.mainlist>div>div{
+ display:inline-block;
+ line-height:1.5em;
+ text-align:left;
+}
+.mainlist>div:first-child{
+ text-align:left;
+}
+.mainlist>div:first-child+div{
+ text-align:center;
+}
+.mainlist>div:first-child+div+div{
+ text-align:right;
+}
+.mainlist>div>div>div{
+ display:inline-block;
+}
+.mainlist img{
+ vertical-align:top;
+ position:relative;
+ top:4px;
+ margin-right:10px;
+ float:left;
+ height:48px;
+ width:48px;
+}
+.maindesc{
+ max-width:760px;
+ margin:auto;
+ line-height:1.5em;
+}
+.mainbutton{
+ text-align:center;
+}
+.mainbutton a,
+.mainbutton a:link,
+.mainbutton a:visited,
+.mainbutton a:active{
+ font-family:'Ubuntu', sans-serif;
+ font-weight:400;
+ font-size:150%;
+ text-shadow:0px 2px 6px rgba(0,0,0,0.6);
+ text-align:left;
+ display:inline-block;
+ background-color:#2c6fad;
+ border:1px solid #20598f;
+ background-image:linear-gradient(bottom, #20598f 14%, #2c6fad 70%);
+ background-image:-o-linear-gradient(bottom, #20598f 14%, #2c6fad 70%);
+ background-image:-moz-linear-gradient(bottom, #20598f 14%, #2c6fad 70%);
+ background-image:-webkit-linear-gradient(bottom, #20598f 14%, #2c6fad 70%);
+ background-image:-ms-linear-gradient(bottom, #20598f 14%, #2c6fad 70%);
+ color:#fff;
+ padding:15px 20px 20px 68px;
+ margin:40px 0px 40px 0px;
+ border-radius:12px;
+ -webkit-border-radius:12px;
+}
+.mainbutton a:hover{
+ background-image:none;
+ color:#fff;
+}
+.mainbutton img{
+ margin-right:10px;
+ margin-left:-52px;
+ margin-bottom:-12px;
+ height:42px;
+ width:42px;
+}
+.mainoverview{
+ font-size:130%;
+ text-align:center;
+ margin-bottom:10px;
+}
+.mainoverviews{
+ font-size:145%;
+ text-align:center;
+ margin-bottom:10px;
+}
+.mainoverviews a{
+ margin:5px 15px;
+ display:inline-block;
+}
+
+.start{
+ text-align:left;
+}
+.start>div:first-child+div{
+ border-top:1px solid #fad296;
+}
+.start div div{
+ display:inline-block;
+ width:380px;
+ vertical-align:top;
+ padding-bottom:15px;
+}
+.start>div>div:first-child{
+ padding-right:40px;
+}
+.start>div>div:first-child+div{
+ padding-left:40px;
+ border-left:1px solid #fad296;
+}
+.start div div div a,
+.start div div div a:link,
+.start div div div a:active,
+.start div div div a:visited{
+ display:inline-block;
+ padding:6px 12px;
+ margin-bottom:10px;
+ font-size:115%;
+ color:#fff;
+ border:1px solid #d57700;
+ background-color:#ee9209;
+ background-image:linear-gradient(bottom, #e28700 14%, #ee9209 70%);
+ background-image:-o-linear-gradient(bottom, #e28700 14%, #ee9209 70%);
+ background-image:-moz-linear-gradient(bottom, #e28700 14%, #ee9209 70%);
+ background-image:-webkit-linear-gradient(bottom, #e28700 14%, #ee9209 70%);
+ background-image:-ms-linear-gradient(bottom, #e28700 14%, #ee9209 70%);
+ border-radius:3px;
+ -webkit-border-radius:3px;
+}
+.start div div div a:hover{
+ background-image:none;
+ color:#fff;
+}
+.start h2{
+ color:#0d579b;
+}
+.start h2 span{
+ font-size:200%;
+ color:#ee9209;
+}
+.start p{
+ text-align:justify;
+}
+.start div div div{
+ display:block;
+ width:auto;
+}
+
+.introlink{
+ text-align:center;
+ font-size:125%;
+ font-weight:bold;
+ margin-top:30px;
+}
+
.titleicon{
width:32px;
height:32px;
+ vertical-align:middle;
+ margin-right:8px;
+ position:relative;
+ top:-2px;
}
.index,.index ul,.index li{
@@ -473,20 +585,32 @@ li p{
}
.resources{
+ text-align:left;
+}
+.resources>div:first-child+div{
+ border-top:1px solid #e0e0e0;
+}
+.resources div div{
+ display:inline-block;
+ width:380px;
+ vertical-align:top;
+ padding:10px 0px 25px 0px;
+ min-height:200px;
+}
+.resources>div>div:first-child{
+ padding-right:40px;
+}
+.resources>div>div:first-child+div{
+ padding-left:40px;
+ border-left:1px solid #e0e0e0;
+}
+.resources div div div{
+ display:block;
+ width:auto;
+}
+.resources p{
font-size:115%;
- font-weight:bold;
-}
-.resources ul{
- padding-top:5px;
-}
-.resources li{
- padding-top:6px;
-}
-.resources a,.resources a:link,.resources a:active,.resources a:visited{
- text-decoration:none;
-}
-.resources li ul li{
- font-weight:normal;
+ margin:6px 0px;
}
#chatbox{
@@ -519,13 +643,7 @@ li p{
}
.preview{
- width:880px;
- padding-left:40px;
- padding-top:15px;
- border:2px solid #eee;
- margin-top:30px;
- border-radius:8px;
- -webkit-border-radius:8px;
+ margin-top:-5px;
}
.previewcol{
clear:both;
@@ -601,7 +719,7 @@ li p{
background:url(/img/bubblebottom.svg) bottom center no-repeat;
height:64px;
}
-.previewrow>div>div>div>span{
+.previewrow>div>div>div>span {
position:absolute;
top:24px;
right:30px;
@@ -688,10 +806,16 @@ h2 .rssicon{
margin-bottom:40px;
max-width:600px;
}
+.versiontext h1{
+ text-align:left;
+}
.alerttext{
margin-bottom:40px;
}
+.alerttext h1{
+ text-align:left;
+}
.alertstatusinactive{
font-size:130%;
color:#0d579b;
@@ -709,10 +833,45 @@ h2 .rssicon{
font-weight:bold;
}
-.download a{
- font-size:125%;
+.download{
+ text-align:center;
+}
+.download h1,.download h2{
+ text-align:center;
+}
+.download .mainbutton a{
+ margin:10px 0px 35px 0px;
+}
+.downloadbox{
+ display:inline-block;
+ text-align:center;
+ border:2px solid #fad296;
+ padding:20px;
+ font-size:125%;
+ border-radius:12px;
+ -webkit-border-radius:12px;
+ margin:0px auto 20px auto;
+}
+.downloadbox p{
+ margin:0;
+ margin-top:20px;
+ margin-bottom:0px;
+}
+.downloadbox p:first-child{
+ margin-top:0px;
+ margin-bottom:20px;
+}
+.downloadbox a{
+ display:inline-block;
+}
+.downloadbox div{
+ margin:10px 0px;
+ text-align:left;
+}
+.downloadbox span{
+ width:16px;
+ height:16px;
display:inline-block;
- margin:5px 0px;
}
.download span{
width:16px;
@@ -723,20 +882,12 @@ h2 .rssicon{
.summary{
font-size:125%;
margin-bottom:40px;
+ text-align:center;
}
.summarytxt{
margin-bottom:40px;
}
-.foundation{
- max-width:500px;
- margin:40px auto;
- border:2px dashed #dfdfdf;
- padding:40px;
- border-radius:9px;
- -webkit-border-radius:9px;
-}
-
.press h2{
font-size:150%;
}
@@ -751,7 +902,7 @@ h2 .rssicon{
width:400px;
height:150px;
display:inline-block;
- margin-right:30px;
+ margin-right:20px;
margin-bottom:30px;
vertical-align:top;
}
@@ -799,7 +950,7 @@ h2 .rssicon{
border-radius: 8px;
}
.press-faq>div{
- width:400px;
+ width:380px;
display:inline-block;
vertical-align:top;
text-align:left;
@@ -840,7 +991,7 @@ h2 .rssicon{
}
.press-materials>div{
display:inline-block;
- width:300px;
+ width:278px;
vertical-align:top;
position:relative;
}
@@ -909,6 +1060,12 @@ h2 .rssicon{
img{
max-width:100%;
}
+ h1{
+ text-align:left;
+ }
+ .summary{
+ text-align:left;
+ }
#head{
margin:0px;
}
@@ -967,26 +1124,18 @@ h2 .rssicon{
display:inline-block;
margin:10px;
}
- #rightbox,#rightbox.wide{
- display:block;
- position:static;
- margin:30px auto 20px auto;
- }
- #content,#content.wide{
+ #content{
position:static;
margin:0px 5px;
padding:15px 10px 20px 10px;
}
#footer{
- padding:0px 0px 20px 5px;
+ padding:20px 0px 20px 5px;
background-color:transparent;
}
.contributors{
width:auto;
}
- .foundation{
- padding:20px;
- }
.preview{
display:none;
}
@@ -1023,11 +1172,66 @@ h2 .rssicon{
margin-right:0px;
margin-bottom: 20px;
}
+ .mainvideo{
+ position:relative;
+ padding-bottom:56.25%;
+ padding-top:30px;
+ height:0;
+ overflow:hidden;
+ }
+ .mainvideo iframe{
+ position:absolute;
+ top:0;
+ left:0;
+ width:100%;
+ height:100%;
+ }
+ .mainlist>div{
+ width:auto;
+ display:block;
+ }
+ .mainlist>div>div{
+ margin:10px;
+ }
+ .mainlist>div:first-child,.mainlist>div:first-child+div,.mainlist>div:first-child+div+div{
+ text-align:left;
+ }
+ .start>div:first-child+div{
+ border-top:0px;
+ }
+ .start div div{
+ display:block;
+ width:auto;
+ padding:0px;
+ }
+ .start>div>div:first-child{
+ padding-right:0px;
+ }
+ .start>div>div:first-child+div{
+ border-left:0px;
+ padding-left:0px;
+ }
+ .resources>div:first-child+div{
+ border-top:0px;
+ }
+ .resources div div{
+ display:block;
+ width:auto;
+ padding:0px 0px 10px 0px;
+ min-height:0;
+ }
+ .resources>div>div:first-child{
+ padding-right:0px;
+ }
+ .resources>div>div:first-child+div{
+ border-left:0px;
+ padding-left:0px;
+ }
}
/* Deprecated styles (should be removed when translations are updated) */
-#menufor{
+body.old #menufor{
margin:0px;
position:absolute;
top:8px;
@@ -1035,7 +1239,16 @@ h2 .rssicon{
padding:0px;
height:35px;
}
-#menufor li{
+body.old h1{
+ text-align:left;
+}
+body.old .summary{
+ text-align:left;
+}
+body.old .alert-message div div{
+ width:960px;
+}
+body.old #menufor li{
list-style:none;
float:left;
padding:0px;
@@ -1043,10 +1256,10 @@ h2 .rssicon{
border-radius:5px;
-webkit-left-radius:5px;
}
-#menufor li a,
-#menufor li a:active,
-#menufor li a:visited,
-#menufor li a:link{
+body.old #menufor li a,
+body.old #menufor li a:active,
+body.old #menufor li a:visited,
+body.old #menufor li a:link{
font-family:'Ubuntu', sans-serif;
font-weight:700;
font-size:105%;
@@ -1056,22 +1269,21 @@ h2 .rssicon{
color:#2c6fad;
white-space:nowrap;
}
-#menufor li:hover,
-#menufor li.active{
+body.old #menufor li:hover,
+body.old #menufor li.active{
background-color:#2c6fad;
}
-#menufor li:hover a,
-#menufor li.active a{
+body.old #menufor li:hover a,
+body.old #menufor li.active a{
border-radius:5px;
-webkit-left-radius:5px;
color:#fff;
}
-
-#menu{
+body.old #menu{
padding:0px;
margin:12px auto -12px 32px;
}
-#menu li{
+body.old #menu li{
list-style:none;
display:inline-block;
margin:0px;
@@ -1089,50 +1301,203 @@ h2 .rssicon{
border: 2px solid transparent;
white-space:nowrap;
}
-#menu li:hover a,
-#menu li.active a{
+body.old #menu li:hover a,
+body.old #menu li.active a{
color:#000;
background-color:#fff;
border:2px solid #ebebeb;
border-radius:3px;
-webkit-border-radius:3px;
}
+body.old #head>div{
+ max-width:1050px;
+}
+
+body.old #body{
+ max-width:1050px;
+}
+
+body.old #content{
+ padding:20px 265px 30px 30px;
+}
+body.old #content.wide{
+ padding:20px 40px 30px 30px;
+ max-width:990px;
+}
+
+body.old #rightbox{
+ width:210px;
+ position:absolute;
+ right:30px;
+ top:20px;
+ border-radius:5px;
+ -webkit-border-radius:5px;
+ padding:5px;
+}
+body.old #rightbox.wide{
+ display:none;
+}
+
+body.old #choose a,
+body.old #before a,
+body.old #support a{
+ font-family:'Ubuntu', sans-serif;
+ font-weight:300;
+ padding:10px 8px 10px 48px;
+ color:#fff;
+ display:block;
+ text-align:left;
+ margin-bottom:10px;
+ text-decoration:none;
+ border-radius:5px;
+ -webkit-border-radius:5px;
+}
+body.old #choose img,
+body.old #before img,
+body.old #support img{
+ vertical-align:middle;
+ margin-right:8px;
+ margin-left:-40px;
+ width:32px;
+ height:32px;
+}
+body.old #before a,
+body.old #support a{
+ background-color:#2c6fad;
+ border:1px solid #20598f;
+ background-image:linear-gradient(bottom, #20598f 14%, #2c6fad 70%);
+ background-image:-o-linear-gradient(bottom, #20598f 14%, #2c6fad 70%);
+ background-image:-moz-linear-gradient(bottom, #20598f 14%, #2c6fad 70%);
+ background-image:-webkit-linear-gradient(bottom, #20598f 14%, #2c6fad 70%);
+ background-image:-ms-linear-gradient(bottom, #20598f 14%, #2c6fad 70%);
+}
+body.old #choose a{
+ padding:12px 8px 12px 48px;
+ background-color:#e78406;
+ border:1px solid #d57700;
+ background-image:linear-gradient(bottom, #d57700 14%, #e78406 70%);
+ background-image:-o-linear-gradient(bottom, #d57700 14%, #e78406 70%);
+ background-image:-moz-linear-gradient(bottom, #d57700 14%, #e78406 70%);
+ background-image:-webkit-linear-gradient(bottom, #d57700 14%, #e78406 70%);
+ background-image:-ms-linear-gradient(bottom, #d57700 14%, #e78406 70%);
+}
+body.old #choose a:hover,
+body.old #before a:hover,
+body.old #support a:hover{
+ background-image:none;
+}
+
+body.old .downloadold a{
+ font-size:125%;
+ display:inline-block;
+ margin:5px 0px;
+}
+body.old .downloadold span{
+ width:16px;
+ height:16px;
+ display:inline-block;
+}
+
+body.old .preview{
+ margin-top:40px;
+}
+
+body.old #footer{
+ max-width:1050px;
+}
+body.old .foundation{
+ max-width:500px;
+ margin:40px auto;
+ border:2px dashed #dfdfdf;
+ padding:40px;
+ border-radius:9px;
+ -webkit-border-radius:9px;
+}
+body.old .preview{
+ width:880px;
+ padding-left:40px;
+ padding-top:15px;
+ border:2px solid #eee;
+ border-radius:8px;
+ -webkit-border-radius:8px;
+}
+body.old .resourcesold{
+ font-size:115%;
+ font-weight:bold;
+}
+body.old .resourcesold ul{
+ padding-top:5px;
+}
+body.old .resourcesold li{
+ padding-top:6px;
+}
+body.old .resourcesold a,
+body.old .resourcesold a:link,
+body.old .resourcesold a:active,
+body.old .resourcesold a:visited{
+ text-decoration:none;
+}
+body.old .resourcesold li ul li{
+ font-weight:normal;
+}
/* Deprecated styles specific to mobiles (should be removed when translations are updated) */
@media handheld, only screen and (max-device-height: 37em), only screen and (max-device-width: 50em){
- #menufor,
- #menu,
- #menusimple{
+ body.old #menufor,
+ body.old #menu{
display:none;
}
- #menufor{
+ body.old #menufor{
position:static;
bottom:0px;
margin:10px 0px 0px 0px;
height:auto;
}
- #menufor li{
+ body.old #menufor li{
float:none;
display:inline-block;
}
- #menufor li a,#menufor li a:active,#menufor li a:visited,#menufor li a:link{
+ body.old #menufor li a,
+ body.old #menufor li a:active,
+ body.old #menufor li a:visited,
+ body.old #menufor li a:link{
padding:6px 6px 3px 6px;
}
- #menufor li{
+ body.old #menufor li{
margin:6px;
}
- #menu{
+ body.old #menu{
position:static;
height:auto;
margin:10px 0px 10px 0px;
}
- #menu li{
+ body.old #menu li{
float:none;
display:inline-block;
padding: 5px;
}
- #menu li a,#menu li a:active,#menu li a:visited,#menu li a:link{
+ body.old #menu li a,
+ body.old #menu li a:active,
+ body.old #menu li a:visited,
+ body.old #menu li a:link{
padding:5px;
}
+ body.old #rightbox,
+ body.old #rightbox.wide{
+ display:block;
+ position:static;
+ margin:30px auto 20px auto;
+ }
+ body.old #content{
+ padding:15px 10px 20px 10px;
+ }
+ body.old #content.wide{
+ position:static;
+ margin:0px 5px;
+ padding:15px 10px 20px 10px;
+ }
+ body.old .foundation{
+ padding:20px;
+ }
}
diff --git a/_templates/bitcoin-for-businesses.html b/_templates/bitcoin-for-businesses.html
index 8656fa1e..b5c8fada 100755
--- a/_templates/bitcoin-for-businesses.html
+++ b/_templates/bitcoin-for-businesses.html
@@ -28,3 +28,11 @@ id: bitcoin-for-businesses
+ {{ content }}
+
+
+ 
{% translate transparency %}
{% translate transparencytext %}
+ +{% case page.lang %} +{% when 'ar' or 'de' or 'es' or 'fa' or 'fr' or 'it' or 'nl' or 'pl' or 'ru' or 'tr' %} +{% else %} +{% translate merchantintro %}
+
+{% endcase %}
+
diff --git a/_templates/bitcoin-for-developers.html b/_templates/bitcoin-for-developers.html
index 7e9c073e..904ae80d 100755
--- a/_templates/bitcoin-for-developers.html
+++ b/_templates/bitcoin-for-developers.html
@@ -22,3 +22,12 @@ id: bitcoin-for-developers
{% translate micro %}
{% translate microtext %}
+ +{% case page.lang %} +{% when 'ar' or 'de' or 'es' or 'fa' or 'fr' or 'it' or 'nl' or 'pl' or 'ru' or 'tr' %} +{% else %} +{% translate serviceslist %}
+{% translate apireference %}
+
+{% endcase %}
+
diff --git a/_templates/bitcoin-for-individuals.html b/_templates/bitcoin-for-individuals.html
index 1360947c..cf17a451 100755
--- a/_templates/bitcoin-for-individuals.html
+++ b/_templates/bitcoin-for-individuals.html
@@ -22,3 +22,9 @@ id: bitcoin-for-individuals
{% translate anonymous %}
{% translate anonymoustext %}
+ +{% case page.lang %} +{% when 'ar' or 'de' or 'es' or 'fa' or 'fr' or 'it' or 'nl' or 'pl' or 'ru' or 'tr' %} +{% else %} + +{% endcase %} diff --git a/_templates/community.html b/_templates/community.html index 660882b0..89220b0d 100644 --- a/_templates/community.html +++ b/_templates/community.html @@ -2,8 +2,11 @@ layout: base id: community --- +{% case page.lang %} +{% when 'ar' or 'de' or 'es' or 'fa' or 'fr' or 'it' or 'nl' or 'pl' or 'ru' or 'tr' %} +{% translate pagetitle %}
--
+
- {% translate foundation %} {% case page.lang %} {% when 'ar' or 'es' or 'fa' or 'it' or 'nl' or 'ru' %} @@ -49,3 +52,55 @@ id: community
- Polski portal bitcoin.pl {% endcase %}
{% translate pagetitle %}
+{% translate pagedesc %}
+ +
+
+
+
+
+
+
+
+ 
{% translate forums %}
+
+ {% translate bitcointalk %}
+ + +
+
+
+
{% translate social %}
+ {% translate linkgoogle %}
+ +{% translate facebook %}
+
+
+
+
+
+
+
+
+
+ 
{% translate meetups %}
+
+
+
+
+
+
+
+
{% translate irc %}
+ {% translate ircjoin %}
+#bitcoin {% translate chanbitcoin %} +
#bitcoin-dev {% translate chandev %} +
#bitcoin-otc {% translate chanotc %} +
#bitcoin-market {% translate chanmarket %} +
#bitcoin-mining {% translate chanmining %} + {% case page.lang %} + {% when 'fr' %} +
#bitcoin-fr (Le Bitcoin en général, français) + {% when 'es' %} +
#bitcoin-ar (Comunidad Bitcoin Argentina) +
#bitcoin-es (Comunidad Bitcoin en español) +
#bitcoin-otc-ar (Mercado OTC de Bitcoin en Argentina) + {% endcase %} +
{% translate wikiportal %}
+
+{% endcase %}
diff --git a/_templates/development.html b/_templates/development.html
index f58fc674..10a4c1a1 100755
--- a/_templates/development.html
+++ b/_templates/development.html
@@ -3,6 +3,11 @@ layout: base
id: development
---
{% translate pagetitle %}
+{% case page.lang %} +{% when 'ar' or 'de' or 'es' or 'fa' or 'fr' or 'it' or 'nl' or 'pl' or 'ru' or 'tr' %} +{% else %} +{% translate summary %}
+{% endcase %}{% translate spec %}
{% translate spectxt %}
diff --git a/_templates/download.html b/_templates/download.html index 2717c480..5014f84f 100755 --- a/_templates/download.html +++ b/_templates/download.html @@ -2,10 +2,13 @@ layout: base id: download --- +{% case page.lang %} +{% when 'ar' or 'de' or 'es' or 'fa' or 'fr' or 'it' or 'nl' or 'pl' or 'ru' or 'tr' %} +{% translate pagetitle %}
{% translate latestversion %}{{site.DOWNLOAD_VERSION}}
-+
{% translate downloadwinzip %} ~13MB
{% translate downloadwinexe %} ~9MB
{% translate downloadubu %}
@@ -17,3 +20,38 @@ id: download
{% translate notelicense %}
{% translate notesync %}
+ +{% else %} + + +
+ {% translate latestversion %}{{site.DOWNLOAD_VERSION}}
+
+
+
+
+{% endcase %}
diff --git a/_templates/events.html b/_templates/events.html
index c40c33f4..f6db15f6 100644
--- a/_templates/events.html
+++ b/_templates/events.html
@@ -13,7 +13,7 @@ id: events
{% endfilter_for %}
{% translate pagetitle %}
+{% translate latestversion %}{{site.DOWNLOAD_VERSION}}
+
+ 
{% translate download %}
+
+ {% translate downloados %}
+ + + + + +
{% translate downloadsource %} (GitHub)
+
+ {% translate notesync %}
+{% translate notelicense %}
+-
+
- {% translate meetupgroup %}
- {% translate meetupbitcointalk %}
- {% translate meetupwiki %} -
- {% translate meetupgroup %}
{% translate pagetitle %}
+ +{% translate pagedesc %}
+ +
+
diff --git a/_templates/index.html b/_templates/index.html
index 3555bf89..26835a57 100755
--- a/_templates/index.html
+++ b/_templates/index.html
@@ -2,6 +2,9 @@
layout: base
id: index
---
+{% case page.lang %}
+{% when 'ar' or 'de' or 'es' or 'fa' or 'fr' or 'it' or 'nl' or 'pl' or 'ru' or 'tr' %}
+
+
+
+
+
+
+
+
+{% translate pagetitle %}
{% translate listintro %}
-
@@ -12,3 +15,19 @@ id: index
{% translate desc %}
{% translate license %}
+ +{% else %} + +{% translate listintro %}
+
+
+ 
+ 
+ 
+
+{% translate list1 %}
{% translate list2 %}
{% translate list3 %}
{% translate desc %}
+
+{% translate overview %}
+{% translate menu-bitcoin-for-individuals layout %} {% translate menu-bitcoin-for-businesses layout %} {% translate menu-bitcoin-for-developers layout %}
+
+{% endcase %}
diff --git a/_templates/resources.html b/_templates/resources.html
index 416fa89f..2b2be725 100644
--- a/_templates/resources.html
+++ b/_templates/resources.html
@@ -2,8 +2,11 @@
layout: base
id: resources
---
+{% case page.lang %}
+{% when 'ar' or 'de' or 'es' or 'fa' or 'fr' or 'it' or 'nl' or 'pl' or 'ru' or 'tr' %}
+
{% translate pagetitle %}
--
+
- {% translate linkweusecoins %}
- {% translate linkwallets %}
- {% translate linkwiki %} @@ -22,7 +25,8 @@ id: resources
- {% translate linknews %}
- {% translate linkbitcoinmagazine %} -
- {% translate linkbitcoinnews %} +
- CoinDesk +
- The Genesis Block
- {% translate linkforumpress %}
@@ -33,3 +37,44 @@ id: resources
{% translate pagetitle %}
+{% translate pagedesc %}
+ +
+
+
+{% endcase %}
diff --git a/_templates/support-bitcoin.html b/_templates/support-bitcoin.html
index 82e87b31..9c018e80 100755
--- a/_templates/support-bitcoin.html
+++ b/_templates/support-bitcoin.html
@@ -17,6 +17,13 @@ id: support-bitcoin
+
+
+
+
+
+ 
{% translate useful %}
+
+ {% translate linkwiki %}
+ + +
+
+
+{% translate directories %}
+ {% translate linkwallets %} - bitcoin.org
+{% translate linkmerchants %} - usebitcoins.info
+{% translate linkexchanges %} - howtobuybitcoins.info
+{% translate linkmerchantstools %} - en.bitcoin.it
+
+
+
+
+
+
+
+
+
+
+
+
{% translate news %}
+
+
+
+
+
+ 
{% translate charts %}
{% translate donation %}
{% translate donationtxt %}
+{% case page.lang %} +{% when 'ar' or 'de' or 'es' or 'fa' or 'fr' or 'it' or 'nl' or 'pl' or 'ru' or 'tr' %} +{% else %} +
{% translate foundation %}
+{% translate foundationtxt %}
+{% endcase %} +{% translate spread %}
{% translate spreadtxt %}
diff --git a/_translations/en.yml b/_translations/en.yml index cebd3f56..d7a08cfc 100644 --- a/_translations/en.yml +++ b/_translations/en.yml @@ -65,6 +65,7 @@ en: multisigtext: "Bitcoin also includes a feature, not yet well known, which allows coins to be spent only if a subset of a group of people sign the transaction (so-called \"n of m\" transactions). This is the equivalent of the good old multi-signature cheque system that you might still use with banks today." transparency: "Accounting transparency" transparencytext: "Many organizations are required to produce accounting documents about their activity and to adopt good transparency practices. Using Bitcoin offers the highest level of transparency since your balance and your transactions are public for your members so long as you keep them aware of your Bitcoin addresses." + merchantintro: "Visit the merchant introduction guide on the wiki." bitcoin-for-developers: title: "Bitcoin for Developers - Bitcoin" pagetitle: "Bitcoin for Developers" @@ -81,6 +82,8 @@ en: securitytext: "Most parts of the security are handled by the protocol on the client and Bitcoin network side. Authenticity is verified through private keys, and double-spends are prevented through the Bitcoin network. That means no need for PCI compliance nor fraud detection. We love things that just work, don't we?" micro: "Cheap micro payments" microtext: "Bitcoin offers the lowest payment processing fees for any type of transaction, including micro-payments. This means that it can also be used to design and implement new creative online services that could not exist before only because of financial limitations." + serviceslist: "Visit the merchant services list on the wiki." + apireference: "Or read Bitcoin-Qt API reference and API calls list." bitcoin-for-individuals: title: "Bitcoin for Individuals - Bitcoin" pagetitle: "Bitcoin for Individuals" @@ -100,24 +103,32 @@ en: community: title: "Community - Bitcoin" pagetitle: "Bitcoin communities" - foundation: "Bitcoin Foundation Forum (members only)" - wikiportal: "Bitcoin Wiki - Community portal" - stackexchange: "Bitcoin StackExchange (Q&A)" + pagedesc: "Find interesting people, groups and communities around Bitcoin." + forums: "Forums" + foundation: "Bitcoin Foundation Forum (members only)" bitcointalk: "BitcoinTalk Forum" - ircjoin: "Join the project's lively IRC channels on the FreeNode networkor use the FreeNode Web IRC." + reddit: "Reddit's Bitcoin Community" + stackexchange: "Bitcoin StackExchange (Q&A)" + irc: "IRC Chat" + ircjoin: "IRC Channels on FreeNode." chanbitcoin: "(General Bitcoin-related)" chandev: "(Development and technical)" chanotc: "(Over The Counter exchange)" chanmarket: "(Live quotes from markets)" chanmining: "(Bitcoin mining related)" - linkgoogle: "Google+ Bitcoin community" - linktwitter: "Twitter Search" + social: "Social networks" + linkgoogle: "Google+ Bitcoin Community" + linktwitter: "Twitter Search" facebook: "Facebook Page" - reddit: "Reddit's Bitcoin community" - linkmeetup: "Bitcoin Meetup Groups" + meetups: "Meetups" + meetupevents: "Bitcoin Conferences And Events" + meetupgroup: "Bitcoin Meetup Groups" + meetupbitcointalk: "Bitcoin Meetups On BitcoinTalk" + meetupwiki: "Bitcoin Meetups On The Wiki" + wikiportal: "Visit the Community portal on the wiki." choose-your-wallet: title: "Choose your wallet - Bitcoin" - pagetitle: "Choose your wallet" + pagetitle: "Choose your Bitcoin wallet" summary: "Your Bitcoin wallet is what allows you to transact with the world. It gives you ownership of Bitcoin addresses that you can use to receive coins from other users and then lets you send those coins onwards. Just like email, you can receive bitcoins when you are offline, and all wallets are compatible with each other. Before you start with Bitcoin, be sure to read what you need to know first." getstarted: "Get started fast and easy" getstartedsum: "If you are new to Bitcoin, these wallets are a good place to begin." @@ -149,6 +160,7 @@ en: development: title: "Development - Bitcoin" pagetitle: "Bitcoin development" + summary: "Find more information about current specification, software and developers." spec: "Specification" spectxt: "If you are interested in learning more about the technical details of Bitcoin, it is recommended you start with these documents." speclink1: "Bitcoin: A Peer-to-Peer Electronic Cash System" @@ -166,6 +178,8 @@ en: title: "Download - Bitcoin" pagetitle: "Download Bitcoin-Qt" latestversion: "Latest version : " + download: "Download Bitcoin-Qt" + downloados: "Or choose your operating system" downloadwinzip: "Download for Windows (zip)" downloadwinexe: "Download for Windows (exe)" downloadubu: "Download for Ubuntu (PPA)" @@ -182,15 +196,26 @@ en: meetupbitcointalk: "Bitcoin meetups on BitcoinTalk" meetupwiki: "Bitcoin meetups on the Wiki" meetupgroup: "Bitcoin meetup groups" - foundation: - title: "Bitcoin Foundation - Bitcoin" - pagetitle: "Bitcoin Foundation" - mission: "Bitcoin Foundation standardizes, protects, and promotes the use of Bitcoin cryptographic money for the benefit of users worldwide." - visit: "Visit Bitcoin Foundation Website" + getting-started: + title: "Getting started - Bitcoin" + pagetitle: "Getting started with Bitcoin" + pagedesc: "Using Bitcoin to pay and get paid anywhere is easy. No rocket science involved." + inform: "Inform yourself" + informtxt: "Bitcoin is different than what you know and use every day. Before you start using Bitcoin, there are a few things that you need to know in order to use it securely and avoid common pitfalls." + informbut: "Read more" + choose: "Choose your wallet" + choosetxt: "You can bring a Bitcoin wallet in your everyday life with your mobile or you can have a wallet only for online payments on your computer. In any case, choosing your wallet can be done in a minute." + choosebut: "Choose your wallet" + get: "Get bitcoins" + gettxt: "You can get bitcoins by accepting them as a payment for goods and services or by buying them from a friend or someone near you. You can also buy them directly from an exchange with your bank account." + getbut: "Find an exchange" + spend: "Spend bitcoins" + spendtxt: "There is a growing number of services and merchants accepting Bitcoin all over the world. You can use Bitcoin to pay them and rate your experience to help honest businesses to gain more visibility." + spendbut: "Find merchants" how-it-works: title: "How does Bitcoin work? - Bitcoin" pagetitle: "How does Bitcoin work?" - intro: "OK, this is a question that often causes confusion. Here's a quick explanation!" + intro: "This is a question that often causes confusion. Here's a quick explanation!" basics: "The basics for a new user" basicstxt1: "As a new user, you only need to choose a wallet that you will install on your computer or on your mobile phone. Once you have your wallet installed, it will generate your first Bitcoin address and you can create more whenever you need one. You can disclose one of your Bitcoin addresses to your friends so that they can pay you or vice versa, you can pay your friends if they give you their addresses. In fact, this is pretty similar to how email works. So all that is left to do at this point is to get some bitcoins and to keep them safe. In order to start using Bitcoin, you are not required to understand the technical details." basicstxt2: "However, if you want to know more, keep reading!" @@ -203,15 +228,16 @@ en: readmore: "Going down the rabbit hole" readmoretxt: "This is only a very short and concise summary of the system. If you want to get into the details, you can read the original paper that describes the system's design, and explore the Bitcoin wiki." index: - title: "Bitcoin - Open source P2P digital currency" - pagetitle: "An open source P2P digital currency" - listintro: "Bitcoin is a digital currency, a protocol, and a software that enables" - list1: "Instant peer-to-peer transactions" - list2: "Worldwide payments" - list3: "Almost no processing fees" - list4: "And much more" - desc: "Bitcoin uses peer-to-peer technology to operate with no central authority; managing transactions and the issuing of bitcoins is carried out collectively by the network. Through many of its unique properties, Bitcoin allows exciting uses that could not be covered by any previous payment systems." - license: "The software is a community-driven, free, open-source project released under the MIT license." + title: "Bitcoin - Open source P2P money" + listintro: "Bitcoin is an innovative payment network and a new kind of money." + list1: "Instant peer-to-peer
transactions" + list2: "Worldwide
payments" + list3: "Zero or low
processing fees" + desc: "Bitcoin uses peer-to-peer technology to operate with no central authority or banks; managing transactions and the issuing of bitcoins is carried out collectively by the network. Bitcoin is open-source; its design is public, nobody owns or controls Bitcoin and everyone can take part. Through many of its unique properties, Bitcoin allows exciting uses that could not be covered by any previous payment system." + overview: "Or get a quick overview for" + individuals: "Individuals" + businesses: "Businesses" + developers: "Developers" innovation: title: "Innovation - Bitcoin" pagetitle: "Why Bitcoin is changing the world" @@ -233,28 +259,22 @@ en: resources: title: "Resources - Bitcoin" pagetitle: "Bitcoin resources" - linkweusecoins: "We Use Coins. Start here!" - linkwallets: "Bitcoin wallets" - linkwiki: "Bitcoin Wiki" - linkwikifaq: "FAQ" - linkwikisites: "Sites That Accept Bitcoin" - linkwikimerchant: "Merchant How-to" - linkcharts: "Bitcoin Charts" - linkbitcoincharts: "Bitcoin Charts - Markets" - linkblockchaininfo: "Blockchain.info - Stats and graphics" - linknews: "Bitcoin News" - linkbitcoinmagazine: "Bitcoin Magazine" - linkbitcoinnews: "Bitcoin News" - linkforumpress: "Bitcoin Forum / Press" - linkspec: "Bitcoin Specification" - linkpdf: "Bitcoin: A Peer-to-Peer Electronic Cash System" - linkprotocol: "Protocol rules" + pagedesc: "Find useful websites and resources about Bitcoin." + useful: "Useful places" + linkwiki: "Bitcoin Wiki" + directories: "Directories" + linkwallets: "Wallets" + linkmerchants: "Merchants" + linkexchanges: "Exchanges" + linkmerchantstools: "Merchant tools" + charts: "Charts and statistics" + news: "News" secure-your-wallet: title: "Securing your wallet - Bitcoin" pagetitle: "Securing your wallet" - summary: "Like in real life, your wallet must be secured. Bitcoin allows the transfer of value worldwide easier than ever. Such great features also come with great security concerns. At the same time, Bitcoin can provide very high levels of security if used correctly. Always remember that it is your responsibility to adopt good practices in order to protect your money. Here are some things you should consider." - online: "Be careful with online wallets" - onlinetxt: "Online wallets look like online banks. You are trusting someone to store and protect your bitcoins while you have to remember your password. However, you should always choose such services carefully. As of today, no online wallet provides enough insurance and security to be used to store value like a bank. Using security features like two-factor authentication can also increase the security of your acccounts." + summary: "Like in real life, your wallet must be secured. Bitcoin makes it possible to transfer value anywhere in a very easy way and it allows you to be in control of your money. Such great features also come with great security concerns. At the same time, Bitcoin can provide very high levels of security if used correctly. Always remember that it is your responsibility to adopt good practices in order to protect your money." + online: "Be careful with online wallets and exchanges" + 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 acccounts." backup: "Backup your wallet" backuptxt: "Bitcoin services and software allow you to backup your wallet. Stored in a safe place, a backup can protect you against computer failures and many human mistakes." backupwhole: "Backup your entire wallet" @@ -307,15 +327,17 @@ en: develop: "Development" developtxt: "Bitcoin is open-source. So if you are a developer, you can use your super-powers to do good and improve Bitcoin. Or you can build amazing new services or software that can use Bitcoin." donation: "Donation" - donationtxt: "The easiest way to help is to donate a few bitcoins or to join the Bitcoin Foundation. The Foundation funds the salary for the maintainers of the core Bitcoin software, organizes conferences, and provides other important resources." + donationtxt: "The easiest way to help is to donate a few bitcoins to the Bitcoin Foundation. Or you can help funding any project related to Bitcoin that you believe will be helpful in the future." + foundation: "Join the Foundation" + foundationtxt: "The Bitcoin Foundation is one of the largest organizations dedicated to standardize, protect and promote Bitcoin. It funds the salary for Bitcoin software maintainers, organizes conferences, and provides many important resources." spread: "Spread" spreadtxt: "Speak about Bitcoin to interested people. Write about it on your blog. Tell your favorite shops you would like to pay with Bitcoin. Or be creative and make yourself a nice Bitcoin T-shirt." wiki: "Wiki" wikitxt: "The Bitcoin wiki is full of useful and detailed information and we are constantly improving the information it contains - just like Wikipedia. You can help keep the wiki accurate and up-to-date." translate: "Translate" translatetxt: "You can help to increase Bitcoin availability by translating or improving translations inside important parts of the Bitcoin ecosystem. Just pick a project you would like to help." - help: "Help" - helptxt: "You can join Bitcoin communities to give help to new users. You can talk about Bitcoin with other people, and you can learn more about it every day." + help: "Meet the communities" + helptxt: "You can join Bitcoin communities and talk with other Bitcoin enthusiasts. You can learn more about Bitcoin every day, give help to new users and get involved in interesting projects." vocabulary: title: "Vocabulary - Bitcoin" pagetitle: "Some Bitcoin words you might hear" @@ -352,9 +374,9 @@ en: you-need-to-know: title: "Some things you need to know - Bitcoin" pagetitle: "Some things you need to know" - summary: "If you are about to explore Bitcoin, there are a few things you should know. Bitcoin does not let you send emails or take pictures; it lets you exchange money and value. As such, Bitcoin must be treated with the same care as your regular wallet, or even more in some cases!" + summary: "If you are about to explore Bitcoin, there are a few things you should know. Bitcoin lets you exchange money in a different way than with usual banks. As such, you should take time to inform yourself before using Bitcoin for any serious transaction. Bitcoin should be treated with the same care as your regular wallet, or even more in some cases!" secure: "Securing your wallet" - securetxt: "Like in real life, your wallet must be secured. Bitcoin allows the transfer of value worldwide easier than ever. Such great features also come with great security concerns. At the same time, Bitcoin can provide very high levels of security if used correctly. Always remember that it is your responsibility to adopt good practices in order to protect your money. Read more about securing your wallet." + securetxt: "Like in real life, your wallet must be secured. Bitcoin makes it possible to transfer value anywhere in a very easy way and it allows you to be in control of your money. Such great features also come with great security concerns. At the same time, Bitcoin can provide very high levels of security if used correctly. Always remember that it is your responsibility to adopt good practices in order to protect your money. Read more about securing your wallet." volatile: "Bitcoin price is volatile" volatiletxt: "The price of a bitcoin can unpredictably increase or decrease over a short period of time due to its young economy, novel nature, and sometimes illiquid markets. Consequently, keeping your savings in bitcoin is not recommended at this point. Bitcoin should be considered as a high risk asset, and you should never store money that you cannot afford to lose with Bitcoin. If you receive payments with Bitcoin, many service providers allow you to convert them instantly to your local currency." irreversible: "Bitcoin payments are irreversible" @@ -374,24 +396,25 @@ en: blockchain: the Block chain blockchaintxt: (a shared public transaction log) layout: - menu-intro: Introduction - menu-bitcoin-for-individuals: Individuals + menu-about: About + menu-about-us: "About bitcoin.org" menu-bitcoin-for-businesses: Businesses menu-bitcoin-for-developers: Developers - menu-how-it-works: "How it works" - menu-resources: Resources - menu-vocabulary: Vocabulary + menu-bitcoin-for-individuals: Individuals menu-community: Community menu-development: Development menu-events: Events - menu-innovation: Innovation menu-foundation: Foundation - menu-about: About - menu-about-us: "About bitcoin.org" - button-wallet: "Choose your wallet" - button-know: "You need to know" - button-support: "Support Bitcoin" + menu-getting-started: "Getting started" + menu-how-it-works: "How it works" + menu-innovation: Innovation + menu-intro: Introduction + menu-resources: Resources + menu-support-bitcoin: Participate + menu-vocabulary: Vocabulary + menu-you-need-to-know: "You need to know" footer: "© Bitcoin Project 2009–2013 Released under the MIT license" + getstarted: "Get started with Bitcoin" url: about: about about-us: about-us @@ -405,6 +428,7 @@ en: download: download events: events foundation: foundation + getting-started: getting-started how-it-works: how-it-works innovation: innovation resources: resources diff --git a/ar/css/main.css b/ar/css/main.css index f86eaaa9..c195093b 100644 --- a/ar/css/main.css +++ b/ar/css/main.css @@ -11,10 +11,6 @@ h1,h2{ h1,h2,h3{ text-align:right; } -h1 img,h2 img,h3 img{ - margin-right:auto; - margin-left:5px; -} ul{ padding-right:20px; padding-left:auto; @@ -40,33 +36,25 @@ p{ #menusimple li a:link{ font-family:'DroidNaskh', sans-serif; } -#content{ - padding:20px 30px 30px 265px; -} -#rightbox{ - left:30px; - right:auto; -} #footer{ text-align:right; padding:20px 40px 20px 0px; } -#rightbox{ - left:30px; - right:auto; +#footer>div>a{ + margin-right:0px; + margin-left:15px; } -#choose img, -#before img, -#support img, -#choose .ieimg, -#before .ieimg, -#support .ieimg{ - margin-right:-40px; - margin-left:8px; +.titleicon{ + margin-right:auto; + margin-left:5px; } -#choose>a:first-child,#before>a:first-child,#support>a:first-child{ - text-align:right; - padding:10px 48px 10px 8px; +h1 .rssicon{ + margin-left:0px; + margin-right:10px; +} +h2 .rssicon{ + margin-left:0px; + margin-right:10px; } .previewrow>div{ margin-right:auto; @@ -78,7 +66,7 @@ p{ .previewrow>div.last{ margin-left:0px; } -.previewrow>div>div>div>span{ +.previewrow>div>div>div>span { right:auto; left:30px; } @@ -121,23 +109,57 @@ p{ /* Deprecated styles (should be removed when translations are updated) */ -#menufor li a, -#menufor li a:active, -#menufor li a:visited, -#menufor li a:link{ +body.old #menufor li a, +body.old #menufor li a:active, +body.old #menufor li a:visited, +body.old #menufor li a:link{ font-family:'DroidNaskh', sans-serif; } -#menu li a, -#menu li a:active, -#menu li a:visited, -#menu li a:link{ +body.old #menu li a, +body.old #menu li a:active, +body.old #menu li a:visited, +body.old #menu li a:link{ font-family:'DroidNaskh', sans-serif; } +body.old h1,body.old h2{ + font-family:'DroidNaskh', sans-serif; +} +body.old h1,body.old h2,body.old h3{ + text-align:right; +} +body.old .summary{ + text-align:right; +} +body.old #content{ + padding:20px 30px 30px 265px; +} +body.old #rightbox{ + left:30px; + right:auto; +} +body.old #choose img, +body.old #before img, +body.old #support img, +body.old #choose .ieimg, +body.old #before .ieimg, +body.old #support .ieimg{ + margin-right:-40px; + margin-left:8px; +} +body.old #choose>a:first-child, +body.old #before>a:first-child, +body.old #support>a:first-child{ + text-align:right; + padding:10px 48px 10px 8px; +} /* Deprecated styles specific to mobiles (should be removed when translations are updated) */ @media handheld, only screen and (max-device-height: 37em), only screen and (max-device-width: 50em){ - #menufor{ + body.old #menufor{ bottom:0px; } + body.old #content{ + padding:15px 10px 20px 10px; + } } diff --git a/css/ie.css b/css/ie.css index 2a5fa6ba..580bac4e 100644 --- a/css/ie.css +++ b/css/ie.css @@ -2,21 +2,15 @@ body{ /*Allows to use :hover on any html tag using javascript*/ behavior:url("/css/csshover.htc"); } -h1 .ieimg, -h2 .ieimg, -h3 .ieimg{ - vertical-align:middle; - margin-right:5px; -} #head div{ - width:expression(this.parentNode.id&&this.parentNode.id=='head'?'1000px':''); + width:expression(this.parentNode.id&&this.parentNode.id=='head'?'940px':''); margin:expression(this.parentNode.id&&this.parentNode.id=='head'?'auto':''); position:expression(this.parentNode.id&&this.parentNode.id=='head'?'relative':''); z-index:expression(this.parentNode.id&&this.parentNode.id=='head'?'100':''); } #body{ - width:1000px; + width:940px; } #footer{ width:800px; @@ -24,13 +18,6 @@ h3 .ieimg{ #footer div a{ margin-right:expression(this.parentNode.nodeName=='DIV'?'15px':''); } -#content{ - width:690px; - overflow:hidden; -} -#content.wide{ - width:920px; -} #lang{ border-left:2px solid #f7f7f7; border-right:2px solid #f7f7f7; @@ -61,15 +48,121 @@ h3 .ieimg{ color:#fff; } -#choose a,#before a,#support a{ - font-family:sans-serif; -} -#choose .ieimg, -#before .ieimg, -#support .ieimg { +.titleicon{ vertical-align:middle; - margin-right:8px; - margin-left:-40px; + margin-right:5px; +} + +.mainlist div{ + /*This one is also required for IE7*/ + zoom:1; + display:inline; + width:250px; +} +.mainlist div div{ + zoom:1; + display:inline; + line-height:1.5em; + text-align:left; + width:auto; +} +.mainlist div div{ + text-align:left; +} +.mainlist div:first-child + div { + text-align:center; +} +.mainlist div:first-child + div + div { + text-align:right; +} +.mainlist .ieimg{ + vertical-align:top; + position:relative; + top:4px; + margin-right:10px; + float:left; + height:48px; + width:48px; +} + +.mainbutton a, +.mainbutton a:link, +.mainbutton a:visited, +.mainbutton a:active{ + /*This one is also required for IE7*/ + zoom:1; + display:inline; +} +.mainbutton a:hover, +.mainbutton a:link:hover, +.mainbutton a:visited:hover, +.mainbutton a:active:hover{ + background-image:none; + color:#fff; +} +.mainbutton .ieimg{ + margin-right:10px; + margin-left:-52px; + margin-bottom:-12px; + height:42px; + width:42px; +} + +.start div{ + border-top:expression((this.parentNode.getElementsByTagName('DIV')[5]==this)?'1px solid #fad296':''); +} +.start div div{ + /*This one is also required for IE7*/ + zoom:1; + display:inline; + padding-top:25px; + padding-right:expression(this.parentNode.getElementsByTagName('DIV')[0]==this?'40px':''); + padding-left:expression(this.parentNode.getElementsByTagName('DIV')[2]==this?'40px':''); + border-left:expression(this.parentNode.getElementsByTagName('DIV')[2]==this?'1px solid #fad296':''); +} +.start div div div{ + padding-top:0px; +} +.start>div>div:first-child+div{ + /*This one is for IE7 only*/ + border-top:0px; +} + +.resources div{ + border-top:expression((this.parentNode.getElementsByTagName('DIV')[3]==this)?'1px solid #e0e0e0':''); +} +.resources div div{ + /*This one is also required for IE7*/ + zoom:1; + display:inline; + padding-top:25px; + padding-right:expression(this.parentNode.getElementsByTagName('DIV')[0]==this?'40px':''); + padding-left:expression(this.parentNode.getElementsByTagName('DIV')[1]==this?'40px':''); + border-left:expression(this.parentNode.getElementsByTagName('DIV')[1]==this?'1px solid #e0e0e0':''); +} +.resources>div>div:first-child+div{ + /*This one is for IE7 only*/ + border-top:0px; +} + +.downloadbox{ + /*This one is also required for IE7*/ + zoom:1; + display:inline; +} +.downloadbox p{ + margin-top:expression(this.parentNode.getElementsByTagName('P')[0]==this?'0px':'20px'); + margin-bottom:expression(this.parentNode.getElementsByTagName('P')[0]==this?'20px':'0px'); +} +.downloadbox a{ + /*This one is also required for IE7*/ + zoom:1; + display:inline; +} +.downloadbox span{ + /*This one is also required for IE7*/ + zoom:1; + display:inline; } .alert-message a:hover, @@ -255,13 +348,12 @@ h3 .ieimg{ border:1px solid #a04246; } - .press-volunteer div div{ width: 400px; height: 150px; display: inline; zoom:1; - margin-right: 30px; + margin-right: 20px; margin-bottom: 30px; vertical-align: top; } @@ -292,7 +384,7 @@ h3 .ieimg{ vertical-align:top; text-align:left; margin-bottom:15px; - margin-right:30px; + margin-right:20px; } .press-faq div a{ display:inline; @@ -321,7 +413,7 @@ h3 .ieimg{ .press-materials div { display:inline; zoom:1; - width:300px; + width:278px; vertical-align:top; position:relative; } @@ -360,32 +452,62 @@ h3 .ieimg{ /* Deprecated styles (should be removed when translations are updated) */ -#menu li{ +body.old #menu li{ /*This one is also required for IE7*/ zoom:1; display:inline; } -#menu li a, -#menu li a:active, -#menu li a:visited, -#menu li a:link{ +body.old #menu li a, +body.old #menu li a:active, +body.old #menu li a:visited, +body.old #menu li a:link{ font-family:sans-serif; border:2px solid #f7f7f7; } -#menu li:hover a, -#menu li.active a{ +body.old #menu li:hover a, +body.old #menu li.active a{ color: #000; background-color: #fff; border: 2px solid #ebebeb; } -#menufor li a, -#menufor li a:active, -#menufor li a:visited, -#menufor li a:link{ +body.old #menufor li a, +body.old #menufor li a:active, +body.old #menufor li a:visited, +body.old #menufor li a:link{ font-family:sans-serif; } -#menufor li:hover a, -#menufor li.active a{ +body.old #menufor li:hover a, +body.old #menufor li.active a{ color:#fff; } +body.old #choose a, +body.old #before a, +body.old #support a{ + font-family:sans-serif; +} +body.old #choose .ieimg, +body.old #before .ieimg, +body.old #support .ieimg { + vertical-align:middle; + margin-right:8px; + margin-left:-40px; +} +body.old #content{ + overflow:hidden; + width:690px; +} +body.old #content.wide{ + width:920px; +} +body.old #head div{ + width:expression(this.parentNode.id&&this.parentNode.id=='head'?'1000px':''); +} +body.old #body{ + width:1000px; +} +body.old .downloadold span{ + /*This one is also required for IE7*/ + zoom:1; + display:inline; +} diff --git a/en/press.html b/en/press.html index 2db3a80b..66921c81 100755 --- a/en/press.html +++ b/en/press.html @@ -3,7 +3,6 @@ layout: base lang: en id: press title: "Bitcoin Press Center - Bitcoin" -mode: wide dialogs: title: "Bitcoin Press Center - Bitcoin" @@ -65,7 +64,7 @@ dialogs: faqponzitxt1: "A Ponzi scheme is a fraudulent investment operation that pays returns to its investors from their own money, or the money paid by subsequent investors, instead of from profit earned by the individual or organization running the operation." faqponzitxt2: "Bitcoin is an open-source software project with no central authority and consequently no one is in a position to make fraudulent representations about investment returns. Like other major currencies such as gold, United States dollars, Euros, Yen, etc. there is no guaranteed purchasing power and the exchange rate freely floats. This can lead to volatility where owners of bitcoins can make or lose value." faqponzitxt3: "Bitcoin is an innovative currency and payment system and not a Ponzi scheme. However, since Bitcoin transactions are irreversible it can be attractive for a Ponzi scam operator, and there have been several notable Ponzi scams which have failed and did use Bitcoin." - faqsatoshi: "Who is Satoshi Nakamoto, the creator of Bitcoin?" + faqsatoshi: "Who is Satoshi Nakamoto?" faqsatoshitxt: "The creator of Bitcoin never revealed his real identity and simply left his invention to the world. Satoshi created the first Bitcoin implementation and remained active in the development for a few years before choosing to leave the project. Meanwhile, a strong community of developers, miners, users, and supporters have spontaneously emerged to continue the project." faqworthless: "Can bitcoins become worthless?" faqworthlesstxt1: "Yes. There are thousands of currencies in the fiat currency graveyard as a result of hyperinflation, such as the German Mark, United States gold and silver certificates, Argentine Peso, and, more recently, the Zimbabwe Dollar. Unlike a physical currency, such as gold, Bitcoin is a completely virtual currency. While Bitcoin was designed to be censorship-resistant, to enable it to continue existing if there were to be some type of technological problem of significant severity, it is still possible, although more unlikely every day, that Bitcoin could stop working as intended. Then all bitcoins could become worthless." diff --git a/fa/css/main.css b/fa/css/main.css index f86eaaa9..c195093b 100644 --- a/fa/css/main.css +++ b/fa/css/main.css @@ -11,10 +11,6 @@ h1,h2{ h1,h2,h3{ text-align:right; } -h1 img,h2 img,h3 img{ - margin-right:auto; - margin-left:5px; -} ul{ padding-right:20px; padding-left:auto; @@ -40,33 +36,25 @@ p{ #menusimple li a:link{ font-family:'DroidNaskh', sans-serif; } -#content{ - padding:20px 30px 30px 265px; -} -#rightbox{ - left:30px; - right:auto; -} #footer{ text-align:right; padding:20px 40px 20px 0px; } -#rightbox{ - left:30px; - right:auto; +#footer>div>a{ + margin-right:0px; + margin-left:15px; } -#choose img, -#before img, -#support img, -#choose .ieimg, -#before .ieimg, -#support .ieimg{ - margin-right:-40px; - margin-left:8px; +.titleicon{ + margin-right:auto; + margin-left:5px; } -#choose>a:first-child,#before>a:first-child,#support>a:first-child{ - text-align:right; - padding:10px 48px 10px 8px; +h1 .rssicon{ + margin-left:0px; + margin-right:10px; +} +h2 .rssicon{ + margin-left:0px; + margin-right:10px; } .previewrow>div{ margin-right:auto; @@ -78,7 +66,7 @@ p{ .previewrow>div.last{ margin-left:0px; } -.previewrow>div>div>div>span{ +.previewrow>div>div>div>span { right:auto; left:30px; } @@ -121,23 +109,57 @@ p{ /* Deprecated styles (should be removed when translations are updated) */ -#menufor li a, -#menufor li a:active, -#menufor li a:visited, -#menufor li a:link{ +body.old #menufor li a, +body.old #menufor li a:active, +body.old #menufor li a:visited, +body.old #menufor li a:link{ font-family:'DroidNaskh', sans-serif; } -#menu li a, -#menu li a:active, -#menu li a:visited, -#menu li a:link{ +body.old #menu li a, +body.old #menu li a:active, +body.old #menu li a:visited, +body.old #menu li a:link{ font-family:'DroidNaskh', sans-serif; } +body.old h1,body.old h2{ + font-family:'DroidNaskh', sans-serif; +} +body.old h1,body.old h2,body.old h3{ + text-align:right; +} +body.old .summary{ + text-align:right; +} +body.old #content{ + padding:20px 30px 30px 265px; +} +body.old #rightbox{ + left:30px; + right:auto; +} +body.old #choose img, +body.old #before img, +body.old #support img, +body.old #choose .ieimg, +body.old #before .ieimg, +body.old #support .ieimg{ + margin-right:-40px; + margin-left:8px; +} +body.old #choose>a:first-child, +body.old #before>a:first-child, +body.old #support>a:first-child{ + text-align:right; + padding:10px 48px 10px 8px; +} /* Deprecated styles specific to mobiles (should be removed when translations are updated) */ @media handheld, only screen and (max-device-height: 37em), only screen and (max-device-width: 50em){ - #menufor{ + body.old #menufor{ bottom:0px; } + body.old #content{ + padding:15px 10px 20px 10px; + } } diff --git a/img/but_bitcoin.png b/img/but_bitcoin.png index f0e823bf..9fcf7eaa 100644 Binary files a/img/but_bitcoin.png and b/img/but_bitcoin.png differ diff --git a/img/but_bitcoin.svg b/img/but_bitcoin.svg index 091d88f9..a5fad582 100644 --- a/img/but_bitcoin.svg +++ b/img/but_bitcoin.svg @@ -9,17 +9,30 @@ 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" + width="42" + height="42" id="svg5494" version="1.1" - inkscape:version="0.48.3.1 r9886" - sodipodi:docname="icon-bitcoin.svg" + inkscape:version="0.48.4 r9939" + sodipodi:docname="but_bitcoin.svg" inkscape:export-filename="/var/www/img/ico-bitcoin.png" inkscape:export-xdpi="90" inkscape:export-ydpi="90">
{%translate pagetitle%}
-{%translate listintro%}
--
-
- {%translate list1%} -
- {%translate list2%} -
- {%translate list3%} -
- {%translate list4%} -
{%translate desc%}
-{%translate license%}
+{% translate listintro %}
+
+
+
+
+
+
+{% translate list1 %}
{% translate list2 %}
{% translate list3 %}
{% translate desc %}
+
+{% translate overview %}
+