Recent changes to this wiki:

diff --git a/supporters.tr.po b/supporters.tr.po
index e48c60a..bf47086 100644
--- a/supporters.tr.po
+++ b/supporters.tr.po
@@ -19,7 +19,7 @@ msgstr ""
 #. type: Plain text
 #, no-wrap
 msgid "[[!meta title=\"User Data Manifesto Supporters\"]]\n"
-msgstr "[[!meta title=\"Kullanıcı Veri Manifestosu Destekçiler\"]]\n"
+msgstr "[[!meta title=\"Kullanıcı Veri Manifestosunu Destekleyenler\"]]\n"
 
 #. type: Title #
 #, no-wrap
@@ -85,4 +85,4 @@ msgid ""
 "supporters.mdwn) (This requires GitHub at the moment, but we'll fix this)"
 msgstr ""
 "[Desteğinizi ekleyin](https://github.com/userdatamanifesto/www/edit/master/"
-"supporters.mdwn) (Bu şu an GitHub gerektiriyor, ama bunu düzelteceğiz)"
+"supporters.mdwn) (Şimdilik GitHub gerekiyor, ama bunu düzelteceğiz)"

diff --git a/supporters.tr.po b/supporters.tr.po
index 6262a5c..e48c60a 100644
--- a/supporters.tr.po
+++ b/supporters.tr.po
@@ -8,10 +8,10 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "POT-Creation-Date: 2015-10-12 15:14+0000\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: \n"
+"PO-Revision-Date: 2017-02-19 11:25+0002\n"
+"Last-Translator: T. E. Kalayci <tekrei@fsfe.org>\n"
+"Language-Team: Turkish <>\n"
+"Language: tr \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -19,12 +19,12 @@ msgstr ""
 #. type: Plain text
 #, no-wrap
 msgid "[[!meta title=\"User Data Manifesto Supporters\"]]\n"
-msgstr ""
+msgstr "[[!meta title=\"Kullanıcı Veri Manifestosu Destekçiler\"]]\n"
 
 #. type: Title #
 #, no-wrap
 msgid "Organisations"
-msgstr ""
+msgstr "Örgütler"
 
 #. type: Plain text
 msgid "- KDE"
@@ -36,7 +36,7 @@ msgstr ""
 
 #. type: Plain text
 msgid "- Free Software Foundation Europe"
-msgstr ""
+msgstr "- Avrupa Özgür Yazılım Vakfı"
 
 #. type: Plain text
 msgid "- Netzpolitik.org"
@@ -65,7 +65,7 @@ msgstr ""
 #. type: Title #
 #, no-wrap
 msgid "Individuals"
-msgstr ""
+msgstr "Kişiler"
 
 #. type: Plain text
 msgid "- Frank Karlitschek"
@@ -84,3 +84,5 @@ msgid ""
 "[Add your support](https://github.com/userdatamanifesto/www/edit/master/"
 "supporters.mdwn) (This requires GitHub at the moment, but we'll fix this)"
 msgstr ""
+"[Desteğinizi ekleyin](https://github.com/userdatamanifesto/www/edit/master/"
+"supporters.mdwn) (Bu şu an GitHub gerektiriyor, ama bunu düzelteceğiz)"

diff --git a/sidebar.tr.po b/sidebar.tr.po
index 92592cb..9c3c62a 100644
--- a/sidebar.tr.po
+++ b/sidebar.tr.po
@@ -1,4 +1,4 @@
-# Yandaki menünün Türkçe Çeviris
+# Yandaki menünün Türkçe Çevirisi
 # Copyright (C) YEAR Free Software Foundation, Inc.
 # This file is distributed under the same license as the PACKAGE package.
 # T. E. Kalayci <tekrei@fsfe.org>, 2017.

[TR] Translation of latest side menu
diff --git a/sidebar.tr.po b/sidebar.tr.po
index 6020082..92592cb 100644
--- a/sidebar.tr.po
+++ b/sidebar.tr.po
@@ -1,7 +1,7 @@
-# SOME DESCRIPTIVE TITLE
+# Yandaki menünün Türkçe Çeviris
 # Copyright (C) YEAR Free Software Foundation, Inc.
 # This file is distributed under the same license as the PACKAGE package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+# T. E. Kalayci <tekrei@fsfe.org>, 2017.
 #
 #, fuzzy
 msgid ""
@@ -16,24 +16,17 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#. type: Plain text
-#, fuzzy, no-wrap
-#| msgid ""
-#| "<ul class=\"nav\" role=\"menu\">\n"
-#| "<li>[[About this wiki|about]]</li>\n"
-#| "<li>[[Frequently Asked Questions|faq]]</li>\n"
-#| "<li>[[Discussion|Discussion/English/]]</li>\n"
-#| "<li><a href=\"/ikiwiki.cgi?P=\">Search</a></li>\n"
-#| "</ul>\n"
 msgid ""
 "<ul class=\"nav\" role=\"menu\">\n"
 "<li>[[About this wiki|about]]</li>\n"
 "<li>[[Frequently Asked Questions|faq]]</li>\n"
+"<li>[[Discussion|Discussion/English/]]</li>\n"
 "<li><a href=\"/ikiwiki.cgi?P=\">Search</a></li>\n"
 "</ul>\n"
 msgstr ""
 "<ul class=\"nav\" role=\"menu\">\n"
-"<li>[[Viki hakkında|about]]</li>\n"
-"<li>[[Sık Sorulan Sorular|faq]]</li>\n"
+"<li>[[Viki hakkında|hakkında]]</li>\n"
+"<li>[[Sıkça Sorulan Sorukar|sss]]</li>\n"
+"<li>[[Tartışma|Tartışma/Türkçe/]]</li>\n"
 "<li><a href=\"/ikiwiki.cgi?P=\">Arama</a></li>\n"
 "</ul>\n"

diff --git a/faq.fr.po b/faq.fr.po
index 8d476f2..5d2dfff 100644
--- a/faq.fr.po
+++ b/faq.fr.po
@@ -18,8 +18,8 @@ msgstr ""
 
 #. type: Bullet: ' 1. '
 msgid ""
-"what’s the difference between *personal data* protection and *user data* "
-"rights?"
+"Quelle est la différence entre la protection *des données personnelles* et *le droit d'accès aux données* "
+"de l'utilisateur?"
 msgstr ""
 
 #. type: Plain text

