summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--common/navigation.j2.inc1
-rw-r--r--copyright.html.j229
-rw-r--r--locale/de/LC_MESSAGES/messages.po2
-rw-r--r--locale/en/LC_MESSAGES/messages.po2
-rw-r--r--locale/es/LC_MESSAGES/messages.po2
-rw-r--r--locale/fr/LC_MESSAGES/messages.po2
-rw-r--r--locale/it/LC_MESSAGES/messages.po2
-rw-r--r--pdf/copyright.pdfbin0 -> 77869 bytes
8 files changed, 35 insertions, 5 deletions
diff --git a/common/navigation.j2.inc b/common/navigation.j2.inc
index d620442..048e675 100644
--- a/common/navigation.j2.inc
+++ b/common/navigation.j2.inc
@@ -12,6 +12,7 @@
<li><a href="faq.html">FAQ</a></li>
<li><a href="glossary.html">Glossary</a></li>
<li><a href="developers.html">Developer Introduction</a></li>
+ <li><a href="copyright.html">Copyright for Contributors</a></li>
<li><a href="bibliography.html">Bibliography</a></li>
</ul>
</li>
diff --git a/copyright.html.j2 b/copyright.html.j2
new file mode 100644
index 0000000..40011d3
--- /dev/null
+++ b/copyright.html.j2
@@ -0,0 +1,29 @@
+{% extends "common/base.j2" %}
+{% block body_content %}
+<!-- Jumbotron -->
+<div class="jumbotron">
+ <div class="container text-center">
+ <h1>{{ _("Copyright Assignment") }}</h1>
+{% trans %}
+ <p>Contributors to GNU Taler with Git access must sign the
+ <a href="pdf/copyright.pdf">copyright assignment</a> to
+ ensure that the GNUnet e.V. --- Taler Systems SA agreement
+ on licensing and collaborative development of the GNUnet and
+ GNU Taler projects is satisfied.</p>
+{% endtrans %}
+{% trans %}
+ <p>The agreements ensure that the code will continue to be made
+ available under free software licenses, but gives us the freedom
+ to move code between GNUnet and GNU Taler and the ability to
+ dual-license.</p>
+{% endtrans %}
+{% trans %}
+ <p>Minor contributions (basically, anyone without Git access) do
+ not require copyright assignment. Pseudonymous contributions are
+ accepted, in this case simply sign the agreement with your
+ pseudonym. Scanned copies are sufficient, but snail mail is
+ preferred.</p>
+{% endtrans %}
+ </div>
+</div>
+{% endblock body_content %}
diff --git a/locale/de/LC_MESSAGES/messages.po b/locale/de/LC_MESSAGES/messages.po
index c729ffe..0c35215 100644
--- a/locale/de/LC_MESSAGES/messages.po
+++ b/locale/de/LC_MESSAGES/messages.po
@@ -3,7 +3,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PROJECT VERSION\n"
"Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2017-05-04 13:31+0200\n"
+"POT-Creation-Date: 2017-05-23 10:32+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language: de\n"
diff --git a/locale/en/LC_MESSAGES/messages.po b/locale/en/LC_MESSAGES/messages.po
index e45c2dc..8e3d522 100644
--- a/locale/en/LC_MESSAGES/messages.po
+++ b/locale/en/LC_MESSAGES/messages.po
@@ -3,7 +3,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PROJECT VERSION\n"
"Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2017-05-04 13:31+0200\n"
+"POT-Creation-Date: 2017-05-23 10:32+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language: en\n"
diff --git a/locale/es/LC_MESSAGES/messages.po b/locale/es/LC_MESSAGES/messages.po
index 01c97e2..cb6a6c4 100644
--- a/locale/es/LC_MESSAGES/messages.po
+++ b/locale/es/LC_MESSAGES/messages.po
@@ -3,7 +3,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PROJECT VERSION\n"
"Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2017-05-04 13:31+0200\n"
+"POT-Creation-Date: 2017-05-23 10:32+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language: es\n"
diff --git a/locale/fr/LC_MESSAGES/messages.po b/locale/fr/LC_MESSAGES/messages.po
index 1d17616..4acbfc0 100644
--- a/locale/fr/LC_MESSAGES/messages.po
+++ b/locale/fr/LC_MESSAGES/messages.po
@@ -3,7 +3,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PROJECT VERSION\n"
"Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2017-05-04 13:31+0200\n"
+"POT-Creation-Date: 2017-05-23 10:32+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language: fr\n"
diff --git a/locale/it/LC_MESSAGES/messages.po b/locale/it/LC_MESSAGES/messages.po
index 09fdd11..7f0cd64 100644
--- a/locale/it/LC_MESSAGES/messages.po
+++ b/locale/it/LC_MESSAGES/messages.po
@@ -3,7 +3,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PROJECT VERSION\n"
"Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2017-05-04 13:31+0200\n"
+"POT-Creation-Date: 2017-05-23 10:32+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language: it\n"
diff --git a/pdf/copyright.pdf b/pdf/copyright.pdf
new file mode 100644
index 0000000..5e3644d
--- /dev/null
+++ b/pdf/copyright.pdf
Binary files differ