commit 789e5790c5e92eb6ab44e2eafc3ce63dc7d47151
Merge: 3a7ab1a b8382a4
Author: hiro
Date: Tue Jan 8 16:11:49 2019 +0100
Fix merge conflicts
.gitignore | 5 +-
assets/scss/_portal.scss| 10 +--
assets/scss/_tpo.scss | 34 +-
assets/static/images/circle-pattern.png | Bin 0 -> 556240 bytes
assets/static/images/circle-pattern.svg | 106
content/about/contents+es.lr| 3 -
content/about/history/contents+es.lr| 15 -
content/about/jobs/contents+es.lr | 1 -
i18n/contents.pot | 2 +-
templates/footer.html | 4 +-
templates/header.html | 4 +-
templates/hero-download.html| 10 +--
templates/hero-home.html| 8 +--
13 files changed, 148 insertions(+), 54 deletions(-)
diff --cc .gitignore
index 5dc82fe,5dc82fe..2baf5c4
--- a/.gitignore
+++ b/.gitignore
@@@ -5,11 -5,11 +5,14 @@@ node_module
public
++contents+*.lr
++
*.egg-info
*.pyc
__pycache__
--i18n/compiled
++### Lektor Temps ###
++*~*
### Emacs ###
# -*- mode: gitignore; -*-
diff --cc i18n/contents.pot
index 23d7e97,8ed1e3d..49ba97c
--- a/i18n/contents.pot
+++ b/i18n/contents.pot
@@@ -2,7 -2,7 +2,7 @@@ msgid "
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
- "POT-Creation-Date: 2018-12-17 15:38+CET\n"
-"POT-Creation-Date: 2018-12-12 23:30+CET\n"
++"POT-Creation-Date: 2018-12-19 13:51+CET\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME \n"
"Language-Team: en \n"
diff --cc templates/footer.html
index fd46bf5,e05ee23..fd3771e
--- a/templates/footer.html
+++ b/templates/footer.html
@@@ -1,12 -1,11 +1,12 @@@
-
+
- Download Tor Browser
+ Download Tor Browser
Download Tor Browser to experience real
private browsing without tracking, surveillance, or censorship.
-https://www.torproject.org/download/download-easy.html.en;>
+{% set download = site.get('/download') %}
+
{{ _("Download Tor Browser") }}
diff --cc templates/hero-download.html
index 6a4a059,000..6867d35
mode 100644,00..100644
--- a/templates/hero-download.html
+++ b/templates/hero-download.html
@@@ -1,38 -1,0 +1,38 @@@
-
++
+ Defend yourself.
+
-
- Protect yourself against tracking,
surveillance, and censorship.
++
++ Protect yourself against tracking,
surveillance, and censorship.
+
+
-
++
+
+
+
+ {% for id, item in bag('platforms+' + this.alt).items() %}
+{{
item.label }}
+ {% endfor %}
+
+
+
+
+
+ {% for id, item in bag('alternatives').items() %}
+{% if this.alt != id %}
+ {{ item.language
}}
+{% endif %}
+ {% endfor %}
+
+
+
+{{
_("Download Tor Browser") }}
+
+
+
+
-
++
+ Read the latest release
announcements.
+
+
+
+
diff --cc templates/hero-home.html
index f9de83c,000..666433d
mode 100644,00..100644
--- a/templates/hero-home.html
+++ b/templates/hero-home.html
@@@ -1,15 -1,0 +1,15 @@@
-
++
+ Browse Privately.
+
-
++
+ Explore Freely.
+
-
- Defend yourself against tracking and
surveillance. Circumnvent censorship.
++
++ Defend yourself against tracking and
surveillance. Circumnvent censorship.
+
+
+ {% set download = site.get('/download') %}
+
+{{ _("Download Tor Browser") }}
+
+
___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
