From 21eed0ac0d0b351135f9a93675ca7fca67faa31a Mon Sep 17 00:00:00 2001
From: Radek Czajka
Date: Mon, 12 Jan 2015 11:18:30 +0100
Subject: [PATCH 1/1] Logos in footer, transl fix.
---
content/media/logo/fnp-footer.png | Bin 0 -> 4159 bytes
content/media/logo/trust-footer.png | Bin 0 -> 4779 bytes
content/texts/intro/introduction.html | 4 ++--
layout/footer.j2 | 3 +++
4 files changed, 5 insertions(+), 2 deletions(-)
create mode 100644 content/media/logo/fnp-footer.png
create mode 100644 content/media/logo/trust-footer.png
diff --git a/content/media/logo/fnp-footer.png b/content/media/logo/fnp-footer.png
new file mode 100644
index 0000000000000000000000000000000000000000..db0c788048c48e89f1e28bb3fdab566f80fb44eb
GIT binary patch
literal 4159
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
literal 0
HcmV?d00001
diff --git a/content/texts/intro/introduction.html b/content/texts/intro/introduction.html
index 164f526..28a2218 100644
--- a/content/texts/intro/introduction.html
+++ b/content/texts/intro/introduction.html
@@ -111,7 +111,7 @@ for the boat of freedom to glide.
Only two decades ago, it seemed that the societies
braided by communications network would defend
themselves. Slogans such as âInformation wants to
-be freeâ by Stewart Brand and âNetwork defines censorship as damage and celebrates it aroundâ by John
+be freeâ by Stewart Brand and âThe Net interprets censorship as damage and routes around itâ by John
Gillmore were extremely successful in 1990, and the
myth of the Web as the space of unfettered freedom
is sometimes taken as fact, what with the aftermath
@@ -133,4 +133,4 @@ to the well-known thesis democracy is a method of
avoiding the worst solutions, rather than choosing the
best. We hope that our report will help identify the directions of change that lead to disaster. To avoid them.
-{% endblock %}
\ No newline at end of file
+{% endblock %}
diff --git a/layout/footer.j2 b/layout/footer.j2
index 1b5467c..ac8a3ed 100644
--- a/layout/footer.j2
+++ b/layout/footer.j2
@@ -15,5 +15,8 @@
alt="CC BY-SA free license"
title="CC BY-SA free license" />
--
2.20.1