updated PO files
diff --git a/tags/__34__.de.po b/tags/__34__.de.po
new file mode 100644
index 0000000..a458804
--- /dev/null
+++ b/tags/__34__.de.po
@@ -0,0 +1,29 @@
+# SOME DESCRIPTIVE TITLE
+# Copyright (C) YEAR Free Software Foundation, Inc.
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"POT-Creation-Date: 2014-08-29 13:46+0000\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#. type: Plain text
+#, no-wrap
+msgid "[[!meta title=\"pages tagged \"\"]]\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+"[[!inline pages=\"tagged(__34__)\" actions=\"no\" archive=\"yes\"\n"
+"feedshow=10]]\n"
+msgstr ""
diff --git a/tags/__34__.fr.po b/tags/__34__.fr.po
new file mode 100644
index 0000000..a458804
--- /dev/null
+++ b/tags/__34__.fr.po
@@ -0,0 +1,29 @@
+# SOME DESCRIPTIVE TITLE
+# Copyright (C) YEAR Free Software Foundation, Inc.
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"POT-Creation-Date: 2014-08-29 13:46+0000\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#. type: Plain text
+#, no-wrap
+msgid "[[!meta title=\"pages tagged \"\"]]\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+"[[!inline pages=\"tagged(__34__)\" actions=\"no\" archive=\"yes\"\n"
+"feedshow=10]]\n"
+msgstr ""
diff --git a/tags/__34__.ja.po b/tags/__34__.ja.po
new file mode 100644
index 0000000..a458804
--- /dev/null
+++ b/tags/__34__.ja.po
@@ -0,0 +1,29 @@
+# SOME DESCRIPTIVE TITLE
+# Copyright (C) YEAR Free Software Foundation, Inc.
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"POT-Creation-Date: 2014-08-29 13:46+0000\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#. type: Plain text
+#, no-wrap
+msgid "[[!meta title=\"pages tagged \"\"]]\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+"[[!inline pages=\"tagged(__34__)\" actions=\"no\" archive=\"yes\"\n"
+"feedshow=10]]\n"
+msgstr ""
diff --git a/tags/__34__.tr.po b/tags/__34__.tr.po
new file mode 100644
index 0000000..a458804
--- /dev/null
+++ b/tags/__34__.tr.po
@@ -0,0 +1,29 @@
+# SOME DESCRIPTIVE TITLE
+# Copyright (C) YEAR Free Software Foundation, Inc.
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"POT-Creation-Date: 2014-08-29 13:46+0000\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#. type: Plain text
+#, no-wrap
+msgid "[[!meta title=\"pages tagged \"\"]]\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+"[[!inline pages=\"tagged(__34__)\" actions=\"no\" archive=\"yes\"\n"
+"feedshow=10]]\n"
+msgstr ""

creating tag page tags/__34__
diff --git a/tags/__34__.mdwn b/tags/__34__.mdwn
new file mode 100644
index 0000000..f26a8ab
--- /dev/null
+++ b/tags/__34__.mdwn
@@ -0,0 +1,4 @@
+[[!meta title="pages tagged ""]]
+
+[[!inline pages="tagged(__34__)" actions="no" archive="yes"
+feedshow=10]]

updated PO files
diff --git a/README.de.po b/README.de.po
new file mode 100644
index 0000000..9263390
--- /dev/null
+++ b/README.de.po
@@ -0,0 +1,55 @@
+# SOME DESCRIPTIVE TITLE
+# Copyright (C) YEAR Free Software Foundation, Inc.
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"POT-Creation-Date: 2016-05-07 15:39+0000\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#. type: Title #
+#, no-wrap
+msgid "user data manifesto 2.0"
+msgstr ""
+
+#. type: Plain text
+msgid ""
+"In 2012, Frank published the userdatamanifesto.org -- in 2014, a draft for "
+"version 2 was published at http://userdatamanifesto.org/2.0 along with a "
+"wiki at http://udm.branchable.com"
+msgstr ""
+
+#. type: Plain text
+msgid ""
+"We acknowledge that today, computers, networks and online services have "
+"socially complex implications. The days where personal computing only "
+"happened on personal computers are long gone (if they ever really existed).  "
+"This isn't an excuse for accepting that our rights and freedom be "
+"violated. It behooves us to demand freedom on the Internet and to refuse "
+"feudalism."
+msgstr ""
+
+#. type: Plain text
+msgid ""
+"This is why we want to improve the User Data Manifesto to define the basic "
+"rights all users of Internet and Web services ought to have."
+msgstr ""
+
+#. type: Plain text
+msgid ""
+"Please join us in writing this document. Feel free to fork, edit, add "
+"comments."
+msgstr ""
+
+#. type: Plain text
+msgid "To translate, edit the \".po\" files."
+msgstr ""
diff --git a/README.fr.po b/README.fr.po
new file mode 100644
index 0000000..9263390
--- /dev/null
+++ b/README.fr.po
@@ -0,0 +1,55 @@
+# SOME DESCRIPTIVE TITLE
+# Copyright (C) YEAR Free Software Foundation, Inc.
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"POT-Creation-Date: 2016-05-07 15:39+0000\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#. type: Title #
+#, no-wrap
+msgid "user data manifesto 2.0"
+msgstr ""
+
+#. type: Plain text
+msgid ""
+"In 2012, Frank published the userdatamanifesto.org -- in 2014, a draft for "
+"version 2 was published at http://userdatamanifesto.org/2.0 along with a "
+"wiki at http://udm.branchable.com"
+msgstr ""
+
+#. type: Plain text
+msgid ""
+"We acknowledge that today, computers, networks and online services have "
+"socially complex implications. The days where personal computing only "
+"happened on personal computers are long gone (if they ever really existed).  "
+"This isn't an excuse for accepting that our rights and freedom be "
+"violated. It behooves us to demand freedom on the Internet and to refuse "
+"feudalism."
+msgstr ""
+
+#. type: Plain text
+msgid ""
+"This is why we want to improve the User Data Manifesto to define the basic "
+"rights all users of Internet and Web services ought to have."
+msgstr ""
+
+#. type: Plain text
+msgid ""
+"Please join us in writing this document. Feel free to fork, edit, add "
+"comments."
+msgstr ""
+
+#. type: Plain text
+msgid "To translate, edit the \".po\" files."
+msgstr ""
diff --git a/README.ja.po b/README.ja.po
new file mode 100644
index 0000000..9263390
--- /dev/null
+++ b/README.ja.po
@@ -0,0 +1,55 @@
+# SOME DESCRIPTIVE TITLE
+# Copyright (C) YEAR Free Software Foundation, Inc.
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"POT-Creation-Date: 2016-05-07 15:39+0000\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#. type: Title #
+#, no-wrap
+msgid "user data manifesto 2.0"
+msgstr ""
+
+#. type: Plain text
+msgid ""
+"In 2012, Frank published the userdatamanifesto.org -- in 2014, a draft for "
+"version 2 was published at http://userdatamanifesto.org/2.0 along with a "
+"wiki at http://udm.branchable.com"
+msgstr ""
+
+#. type: Plain text
+msgid ""
+"We acknowledge that today, computers, networks and online services have "
+"socially complex implications. The days where personal computing only "
+"happened on personal computers are long gone (if they ever really existed).  "
+"This isn't an excuse for accepting that our rights and freedom be "
+"violated. It behooves us to demand freedom on the Internet and to refuse "
+"feudalism."
+msgstr ""
+
+#. type: Plain text
+msgid ""
+"This is why we want to improve the User Data Manifesto to define the basic "
+"rights all users of Internet and Web services ought to have."
+msgstr ""
+
+#. type: Plain text
+msgid ""
+"Please join us in writing this document. Feel free to fork, edit, add "
+"comments."
+msgstr ""
+
+#. type: Plain text
+msgid "To translate, edit the \".po\" files."
+msgstr ""
diff --git a/README.tr.po b/README.tr.po
new file mode 100644
index 0000000..9263390
--- /dev/null
+++ b/README.tr.po
@@ -0,0 +1,55 @@
+# SOME DESCRIPTIVE TITLE
+# Copyright (C) YEAR Free Software Foundation, Inc.
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"POT-Creation-Date: 2016-05-07 15:39+0000\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"

(Diff truncated)
updated PO files
diff --git a/supporters.de.po b/supporters.de.po
index 101c47f..6262a5c 100644
--- a/supporters.de.po
+++ b/supporters.de.po
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2015-08-30 17:21+0000\n"
+"POT-Creation-Date: 2015-10-12 15:14+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -58,6 +58,10 @@ msgstr ""
 msgid "- ownCloud"
 msgstr ""
 
+#. type: Plain text
+msgid "- IndieHosters"
+msgstr ""
+
 #. type: Title #
 #, no-wrap
 msgid "Individuals"
diff --git a/supporters.el.po b/supporters.el.po
index 5ad1618..6262a5c 100644
--- a/supporters.el.po
+++ b/supporters.el.po
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2015-09-01 15:18+0000\n"
+"POT-Creation-Date: 2015-10-12 15:14+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -58,6 +58,10 @@ msgstr ""
 msgid "- ownCloud"
 msgstr ""
 
+#. type: Plain text
+msgid "- IndieHosters"
+msgstr ""
+
 #. type: Title #
 #, no-wrap
 msgid "Individuals"
@@ -77,7 +81,6 @@ msgstr ""
 
 #. type: Plain text
 msgid ""
-"[Add your "
-"support](https://github.com/userdatamanifesto/www/edit/master/supporters.mdwn) "
-"(This requires GitHub at the moment, but we'll fix this)"
+"[Add your support](https://github.com/userdatamanifesto/www/edit/master/"
+"supporters.mdwn) (This requires GitHub at the moment, but we'll fix this)"
 msgstr ""
diff --git a/supporters.fr.po b/supporters.fr.po
index 101c47f..6262a5c 100644
--- a/supporters.fr.po
+++ b/supporters.fr.po
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2015-08-30 17:21+0000\n"
+"POT-Creation-Date: 2015-10-12 15:14+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -58,6 +58,10 @@ msgstr ""
 msgid "- ownCloud"
 msgstr ""
 
+#. type: Plain text
+msgid "- IndieHosters"
+msgstr ""
+
 #. type: Title #
 #, no-wrap
 msgid "Individuals"
diff --git a/supporters.ja.po b/supporters.ja.po
index 101c47f..6262a5c 100644
--- a/supporters.ja.po
+++ b/supporters.ja.po
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2015-08-30 17:21+0000\n"
+"POT-Creation-Date: 2015-10-12 15:14+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -58,6 +58,10 @@ msgstr ""
 msgid "- ownCloud"
 msgstr ""
 
+#. type: Plain text
+msgid "- IndieHosters"
+msgstr ""
+
 #. type: Title #
 #, no-wrap
 msgid "Individuals"
diff --git a/supporters.tr.po b/supporters.tr.po
index 101c47f..6262a5c 100644
--- a/supporters.tr.po
+++ b/supporters.tr.po
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2015-08-30 17:21+0000\n"
+"POT-Creation-Date: 2015-10-12 15:14+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -58,6 +58,10 @@ msgstr ""
 msgid "- ownCloud"
 msgstr ""
 
+#. type: Plain text
+msgid "- IndieHosters"
+msgstr ""
+
 #. type: Title #
 #, no-wrap
 msgid "Individuals"

UDM now supported by IndieHosters https://t.co/qAmJm1dnqM
diff --git a/supporters.mdwn b/supporters.mdwn
index 308287e..2866c66 100644
--- a/supporters.mdwn
+++ b/supporters.mdwn
@@ -18,6 +18,8 @@
 
 - ownCloud
 
+- IndieHosters
+
 # Individuals
 
 - Frank Karlitschek

direct link to english version for now until we fix the translation plugin
diff --git a/index.php b/index.php
index d63f43d..91f9ca0 100644
--- a/index.php
+++ b/index.php
@@ -49,7 +49,7 @@
 		</div>
 
 		<div class="more-button-row center">
-			<a href="https://udm.branchable.com/" class="more-button" target="_blank">Read more & participate!</a>
+			<a href="https://udm.branchable.com/index.en.html" class="more-button" target="_blank">Read more & participate!</a>
 		</div>
 	</body>
 </html>

updated PO files
diff --git a/about.el.po b/about.el.po
index ee191c4..9e296c9 100644
--- a/about.el.po
+++ b/about.el.po
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2015-09-01 15:18+0000\n"
+"POT-Creation-Date: 2015-10-12 14:44+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -24,8 +24,8 @@ msgstr ""
 
 #. type: Plain text
 msgid ""
-"The official page of the [user data manifesto][udm2] is "
-"<http://userdatamanifesto.org/>. Please spread the word!"
+"The official page of the [user data manifesto][udm2] is <http://"
+"userdatamanifesto.org/>. Please spread the word!"
 msgstr ""
 
 #. type: Plain text
@@ -34,8 +34,22 @@ msgstr ""
 
 #. type: Plain text
 msgid ""
-"Sources should also be available [on "
-"Github](https://github.com/userdatamanifesto)."
+"We are currently facing issues with the translation module for ikiwiki. We "
+"have backed up previous translations at <https://github.com/"
+"userdatamanifesto/www/tree/master/translationsBackups>."
+msgstr ""
+
+#. type: Plain text
+msgid ""
+"If you wish to contribute a translation in additional languages, please open "
+"a new issue on Github <https://github.com/userdatamanifesto/www/issues/> or "
+"[[Get_in_touch|contact]]."
+msgstr ""
+
+#. type: Plain text
+msgid ""
+"Sources should also be available [on Github](https://github.com/"
+"userdatamanifesto)."
 msgstr ""
 
 #. type: Plain text
@@ -43,5 +57,6 @@ msgid "Wiki [hosted by branchable]."
 msgstr ""
 
 #. type: Plain text
-msgid "[hosted by branchable]: http://udm.branchable.com/ikiwiki.cgi?do=branchable"
+msgid ""
+"[hosted by branchable]: http://udm.branchable.com/ikiwiki.cgi?do=branchable"
 msgstr ""
diff --git a/contact.el.po b/contact.el.po
new file mode 100644
index 0000000..a0efb08
--- /dev/null
+++ b/contact.el.po
@@ -0,0 +1,21 @@
+# SOME DESCRIPTIVE TITLE
+# Copyright (C) YEAR Free Software Foundation, Inc.
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"POT-Creation-Date: 2015-10-12 14:44+0000\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#. type: Plain text
+msgid "To contact us, please write to hugo+udmwiki at ampoliros.net"
+msgstr ""
diff --git "a/news/amendmentsR\303\251publiqueNum\303\251rique.el.po" "b/news/amendmentsR\303\251publiqueNum\303\251rique.el.po"
new file mode 100644
index 0000000..f4560f4
--- /dev/null
+++ "b/news/amendmentsR\303\251publiqueNum\303\251rique.el.po"
@@ -0,0 +1,79 @@
+# SOME DESCRIPTIVE TITLE
+# Copyright (C) YEAR Free Software Foundation, Inc.
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"POT-Creation-Date: 2015-10-12 14:44+0000\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+"[[!meta title=\"In support of user data rights in France's République "
+"Numérique draft law\"]]\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid "[[!meta language=\"en\"]]\n"
+msgstr ""
+
+#. type: Plain text
+msgid ""
+"The French government has launched a platform to solicit contributions on "
+"its draft law « république numérique » (digital republic). A section of the "
+"law would give rise to the recognition of user data rights regarding "
+"“portability” of data."
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+"Today, with La Quadrature du Net, we are adding our own amendment in\n"
+"order to recognise users' <strong>right to know how their data is\n"
+"stored</strong>. We think that when the data you use is stored online\n"
+"by a specific provider, users should be informed about where that\n"
+"specific service provider stores the data, <strong>how long, in which\n"
+"jurisdiction</strong> the specific service provider operates, and\n"
+"which laws apply.\n"
+msgstr ""
+
+#. type: Plain text
+msgid ""
+"You can join us and support this proposal: "
+"<https://www.republique-numerique.fr/consultations/projet-de-loi-numerique/consultation/consultation/opinions/section-2-portabilite-des-donnees/article-12-portabilite-des-donnees/versions/consacrer-un-droit-d-information-sur-les-modalites-du-stockage-des-fichiers-et-donnees-utilisateur>"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+"In the User Data Manifesto, we also demand that users have the\n"
+"<strong>freedom to choose a platform</strong>, i.e. users should\n"
+"always be able to extract their data from the service at any time\n"
+"without experiencing any vendor lock-in. Open standards for formats\n"
+"and protocols are necessary to guarantee this.\n"
+msgstr ""
+
+#. type: Plain text
+msgid ""
+"Please support this amendment in order to make this user data right more "
+"effective: "
+"<https://www.republique-numerique.fr/consultations/projet-de-loi-numerique/consultation/consultation/opinions/section-2-portabilite-des-donnees/article-12-portabilite-des-donnees/versions/consacrer-un-droit-effectif-a-la-portabilite>."
+msgstr ""
+
+#. type: Plain text
+msgid ""
+"If you have other inspired ideas in line with the user data manifesto that "
+"could be implemented into law, feel free to suggest them! Contributions and "
+"votes are still accepted until the end of the week."
+msgstr ""
diff --git a/news/launchingVersion2dot0.el.po b/news/launchingVersion2dot0.el.po
index 6283481..ac02ea8 100644
--- a/news/launchingVersion2dot0.el.po
+++ b/news/launchingVersion2dot0.el.po
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2015-09-01 15:18+0000\n"
+"POT-Creation-Date: 2015-10-12 14:44+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -29,28 +29,18 @@ msgstr ""
 #. type: Plain text
 msgid ""
 "Today, the main authors of the User Data Manifesto have announced the "
-"release of version 2.0 during the [ownCloud Contributor "
-"Conference](https://owncloud.org/conf/) in Berlin."
+"release of version 2.0 during the [ownCloud Contributor Conference](https://"
+"owncloud.org/conf/) in Berlin."
 msgstr ""
 
 #. type: Plain text
 #, no-wrap
-msgid ""
-"> “The version 1.0 was instantly very popular and I got a ton of positive "
-"feedback and support. But over the time it also became clear that a few "
-"things could be expressed in a simpler and clearer way. So the idea came up "
-"to do a revision of the manifesto based on all the feedback” [says Frank "
-"Karlitschek](http://karlitschek.de/2015/08/user-data-manifesto-2-0-launched/) "

(Diff truncated)
updated PO files
diff --git "a/news/amendmentsR\303\251publiqueNum\303\251rique.de.po" "b/news/amendmentsR\303\251publiqueNum\303\251rique.de.po"
new file mode 100644
index 0000000..b69bf2e
--- /dev/null
+++ "b/news/amendmentsR\303\251publiqueNum\303\251rique.de.po"
@@ -0,0 +1,79 @@
+# SOME DESCRIPTIVE TITLE
+# Copyright (C) YEAR Free Software Foundation, Inc.
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"POT-Creation-Date: 2015-10-12 14:18+0000\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+"[[!meta title=\"In support of user data rights in France's République "
+"Numérique draft law\"]]\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid "[[!meta language=\"en\"]]\n"
+msgstr ""
+
+#. type: Plain text
+msgid ""
+"The French government has launched a platform to solicit contributions on "
+"its draft law « république numérique » (digital republic). A section of the "
+"law would give rise to the recognition of user data rights regarding "
+"“portability” of data."
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+"Today, with La Quadrature du Net, we are adding our own amendment in\n"
+"order to recognise users' <strong>right to know how their data is\n"
+"stored</strong>. We think that when the data you use is stored online\n"
+"by a specific provider, users should be informed about where that\n"
+"specific service provider stores the data, <strong>how long, in which\n"
+"jurisdiction</strong> the specific service provider operates, and\n"
+"which laws apply.\n"
+msgstr ""
+
+#. type: Plain text
+msgid ""
+"You can join us and support this proposal: "
+"<https://www.republique-numerique.fr/consultations/projet-de-loi-numerique/consultation/consultation/opinions/section-2-portabilite-des-donnees/article-12-portabilite-des-donnees/versions/consacrer-un-droit-d-information-sur-les-modalites-du-stockage-des-fichiers-et-donnees-utilisateur>"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+"In the User Data Manifesto, we also demand that users have the\n"
+"<strong>freedom to choose a platform</strong>, i.e. users should\n"
+"always be able to extract their data from the service at any time\n"
+"without experiencing any vendor lock-in. Open standards for formats\n"
+"and protocols are necessary to guarantee this.\n"
+msgstr ""
+
+#. type: Plain text
+msgid ""
+"Please support this amendment in order to make this user data right more "
+"effective: "
+"<https://www.republique-numerique.fr/consultations/projet-de-loi-numerique/consultation/consultation/opinions/section-2-portabilite-des-donnees/article-12-portabilite-des-donnees/versions/consacrer-un-droit-effectif-a-la-portabilite>."
+msgstr ""
+
+#. type: Plain text
+msgid ""
+"If you have other inspired ideas in line with the user data manifesto that "
+"could be implemented into law, feel free to suggest them! Contributions and "
+"votes are still accepted until the end of the week."
+msgstr ""
diff --git "a/news/amendmentsR\303\251publiqueNum\303\251rique.fr.po" "b/news/amendmentsR\303\251publiqueNum\303\251rique.fr.po"
new file mode 100644
index 0000000..b69bf2e
--- /dev/null
+++ "b/news/amendmentsR\303\251publiqueNum\303\251rique.fr.po"
@@ -0,0 +1,79 @@
+# SOME DESCRIPTIVE TITLE
+# Copyright (C) YEAR Free Software Foundation, Inc.
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"POT-Creation-Date: 2015-10-12 14:18+0000\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+"[[!meta title=\"In support of user data rights in France's République "
+"Numérique draft law\"]]\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid "[[!meta language=\"en\"]]\n"
+msgstr ""
+
+#. type: Plain text
+msgid ""
+"The French government has launched a platform to solicit contributions on "
+"its draft law « république numérique » (digital republic). A section of the "
+"law would give rise to the recognition of user data rights regarding "
+"“portability” of data."
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+"Today, with La Quadrature du Net, we are adding our own amendment in\n"
+"order to recognise users' <strong>right to know how their data is\n"
+"stored</strong>. We think that when the data you use is stored online\n"
+"by a specific provider, users should be informed about where that\n"
+"specific service provider stores the data, <strong>how long, in which\n"
+"jurisdiction</strong> the specific service provider operates, and\n"
+"which laws apply.\n"
+msgstr ""
+
+#. type: Plain text
+msgid ""
+"You can join us and support this proposal: "
+"<https://www.republique-numerique.fr/consultations/projet-de-loi-numerique/consultation/consultation/opinions/section-2-portabilite-des-donnees/article-12-portabilite-des-donnees/versions/consacrer-un-droit-d-information-sur-les-modalites-du-stockage-des-fichiers-et-donnees-utilisateur>"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+"In the User Data Manifesto, we also demand that users have the\n"
+"<strong>freedom to choose a platform</strong>, i.e. users should\n"
+"always be able to extract their data from the service at any time\n"
+"without experiencing any vendor lock-in. Open standards for formats\n"
+"and protocols are necessary to guarantee this.\n"
+msgstr ""
+
+#. type: Plain text
+msgid ""
+"Please support this amendment in order to make this user data right more "
+"effective: "
+"<https://www.republique-numerique.fr/consultations/projet-de-loi-numerique/consultation/consultation/opinions/section-2-portabilite-des-donnees/article-12-portabilite-des-donnees/versions/consacrer-un-droit-effectif-a-la-portabilite>."
+msgstr ""
+
+#. type: Plain text
+msgid ""
+"If you have other inspired ideas in line with the user data manifesto that "
+"could be implemented into law, feel free to suggest them! Contributions and "
+"votes are still accepted until the end of the week."
+msgstr ""
diff --git "a/news/amendmentsR\303\251publiqueNum\303\251rique.ja.po" "b/news/amendmentsR\303\251publiqueNum\303\251rique.ja.po"
new file mode 100644
index 0000000..b69bf2e
--- /dev/null
+++ "b/news/amendmentsR\303\251publiqueNum\303\251rique.ja.po"
@@ -0,0 +1,79 @@
+# SOME DESCRIPTIVE TITLE
+# Copyright (C) YEAR Free Software Foundation, Inc.
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"POT-Creation-Date: 2015-10-12 14:18+0000\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+"[[!meta title=\"In support of user data rights in France's République "
+"Numérique draft law\"]]\n"
+msgstr ""

(Diff truncated)
new post abuot French bill
diff --git "a/news/amendmentsR\303\251publiqueNum\303\251rique.mdwn" "b/news/amendmentsR\303\251publiqueNum\303\251rique.mdwn"
new file mode 100644
index 0000000..251699e
--- /dev/null
+++ "b/news/amendmentsR\303\251publiqueNum\303\251rique.mdwn"
@@ -0,0 +1,30 @@
+[[!meta title="In support of user data rights in France's République Numérique draft law"]]
+[[!meta language="en"]]
+
+The French government has launched a platform to solicit contributions
+on its draft law « république numérique » (digital republic). A
+section of the law would give rise to the recognition of user data
+rights regarding “portability” of data.
+
+Today, with La Quadrature du Net, we are adding our own amendment in
+order to recognise users' <strong>right to know how their data is
+stored</strong>. We think that when the data you use is stored online
+by a specific provider, users should be informed about where that
+specific service provider stores the data, <strong>how long, in which
+jurisdiction</strong> the specific service provider operates, and
+which laws apply.
+
+You can join us and support this proposal: <https://www.republique-numerique.fr/consultations/projet-de-loi-numerique/consultation/consultation/opinions/section-2-portabilite-des-donnees/article-12-portabilite-des-donnees/versions/consacrer-un-droit-d-information-sur-les-modalites-du-stockage-des-fichiers-et-donnees-utilisateur>
+
+In the User Data Manifesto, we also demand that users have the
+<strong>freedom to choose a platform</strong>, i.e. users should
+always be able to extract their data from the service at any time
+without experiencing any vendor lock-in. Open standards for formats
+and protocols are necessary to guarantee this.
+
+Please support this amendment in order to make this user data right
+more effective: <https://www.republique-numerique.fr/consultations/projet-de-loi-numerique/consultation/consultation/opinions/section-2-portabilite-des-donnees/article-12-portabilite-des-donnees/versions/consacrer-un-droit-effectif-a-la-portabilite>.
+
+If you have other inspired ideas in line with the user data manifesto
+that could be implemented into law, feel free to suggest them!
+Contributions and votes are still accepted until the end of the week.

updated PO files
diff --git a/about.de.po b/about.de.po
index 73c9a73..660256b 100644
--- a/about.de.po
+++ b/about.de.po
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2015-08-29 15:44+0000\n"
+"POT-Creation-Date: 2015-10-02 16:07+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -34,6 +34,20 @@ msgstr ""
 
 #. type: Plain text
 msgid ""
+"We are currently facing issues with the translation module for ikiwiki. We "
+"have backed up previous translations at <https://github.com/"
+"userdatamanifesto/www/tree/master/translationsBackups>."
+msgstr ""
+
+#. type: Plain text
+msgid ""
+"If you wish to contribute a translation in additional languages, please open "
+"a new issue on Github <https://github.com/userdatamanifesto/www/issues/> or "
+"[[Get_in_touch|contact]]."
+msgstr ""
+
+#. type: Plain text
+msgid ""
 "Sources should also be available [on Github](https://github.com/"
 "userdatamanifesto)."
 msgstr ""
diff --git a/about.fr.po b/about.fr.po
index 73c9a73..660256b 100644
--- a/about.fr.po
+++ b/about.fr.po
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2015-08-29 15:44+0000\n"
+"POT-Creation-Date: 2015-10-02 16:07+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -34,6 +34,20 @@ msgstr ""
 
 #. type: Plain text
 msgid ""
+"We are currently facing issues with the translation module for ikiwiki. We "
+"have backed up previous translations at <https://github.com/"
+"userdatamanifesto/www/tree/master/translationsBackups>."
+msgstr ""
+
+#. type: Plain text
+msgid ""
+"If you wish to contribute a translation in additional languages, please open "
+"a new issue on Github <https://github.com/userdatamanifesto/www/issues/> or "
+"[[Get_in_touch|contact]]."
+msgstr ""
+
+#. type: Plain text
+msgid ""
 "Sources should also be available [on Github](https://github.com/"
 "userdatamanifesto)."
 msgstr ""
diff --git a/about.ja.po b/about.ja.po
index 73c9a73..660256b 100644
--- a/about.ja.po
+++ b/about.ja.po
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2015-08-29 15:44+0000\n"
+"POT-Creation-Date: 2015-10-02 16:07+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -34,6 +34,20 @@ msgstr ""
 
 #. type: Plain text
 msgid ""
+"We are currently facing issues with the translation module for ikiwiki. We "
+"have backed up previous translations at <https://github.com/"
+"userdatamanifesto/www/tree/master/translationsBackups>."
+msgstr ""
+
+#. type: Plain text
+msgid ""
+"If you wish to contribute a translation in additional languages, please open "
+"a new issue on Github <https://github.com/userdatamanifesto/www/issues/> or "
+"[[Get_in_touch|contact]]."
+msgstr ""
+
+#. type: Plain text
+msgid ""
 "Sources should also be available [on Github](https://github.com/"
 "userdatamanifesto)."
 msgstr ""
diff --git a/about.tr.po b/about.tr.po
index 73c9a73..660256b 100644
--- a/about.tr.po
+++ b/about.tr.po
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2015-08-29 15:44+0000\n"
+"POT-Creation-Date: 2015-10-02 16:07+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -34,6 +34,20 @@ msgstr ""
 
 #. type: Plain text
 msgid ""
+"We are currently facing issues with the translation module for ikiwiki. We "
+"have backed up previous translations at <https://github.com/"
+"userdatamanifesto/www/tree/master/translationsBackups>."
+msgstr ""
+
+#. type: Plain text
+msgid ""
+"If you wish to contribute a translation in additional languages, please open "
+"a new issue on Github <https://github.com/userdatamanifesto/www/issues/> or "
+"[[Get_in_touch|contact]]."
+msgstr ""
+
+#. type: Plain text
+msgid ""
 "Sources should also be available [on Github](https://github.com/"
 "userdatamanifesto)."
 msgstr ""
diff --git a/contact.de.po b/contact.de.po
new file mode 100644
index 0000000..5433183
--- /dev/null
+++ b/contact.de.po
@@ -0,0 +1,21 @@
+# SOME DESCRIPTIVE TITLE
+# Copyright (C) YEAR Free Software Foundation, Inc.
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"POT-Creation-Date: 2015-10-02 16:07+0000\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#. type: Plain text
+msgid "To contact us, please write to hugo+udmwiki at ampoliros.net"
+msgstr ""
diff --git a/contact.fr.po b/contact.fr.po
new file mode 100644
index 0000000..5433183
--- /dev/null
+++ b/contact.fr.po
@@ -0,0 +1,21 @@
+# SOME DESCRIPTIVE TITLE
+# Copyright (C) YEAR Free Software Foundation, Inc.
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"POT-Creation-Date: 2015-10-02 16:07+0000\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#. type: Plain text
+msgid "To contact us, please write to hugo+udmwiki at ampoliros.net"
+msgstr ""
diff --git a/contact.ja.po b/contact.ja.po
new file mode 100644
index 0000000..5433183
--- /dev/null
+++ b/contact.ja.po
@@ -0,0 +1,21 @@
+# SOME DESCRIPTIVE TITLE
+# Copyright (C) YEAR Free Software Foundation, Inc.
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.

(Diff truncated)
get in touch to translate
diff --git a/about.mdwn b/about.mdwn
index 5615372..732760f 100644
--- a/about.mdwn
+++ b/about.mdwn
@@ -7,6 +7,16 @@ The official page of the [user data manifesto][udm2] is <http://userdatamanifest
 
 -----
 
+We are currently facing issues with the translation module for
+ikiwiki. We have backed  up previous translations at
+<https://github.com/userdatamanifesto/www/tree/master/translationsBackups>.
+
+If you wish to contribute a translation in additional languages,
+please open a new issue on Github
+<https://github.com/userdatamanifesto/www/issues/> or [[Get_in_touch|contact]].
+
+-----
+
 Sources should also be available [on Github](https://github.com/userdatamanifesto).
 
 Wiki [hosted by branchable].
diff --git a/contact.mdwn b/contact.mdwn
new file mode 100644
index 0000000..7adaa06
--- /dev/null
+++ b/contact.mdwn
@@ -0,0 +1,4 @@
+
+
+
+To contact us, please write to hugo+udmwiki at ampoliros.net

links to press release from kde and gnome
diff --git a/news/launchingVersion2dot0.mdwn b/news/launchingVersion2dot0.mdwn
index 596df0b..832ae34 100644
--- a/news/launchingVersion2dot0.mdwn
+++ b/news/launchingVersion2dot0.mdwn
@@ -9,9 +9,9 @@ Today, the main authors of the User Data Manifesto have announced the release of
 
 The publication of the Manifesto is supported by:
 
-- KDE
+- [KDE](http://blog.lydiapintscher.de/2015/09/03/kde-signs-the-user-data-manifesto-2-0-and-continues-to-defend-your-freedom/)
 
-- GNOME
+- [GNOME](https://www.gnome.org/news/2015/09/gnome-foundandon-endorses-user-data-manifesto/)
 
 - [Free Software Foundation Europe](https://fsfe.org/news/2015/news-20150829-01.html)
 
@@ -19,7 +19,7 @@ The publication of the Manifesto is supported by:
 
 - X-Lab
 
-- ToS;DR
+- [ToS;DR](http://blog.tosdr.org/posts/userDataManifesto/)
 
 - Spreed
 

updated PO files
diff --git a/about.el.po b/about.el.po
new file mode 100644
index 0000000..ee191c4
--- /dev/null
+++ b/about.el.po
@@ -0,0 +1,47 @@
+# SOME DESCRIPTIVE TITLE
+# Copyright (C) YEAR Free Software Foundation, Inc.
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"POT-Creation-Date: 2015-09-01 15:18+0000\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#. type: Plain text
+msgid ""
+"This wiki is a space dedicated to exploring, writing and discussing [the "
+"user data manifesto]."
+msgstr ""
+
+#. type: Plain text
+msgid ""
+"The official page of the [user data manifesto][udm2] is "
+"<http://userdatamanifesto.org/>. Please spread the word!"
+msgstr ""
+
+#. type: Plain text
+msgid "[udm2]: http://userdatamanifesto.org/2.0/"
+msgstr ""
+
+#. type: Plain text
+msgid ""
+"Sources should also be available [on "
+"Github](https://github.com/userdatamanifesto)."
+msgstr ""
+
+#. type: Plain text
+msgid "Wiki [hosted by branchable]."
+msgstr ""
+
+#. type: Plain text
+msgid "[hosted by branchable]: http://udm.branchable.com/ikiwiki.cgi?do=branchable"
+msgstr ""
diff --git a/faq.el.po b/faq.el.po
new file mode 100644
index 0000000..1f76567
--- /dev/null
+++ b/faq.el.po
@@ -0,0 +1,84 @@
+# SOME DESCRIPTIVE TITLE
+# Copyright (C) YEAR Free Software Foundation, Inc.
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"POT-Creation-Date: 2015-09-01 15:18+0000\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#. type: Bullet: ' 1. '
+msgid ""
+"what’s the difference between *personal data* protection and *user data* "
+"rights?"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+"    Data is called *personal data* when it identifies a person, called the\n"
+"    *data subject*. But the data subject is not necessarily the user of "
+"the\n"
+"    data.\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+"    For example, if Alice uploads a very boring photo of her friend "
+"Bernard;\n"
+"    the data of that photo is both *personal data* because it identifies\n"
+"    Bernard (the *subject*), but it is also *user data* because it is Alice "
+"who\n"
+"    uploaded the photo somwhere: she is the *user*.\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+"    For more information [[on the distinction between copyright, data "
+"protection and data rights|tags/datarights]].\n"
+msgstr ""
+
+#. type: Bullet: ' 1. '
+msgid "what’s *not* user data?"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+"    User data is not necessarily private data and does not necessarily "
+"relate to a\n"
+"    person or contains personally identifiable information. Thus, this "
+"manifesto\n"
+"    does not aim at modifying personal data regulations, but rather aim at\n"
+"    complementing them.\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+"    Anonymously “dumped” data, e.g. on pastebin, or data that can be "
+"edited\n"
+"    directly by anybody, e.g. a public etherpad, do not usually deal with "
+"user\n"
+"    data.\n"
+msgstr ""
+
+#. type: Bullet: ' 1. '
+msgid "what other initiatives are there?"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid "    We maintain a page of [[related initiatives|related]].\n"
+msgstr ""
diff --git a/index.el.po b/index.el.po
new file mode 100644
index 0000000..2ecc390
--- /dev/null
+++ b/index.el.po
@@ -0,0 +1,403 @@
+# SOME DESCRIPTIVE TITLE
+# Copyright (C) YEAR Free Software Foundation, Inc.
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"POT-Creation-Date: 2015-09-01 15:18+0000\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#. type: Plain text
+#, no-wrap
+msgid "[[!meta title=\"user data manifesto\"]]\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+"[[!meta description=\"This manifesto aims at defining users’ fundamental "
+"rights to their own data in the Internet age. People ought to be free and "
+"should not have to pay allegiance to service providers.\"]] \n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid "[[!meta language=\"en\"]]\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+"<div class=\"lastNewsEntry\">\n"
+"[[news]]:\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+"[[!inline pages=\"page(./news/*) and !*/Discussion\" archive=yes quick=yes "
+"trail=no show=\"1\" feeds=\"yes\"]]\n"
+msgstr ""
+
+#. type: Plain text

(Diff truncated)
translating test on a couple of sentences
diff --git a/index.fr.po b/index.fr.po
index 2dad226..872055e 100644
--- a/index.fr.po
+++ b/index.fr.po
@@ -21,7 +21,7 @@ msgstr ""
 
 #. type: Plain text
 #, no-wrap
-msgid "[[!meta description=\"This manifesto aims at defining users’ fundamental rights to their own data in the Internet age. People ought to be free and should not have to pay allegiance to service providers.\"]] \n"
+msgid "[[!meta description=\"Ce manifeste a pour objectif de définir les droits fondamentaux des usagers sur leurs données personnelles à l'ère d'Internet. Les internautes devraient être libres de leur choix et ne pas avoir à faire allégeance aux fournisseurs de services.\"]] \n"
 msgstr ""
 
 #. type: Plain text
@@ -61,8 +61,8 @@ msgstr ""
 #. type: Plain text
 #, no-wrap
 msgid ""
-"<ol start=\"0\"><li><p><strong>User data</strong> means any data uploaded by a\n"
-"user for his or her own use.</p></li></ol>\n"
+"<ol start=\"0\"><li><p><strong>Les données personnelles</strong> sont toutes celles qu'un usager met en ligne\n"
+"pour son usage personnel.</p></li></ol>\n"
 msgstr ""
 
 #. type: Plain text

moving to version 2.0
diff --git a/2.0/index.html b/2.0/index.html
index 69f5238..d63f43d 100644
--- a/2.0/index.html
+++ b/2.0/index.html
@@ -18,9 +18,6 @@
 
 		<h2>Defining basic rights for people to control their own data in the internet age</h2>
 
-		<div class="draft">This is a draft! Contribute on <a href="http://udm.branchable.com/" target="_blank">the wiki</a>.</div>
-
-
 		<div class="section control">
 			<img src="control.svg" alt="" />
 			<h2>
@@ -52,7 +49,7 @@
 		</div>
 
 		<div class="more-button-row center">
-			<a href="http://udm.branchable.com/" class="more-button" target="_blank">Read more & participate!</a>
+			<a href="https://udm.branchable.com/" class="more-button" target="_blank">Read more & participate!</a>
 		</div>
 	</body>
 </html>
diff --git a/index.php b/index.php
index 7d02230..d63f43d 100644
--- a/index.php
+++ b/index.php
@@ -1,105 +1,55 @@
-<?php
-date_default_timezone_set('America/New_York');
+<!DOCTYPE html>
+<html manifest="cache.manifest">
 
-error_reporting(E_ERROR | E_WARNING | E_PARSE | E_NOTICE);
-require('campaigner/libcampaigner.php');
-
-$response=CAMPAIGNER::listener();
-//echo('<center><span class="notify">'.$response.'</span></center>');
-?>
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html>
 <head>
-<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-<title>User Data Manifesto</title>
-<link rel="stylesheet" href="style1.0.css" type="text/css"  />
-<link rel="stylesheet" href="campaigner/style.css" type="text/css"  />
-</head>
-<body bgcolor="#EEEEEE">
-
-<?php
-
-   echo('<center><span class="notify">'.$response.'</span></center>');
-
-?>
-
-
-<table border="0" width="100%"><tr><td></td><td width="620px">
-<a href="/"><img src="udm.png" align="left" border="0" >&nbsp;&nbsp;<span class="head1">user data manifesto</span><br /></a>
-
-<span class="head2">&nbsp;&nbsp;defining basic rights for people to control their own data in the internet age</span>
-<br />
-<br />
-
-
-<p class="mainitem">1. Own the data<br />
-<span class="subitem">The data that someone directly or indirectly creates belongs to the person who created it.</span>
-</p>
-
-<p class="mainitem">2. Know where the data is stored<br />
-<span class="subitem">Everybody should be able to know: where their personal data is physically stored, how long, on which server,  in what country, and what laws apply.</span>
-</p>
-
-<p class="mainitem">3. Choose the storage location<br />
-<span class="subitem">Everybody should always be able to migrate their personal data to a different provider, server or their own machine at any time without being locked in to a specific vendor.</span>
-</p>
-
-<p class="mainitem">4. Control access<br />
-<span class="subitem">Everybody should be able to know, choose and control who has access to their own data to see or modify it.</span>
-</p>
-
-<p class="mainitem">5. Choose the conditions<br />
-<span class="subitem">If someone chooses to share their own data, then the owner of the data selects the sharing license and conditions.</span>
-</p>
-
-<p class="mainitem">6. Invulnerability of data<br />
-<span class="subitem">
-Everybody should be able to protect their own data against surveillance and to federate their own data for backups to prevent data loss or for any other reason.
-</span>
-</p>
+	<meta charset="utf-8">
+	<meta name="viewport" content="width=device-width,minimum-scale=1.0,maximum-scale=1.0">
 
-<p class="mainitem">7. Use it optimally<br />
-<span class="subitem">Everybody should be able to access and use their own data at all times with any device they choose and in the most convenient and easiest way for them.</span>
-</p>
+	<title>User Data Manifesto 2.0</title>
+	<meta name="description" content="A manifesto for digital rights">
 
+	<link rel="stylesheet" href="custom.css">
+	<link rel="shortcut icon" href="img/litewrite.png">
+	<link rel="apple-touch-icon-precomposed" href="img/litewrite-touch.png">
+</head>
 
-<p class="mainitem">8. Server software transparency<br />
-<span class="subitem">Server software should be free and open source software so that the source code of the software can be inspected to confirm that it works as specified.</span>
-</p>
-
-
-
-<br />
-<span class="related">Services, projects and software that respects the user data rights and this manifesto. <a href="#contact">Contact us</a> to have software or projects added to this list.</span><br />
-<ul class="list">
-<li><a href="http://buddycloud.com">buddycloud</a></li>
-<li><a href="http://data.fm">data.fm</a></li>
-<li><a href="http://diasporaproject.org/">Diaspora</a></li>
-<li><a href="http://owncloud.org">ownCloud</a></li>
-<li><a href="http://sparkleshare.org">Sparkleshare</a></li>
-<li><a href="http://status.net/">status.net</a></li>
-<li><a href="http://tent.io/">tent.io</a></li>
-<li><a href="http://unhosted.org/">Unhosted apps</a></li>
-<li><a href="https://www.wallabag.org/">Wallabag</a></li>
-<li><a href="https://github.com/wrr/wwwhisper">wwwhisper</a></li>
-</ul>
-
-
-
-<?php
-
-   CAMPAIGNER::show();
-
-?>
-
-
-<br /><br />
-<span class="contact" id="contact"><b>Contact:</b> frank.karlitschek (at) userdatamanifesto.org</span>
-
-
-</td><td></td></tr></table>
-
-<div class="draft">The <strong><a href="https://userdatamanifesto.org/2.0">User Data Manifesto 2.0</a></strong> is in the works!</div>
-
-</body>
+	<body>
+		<h1>User Data Manifesto 2.0</h1>
+
+		<h2>Defining basic rights for people to control their own data in the internet age</h2>
+
+		<div class="section control">
+			<img src="control.svg" alt="" />
+			<h2>
+				<strong>Control</strong><br/>
+				over user data access
+			</h2>
+
+			<p>Data explicitly and willingly uploaded by a user should be under the ultimate control of the user. Users should be able to decide whom to grant direct access to their data and with which permissions and licenses such access should be granted.</p>
+		</div>
+
+		<div class="section knowledge">
+			<img src="knowledge.svg" alt="" />
+			<h2>
+				<strong>Knowledge</strong><br/>
+				of how the data is stored
+			</h2>
+
+			<p>When the data is uploaded to a specific service provider, users should be informed about where that specific service provider stores the data, how long, in which jurisdiction the specific service provider operates, and which laws apply.</p>
+		</div>
+
+		<div class="section freedom">
+			<img src="freedom.svg" alt="" />
+			<h2>
+				<strong>Freedom</strong><br/>
+				to choose a platform
+			</h2>
+
+			<p>Users should always be able to extract their data from the service at any time without experiencing any vendor lock-in. Open standards for formats and protocols are necessary to guarantee this.</p>
+		</div>
+
+		<div class="more-button-row center">
+			<a href="https://udm.branchable.com/" class="more-button" target="_blank">Read more & participate!</a>
+		</div>
+	</body>
 </html>

updated PO files
diff --git a/supporters.de.po b/supporters.de.po
index 5fab6e4..101c47f 100644
--- a/supporters.de.po
+++ b/supporters.de.po
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2015-08-30 17:19+0000\n"
+"POT-Creation-Date: 2015-08-30 17:21+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -78,5 +78,5 @@ msgstr ""
 #. type: Plain text
 msgid ""
 "[Add your support](https://github.com/userdatamanifesto/www/edit/master/"
-"supporters.mdwn)"
+"supporters.mdwn) (This requires GitHub at the moment, but we'll fix this)"
 msgstr ""
diff --git a/supporters.fr.po b/supporters.fr.po
index 5fab6e4..101c47f 100644
--- a/supporters.fr.po
+++ b/supporters.fr.po
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2015-08-30 17:19+0000\n"
+"POT-Creation-Date: 2015-08-30 17:21+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -78,5 +78,5 @@ msgstr ""
 #. type: Plain text
 msgid ""
 "[Add your support](https://github.com/userdatamanifesto/www/edit/master/"
-"supporters.mdwn)"
+"supporters.mdwn) (This requires GitHub at the moment, but we'll fix this)"
 msgstr ""
diff --git a/supporters.ja.po b/supporters.ja.po
index 5fab6e4..101c47f 100644
--- a/supporters.ja.po
+++ b/supporters.ja.po
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2015-08-30 17:19+0000\n"
+"POT-Creation-Date: 2015-08-30 17:21+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -78,5 +78,5 @@ msgstr ""
 #. type: Plain text
 msgid ""
 "[Add your support](https://github.com/userdatamanifesto/www/edit/master/"
-"supporters.mdwn)"
+"supporters.mdwn) (This requires GitHub at the moment, but we'll fix this)"
 msgstr ""
diff --git a/supporters.tr.po b/supporters.tr.po
index 5fab6e4..101c47f 100644
--- a/supporters.tr.po
+++ b/supporters.tr.po
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2015-08-30 17:19+0000\n"
+"POT-Creation-Date: 2015-08-30 17:21+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -78,5 +78,5 @@ msgstr ""
 #. type: Plain text
 msgid ""
 "[Add your support](https://github.com/userdatamanifesto/www/edit/master/"
-"supporters.mdwn)"
+"supporters.mdwn) (This requires GitHub at the moment, but we'll fix this)"
 msgstr ""

add notice about requiring github
diff --git a/supporters.mdwn b/supporters.mdwn
index 41986be..308287e 100644
--- a/supporters.mdwn
+++ b/supporters.mdwn
@@ -28,4 +28,4 @@
 
 
 
-[Add your support](https://github.com/userdatamanifesto/www/edit/master/supporters.mdwn) 
+[Add your support](https://github.com/userdatamanifesto/www/edit/master/supporters.mdwn) (This requires GitHub at the moment, but we'll fix this)

updated PO files
diff --git a/supporters.de.po b/supporters.de.po
index 7a75edb..5fab6e4 100644
--- a/supporters.de.po
+++ b/supporters.de.po
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2015-08-30 17:18+0000\n"
+"POT-Creation-Date: 2015-08-30 17:19+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -27,9 +27,35 @@ msgid "Organisations"
 msgstr ""
 
 #. type: Plain text
-msgid ""
-"- KDE - GNOME - Free Software Foundation Europe - Netzpolitik.org - X-Lab - "
-"ToS;DR - Spreed - ownCloud"
+msgid "- KDE"
+msgstr ""
+
+#. type: Plain text
+msgid "- GNOME"
+msgstr ""
+
+#. type: Plain text
+msgid "- Free Software Foundation Europe"
+msgstr ""
+
+#. type: Plain text
+msgid "- Netzpolitik.org"
+msgstr ""
+
+#. type: Plain text
+msgid "- X-Lab"
+msgstr ""
+
+#. type: Plain text
+msgid "- ToS;DR"
+msgstr ""
+
+#. type: Plain text
+msgid "- Spreed"
+msgstr ""
+
+#. type: Plain text
+msgid "- ownCloud"
 msgstr ""
 
 #. type: Title #
@@ -38,11 +64,19 @@ msgid "Individuals"
 msgstr ""
 
 #. type: Plain text
-msgid "- Frank Karlitschek - Hugo Roy - Jan-Christoph Borchardt"
+msgid "- Frank Karlitschek"
+msgstr ""
+
+#. type: Plain text
+msgid "- Hugo Roy"
+msgstr ""
+
+#. type: Plain text
+msgid "- Jan-Christoph Borchardt"
 msgstr ""
 
 #. type: Plain text
 msgid ""
-"[Add your "
-"support](https://github.com/userdatamanifesto/www/edit/master/supporters.mdwn)"
+"[Add your support](https://github.com/userdatamanifesto/www/edit/master/"
+"supporters.mdwn)"
 msgstr ""
diff --git a/supporters.fr.po b/supporters.fr.po
index 7a75edb..5fab6e4 100644
--- a/supporters.fr.po
+++ b/supporters.fr.po
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2015-08-30 17:18+0000\n"
+"POT-Creation-Date: 2015-08-30 17:19+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -27,9 +27,35 @@ msgid "Organisations"
 msgstr ""
 
 #. type: Plain text
-msgid ""
-"- KDE - GNOME - Free Software Foundation Europe - Netzpolitik.org - X-Lab - "
-"ToS;DR - Spreed - ownCloud"
+msgid "- KDE"
+msgstr ""
+
+#. type: Plain text
+msgid "- GNOME"
+msgstr ""
+
+#. type: Plain text
+msgid "- Free Software Foundation Europe"
+msgstr ""
+
+#. type: Plain text
+msgid "- Netzpolitik.org"
+msgstr ""
+
+#. type: Plain text
+msgid "- X-Lab"
+msgstr ""
+
+#. type: Plain text
+msgid "- ToS;DR"
+msgstr ""
+
+#. type: Plain text
+msgid "- Spreed"
+msgstr ""
+
+#. type: Plain text
+msgid "- ownCloud"
 msgstr ""
 
 #. type: Title #
@@ -38,11 +64,19 @@ msgid "Individuals"
 msgstr ""
 
 #. type: Plain text
-msgid "- Frank Karlitschek - Hugo Roy - Jan-Christoph Borchardt"
+msgid "- Frank Karlitschek"
+msgstr ""
+
+#. type: Plain text
+msgid "- Hugo Roy"
+msgstr ""
+
+#. type: Plain text
+msgid "- Jan-Christoph Borchardt"
 msgstr ""
 
 #. type: Plain text
 msgid ""
-"[Add your "
-"support](https://github.com/userdatamanifesto/www/edit/master/supporters.mdwn)"
+"[Add your support](https://github.com/userdatamanifesto/www/edit/master/"
+"supporters.mdwn)"
 msgstr ""
diff --git a/supporters.ja.po b/supporters.ja.po
index 7a75edb..5fab6e4 100644
--- a/supporters.ja.po
+++ b/supporters.ja.po
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2015-08-30 17:18+0000\n"
+"POT-Creation-Date: 2015-08-30 17:19+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -27,9 +27,35 @@ msgid "Organisations"
 msgstr ""
 
 #. type: Plain text
-msgid ""
-"- KDE - GNOME - Free Software Foundation Europe - Netzpolitik.org - X-Lab - "
-"ToS;DR - Spreed - ownCloud"
+msgid "- KDE"
+msgstr ""
+
+#. type: Plain text
+msgid "- GNOME"
+msgstr ""
+
+#. type: Plain text
+msgid "- Free Software Foundation Europe"
+msgstr ""
+
+#. type: Plain text
+msgid "- Netzpolitik.org"
+msgstr ""
+
+#. type: Plain text
+msgid "- X-Lab"
+msgstr ""
+
+#. type: Plain text
+msgid "- ToS;DR"
+msgstr ""
+
+#. type: Plain text
+msgid "- Spreed"
+msgstr ""
+
+#. type: Plain text
+msgid "- ownCloud"
 msgstr ""

(Diff truncated)
weird, don't know why lists are no working properly
diff --git a/supporters.mdwn b/supporters.mdwn
index ebce1d4..41986be 100644
--- a/supporters.mdwn
+++ b/supporters.mdwn
@@ -3,18 +3,27 @@
 # Organisations
 
 - KDE
+
 - GNOME
+
 - Free Software Foundation Europe
+
 - Netzpolitik.org
+
 - X-Lab
+
 - ToS;DR
+
 - Spreed
+
 - ownCloud
 
 # Individuals
 
 - Frank Karlitschek
+
 - Hugo Roy
+
 - Jan-Christoph Borchardt
 
 

updated PO files
diff --git a/supporters.de.po b/supporters.de.po
new file mode 100644
index 0000000..7a75edb
--- /dev/null
+++ b/supporters.de.po
@@ -0,0 +1,48 @@
+# SOME DESCRIPTIVE TITLE
+# Copyright (C) YEAR Free Software Foundation, Inc.
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"POT-Creation-Date: 2015-08-30 17:18+0000\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#. type: Plain text
+#, no-wrap
+msgid "[[!meta title=\"User Data Manifesto Supporters\"]]\n"
+msgstr ""
+
+#. type: Title #
+#, no-wrap
+msgid "Organisations"
+msgstr ""
+
+#. type: Plain text
+msgid ""
+"- KDE - GNOME - Free Software Foundation Europe - Netzpolitik.org - X-Lab - "
+"ToS;DR - Spreed - ownCloud"
+msgstr ""
+
+#. type: Title #
+#, no-wrap
+msgid "Individuals"
+msgstr ""
+
+#. type: Plain text
+msgid "- Frank Karlitschek - Hugo Roy - Jan-Christoph Borchardt"
+msgstr ""
+
+#. type: Plain text
+msgid ""
+"[Add your "
+"support](https://github.com/userdatamanifesto/www/edit/master/supporters.mdwn)"
+msgstr ""
diff --git a/supporters.fr.po b/supporters.fr.po
new file mode 100644
index 0000000..7a75edb
--- /dev/null
+++ b/supporters.fr.po
@@ -0,0 +1,48 @@
+# SOME DESCRIPTIVE TITLE
+# Copyright (C) YEAR Free Software Foundation, Inc.
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"POT-Creation-Date: 2015-08-30 17:18+0000\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#. type: Plain text
+#, no-wrap
+msgid "[[!meta title=\"User Data Manifesto Supporters\"]]\n"
+msgstr ""
+
+#. type: Title #
+#, no-wrap
+msgid "Organisations"
+msgstr ""
+
+#. type: Plain text
+msgid ""
+"- KDE - GNOME - Free Software Foundation Europe - Netzpolitik.org - X-Lab - "
+"ToS;DR - Spreed - ownCloud"
+msgstr ""
+
+#. type: Title #
+#, no-wrap
+msgid "Individuals"
+msgstr ""
+
+#. type: Plain text
+msgid "- Frank Karlitschek - Hugo Roy - Jan-Christoph Borchardt"
+msgstr ""
+
+#. type: Plain text
+msgid ""
+"[Add your "
+"support](https://github.com/userdatamanifesto/www/edit/master/supporters.mdwn)"
+msgstr ""
diff --git a/supporters.ja.po b/supporters.ja.po
new file mode 100644
index 0000000..7a75edb
--- /dev/null
+++ b/supporters.ja.po
@@ -0,0 +1,48 @@
+# SOME DESCRIPTIVE TITLE
+# Copyright (C) YEAR Free Software Foundation, Inc.
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"POT-Creation-Date: 2015-08-30 17:18+0000\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#. type: Plain text
+#, no-wrap
+msgid "[[!meta title=\"User Data Manifesto Supporters\"]]\n"
+msgstr ""
+
+#. type: Title #
+#, no-wrap
+msgid "Organisations"
+msgstr ""
+
+#. type: Plain text
+msgid ""
+"- KDE - GNOME - Free Software Foundation Europe - Netzpolitik.org - X-Lab - "
+"ToS;DR - Spreed - ownCloud"
+msgstr ""
+
+#. type: Title #
+#, no-wrap
+msgid "Individuals"
+msgstr ""
+
+#. type: Plain text
+msgid "- Frank Karlitschek - Hugo Roy - Jan-Christoph Borchardt"
+msgstr ""
+
+#. type: Plain text
+msgid ""
+"[Add your "
+"support](https://github.com/userdatamanifesto/www/edit/master/supporters.mdwn)"
+msgstr ""
diff --git a/supporters.tr.po b/supporters.tr.po
new file mode 100644
index 0000000..7a75edb
--- /dev/null
+++ b/supporters.tr.po
@@ -0,0 +1,48 @@
+# SOME DESCRIPTIVE TITLE
+# Copyright (C) YEAR Free Software Foundation, Inc.
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"POT-Creation-Date: 2015-08-30 17:18+0000\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#. type: Plain text
+#, no-wrap
+msgid "[[!meta title=\"User Data Manifesto Supporters\"]]\n"
+msgstr ""
+
+#. type: Title #
+#, no-wrap
+msgid "Organisations"
+msgstr ""
+
+#. type: Plain text
+msgid ""
+"- KDE - GNOME - Free Software Foundation Europe - Netzpolitik.org - X-Lab - "
+"ToS;DR - Spreed - ownCloud"

(Diff truncated)
list of supporters
diff --git a/supporters.mdwn b/supporters.mdwn
new file mode 100644
index 0000000..ebce1d4
--- /dev/null
+++ b/supporters.mdwn
@@ -0,0 +1,22 @@
+[[!meta title="User Data Manifesto Supporters"]]
+
+# Organisations
+
+- KDE
+- GNOME
+- Free Software Foundation Europe
+- Netzpolitik.org
+- X-Lab
+- ToS;DR
+- Spreed
+- ownCloud
+
+# Individuals
+
+- Frank Karlitschek
+- Hugo Roy
+- Jan-Christoph Borchardt
+
+
+
+[Add your support](https://github.com/userdatamanifesto/www/edit/master/supporters.mdwn) 

updated PO files
diff --git a/index.de.po b/index.de.po
index 99e553f..8d000c5 100644
--- a/index.de.po
+++ b/index.de.po
@@ -4,7 +4,7 @@
 # modification, are permitted under any circumstances. No warranty.
 msgid ""
 msgstr ""
-"POT-Creation-Date: 2015-08-29 15:44+0000\n"
+"POT-Creation-Date: 2015-08-29 15:45+0000\n"
 "PO-Revision-Date: 2010-03-12 09:40+0530\n"
 "Last-Translator: Sebastian Kuhnert <mail@sebastian-kuhnert.de>\n"
 "Language-Team: None\n"
@@ -31,12 +31,9 @@ msgstr ""
 
 #. type: Plain text
 #, no-wrap
-msgid "<div class=\"lastNewsEntry\">\n"
-msgstr ""
-
-#. type: Title ##
-#, no-wrap
-msgid "[[news]]"
+msgid ""
+"<div class=\"lastNewsEntry\">\n"
+"[[news]]:\n"
 msgstr ""
 
 #. type: Plain text
diff --git a/index.fr.po b/index.fr.po
index a47bc2c..2dad226 100644
--- a/index.fr.po
+++ b/index.fr.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ikiwiki\n"
-"POT-Creation-Date: 2015-08-29 15:44+0000\n"
+"POT-Creation-Date: 2015-08-29 15:45+0000\n"
 "PO-Revision-Date: 2009-08-23 18:50+0200\n"
 "Last-Translator: Philippe Batailler <philippe.batailler@free.fr>\n"
 "Language-Team: French <debian-l10n-french@lists.debian.org>\n"
@@ -31,12 +31,9 @@ msgstr ""
 
 #. type: Plain text
 #, no-wrap
-msgid "<div class=\"lastNewsEntry\">\n"
-msgstr ""
-
-#. type: Title ##
-#, no-wrap
-msgid "[[news]]"
+msgid ""
+"<div class=\"lastNewsEntry\">\n"
+"[[news]]:\n"
 msgstr ""
 
 #. type: Plain text
diff --git a/index.ja.po b/index.ja.po
index 71f5a3c..69ac65e 100644
--- a/index.ja.po
+++ b/index.ja.po
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2015-08-29 15:44+0000\n"
+"POT-Creation-Date: 2015-08-29 15:45+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -33,12 +33,9 @@ msgstr ""
 
 #. type: Plain text
 #, no-wrap
-msgid "<div class=\"lastNewsEntry\">\n"
-msgstr ""
-
-#. type: Title ##
-#, no-wrap
-msgid "[[news]]"
+msgid ""
+"<div class=\"lastNewsEntry\">\n"
+"[[news]]:\n"
 msgstr ""
 
 #. type: Plain text
diff --git a/index.tr.po b/index.tr.po
index 71f5a3c..69ac65e 100644
--- a/index.tr.po
+++ b/index.tr.po
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2015-08-29 15:44+0000\n"
+"POT-Creation-Date: 2015-08-29 15:45+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -33,12 +33,9 @@ msgstr ""
 
 #. type: Plain text
 #, no-wrap
-msgid "<div class=\"lastNewsEntry\">\n"
-msgstr ""
-
-#. type: Title ##
-#, no-wrap
-msgid "[[news]]"
+msgid ""
+"<div class=\"lastNewsEntry\">\n"
+"[[news]]:\n"
 msgstr ""
 
 #. type: Plain text

typo
diff --git a/index.mdwn b/index.mdwn
index edf6aa7..dc5c762 100644
--- a/index.mdwn
+++ b/index.mdwn
@@ -3,7 +3,7 @@
 [[!meta language="en"]]
 
 <div class="lastNewsEntry">
-## [[news]]
+[[news]]:
 
 [[!inline pages="page(./news/*) and !*/Discussion" archive=yes quick=yes trail=no show="1" feeds="yes"]]
 </div>

updated PO files
diff --git a/about.de.po b/about.de.po
index a935989..73c9a73 100644
--- a/about.de.po
+++ b/about.de.po
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2014-10-28 13:45+0000\n"
+"POT-Creation-Date: 2015-08-29 15:44+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -18,22 +18,14 @@ msgstr ""
 
 #. type: Plain text
 msgid ""
-"This wiki is a space dedicated to exploring, writing and discussing the "
-"[next version of the user data manifesto][udm2]."
-msgstr ""
-
-#. type: Plain text
-msgid ""
-"Attention: there seems to be a [bug](https://www.branchable.com/forum/"
-"Discussion_page_not_created/) right now that prevents you from creating "
-"“Discussion” pages. For now, please comment on this page to discuss: http://"
-"udm.branchable.com/Discussion/"
+"This wiki is a space dedicated to exploring, writing and discussing [the "
+"user data manifesto]."
 msgstr ""
 
 #. type: Plain text
 msgid ""
 "The official page of the [user data manifesto][udm2] is <http://"
-"userdatamanifesto.org/2.0/>. Please spread the word!"
+"userdatamanifesto.org/>. Please spread the word!"
 msgstr ""
 
 #. type: Plain text
diff --git a/about.fr.po b/about.fr.po
index a935989..73c9a73 100644
--- a/about.fr.po
+++ b/about.fr.po
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2014-10-28 13:45+0000\n"
+"POT-Creation-Date: 2015-08-29 15:44+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -18,22 +18,14 @@ msgstr ""
 
 #. type: Plain text
 msgid ""
-"This wiki is a space dedicated to exploring, writing and discussing the "
-"[next version of the user data manifesto][udm2]."
-msgstr ""
-
-#. type: Plain text
-msgid ""
-"Attention: there seems to be a [bug](https://www.branchable.com/forum/"
-"Discussion_page_not_created/) right now that prevents you from creating "
-"“Discussion” pages. For now, please comment on this page to discuss: http://"
-"udm.branchable.com/Discussion/"
+"This wiki is a space dedicated to exploring, writing and discussing [the "
+"user data manifesto]."
 msgstr ""
 
 #. type: Plain text
 msgid ""
 "The official page of the [user data manifesto][udm2] is <http://"
-"userdatamanifesto.org/2.0/>. Please spread the word!"
+"userdatamanifesto.org/>. Please spread the word!"
 msgstr ""
 
 #. type: Plain text
diff --git a/about.ja.po b/about.ja.po
index b7f906a..73c9a73 100644
--- a/about.ja.po
+++ b/about.ja.po
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2014-10-28 13:54+0000\n"
+"POT-Creation-Date: 2015-08-29 15:44+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -18,22 +18,14 @@ msgstr ""
 
 #. type: Plain text
 msgid ""
-"This wiki is a space dedicated to exploring, writing and discussing the "
-"[next version of the user data manifesto][udm2]."
-msgstr ""
-
-#. type: Plain text
-msgid ""
-"Attention: there seems to be a [bug](https://www.branchable.com/forum/"
-"Discussion_page_not_created/) right now that prevents you from creating "
-"“Discussion” pages. For now, please comment on this page to discuss: http://"
-"udm.branchable.com/Discussion/"
+"This wiki is a space dedicated to exploring, writing and discussing [the "
+"user data manifesto]."
 msgstr ""
 
 #. type: Plain text
 msgid ""
 "The official page of the [user data manifesto][udm2] is <http://"
-"userdatamanifesto.org/2.0/>. Please spread the word!"
+"userdatamanifesto.org/>. Please spread the word!"
 msgstr ""
 
 #. type: Plain text
diff --git a/about.tr.po b/about.tr.po
index b7f906a..73c9a73 100644
--- a/about.tr.po
+++ b/about.tr.po
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2014-10-28 13:54+0000\n"
+"POT-Creation-Date: 2015-08-29 15:44+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -18,22 +18,14 @@ msgstr ""
 
 #. type: Plain text
 msgid ""
-"This wiki is a space dedicated to exploring, writing and discussing the "
-"[next version of the user data manifesto][udm2]."
-msgstr ""
-
-#. type: Plain text
-msgid ""
-"Attention: there seems to be a [bug](https://www.branchable.com/forum/"
-"Discussion_page_not_created/) right now that prevents you from creating "
-"“Discussion” pages. For now, please comment on this page to discuss: http://"
-"udm.branchable.com/Discussion/"
+"This wiki is a space dedicated to exploring, writing and discussing [the "
+"user data manifesto]."
 msgstr ""
 
 #. type: Plain text
 msgid ""
 "The official page of the [user data manifesto][udm2] is <http://"
-"userdatamanifesto.org/2.0/>. Please spread the word!"
+"userdatamanifesto.org/>. Please spread the word!"
 msgstr ""
 
 #. type: Plain text
diff --git a/index.de.po b/index.de.po
index 6259c69..99e553f 100644
--- a/index.de.po
+++ b/index.de.po
@@ -4,7 +4,7 @@
 # modification, are permitted under any circumstances. No warranty.
 msgid ""
 msgstr ""
-"POT-Creation-Date: 2015-08-29 15:35+0000\n"
+"POT-Creation-Date: 2015-08-29 15:44+0000\n"
 "PO-Revision-Date: 2010-03-12 09:40+0530\n"
 "Last-Translator: Sebastian Kuhnert <mail@sebastian-kuhnert.de>\n"
 "Language-Team: None\n"
@@ -31,9 +31,12 @@ msgstr ""
 
 #. type: Plain text
 #, no-wrap
-msgid ""
-"<div class=\"lastNewsEntry\">\n"
-"<h2>News</h2>\n"
+msgid "<div class=\"lastNewsEntry\">\n"
+msgstr ""
+
+#. type: Title ##
+#, no-wrap
+msgid "[[news]]"
 msgstr ""
 
 #. type: Plain text
diff --git a/index.fr.po b/index.fr.po
index 8198a4d..a47bc2c 100644
--- a/index.fr.po
+++ b/index.fr.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ikiwiki\n"
-"POT-Creation-Date: 2015-08-29 15:35+0000\n"
+"POT-Creation-Date: 2015-08-29 15:44+0000\n"
 "PO-Revision-Date: 2009-08-23 18:50+0200\n"
 "Last-Translator: Philippe Batailler <philippe.batailler@free.fr>\n"
 "Language-Team: French <debian-l10n-french@lists.debian.org>\n"
@@ -31,9 +31,12 @@ msgstr ""
 

(Diff truncated)
news style on index and update about
diff --git a/about.mdwn b/about.mdwn
index 8d11128..5615372 100644
--- a/about.mdwn
+++ b/about.mdwn
@@ -1,14 +1,15 @@
 
-This wiki is a space dedicated to exploring, writing and discussing the [next version of the user data manifesto][udm2]. 
+This wiki is a space dedicated to exploring, writing and discussing [the user data manifesto]. 
 
-Attention: there seems to be a [bug](https://www.branchable.com/forum/Discussion_page_not_created/) right now that prevents you from creating “Discussion” pages. For now, please comment on this page to discuss: http://udm.branchable.com/Discussion/
-
-The official page of the [user data manifesto][udm2] is <http://userdatamanifesto.org/2.0/>. Please spread the word!
+The official page of the [user data manifesto][udm2] is <http://userdatamanifesto.org/>. Please spread the word!
 
 [udm2]: http://userdatamanifesto.org/2.0/
 
+-----
+
 Sources should also be available [on Github](https://github.com/userdatamanifesto).
 
 Wiki [hosted by branchable].
 
 [hosted by branchable]: http://udm.branchable.com/ikiwiki.cgi?do=branchable
+
diff --git a/index.mdwn b/index.mdwn
index b52008d..edf6aa7 100644
--- a/index.mdwn
+++ b/index.mdwn
@@ -3,7 +3,8 @@
 [[!meta language="en"]]
 
 <div class="lastNewsEntry">
-<h2>News</h2>
+## [[news]]
+
 [[!inline pages="page(./news/*) and !*/Discussion" archive=yes quick=yes trail=no show="1" feeds="yes"]]
 </div>
 
diff --git a/local.css b/local.css
index 6d1347d..5ee797c 100644
--- a/local.css
+++ b/local.css
@@ -1 +1 @@
-.pageheader .actions{font-size:.8em;display:none}@media (min-width:700px){.pageheader .actions{display:block}}.pageheader .title{padding:1em 0}.pageheader #searchform{display:none}#pagebody{max-width:900px}aside.sidebar{margin:1em 2em;border:0;padding:0;width:auto;float:none;background:transparent;display:none}@media (min-width:350px){aside.sidebar{display:block}}aside.sidebar .nav{padding-left:0;list-style-type:none;font-size:.8em}aside.sidebar .nav li{background:rgba(255,255,0,0.2);display:inline-block;padding:.5em;margin:.25em}@media (min-width:1200px){aside.sidebar{float:right;width:250px}aside.sidebar .nav li{display:block}}.toggleable{font-size:.9em;margin-left:1.5em}.toggleable .toggle{margin-left:-1.5em;float:left}#otherlanguages span{float:left;padding:6px 0}.notice.translation{display:block;font-size:.8em;background:none repeat scroll 0 0 rgba(255,255,0,0.2);padding:1em}.lastNewsEntry{background:rgba(255,255,0,0.2)}#footer .tags a{display:block}@media (min-width:350px){#footer .tags a{display:inline;margin-right:1.5em}}
\ No newline at end of file
+.pageheader .actions{font-size:.8em;display:none}@media (min-width:700px){.pageheader .actions{display:block}}.pageheader .title{padding:1em 0}.pageheader #searchform{display:none}#pagebody{max-width:900px}aside.sidebar{margin:1em 2em;border:0;padding:0;width:auto;float:none;background:transparent;display:none}@media (min-width:350px){aside.sidebar{display:block}}aside.sidebar .nav{padding-left:0;list-style-type:none;font-size:.8em}aside.sidebar .nav li{background:rgba(255,255,0,0.2);display:inline-block;padding:.5em;margin:.25em}@media (min-width:1200px){aside.sidebar{float:right;width:250px}aside.sidebar .nav li{display:block}}.toggleable{font-size:.9em;margin-left:1.5em}.toggleable .toggle{margin-left:-1.5em;float:left}#otherlanguages span{float:left;padding:6px 0}.notice.translation{display:block;font-size:.8em;background:none repeat scroll 0 0 rgba(255,255,0,0.2);padding:1em}.lastNewsEntry{background:rgba(255,255,0,0.2);margin-bottom:2em}#footer .tags a{display:block}@media (min-width:350px){#footer .tags a{display:inline;margin-right:1.5em}}
\ No newline at end of file
diff --git a/local.less b/local.less
index 4323337..6da08c4 100644
--- a/local.less
+++ b/local.less
@@ -103,6 +103,7 @@ aside.sidebar {
 
 .lastNewsEntry {
     background: rgba(255, 255, 0, 0.2);
+    margin-bottom: 2em;
 }
 
 #footer {

updated PO files
diff --git a/news/launchingVersion2dot0.de.po b/news/launchingVersion2dot0.de.po
index 6fdba20..274ffb7 100644
--- a/news/launchingVersion2dot0.de.po
+++ b/news/launchingVersion2dot0.de.po
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2015-08-29 15:36+0000\n"
+"POT-Creation-Date: 2015-08-29 15:37+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -48,10 +48,38 @@ msgid "The publication of the Manifesto is supported by:"
 msgstr ""
 
 #. type: Plain text
+msgid "- KDE"
+msgstr ""
+
+#. type: Plain text
+msgid "- GNOME"
+msgstr ""
+
+#. type: Plain text
 msgid ""
-"- KDE - GNOME - [Free Software Foundation Europe](https://fsfe.org/news/2015/"
-"news-20150829-01.html)  - [Netzpolitik.org](https://netzpolitik.org/2015/"
-"user-data-manifesto-2-0/)  - X-Lab - ToS;DR - Spreed - ownCloud"
+"- [Free Software Foundation Europe](https://fsfe.org/news/2015/"
+"news-20150829-01.html)"
+msgstr ""
+
+#. type: Plain text
+msgid ""
+"- [Netzpolitik.org](https://netzpolitik.org/2015/user-data-manifesto-2-0/)"
+msgstr ""
+
+#. type: Plain text
+msgid "- X-Lab"
+msgstr ""
+
+#. type: Plain text
+msgid "- ToS;DR"
+msgstr ""
+
+#. type: Plain text
+msgid "- Spreed"
+msgstr ""
+
+#. type: Plain text
+msgid "- ownCloud"
 msgstr ""
 
 #. type: Plain text
diff --git a/news/launchingVersion2dot0.fr.po b/news/launchingVersion2dot0.fr.po
index 6fdba20..274ffb7 100644
--- a/news/launchingVersion2dot0.fr.po
+++ b/news/launchingVersion2dot0.fr.po
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2015-08-29 15:36+0000\n"
+"POT-Creation-Date: 2015-08-29 15:37+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -48,10 +48,38 @@ msgid "The publication of the Manifesto is supported by:"
 msgstr ""
 
 #. type: Plain text
+msgid "- KDE"
+msgstr ""
+
+#. type: Plain text
+msgid "- GNOME"
+msgstr ""
+
+#. type: Plain text
 msgid ""
-"- KDE - GNOME - [Free Software Foundation Europe](https://fsfe.org/news/2015/"
-"news-20150829-01.html)  - [Netzpolitik.org](https://netzpolitik.org/2015/"
-"user-data-manifesto-2-0/)  - X-Lab - ToS;DR - Spreed - ownCloud"
+"- [Free Software Foundation Europe](https://fsfe.org/news/2015/"
+"news-20150829-01.html)"
+msgstr ""
+
+#. type: Plain text
+msgid ""
+"- [Netzpolitik.org](https://netzpolitik.org/2015/user-data-manifesto-2-0/)"
+msgstr ""
+
+#. type: Plain text
+msgid "- X-Lab"
+msgstr ""
+
+#. type: Plain text
+msgid "- ToS;DR"
+msgstr ""
+
+#. type: Plain text
+msgid "- Spreed"
+msgstr ""
+
+#. type: Plain text
+msgid "- ownCloud"
 msgstr ""
 
 #. type: Plain text
diff --git a/news/launchingVersion2dot0.ja.po b/news/launchingVersion2dot0.ja.po
index 6fdba20..274ffb7 100644
--- a/news/launchingVersion2dot0.ja.po
+++ b/news/launchingVersion2dot0.ja.po
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2015-08-29 15:36+0000\n"
+"POT-Creation-Date: 2015-08-29 15:37+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -48,10 +48,38 @@ msgid "The publication of the Manifesto is supported by:"
 msgstr ""
 
 #. type: Plain text
+msgid "- KDE"
+msgstr ""
+
+#. type: Plain text
+msgid "- GNOME"
+msgstr ""
+
+#. type: Plain text
 msgid ""
-"- KDE - GNOME - [Free Software Foundation Europe](https://fsfe.org/news/2015/"
-"news-20150829-01.html)  - [Netzpolitik.org](https://netzpolitik.org/2015/"
-"user-data-manifesto-2-0/)  - X-Lab - ToS;DR - Spreed - ownCloud"
+"- [Free Software Foundation Europe](https://fsfe.org/news/2015/"
+"news-20150829-01.html)"
+msgstr ""
+
+#. type: Plain text
+msgid ""
+"- [Netzpolitik.org](https://netzpolitik.org/2015/user-data-manifesto-2-0/)"
+msgstr ""
+
+#. type: Plain text
+msgid "- X-Lab"
+msgstr ""
+
+#. type: Plain text
+msgid "- ToS;DR"
+msgstr ""
+
+#. type: Plain text
+msgid "- Spreed"
+msgstr ""
+
+#. type: Plain text
+msgid "- ownCloud"
 msgstr ""
 
 #. type: Plain text
diff --git a/news/launchingVersion2dot0.tr.po b/news/launchingVersion2dot0.tr.po
index 6fdba20..274ffb7 100644
--- a/news/launchingVersion2dot0.tr.po
+++ b/news/launchingVersion2dot0.tr.po
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2015-08-29 15:36+0000\n"
+"POT-Creation-Date: 2015-08-29 15:37+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -48,10 +48,38 @@ msgid "The publication of the Manifesto is supported by:"
 msgstr ""
 
 #. type: Plain text
+msgid "- KDE"
+msgstr ""
+
+#. type: Plain text
+msgid "- GNOME"
+msgstr ""
+
+#. type: Plain text
 msgid ""
-"- KDE - GNOME - [Free Software Foundation Europe](https://fsfe.org/news/2015/"
-"news-20150829-01.html)  - [Netzpolitik.org](https://netzpolitik.org/2015/"
-"user-data-manifesto-2-0/)  - X-Lab - ToS;DR - Spreed - ownCloud"
+"- [Free Software Foundation Europe](https://fsfe.org/news/2015/"
+"news-20150829-01.html)"
+msgstr ""
+
+#. type: Plain text
+msgid ""

(Diff truncated)
weird list issue
diff --git a/news/launchingVersion2dot0.mdwn b/news/launchingVersion2dot0.mdwn
index de27334..596df0b 100644
--- a/news/launchingVersion2dot0.mdwn
+++ b/news/launchingVersion2dot0.mdwn
@@ -10,12 +10,19 @@ Today, the main authors of the User Data Manifesto have announced the release of
 The publication of the Manifesto is supported by:
 
 - KDE
+
 - GNOME
+
 - [Free Software Foundation Europe](https://fsfe.org/news/2015/news-20150829-01.html)
+
 - [Netzpolitik.org](https://netzpolitik.org/2015/user-data-manifesto-2-0/)
+
 - X-Lab
+
 - ToS;DR
+
 - Spreed
+
 - ownCloud
 
 The User Data Manifesto is a starting point, a humble contribution to the greater debate on rights and freedoms online that can hopefully help raise awareness.

updated PO files
diff --git a/news/launchingVersion2dot0.de.po b/news/launchingVersion2dot0.de.po
index 4da5f0a..6fdba20 100644
--- a/news/launchingVersion2dot0.de.po
+++ b/news/launchingVersion2dot0.de.po
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2015-08-29 15:26+0000\n"
+"POT-Creation-Date: 2015-08-29 15:36+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -29,28 +29,18 @@ msgstr ""
 #. type: Plain text
 msgid ""
 "Today, the main authors of the User Data Manifesto have announced the "
-"release of version 2.0 during the [ownCloud Contributors "
-"Conference](https://owncloud.org/conf/) in Berlin."
+"release of version 2.0 during the [ownCloud Contributor Conference](https://"
+"owncloud.org/conf/) in Berlin."
 msgstr ""
 
 #. type: Plain text
 #, no-wrap
-msgid ""
-"> “The version 1.0 was instantly very popular and I got a ton of positive "
-"feedback and support. But over the time it also became clear that a few "
-"things could be expressed in a simpler and clearer way. So the idea came up "
-"to do a revision of the manifesto based on all the feedback” [says Frank "
-"Karlitschek](http://karlitschek.de/2015/08/user-data-manifesto-2-0-launched/) "
-"who launched the initiative in 2012.\n"
+msgid "> “The version 1.0 was instantly very popular and I got a ton of positive feedback and support. But over the time it also became clear that a few things could be expressed in a simpler and clearer way. So the idea came up to do a revision of the manifesto based on all the feedback” [says Frank Karlitschek](http://karlitschek.de/2015/08/user-data-manifesto-2-0-launched/) who launched the initiative in 2012.\n"
 msgstr ""
 
 #. type: Plain text
 #, no-wrap
-msgid ""
-"> “The recognition of the User Data Rights defined in the manifesto is an "
-"important block to build a free society in the digital age“ [according to "
-"Hugo Roy](https://hroy.eu/posts/UserDataManifesto2dot0/), coauthor of the "
-"User Data Manifesto version 2.\n"
+msgid "> “The recognition of the User Data Rights defined in the manifesto is an important block to build a free society in the digital age“ [according to Hugo Roy](https://hroy.eu/posts/UserDataManifesto2dot0/), coauthor of the User Data Manifesto version 2.\n"
 msgstr ""
 
 #. type: Plain text
@@ -59,10 +49,9 @@ msgstr ""
 
 #. type: Plain text
 msgid ""
-"- KDE - GNOME - [Free Software Foundation "
-"Europe](https://fsfe.org/news/2015/news-20150829-01.html)  - "
-"[Netzpolitik.org](https://netzpolitik.org/2015/user-data-manifesto-2-0/)  - "
-"X-Lab - ToS;DR - Spreed - ownCloud"
+"- KDE - GNOME - [Free Software Foundation Europe](https://fsfe.org/news/2015/"
+"news-20150829-01.html)  - [Netzpolitik.org](https://netzpolitik.org/2015/"
+"user-data-manifesto-2-0/)  - X-Lab - ToS;DR - Spreed - ownCloud"
 msgstr ""
 
 #. type: Plain text
diff --git a/news/launchingVersion2dot0.fr.po b/news/launchingVersion2dot0.fr.po
index 4da5f0a..6fdba20 100644
--- a/news/launchingVersion2dot0.fr.po
+++ b/news/launchingVersion2dot0.fr.po
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2015-08-29 15:26+0000\n"
+"POT-Creation-Date: 2015-08-29 15:36+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -29,28 +29,18 @@ msgstr ""
 #. type: Plain text
 msgid ""
 "Today, the main authors of the User Data Manifesto have announced the "
-"release of version 2.0 during the [ownCloud Contributors "
-"Conference](https://owncloud.org/conf/) in Berlin."
+"release of version 2.0 during the [ownCloud Contributor Conference](https://"
+"owncloud.org/conf/) in Berlin."
 msgstr ""
 
 #. type: Plain text
 #, no-wrap
-msgid ""
-"> “The version 1.0 was instantly very popular and I got a ton of positive "
-"feedback and support. But over the time it also became clear that a few "
-"things could be expressed in a simpler and clearer way. So the idea came up "
-"to do a revision of the manifesto based on all the feedback” [says Frank "
-"Karlitschek](http://karlitschek.de/2015/08/user-data-manifesto-2-0-launched/) "
-"who launched the initiative in 2012.\n"
+msgid "> “The version 1.0 was instantly very popular and I got a ton of positive feedback and support. But over the time it also became clear that a few things could be expressed in a simpler and clearer way. So the idea came up to do a revision of the manifesto based on all the feedback” [says Frank Karlitschek](http://karlitschek.de/2015/08/user-data-manifesto-2-0-launched/) who launched the initiative in 2012.\n"
 msgstr ""
 
 #. type: Plain text
 #, no-wrap
-msgid ""
-"> “The recognition of the User Data Rights defined in the manifesto is an "
-"important block to build a free society in the digital age“ [according to "
-"Hugo Roy](https://hroy.eu/posts/UserDataManifesto2dot0/), coauthor of the "
-"User Data Manifesto version 2.\n"
+msgid "> “The recognition of the User Data Rights defined in the manifesto is an important block to build a free society in the digital age“ [according to Hugo Roy](https://hroy.eu/posts/UserDataManifesto2dot0/), coauthor of the User Data Manifesto version 2.\n"
 msgstr ""
 
 #. type: Plain text
@@ -59,10 +49,9 @@ msgstr ""
 
 #. type: Plain text
 msgid ""
-"- KDE - GNOME - [Free Software Foundation "
-"Europe](https://fsfe.org/news/2015/news-20150829-01.html)  - "
-"[Netzpolitik.org](https://netzpolitik.org/2015/user-data-manifesto-2-0/)  - "
-"X-Lab - ToS;DR - Spreed - ownCloud"
+"- KDE - GNOME - [Free Software Foundation Europe](https://fsfe.org/news/2015/"
+"news-20150829-01.html)  - [Netzpolitik.org](https://netzpolitik.org/2015/"
+"user-data-manifesto-2-0/)  - X-Lab - ToS;DR - Spreed - ownCloud"
 msgstr ""
 
 #. type: Plain text
diff --git a/news/launchingVersion2dot0.ja.po b/news/launchingVersion2dot0.ja.po
index 4da5f0a..6fdba20 100644
--- a/news/launchingVersion2dot0.ja.po
+++ b/news/launchingVersion2dot0.ja.po
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2015-08-29 15:26+0000\n"
+"POT-Creation-Date: 2015-08-29 15:36+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -29,28 +29,18 @@ msgstr ""
 #. type: Plain text
 msgid ""
 "Today, the main authors of the User Data Manifesto have announced the "
-"release of version 2.0 during the [ownCloud Contributors "
-"Conference](https://owncloud.org/conf/) in Berlin."
+"release of version 2.0 during the [ownCloud Contributor Conference](https://"
+"owncloud.org/conf/) in Berlin."
 msgstr ""
 
 #. type: Plain text
 #, no-wrap
-msgid ""
-"> “The version 1.0 was instantly very popular and I got a ton of positive "
-"feedback and support. But over the time it also became clear that a few "
-"things could be expressed in a simpler and clearer way. So the idea came up "
-"to do a revision of the manifesto based on all the feedback” [says Frank "
-"Karlitschek](http://karlitschek.de/2015/08/user-data-manifesto-2-0-launched/) "
-"who launched the initiative in 2012.\n"
+msgid "> “The version 1.0 was instantly very popular and I got a ton of positive feedback and support. But over the time it also became clear that a few things could be expressed in a simpler and clearer way. So the idea came up to do a revision of the manifesto based on all the feedback” [says Frank Karlitschek](http://karlitschek.de/2015/08/user-data-manifesto-2-0-launched/) who launched the initiative in 2012.\n"
 msgstr ""
 
 #. type: Plain text
 #, no-wrap
-msgid ""
-"> “The recognition of the User Data Rights defined in the manifesto is an "
-"important block to build a free society in the digital age“ [according to "
-"Hugo Roy](https://hroy.eu/posts/UserDataManifesto2dot0/), coauthor of the "
-"User Data Manifesto version 2.\n"
+msgid "> “The recognition of the User Data Rights defined in the manifesto is an important block to build a free society in the digital age“ [according to Hugo Roy](https://hroy.eu/posts/UserDataManifesto2dot0/), coauthor of the User Data Manifesto version 2.\n"
 msgstr ""
 
 #. type: Plain text
@@ -59,10 +49,9 @@ msgstr ""
 
 #. type: Plain text
 msgid ""
-"- KDE - GNOME - [Free Software Foundation "
-"Europe](https://fsfe.org/news/2015/news-20150829-01.html)  - "
-"[Netzpolitik.org](https://netzpolitik.org/2015/user-data-manifesto-2-0/)  - "
-"X-Lab - ToS;DR - Spreed - ownCloud"
+"- KDE - GNOME - [Free Software Foundation Europe](https://fsfe.org/news/2015/"
+"news-20150829-01.html)  - [Netzpolitik.org](https://netzpolitik.org/2015/"
+"user-data-manifesto-2-0/)  - X-Lab - ToS;DR - Spreed - ownCloud"
 msgstr ""
 
 #. type: Plain text
diff --git a/news/launchingVersion2dot0.tr.po b/news/launchingVersion2dot0.tr.po
index 4da5f0a..6fdba20 100644
--- a/news/launchingVersion2dot0.tr.po
+++ b/news/launchingVersion2dot0.tr.po
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2015-08-29 15:26+0000\n"
+"POT-Creation-Date: 2015-08-29 15:36+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -29,28 +29,18 @@ msgstr ""
 #. type: Plain text
 msgid ""
 "Today, the main authors of the User Data Manifesto have announced the "
-"release of version 2.0 during the [ownCloud Contributors "
-"Conference](https://owncloud.org/conf/) in Berlin."
+"release of version 2.0 during the [ownCloud Contributor Conference](https://"

(Diff truncated)
owncloud conf name
diff --git a/news/launchingVersion2dot0.mdwn b/news/launchingVersion2dot0.mdwn
index 41e7bcb..de27334 100644
--- a/news/launchingVersion2dot0.mdwn
+++ b/news/launchingVersion2dot0.mdwn
@@ -1,7 +1,7 @@
 [[!meta title="Announcing Version 2.0 of the User Data Manifesto"]]
 [[!meta language="en"]]
 
-Today, the main authors of the User Data Manifesto have announced the release of version 2.0 during the [ownCloud Contributors Conference](https://owncloud.org/conf/) in Berlin.
+Today, the main authors of the User Data Manifesto have announced the release of version 2.0 during the [ownCloud Contributor Conference](https://owncloud.org/conf/) in Berlin.
 
 > “The version 1.0 was instantly very popular and I got a ton of positive feedback and support. But over the time it also became clear that a few things could be expressed in a simpler and clearer way. So the idea came up to do a revision of the manifesto based on all the feedback” [says Frank Karlitschek](http://karlitschek.de/2015/08/user-data-manifesto-2-0-launched/) who launched the initiative in 2012.
 

updated PO files
diff --git a/index.de.po b/index.de.po
index ed0532f..6259c69 100644
--- a/index.de.po
+++ b/index.de.po
@@ -4,7 +4,7 @@
 # modification, are permitted under any circumstances. No warranty.
 msgid ""
 msgstr ""
-"POT-Creation-Date: 2015-08-29 15:26+0000\n"
+"POT-Creation-Date: 2015-08-29 15:35+0000\n"
 "PO-Revision-Date: 2010-03-12 09:40+0530\n"
 "Last-Translator: Sebastian Kuhnert <mail@sebastian-kuhnert.de>\n"
 "Language-Team: None\n"
@@ -31,7 +31,9 @@ msgstr ""
 
 #. type: Plain text
 #, no-wrap
-msgid "<div class=\"lastNewsEntry\">\n"
+msgid ""
+"<div class=\"lastNewsEntry\">\n"
+"<h2>News</h2>\n"
 msgstr ""
 
 #. type: Plain text
diff --git a/index.fr.po b/index.fr.po
index c28e946..8198a4d 100644
--- a/index.fr.po
+++ b/index.fr.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ikiwiki\n"
-"POT-Creation-Date: 2015-08-29 15:26+0000\n"
+"POT-Creation-Date: 2015-08-29 15:35+0000\n"
 "PO-Revision-Date: 2009-08-23 18:50+0200\n"
 "Last-Translator: Philippe Batailler <philippe.batailler@free.fr>\n"
 "Language-Team: French <debian-l10n-french@lists.debian.org>\n"
@@ -31,7 +31,9 @@ msgstr ""
 
 #. type: Plain text
 #, no-wrap
-msgid "<div class=\"lastNewsEntry\">\n"
+msgid ""
+"<div class=\"lastNewsEntry\">\n"
+"<h2>News</h2>\n"
 msgstr ""
 
 #. type: Plain text
diff --git a/index.ja.po b/index.ja.po
index df47630..9ba4982 100644
--- a/index.ja.po
+++ b/index.ja.po
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2015-08-29 15:26+0000\n"
+"POT-Creation-Date: 2015-08-29 15:35+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -33,7 +33,9 @@ msgstr ""
 
 #. type: Plain text
 #, no-wrap
-msgid "<div class=\"lastNewsEntry\">\n"
+msgid ""
+"<div class=\"lastNewsEntry\">\n"
+"<h2>News</h2>\n"
 msgstr ""
 
 #. type: Plain text
diff --git a/index.tr.po b/index.tr.po
index df47630..9ba4982 100644
--- a/index.tr.po
+++ b/index.tr.po
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2015-08-29 15:26+0000\n"
+"POT-Creation-Date: 2015-08-29 15:35+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -33,7 +33,9 @@ msgstr ""
 
 #. type: Plain text
 #, no-wrap
-msgid "<div class=\"lastNewsEntry\">\n"
+msgid ""
+"<div class=\"lastNewsEntry\">\n"
+"<h2>News</h2>\n"
 msgstr ""
 
 #. type: Plain text

add news title
diff --git a/index.mdwn b/index.mdwn
index 563a08e..b52008d 100644
--- a/index.mdwn
+++ b/index.mdwn
@@ -3,6 +3,7 @@
 [[!meta language="en"]]
 
 <div class="lastNewsEntry">
+<h2>News</h2>
 [[!inline pages="page(./news/*) and !*/Discussion" archive=yes quick=yes trail=no show="1" feeds="yes"]]
 </div>
 

updated PO files
diff --git a/news.de.po b/news.de.po
index 42cb4a9..d4374db 100644
--- a/news.de.po
+++ b/news.de.po
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2015-08-29 15:29+0000\n"
+"POT-Creation-Date: 2015-08-29 15:33+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -23,7 +23,5 @@ msgstr ""
 
 #. type: Plain text
 #, no-wrap
-msgid ""
-"[[!inline pages=\"page(./news/*) and !*/Discussion\" archive=yes\n"
-"feedshow=15 quick=yes trail=yes feeds=yes]]\n"
+msgid "[[!inline pages=\"page(./news/*) and !*/Discussion and currentlang()\" archive=yes feedshow=15 quick=yes trail=yes feeds=yes]]\n"
 msgstr ""
diff --git a/news.fr.po b/news.fr.po
index 42cb4a9..d4374db 100644
--- a/news.fr.po
+++ b/news.fr.po
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2015-08-29 15:29+0000\n"
+"POT-Creation-Date: 2015-08-29 15:33+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -23,7 +23,5 @@ msgstr ""
 
 #. type: Plain text
 #, no-wrap
-msgid ""
-"[[!inline pages=\"page(./news/*) and !*/Discussion\" archive=yes\n"
-"feedshow=15 quick=yes trail=yes feeds=yes]]\n"
+msgid "[[!inline pages=\"page(./news/*) and !*/Discussion and currentlang()\" archive=yes feedshow=15 quick=yes trail=yes feeds=yes]]\n"
 msgstr ""
diff --git a/news.ja.po b/news.ja.po
index 42cb4a9..d4374db 100644
--- a/news.ja.po
+++ b/news.ja.po
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2015-08-29 15:29+0000\n"
+"POT-Creation-Date: 2015-08-29 15:33+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -23,7 +23,5 @@ msgstr ""
 
 #. type: Plain text
 #, no-wrap
-msgid ""
-"[[!inline pages=\"page(./news/*) and !*/Discussion\" archive=yes\n"
-"feedshow=15 quick=yes trail=yes feeds=yes]]\n"
+msgid "[[!inline pages=\"page(./news/*) and !*/Discussion and currentlang()\" archive=yes feedshow=15 quick=yes trail=yes feeds=yes]]\n"
 msgstr ""
diff --git a/news.tr.po b/news.tr.po
index 42cb4a9..d4374db 100644
--- a/news.tr.po
+++ b/news.tr.po
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2015-08-29 15:29+0000\n"
+"POT-Creation-Date: 2015-08-29 15:33+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -23,7 +23,5 @@ msgstr ""
 
 #. type: Plain text
 #, no-wrap
-msgid ""
-"[[!inline pages=\"page(./news/*) and !*/Discussion\" archive=yes\n"
-"feedshow=15 quick=yes trail=yes feeds=yes]]\n"
+msgid "[[!inline pages=\"page(./news/*) and !*/Discussion and currentlang()\" archive=yes feedshow=15 quick=yes trail=yes feeds=yes]]\n"
 msgstr ""

show only current lang news
diff --git a/news.mdwn b/news.mdwn
index 7330f94..8964250 100644
--- a/news.mdwn
+++ b/news.mdwn
@@ -1,5 +1,4 @@
 
 [[!meta title="News - User Data Manifesto"]]
 
-[[!inline pages="page(./news/*) and !*/Discussion" archive=yes
-feedshow=15 quick=yes trail=yes feeds=yes]]
+[[!inline pages="page(./news/*) and !*/Discussion and currentlang()" archive=yes feedshow=15 quick=yes trail=yes feeds=yes]]

updated PO files
diff --git a/news.de.po b/news.de.po
new file mode 100644
index 0000000..42cb4a9
--- /dev/null
+++ b/news.de.po
@@ -0,0 +1,29 @@
+# SOME DESCRIPTIVE TITLE
+# Copyright (C) YEAR Free Software Foundation, Inc.
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"POT-Creation-Date: 2015-08-29 15:29+0000\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#. type: Plain text
+#, no-wrap
+msgid "[[!meta title=\"News - User Data Manifesto\"]]\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+"[[!inline pages=\"page(./news/*) and !*/Discussion\" archive=yes\n"
+"feedshow=15 quick=yes trail=yes feeds=yes]]\n"
+msgstr ""
diff --git a/news.fr.po b/news.fr.po
new file mode 100644
index 0000000..42cb4a9
--- /dev/null
+++ b/news.fr.po
@@ -0,0 +1,29 @@
+# SOME DESCRIPTIVE TITLE
+# Copyright (C) YEAR Free Software Foundation, Inc.
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"POT-Creation-Date: 2015-08-29 15:29+0000\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#. type: Plain text
+#, no-wrap
+msgid "[[!meta title=\"News - User Data Manifesto\"]]\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+"[[!inline pages=\"page(./news/*) and !*/Discussion\" archive=yes\n"
+"feedshow=15 quick=yes trail=yes feeds=yes]]\n"
+msgstr ""
diff --git a/news.ja.po b/news.ja.po
new file mode 100644
index 0000000..42cb4a9
--- /dev/null
+++ b/news.ja.po
@@ -0,0 +1,29 @@
+# SOME DESCRIPTIVE TITLE
+# Copyright (C) YEAR Free Software Foundation, Inc.
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"POT-Creation-Date: 2015-08-29 15:29+0000\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#. type: Plain text
+#, no-wrap
+msgid "[[!meta title=\"News - User Data Manifesto\"]]\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+"[[!inline pages=\"page(./news/*) and !*/Discussion\" archive=yes\n"
+"feedshow=15 quick=yes trail=yes feeds=yes]]\n"
+msgstr ""
diff --git a/news.tr.po b/news.tr.po
new file mode 100644
index 0000000..42cb4a9
--- /dev/null
+++ b/news.tr.po
@@ -0,0 +1,29 @@
+# SOME DESCRIPTIVE TITLE
+# Copyright (C) YEAR Free Software Foundation, Inc.
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"POT-Creation-Date: 2015-08-29 15:29+0000\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#. type: Plain text
+#, no-wrap
+msgid "[[!meta title=\"News - User Data Manifesto\"]]\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+"[[!inline pages=\"page(./news/*) and !*/Discussion\" archive=yes\n"
+"feedshow=15 quick=yes trail=yes feeds=yes]]\n"
+msgstr ""

index of news entries
diff --git a/news.mdwn b/news.mdwn
new file mode 100644
index 0000000..7330f94
--- /dev/null
+++ b/news.mdwn
@@ -0,0 +1,5 @@
+
+[[!meta title="News - User Data Manifesto"]]
+
+[[!inline pages="page(./news/*) and !*/Discussion" archive=yes
+feedshow=15 quick=yes trail=yes feeds=yes]]

updated PO files
diff --git a/index.de.po b/index.de.po
index 4d70454..ed0532f 100644
--- a/index.de.po
+++ b/index.de.po
@@ -4,7 +4,7 @@
 # modification, are permitted under any circumstances. No warranty.
 msgid ""
 msgstr ""
-"POT-Creation-Date: 2015-08-18 14:16+0000\n"
+"POT-Creation-Date: 2015-08-29 15:26+0000\n"
 "PO-Revision-Date: 2010-03-12 09:40+0530\n"
 "Last-Translator: Sebastian Kuhnert <mail@sebastian-kuhnert.de>\n"
 "Language-Team: None\n"
@@ -29,9 +29,19 @@ msgstr ""
 msgid "[[!meta language=\"en\"]]\n"
 msgstr ""
 
-#. type: Title #
+#. type: Plain text
+#, no-wrap
+msgid "<div class=\"lastNewsEntry\">\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid "[[!inline pages=\"page(./news/*) and !*/Discussion\" archive=yes quick=yes trail=no show=\"1\" feeds=\"yes\"]]\n"
+msgstr ""
+
+#. type: Plain text
 #, no-wrap
-msgid "2.0 DRAFT"
+msgid "</div>\n"
 msgstr ""
 
 #. type: Plain text
diff --git a/index.fr.po b/index.fr.po
index ef22d86..c28e946 100644
--- a/index.fr.po
+++ b/index.fr.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ikiwiki\n"
-"POT-Creation-Date: 2015-08-18 14:16+0000\n"
+"POT-Creation-Date: 2015-08-29 15:26+0000\n"
 "PO-Revision-Date: 2009-08-23 18:50+0200\n"
 "Last-Translator: Philippe Batailler <philippe.batailler@free.fr>\n"
 "Language-Team: French <debian-l10n-french@lists.debian.org>\n"
@@ -29,9 +29,19 @@ msgstr ""
 msgid "[[!meta language=\"en\"]]\n"
 msgstr ""
 
-#. type: Title #
+#. type: Plain text
+#, no-wrap
+msgid "<div class=\"lastNewsEntry\">\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid "[[!inline pages=\"page(./news/*) and !*/Discussion\" archive=yes quick=yes trail=no show=\"1\" feeds=\"yes\"]]\n"
+msgstr ""
+
+#. type: Plain text
 #, no-wrap
-msgid "2.0 DRAFT"
+msgid "</div>\n"
 msgstr ""
 
 #. type: Plain text
diff --git a/index.ja.po b/index.ja.po
index e03b6ec..df47630 100644
--- a/index.ja.po
+++ b/index.ja.po
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2015-08-18 14:16+0000\n"
+"POT-Creation-Date: 2015-08-29 15:26+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -23,10 +23,7 @@ msgstr ""
 
 #. type: Plain text
 #, no-wrap
-msgid ""
-"[[!meta description=\"This manifesto aims at defining users’ fundamental "
-"rights to their own data in the Internet age. People ought to be free and "
-"should not have to pay allegiance to service providers.\"]] \n"
+msgid "[[!meta description=\"This manifesto aims at defining users’ fundamental rights to their own data in the Internet age. People ought to be free and should not have to pay allegiance to service providers.\"]] \n"
 msgstr ""
 
 #. type: Plain text
@@ -34,9 +31,19 @@ msgstr ""
 msgid "[[!meta language=\"en\"]]\n"
 msgstr ""
 
-#. type: Title #
+#. type: Plain text
+#, no-wrap
+msgid "<div class=\"lastNewsEntry\">\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid "[[!inline pages=\"page(./news/*) and !*/Discussion\" archive=yes quick=yes trail=no show=\"1\" feeds=\"yes\"]]\n"
+msgstr ""
+
+#. type: Plain text
 #, no-wrap
-msgid "2.0 DRAFT"
+msgid "</div>\n"
 msgstr ""
 
 #. type: Plain text
@@ -54,8 +61,7 @@ msgstr ""
 #. type: Plain text
 #, no-wrap
 msgid ""
-"<ol start=\"0\"><li><p><strong>User data</strong> means any data uploaded by "
-"a\n"
+"<ol start=\"0\"><li><p><strong>User data</strong> means any data uploaded by a\n"
 "user for his or her own use.</p></li></ol>\n"
 msgstr ""
 
@@ -75,8 +81,7 @@ msgstr ""
 
 #. type: Bullet: '  - '
 msgid ""
-"the files a user is syncing through multiple devices or sharing with a "
-"friend"
+"the files a user is syncing through multiple devices or sharing with a friend"
 msgstr ""
 
 #. type: Bullet: '  - '
@@ -111,10 +116,8 @@ msgstr ""
 #. type: Plain text
 #, no-wrap
 msgid ""
-"    User data should be under the ultimate control of the user. Users should "
-"be\n"
-"    able to decide whom to grant direct access to their data and with "
-"which\n"
+"    User data should be under the ultimate control of the user. Users should be\n"
+"    able to decide whom to grant direct access to their data and with which\n"
 "    permissions and licenses such access should be granted.\n"
 msgstr ""
 
@@ -146,10 +149,8 @@ msgstr ""
 #. type: Plain text
 #, no-wrap
 msgid ""
-"    That also means that when users do not have full control over the upload "
-"of\n"
-"    their data (e.g. if they don't use cryptography before uploading) a "
-"service\n"
+"    That also means that when users do not have full control over the upload of\n"
+"    their data (e.g. if they don't use cryptography before uploading) a service\n"
 "    provider should **not**:\n"
 msgstr ""
 
@@ -169,17 +170,13 @@ msgstr ""
 #. type: Plain text
 #, no-wrap
 msgid ""
-"    When users make data available to others, whether to a restrictive group "
-"of\n"
+"    When users make data available to others, whether to a restrictive group of\n"
 "    people or to large groups, they should be able to decide under which\n"
 "    permissions they grant access to this data. However, this right is not\n"
-"    absolute and should not extend over others’ rights to use and exploit "
-"the\n"
-"    data once it has been made available to them.  What’s more, it does "
-"not\n"
+"    absolute and should not extend over others’ rights to use and exploit the\n"
+"    data once it has been made available to them.  What’s more, it does not\n"
 "    mean that users should have the right to impose unfair restrictions to\n"
-"    other people. In any event, technical systems should not be designed "
-"to\n"
+"    other people. In any event, technical systems should not be designed to\n"
 "    enforce such restrictions (e.g. through [[!taglink DRM]]).\n"
 msgstr ""
 
@@ -191,10 +188,8 @@ msgstr ""
 #. type: Plain text
 #, no-wrap
 msgid ""
-"    Data generated or associated with user data (e.g. metadata) should also "
-"be\n"
-"    made available to that user and put under their control just like the "
-"user\n"
+"    Data generated or associated with user data (e.g. metadata) should also be\n"
+"    made available to that user and put under their control just like the user\n"
 "    data itself.\n"
 msgstr ""
 
@@ -229,11 +224,9 @@ msgstr ""
 #. type: Plain text

(Diff truncated)
announcing version 2.0
diff --git a/index.mdwn b/index.mdwn
index 4d5938d..563a08e 100644
--- a/index.mdwn
+++ b/index.mdwn
@@ -2,10 +2,9 @@
 [[!meta description="This manifesto aims at defining users’ fundamental rights to their own data in the Internet age. People ought to be free and should not have to pay allegiance to service providers."]] 
 [[!meta language="en"]]
 
-
-
-# 2.0 DRAFT
-
+<div class="lastNewsEntry">
+[[!inline pages="page(./news/*) and !*/Discussion" archive=yes quick=yes trail=no show="1" feeds="yes"]]
+</div>
 
 This manifesto aims at defining users’ fundamental 
 [[!taglink rights_to_their_own_data|datarights]] in the Internet age. People
diff --git a/local.css b/local.css
index fbb3a8b..6d1347d 100644
--- a/local.css
+++ b/local.css
@@ -1 +1 @@
-.pageheader .actions{font-size:.8em;display:none}@media (min-width:700px){.pageheader .actions{display:block}}.pageheader .title{padding:1em 0}.pageheader #searchform{display:none}#pagebody{max-width:900px}aside.sidebar{margin:1em 2em;border:0;padding:0;width:auto;float:none;background:transparent;display:none}@media (min-width:350px){aside.sidebar{display:block}}aside.sidebar .nav{padding-left:0;list-style-type:none;font-size:.8em}aside.sidebar .nav li{background:rgba(255,255,0,0.2);display:inline-block;padding:.5em;margin:.25em}@media (min-width:1200px){aside.sidebar{float:right;width:250px}aside.sidebar .nav li{display:block}}.toggleable{font-size:.9em;margin-left:1.5em}.toggleable .toggle{margin-left:-1.5em;float:left}#otherlanguages span{float:left;padding:6px 0}.notice.translation{display:block;font-size:.8em;background:none repeat scroll 0 0 rgba(255,255,0,0.2);padding:1em}#footer .tags a{display:block}@media (min-width:350px){#footer .tags a{display:inline;margin-right:1.5em}}
\ No newline at end of file
+.pageheader .actions{font-size:.8em;display:none}@media (min-width:700px){.pageheader .actions{display:block}}.pageheader .title{padding:1em 0}.pageheader #searchform{display:none}#pagebody{max-width:900px}aside.sidebar{margin:1em 2em;border:0;padding:0;width:auto;float:none;background:transparent;display:none}@media (min-width:350px){aside.sidebar{display:block}}aside.sidebar .nav{padding-left:0;list-style-type:none;font-size:.8em}aside.sidebar .nav li{background:rgba(255,255,0,0.2);display:inline-block;padding:.5em;margin:.25em}@media (min-width:1200px){aside.sidebar{float:right;width:250px}aside.sidebar .nav li{display:block}}.toggleable{font-size:.9em;margin-left:1.5em}.toggleable .toggle{margin-left:-1.5em;float:left}#otherlanguages span{float:left;padding:6px 0}.notice.translation{display:block;font-size:.8em;background:none repeat scroll 0 0 rgba(255,255,0,0.2);padding:1em}.lastNewsEntry{background:rgba(255,255,0,0.2)}#footer .tags a{display:block}@media (min-width:350px){#footer .tags a{display:inline;margin-right:1.5em}}
\ No newline at end of file
diff --git a/local.less b/local.less
index 1c97343..4323337 100644
--- a/local.less
+++ b/local.less
@@ -101,6 +101,10 @@ aside.sidebar {
     }
 }
 
+.lastNewsEntry {
+    background: rgba(255, 255, 0, 0.2);
+}
+
 #footer {
     .tags {
         a {
diff --git a/news/launchingVersion2dot0.mdwn b/news/launchingVersion2dot0.mdwn
new file mode 100644
index 0000000..41e7bcb
--- /dev/null
+++ b/news/launchingVersion2dot0.mdwn
@@ -0,0 +1,23 @@
+[[!meta title="Announcing Version 2.0 of the User Data Manifesto"]]
+[[!meta language="en"]]
+
+Today, the main authors of the User Data Manifesto have announced the release of version 2.0 during the [ownCloud Contributors Conference](https://owncloud.org/conf/) in Berlin.
+
+> “The version 1.0 was instantly very popular and I got a ton of positive feedback and support. But over the time it also became clear that a few things could be expressed in a simpler and clearer way. So the idea came up to do a revision of the manifesto based on all the feedback” [says Frank Karlitschek](http://karlitschek.de/2015/08/user-data-manifesto-2-0-launched/) who launched the initiative in 2012.
+
+> “The recognition of the User Data Rights defined in the manifesto is an important block to build a free society in the digital age“ [according to Hugo Roy](https://hroy.eu/posts/UserDataManifesto2dot0/), coauthor of the User Data Manifesto version 2.
+
+The publication of the Manifesto is supported by:
+
+- KDE
+- GNOME
+- [Free Software Foundation Europe](https://fsfe.org/news/2015/news-20150829-01.html)
+- [Netzpolitik.org](https://netzpolitik.org/2015/user-data-manifesto-2-0/)
+- X-Lab
+- ToS;DR
+- Spreed
+- ownCloud
+
+The User Data Manifesto is a starting point, a humble contribution to the greater debate on rights and freedoms online that can hopefully help raise awareness.
+
+[[Read_the_full_text_of_the_User_Data_Manifesto_here|index]].

updated PO files
diff --git a/index.de.po b/index.de.po
new file mode 100644
index 0000000..4d70454
--- /dev/null
+++ b/index.de.po
@@ -0,0 +1,370 @@
+# German translation of basewiki/index page for ikiwiki.
+# Copyright © 2010 Sebastian Kuhnert <mail@sebastian-kuhnert.de>
+# Redistribution and use in source and compiled forms, with or without
+# modification, are permitted under any circumstances. No warranty.
+msgid ""
+msgstr ""
+"POT-Creation-Date: 2015-08-18 14:16+0000\n"
+"PO-Revision-Date: 2010-03-12 09:40+0530\n"
+"Last-Translator: Sebastian Kuhnert <mail@sebastian-kuhnert.de>\n"
+"Language-Team: None\n"
+"Language: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=n != 1;\n"
+
+#. type: Plain text
+#, no-wrap
+msgid "[[!meta title=\"user data manifesto\"]]\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid "[[!meta description=\"This manifesto aims at defining users’ fundamental rights to their own data in the Internet age. People ought to be free and should not have to pay allegiance to service providers.\"]] \n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid "[[!meta language=\"en\"]]\n"
+msgstr ""
+
+#. type: Title #
+#, no-wrap
+msgid "2.0 DRAFT"
+msgstr ""
+
+#. type: Plain text
+msgid ""
+"This manifesto aims at defining users’ fundamental [[!taglink "
+"rights_to_their_own_data|datarights]] in the Internet age. People ought to "
+"be free and should not have to pay allegiance to service providers."
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid "[[!toggle  id=\"userdata\" text=\"\"\"\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+"<ol start=\"0\"><li><p><strong>User data</strong> means any data uploaded by a\n"
+"user for his or her own use.</p></li></ol>\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid "[[!toggleable id=\"userdata\" text=\"\"\"\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid "[[!toggle  id=\"userdata\" text=\"×\"]]\n"
+msgstr ""
+
+#. type: Plain text
+msgid "Examples of user data include:"
+msgstr ""
+
+#. type: Bullet: '  - '
+msgid ""
+"the files a user is syncing through multiple devices or sharing with a friend"
+msgstr ""
+
+#. type: Bullet: '  - '
+msgid ""
+"a library of photos, books or other files a user uploads from their device "
+"in order to be able to read, view or modify online"
+msgstr ""
+
+#. type: Bullet: '  - '
+msgid ""
+"data generated by a user's device (like a connected watch or theromstat) and "
+"sent to a server"
+msgstr ""
+
+#. type: Bullet: '  - '
+msgid "a user's search engine queries, if they are logged as such"
+msgstr ""
+
+#. type: Plain text
+msgid "Thus, users should have:"
+msgstr ""
+
+#. type: Bullet: '1. '
+msgid "**Control** over user data access"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid "    [[!toggle  id=\"wucat\" text=\"\"\"\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+"    User data should be under the ultimate control of the user. Users should be\n"
+"    able to decide whom to grant direct access to their data and with which\n"
+"    permissions and licenses such access should be granted.\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid "    [[!toggleable id=\"wucat\" text=\"\"\"\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid "    [[!toggle  id=\"wucat\" text=\"×\"]]\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+"    When users have control over the upload of their data, data\n"
+"    intended to be privately shared should not be accessible to the\n"
+"    service provider, nor shared with governments.\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+"    That means the right to use [[!taglink cryptography]] should never be\n"
+"    denied. \n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+"    That also means that when users do not have full control over the upload of\n"
+"    their data (e.g. if they don't use cryptography before uploading) a service\n"
+"    provider should **not**:\n"
+msgstr ""
+
+#. type: Bullet: '     1. '
+msgid ""
+"force users to disclose private data (including private correspondence)  "
+"with them, nor"
+msgstr ""
+
+#. type: Bullet: '     2. '
+msgid ""
+"impose licensing conditions (e.g. on copyright, or personal data "
+"exploitation) that go beyond what is necessary for the purpose of running "
+"the service."
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+"    When users make data available to others, whether to a restrictive group of\n"
+"    people or to large groups, they should be able to decide under which\n"
+"    permissions they grant access to this data. However, this right is not\n"
+"    absolute and should not extend over others’ rights to use and exploit the\n"
+"    data once it has been made available to them.  What’s more, it does not\n"
+"    mean that users should have the right to impose unfair restrictions to\n"
+"    other people. In any event, technical systems should not be designed to\n"
+"    enforce such restrictions (e.g. through [[!taglink DRM]]).\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid "    [[!toggle  id=\"ssauts\" text=\"\"\"\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+"    Data generated or associated with user data (e.g. metadata) should also be\n"
+"    made available to that user and put under their control just like the user\n"
+"    data itself.\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid "    [[!toggleable id=\"ssauts\" text=\"\"\"\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid "    [[!toggle  id=\"ssauts\" text=\"×\"]]\n"
+msgstr ""
+
+#. type: Plain text

(Diff truncated)
backup of translations
diff --git a/index.de.po b/index.de.po
deleted file mode 100644
index e2d5485..0000000
--- a/index.de.po
+++ /dev/null
@@ -1,401 +0,0 @@
-# German translation of basewiki/index page for ikiwiki.
-# Copyright © 2010 Sebastian Kuhnert <mail@sebastian-kuhnert.de>
-# Redistribution and use in source and compiled forms, with or without
-# modification, are permitted under any circumstances. No warranty.
-msgid ""
-msgstr ""
-"POT-Creation-Date: 2015-08-18 14:16+0000\n"
-"PO-Revision-Date: 2010-03-12 09:40+0530\n"
-"Last-Translator: Sebastian Kuhnert <mail@sebastian-kuhnert.de>\n"
-"Language-Team: None\n"
-"Language: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=n != 1;\n"
-
-#. type: Plain text
-#, no-wrap
-msgid "[[!meta title=\"user data manifesto\"]]\n"
-msgstr "[[!meta title=\"User Data Manifesto\"]]\n"
-
-#. type: Plain text
-#, no-wrap
-msgid "[[!meta description=\"This manifesto aims at defining users’ fundamental rights to their own data in the Internet age. People ought to be free and should not have to pay allegiance to service providers.\"]] \n"
-msgstr "[[!meta description=\"Dieses Manifest zielt auf die Definition der grundlegenden Rechte eines Nutzers an seinen eigenen Daten im Internet-Zeitalter ab. Jeder sollte frei sein und sollte nicht an einen Diensteanbieter gebunden sein.\"]] \n"
-
-#. type: Plain text
-#, no-wrap
-msgid "[[!meta language=\"en\"]]\n"
-msgstr "[[!meta language=\"de\"]] [[!template id=\"translation-notice.tmpl\" deutsch=\"yes\" doing=\"yes\" ghsrc=\"index.de.po\"]]"
-
-#. type: Title #
-#, no-wrap
-msgid "2.0 DRAFT"
-msgstr "2.0 ENTWURF"
-
-#. type: Plain text
-msgid ""
-"This manifesto aims at defining users’ fundamental [[!taglink "
-"rights_to_their_own_data|datarights]] in the Internet age. People ought to "
-"be free and should not have to pay allegiance to service providers."
-msgstr ""
-"Dieses Manifest zielt auf die Definition der grundlegenden [[!taglink "
-"rights_to_their_own_data|datarights]] im Internet-Zeitalter ab. Jeder sollte "
-"frei sein und sollte nicht an einen Diensteanbieter gebunden sein."
-
-#. type: Plain text
-#, no-wrap
-msgid "[[!toggle  id=\"userdata\" text=\"\"\"\n"
-msgstr ""
-
-#. type: Plain text
-#, fuzzy, no-wrap
-#| msgid ""
-#| "<ol start=\"0\"><li><strong>User data</strong> means any data uploaded by a user and/or\n"
-#| "generated from a user, while using a service on the Internet. </li></ol>\n"
-msgid ""
-"<ol start=\"0\"><li><p><strong>User data</strong> means any data uploaded by a\n"
-"user for his or her own use.</p></li></ol>\n"
-msgstr ""
-"<ol start=\"0\"><li><strong>Nutzerdaten</strong> bezeichnet alle Daten, die ein Nutzer hochgeladen und/oder\n"
-"von einem Nutzer generiert wurden, während er einen Dienst im Internet nutzte. </li></ol>\n"
-
-#. type: Plain text
-#, no-wrap
-msgid "[[!toggleable id=\"userdata\" text=\"\"\"\n"
-msgstr ""
-
-#. type: Plain text
-#, fuzzy, no-wrap
-#| msgid "[[!meta title=\"user data manifesto\"]]\n"
-msgid "[[!toggle  id=\"userdata\" text=\"×\"]]\n"
-msgstr "[[!meta title=\"User Data Manifesto\"]]\n"
-
-#. type: Plain text
-msgid "Examples of user data include:"
-msgstr ""
-
-#. type: Bullet: '  - '
-msgid ""
-"the files a user is syncing through multiple devices or sharing with a friend"
-msgstr ""
-
-#. type: Bullet: '  - '
-msgid ""
-"a library of photos, books or other files a user uploads from their device "
-"in order to be able to read, view or modify online"
-msgstr ""
-
-#. type: Bullet: '  - '
-msgid ""
-"data generated by a user's device (like a connected watch or theromstat) and "
-"sent to a server"
-msgstr ""
-
-#. type: Bullet: '  - '
-msgid "a user's search engine queries, if they are logged as such"
-msgstr ""
-
-#. type: Plain text
-msgid "Thus, users should have:"
-msgstr "Deswegen sollte jeder Nutzer folgendes haben:"
-
-#. type: Bullet: '1. '
-msgid "**Control** over user data access"
-msgstr "**Kontrolle** über den Zugriff auf die Nutzerdaten"
-
-#. type: Plain text
-#, no-wrap
-msgid "    [[!toggle  id=\"wucat\" text=\"\"\"\n"
-msgstr ""
-
-#. type: Plain text
-#, fuzzy, no-wrap
-#| msgid ""
-#| "    Data explicitly and willingly uploaded by a user should be under the\n"
-#| "    ultimate control of the user. Users should be able to decide whom to grant\n"
-#| "    direct access to their data and with which permissions and licenses such\n"
-#| "    access should be granted.\n"
-msgid ""
-"    User data should be under the ultimate control of the user. Users should be\n"
-"    able to decide whom to grant direct access to their data and with which\n"
-"    permissions and licenses such access should be granted.\n"
-msgstr ""
-"    Daten, die explizit und gewollt vom Nutzer hochgeladen wurden, sollten unter\n"
-"    alleiniger Kontrolle des Nutzers sein. Der Nutzer sollte in der Lage sein, zu\n"
-"    entscheiden wem direkter Zugriff auf die Daten erlaubt ist und mit welchen\n"
-"    Berechtigungen und Lizenzen der Zugriff erlaubt ist.\n"
-
-#. type: Plain text
-#, no-wrap
-msgid "    [[!toggleable id=\"wucat\" text=\"\"\"\n"
-msgstr ""
-
-#. type: Plain text
-#, no-wrap
-msgid "    [[!toggle  id=\"wucat\" text=\"×\"]]\n"
-msgstr ""
-
-#. type: Plain text
-#, fuzzy, no-wrap
-#| msgid ""
-#| "    When users control access to the data they upload, it means that\n"
-#| "    data intended to be privately shared should not be accessible to the service\n"
-#| "    provider, nor shared with governments.  Users should be the only ones to have\n"
-#| "    ultimate control over it and to grant access to it. \n"
-msgid ""
-"    When users have control over the upload of their data, data\n"
-"    intended to be privately shared should not be accessible to the\n"
-"    service provider, nor shared with governments.\n"
-msgstr "    Wenn Nutzer die Zugriffkontrolle auf die hochgeladenen Daten haben, bedeutet das, dass weder der Dienstanbieter noch Regierungen Zugriff auf privat geteilten Daten haben. Die Nutzer haben die alleinige Kontrolle über die Daten und die Bewilligung der Zugriffsberechtigung auf diese. \n"
-
-#. type: Plain text
-#, fuzzy, no-wrap
-#| msgid "    That means the right to use [[!taglink cryptography]] should never be denied. \n"
-msgid ""
-"    That means the right to use [[!taglink cryptography]] should never be\n"
-"    denied. \n"
-msgstr "    Dies bedeutet, dass das Recht auf das Nutzen von [[!taglink Kryptographie|cryptography]] niemals verwährt werden darf. \n"
-
-#. type: Plain text
-#, no-wrap
-msgid ""
-"    That also means that when users do not have full control over the upload of\n"
-"    their data (e.g. if they don't use cryptography before uploading) a service\n"
-"    provider should **not**:\n"
-msgstr ""
-
-#. type: Bullet: '     1. '
-msgid ""
-"force users to disclose private data (including private correspondence)  "
-"with them, nor"
-msgstr ""
-
-#. type: Bullet: '     2. '
-msgid ""
-"impose licensing conditions (e.g. on copyright, or personal data "
-"exploitation) that go beyond what is necessary for the purpose of running "
-"the service."
-msgstr ""
-
-#. type: Plain text
-#, no-wrap
-msgid ""
-"    When users make data available to others, whether to a restrictive group of\n"
-"    people or to large groups, they should be able to decide under which\n"
-"    permissions they grant access to this data. However, this right is not\n"
-"    absolute and should not extend over others’ rights to use and exploit the\n"
-"    data once it has been made available to them.  What’s more, it does not\n"
-"    mean that users should have the right to impose unfair restrictions to\n"
-"    other people. In any event, technical systems should not be designed to\n"
-"    enforce such restrictions (e.g. through [[!taglink DRM]]).\n"
-msgstr ""
-

(Diff truncated)
taglink repair
diff --git a/index.fr.po b/index.fr.po
index ce6e058..23cba0e 100644
--- a/index.fr.po
+++ b/index.fr.po
@@ -375,8 +375,7 @@ msgid ""
 msgstr ""
 "De nombreux services qui gèrent les données utilisateur à ce jour sont "
 "gratuits, mais cela ne signifie pas qu’ils soient libres. Plutôt que de "
-"payer avec de l’argent, les utilisateurs [[!taglink payent_allégeance|"
-"Internet_Feudalism]] aux fournisseurs de services pour que ceux-ci puissent "
+"payer avec de l’argent, les utilisateurs [[!taglink payent_allégeance|Internet_Feudalism]] aux fournisseurs de services pour que ceux-ci puissent "
 "exploiter les données utilisateurs (par ex. en les vendant, en offrant des "
 "licences ou en construisant des profils pour les annonceurs publicitaires)."
 

fighting with PO nonsense
diff --git a/index.fr.po b/index.fr.po
index 449f03a..ce6e058 100644
--- a/index.fr.po
+++ b/index.fr.po
@@ -59,7 +59,8 @@ msgstr "    [[!toggle  id=\"userdata\" text=\"\"\"\n"
 msgid ""
 "<ol start=\"0\"><li><p><strong>User data</strong> means any data uploaded by a\n"
 "user for his or her own use.</p></li></ol>\n"
-msgstr "<ol start=\"0\"><li>Par <strong>données utilisateur</strong>, on entend les données envoyées par un utilisateur ou générées par une utilisatrice, au moyen de l’utilisation d’un service sur Internet.</li></ol>\n"
+msgstr ""
+"<ol start=\"0\"><li><p>Par <strong>données utilisateur</strong>, on entend les données envoyées par un utilisateur pour son propre usage.</p></li></ol>\n"
 
 #. type: Plain text
 #, fuzzy, no-wrap
@@ -124,7 +125,8 @@ msgid ""
 "    User data should be under the ultimate control of the user. Users should be\n"
 "    able to decide whom to grant direct access to their data and with which\n"
 "    permissions and licenses such access should be granted.\n"
-msgstr "    Les données explicitement et volontairement envoyées par une utilisatrice devraient être sous la pleine maîtrise de l’utilisatrice. Les utilisateurs devraient être capables de décider à qui accorder un accès direct à leurs données et avec quelles permissions et licences cet accès devrait être accordé."
+msgstr ""
+"Les données explicitement et volontairement envoyées par une utilisatrice devraient être sous la pleine maîtrise de l’utilisatrice. Les utilisateurs devraient être capables de décider à qui accorder un accès direct à leurs données et avec quelles permissions et licences cet accès devrait être accordé."
 
 #. type: Plain text
 #, no-wrap
@@ -142,14 +144,16 @@ msgid ""
 "    When users have control over the upload of their data, data\n"
 "    intended to be privately shared should not be accessible to the\n"
 "    service provider, nor shared with governments.\n"
-msgstr "    Lorsque les utilisateurs maîtrisent l’accès aux données qu’ils envoient, les données censées restées privées ou partagées à un cercle restreint ne devraient pas être rendues accessibles au fournisseur du service, ni divulguées aux États."
+msgstr ""
+"    Lorsque les utilisateurs maîtrisent l’accès aux données qu’ils envoient, les données censées restées privées ou partagées à un cercle restreint ne devraient pas être rendues accessibles au fournisseur du service, ni divulguées aux États."
 
 #. type: Plain text
 #, fuzzy, no-wrap
 msgid ""
 "    That means the right to use [[!taglink cryptography]] should never be\n"
 "    denied. \n"
-msgstr "    Cela implique que le droit d’utiliser [[!taglink la_cryptographie|cryptography]] ne devrait jamais être bafoué."
+msgstr ""
+"    Cela implique que le droit d’utiliser [[!taglink la_cryptographie|cryptography]] ne devrait jamais être bafoué."
 
 #. type: Plain text
 #, no-wrap
@@ -157,7 +161,8 @@ msgid ""
 "    That also means that when users do not have full control over the upload of\n"
 "    their data (e.g. if they don't use cryptography before uploading) a service\n"
 "    provider should **not**:\n"
-msgstr "    Cela implique également que lorsque des utilisateurs n'ont pas la pleine maîtrise sur l'envoi de leurs données (par exemple s'ils n'utilisent pas la cryptographie avant l'envoi) un fournisseur de service **ne** doit **pas** :"
+msgstr ""
+"    Cela implique également que lorsque des utilisateurs n'ont pas la pleine maîtrise sur l'envoi de leurs données (par exemple s'ils n'utilisent pas la cryptographie avant l'envoi) un fournisseur de service **ne** doit **pas** :"
 
 #. type: Bullet: '     1. '
 msgid ""
@@ -189,7 +194,8 @@ msgid ""
 "    mean that users should have the right to impose unfair restrictions to\n"
 "    other people. In any event, technical systems should not be designed to\n"
 "    enforce such restrictions (e.g. through [[!taglink DRM]]).\n"
-msgstr "    Lorsque les utilisateurs rendent des données accessibles à d’autres, qu’il s’agisse d’un groupe de gens restreint ou d’un groupe plus large, ils devraient pouvoir décider sous quelles permissions l’accès à leurs données est autorisé. Cependant, ce droit n’est pas absolu et ne devrait pas empiéter sur le droit des tierces personnes à utiliser et exploiter ces données une fois qu’elles leur ont été rendues accessibles. Qui plus est, cela ne signifie pas que les utilisateurs devraient avoir le droit d’imposer des restrictions injustes à d’autres personnes. Dans tous les cas, les systèmes techniques ne doivent pas être conçus pour faire appliquer de telles restrictions (par exemple avec des [[!taglink DRM]])."
+msgstr ""
+"    Lorsque les utilisateurs rendent des données accessibles à d’autres, qu’il s’agisse d’un groupe de gens restreint ou d’un groupe plus large, ils devraient pouvoir décider sous quelles permissions l’accès à leurs données est autorisé. Cependant, ce droit n’est pas absolu et ne devrait pas empiéter sur le droit des tierces personnes à utiliser et exploiter ces données une fois qu’elles leur ont été rendues accessibles. Qui plus est, cela ne signifie pas que les utilisateurs devraient avoir le droit d’imposer des restrictions injustes à d’autres personnes. Dans tous les cas, les systèmes techniques ne doivent pas être conçus pour faire appliquer de telles restrictions (par exemple avec des [[!taglink DRM]])."
 
 #. type: Plain text
 #, no-wrap
@@ -202,7 +208,8 @@ msgid ""
 "    Data generated or associated with user data (e.g. metadata) should also be\n"
 "    made available to that user and put under their control just like the user\n"
 "    data itself.\n"
-msgstr "    Les données reçues, générées ou collectées à partir de l’activité des utilisateurs dans l’utilisation du service (ex. : les métadonnées ou les données du graphe social) devraient leur être rendues accessibles et être également sous leur maîtrise. Si cette maîtrise n’est pas possible, alors ce type de données devrait être anonyme ou bien ne pas être stockée pour une période plus longue que nécessaire."
+msgstr ""
+"    Les données reçues, générées ou collectées à partir de l’activité des utilisateurs dans l’utilisation du service (ex. : les métadonnées ou les données du graphe social) devraient leur être rendues accessibles et être également sous leur maîtrise. Si cette maîtrise n’est pas possible, alors ce type de données devrait être anonyme ou bien ne pas être stockée pour une période plus longue que nécessaire."
 
 #. type: Plain text
 #, no-wrap
@@ -221,7 +228,8 @@ msgid ""
 "    publicly available and usable by all. Even in these cases, some\n"
 "    amount of user data is kept private (e.g. metadata or social graph\n"
 "    data). The user should also have control over this data.\n"
-msgstr "    Certains services permettent aux utilisateurs de soumettre des données avec l’intention de les rendre publiquement accessibles à toutes et à tous. Y compris dans ces cas de figure, quelques données utilisateur restent privées (ex. : les métadonnées ou les données du graphe social). L’utilisateur devrait pouvoir contrôler aussi ces données."
+msgstr ""
+"    Certains services permettent aux utilisateurs de soumettre des données avec l’intention de les rendre publiquement accessibles à toutes et à tous. Y compris dans ces cas de figure, quelques données utilisateur restent privées (ex. : les métadonnées ou les données du graphe social). L’utilisateur devrait pouvoir contrôler aussi ces données."
 
 #. type: Bullet: '2. '
 #, fuzzy
@@ -240,7 +248,8 @@ msgid ""
 "    informed about the geographic location that specific service provider\n"
 "    stores the data in, how long, in which jurisdiction that specific service\n"
 "    provider operates and which laws apply.\n"
-msgstr "    Quand les données sont envoyées à un fournisseur de service particulier, les utilisateurs devraient être informés du lieu de stockage des données du fournisseur de service, de la durée, de la juridiction dans laquelle le fournisseur de service particulier opère et des lois qui s’y appliquent."
+msgstr ""
+"    Quand les données sont envoyées à un fournisseur de service particulier, les utilisateurs devraient être informés du lieu de stockage des données du fournisseur de service, de la durée, de la juridiction dans laquelle le fournisseur de service particulier opère et des lois qui s’y appliquent."
 
 #. type: Plain text
 #, no-wrap
@@ -259,7 +268,8 @@ msgid ""
 "    providers instead of relying on peer-to-peer systems, it is important to\n"
 "    know where the providers might store data because they could be compelled\n"
 "    by governments to turn over data they have in their possession.\n"
-msgstr "    Lorsque les utilisateurs utilisent des services centralisés pour envoyer leurs données à un fournisseur de stockage particulier plutôt que de reposer sur des systèmes pair-à-pair, il est important de savoir où les fournisseurs pourraient stocker ces données car ils pourraient être obligés par les États à divulguer ces données qu’ils ont en leur possession."
+msgstr ""
+"    Lorsque les utilisateurs utilisent des services centralisés pour envoyer leurs données à un fournisseur de stockage particulier plutôt que de reposer sur des systèmes pair-à-pair, il est important de savoir où les fournisseurs pourraient stocker ces données car ils pourraient être obligés par les États à divulguer ces données qu’ils ont en leur possession."
 
 #. type: Plain text
 #, no-wrap
@@ -272,7 +282,8 @@ msgid ""
 "    This point is not relevant when users are able to store their own data on\n"
 "    devices in their vicinity and under their direct control (e.g. servers) or\n"
 "    when they rely on systems without centralised control (e.g. peer-to-peer).\n"
-msgstr "    Les utilisateurs devraient être libres de choisir de stocker leurs propres données sur leurs appareils (ex. : des serveurs) dans leur entourage et sous leur contrôle direct. De cette manière, les utilisateurs n’ont pas à compter sur les services centralisés."
+msgstr ""
+"    Les utilisateurs devraient être libres de choisir de stocker leurs propres données sur leurs appareils (ex. : des serveurs) dans leur entourage et sous leur contrôle direct. De cette manière, les utilisateurs n’ont pas à compter sur les services centralisés."
 
 #. type: Plain text
 #, no-wrap
@@ -291,7 +302,8 @@ msgid ""
 "    unhosted applications are a means to that end.  In the long term, all users\n"
 "    should be able to have their own server with\n"
 "    [[!taglink Free_Software]].\n"
-msgstr "    Les utilisateurs ne devraient pas reposer sur des services centralisés. Les systèmes pair-à-pair et les applications *unhosted* sont un moyen d’y arriver. À long terme, tous les utilisateurs devraient être capables d’avoir leur propre serveur avec [[!taglink du_logiciel_libre|Free_Software]]."
+msgstr ""
+"    Les utilisateurs ne devraient pas reposer sur des services centralisés. Les systèmes pair-à-pair et les applications *unhosted* sont un moyen d’y arriver. À long terme, tous les utilisateurs devraient être capables d’avoir leur propre serveur avec [[!taglink du_logiciel_libre|Free_Software]]."
 
 #. type: Bullet: '3. '
 msgid "**Freedom** to choose a platform"
@@ -307,7 +319,8 @@ msgstr "    [[!toggle  id=\"usngsi\" text=\"\"\"\n"
 msgid ""
 "    Users should always be able to extract their data from the service at any\n"
 "    time without experiencing any vendor lock-in.\n"
-msgstr "    Les utilisateurs devraient toujours être en mesure d’extraire leurs données du service à tout moment sans faire l’expérience de l’enfermement propriétaire."
+msgstr ""
+"    Les utilisateurs devraient toujours être en mesure d’extraire leurs données du service à tout moment sans faire l’expérience de l’enfermement propriétaire."
 
 #. type: Plain text
 #, no-wrap
@@ -324,7 +337,8 @@ msgstr "    [[!toggle  id=\"usngsi\" text=\"×\"]]\n"
 msgid ""
 "    Users should not get stuck into a specific technical solution.  This is why\n"
 "    they should always be able to leave a platform and settle elsewhere.\n"
-msgstr "    Les utilisateurs ne devraient pas être bloqués par une solution technique particulière. C’est pourquoi ils devraient toujours être capables de quitter une plateforme et de s’installer ailleurs."
+msgstr ""
+"    Les utilisateurs ne devraient pas être bloqués par une solution technique particulière. C’est pourquoi ils devraient toujours être capables de quitter une plateforme et de s’installer ailleurs."
 
 #. type: Plain text
 #, no-wrap
@@ -340,7 +354,8 @@ msgid ""
 "    data, this is impractical. This is why programs available to exploit\n"
 "    exported data should be available under a \n"
 "    [[!taglink Free_Software_(Open_Source)_License|Free_Software]].\n"
-msgstr "    [[!taglink Les_standards_ouverts|Open_standards]] pour les formats et les protocoles sont nécessaires pour garantir cela. Évidemment, sans le code source des programmes utilisés pour les données utilisateurs, cela n’est pas pratique. C’est pourquoi des programmes devraient être distribués sous une [[!taglink licence_de_logiciel_libre|Free_Software]]."
+msgstr ""
+"    [[!taglink Les_standards_ouverts|Open_standards]] pour les formats et les protocoles sont nécessaires pour garantir cela. Évidemment, sans le code source des programmes utilisés pour les données utilisateurs, cela n’est pas pratique. C’est pourquoi des programmes devraient être distribués sous une [[!taglink licence_de_logiciel_libre|Free_Software]]."
 
 #. type: Plain text
 msgid ""

french transaltion, why you no show?
diff --git a/index.fr.po b/index.fr.po
index 508b31c..449f03a 100644
--- a/index.fr.po
+++ b/index.fr.po
@@ -120,11 +120,6 @@ msgstr "    [[!toggle  id=\"wucat\" text=\"\"\"\n"
 
 #. type: Plain text
 #, fuzzy, no-wrap
-#| msgid ""
-#| "    Data explicitly and willingly uploaded by a user should be under the\n"
-#| "    ultimate control of the user. Users should be able to decide whom to grant\n"
-#| "    direct access to their data and with which permissions and licenses such\n"
-#| "    access should be granted.\n"
 msgid ""
 "    User data should be under the ultimate control of the user. Users should be\n"
 "    able to decide whom to grant direct access to their data and with which\n"
@@ -230,7 +225,6 @@ msgstr "    Certains services permettent aux utilisateurs de soumettre des donn
 
 #. type: Bullet: '2. '
 #, fuzzy
-#| msgid "**Knowledge** of how the data is stored"
 msgid "**Knowledge** of how user data is stored"
 msgstr "**Savoir** comment les données sont stockées"
 

updated PO files
diff --git a/tags/__34__Internet_Feudalism.de.po b/tags/__34__Internet_Feudalism.de.po
new file mode 100644
index 0000000..cac8918
--- /dev/null
+++ b/tags/__34__Internet_Feudalism.de.po
@@ -0,0 +1,30 @@
+# SOME DESCRIPTIVE TITLE
+# Copyright (C) YEAR Free Software Foundation, Inc.
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"POT-Creation-Date: 2015-08-18 14:17+0000\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#. type: Plain text
+#, no-wrap
+msgid "[[!meta title=\"pages tagged \"Internet Feudalism\"]]\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+"[[!inline pages=\"tagged(__34__Internet_Feudalism)\" actions=\"no\" "
+"archive=\"yes\"\n"
+"feedshow=10]]\n"
+msgstr ""
diff --git a/tags/__34__Internet_Feudalism.fr.po b/tags/__34__Internet_Feudalism.fr.po
new file mode 100644
index 0000000..cac8918
--- /dev/null
+++ b/tags/__34__Internet_Feudalism.fr.po
@@ -0,0 +1,30 @@
+# SOME DESCRIPTIVE TITLE
+# Copyright (C) YEAR Free Software Foundation, Inc.
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"POT-Creation-Date: 2015-08-18 14:17+0000\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#. type: Plain text
+#, no-wrap
+msgid "[[!meta title=\"pages tagged \"Internet Feudalism\"]]\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+"[[!inline pages=\"tagged(__34__Internet_Feudalism)\" actions=\"no\" "
+"archive=\"yes\"\n"
+"feedshow=10]]\n"
+msgstr ""
diff --git a/tags/__34__Internet_Feudalism.ja.po b/tags/__34__Internet_Feudalism.ja.po
new file mode 100644
index 0000000..cac8918
--- /dev/null
+++ b/tags/__34__Internet_Feudalism.ja.po
@@ -0,0 +1,30 @@
+# SOME DESCRIPTIVE TITLE
+# Copyright (C) YEAR Free Software Foundation, Inc.
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"POT-Creation-Date: 2015-08-18 14:17+0000\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#. type: Plain text
+#, no-wrap
+msgid "[[!meta title=\"pages tagged \"Internet Feudalism\"]]\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+"[[!inline pages=\"tagged(__34__Internet_Feudalism)\" actions=\"no\" "
+"archive=\"yes\"\n"
+"feedshow=10]]\n"
+msgstr ""
diff --git a/tags/__34__Internet_Feudalism.tr.po b/tags/__34__Internet_Feudalism.tr.po
new file mode 100644
index 0000000..cac8918
--- /dev/null
+++ b/tags/__34__Internet_Feudalism.tr.po
@@ -0,0 +1,30 @@
+# SOME DESCRIPTIVE TITLE
+# Copyright (C) YEAR Free Software Foundation, Inc.
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"POT-Creation-Date: 2015-08-18 14:17+0000\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#. type: Plain text
+#, no-wrap
+msgid "[[!meta title=\"pages tagged \"Internet Feudalism\"]]\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+"[[!inline pages=\"tagged(__34__Internet_Feudalism)\" actions=\"no\" "
+"archive=\"yes\"\n"
+"feedshow=10]]\n"
+msgstr ""
diff --git "a/tags/\350\207\252__34__.de.po" "b/tags/\350\207\252__34__.de.po"
new file mode 100644
index 0000000..beaf96c
--- /dev/null
+++ "b/tags/\350\207\252__34__.de.po"
@@ -0,0 +1,29 @@
+# SOME DESCRIPTIVE TITLE
+# Copyright (C) YEAR Free Software Foundation, Inc.
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"POT-Creation-Date: 2015-08-18 14:17+0000\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#. type: Plain text
+#, no-wrap
+msgid "[[!meta title=\"pages tagged 自\"\"]]\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+"[[!inline pages=\"tagged(自__34__)\" actions=\"no\" archive=\"yes\"\n"
+"feedshow=10]]\n"
+msgstr ""
diff --git "a/tags/\350\207\252__34__.fr.po" "b/tags/\350\207\252__34__.fr.po"
new file mode 100644
index 0000000..beaf96c
--- /dev/null
+++ "b/tags/\350\207\252__34__.fr.po"
@@ -0,0 +1,29 @@
+# SOME DESCRIPTIVE TITLE
+# Copyright (C) YEAR Free Software Foundation, Inc.
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"POT-Creation-Date: 2015-08-18 14:17+0000\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: \n"
+"MIME-Version: 1.0\n"

(Diff truncated)
updated PO files
diff --git a/index.de.po b/index.de.po
index 7da9078..e2d5485 100644
--- a/index.de.po
+++ b/index.de.po
@@ -4,7 +4,7 @@
 # modification, are permitted under any circumstances. No warranty.
 msgid ""
 msgstr ""
-"POT-Creation-Date: 2015-08-18 13:49+0000\n"
+"POT-Creation-Date: 2015-08-18 14:16+0000\n"
 "PO-Revision-Date: 2010-03-12 09:40+0530\n"
 "Last-Translator: Sebastian Kuhnert <mail@sebastian-kuhnert.de>\n"
 "Language-Team: None\n"
@@ -55,8 +55,8 @@ msgstr ""
 #| "<ol start=\"0\"><li><strong>User data</strong> means any data uploaded by a user and/or\n"
 #| "generated from a user, while using a service on the Internet. </li></ol>\n"
 msgid ""
-"<ol start=\"0\"><li><p><strong>User data</strong> means any data uploaded by a user or\n"
-"generated from a user, while using a service on the Internet.</p></li></ol>\n"
+"<ol start=\"0\"><li><p><strong>User data</strong> means any data uploaded by a\n"
+"user for his or her own use.</p></li></ol>\n"
 msgstr ""
 "<ol start=\"0\"><li><strong>Nutzerdaten</strong> bezeichnet alle Daten, die ein Nutzer hochgeladen und/oder\n"
 "von einem Nutzer generiert wurden, während er einen Dienst im Internet nutzte. </li></ol>\n"
@@ -111,12 +111,16 @@ msgid "    [[!toggle  id=\"wucat\" text=\"\"\"\n"
 msgstr ""
 
 #. type: Plain text
-#, no-wrap
+#, fuzzy, no-wrap
+#| msgid ""
+#| "    Data explicitly and willingly uploaded by a user should be under the\n"
+#| "    ultimate control of the user. Users should be able to decide whom to grant\n"
+#| "    direct access to their data and with which permissions and licenses such\n"
+#| "    access should be granted.\n"
 msgid ""
-"    Data explicitly and willingly uploaded by a user should be under the\n"
-"    ultimate control of the user. Users should be able to decide whom to grant\n"
-"    direct access to their data and with which permissions and licenses such\n"
-"    access should be granted.\n"
+"    User data should be under the ultimate control of the user. Users should be\n"
+"    able to decide whom to grant direct access to their data and with which\n"
+"    permissions and licenses such access should be granted.\n"
 msgstr ""
 "    Daten, die explizit und gewollt vom Nutzer hochgeladen wurden, sollten unter\n"
 "    alleiniger Kontrolle des Nutzers sein. Der Nutzer sollte in der Lage sein, zu\n"
@@ -196,9 +200,9 @@ msgstr ""
 #. type: Plain text
 #, no-wrap
 msgid ""
-"    Data received, generated, or collected from user activity or from a\n"
-"    user's device (e.g. metadata or social graph data) should be made\n"
-"    accessible to them and put under their control. \n"
+"    Data generated or associated with user data (e.g. metadata) should also be\n"
+"    made available to that user and put under their control just like the user\n"
+"    data itself.\n"
 msgstr ""
 
 #. type: Plain text
@@ -221,7 +225,9 @@ msgid ""
 msgstr ""
 
 #. type: Bullet: '2. '
-msgid "**Knowledge** of how the data is stored"
+#, fuzzy
+#| msgid "**Knowledge** of how the data is stored"
+msgid "**Knowledge** of how user data is stored"
 msgstr "**Wissen** wie die Daten gespeichert sind"
 
 #. type: Plain text
@@ -232,9 +238,9 @@ msgstr ""
 #. type: Plain text
 #, no-wrap
 msgid ""
-"    When the data is uploaded to a specific service provider, users should be\n"
+"    When user data is uploaded to a specific service provider, users should be\n"
 "    informed about the geographic location that specific service provider\n"
-"    stores the data in, how long, in which jurisdiction the specific service\n"
+"    stores the data in, how long, in which jurisdiction that specific service\n"
 "    provider operates and which laws apply.\n"
 msgstr ""
 
@@ -265,9 +271,9 @@ msgstr ""
 #. type: Plain text
 #, no-wrap
 msgid ""
-"    Users should be able to store their own data on devices (e.g.  servers) in\n"
-"    their vicinity and under their direct control. This way, users do not have\n"
-"    to rely on centralised services.\n"
+"    This point is not relevant when users are able to store their own data on\n"
+"    devices in their vicinity and under their direct control (e.g. servers) or\n"
+"    when they rely on systems without centralised control (e.g. peer-to-peer).\n"
 msgstr ""
 
 #. type: Plain text
@@ -285,14 +291,8 @@ msgstr ""
 msgid ""
 "    Users should not rely on centralised services. Peer-to-peer systems and\n"
 "    unhosted applications are a means to that end.  In the long term, all users\n"
-"    should be able to have their own server with [[!taglink Free_Software]].\n"
-msgstr ""
-
-#. type: Plain text
-#, no-wrap
-msgid ""
-"    Unfortunately, this is made very difficult by some Internet access\n"
-"    providers that restrict their customers unfairly. \n"
+"    should be able to have their own server with\n"
+"    [[!taglink Free_Software]].\n"
 msgstr ""
 
 #. type: Bullet: '3. '
diff --git a/index.fr.po b/index.fr.po
index 8c5ce90..508b31c 100644
--- a/index.fr.po
+++ b/index.fr.po
@@ -9,7 +9,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ikiwiki\n"
-"POT-Creation-Date: 2015-08-18 13:49+0000\n"
+"POT-Creation-Date: 2015-08-18 14:16+0000\n"
 "PO-Revision-Date: 2009-08-23 18:50+0200\n"
 "Last-Translator: Philippe Batailler <philippe.batailler@free.fr>\n"
 "Language-Team: French <debian-l10n-french@lists.debian.org>\n"
@@ -44,8 +44,8 @@ msgid ""
 "rights_to_their_own_data|datarights]] in the Internet age. People ought to "
 "be free and should not have to pay allegiance to service providers."
 msgstr ""
-"Ce manifeste a pour but de définir "
-"[[!taglink les_droits_fondamentaux_des_utilisateurs_sur_leurs_données|datarights]] à "
+"Ce manifeste a pour but de définir [[!taglink "
+"les_droits_fondamentaux_des_utilisateurs_sur_leurs_données|datarights]] à "
 "l’ère d’internet. Chacun devrait être libre et ne pas avoir à payer "
 "allégeance aux fournisseurs de service."
 
@@ -57,10 +57,9 @@ msgstr "    [[!toggle  id=\"userdata\" text=\"\"\"\n"
 #. type: Plain text
 #, fuzzy, no-wrap
 msgid ""
-"<ol start=\"0\"><li><p><strong>User data</strong> means any data uploaded by a user or\n"
-"generated from a user, while using a service on the Internet.</p></li></ol>\n"
-msgstr ""
-"<ol start=\"0\"><li>Par <strong>données utilisateur</strong>, on entend les données envoyées par un utilisateur ou générées par une utilisatrice, au moyen de l’utilisation d’un service sur Internet.</li></ol>\n"
+"<ol start=\"0\"><li><p><strong>User data</strong> means any data uploaded by a\n"
+"user for his or her own use.</p></li></ol>\n"
+msgstr "<ol start=\"0\"><li>Par <strong>données utilisateur</strong>, on entend les données envoyées par un utilisateur ou générées par une utilisatrice, au moyen de l’utilisation d’un service sur Internet.</li></ol>\n"
 
 #. type: Plain text
 #, fuzzy, no-wrap
@@ -80,25 +79,31 @@ msgstr "Par exemple,  les données utilisateur comprennent :"
 msgid ""
 "the files a user is syncing through multiple devices or sharing with a friend"
 msgstr ""
-"les fichiers qu'un utilisateur synchronise entre plusieurs appareils ou qu'il partage avec une amie"
+"les fichiers qu'un utilisateur synchronise entre plusieurs appareils ou "
+"qu'il partage avec une amie"
 
 #. type: Bullet: '  - '
 msgid ""
 "a library of photos, books or other files a user uploads from their device "
 "in order to be able to read, view or modify online"
 msgstr ""
-"une bibliothèque d'albums photos, de livres ou d'autres fichiers qu'un utilisateur envoie depuis son appareil afin de pouvoir lire, voir, et modifier tout cela en ligne"
+"une bibliothèque d'albums photos, de livres ou d'autres fichiers qu'un "
+"utilisateur envoie depuis son appareil afin de pouvoir lire, voir, et "
+"modifier tout cela en ligne"
 
 #. type: Bullet: '  - '
 msgid ""
 "data generated by a user's device (like a connected watch or theromstat) and "
 "sent to a server"
 msgstr ""
-"les données générées par un appareil de l'utilisateur (comme un thermostat ou une montre connectée) et envoyées vers un serveur"
+"les données générées par un appareil de l'utilisateur (comme un thermostat "
+"ou une montre connectée) et envoyées vers un serveur"
 
 #. type: Bullet: '  - '
 msgid "a user's search engine queries, if they are logged as such"
-msgstr "les requêtes d'un utilisateur à un moteur de recherche, si de telles requêtes sont enregistrées comme telles"
+msgstr ""
+"les requêtes d'un utilisateur à un moteur de recherche, si de telles "
+"requêtes sont enregistrées comme telles"
 
 #. type: Plain text
 msgid "Thus, users should have:"
@@ -114,12 +119,16 @@ msgid "    [[!toggle  id=\"wucat\" text=\"\"\"\n"
 msgstr "    [[!toggle  id=\"wucat\" text=\"\"\"\n"
 
 #. type: Plain text
-#, no-wrap
+#, fuzzy, no-wrap
+#| msgid ""
+#| "    Data explicitly and willingly uploaded by a user should be under the\n"
+#| "    ultimate control of the user. Users should be able to decide whom to grant\n"
+#| "    direct access to their data and with which permissions and licenses such\n"
+#| "    access should be granted.\n"
 msgid ""
-"    Data explicitly and willingly uploaded by a user should be under the\n"
-"    ultimate control of the user. Users should be able to decide whom to grant\n"

(Diff truncated)
creating tag page tags/自__34__
diff --git "a/tags/\350\207\252__34__.mdwn" "b/tags/\350\207\252__34__.mdwn"
new file mode 100644
index 0000000..714af73
--- /dev/null
+++ "b/tags/\350\207\252__34__.mdwn"
@@ -0,0 +1,4 @@
+[[!meta title="pages tagged 自""]]
+
+[[!inline pages="tagged(自__34__)" actions="no" archive="yes"
+feedshow=10]]

creating tag page tags/__34__Internet_Feudalism
diff --git a/tags/__34__Internet_Feudalism.mdwn b/tags/__34__Internet_Feudalism.mdwn
new file mode 100644
index 0000000..b2641da
--- /dev/null
+++ b/tags/__34__Internet_Feudalism.mdwn
@@ -0,0 +1,4 @@
+[[!meta title="pages tagged "Internet Feudalism"]]
+
+[[!inline pages="tagged(__34__Internet_Feudalism)" actions="no" archive="yes"
+feedshow=10]]

merging
cleaning french translation, fighting with po files
diff --git a/index.fr.po b/index.fr.po
index 45c3234..8c5ce90 100644
--- a/index.fr.po
+++ b/index.fr.po
@@ -51,31 +51,26 @@ msgstr ""
 
 #. type: Plain text
 #, fuzzy, no-wrap
-#| msgid "    [[!toggle  id=\"wucat\" text=\"\"\"\n"
 msgid "[[!toggle  id=\"userdata\" text=\"\"\"\n"
-msgstr "    [[!toggle  id=\"wucat\" text=\"\"\"\n"
+msgstr "    [[!toggle  id=\"userdata\" text=\"\"\"\n"
 
 #. type: Plain text
 #, fuzzy, no-wrap
-#| msgid ""
-#| "<ol start=\"0\"><li><strong>User data</strong> means any data uploaded by a user and/or\n"
-#| "generated from a user, while using a service on the Internet. </li></ol>\n"
 msgid ""
 "<ol start=\"0\"><li><p><strong>User data</strong> means any data uploaded by a user or\n"
 "generated from a user, while using a service on the Internet.</p></li></ol>\n"
-msgstr "<ol start=\"0\"><li>Par <strong>données utilisateur</strong>, on entend les données envoyées par un utilisateur ou générées par une utilisatrice, au moyen de l’utilisation d’un service sur Internet.</li></ol>\n"
+msgstr ""
+"<ol start=\"0\"><li>Par <strong>données utilisateur</strong>, on entend les données envoyées par un utilisateur ou générées par une utilisatrice, au moyen de l’utilisation d’un service sur Internet.</li></ol>\n"
 
 #. type: Plain text
 #, fuzzy, no-wrap
-#| msgid "    [[!toggleable id=\"wucat\" text=\"\"\"\n"
 msgid "[[!toggleable id=\"userdata\" text=\"\"\"\n"
-msgstr "    [[!toggleable id=\"wucat\" text=\"\"\"\n"
+msgstr "    [[!toggleable id=\"userdata\" text=\"\"\"\n"
 
 #. type: Plain text
 #, fuzzy, no-wrap
-#| msgid "    [[!toggle  id=\"wucat\" text=\"×\"]]\n"
 msgid "[[!toggle  id=\"userdata\" text=\"×\"]]\n"
-msgstr "    [[!toggle  id=\"wucat\" text=\"×\"]]\n"
+msgstr "    [[!toggle  id=\"userdata\" text=\"×\"]]\n"
 
 #. type: Plain text
 msgid "Examples of user data include:"
@@ -139,11 +134,6 @@ msgstr "    [[!toggle  id=\"wucat\" text=\"×\"]]\n"
 
 #. type: Plain text
 #, fuzzy, no-wrap
-#| msgid ""
-#| "    When users control access to the data they upload, it means that\n"
-#| "    data intended to be privately shared should not be accessible to the service\n"
-#| "    provider, nor shared with governments.  Users should be the only ones to have\n"
-#| "    ultimate control over it and to grant access to it. \n"
 msgid ""
 "    When users have control over the upload of their data, data\n"
 "    intended to be privately shared should not be accessible to the\n"
@@ -152,7 +142,6 @@ msgstr "    Lorsque les utilisateurs maîtrisent l’accès aux données qu’il
 
 #. type: Plain text
 #, fuzzy, no-wrap
-#| msgid "    That means the right to use [[!taglink cryptography]] should never be denied. \n"
 msgid ""
 "    That means the right to use [[!taglink cryptography]] should never be\n"
 "    denied. \n"
@@ -177,9 +166,6 @@ msgstr ""
 
 #. type: Bullet: '     2. '
 #, fuzzy
-#| msgid ""
-#| "impose licensing conditions (e.g. copyright, personal data protection)  "
-#| "that go beyond what is necessary for the purpose of the service."
 msgid ""
 "impose licensing conditions (e.g. on copyright, or personal data "
 "exploitation) that go beyond what is necessary for the purpose of running "
@@ -191,13 +177,6 @@ msgstr ""
 
 #. type: Plain text
 #, fuzzy, no-wrap
-#| msgid ""
-#| "    When users make data available to others, whether to a restrictive group of\n"
-#| "    people or to large groups, they should be able to decide under which\n"
-#| "    permissions they grant access to this data. However, this right is not absolute\n"
-#| "    and should not extend over others’ rights to use and exploit the data once it\n"
-#| "    has been made available to them.  What’s more, it does not mean that users\n"
-#| "    should have the right to impose unfair restrictions to other people. \n"
 msgid ""
 "    When users make data available to others, whether to a restrictive group of\n"
 "    people or to large groups, they should be able to decide under which\n"
@@ -216,12 +195,6 @@ msgstr "    [[!toggle  id=\"ssauts\" text=\"\"\"\n"
 
 #. type: Plain text
 #, fuzzy, no-wrap
-#| msgid ""
-#| "    Data received, generated, and/or collected from users’ activity while using\n"
-#| "    the service (e.g. metadata or social graph data) should be made accessible\n"
-#| "    to them and put under their control as well. If this control can’t be\n"
-#| "    given, then this type of data should be anonymous or not stored for\n"
-#| "    periods longer than necessary.\n"
 msgid ""
 "    Data received, generated, or collected from user activity or from a\n"
 "    user's device (e.g. metadata or social graph data) should be made\n"
@@ -240,12 +213,6 @@ msgstr "    [[!toggle  id=\"ssauts\" text=\"×\"]]\n"
 
 #. type: Plain text
 #, fuzzy, no-wrap
-#| msgid ""
-#| "    Some services allow users to submit data with the intention to make it publicly\n"
-#| "    available for all. Even in these cases, some amount of user data is kept\n"
-#| "    private (e.g. metadata or social graph data). The user should also have control\n"
-#| "    over this data, because metadata and logging information can be used for\n"
-#| "    disproportionate surveillance. \n"
 msgid ""
 "    Some services allow users to submit data with the intention to make it\n"
 "    publicly available and usable by all. Even in these cases, some\n"
@@ -264,11 +231,6 @@ msgstr "    [[!toggle  id=\"wuucstu\" text=\"\"\"\n"
 
 #. type: Plain text
 #, fuzzy, no-wrap
-#| msgid ""
-#| "    When the data is uploaded to a specific service provider, users should be\n"
-#| "    informed about where that specific service provider stores the data, how\n"
-#| "    long, in which jurisdiction the specific service provider operates, and\n"
-#| "    which laws apply.\n"
 msgid ""
 "    When the data is uploaded to a specific service provider, users should be\n"
 "    informed about the geographic location that specific service provider\n"
@@ -288,11 +250,6 @@ msgstr "    [[!toggle  id=\"wuucstu\" text=\"×\"]]\n"
 
 #. type: Plain text
 #, fuzzy, no-wrap
-#| msgid ""
-#| "    When users use centralised services that uploads data to specific storage\n"
-#| "    providers instead of relying on peer-to-peer systems, it is important to know\n"
-#| "    where the providers might store data because they could be compelled by\n"
-#| "    governments to turn over data they have in their possession.\n"
 msgid ""
 "    When users use centralised services that uploads data to specific storage\n"
 "    providers instead of relying on peer-to-peer systems, it is important to\n"
@@ -307,10 +264,6 @@ msgstr "    [[!toggle  id=\"usnroc\" text=\"\"\"\n"
 
 #. type: Plain text
 #, fuzzy, no-wrap
-#| msgid ""
-#| "    Users should be free to choose to store their own data on devices (e.g.\n"
-#| "    servers) in their vicinity and under their direct control. This way, users\n"
-#| "    do not have to rely on centralised services.\n"
 msgid ""
 "    Users should be able to store their own data on devices (e.g.  servers) in\n"
 "    their vicinity and under their direct control. This way, users do not have\n"
@@ -329,11 +282,6 @@ msgstr "    [[!toggle  id=\"usnroc\" text=\"×\"]]\n"
 
 #. type: Plain text
 #, fuzzy, no-wrap
-#| msgid ""
-#| "    Users should not rely on centralised services. Peer-to-peer systems and\n"
-#| "    unhosted applications are a means to that end.  In the long term, all users\n"
-#| "    should be able to have their own server with\n"
-#| "    [[!taglink Free_Software]].\n"
 msgid ""
 "    Users should not rely on centralised services. Peer-to-peer systems and\n"
 "    unhosted applications are a means to that end.  In the long term, all users\n"
@@ -389,12 +337,6 @@ msgstr ""
 
 #. type: Plain text
 #, fuzzy, no-wrap
-#| msgid ""
-#| "    [[!taglink Open_standards]] for formats and protocols are necessary to\n"
-#| "    guarantee this.  Obviously, without the source code of the programs used to\n"
-#| "    deal with user data, this is impractical.  This is why programs should be\n"
-#| "    distributed under a \n"
-#| "    [[!taglink Free_Software_license_like_the_GNU_AGPL-3|Free_Software]].\n"
 msgid ""
 "    Obviously, without the source code of the programs used to deal with user\n"
 "    data, this is impractical. This is why programs available to exploit\n"
@@ -427,11 +369,6 @@ msgstr ""
 
 #. type: Plain text
 #, fuzzy
-#| msgid ""
-#| "Surrendering privacy and other rights in this way may seem to many people "
-#| "a trivial thing and a small price to pay for the sake of convenience that "
-#| "these Internet services bring. This has made this kind of exchange to "
-#| "become common."
 msgid ""
 "Surrendering privacy and other rights in this way may seem to many people a "
 "trivial thing and a small price to pay for the sake of convenience that "
@@ -443,11 +380,6 @@ msgstr ""
 
 #. type: Plain text
 #, fuzzy
-#| msgid ""
-#| "Service providers have thus been unwittingly compelled to turn their "
-#| "valuable Internet services into massive and centralised surveillance "
-#| "systems. It is of grave importance that people understand/realize this, "
-#| "since it forms a serious threat to the freedom of humanity."
 msgid ""
 "Service providers have thus been unwittingly compelled to turn their "
 "valuable Internet services into massive and centralised surveillance "

french trad
diff --git a/index.fr.po b/index.fr.po
index 03f766f..45c3234 100644
--- a/index.fr.po
+++ b/index.fr.po
@@ -44,8 +44,8 @@ msgid ""
 "rights_to_their_own_data|datarights]] in the Internet age. People ought to "
 "be free and should not have to pay allegiance to service providers."
 msgstr ""
-"Ce manifeste a pour but de définir [[!taglink "
-"les_droits_fondamentaux_des_utilisateurs_sur_leurs_données|datarights]] à "
+"Ce manifeste a pour but de définir "
+"[[!taglink les_droits_fondamentaux_des_utilisateurs_sur_leurs_données|datarights]] à "
 "l’ère d’internet. Chacun devrait être libre et ne pas avoir à payer "
 "allégeance aux fournisseurs de service."
 
@@ -63,7 +63,7 @@ msgstr "    [[!toggle  id=\"wucat\" text=\"\"\"\n"
 msgid ""
 "<ol start=\"0\"><li><p><strong>User data</strong> means any data uploaded by a user or\n"
 "generated from a user, while using a service on the Internet.</p></li></ol>\n"
-msgstr "<ol start=\"0\"><li>Par <strong>données utilisateur</strong>, on entend les données envoyées par un utilisateur et/ou générées depuis une utilisatrice, au moyen de l’utilisation d’un service sur Internet.</li></ol>\n"
+msgstr "<ol start=\"0\"><li>Par <strong>données utilisateur</strong>, on entend les données envoyées par un utilisateur ou générées par une utilisatrice, au moyen de l’utilisation d’un service sur Internet.</li></ol>\n"
 
 #. type: Plain text
 #, fuzzy, no-wrap
@@ -79,28 +79,31 @@ msgstr "    [[!toggle  id=\"wucat\" text=\"×\"]]\n"
 
 #. type: Plain text
 msgid "Examples of user data include:"
-msgstr ""
+msgstr "Par exemple,  les données utilisateur comprennent :"
 
 #. type: Bullet: '  - '
 msgid ""
 "the files a user is syncing through multiple devices or sharing with a friend"
 msgstr ""
+"les fichiers qu'un utilisateur synchronise entre plusieurs appareils ou qu'il partage avec une amie"
 
 #. type: Bullet: '  - '
 msgid ""
 "a library of photos, books or other files a user uploads from their device "
 "in order to be able to read, view or modify online"
 msgstr ""
+"une bibliothèque d'albums photos, de livres ou d'autres fichiers qu'un utilisateur envoie depuis son appareil afin de pouvoir lire, voir, et modifier tout cela en ligne"
 
 #. type: Bullet: '  - '
 msgid ""
 "data generated by a user's device (like a connected watch or theromstat) and "
 "sent to a server"
 msgstr ""
+"les données générées par un appareil de l'utilisateur (comme un thermostat ou une montre connectée) et envoyées vers un serveur"
 
 #. type: Bullet: '  - '
 msgid "a user's search engine queries, if they are logged as such"
-msgstr ""
+msgstr "les requêtes d'un utilisateur à un moteur de recherche, si de telles requêtes sont enregistrées comme telles"
 
 #. type: Plain text
 msgid "Thus, users should have:"
@@ -145,7 +148,7 @@ msgid ""
 "    When users have control over the upload of their data, data\n"
 "    intended to be privately shared should not be accessible to the\n"
 "    service provider, nor shared with governments.\n"
-msgstr "    Lorsque les utilisateurs maîtrisent l’accès aux données qu’ils envoient, cela signifie que les données censées restées privées ou partagées à un cercle restreint ne devraient pas être rendues accessibles au fournisseur du service, ni divulguées aux États. Seuls les utilisateurs devraient en avoir la maîtrise ultime et y donner accès."
+msgstr "    Lorsque les utilisateurs maîtrisent l’accès aux données qu’ils envoient, les données censées restées privées ou partagées à un cercle restreint ne devraient pas être rendues accessibles au fournisseur du service, ni divulguées aux États."
 
 #. type: Plain text
 #, fuzzy, no-wrap
@@ -153,7 +156,7 @@ msgstr "    Lorsque les utilisateurs maîtrisent l’accès aux données qu’il
 msgid ""
 "    That means the right to use [[!taglink cryptography]] should never be\n"
 "    denied. \n"
-msgstr "    Cela signifie que le droit d’utiliser [[!taglink la_cryptographie|cryptography]] ne devrait jamais être bafoué."
+msgstr "    Cela implique que le droit d’utiliser [[!taglink la_cryptographie|cryptography]] ne devrait jamais être bafoué."
 
 #. type: Plain text
 #, no-wrap
@@ -162,6 +165,7 @@ msgid ""
 "    their data (e.g. if they don't use cryptography before uploading) a service\n"
 "    provider should **not**:\n"
 msgstr ""
+"    Cela implique également que lorsque des utilisateurs n'ont pas la pleine maîtrise sur l'envoi de leurs données (par exemple s'ils n'utilisent pas la cryptographie avant l'envoi) un fournisseur de service **ne** doit **pas** :"
 
 #. type: Bullet: '     1. '
 msgid ""
@@ -181,7 +185,7 @@ msgid ""
 "exploitation) that go beyond what is necessary for the purpose of running "
 "the service."
 msgstr ""
-"imposer des conditions de licence (ex. : de droit d’auteur ou de protection "
+"imposer des conditions de licence (ex. : de droit d’auteur ou d'exploitation "
 "des données personnelles) qui vont au-delà de ce qui est nécessaire pour "
 "l’objectif du service."
 
@@ -203,7 +207,7 @@ msgid ""
 "    mean that users should have the right to impose unfair restrictions to\n"
 "    other people. In any event, technical systems should not be designed to\n"
 "    enforce such restrictions (e.g. through [[!taglink DRM]]).\n"
-msgstr "    Lorsque les utilisateurs rendent des données accessibles à d’autres, qu’il s’agisse d’un groupe de gens restreint ou d’un groupe plus large, ils devraient pouvoir décider sous quelles permissions l’accès à leurs données est autorisé. Cependant, ce droit n’est pas absolu et ne devrait pas empiéter sur le droit des tierces personnes à utiliser et exploiter ces données une fois qu’elles leur ont été rendues accessibles. Qui plus est, cela ne signifie pas que les utilisateurs devraient avoir le droit d’imposer des restrictions injustes à d’autres personnes. \n"
+msgstr "    Lorsque les utilisateurs rendent des données accessibles à d’autres, qu’il s’agisse d’un groupe de gens restreint ou d’un groupe plus large, ils devraient pouvoir décider sous quelles permissions l’accès à leurs données est autorisé. Cependant, ce droit n’est pas absolu et ne devrait pas empiéter sur le droit des tierces personnes à utiliser et exploiter ces données une fois qu’elles leur ont été rendues accessibles. Qui plus est, cela ne signifie pas que les utilisateurs devraient avoir le droit d’imposer des restrictions injustes à d’autres personnes. Dans tous les cas, les systèmes techniques ne doivent pas être conçus pour faire appliquer de telles restrictions (par exemple avec des [[!taglink DRM]])."
 
 #. type: Plain text
 #, no-wrap
@@ -222,7 +226,7 @@ msgid ""
 "    Data received, generated, or collected from user activity or from a\n"
 "    user's device (e.g. metadata or social graph data) should be made\n"
 "    accessible to them and put under their control. \n"
-msgstr "    Les données reçues, générées et/ou collectées à partir de l’activité des utilisateurs dans l’utilisation du service (ex. : les métadonnées ou les données du graphe social) devraient leur être rendues accessibles et être également sous leur maîtrise. Si cette maîtrise n’est pas possible, alors ce type de données devrait être anonyme ou bien ne pas être stockée pour une période plus longue que nécessaire."
+msgstr "    Les données reçues, générées ou collectées à partir de l’activité des utilisateurs dans l’utilisation du service (ex. : les métadonnées ou les données du graphe social) devraient leur être rendues accessibles et être également sous leur maîtrise. Si cette maîtrise n’est pas possible, alors ce type de données devrait être anonyme ou bien ne pas être stockée pour une période plus longue que nécessaire."
 
 #. type: Plain text
 #, no-wrap
@@ -247,7 +251,7 @@ msgid ""
 "    publicly available and usable by all. Even in these cases, some\n"
 "    amount of user data is kept private (e.g. metadata or social graph\n"
 "    data). The user should also have control over this data.\n"
-msgstr "    Certains services permettent aux utilisateurs de soumettre des données avec l’intention de les rendre publiquement accessibles à toutes et à tous. Y compris dans ces cas de figure, quelques données utilisateur restent privées (ex. : les métadonnées ou les données du graphe social). L’utilisateur devrait pouvoir contrôler ces données, car les métadonnées et les informations de log peuvent être utilisées pour de la surveillance disproportionnée."
+msgstr "    Certains services permettent aux utilisateurs de soumettre des données avec l’intention de les rendre publiquement accessibles à toutes et à tous. Y compris dans ces cas de figure, quelques données utilisateur restent privées (ex. : les métadonnées ou les données du graphe social). L’utilisateur devrait pouvoir contrôler aussi ces données."
 
 #. type: Bullet: '2. '
 msgid "**Knowledge** of how the data is stored"
@@ -270,7 +274,7 @@ msgid ""
 "    informed about the geographic location that specific service provider\n"
 "    stores the data in, how long, in which jurisdiction the specific service\n"
 "    provider operates and which laws apply.\n"
-msgstr "    Quand les données sont envoyées à un fournisseur de service particulier, les utilisateurs devraient être informés du lieu de stockage des données du fournisseur de service, de la durée, de la juridiction dans laquelle le fournisseur de service particulier opère, et des lois qui s’y appliquent."
+msgstr "    Quand les données sont envoyées à un fournisseur de service particulier, les utilisateurs devraient être informés du lieu de stockage des données du fournisseur de service, de la durée, de la juridiction dans laquelle le fournisseur de service particulier opère et des lois qui s’y appliquent."
 
 #. type: Plain text
 #, no-wrap
@@ -396,7 +400,7 @@ msgid ""
 "    data, this is impractical. This is why programs available to exploit\n"
 "    exported data should be available under a \n"
 "    [[!taglink Free_Software_(Open_Source)_License|Free_Software]].\n"
-msgstr "    [[!taglink Les_standards_ouverts|Open_standards]] pour les formats et les protocoles sont nécessaires pour garantir cela. Évidemment, sans le code source des programmes utilisés pour les données utilisateurs, cela n’est pas pratique. C’est pourquoi des programmes devraient être distribués sous une [[!taglink licence_de_logiciel_libre_comme_la_GNU_AGPL-3|Free_Software]]."
+msgstr "    [[!taglink Les_standards_ouverts|Open_standards]] pour les formats et les protocoles sont nécessaires pour garantir cela. Évidemment, sans le code source des programmes utilisés pour les données utilisateurs, cela n’est pas pratique. C’est pourquoi des programmes devraient être distribués sous une [[!taglink licence_de_logiciel_libre|Free_Software]]."
 
 #. type: Plain text
 msgid ""
@@ -435,8 +439,7 @@ msgid ""
 msgstr ""
 "Abandonner ainsi la maîtrise de sa vie privée et d’autres droits semble être "
 "un acte trivial pour de nombreuses personnes, un faible prix à payer en "
-"échange du confort que ces services Internet apportent. Cela fait que ce "
-"genre d’échange de procédé s’est répandu."
+"échange du confort que ces services Internet apportent."
 
 #. type: Plain text
 #, fuzzy
@@ -455,7 +458,7 @@ msgstr ""
 "Les fournisseurs de service ont ainsi été obligés de transformer leurs "
 "valeureux services Internet en systèmes massifs et centralisés de "
 "surveillance. Il est crucial que chacun réalise et comprenne cela, puisqu’il "
-"s’agit d’une menace importante pour les libertés de l’humanité."
+"s’agit d’une menace importante pour les libertés de l’humanité et le respect de la vie privée de chacun."
 
 #. type: Plain text
 msgid ""

updated PO files
diff --git a/index.de.po b/index.de.po
index 5cad24e..7da9078 100644
--- a/index.de.po
+++ b/index.de.po
@@ -4,7 +4,7 @@
 # modification, are permitted under any circumstances. No warranty.
 msgid ""
 msgstr ""
-"POT-Creation-Date: 2014-11-18 16:34+0000\n"
+"POT-Creation-Date: 2015-08-18 13:49+0000\n"
 "PO-Revision-Date: 2010-03-12 09:40+0530\n"
 "Last-Translator: Sebastian Kuhnert <mail@sebastian-kuhnert.de>\n"
 "Language-Team: None\n"
@@ -55,7 +55,7 @@ msgstr ""
 #| "<ol start=\"0\"><li><strong>User data</strong> means any data uploaded by a user and/or\n"
 #| "generated from a user, while using a service on the Internet. </li></ol>\n"
 msgid ""
-"<ol start=\"0\"><li><p><strong>User data</strong> means any data uploaded by a user and/or\n"
+"<ol start=\"0\"><li><p><strong>User data</strong> means any data uploaded by a user or\n"
 "generated from a user, while using a service on the Internet.</p></li></ol>\n"
 msgstr ""
 "<ol start=\"0\"><li><strong>Nutzerdaten</strong> bezeichnet alle Daten, die ein Nutzer hochgeladen und/oder\n"
@@ -88,11 +88,13 @@ msgid ""
 msgstr ""
 
 #. type: Bullet: '  - '
-msgid "data generated by a user's device and sent to a server"
+msgid ""
+"data generated by a user's device (like a connected watch or theromstat) and "
+"sent to a server"
 msgstr ""
 
 #. type: Bullet: '  - '
-msgid "a user's search engine queries"
+msgid "a user's search engine queries, if they are logged as such"
 msgstr ""
 
 #. type: Plain text
@@ -139,9 +141,9 @@ msgstr ""
 #| "    provider, nor shared with governments.  Users should be the only ones to have\n"
 #| "    ultimate control over it and to grant access to it. \n"
 msgid ""
-"    When users have control over upload of their data, data intended to be\n"
-"    privately shared should not be accessible to the service provider, nor\n"
-"    shared with governments.  \n"
+"    When users have control over the upload of their data, data\n"
+"    intended to be privately shared should not be accessible to the\n"
+"    service provider, nor shared with governments.\n"
 msgstr "    Wenn Nutzer die Zugriffkontrolle auf die hochgeladenen Daten haben, bedeutet das, dass weder der Dienstanbieter noch Regierungen Zugriff auf privat geteilten Daten haben. Die Nutzer haben die alleinige Kontrolle über die Daten und die Bewilligung der Zugriffsberechtigung auf diese. \n"
 
 #. type: Plain text
@@ -155,7 +157,7 @@ msgstr "    Dies bedeutet, dass das Recht auf das Nutzen von [[!taglink Kryptogr
 #. type: Plain text
 #, no-wrap
 msgid ""
-"    That also means that when users do not have full control over upload of\n"
+"    That also means that when users do not have full control over the upload of\n"
 "    their data (e.g. if they don't use cryptography before uploading) a service\n"
 "    provider should **not**:\n"
 msgstr ""
@@ -168,8 +170,9 @@ msgstr ""
 
 #. type: Bullet: '     2. '
 msgid ""
-"impose licensing conditions (e.g. copyright, personal data protection)  that "
-"go beyond what is necessary for the purpose of the service."
+"impose licensing conditions (e.g. on copyright, or personal data "
+"exploitation) that go beyond what is necessary for the purpose of running "
+"the service."
 msgstr ""
 
 #. type: Plain text
@@ -181,8 +184,8 @@ msgid ""
 "    absolute and should not extend over others’ rights to use and exploit the\n"
 "    data once it has been made available to them.  What’s more, it does not\n"
 "    mean that users should have the right to impose unfair restrictions to\n"
-"    other people and systems should not enforce such restrictions (e.g. through\n"
-"    [[!taglink DRM]]). \n"
+"    other people. In any event, technical systems should not be designed to\n"
+"    enforce such restrictions (e.g. through [[!taglink DRM]]).\n"
 msgstr ""
 
 #. type: Plain text
@@ -193,7 +196,7 @@ msgstr ""
 #. type: Plain text
 #, no-wrap
 msgid ""
-"    Data received, generated, and/or collected from user activity or from a\n"
+"    Data received, generated, or collected from user activity or from a\n"
 "    user's device (e.g. metadata or social graph data) should be made\n"
 "    accessible to them and put under their control. \n"
 msgstr ""
@@ -212,9 +215,9 @@ msgstr ""
 #, no-wrap
 msgid ""
 "    Some services allow users to submit data with the intention to make it\n"
-"    publicly available for all. Even in these cases, some amount of user data\n"
-"    is kept private (e.g. metadata or social graph data). The user should also\n"
-"    have control over this data.\n"
+"    publicly available and usable by all. Even in these cases, some\n"
+"    amount of user data is kept private (e.g. metadata or social graph\n"
+"    data). The user should also have control over this data.\n"
 msgstr ""
 
 #. type: Bullet: '2. '
@@ -282,8 +285,7 @@ msgstr ""
 msgid ""
 "    Users should not rely on centralised services. Peer-to-peer systems and\n"
 "    unhosted applications are a means to that end.  In the long term, all users\n"
-"    should be able to have their own server with\n"
-"    [[!taglink Free_Software]].\n"
+"    should be able to have their own server with [[!taglink Free_Software]].\n"
 msgstr ""
 
 #. type: Plain text
@@ -330,7 +332,7 @@ msgstr ""
 #, no-wrap
 msgid ""
 "    [[!taglink Open_standards]] for formats and protocols are necessary to\n"
-"    guarantee this.  \n"
+"    guarantee this.\n"
 msgstr ""
 
 #. type: Plain text
@@ -338,8 +340,8 @@ msgstr ""
 msgid ""
 "    Obviously, without the source code of the programs used to deal with user\n"
 "    data, this is impractical. This is why programs available to exploit\n"
-"    exported data should be distributed under a \n"
-"    [[!taglink Free_Software_license_like_the_GNU_AGPL-3|Free_Software]].\n"
+"    exported data should be available under a \n"
+"    [[!taglink Free_Software_(Open_Source)_License|Free_Software]].\n"
 msgstr ""
 
 #. type: Plain text
@@ -368,8 +370,9 @@ msgstr ""
 msgid ""
 "Service providers have thus been unwittingly compelled to turn their "
 "valuable Internet services into massive and centralised surveillance "
-"systems. It is of grave importance that people understand/realize this, "
-"since it forms a serious threat to the freedom of humanity."
+"systems. It is of grave importance that people understand and realize this, "
+"since it forms a serious threat to the freedom of humanity and to the "
+"privacy of each individual."
 msgstr ""
 
 #. type: Plain text
diff --git a/index.fr.po b/index.fr.po
index 0395e67..03f766f 100644
--- a/index.fr.po
+++ b/index.fr.po
@@ -9,7 +9,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ikiwiki\n"
-"POT-Creation-Date: 2014-11-18 16:34+0000\n"
+"POT-Creation-Date: 2015-08-18 13:49+0000\n"
 "PO-Revision-Date: 2009-08-23 18:50+0200\n"
 "Last-Translator: Philippe Batailler <philippe.batailler@free.fr>\n"
 "Language-Team: French <debian-l10n-french@lists.debian.org>\n"
@@ -61,7 +61,7 @@ msgstr "    [[!toggle  id=\"wucat\" text=\"\"\"\n"
 #| "<ol start=\"0\"><li><strong>User data</strong> means any data uploaded by a user and/or\n"
 #| "generated from a user, while using a service on the Internet. </li></ol>\n"
 msgid ""
-"<ol start=\"0\"><li><p><strong>User data</strong> means any data uploaded by a user and/or\n"
+"<ol start=\"0\"><li><p><strong>User data</strong> means any data uploaded by a user or\n"
 "generated from a user, while using a service on the Internet.</p></li></ol>\n"
 msgstr "<ol start=\"0\"><li>Par <strong>données utilisateur</strong>, on entend les données envoyées par un utilisateur et/ou générées depuis une utilisatrice, au moyen de l’utilisation d’un service sur Internet.</li></ol>\n"
 
@@ -93,11 +93,13 @@ msgid ""
 msgstr ""
 
 #. type: Bullet: '  - '
-msgid "data generated by a user's device and sent to a server"
+msgid ""
+"data generated by a user's device (like a connected watch or theromstat) and "
+"sent to a server"
 msgstr ""
 
 #. type: Bullet: '  - '
-msgid "a user's search engine queries"
+msgid "a user's search engine queries, if they are logged as such"
 msgstr ""
 
 #. type: Plain text
@@ -140,9 +142,9 @@ msgstr "    [[!toggle  id=\"wucat\" text=\"×\"]]\n"
 #| "    provider, nor shared with governments.  Users should be the only ones to have\n"
 #| "    ultimate control over it and to grant access to it. \n"
 msgid ""
-"    When users have control over upload of their data, data intended to be\n"
-"    privately shared should not be accessible to the service provider, nor\n"
-"    shared with governments.  \n"
+"    When users have control over the upload of their data, data\n"
+"    intended to be privately shared should not be accessible to the\n"
+"    service provider, nor shared with governments.\n"
 msgstr "    Lorsque les utilisateurs maîtrisent l’accès aux données qu’ils envoient, cela signifie que les données censées restées privées ou partagées à un cercle restreint ne devraient pas être rendues accessibles au fournisseur du service, ni divulguées aux États. Seuls les utilisateurs devraient en avoir la maîtrise ultime et y donner accès."
 
 #. type: Plain text
@@ -156,7 +158,7 @@ msgstr "    Cela signifie que le droit d’utiliser [[!taglink la_cryptographie|
 #. type: Plain text

(Diff truncated)
removed and/or and added a few precisions
diff --git a/index.mdwn b/index.mdwn
index 447a4a9..e5147e3 100644
--- a/index.mdwn
+++ b/index.mdwn
@@ -12,7 +12,7 @@ This manifesto aims at defining users’ fundamental
 ought to be free and should not have to pay allegiance to service providers. 
 
 [[!toggle  id="userdata" text="""
-<ol start="0"><li><p><strong>User data</strong> means any data uploaded by a user and/or
+<ol start="0"><li><p><strong>User data</strong> means any data uploaded by a user or
 generated from a user, while using a service on the Internet.</p></li></ol>
 """]]
 
@@ -24,8 +24,9 @@ Examples of user data include:
     friend
   - a library of photos, books or other files a user uploads from their device
     in order to be able to read, view or modify online
-  - data generated by a user's device and sent to a server
-  - a user's search engine queries
+  - data generated by a user's device (like a connected watch or
+    theromstat) and sent to a server
+  - a user's search engine queries, if they are logged as such 
 """]]
 
 Thus, users should have:
@@ -41,21 +42,22 @@ Thus, users should have:
 
     [[!toggleable id="wucat" text="""
     [[!toggle  id="wucat" text="×"]]
-    When users have control over upload of their data, data intended to be
-    privately shared should not be accessible to the service provider, nor
-    shared with governments.  
+    When users have control over the upload of their data, data
+    intended to be privately shared should not be accessible to the
+    service provider, nor shared with governments.
 
     That means the right to use [[!taglink cryptography]] should never be
     denied. 
 
-    That also means that when users do not have full control over upload of
+    That also means that when users do not have full control over the upload of
     their data (e.g. if they don't use cryptography before uploading) a service
     provider should **not**:
      
      1. force users to disclose private data (including private correspondence)
         with them, nor
-     2. impose licensing conditions (e.g. copyright, personal data protection)
-        that go beyond what is necessary for the purpose of the service.
+     2. impose licensing conditions (e.g. on copyright, or personal
+        data exploitation) that go beyond what is necessary for the
+        purpose of running the service.
 
     When users make data available to others, whether to a restrictive group of
     people or to large groups, they should be able to decide under which
@@ -63,12 +65,12 @@ Thus, users should have:
     absolute and should not extend over others’ rights to use and exploit the
     data once it has been made available to them.  What’s more, it does not
     mean that users should have the right to impose unfair restrictions to
-    other people and systems should not enforce such restrictions (e.g. through
-    [[!taglink DRM]]). 
+    other people. In any event, technical systems should not be designed to
+    enforce such restrictions (e.g. through [[!taglink DRM]]).
     """]]
 
     [[!toggle  id="ssauts" text="""
-    Data received, generated, and/or collected from user activity or from a
+    Data received, generated, or collected from user activity or from a
     user's device (e.g. metadata or social graph data) should be made
     accessible to them and put under their control. 
     """]]
@@ -76,9 +78,9 @@ Thus, users should have:
     [[!toggleable id="ssauts" text="""
     [[!toggle  id="ssauts" text="×"]]
     Some services allow users to submit data with the intention to make it
-    publicly available for all. Even in these cases, some amount of user data
-    is kept private (e.g. metadata or social graph data). The user should also
-    have control over this data.
+    publicly available and usable by all. Even in these cases, some
+    amount of user data is kept private (e.g. metadata or social graph
+    data). The user should also have control over this data.
     """]]
 
 
@@ -110,8 +112,7 @@ Thus, users should have:
     [[!toggle  id="usnroc" text="×"]]
     Users should not rely on centralised services. Peer-to-peer systems and
     unhosted applications are a means to that end.  In the long term, all users
-    should be able to have their own server with
-    [[!taglink Free_Software]].
+    should be able to have their own server with [[!taglink Free_Software]].
     
     Unfortunately, this is made very difficult by some Internet access
     providers that restrict their customers unfairly. 
@@ -130,12 +131,12 @@ Thus, users should have:
     they should always be able to leave a platform and settle elsewhere.
 
     [[!taglink Open_standards]] for formats and protocols are necessary to
-    guarantee this.  
+    guarantee this.
     
     Obviously, without the source code of the programs used to deal with user
     data, this is impractical. This is why programs available to exploit
-    exported data should be distributed under a 
-    [[!taglink Free_Software_license_like_the_GNU_AGPL-3|Free_Software]].
+    exported data should be available under a 
+    [[!taglink Free_Software_(Open_Source)_License|Free_Software]].
     """]]
 
 
@@ -154,8 +155,9 @@ Internet services bring.
 
 Service providers have thus been unwittingly compelled to turn their valuable
 Internet services into massive and centralised surveillance systems. It is of
-grave importance that people understand/realize this, since it forms a serious
-threat to the freedom of humanity.
+grave importance that people understand and realize this, since it
+forms a serious threat to the freedom of humanity and to the privacy
+of each individual.
 
 
 Ultimately, to ensure that user data is under the users’ control, the best

sidebar trans
diff --git a/sidebar.fr.po b/sidebar.fr.po
index 191cb5f..09f422a 100644
--- a/sidebar.fr.po
+++ b/sidebar.fr.po
@@ -32,7 +32,7 @@ msgid ""
 "</ul>\n"
 msgstr ""
 "<ul class=\"nav\" role=\"menu\">\n"
-"<li>[[À propos de ce wiki|about]]</li>\n"
+"<li>[[À propos du wiki|about]]</li>\n"
 "<li>[[Questions fréquentes|faq]]</li>\n"
 "<li><a href=\"/ikiwiki.cgi?P=\">Rechercher</a></li>\n"
 "</ul>\n"

removed discussion sidebar in translations
diff --git a/sidebar.fr.po b/sidebar.fr.po
index 91fcee4..191cb5f 100644
--- a/sidebar.fr.po
+++ b/sidebar.fr.po
@@ -34,6 +34,5 @@ msgstr ""
 "<ul class=\"nav\" role=\"menu\">\n"
 "<li>[[À propos de ce wiki|about]]</li>\n"
 "<li>[[Questions fréquentes|faq]]</li>\n"
-"<li>[[Discussion|Discussion/Français/]]</li>\n"
 "<li><a href=\"/ikiwiki.cgi?P=\">Rechercher</a></li>\n"
 "</ul>\n"
diff --git a/sidebar.ja.po b/sidebar.ja.po
index cd3592d..47cf987 100644
--- a/sidebar.ja.po
+++ b/sidebar.ja.po
@@ -22,7 +22,6 @@ msgstr ""
 #| "<ul class=\"nav\" role=\"menu\">\n"
 #| "<li>[[About this wiki|about]]</li>\n"
 #| "<li>[[Frequently Asked Questions|faq]]</li>\n"
-#| "<li>[[Discussion|Discussion/]]</li>\n"
 #| "<li><a href=\"/ikiwiki.cgi?P=\">Search</a></li>\n"
 #| "</ul>\n"
 msgid ""
diff --git a/sidebar.tr.po b/sidebar.tr.po
index 98337f9..6020082 100644
--- a/sidebar.tr.po
+++ b/sidebar.tr.po
@@ -35,6 +35,5 @@ msgstr ""
 "<ul class=\"nav\" role=\"menu\">\n"
 "<li>[[Viki hakkında|about]]</li>\n"
 "<li>[[Sık Sorulan Sorular|faq]]</li>\n"
-"<li>[[Tartışma|Discussion/]]</li>\n"
 "<li><a href=\"/ikiwiki.cgi?P=\">Arama</a></li>\n"
 "</ul>\n"

updated PO files
diff --git a/sidebar.de.po b/sidebar.de.po
index 188cb02..b197fdf 100644
--- a/sidebar.de.po
+++ b/sidebar.de.po
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2014-11-03 15:51+0000\n"
+"POT-Creation-Date: 2015-08-18 13:25+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -22,7 +22,6 @@ msgid ""
 "<ul class=\"nav\" role=\"menu\">\n"
 "<li>[[About this wiki|about]]</li>\n"
 "<li>[[Frequently Asked Questions|faq]]</li>\n"
-"<li>[[Discussion|Discussion/English/]]</li>\n"
 "<li><a href=\"/ikiwiki.cgi?P=\">Search</a></li>\n"
 "</ul>\n"
 msgstr ""
diff --git a/sidebar.fr.po b/sidebar.fr.po
index 3501e84..91fcee4 100644
--- a/sidebar.fr.po
+++ b/sidebar.fr.po
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2014-11-03 15:51+0000\n"
+"POT-Creation-Date: 2015-08-18 13:25+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -28,7 +28,6 @@ msgid ""
 "<ul class=\"nav\" role=\"menu\">\n"
 "<li>[[About this wiki|about]]</li>\n"
 "<li>[[Frequently Asked Questions|faq]]</li>\n"
-"<li>[[Discussion|Discussion/English/]]</li>\n"
 "<li><a href=\"/ikiwiki.cgi?P=\">Search</a></li>\n"
 "</ul>\n"
 msgstr ""
diff --git a/sidebar.ja.po b/sidebar.ja.po
index 23c52fe..cd3592d 100644
--- a/sidebar.ja.po
+++ b/sidebar.ja.po
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2014-11-03 15:51+0000\n"
+"POT-Creation-Date: 2015-08-18 13:25+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -29,7 +29,6 @@ msgid ""
 "<ul class=\"nav\" role=\"menu\">\n"
 "<li>[[About this wiki|about]]</li>\n"
 "<li>[[Frequently Asked Questions|faq]]</li>\n"
-"<li>[[Discussion|Discussion/English/]]</li>\n"
 "<li><a href=\"/ikiwiki.cgi?P=\">Search</a></li>\n"
 "</ul>\n"
 msgstr ""
diff --git a/sidebar.tr.po b/sidebar.tr.po
index 6b7af05..98337f9 100644
--- a/sidebar.tr.po
+++ b/sidebar.tr.po
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2014-11-03 15:24+0000\n"
+"POT-Creation-Date: 2015-08-18 13:25+0000\n"
 "PO-Revision-Date: 2014-11-05 14:53+0200\n"
 "Last-Translator: T. E. KALAYCI <tekrei@fsfe.org>\n"
 "Language-Team: Turkish\n"
@@ -17,12 +17,18 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 
 #. type: Plain text
-#, no-wrap
+#, fuzzy, no-wrap
+#| msgid ""
+#| "<ul class=\"nav\" role=\"menu\">\n"
+#| "<li>[[About this wiki|about]]</li>\n"
+#| "<li>[[Frequently Asked Questions|faq]]</li>\n"
+#| "<li>[[Discussion|Discussion/English/]]</li>\n"
+#| "<li><a href=\"/ikiwiki.cgi?P=\">Search</a></li>\n"
+#| "</ul>\n"
 msgid ""
 "<ul class=\"nav\" role=\"menu\">\n"
 "<li>[[About this wiki|about]]</li>\n"
 "<li>[[Frequently Asked Questions|faq]]</li>\n"
-"<li>[[Discussion|Discussion/English/]]</li>\n"
 "<li><a href=\"/ikiwiki.cgi?P=\">Search</a></li>\n"
 "</ul>\n"
 msgstr ""

removed discussion page because buggy
diff --git a/Discussion/English.de.po b/Discussion/English.de.po
deleted file mode 100644
index 5969539..0000000
--- a/Discussion/English.de.po
+++ /dev/null
@@ -1,60 +0,0 @@
-# SOME DESCRIPTIVE TITLE
-# Copyright (C) YEAR Free Software Foundation, Inc.
-# This file is distributed under the same license as the PACKAGE package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-#, fuzzy
-msgid ""
-msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2014-11-03 15:51+0000\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-
-#. type: Plain text
-#, no-wrap
-msgid ""
-"**Please sign your edit or give us a way to get back to you so we can "
-"discuss.**\n"
-msgstr ""
-
-#. type: Plain text
-msgid ""
-"From "
-"http://source.udm.branchable.com/?p=source.git;a=commitdiff;h=70c036cbeb2cdea9e5718a871a15c40a18a3d533"
-msgstr ""
-
-#. type: Plain text
-#, no-wrap
-msgid ""
-" > The manifesto as it stands, seems fine for \"user-created content\", as "
-"in social media. But with the dawn of the Internet of Things, people will be "
-"generating much data of which they are unaware, though often it will have "
-"privacy implications. Therefore I propose a new section in the manifesto "
-"which deals with anonymisation. Often the use of anonymous data will be "
-"beneficial to citizens; they just need to have control of what is anonymised "
-"and when. \n"
-msgstr ""
-
-#. type: Plain text
-msgid "Hugo: Thiere is already such a section, see point 1 paragraph 2 :"
-msgstr ""
-
-#. type: Plain text
-#, no-wrap
-msgid ""
-" > Data received, generated, and/or collected from users’ activity while "
-"using\n"
-" > the service (e.g. metadata or social graph data) should be made "
-"accessible\n"
-" > to them and put under their control as well. If this control can’t be "
-"given,\n"
-" > then this type of data should be anonymous or not stored for periods "
-"longer\n"
-" > than necessary.\n"
-msgstr ""
diff --git a/Discussion/English.fr.po b/Discussion/English.fr.po
deleted file mode 100644
index 5969539..0000000
--- a/Discussion/English.fr.po
+++ /dev/null
@@ -1,60 +0,0 @@
-# SOME DESCRIPTIVE TITLE
-# Copyright (C) YEAR Free Software Foundation, Inc.
-# This file is distributed under the same license as the PACKAGE package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-#, fuzzy
-msgid ""
-msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2014-11-03 15:51+0000\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-
-#. type: Plain text
-#, no-wrap
-msgid ""
-"**Please sign your edit or give us a way to get back to you so we can "
-"discuss.**\n"
-msgstr ""
-
-#. type: Plain text
-msgid ""
-"From "
-"http://source.udm.branchable.com/?p=source.git;a=commitdiff;h=70c036cbeb2cdea9e5718a871a15c40a18a3d533"
-msgstr ""
-
-#. type: Plain text
-#, no-wrap
-msgid ""
-" > The manifesto as it stands, seems fine for \"user-created content\", as "
-"in social media. But with the dawn of the Internet of Things, people will be "
-"generating much data of which they are unaware, though often it will have "
-"privacy implications. Therefore I propose a new section in the manifesto "
-"which deals with anonymisation. Often the use of anonymous data will be "
-"beneficial to citizens; they just need to have control of what is anonymised "
-"and when. \n"
-msgstr ""
-
-#. type: Plain text
-msgid "Hugo: Thiere is already such a section, see point 1 paragraph 2 :"
-msgstr ""
-
-#. type: Plain text
-#, no-wrap
-msgid ""
-" > Data received, generated, and/or collected from users’ activity while "
-"using\n"
-" > the service (e.g. metadata or social graph data) should be made "
-"accessible\n"
-" > to them and put under their control as well. If this control can’t be "
-"given,\n"
-" > then this type of data should be anonymous or not stored for periods "
-"longer\n"
-" > than necessary.\n"
-msgstr ""
diff --git a/Discussion/English.ja.po b/Discussion/English.ja.po
deleted file mode 100644
index 5969539..0000000
--- a/Discussion/English.ja.po
+++ /dev/null
@@ -1,60 +0,0 @@
-# SOME DESCRIPTIVE TITLE
-# Copyright (C) YEAR Free Software Foundation, Inc.
-# This file is distributed under the same license as the PACKAGE package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-#, fuzzy
-msgid ""
-msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2014-11-03 15:51+0000\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-
-#. type: Plain text
-#, no-wrap
-msgid ""
-"**Please sign your edit or give us a way to get back to you so we can "
-"discuss.**\n"
-msgstr ""
-
-#. type: Plain text
-msgid ""
-"From "
-"http://source.udm.branchable.com/?p=source.git;a=commitdiff;h=70c036cbeb2cdea9e5718a871a15c40a18a3d533"
-msgstr ""
-
-#. type: Plain text
-#, no-wrap
-msgid ""
-" > The manifesto as it stands, seems fine for \"user-created content\", as "
-"in social media. But with the dawn of the Internet of Things, people will be "
-"generating much data of which they are unaware, though often it will have "
-"privacy implications. Therefore I propose a new section in the manifesto "
-"which deals with anonymisation. Often the use of anonymous data will be "
-"beneficial to citizens; they just need to have control of what is anonymised "
-"and when. \n"
-msgstr ""
-
-#. type: Plain text
-msgid "Hugo: Thiere is already such a section, see point 1 paragraph 2 :"
-msgstr ""
-
-#. type: Plain text
-#, no-wrap
-msgid ""
-" > Data received, generated, and/or collected from users’ activity while "
-"using\n"
-" > the service (e.g. metadata or social graph data) should be made "
-"accessible\n"
-" > to them and put under their control as well. If this control can’t be "
-"given,\n"
-" > then this type of data should be anonymous or not stored for periods "
-"longer\n"
-" > than necessary.\n"
-msgstr ""
diff --git a/Discussion/English.mdwn b/Discussion/English.mdwn
deleted file mode 100644

(Diff truncated)
Merge branch 'master' of github.com:userdatamanifesto/www
adding modifications and suggestions after fosdem feedback and some fixmes
diff --git a/index.mdwn b/index.mdwn
index 447a4a9..0d70ee8 100644
--- a/index.mdwn
+++ b/index.mdwn
@@ -12,8 +12,8 @@ This manifesto aims at defining users’ fundamental
 ought to be free and should not have to pay allegiance to service providers. 
 
 [[!toggle  id="userdata" text="""
-<ol start="0"><li><p><strong>User data</strong> means any data uploaded by a user and/or
-generated from a user, while using a service on the Internet.</p></li></ol>
+<ol start="0"><li><p><strong>User data</strong> means any data uploaded by a
+user for his or her own use.</p></li></ol>
 """]]
 
 [[!toggleable id="userdata" text="""
@@ -24,8 +24,7 @@ Examples of user data include:
     friend
   - a library of photos, books or other files a user uploads from their device
     in order to be able to read, view or modify online
-  - data generated by a user's device and sent to a server
-  - a user's search engine queries
+  - FIXME
 """]]
 
 Thus, users should have:
@@ -33,61 +32,56 @@ Thus, users should have:
 1. **Control** over user data access
 
     [[!toggle  id="wucat" text="""
-    Data explicitly and willingly uploaded by a user should be under the
-    ultimate control of the user. Users should be able to decide whom to grant
-    direct access to their data and with which permissions and licenses such
-    access should be granted.
+    User data should be under the ultimate control of the user. Users should be
+    able to decide whom to grant direct access to their data and with which
+    permissions and licenses such access should be granted.
     """]]
 
     [[!toggleable id="wucat" text="""
     [[!toggle  id="wucat" text="×"]]
     When users have control over upload of their data, data intended to be
-    privately shared should not be accessible to the service provider, nor
-    shared with governments.  
+    privately shared should not be used by the service provider, nor shared
+    with third parties or governments. 
 
-    That means the right to use [[!taglink cryptography]] should never be
-    denied. 
-
-    That also means that when users do not have full control over upload of
-    their data (e.g. if they don't use cryptography before uploading) a service
-    provider should **not**:
-     
-     1. force users to disclose private data (including private correspondence)
-        with them, nor
-     2. impose licensing conditions (e.g. copyright, personal data protection)
-        that go beyond what is necessary for the purpose of the service.
+    Service providers should not force users to disclose private data with them
+    (including private correspondence).  That means the right to use end-to-end
+    [[!taglink cryptography]] should never be denied.  Also, service providers
+    should not impose licensing conditions (e.g. copyright, personal data
+    protection) that go beyond what is necessary for the purpose of running the
+    service for the user.
 
     When users make data available to others, whether to a restrictive group of
     people or to large groups, they should be able to decide under which
-    permissions they grant access to this data. However, this right is not
-    absolute and should not extend over others’ rights to use and exploit the
-    data once it has been made available to them.  What’s more, it does not
-    mean that users should have the right to impose unfair restrictions to
-    other people and systems should not enforce such restrictions (e.g. through
-    [[!taglink DRM]]). 
+    permissions they grant access to this data. 
+    
+    However, this right is not absolute and should not extend over others’
+    rights to use and exploit the data once it has been made available to them.
+    What’s more, it does not mean that users should have the right to impose
+    unfair restrictions to other people and technical systems should not
+    enforce such restrictions (e.g. through [[!taglink DRM]]). 
     """]]
 
     [[!toggle  id="ssauts" text="""
-    Data received, generated, and/or collected from user activity or from a
-    user's device (e.g. metadata or social graph data) should be made
-    accessible to them and put under their control. 
+    Data generated or associated with user data (e.g. metadata) should also be
+    made available to that user and put under their control just like the user
+    data itself.
     """]]
 
     [[!toggleable id="ssauts" text="""
     [[!toggle  id="ssauts" text="×"]]
-    Some services allow users to submit data with the intention to make it
-    publicly available for all. Even in these cases, some amount of user data
+    Some services allow users to submit data with the intention to publish it. Even in these cases, some amount of user data
     is kept private (e.g. metadata or social graph data). The user should also
     have control over this data.
+    [FIXME]
     """]]
 
 
-2. **Knowledge** of how the data is stored
+2. **Knowledge** of how user data is stored
 
     [[!toggle  id="wuucstu" text="""
-    When the data is uploaded to a specific service provider, users should be
+    When user data is uploaded to a specific service provider, users should be
     informed about the geographic location that specific service provider
-    stores the data in, how long, in which jurisdiction the specific service
+    stores the data in, how long, in which jurisdiction that specific service
     provider operates and which laws apply.
     """]]
 
@@ -100,9 +94,9 @@ Thus, users should have:
     """]]
 
     [[!toggle  id="usnroc" text="""
-    Users should be able to store their own data on devices (e.g.  servers) in
-    their vicinity and under their direct control. This way, users do not have
-    to rely on centralised services.
+    This point is not relevant when users are able to store their own data on
+    devices in their vicinity and under their direct control (e.g. servers) or
+    when they rely on systems without centralised control (e.g. peer-to-peer).
     """]]
 
 
@@ -112,9 +106,6 @@ Thus, users should have:
     unhosted applications are a means to that end.  In the long term, all users
     should be able to have their own server with
     [[!taglink Free_Software]].
-    
-    Unfortunately, this is made very difficult by some Internet access
-    providers that restrict their customers unfairly. 
     """]]
 
 3. **Freedom** to choose a platform
@@ -132,8 +123,8 @@ Thus, users should have:
     [[!taglink Open_standards]] for formats and protocols are necessary to
     guarantee this.  
     
-    Obviously, without the source code of the programs used to deal with user
-    data, this is impractical. This is why programs available to exploit
+    Obviously, without the source code of programs used to deal with user data,
+    this is impractical. This is why some programs must be available to exploit
     exported data should be distributed under a 
     [[!taglink Free_Software_license_like_the_GNU_AGPL-3|Free_Software]].
     """]]

[TR] update of the translation
diff --git a/index.tr.po b/index.tr.po
index 203e158..1b50180 100644
--- a/index.tr.po
+++ b/index.tr.po
@@ -85,6 +85,15 @@ msgid ""
 "</ul>\n"
 "</li></ul>\n"
 msgstr ""
+"<ul style=\"list-style-type: none;\"><li>\n"
+"Kullanıcı verisi örnekleri:\n"
+"<ul>\n"
+"<li>bir kullanıcının bir çok aygıt aracılığıyla eşlediği veya arkadaşıyla paylaştığı dosyalar</li>\n"
+"<li>çevrim içi olarak okuyabilmek, görüntüleyebilmek veya değiştirmek amacıyla aygıtından karşıya yüklediği bir kullanıcının resim, kitap ve diğer dosya kütüphaneleri</li>\n"
+"<li>bir kullanıcının aygıtı tarafından üretilen ve sunucuya gönderilen veri</li>\n"
+"<li>bir kullanıcının arama motoru sorguları</li>\n"
+"</ul>\n"
+"</li></ul>\n"
 
 #. type: Plain text
 msgid "Thus, users should have:"
@@ -198,9 +207,7 @@ msgid ""
 msgstr ""
 "    Kullanıcıların hizmeti kullanırken yaptığı etkinlikler sonucunda elde edilen,\n"
 "    üretilen ve/veya toplanan veriler (örneğin üst veri veya sosyal grafik verisi),\n"
-"    onlara sağlanmalı ve denetimlerine de sunulmalıdır. Eğer bu denetim verilemeyecekse,\n"
-"    o zaman bu tür veriler anonim olmalı veya gerekenden daha uzun bir süre\n"
-"    saklanmamalıdır.\n"
+"    onlara sağlanmalı ve denetimlerine de sunulmalıdır.\n"
 
 #. type: Plain text
 #, no-wrap
@@ -259,7 +266,7 @@ msgid ""
 "    provider operates and which laws apply.\n"
 msgstr ""
 "    Veri belirli bir hizmet sağlayıcıya yüklendiğinde, kullanıcılar ilgili sağlayıcının\n"
-"    veriyi nerede, ne kadar zamanla sakladığı, ilgili hizmet sağlayıcının\n"
+"    veriyi saklandığı coğrafik konum, ne kadar zamanla sakladığı, ilgili hizmet sağlayıcının\n"
 "    hangi yetkilerle iş gördüğü ve hangi yasaların geçerli olduğu konularında\n"
 "    bilgilendirilmelidir.\n"
 
@@ -327,6 +334,7 @@ msgstr ""
 "    Kullanıcılar, merkezi hizmetlere itibar etmemelidirler. Eşler arası sistemler ve\n"
 "    sunucusuz uygulamalar bu niyete yönelik araçlardır. Uzun vadede, bütün kullanıcılar\n"
 "    kendi sunucularına sahip olabilmelidir. \n"
+"    [[!taglink Özgür_Yazılım|Free_Software]].\n"
 
 #. type: Plain text
 #, no-wrap
@@ -426,8 +434,7 @@ msgid ""
 msgstr ""
 "Mahremiyet ve diğer haklardan bu şekilde feragat etmek, çoğu kullanıcıya "
 "önemsiz ve bu İnternet hizmetlerinin sağladıkları rahatlık uğruna ufak bir "
-"bedel olarak gözükebilmektedir. Bu durum, bu tür bir takası "
-"yaygınlaştırmıştır."
+"bedel olarak gözükebilmektedir."
 
 #. type: Plain text
 msgid ""

updated PO files
diff --git a/tags/DRM.de.po b/tags/DRM.de.po
new file mode 100644
index 0000000..72c65dd
--- /dev/null
+++ b/tags/DRM.de.po
@@ -0,0 +1,29 @@
+# SOME DESCRIPTIVE TITLE
+# Copyright (C) YEAR Free Software Foundation, Inc.
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"POT-Creation-Date: 2014-11-18 16:34+0000\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#. type: Plain text
+#, no-wrap
+msgid "[[!meta title=\"pages tagged DRM\"]]\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+"[[!inline pages=\"tagged(DRM)\" actions=\"no\" archive=\"yes\"\n"
+"feedshow=10]]\n"
+msgstr ""
diff --git a/tags/DRM.fr.po b/tags/DRM.fr.po
new file mode 100644
index 0000000..72c65dd
--- /dev/null
+++ b/tags/DRM.fr.po
@@ -0,0 +1,29 @@
+# SOME DESCRIPTIVE TITLE
+# Copyright (C) YEAR Free Software Foundation, Inc.
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"POT-Creation-Date: 2014-11-18 16:34+0000\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#. type: Plain text
+#, no-wrap
+msgid "[[!meta title=\"pages tagged DRM\"]]\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+"[[!inline pages=\"tagged(DRM)\" actions=\"no\" archive=\"yes\"\n"
+"feedshow=10]]\n"
+msgstr ""
diff --git a/tags/DRM.ja.po b/tags/DRM.ja.po
new file mode 100644
index 0000000..72c65dd
--- /dev/null
+++ b/tags/DRM.ja.po
@@ -0,0 +1,29 @@
+# SOME DESCRIPTIVE TITLE
+# Copyright (C) YEAR Free Software Foundation, Inc.
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"POT-Creation-Date: 2014-11-18 16:34+0000\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#. type: Plain text
+#, no-wrap
+msgid "[[!meta title=\"pages tagged DRM\"]]\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+"[[!inline pages=\"tagged(DRM)\" actions=\"no\" archive=\"yes\"\n"
+"feedshow=10]]\n"
+msgstr ""
diff --git a/tags/DRM.tr.po b/tags/DRM.tr.po
new file mode 100644
index 0000000..72c65dd
--- /dev/null
+++ b/tags/DRM.tr.po
@@ -0,0 +1,29 @@
+# SOME DESCRIPTIVE TITLE
+# Copyright (C) YEAR Free Software Foundation, Inc.
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"POT-Creation-Date: 2014-11-18 16:34+0000\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#. type: Plain text
+#, no-wrap
+msgid "[[!meta title=\"pages tagged DRM\"]]\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+"[[!inline pages=\"tagged(DRM)\" actions=\"no\" archive=\"yes\"\n"
+"feedshow=10]]\n"
+msgstr ""

creating tag page tags/DRM
diff --git a/tags/DRM.mdwn b/tags/DRM.mdwn
new file mode 100644
index 0000000..c95e2a2
--- /dev/null
+++ b/tags/DRM.mdwn
@@ -0,0 +1,4 @@
+[[!meta title="pages tagged DRM"]]
+
+[[!inline pages="tagged(DRM)" actions="no" archive="yes"
+feedshow=10]]

updated PO files
diff --git a/index.de.po b/index.de.po
index 725e373..5cad24e 100644
--- a/index.de.po
+++ b/index.de.po
@@ -4,7 +4,7 @@
 # modification, are permitted under any circumstances. No warranty.
 msgid ""
 msgstr ""
-"POT-Creation-Date: 2014-11-15 21:09+0000\n"
+"POT-Creation-Date: 2014-11-18 16:34+0000\n"
 "PO-Revision-Date: 2010-03-12 09:40+0530\n"
 "Last-Translator: Sebastian Kuhnert <mail@sebastian-kuhnert.de>\n"
 "Language-Team: None\n"
@@ -73,17 +73,26 @@ msgid "[[!toggle  id=\"userdata\" text=\"×\"]]\n"
 msgstr "[[!meta title=\"User Data Manifesto\"]]\n"
 
 #. type: Plain text
-#, no-wrap
+msgid "Examples of user data include:"
+msgstr ""
+
+#. type: Bullet: '  - '
+msgid ""
+"the files a user is syncing through multiple devices or sharing with a friend"
+msgstr ""
+
+#. type: Bullet: '  - '
 msgid ""
-"<ul style=\"list-style-type: none;\"><li>\n"
-"Examples of user data include:\n"
-"<ul>\n"
-"<li>the files a user is syncing through multiple devices or sharing with a friend</li>\n"
-"<li>a library of photos, books or other files a user uploads from their device in order to be able to read, view or modify online</li>\n"
-"<li>data generated by a user's device and sent to a server</li>\n"
-"<li>a user's search engine queries</li>\n"
-"</ul>\n"
-"</li></ul>\n"
+"a library of photos, books or other files a user uploads from their device "
+"in order to be able to read, view or modify online"
+msgstr ""
+
+#. type: Bullet: '  - '
+msgid "data generated by a user's device and sent to a server"
+msgstr ""
+
+#. type: Bullet: '  - '
+msgid "a user's search engine queries"
 msgstr ""
 
 #. type: Plain text
@@ -130,15 +139,17 @@ msgstr ""
 #| "    provider, nor shared with governments.  Users should be the only ones to have\n"
 #| "    ultimate control over it and to grant access to it. \n"
 msgid ""
-"    When users have control over upload of their data, it means that\n"
-"    data intended to be privately shared should not be accessible to the service\n"
-"    provider, nor shared with governments.  Users should be the only ones to have\n"
-"    ultimate control over it and to grant access to it. \n"
+"    When users have control over upload of their data, data intended to be\n"
+"    privately shared should not be accessible to the service provider, nor\n"
+"    shared with governments.  \n"
 msgstr "    Wenn Nutzer die Zugriffkontrolle auf die hochgeladenen Daten haben, bedeutet das, dass weder der Dienstanbieter noch Regierungen Zugriff auf privat geteilten Daten haben. Die Nutzer haben die alleinige Kontrolle über die Daten und die Bewilligung der Zugriffsberechtigung auf diese. \n"
 
 #. type: Plain text
-#, no-wrap
-msgid "    That means the right to use [[!taglink cryptography]] should never be denied. \n"
+#, fuzzy, no-wrap
+#| msgid "    That means the right to use [[!taglink cryptography]] should never be denied. \n"
+msgid ""
+"    That means the right to use [[!taglink cryptography]] should never be\n"
+"    denied. \n"
 msgstr "    Dies bedeutet, dass das Recht auf das Nutzen von [[!taglink Kryptographie|cryptography]] niemals verwährt werden darf. \n"
 
 #. type: Plain text
@@ -166,10 +177,12 @@ msgstr ""
 msgid ""
 "    When users make data available to others, whether to a restrictive group of\n"
 "    people or to large groups, they should be able to decide under which\n"
-"    permissions they grant access to this data. However, this right is not absolute\n"
-"    and should not extend over others’ rights to use and exploit the data once it\n"
-"    has been made available to them.  What’s more, it does not mean that users\n"
-"    should have the right to impose unfair restrictions to other people. \n"
+"    permissions they grant access to this data. However, this right is not\n"
+"    absolute and should not extend over others’ rights to use and exploit the\n"
+"    data once it has been made available to them.  What’s more, it does not\n"
+"    mean that users should have the right to impose unfair restrictions to\n"
+"    other people and systems should not enforce such restrictions (e.g. through\n"
+"    [[!taglink DRM]]). \n"
 msgstr ""
 
 #. type: Plain text
@@ -180,9 +193,9 @@ msgstr ""
 #. type: Plain text
 #, no-wrap
 msgid ""
-"    Data received, generated, and/or collected from users’ activity while using\n"
-"    the service (e.g. metadata or social graph data) should be made accessible\n"
-"    to them and put under their control. \n"
+"    Data received, generated, and/or collected from user activity or from a\n"
+"    user's device (e.g. metadata or social graph data) should be made\n"
+"    accessible to them and put under their control. \n"
 msgstr ""
 
 #. type: Plain text
@@ -198,18 +211,10 @@ msgstr ""
 #. type: Plain text
 #, no-wrap
 msgid ""
-"    Some services allow users to submit data with the intention to make it publicly\n"
-"    available for all. Even in these cases, some amount of user data is kept\n"
-"    private (e.g. metadata or social graph data). The user should also have control\n"
-"    over this data, because metadata and logging information can be used for\n"
-"    disproportionate surveillance. \n"
-msgstr ""
-
-#. type: Plain text
-#, no-wrap
-msgid ""
-"    That means that service providers must commit to keeping these to a\n"
-"    minimum, and only for the purpose of operating the service.\n"
+"    Some services allow users to submit data with the intention to make it\n"
+"    publicly available for all. Even in these cases, some amount of user data\n"
+"    is kept private (e.g. metadata or social graph data). The user should also\n"
+"    have control over this data.\n"
 msgstr ""
 
 #. type: Bullet: '2. '
@@ -244,9 +249,9 @@ msgstr ""
 #, no-wrap
 msgid ""
 "    When users use centralised services that uploads data to specific storage\n"
-"    providers instead of relying on peer-to-peer systems, it is important to know\n"
-"    where the providers might store data because they could be compelled by\n"
-"    governments to turn over data they have in their possession.\n"
+"    providers instead of relying on peer-to-peer systems, it is important to\n"
+"    know where the providers might store data because they could be compelled\n"
+"    by governments to turn over data they have in their possession.\n"
 msgstr ""
 
 #. type: Plain text
@@ -257,9 +262,9 @@ msgstr ""
 #. type: Plain text
 #, no-wrap
 msgid ""
-"    Users should be free to choose to store their own data on devices (e.g.\n"
-"    servers) in their vicinity and under their direct control. This way, users\n"
-"    do not have to rely on centralised services.\n"
+"    Users should be able to store their own data on devices (e.g.  servers) in\n"
+"    their vicinity and under their direct control. This way, users do not have\n"
+"    to rely on centralised services.\n"
 msgstr ""
 
 #. type: Plain text
@@ -325,9 +330,15 @@ msgstr ""
 #, no-wrap
 msgid ""
 "    [[!taglink Open_standards]] for formats and protocols are necessary to\n"
-"    guarantee this.  Obviously, without the source code of the programs used to\n"
-"    deal with user data, this is impractical.  This is why programs should be\n"
-"    distributed under a \n"
+"    guarantee this.  \n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+"    Obviously, without the source code of the programs used to deal with user\n"
+"    data, this is impractical. This is why programs available to exploit\n"
+"    exported data should be distributed under a \n"
 "    [[!taglink Free_Software_license_like_the_GNU_AGPL-3|Free_Software]].\n"
 msgstr ""
 
@@ -371,7 +382,9 @@ msgid ""
 msgstr ""
 
 #~ msgid "    That also means that a service provider should **not**:\n"
-#~ msgstr "    Dies bedeutet auch, dass der Diensteanbieter folgendes **nicht** darf:\n"
+#~ msgstr ""
+#~ "    Dies bedeutet auch, dass der Diensteanbieter folgendes **nicht** "
+#~ "darf:\n"
 
 #~ msgid "Welcome to your new wiki."
 #~ msgstr "Willkommen in Ihrem neuen Wiki."
diff --git a/index.fr.po b/index.fr.po
index 1ac7a12..0395e67 100644
--- a/index.fr.po
+++ b/index.fr.po
@@ -9,7 +9,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ikiwiki\n"
-"POT-Creation-Date: 2014-11-15 21:09+0000\n"
+"POT-Creation-Date: 2014-11-18 16:34+0000\n"
 "PO-Revision-Date: 2009-08-23 18:50+0200\n"
 "Last-Translator: Philippe Batailler <philippe.batailler@free.fr>\n"
 "Language-Team: French <debian-l10n-french@lists.debian.org>\n"
@@ -78,17 +78,26 @@ msgid "[[!toggle  id=\"userdata\" text=\"×\"]]\n"
 msgstr "    [[!toggle  id=\"wucat\" text=\"×\"]]\n"
 
 #. type: Plain text

(Diff truncated)
clarifying data access and data upload plus free software programs available for data export
diff --git a/index.mdwn b/index.mdwn
index f1e64c7..447a4a9 100644
--- a/index.mdwn
+++ b/index.mdwn
@@ -18,15 +18,14 @@ generated from a user, while using a service on the Internet.</p></li></ol>
 
 [[!toggleable id="userdata" text="""
 [[!toggle  id="userdata" text="×"]]
-<ul style="list-style-type: none;"><li>
 Examples of user data include:
-<ul>
-<li>the files a user is syncing through multiple devices or sharing with a friend</li>
-<li>a library of photos, books or other files a user uploads from their device in order to be able to read, view or modify online</li>
-<li>data generated by a user's device and sent to a server</li>
-<li>a user's search engine queries</li>
-</ul>
-</li></ul>
+
+  - the files a user is syncing through multiple devices or sharing with a
+    friend
+  - a library of photos, books or other files a user uploads from their device
+    in order to be able to read, view or modify online
+  - data generated by a user's device and sent to a server
+  - a user's search engine queries
 """]]
 
 Thus, users should have:
@@ -42,12 +41,12 @@ Thus, users should have:
 
     [[!toggleable id="wucat" text="""
     [[!toggle  id="wucat" text="×"]]
-    When users have control over upload of their data, it means that
-    data intended to be privately shared should not be accessible to the service
-    provider, nor shared with governments.  Users should be the only ones to have
-    ultimate control over it and to grant access to it. 
+    When users have control over upload of their data, data intended to be
+    privately shared should not be accessible to the service provider, nor
+    shared with governments.  
 
-    That means the right to use [[!taglink cryptography]] should never be denied. 
+    That means the right to use [[!taglink cryptography]] should never be
+    denied. 
 
     That also means that when users do not have full control over upload of
     their data (e.g. if they don't use cryptography before uploading) a service
@@ -60,28 +59,26 @@ Thus, users should have:
 
     When users make data available to others, whether to a restrictive group of
     people or to large groups, they should be able to decide under which
-    permissions they grant access to this data. However, this right is not absolute
-    and should not extend over others’ rights to use and exploit the data once it
-    has been made available to them.  What’s more, it does not mean that users
-    should have the right to impose unfair restrictions to other people. 
+    permissions they grant access to this data. However, this right is not
+    absolute and should not extend over others’ rights to use and exploit the
+    data once it has been made available to them.  What’s more, it does not
+    mean that users should have the right to impose unfair restrictions to
+    other people and systems should not enforce such restrictions (e.g. through
+    [[!taglink DRM]]). 
     """]]
 
     [[!toggle  id="ssauts" text="""
-    Data received, generated, and/or collected from users’ activity while using
-    the service (e.g. metadata or social graph data) should be made accessible
-    to them and put under their control. 
+    Data received, generated, and/or collected from user activity or from a
+    user's device (e.g. metadata or social graph data) should be made
+    accessible to them and put under their control. 
     """]]
 
     [[!toggleable id="ssauts" text="""
     [[!toggle  id="ssauts" text="×"]]
-    Some services allow users to submit data with the intention to make it publicly
-    available for all. Even in these cases, some amount of user data is kept
-    private (e.g. metadata or social graph data). The user should also have control
-    over this data, because metadata and logging information can be used for
-    disproportionate surveillance. 
-    
-    That means that service providers must commit to keeping these to a
-    minimum, and only for the purpose of operating the service.
+    Some services allow users to submit data with the intention to make it
+    publicly available for all. Even in these cases, some amount of user data
+    is kept private (e.g. metadata or social graph data). The user should also
+    have control over this data.
     """]]
 
 
@@ -97,15 +94,15 @@ Thus, users should have:
     [[!toggleable id="wuucstu" text="""
     [[!toggle  id="wuucstu" text="×"]]
     When users use centralised services that uploads data to specific storage
-    providers instead of relying on peer-to-peer systems, it is important to know
-    where the providers might store data because they could be compelled by
-    governments to turn over data they have in their possession.
+    providers instead of relying on peer-to-peer systems, it is important to
+    know where the providers might store data because they could be compelled
+    by governments to turn over data they have in their possession.
     """]]
 
     [[!toggle  id="usnroc" text="""
-    Users should be free to choose to store their own data on devices (e.g.
-    servers) in their vicinity and under their direct control. This way, users
-    do not have to rely on centralised services.
+    Users should be able to store their own data on devices (e.g.  servers) in
+    their vicinity and under their direct control. This way, users do not have
+    to rely on centralised services.
     """]]
 
 
@@ -133,9 +130,11 @@ Thus, users should have:
     they should always be able to leave a platform and settle elsewhere.
 
     [[!taglink Open_standards]] for formats and protocols are necessary to
-    guarantee this.  Obviously, without the source code of the programs used to
-    deal with user data, this is impractical.  This is why programs should be
-    distributed under a 
+    guarantee this.  
+    
+    Obviously, without the source code of the programs used to deal with user
+    data, this is impractical. This is why programs available to exploit
+    exported data should be distributed under a 
     [[!taglink Free_Software_license_like_the_GNU_AGPL-3|Free_Software]].
     """]]
 

updated PO files
diff --git a/index.de.po b/index.de.po
index b925773..725e373 100644
--- a/index.de.po
+++ b/index.de.po
@@ -4,7 +4,7 @@
 # modification, are permitted under any circumstances. No warranty.
 msgid ""
 msgstr ""
-"POT-Creation-Date: 2014-11-15 15:47+0000\n"
+"POT-Creation-Date: 2014-11-15 21:09+0000\n"
 "PO-Revision-Date: 2010-03-12 09:40+0530\n"
 "Last-Translator: Sebastian Kuhnert <mail@sebastian-kuhnert.de>\n"
 "Language-Team: None\n"
@@ -123,9 +123,14 @@ msgid "    [[!toggle  id=\"wucat\" text=\"×\"]]\n"
 msgstr ""
 
 #. type: Plain text
-#, no-wrap
+#, fuzzy, no-wrap
+#| msgid ""
+#| "    When users control access to the data they upload, it means that\n"
+#| "    data intended to be privately shared should not be accessible to the service\n"
+#| "    provider, nor shared with governments.  Users should be the only ones to have\n"
+#| "    ultimate control over it and to grant access to it. \n"
 msgid ""
-"    When users control access to the data they upload, it means that\n"
+"    When users have control over upload of their data, it means that\n"
 "    data intended to be privately shared should not be accessible to the service\n"
 "    provider, nor shared with governments.  Users should be the only ones to have\n"
 "    ultimate control over it and to grant access to it. \n"
@@ -138,8 +143,11 @@ msgstr "    Dies bedeutet, dass das Recht auf das Nutzen von [[!taglink Kryptogr
 
 #. type: Plain text
 #, no-wrap
-msgid "    That also means that a service provider should **not**:\n"
-msgstr "    Dies bedeutet auch, dass der Diensteanbieter folgendes **nicht** darf:\n"
+msgid ""
+"    That also means that when users do not have full control over upload of\n"
+"    their data (e.g. if they don't use cryptography before uploading) a service\n"
+"    provider should **not**:\n"
+msgstr ""
 
 #. type: Bullet: '     1. '
 msgid ""
@@ -362,6 +370,9 @@ msgid ""
 "defined in this manifesto."
 msgstr ""
 
+#~ msgid "    That also means that a service provider should **not**:\n"
+#~ msgstr "    Dies bedeutet auch, dass der Diensteanbieter folgendes **nicht** darf:\n"
+
 #~ msgid "Welcome to your new wiki."
 #~ msgstr "Willkommen in Ihrem neuen Wiki."
 
diff --git a/index.fr.po b/index.fr.po
index 9d93786..1ac7a12 100644
--- a/index.fr.po
+++ b/index.fr.po
@@ -9,7 +9,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ikiwiki\n"
-"POT-Creation-Date: 2014-11-15 15:47+0000\n"
+"POT-Creation-Date: 2014-11-15 21:09+0000\n"
 "PO-Revision-Date: 2009-08-23 18:50+0200\n"
 "Last-Translator: Philippe Batailler <philippe.batailler@free.fr>\n"
 "Language-Team: French <debian-l10n-french@lists.debian.org>\n"
@@ -124,9 +124,14 @@ msgid "    [[!toggle  id=\"wucat\" text=\"×\"]]\n"
 msgstr "    [[!toggle  id=\"wucat\" text=\"×\"]]\n"
 
 #. type: Plain text
-#, no-wrap
+#, fuzzy, no-wrap
+#| msgid ""
+#| "    When users control access to the data they upload, it means that\n"
+#| "    data intended to be privately shared should not be accessible to the service\n"
+#| "    provider, nor shared with governments.  Users should be the only ones to have\n"
+#| "    ultimate control over it and to grant access to it. \n"
 msgid ""
-"    When users control access to the data they upload, it means that\n"
+"    When users have control over upload of their data, it means that\n"
 "    data intended to be privately shared should not be accessible to the service\n"
 "    provider, nor shared with governments.  Users should be the only ones to have\n"
 "    ultimate control over it and to grant access to it. \n"
@@ -139,8 +144,11 @@ msgstr "    Cela signifie que le droit d’utiliser [[!taglink la_cryptographie|
 
 #. type: Plain text
 #, no-wrap
-msgid "    That also means that a service provider should **not**:\n"
-msgstr "Cela signifie également qu’un fournisseur de service devrait **ne pas** :"
+msgid ""
+"    That also means that when users do not have full control over upload of\n"
+"    their data (e.g. if they don't use cryptography before uploading) a service\n"
+"    provider should **not**:\n"
+msgstr ""
 
 #. type: Bullet: '     1. '
 msgid ""
@@ -408,6 +416,9 @@ msgstr ""
 "possibilité d’exercer les [[!taglink droits_des_données|datarights]] définis "
 "dans ce manifeste."
 
+#~ msgid "    That also means that a service provider should **not**:\n"
+#~ msgstr "Cela signifie également qu’un fournisseur de service devrait **ne pas** :"
+
 #~ msgid "Welcome to your new wiki."
 #~ msgstr "Bienvenue sur votre nouveau wiki."
 
diff --git a/index.ja.po b/index.ja.po
index 4a1c388..5fcc19f 100644
--- a/index.ja.po
+++ b/index.ja.po
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2014-11-15 15:47+0000\n"
+"POT-Creation-Date: 2014-11-15 21:09+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -124,7 +124,7 @@ msgstr ""
 #. type: Plain text
 #, no-wrap
 msgid ""
-"    When users control access to the data they upload, it means that\n"
+"    When users have control over upload of their data, it means that\n"
 "    data intended to be privately shared should not be accessible to the service\n"
 "    provider, nor shared with governments.  Users should be the only ones to have\n"
 "    ultimate control over it and to grant access to it. \n"
@@ -137,7 +137,10 @@ msgstr ""
 
 #. type: Plain text
 #, no-wrap
-msgid "    That also means that a service provider should **not**:\n"
+msgid ""
+"    That also means that when users do not have full control over upload of\n"
+"    their data (e.g. if they don't use cryptography before uploading) a service\n"
+"    provider should **not**:\n"
 msgstr ""
 
 #. type: Bullet: '     1. '
diff --git a/index.tr.po b/index.tr.po
index 203e158..d197982 100644
--- a/index.tr.po
+++ b/index.tr.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ikiwiki\n"
-"POT-Creation-Date: 2014-11-15 15:47+0000\n"
+"POT-Creation-Date: 2014-11-15 21:09+0000\n"
 "PO-Revision-Date: 2014-10-12 09:25+0200\n"
 "Last-Translator: T. E. KALAYCI <tekrei@fsfe.org>\n"
 "Language-Team: Turkish\n"
@@ -123,9 +123,14 @@ msgid "    [[!toggle  id=\"wucat\" text=\"×\"]]\n"
 msgstr "    [[!toggle  id=\"wucat\" text=\"×\"]]\n"
 
 #. type: Plain text
-#, no-wrap
+#, fuzzy, no-wrap
+#| msgid ""
+#| "    When users control access to the data they upload, it means that\n"
+#| "    data intended to be privately shared should not be accessible to the service\n"
+#| "    provider, nor shared with governments.  Users should be the only ones to have\n"
+#| "    ultimate control over it and to grant access to it. \n"
 msgid ""
-"    When users control access to the data they upload, it means that\n"
+"    When users have control over upload of their data, it means that\n"
 "    data intended to be privately shared should not be accessible to the service\n"
 "    provider, nor shared with governments.  Users should be the only ones to have\n"
 "    ultimate control over it and to grant access to it. \n"
@@ -142,8 +147,11 @@ msgstr "    Bu [[!taglink şifreleme|cryptography]] kullanma hakkının hiç bir
 
 #. type: Plain text
 #, no-wrap
-msgid "    That also means that a service provider should **not**:\n"
-msgstr "    Bu ayrıca hizmet sağlayıcının aşağıdakileri **yapmaması** gerektiği anlamına da gelir:\n"
+msgid ""
+"    That also means that when users do not have full control over upload of\n"
+"    their data (e.g. if they don't use cryptography before uploading) a service\n"
+"    provider should **not**:\n"
+msgstr ""
 
 #. type: Bullet: '     1. '
 msgid ""
@@ -455,3 +463,6 @@ msgstr ""
 "olarak bu, hizmet şartlarının kullanıcıların haklarına saygı göstermesi ve "
 "onlara bu bildirgede tanımlanmış olan [[!taglink veri_haklarını|datarights]] "
 "uygulama olanağını sunması gerektiği anlamına gelir."
+
+#~ msgid "    That also means that a service provider should **not**:\n"
+#~ msgstr "    Bu ayrıca hizmet sağlayıcının aşağıdakileri **yapmaması** gerektiği anlamına da gelir:\n"

trying to clear things regarding encryption and data access re the provider of the service
diff --git a/index.mdwn b/index.mdwn
index 066b6f7..f1e64c7 100644
--- a/index.mdwn
+++ b/index.mdwn
@@ -42,14 +42,16 @@ Thus, users should have:
 
     [[!toggleable id="wucat" text="""
     [[!toggle  id="wucat" text="×"]]
-    When users control access to the data they upload, it means that
+    When users have control over upload of their data, it means that
     data intended to be privately shared should not be accessible to the service
     provider, nor shared with governments.  Users should be the only ones to have
     ultimate control over it and to grant access to it. 
 
     That means the right to use [[!taglink cryptography]] should never be denied. 
 
-    That also means that a service provider should **not**:
+    That also means that when users do not have full control over upload of
+    their data (e.g. if they don't use cryptography before uploading) a service
+    provider should **not**:
      
      1. force users to disclose private data (including private correspondence)
         with them, nor

no tag
diff --git a/tags/person.de.po b/tags/person.de.po
deleted file mode 100644
index fbb34c5..0000000
--- a/tags/person.de.po
+++ /dev/null
@@ -1,29 +0,0 @@
-# SOME DESCRIPTIVE TITLE
-# Copyright (C) YEAR Free Software Foundation, Inc.
-# This file is distributed under the same license as the PACKAGE package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-#, fuzzy
-msgid ""
-msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2014-11-06 19:04+0000\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-
-#. type: Plain text
-#, no-wrap
-msgid "[[!meta title=\"pages tagged person\"]]\n"
-msgstr ""
-
-#. type: Plain text
-#, no-wrap
-msgid ""
-"[[!inline pages=\"tagged(person)\" actions=\"no\" archive=\"yes\"\n"
-"feedshow=10]]\n"
-msgstr ""
diff --git a/tags/person.fr.po b/tags/person.fr.po
deleted file mode 100644
index fbb34c5..0000000
--- a/tags/person.fr.po
+++ /dev/null
@@ -1,29 +0,0 @@
-# SOME DESCRIPTIVE TITLE
-# Copyright (C) YEAR Free Software Foundation, Inc.
-# This file is distributed under the same license as the PACKAGE package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-#, fuzzy
-msgid ""
-msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2014-11-06 19:04+0000\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-
-#. type: Plain text
-#, no-wrap
-msgid "[[!meta title=\"pages tagged person\"]]\n"
-msgstr ""
-
-#. type: Plain text
-#, no-wrap
-msgid ""
-"[[!inline pages=\"tagged(person)\" actions=\"no\" archive=\"yes\"\n"
-"feedshow=10]]\n"
-msgstr ""
diff --git a/tags/person.ja.po b/tags/person.ja.po
deleted file mode 100644
index fbb34c5..0000000
--- a/tags/person.ja.po
+++ /dev/null
@@ -1,29 +0,0 @@
-# SOME DESCRIPTIVE TITLE
-# Copyright (C) YEAR Free Software Foundation, Inc.
-# This file is distributed under the same license as the PACKAGE package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-#, fuzzy
-msgid ""
-msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2014-11-06 19:04+0000\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-
-#. type: Plain text
-#, no-wrap
-msgid "[[!meta title=\"pages tagged person\"]]\n"
-msgstr ""
-
-#. type: Plain text
-#, no-wrap
-msgid ""
-"[[!inline pages=\"tagged(person)\" actions=\"no\" archive=\"yes\"\n"
-"feedshow=10]]\n"
-msgstr ""
diff --git a/tags/person.mdwn b/tags/person.mdwn
deleted file mode 100644
index d3b7dfa..0000000
--- a/tags/person.mdwn
+++ /dev/null
@@ -1,4 +0,0 @@
-[[!meta title="pages tagged person"]]
-
-[[!inline pages="tagged(person)" actions="no" archive="yes"
-feedshow=10]]
diff --git a/tags/person.tr.po b/tags/person.tr.po
deleted file mode 100644
index fbb34c5..0000000
--- a/tags/person.tr.po
+++ /dev/null
@@ -1,29 +0,0 @@
-# SOME DESCRIPTIVE TITLE
-# Copyright (C) YEAR Free Software Foundation, Inc.
-# This file is distributed under the same license as the PACKAGE package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-#, fuzzy
-msgid ""
-msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2014-11-06 19:04+0000\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-
-#. type: Plain text
-#, no-wrap
-msgid "[[!meta title=\"pages tagged person\"]]\n"
-msgstr ""
-
-#. type: Plain text
-#, no-wrap
-msgid ""
-"[[!inline pages=\"tagged(person)\" actions=\"no\" archive=\"yes\"\n"
-"feedshow=10]]\n"
-msgstr ""

updated PO files
diff --git a/index.de.po b/index.de.po
index 1154043..b925773 100644
--- a/index.de.po
+++ b/index.de.po
@@ -4,7 +4,7 @@
 # modification, are permitted under any circumstances. No warranty.
 msgid ""
 msgstr ""
-"POT-Creation-Date: 2014-11-03 15:42+0000\n"
+"POT-Creation-Date: 2014-11-15 15:47+0000\n"
 "PO-Revision-Date: 2010-03-12 09:40+0530\n"
 "Last-Translator: Sebastian Kuhnert <mail@sebastian-kuhnert.de>\n"
 "Language-Team: None\n"
@@ -46,14 +46,47 @@ msgstr ""
 
 #. type: Plain text
 #, no-wrap
+msgid "[[!toggle  id=\"userdata\" text=\"\"\"\n"
+msgstr ""
+
+#. type: Plain text
+#, fuzzy, no-wrap
+#| msgid ""
+#| "<ol start=\"0\"><li><strong>User data</strong> means any data uploaded by a user and/or\n"
+#| "generated from a user, while using a service on the Internet. </li></ol>\n"
 msgid ""
-"<ol start=\"0\"><li><strong>User data</strong> means any data uploaded by a user and/or\n"
-"generated from a user, while using a service on the Internet. </li></ol>\n"
+"<ol start=\"0\"><li><p><strong>User data</strong> means any data uploaded by a user and/or\n"
+"generated from a user, while using a service on the Internet.</p></li></ol>\n"
 msgstr ""
 "<ol start=\"0\"><li><strong>Nutzerdaten</strong> bezeichnet alle Daten, die ein Nutzer hochgeladen und/oder\n"
 "von einem Nutzer generiert wurden, während er einen Dienst im Internet nutzte. </li></ol>\n"
 
 #. type: Plain text
+#, no-wrap
+msgid "[[!toggleable id=\"userdata\" text=\"\"\"\n"
+msgstr ""
+
+#. type: Plain text
+#, fuzzy, no-wrap
+#| msgid "[[!meta title=\"user data manifesto\"]]\n"
+msgid "[[!toggle  id=\"userdata\" text=\"×\"]]\n"
+msgstr "[[!meta title=\"User Data Manifesto\"]]\n"
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+"<ul style=\"list-style-type: none;\"><li>\n"
+"Examples of user data include:\n"
+"<ul>\n"
+"<li>the files a user is syncing through multiple devices or sharing with a friend</li>\n"
+"<li>a library of photos, books or other files a user uploads from their device in order to be able to read, view or modify online</li>\n"
+"<li>data generated by a user's device and sent to a server</li>\n"
+"<li>a user's search engine queries</li>\n"
+"</ul>\n"
+"</li></ul>\n"
+msgstr ""
+
+#. type: Plain text
 msgid "Thus, users should have:"
 msgstr "Deswegen sollte jeder Nutzer folgendes haben:"
 
@@ -141,9 +174,7 @@ msgstr ""
 msgid ""
 "    Data received, generated, and/or collected from users’ activity while using\n"
 "    the service (e.g. metadata or social graph data) should be made accessible\n"
-"    to them and put under their control as well. If this control can’t be\n"
-"    given, then this type of data should be anonymous or not stored for\n"
-"    periods longer than necessary.\n"
+"    to them and put under their control. \n"
 msgstr ""
 
 #. type: Plain text
@@ -186,9 +217,9 @@ msgstr ""
 #, no-wrap
 msgid ""
 "    When the data is uploaded to a specific service provider, users should be\n"
-"    informed about where that specific service provider stores the data, how\n"
-"    long, in which jurisdiction the specific service provider operates, and\n"
-"    which laws apply.\n"
+"    informed about the geographic location that specific service provider\n"
+"    stores the data in, how long, in which jurisdiction the specific service\n"
+"    provider operates and which laws apply.\n"
 msgstr ""
 
 #. type: Plain text
@@ -311,8 +342,7 @@ msgstr ""
 msgid ""
 "Surrendering privacy and other rights in this way may seem to many people a "
 "trivial thing and a small price to pay for the sake of convenience that "
-"these Internet services bring. This has made this kind of exchange to become "
-"common."
+"these Internet services bring."
 msgstr ""
 
 #. type: Plain text
diff --git a/index.fr.po b/index.fr.po
index 6013ac3..9d93786 100644
--- a/index.fr.po
+++ b/index.fr.po
@@ -9,7 +9,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ikiwiki\n"
-"POT-Creation-Date: 2014-11-03 15:42+0000\n"
+"POT-Creation-Date: 2014-11-15 15:47+0000\n"
 "PO-Revision-Date: 2009-08-23 18:50+0200\n"
 "Last-Translator: Philippe Batailler <philippe.batailler@free.fr>\n"
 "Language-Team: French <debian-l10n-french@lists.debian.org>\n"
@@ -50,13 +50,48 @@ msgstr ""
 "allégeance aux fournisseurs de service."
 
 #. type: Plain text
-#, no-wrap
+#, fuzzy, no-wrap
+#| msgid "    [[!toggle  id=\"wucat\" text=\"\"\"\n"
+msgid "[[!toggle  id=\"userdata\" text=\"\"\"\n"
+msgstr "    [[!toggle  id=\"wucat\" text=\"\"\"\n"
+
+#. type: Plain text
+#, fuzzy, no-wrap
+#| msgid ""
+#| "<ol start=\"0\"><li><strong>User data</strong> means any data uploaded by a user and/or\n"
+#| "generated from a user, while using a service on the Internet. </li></ol>\n"
 msgid ""
-"<ol start=\"0\"><li><strong>User data</strong> means any data uploaded by a user and/or\n"
-"generated from a user, while using a service on the Internet. </li></ol>\n"
+"<ol start=\"0\"><li><p><strong>User data</strong> means any data uploaded by a user and/or\n"
+"generated from a user, while using a service on the Internet.</p></li></ol>\n"
 msgstr "<ol start=\"0\"><li>Par <strong>données utilisateur</strong>, on entend les données envoyées par un utilisateur et/ou générées depuis une utilisatrice, au moyen de l’utilisation d’un service sur Internet.</li></ol>\n"
 
 #. type: Plain text
+#, fuzzy, no-wrap
+#| msgid "    [[!toggleable id=\"wucat\" text=\"\"\"\n"
+msgid "[[!toggleable id=\"userdata\" text=\"\"\"\n"
+msgstr "    [[!toggleable id=\"wucat\" text=\"\"\"\n"
+
+#. type: Plain text
+#, fuzzy, no-wrap
+#| msgid "    [[!toggle  id=\"wucat\" text=\"×\"]]\n"
+msgid "[[!toggle  id=\"userdata\" text=\"×\"]]\n"
+msgstr "    [[!toggle  id=\"wucat\" text=\"×\"]]\n"
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+"<ul style=\"list-style-type: none;\"><li>\n"
+"Examples of user data include:\n"
+"<ul>\n"
+"<li>the files a user is syncing through multiple devices or sharing with a friend</li>\n"
+"<li>a library of photos, books or other files a user uploads from their device in order to be able to read, view or modify online</li>\n"
+"<li>data generated by a user's device and sent to a server</li>\n"
+"<li>a user's search engine queries</li>\n"
+"</ul>\n"
+"</li></ul>\n"
+msgstr ""
+
+#. type: Plain text
 msgid "Thus, users should have:"
 msgstr "Ainsi, les utilisateurs devraient pouvoir :"
 
@@ -141,13 +176,17 @@ msgid "    [[!toggle  id=\"ssauts\" text=\"\"\"\n"
 msgstr "    [[!toggle  id=\"ssauts\" text=\"\"\"\n"
 
 #. type: Plain text
-#, no-wrap
+#, fuzzy, no-wrap
+#| msgid ""
+#| "    Data received, generated, and/or collected from users’ activity while using\n"
+#| "    the service (e.g. metadata or social graph data) should be made accessible\n"
+#| "    to them and put under their control as well. If this control can’t be\n"
+#| "    given, then this type of data should be anonymous or not stored for\n"
+#| "    periods longer than necessary.\n"
 msgid ""
 "    Data received, generated, and/or collected from users’ activity while using\n"
 "    the service (e.g. metadata or social graph data) should be made accessible\n"
-"    to them and put under their control as well. If this control can’t be\n"
-"    given, then this type of data should be anonymous or not stored for\n"
-"    periods longer than necessary.\n"
+"    to them and put under their control. \n"
 msgstr "    Les données reçues, générées et/ou collectées à partir de l’activité des utilisateurs dans l’utilisation du service (ex. : les métadonnées ou les données du graphe social) devraient leur être rendues accessibles et être également sous leur maîtrise. Si cette maîtrise n’est pas possible, alors ce type de données devrait être anonyme ou bien ne pas être stockée pour une période plus longue que nécessaire."
 
 #. type: Plain text
@@ -187,12 +226,17 @@ msgid "    [[!toggle  id=\"wuucstu\" text=\"\"\"\n"
 msgstr "    [[!toggle  id=\"wuucstu\" text=\"\"\"\n"
 
 #. type: Plain text
-#, no-wrap
+#, fuzzy, no-wrap
+#| msgid ""
+#| "    When the data is uploaded to a specific service provider, users should be\n"
+#| "    informed about where that specific service provider stores the data, how\n"
+#| "    long, in which jurisdiction the specific service provider operates, and\n"
+#| "    which laws apply.\n"
 msgid ""
 "    When the data is uploaded to a specific service provider, users should be\n"
-"    informed about where that specific service provider stores the data, how\n"
-"    long, in which jurisdiction the specific service provider operates, and\n"
-"    which laws apply.\n"

(Diff truncated)
feedback from eff
diff --git a/index.mdwn b/index.mdwn
index 629448d..066b6f7 100644
--- a/index.mdwn
+++ b/index.mdwn
@@ -11,8 +11,23 @@ This manifesto aims at defining users’ fundamental
 [[!taglink rights_to_their_own_data|datarights]] in the Internet age. People
 ought to be free and should not have to pay allegiance to service providers. 
 
-<ol start="0"><li><strong>User data</strong> means any data uploaded by a user and/or
-generated from a user, while using a service on the Internet. </li></ol>
+[[!toggle  id="userdata" text="""
+<ol start="0"><li><p><strong>User data</strong> means any data uploaded by a user and/or
+generated from a user, while using a service on the Internet.</p></li></ol>
+"""]]
+
+[[!toggleable id="userdata" text="""
+[[!toggle  id="userdata" text="×"]]
+<ul style="list-style-type: none;"><li>
+Examples of user data include:
+<ul>
+<li>the files a user is syncing through multiple devices or sharing with a friend</li>
+<li>a library of photos, books or other files a user uploads from their device in order to be able to read, view or modify online</li>
+<li>data generated by a user's device and sent to a server</li>
+<li>a user's search engine queries</li>
+</ul>
+</li></ul>
+"""]]
 
 Thus, users should have:
 
@@ -52,9 +67,7 @@ Thus, users should have:
     [[!toggle  id="ssauts" text="""
     Data received, generated, and/or collected from users’ activity while using
     the service (e.g. metadata or social graph data) should be made accessible
-    to them and put under their control as well. If this control can’t be
-    given, then this type of data should be anonymous or not stored for
-    periods longer than necessary.
+    to them and put under their control. 
     """]]
 
     [[!toggleable id="ssauts" text="""
@@ -74,9 +87,9 @@ Thus, users should have:
 
     [[!toggle  id="wuucstu" text="""
     When the data is uploaded to a specific service provider, users should be
-    informed about where that specific service provider stores the data, how
-    long, in which jurisdiction the specific service provider operates, and
-    which laws apply.
+    informed about the geographic location that specific service provider
+    stores the data in, how long, in which jurisdiction the specific service
+    provider operates and which laws apply.
     """]]
 
     [[!toggleable id="wuucstu" text="""
@@ -136,7 +149,7 @@ them or building a profile for advertisers).
 
 Surrendering privacy and other rights in this way may seem to many people a
 trivial thing and a small price to pay for the sake of convenience that these
-Internet services bring. This has made this kind of exchange to become common.
+Internet services bring. 
 
 Service providers have thus been unwittingly compelled to turn their valuable
 Internet services into massive and centralised surveillance systems. It is of

updated PO files
diff --git a/tags/person.de.po b/tags/person.de.po
new file mode 100644
index 0000000..fbb34c5
--- /dev/null
+++ b/tags/person.de.po
@@ -0,0 +1,29 @@
+# SOME DESCRIPTIVE TITLE
+# Copyright (C) YEAR Free Software Foundation, Inc.
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"POT-Creation-Date: 2014-11-06 19:04+0000\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#. type: Plain text
+#, no-wrap
+msgid "[[!meta title=\"pages tagged person\"]]\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+"[[!inline pages=\"tagged(person)\" actions=\"no\" archive=\"yes\"\n"
+"feedshow=10]]\n"
+msgstr ""
diff --git a/tags/person.fr.po b/tags/person.fr.po
new file mode 100644
index 0000000..fbb34c5
--- /dev/null
+++ b/tags/person.fr.po
@@ -0,0 +1,29 @@
+# SOME DESCRIPTIVE TITLE
+# Copyright (C) YEAR Free Software Foundation, Inc.
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"POT-Creation-Date: 2014-11-06 19:04+0000\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#. type: Plain text
+#, no-wrap
+msgid "[[!meta title=\"pages tagged person\"]]\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+"[[!inline pages=\"tagged(person)\" actions=\"no\" archive=\"yes\"\n"
+"feedshow=10]]\n"
+msgstr ""
diff --git a/tags/person.ja.po b/tags/person.ja.po
new file mode 100644
index 0000000..fbb34c5
--- /dev/null
+++ b/tags/person.ja.po
@@ -0,0 +1,29 @@
+# SOME DESCRIPTIVE TITLE
+# Copyright (C) YEAR Free Software Foundation, Inc.
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"POT-Creation-Date: 2014-11-06 19:04+0000\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#. type: Plain text
+#, no-wrap
+msgid "[[!meta title=\"pages tagged person\"]]\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+"[[!inline pages=\"tagged(person)\" actions=\"no\" archive=\"yes\"\n"
+"feedshow=10]]\n"
+msgstr ""
diff --git a/tags/person.tr.po b/tags/person.tr.po
new file mode 100644
index 0000000..fbb34c5
--- /dev/null
+++ b/tags/person.tr.po
@@ -0,0 +1,29 @@
+# SOME DESCRIPTIVE TITLE
+# Copyright (C) YEAR Free Software Foundation, Inc.
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"POT-Creation-Date: 2014-11-06 19:04+0000\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#. type: Plain text
+#, no-wrap
+msgid "[[!meta title=\"pages tagged person\"]]\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+"[[!inline pages=\"tagged(person)\" actions=\"no\" archive=\"yes\"\n"
+"feedshow=10]]\n"
+msgstr ""

creating tag page tags/person
diff --git a/tags/person.mdwn b/tags/person.mdwn
new file mode 100644
index 0000000..d3b7dfa
--- /dev/null
+++ b/tags/person.mdwn
@@ -0,0 +1,4 @@
+[[!meta title="pages tagged person"]]
+
+[[!inline pages="tagged(person)" actions="no" archive="yes"
+feedshow=10]]

French translation updated
diff --git a/index.fr.po b/index.fr.po
index e81d02d..6013ac3 100644
--- a/index.fr.po
+++ b/index.fr.po
@@ -238,17 +238,13 @@ msgid "    [[!toggle  id=\"usnroc\" text=\"×\"]]\n"
 msgstr "    [[!toggle  id=\"usnroc\" text=\"×\"]]\n"
 
 #. type: Plain text
-#, fuzzy, no-wrap
-#| msgid ""
-#| "    Users should not rely on centralised services. Peer-to-peer systems and\n"
-#| "    unhosted applications are a means to that end.  In the long term, all users\n"
-#| "    should be able to have their own server.  \n"
+#, no-wrap
 msgid ""
 "    Users should not rely on centralised services. Peer-to-peer systems and\n"
 "    unhosted applications are a means to that end.  In the long term, all users\n"
 "    should be able to have their own server with\n"
 "    [[!taglink Free_Software]].\n"
-msgstr "    Les utilisateurs ne devraient pas reposer sur des services centralisés. Les systèmes pair-à-pair et les applications *unhosted* sont un moyen d’y arriver. À long terme, tous les utilisateurs devraient être capables d’avoir leur propre serveur."
+msgstr "    Les utilisateurs ne devraient pas reposer sur des services centralisés. Les systèmes pair-à-pair et les applications *unhosted* sont un moyen d’y arriver. À long terme, tous les utilisateurs devraient être capables d’avoir leur propre serveur avec [[!taglink du_logiciel_libre|Free_Software]]."
 
 #. type: Plain text
 #, no-wrap

sidebar conflict
Turkish translation
diff --git a/templates/translation-notice.tmpl b/templates/translation-notice.tmpl
index d253952..db819ab 100644
--- a/templates/translation-notice.tmpl
+++ b/templates/translation-notice.tmpl
@@ -22,9 +22,9 @@
 </TMPL_IF>
 
 <TMPL_IF TURKISH>
-<TMPL_IF TODO><span class="translation notice">To translate this page, <a href="https://github.com/userdatamanifesto/www/blob/master/<TMPL_VAR GHSRC>">edit the source</a>. Thanks!</span></TMPL_IF>
-<TMPL_IF DOING><span class="translation notice">This page is an ongoing translation. The <a href="index.en.html">original page is in English</a>. To contribute to this translation, <a href="https://github.com/userdatamanifesto/www/blob/master/<TMPL_VAR GHSRC>">edit the source</a>.</span></TMPL_IF>
-<TMPL_IF DONE><span class="translation notice">This page is a translation. The <a href="index.en.html">original is in ENglish</a>.</span></TMPL_IF>
+<TMPL_IF TODO><span class="translation notice">Bu sayfayı çevirmek için, <a href="https://github.com/userdatamanifesto/www/blob/master/<TMPL_VAR GHSRC>">kaynak kodu düzenleyebilirsiniz</a>. Teşekkürler!</span></TMPL_IF>
+<TMPL_IF DOING><span class="translation notice">Bu sayfanın çevirisi devam etmektedir. <a href="index.en.html">Sayfanın aslı İngilizce'dir</a>. Çeviriye katkıda bulunmak için, <a href="https://github.com/userdatamanifesto/www/blob/master/<TMPL_VAR GHSRC>">kaynak kodu düzenleyebilirsiniz</a>.</span></TMPL_IF>
+<TMPL_IF DONE><span class="translation notice">Bu sayfa bir çeviridir. <a href="index.en.html">Sayfanın aslı İngilizce'dir</a>.</span></TMPL_IF>
 </TMPL_IF>
 
 <TMPL_IF JAPANESE>

Turkish translation
diff --git a/sidebar.tr.po b/sidebar.tr.po
index 3d8cd21..6af70b3 100644
--- a/sidebar.tr.po
+++ b/sidebar.tr.po
@@ -8,10 +8,10 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "POT-Creation-Date: 2014-11-03 15:24+0000\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: \n"
+"PO-Revision-Date: 2014-11-05 14:53+0200\n"
+"Last-Translator: T. E. KALAYCI <tekrei@fsfe.org>\n"
+"Language-Team: Turkish\n"
+"Language: tr\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -26,3 +26,9 @@ msgid ""
 "<li><a href=\"/ikiwiki.cgi?P=\">Search</a></li>\n"
 "</ul>\n"
 msgstr ""
+"<ul class=\"nav\" role=\"menu\">\n"
+"<li>[[Viki hakkında|about]]</li>\n"
+"<li>[[Sık Sorulan Sorular|faq]]</li>\n"
+"<li>[[Tartışma|Discussion/]]</li>\n"
+"<li><a href=\"/ikiwiki.cgi?P=\">Arama</a></li>\n"
+"</ul>\n"

no translating this
diff --git a/recentchanges/discussion.de.po b/recentchanges/discussion.de.po
deleted file mode 100644
index 32a07b4..0000000
--- a/recentchanges/discussion.de.po
+++ /dev/null
@@ -1,26 +0,0 @@
-# SOME DESCRIPTIVE TITLE
-# Copyright (C) YEAR Free Software Foundation, Inc.
-# This file is distributed under the same license as the PACKAGE package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-#, fuzzy
-msgid ""
-msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2014-11-03 15:49+0000\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-
-#. type: Plain text
-#, no-wrap
-msgid ""
-"DaeUYE  <a href=\"http://ifdsqoenqaxq.com/\">ifdsqoenqaxq</a>, "
-"[url=http://ygvbkbnsltuw.com/]ygvbkbnsltuw[/url], "
-"[link=http://xomigmbveiqx.com/]xomigmbveiqx[/link], "
-"http://rklsztjodirv.com/\n"
-msgstr ""
diff --git a/recentchanges/discussion.fr.po b/recentchanges/discussion.fr.po
deleted file mode 100644
index 32a07b4..0000000
--- a/recentchanges/discussion.fr.po
+++ /dev/null
@@ -1,26 +0,0 @@
-# SOME DESCRIPTIVE TITLE
-# Copyright (C) YEAR Free Software Foundation, Inc.
-# This file is distributed under the same license as the PACKAGE package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-#, fuzzy
-msgid ""
-msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2014-11-03 15:49+0000\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-
-#. type: Plain text
-#, no-wrap
-msgid ""
-"DaeUYE  <a href=\"http://ifdsqoenqaxq.com/\">ifdsqoenqaxq</a>, "
-"[url=http://ygvbkbnsltuw.com/]ygvbkbnsltuw[/url], "
-"[link=http://xomigmbveiqx.com/]xomigmbveiqx[/link], "
-"http://rklsztjodirv.com/\n"
-msgstr ""
diff --git a/recentchanges/discussion.ja.po b/recentchanges/discussion.ja.po
deleted file mode 100644
index 32a07b4..0000000
--- a/recentchanges/discussion.ja.po
+++ /dev/null
@@ -1,26 +0,0 @@
-# SOME DESCRIPTIVE TITLE
-# Copyright (C) YEAR Free Software Foundation, Inc.
-# This file is distributed under the same license as the PACKAGE package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-#, fuzzy
-msgid ""
-msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2014-11-03 15:49+0000\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-
-#. type: Plain text
-#, no-wrap
-msgid ""
-"DaeUYE  <a href=\"http://ifdsqoenqaxq.com/\">ifdsqoenqaxq</a>, "
-"[url=http://ygvbkbnsltuw.com/]ygvbkbnsltuw[/url], "
-"[link=http://xomigmbveiqx.com/]xomigmbveiqx[/link], "
-"http://rklsztjodirv.com/\n"
-msgstr ""
diff --git a/recentchanges/discussion.tr.po b/recentchanges/discussion.tr.po
deleted file mode 100644
index 32a07b4..0000000
--- a/recentchanges/discussion.tr.po
+++ /dev/null
@@ -1,26 +0,0 @@
-# SOME DESCRIPTIVE TITLE
-# Copyright (C) YEAR Free Software Foundation, Inc.
-# This file is distributed under the same license as the PACKAGE package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-#, fuzzy
-msgid ""
-msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2014-11-03 15:49+0000\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-
-#. type: Plain text
-#, no-wrap
-msgid ""
-"DaeUYE  <a href=\"http://ifdsqoenqaxq.com/\">ifdsqoenqaxq</a>, "
-"[url=http://ygvbkbnsltuw.com/]ygvbkbnsltuw[/url], "
-"[link=http://xomigmbveiqx.com/]xomigmbveiqx[/link], "
-"http://rklsztjodirv.com/\n"
-msgstr ""

updated PO files
diff --git a/Discussion/English.de.po b/Discussion/English.de.po
new file mode 100644
index 0000000..5969539
--- /dev/null
+++ b/Discussion/English.de.po
@@ -0,0 +1,60 @@
+# SOME DESCRIPTIVE TITLE
+# Copyright (C) YEAR Free Software Foundation, Inc.
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"POT-Creation-Date: 2014-11-03 15:51+0000\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+"**Please sign your edit or give us a way to get back to you so we can "
+"discuss.**\n"
+msgstr ""
+
+#. type: Plain text
+msgid ""
+"From "
+"http://source.udm.branchable.com/?p=source.git;a=commitdiff;h=70c036cbeb2cdea9e5718a871a15c40a18a3d533"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+" > The manifesto as it stands, seems fine for \"user-created content\", as "
+"in social media. But with the dawn of the Internet of Things, people will be "
+"generating much data of which they are unaware, though often it will have "
+"privacy implications. Therefore I propose a new section in the manifesto "
+"which deals with anonymisation. Often the use of anonymous data will be "
+"beneficial to citizens; they just need to have control of what is anonymised "
+"and when. \n"
+msgstr ""
+
+#. type: Plain text
+msgid "Hugo: Thiere is already such a section, see point 1 paragraph 2 :"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+" > Data received, generated, and/or collected from users’ activity while "
+"using\n"
+" > the service (e.g. metadata or social graph data) should be made "
+"accessible\n"
+" > to them and put under their control as well. If this control can’t be "
+"given,\n"
+" > then this type of data should be anonymous or not stored for periods "
+"longer\n"
+" > than necessary.\n"
+msgstr ""
diff --git a/Discussion/English.fr.po b/Discussion/English.fr.po
new file mode 100644
index 0000000..5969539
--- /dev/null
+++ b/Discussion/English.fr.po
@@ -0,0 +1,60 @@
+# SOME DESCRIPTIVE TITLE
+# Copyright (C) YEAR Free Software Foundation, Inc.
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"POT-Creation-Date: 2014-11-03 15:51+0000\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+"**Please sign your edit or give us a way to get back to you so we can "
+"discuss.**\n"
+msgstr ""
+
+#. type: Plain text
+msgid ""
+"From "
+"http://source.udm.branchable.com/?p=source.git;a=commitdiff;h=70c036cbeb2cdea9e5718a871a15c40a18a3d533"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+" > The manifesto as it stands, seems fine for \"user-created content\", as "
+"in social media. But with the dawn of the Internet of Things, people will be "
+"generating much data of which they are unaware, though often it will have "
+"privacy implications. Therefore I propose a new section in the manifesto "
+"which deals with anonymisation. Often the use of anonymous data will be "
+"beneficial to citizens; they just need to have control of what is anonymised "
+"and when. \n"
+msgstr ""
+
+#. type: Plain text
+msgid "Hugo: Thiere is already such a section, see point 1 paragraph 2 :"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+" > Data received, generated, and/or collected from users’ activity while "
+"using\n"
+" > the service (e.g. metadata or social graph data) should be made "
+"accessible\n"
+" > to them and put under their control as well. If this control can’t be "
+"given,\n"
+" > then this type of data should be anonymous or not stored for periods "
+"longer\n"
+" > than necessary.\n"
+msgstr ""
diff --git a/Discussion/English.ja.po b/Discussion/English.ja.po
new file mode 100644
index 0000000..5969539
--- /dev/null
+++ b/Discussion/English.ja.po
@@ -0,0 +1,60 @@
+# SOME DESCRIPTIVE TITLE
+# Copyright (C) YEAR Free Software Foundation, Inc.
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"POT-Creation-Date: 2014-11-03 15:51+0000\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+"**Please sign your edit or give us a way to get back to you so we can "
+"discuss.**\n"
+msgstr ""
+
+#. type: Plain text
+msgid ""
+"From "
+"http://source.udm.branchable.com/?p=source.git;a=commitdiff;h=70c036cbeb2cdea9e5718a871a15c40a18a3d533"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+" > The manifesto as it stands, seems fine for \"user-created content\", as "
+"in social media. But with the dawn of the Internet of Things, people will be "
+"generating much data of which they are unaware, though often it will have "
+"privacy implications. Therefore I propose a new section in the manifesto "
+"which deals with anonymisation. Often the use of anonymous data will be "
+"beneficial to citizens; they just need to have control of what is anonymised "
+"and when. \n"
+msgstr ""
+
+#. type: Plain text
+msgid "Hugo: Thiere is already such a section, see point 1 paragraph 2 :"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+" > Data received, generated, and/or collected from users’ activity while "
+"using\n"
+" > the service (e.g. metadata or social graph data) should be made "
+"accessible\n"
+" > to them and put under their control as well. If this control can’t be "
+"given,\n"
+" > then this type of data should be anonymous or not stored for periods "
+"longer\n"
+" > than necessary.\n"
+msgstr ""
diff --git a/Discussion/English.tr.po b/Discussion/English.tr.po
new file mode 100644

(Diff truncated)
moving discussions to directory
diff --git a/Discussion.de.po b/Discussion.de.po
deleted file mode 100644
index e98822a..0000000
--- a/Discussion.de.po
+++ /dev/null
@@ -1,60 +0,0 @@
-# SOME DESCRIPTIVE TITLE
-# Copyright (C) YEAR Free Software Foundation, Inc.
-# This file is distributed under the same license as the PACKAGE package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-#, fuzzy
-msgid ""
-msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2014-11-03 15:34+0000\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-
-#. type: Plain text
-#, no-wrap
-msgid ""
-"**Please sign your comment or give us a way to get back to you so we can "
-"discuss.**\n"
-msgstr ""
-
-#. type: Plain text
-msgid ""
-"From "
-"http://source.udm.branchable.com/?p=source.git;a=commitdiff;h=70c036cbeb2cdea9e5718a871a15c40a18a3d533"
-msgstr ""
-
-#. type: Plain text
-#, no-wrap
-msgid ""
-" > The manifesto as it stands, seems fine for \"user-created content\", as "
-"in social media. But with the dawn of the Internet of Things, people will be "
-"generating much data of which they are unaware, though often it will have "
-"privacy implications. Therefore I propose a new section in the manifesto "
-"which deals with anonymisation. Often the use of anonymous data will be "
-"beneficial to citizens; they just need to have control of what is anonymised "
-"and when. \n"
-msgstr ""
-
-#. type: Plain text
-msgid "Hugo: Thiere is already such a section, see point 1 paragraph 2 :"
-msgstr ""
-
-#. type: Plain text
-#, no-wrap
-msgid ""
-" > Data received, generated, and/or collected from users’ activity while "
-"using\n"
-" > the service (e.g. metadata or social graph data) should be made "
-"accessible\n"
-" > to them and put under their control as well. If this control can’t be "
-"given,\n"
-" > then this type of data should be anonymous or not stored for periods "
-"longer\n"
-" > than necessary.\n"
-msgstr ""
diff --git a/Discussion.fr.po b/Discussion.fr.po
deleted file mode 100644
index e98822a..0000000
--- a/Discussion.fr.po
+++ /dev/null
@@ -1,60 +0,0 @@
-# SOME DESCRIPTIVE TITLE
-# Copyright (C) YEAR Free Software Foundation, Inc.
-# This file is distributed under the same license as the PACKAGE package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-#, fuzzy
-msgid ""
-msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2014-11-03 15:34+0000\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-
-#. type: Plain text
-#, no-wrap
-msgid ""
-"**Please sign your comment or give us a way to get back to you so we can "
-"discuss.**\n"
-msgstr ""
-
-#. type: Plain text
-msgid ""
-"From "
-"http://source.udm.branchable.com/?p=source.git;a=commitdiff;h=70c036cbeb2cdea9e5718a871a15c40a18a3d533"
-msgstr ""
-
-#. type: Plain text
-#, no-wrap
-msgid ""
-" > The manifesto as it stands, seems fine for \"user-created content\", as "
-"in social media. But with the dawn of the Internet of Things, people will be "
-"generating much data of which they are unaware, though often it will have "
-"privacy implications. Therefore I propose a new section in the manifesto "
-"which deals with anonymisation. Often the use of anonymous data will be "
-"beneficial to citizens; they just need to have control of what is anonymised "
-"and when. \n"
-msgstr ""
-
-#. type: Plain text
-msgid "Hugo: Thiere is already such a section, see point 1 paragraph 2 :"
-msgstr ""
-
-#. type: Plain text
-#, no-wrap
-msgid ""
-" > Data received, generated, and/or collected from users’ activity while "
-"using\n"
-" > the service (e.g. metadata or social graph data) should be made "
-"accessible\n"
-" > to them and put under their control as well. If this control can’t be "
-"given,\n"
-" > then this type of data should be anonymous or not stored for periods "
-"longer\n"
-" > than necessary.\n"
-msgstr ""
diff --git a/Discussion.ja.po b/Discussion.ja.po
deleted file mode 100644
index e98822a..0000000
--- a/Discussion.ja.po
+++ /dev/null
@@ -1,60 +0,0 @@
-# SOME DESCRIPTIVE TITLE
-# Copyright (C) YEAR Free Software Foundation, Inc.
-# This file is distributed under the same license as the PACKAGE package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-#, fuzzy
-msgid ""
-msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2014-11-03 15:34+0000\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-
-#. type: Plain text
-#, no-wrap
-msgid ""
-"**Please sign your comment or give us a way to get back to you so we can "
-"discuss.**\n"
-msgstr ""
-
-#. type: Plain text
-msgid ""
-"From "
-"http://source.udm.branchable.com/?p=source.git;a=commitdiff;h=70c036cbeb2cdea9e5718a871a15c40a18a3d533"
-msgstr ""
-
-#. type: Plain text
-#, no-wrap
-msgid ""
-" > The manifesto as it stands, seems fine for \"user-created content\", as "
-"in social media. But with the dawn of the Internet of Things, people will be "
-"generating much data of which they are unaware, though often it will have "
-"privacy implications. Therefore I propose a new section in the manifesto "
-"which deals with anonymisation. Often the use of anonymous data will be "
-"beneficial to citizens; they just need to have control of what is anonymised "
-"and when. \n"
-msgstr ""
-
-#. type: Plain text
-msgid "Hugo: Thiere is already such a section, see point 1 paragraph 2 :"
-msgstr ""
-
-#. type: Plain text
-#, no-wrap
-msgid ""
-" > Data received, generated, and/or collected from users’ activity while "
-"using\n"
-" > the service (e.g. metadata or social graph data) should be made "
-"accessible\n"
-" > to them and put under their control as well. If this control can’t be "
-"given,\n"
-" > then this type of data should be anonymous or not stored for periods "
-"longer\n"
-" > than necessary.\n"
-msgstr ""
diff --git a/Discussion.mdwn b/Discussion.mdwn
deleted file mode 100644

(Diff truncated)
updated PO files
diff --git a/recentchanges/discussion.de.po b/recentchanges/discussion.de.po
new file mode 100644
index 0000000..32a07b4
--- /dev/null
+++ b/recentchanges/discussion.de.po
@@ -0,0 +1,26 @@
+# SOME DESCRIPTIVE TITLE
+# Copyright (C) YEAR Free Software Foundation, Inc.
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"POT-Creation-Date: 2014-11-03 15:49+0000\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+"DaeUYE  <a href=\"http://ifdsqoenqaxq.com/\">ifdsqoenqaxq</a>, "
+"[url=http://ygvbkbnsltuw.com/]ygvbkbnsltuw[/url], "
+"[link=http://xomigmbveiqx.com/]xomigmbveiqx[/link], "
+"http://rklsztjodirv.com/\n"
+msgstr ""
diff --git a/recentchanges/discussion.fr.po b/recentchanges/discussion.fr.po
new file mode 100644
index 0000000..32a07b4
--- /dev/null
+++ b/recentchanges/discussion.fr.po
@@ -0,0 +1,26 @@
+# SOME DESCRIPTIVE TITLE
+# Copyright (C) YEAR Free Software Foundation, Inc.
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"POT-Creation-Date: 2014-11-03 15:49+0000\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+"DaeUYE  <a href=\"http://ifdsqoenqaxq.com/\">ifdsqoenqaxq</a>, "
+"[url=http://ygvbkbnsltuw.com/]ygvbkbnsltuw[/url], "
+"[link=http://xomigmbveiqx.com/]xomigmbveiqx[/link], "
+"http://rklsztjodirv.com/\n"
+msgstr ""
diff --git a/recentchanges/discussion.ja.po b/recentchanges/discussion.ja.po
new file mode 100644
index 0000000..32a07b4
--- /dev/null
+++ b/recentchanges/discussion.ja.po
@@ -0,0 +1,26 @@
+# SOME DESCRIPTIVE TITLE
+# Copyright (C) YEAR Free Software Foundation, Inc.
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"POT-Creation-Date: 2014-11-03 15:49+0000\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+"DaeUYE  <a href=\"http://ifdsqoenqaxq.com/\">ifdsqoenqaxq</a>, "
+"[url=http://ygvbkbnsltuw.com/]ygvbkbnsltuw[/url], "
+"[link=http://xomigmbveiqx.com/]xomigmbveiqx[/link], "
+"http://rklsztjodirv.com/\n"
+msgstr ""
diff --git a/recentchanges/discussion.tr.po b/recentchanges/discussion.tr.po
new file mode 100644
index 0000000..32a07b4
--- /dev/null
+++ b/recentchanges/discussion.tr.po
@@ -0,0 +1,26 @@
+# SOME DESCRIPTIVE TITLE
+# Copyright (C) YEAR Free Software Foundation, Inc.
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"POT-Creation-Date: 2014-11-03 15:49+0000\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+"DaeUYE  <a href=\"http://ifdsqoenqaxq.com/\">ifdsqoenqaxq</a>, "
+"[url=http://ygvbkbnsltuw.com/]ygvbkbnsltuw[/url], "
+"[link=http://xomigmbveiqx.com/]xomigmbveiqx[/link], "
+"http://rklsztjodirv.com/\n"
+msgstr ""

updated PO files
diff --git a/index.de.po b/index.de.po
index 73dbf66..1154043 100644
--- a/index.de.po
+++ b/index.de.po
@@ -4,7 +4,7 @@
 # modification, are permitted under any circumstances. No warranty.
 msgid ""
 msgstr ""
-"POT-Creation-Date: 2014-08-30 09:48+0000\n"
+"POT-Creation-Date: 2014-11-03 15:42+0000\n"
 "PO-Revision-Date: 2010-03-12 09:40+0530\n"
 "Last-Translator: Sebastian Kuhnert <mail@sebastian-kuhnert.de>\n"
 "Language-Team: None\n"
@@ -96,8 +96,7 @@ msgid ""
 "    data intended to be privately shared should not be accessible to the service\n"
 "    provider, nor shared with governments.  Users should be the only ones to have\n"
 "    ultimate control over it and to grant access to it. \n"
-msgstr ""
-"    Wenn Nutzer die Zugriffkontrolle auf die hochgeladenen Daten haben, bedeutet das, dass weder der Dienstanbieter noch Regierungen Zugriff auf privat geteilten Daten haben. Die Nutzer haben die alleinige Kontrolle über die Daten und die Bewilligung der Zugriffsberechtigung auf diese. \n"
+msgstr "    Wenn Nutzer die Zugriffkontrolle auf die hochgeladenen Daten haben, bedeutet das, dass weder der Dienstanbieter noch Regierungen Zugriff auf privat geteilten Daten haben. Die Nutzer haben die alleinige Kontrolle über die Daten und die Bewilligung der Zugriffsberechtigung auf diese. \n"
 
 #. type: Plain text
 #, no-wrap
@@ -239,7 +238,8 @@ msgstr ""
 msgid ""
 "    Users should not rely on centralised services. Peer-to-peer systems and\n"
 "    unhosted applications are a means to that end.  In the long term, all users\n"
-"    should be able to have their own server.  \n"
+"    should be able to have their own server with\n"
+"    [[!taglink Free_Software]].\n"
 msgstr ""
 
 #. type: Plain text
diff --git a/index.fr.po b/index.fr.po
index f5a65ee..e81d02d 100644
--- a/index.fr.po
+++ b/index.fr.po
@@ -9,7 +9,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ikiwiki\n"
-"POT-Creation-Date: 2014-08-30 09:48+0000\n"
+"POT-Creation-Date: 2014-11-03 15:42+0000\n"
 "PO-Revision-Date: 2009-08-23 18:50+0200\n"
 "Last-Translator: Philippe Batailler <philippe.batailler@free.fr>\n"
 "Language-Team: French <debian-l10n-french@lists.debian.org>\n"
@@ -40,12 +40,12 @@ msgstr "2.0 BROUILLON"
 
 #. type: Plain text
 msgid ""
-"This manifesto aims at defining users’ fundamental "
-"[[!taglink rights_to_their_own_data|datarights]] in the Internet age. People ought to "
+"This manifesto aims at defining users’ fundamental [[!taglink "
+"rights_to_their_own_data|datarights]] in the Internet age. People ought to "
 "be free and should not have to pay allegiance to service providers."
 msgstr ""
-"Ce manifeste a pour but de définir "
-"[[!taglink les_droits_fondamentaux_des_utilisateurs_sur_leurs_données|datarights]] à "
+"Ce manifeste a pour but de définir [[!taglink "
+"les_droits_fondamentaux_des_utilisateurs_sur_leurs_données|datarights]] à "
 "l’ère d’internet. Chacun devrait être libre et ne pas avoir à payer "
 "allégeance aux fournisseurs de service."
 
@@ -111,13 +111,18 @@ msgstr "Cela signifie également qu’un fournisseur de service devrait **ne pas
 msgid ""
 "force users to disclose private data (including private correspondence)  "
 "with them, nor"
-msgstr "forcer les utilisateurs à divulguer des données privées (ce qui inclut la correspondance privée) pour eux, ni"
+msgstr ""
+"forcer les utilisateurs à divulguer des données privées (ce qui inclut la "
+"correspondance privée) pour eux, ni"
 
 #. type: Bullet: '     2. '
 msgid ""
 "impose licensing conditions (e.g. copyright, personal data protection)  that "
 "go beyond what is necessary for the purpose of the service."
-msgstr "imposer des conditions de licence (ex. : de droit d’auteur ou de protection des données personnelles) qui vont au-delà de ce qui est nécessaire pour l’objectif du service."
+msgstr ""
+"imposer des conditions de licence (ex. : de droit d’auteur ou de protection "
+"des données personnelles) qui vont au-delà de ce qui est nécessaire pour "
+"l’objectif du service."
 
 #. type: Plain text
 #, no-wrap
@@ -233,11 +238,16 @@ msgid "    [[!toggle  id=\"usnroc\" text=\"×\"]]\n"
 msgstr "    [[!toggle  id=\"usnroc\" text=\"×\"]]\n"
 
 #. type: Plain text
-#, no-wrap
+#, fuzzy, no-wrap
+#| msgid ""
+#| "    Users should not rely on centralised services. Peer-to-peer systems and\n"
+#| "    unhosted applications are a means to that end.  In the long term, all users\n"
+#| "    should be able to have their own server.  \n"
 msgid ""
 "    Users should not rely on centralised services. Peer-to-peer systems and\n"
 "    unhosted applications are a means to that end.  In the long term, all users\n"
-"    should be able to have their own server.  \n"
+"    should be able to have their own server with\n"
+"    [[!taglink Free_Software]].\n"
 msgstr "    Les utilisateurs ne devraient pas reposer sur des services centralisés. Les systèmes pair-à-pair et les applications *unhosted* sont un moyen d’y arriver. À long terme, tous les utilisateurs devraient être capables d’avoir leur propre serveur."
 
 #. type: Plain text
@@ -294,7 +304,9 @@ msgstr "    [[!taglink Les_standards_ouverts|Open_standards]] pour les formats e
 msgid ""
 "If users have these rights, they are in control of their data rather than "
 "being subjugated by service providers."
-msgstr "Si les utilisateurs ont ces droits, ils ont la maîtrise de leurs données plutôt que d’être subjugués par les fournisseurs de service."
+msgstr ""
+"Si les utilisateurs ont ces droits, ils ont la maîtrise de leurs données "
+"plutôt que d’être subjugués par les fournisseurs de service."
 
 #. type: Plain text
 msgid ""
@@ -303,7 +315,13 @@ msgid ""
 "users are [[!taglink paying_with_their_allegiance|Internet_Feudalism]] to "
 "the service providers so that they can exploit user data (e.g. by selling "
 "them, licensing them or building a profile for advertisers)."
-msgstr "De nombreux services qui gèrent les données utilisateur à ce jour sont gratuits, mais cela ne signifie pas qu’ils soient libres. Plutôt que de payer avec de l’argent, les utilisateurs [[!taglink payent_allégeance|Internet_Feudalism]] aux fournisseurs de services pour que ceux-ci puissent exploiter les données utilisateurs (par ex. en les vendant, en offrant des licences ou en construisant des profils pour les annonceurs publicitaires)."
+msgstr ""
+"De nombreux services qui gèrent les données utilisateur à ce jour sont "
+"gratuits, mais cela ne signifie pas qu’ils soient libres. Plutôt que de "
+"payer avec de l’argent, les utilisateurs [[!taglink payent_allégeance|"
+"Internet_Feudalism]] aux fournisseurs de services pour que ceux-ci puissent "
+"exploiter les données utilisateurs (par ex. en les vendant, en offrant des "
+"licences ou en construisant des profils pour les annonceurs publicitaires)."
 
 #. type: Plain text
 msgid ""
@@ -311,7 +329,11 @@ msgid ""
 "trivial thing and a small price to pay for the sake of convenience that "
 "these Internet services bring. This has made this kind of exchange to become "
 "common."
-msgstr "Abandonner ainsi la maîtrise de sa vie privée et d’autres droits semble être un acte trivial pour de nombreuses personnes, un faible prix à payer en échange du confort que ces services Internet apportent. Cela fait que ce genre d’échange de procédé s’est répandu."
+msgstr ""
+"Abandonner ainsi la maîtrise de sa vie privée et d’autres droits semble être "
+"un acte trivial pour de nombreuses personnes, un faible prix à payer en "
+"échange du confort que ces services Internet apportent. Cela fait que ce "
+"genre d’échange de procédé s’est répandu."
 
 #. type: Plain text
 msgid ""
@@ -319,7 +341,11 @@ msgid ""
 "valuable Internet services into massive and centralised surveillance "
 "systems. It is of grave importance that people understand/realize this, "
 "since it forms a serious threat to the freedom of humanity."
-msgstr "Les fournisseurs de service ont ainsi été obligés de transformer leurs valeureux services Internet en systèmes massifs et centralisés de surveillance. Il est crucial que chacun réalise et comprenne cela, puisqu’il s’agit d’une menace importante pour les libertés de l’humanité."
+msgstr ""
+"Les fournisseurs de service ont ainsi été obligés de transformer leurs "
+"valeureux services Internet en systèmes massifs et centralisés de "
+"surveillance. Il est crucial que chacun réalise et comprenne cela, puisqu’il "
+"s’agit d’une menace importante pour les libertés de l’humanité."
 
 #. type: Plain text
 msgid ""
@@ -328,7 +354,14 @@ msgid ""
 "applications. Legally, that means terms of service should respect users’ "
 "rights and give them the possibility to exercise the [[!taglink datarights]] "
 "defined in this manifesto."
-msgstr "Enfin, pour assurer que les données utilisateurs soient sous la maîtrise des utilisateurs, les meilleurs conceptions techniques incluent les systèmes distribués ou pair-à-pair, ainsi que les applications *unhosted*. Juridiquement, cela signifie que les conditions générales d’utilisation devraient respecter les droits des utilisateurs et leur donner la possibilité d’exercer les [[!taglink droits_des_données|datarights]] définis dans ce manifeste."
+msgstr ""
+"Enfin, pour assurer que les données utilisateurs soient sous la maîtrise des "
+"utilisateurs, les meilleurs conceptions techniques incluent les systèmes "
+"distribués ou pair-à-pair, ainsi que les applications *unhosted*. "
+"Juridiquement, cela signifie que les conditions générales d’utilisation "
+"devraient respecter les droits des utilisateurs et leur donner la "
+"possibilité d’exercer les [[!taglink droits_des_données|datarights]] définis "
+"dans ce manifeste."
 
 #~ msgid "Welcome to your new wiki."
 #~ msgstr "Bienvenue sur votre nouveau wiki."
diff --git a/index.ja.po b/index.ja.po
index 54294a9..2eadc88 100644
--- a/index.ja.po
+++ b/index.ja.po
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2014-10-10 13:07+0000\n"
+"POT-Creation-Date: 2014-11-03 15:42+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -23,14 +23,8 @@ msgstr "[[!meta title=\"ユーザーデータマニュフェスト\"]]\n"
 
 #. type: Plain text
 #, no-wrap
-msgid ""
-"[[!meta description=\"This manifesto aims at defining users’ fundamental "
-"rights to their own data in the Internet age. People ought to be free and "
-"should not have to pay allegiance to service providers.\"]] \n"
-msgstr ""
-"[[!meta description=\"このマニュフェストはこのインターネットの時代においてユーザーの"
-"自らの情報に関する基本的権利を定義することを目的としている。人々は自由であるべきであり、"
-"サービス提供者に対して忠誠を示すべきではないのである。\"]] \n"
+msgid "[[!meta description=\"This manifesto aims at defining users’ fundamental rights to their own data in the Internet age. People ought to be free and should not have to pay allegiance to service providers.\"]] \n"
+msgstr "[[!meta description=\"このマニュフェストはこのインターネットの時代においてユーザーの自らの情報に関する基本的権利を定義することを目的としている。人々は自由であるべきであり、サービス提供者に対して忠誠を示すべきではないのである。\"]] \n"
 
 #. type: Plain text

(Diff truncated)
add free software server
diff --git a/index.mdwn b/index.mdwn
index a250f05..629448d 100644
--- a/index.mdwn
+++ b/index.mdwn
@@ -98,7 +98,8 @@ Thus, users should have:
     [[!toggle  id="usnroc" text="×"]]
     Users should not rely on centralised services. Peer-to-peer systems and
     unhosted applications are a means to that end.  In the long term, all users
-    should be able to have their own server.  
+    should be able to have their own server with
+    [[!taglink Free_Software]].
     
     Unfortunately, this is made very difficult by some Internet access
     providers that restrict their customers unfairly. 

updated PO files
diff --git a/Discussion.de.po b/Discussion.de.po
new file mode 100644
index 0000000..e98822a
--- /dev/null
+++ b/Discussion.de.po
@@ -0,0 +1,60 @@
+# SOME DESCRIPTIVE TITLE
+# Copyright (C) YEAR Free Software Foundation, Inc.
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"POT-Creation-Date: 2014-11-03 15:34+0000\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+"**Please sign your comment or give us a way to get back to you so we can "
+"discuss.**\n"
+msgstr ""
+
+#. type: Plain text
+msgid ""
+"From "
+"http://source.udm.branchable.com/?p=source.git;a=commitdiff;h=70c036cbeb2cdea9e5718a871a15c40a18a3d533"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+" > The manifesto as it stands, seems fine for \"user-created content\", as "
+"in social media. But with the dawn of the Internet of Things, people will be "
+"generating much data of which they are unaware, though often it will have "
+"privacy implications. Therefore I propose a new section in the manifesto "
+"which deals with anonymisation. Often the use of anonymous data will be "
+"beneficial to citizens; they just need to have control of what is anonymised "
+"and when. \n"
+msgstr ""
+
+#. type: Plain text
+msgid "Hugo: Thiere is already such a section, see point 1 paragraph 2 :"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+" > Data received, generated, and/or collected from users’ activity while "
+"using\n"
+" > the service (e.g. metadata or social graph data) should be made "
+"accessible\n"
+" > to them and put under their control as well. If this control can’t be "
+"given,\n"
+" > then this type of data should be anonymous or not stored for periods "
+"longer\n"
+" > than necessary.\n"
+msgstr ""
diff --git a/Discussion.fr.po b/Discussion.fr.po
new file mode 100644
index 0000000..e98822a
--- /dev/null
+++ b/Discussion.fr.po
@@ -0,0 +1,60 @@
+# SOME DESCRIPTIVE TITLE
+# Copyright (C) YEAR Free Software Foundation, Inc.
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"POT-Creation-Date: 2014-11-03 15:34+0000\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+"**Please sign your comment or give us a way to get back to you so we can "
+"discuss.**\n"
+msgstr ""
+
+#. type: Plain text
+msgid ""
+"From "
+"http://source.udm.branchable.com/?p=source.git;a=commitdiff;h=70c036cbeb2cdea9e5718a871a15c40a18a3d533"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+" > The manifesto as it stands, seems fine for \"user-created content\", as "
+"in social media. But with the dawn of the Internet of Things, people will be "
+"generating much data of which they are unaware, though often it will have "
+"privacy implications. Therefore I propose a new section in the manifesto "
+"which deals with anonymisation. Often the use of anonymous data will be "
+"beneficial to citizens; they just need to have control of what is anonymised "
+"and when. \n"
+msgstr ""
+
+#. type: Plain text
+msgid "Hugo: Thiere is already such a section, see point 1 paragraph 2 :"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+" > Data received, generated, and/or collected from users’ activity while "
+"using\n"
+" > the service (e.g. metadata or social graph data) should be made "
+"accessible\n"
+" > to them and put under their control as well. If this control can’t be "
+"given,\n"
+" > then this type of data should be anonymous or not stored for periods "
+"longer\n"
+" > than necessary.\n"
+msgstr ""
diff --git a/Discussion.ja.po b/Discussion.ja.po
new file mode 100644
index 0000000..e98822a
--- /dev/null
+++ b/Discussion.ja.po
@@ -0,0 +1,60 @@
+# SOME DESCRIPTIVE TITLE
+# Copyright (C) YEAR Free Software Foundation, Inc.
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"POT-Creation-Date: 2014-11-03 15:34+0000\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+"**Please sign your comment or give us a way to get back to you so we can "
+"discuss.**\n"
+msgstr ""
+
+#. type: Plain text
+msgid ""
+"From "
+"http://source.udm.branchable.com/?p=source.git;a=commitdiff;h=70c036cbeb2cdea9e5718a871a15c40a18a3d533"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+" > The manifesto as it stands, seems fine for \"user-created content\", as "
+"in social media. But with the dawn of the Internet of Things, people will be "
+"generating much data of which they are unaware, though often it will have "
+"privacy implications. Therefore I propose a new section in the manifesto "
+"which deals with anonymisation. Often the use of anonymous data will be "
+"beneficial to citizens; they just need to have control of what is anonymised "
+"and when. \n"
+msgstr ""
+
+#. type: Plain text
+msgid "Hugo: Thiere is already such a section, see point 1 paragraph 2 :"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+" > Data received, generated, and/or collected from users’ activity while "
+"using\n"
+" > the service (e.g. metadata or social graph data) should be made "
+"accessible\n"
+" > to them and put under their control as well. If this control can’t be "
+"given,\n"
+" > then this type of data should be anonymous or not stored for periods "
+"longer\n"
+" > than necessary.\n"
+msgstr ""
diff --git a/Discussion.tr.po b/Discussion.tr.po
new file mode 100644

(Diff truncated)
remove non translatable discussions
diff --git a/Discussion.de.po b/Discussion.de.po
deleted file mode 100644
index a238713..0000000
--- a/Discussion.de.po
+++ /dev/null
@@ -1,47 +0,0 @@
-# SOME DESCRIPTIVE TITLE
-# Copyright (C) YEAR Free Software Foundation, Inc.
-# This file is distributed under the same license as the PACKAGE package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-#, fuzzy
-msgid ""
-msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2014-10-28 15:10+0000\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-
-#. type: Plain text
-#, no-wrap
-msgid "**Please sign your comment or give us a way to get back to you so we can discuss.**\n"
-msgstr "[[!meta redir=http://udm.branchable.com/Discussion/index.en.html]]"
-
-#. type: Plain text
-msgid ""
-"From http://source.udm.branchable.com/?p=source.git;a=commitdiff;"
-"h=70c036cbeb2cdea9e5718a871a15c40a18a3d533"
-msgstr ""
-
-#. type: Plain text
-#, no-wrap
-msgid " > The manifesto as it stands, seems fine for \"user-created content\", as in social media. But with the dawn of the Internet of Things, people will be generating much data of which they are unaware, though often it will have privacy implications. Therefore I propose a new section in the manifesto which deals with anonymisation. Often the use of anonymous data will be beneficial to citizens; they just need to have control of what is anonymised and when. \n"
-msgstr ""
-
-#. type: Plain text
-msgid "Hugo: Thiere is already such a section, see point 1 paragraph 2 :"
-msgstr ""
-
-#. type: Plain text
-#, no-wrap
-msgid ""
-" > Data received, generated, and/or collected from users’ activity while using\n"
-" > the service (e.g. metadata or social graph data) should be made accessible\n"
-" > to them and put under their control as well. If this control can’t be given,\n"
-" > then this type of data should be anonymous or not stored for periods longer\n"
-" > than necessary.\n"
-msgstr ""
diff --git a/Discussion.fr.po b/Discussion.fr.po
deleted file mode 100644
index fa5785f..0000000
--- a/Discussion.fr.po
+++ /dev/null
@@ -1,47 +0,0 @@
-# SOME DESCRIPTIVE TITLE
-# Copyright (C) YEAR Free Software Foundation, Inc.
-# This file is distributed under the same license as the PACKAGE package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-#, fuzzy
-msgid ""
-msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2014-10-28 15:10+0000\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-
-#. type: Plain text
-#, no-wrap
-msgid "**Please sign your comment or give us a way to get back to you so we can discuss.**\n"
-msgstr ""
-
-#. type: Plain text
-msgid ""
-"From http://source.udm.branchable.com/?p=source.git;a=commitdiff;"
-"h=70c036cbeb2cdea9e5718a871a15c40a18a3d533"
-msgstr ""
-
-#. type: Plain text
-#, no-wrap
-msgid " > The manifesto as it stands, seems fine for \"user-created content\", as in social media. But with the dawn of the Internet of Things, people will be generating much data of which they are unaware, though often it will have privacy implications. Therefore I propose a new section in the manifesto which deals with anonymisation. Often the use of anonymous data will be beneficial to citizens; they just need to have control of what is anonymised and when. \n"
-msgstr ""
-
-#. type: Plain text
-msgid "Hugo: Thiere is already such a section, see point 1 paragraph 2 :"
-msgstr ""
-
-#. type: Plain text
-#, no-wrap
-msgid ""
-" > Data received, generated, and/or collected from users’ activity while using\n"
-" > the service (e.g. metadata or social graph data) should be made accessible\n"
-" > to them and put under their control as well. If this control can’t be given,\n"
-" > then this type of data should be anonymous or not stored for periods longer\n"
-" > than necessary.\n"
-msgstr ""
diff --git a/Discussion.ja.po b/Discussion.ja.po
deleted file mode 100644
index a238713..0000000
--- a/Discussion.ja.po
+++ /dev/null
@@ -1,47 +0,0 @@
-# SOME DESCRIPTIVE TITLE
-# Copyright (C) YEAR Free Software Foundation, Inc.
-# This file is distributed under the same license as the PACKAGE package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-#, fuzzy
-msgid ""
-msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2014-10-28 15:10+0000\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-
-#. type: Plain text
-#, no-wrap
-msgid "**Please sign your comment or give us a way to get back to you so we can discuss.**\n"
-msgstr "[[!meta redir=http://udm.branchable.com/Discussion/index.en.html]]"
-
-#. type: Plain text
-msgid ""
-"From http://source.udm.branchable.com/?p=source.git;a=commitdiff;"
-"h=70c036cbeb2cdea9e5718a871a15c40a18a3d533"
-msgstr ""
-
-#. type: Plain text
-#, no-wrap
-msgid " > The manifesto as it stands, seems fine for \"user-created content\", as in social media. But with the dawn of the Internet of Things, people will be generating much data of which they are unaware, though often it will have privacy implications. Therefore I propose a new section in the manifesto which deals with anonymisation. Often the use of anonymous data will be beneficial to citizens; they just need to have control of what is anonymised and when. \n"
-msgstr ""
-
-#. type: Plain text
-msgid "Hugo: Thiere is already such a section, see point 1 paragraph 2 :"
-msgstr ""
-
-#. type: Plain text
-#, no-wrap
-msgid ""
-" > Data received, generated, and/or collected from users’ activity while using\n"
-" > the service (e.g. metadata or social graph data) should be made accessible\n"
-" > to them and put under their control as well. If this control can’t be given,\n"
-" > then this type of data should be anonymous or not stored for periods longer\n"
-" > than necessary.\n"
-msgstr ""
diff --git a/Discussion.tr.po b/Discussion.tr.po
deleted file mode 100644
index a238713..0000000
--- a/Discussion.tr.po
+++ /dev/null
@@ -1,47 +0,0 @@
-# SOME DESCRIPTIVE TITLE
-# Copyright (C) YEAR Free Software Foundation, Inc.
-# This file is distributed under the same license as the PACKAGE package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-#, fuzzy
-msgid ""
-msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2014-10-28 15:10+0000\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-
-#. type: Plain text
-#, no-wrap
-msgid "**Please sign your comment or give us a way to get back to you so we can discuss.**\n"
-msgstr "[[!meta redir=http://udm.branchable.com/Discussion/index.en.html]]"
-
-#. type: Plain text
-msgid ""
-"From http://source.udm.branchable.com/?p=source.git;a=commitdiff;"
-"h=70c036cbeb2cdea9e5718a871a15c40a18a3d533"
-msgstr ""
-
-#. type: Plain text
-#, no-wrap
-msgid " > The manifesto as it stands, seems fine for \"user-created content\", as in social media. But with the dawn of the Internet of Things, people will be generating much data of which they are unaware, though often it will have privacy implications. Therefore I propose a new section in the manifesto which deals with anonymisation. Often the use of anonymous data will be beneficial to citizens; they just need to have control of what is anonymised and when. \n"
-msgstr ""
-
-#. type: Plain text

(Diff truncated)
updated PO files
diff --git a/sidebar.de.po b/sidebar.de.po
index 1c3f79e..3d8cd21 100644
--- a/sidebar.de.po
+++ b/sidebar.de.po
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2014-11-03 15:22+0000\n"
+"POT-Creation-Date: 2014-11-03 15:24+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -22,7 +22,7 @@ msgid ""
 "<ul class=\"nav\" role=\"menu\">\n"
 "<li>[[About this wiki|about]]</li>\n"
 "<li>[[Frequently Asked Questions|faq]]</li>\n"
-"<li>[[Discussion|Discussion/index.en.html]]</li>\n"
+"<li>[[Discussion|Discussion/]]</li>\n"
 "<li><a href=\"/ikiwiki.cgi?P=\">Search</a></li>\n"
 "</ul>\n"
 msgstr ""
diff --git a/sidebar.fr.po b/sidebar.fr.po
index 7367b57..99c7d2f 100644
--- a/sidebar.fr.po
+++ b/sidebar.fr.po
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2014-11-03 15:22+0000\n"
+"POT-Creation-Date: 2014-11-03 15:24+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -28,7 +28,7 @@ msgid ""
 "<ul class=\"nav\" role=\"menu\">\n"
 "<li>[[About this wiki|about]]</li>\n"
 "<li>[[Frequently Asked Questions|faq]]</li>\n"
-"<li>[[Discussion|Discussion/index.en.html]]</li>\n"
+"<li>[[Discussion|Discussion/]]</li>\n"
 "<li><a href=\"/ikiwiki.cgi?P=\">Search</a></li>\n"
 "</ul>\n"
 msgstr ""
diff --git a/sidebar.ja.po b/sidebar.ja.po
index 35d6c9f..b29b87c 100644
--- a/sidebar.ja.po
+++ b/sidebar.ja.po
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2014-11-03 15:22+0000\n"
+"POT-Creation-Date: 2014-11-03 15:24+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -29,7 +29,7 @@ msgid ""
 "<ul class=\"nav\" role=\"menu\">\n"
 "<li>[[About this wiki|about]]</li>\n"
 "<li>[[Frequently Asked Questions|faq]]</li>\n"
-"<li>[[Discussion|Discussion/index.en.html]]</li>\n"
+"<li>[[Discussion|Discussion/]]</li>\n"
 "<li><a href=\"/ikiwiki.cgi?P=\">Search</a></li>\n"
 "</ul>\n"
 msgstr ""
diff --git a/sidebar.tr.po b/sidebar.tr.po
index 1c3f79e..3d8cd21 100644
--- a/sidebar.tr.po
+++ b/sidebar.tr.po
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2014-11-03 15:22+0000\n"
+"POT-Creation-Date: 2014-11-03 15:24+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -22,7 +22,7 @@ msgid ""
 "<ul class=\"nav\" role=\"menu\">\n"
 "<li>[[About this wiki|about]]</li>\n"
 "<li>[[Frequently Asked Questions|faq]]</li>\n"
-"<li>[[Discussion|Discussion/index.en.html]]</li>\n"
+"<li>[[Discussion|Discussion/]]</li>\n"
 "<li><a href=\"/ikiwiki.cgi?P=\">Search</a></li>\n"
 "</ul>\n"
 msgstr ""