diff options
author | Christian Grothoff <christian@grothoff.org> | 2017-05-23 11:01:52 +0200 |
---|---|---|
committer | Christian Grothoff <christian@grothoff.org> | 2017-05-23 11:01:52 +0200 |
commit | a8dc6f01ae5617b46dc9078b9ff84169bc15c45a (patch) | |
tree | 7d2b2f61bc77f1f747c7080dc4699e430ff93554 | |
parent | 3875acca7ff2142a4a5eaaf0376bd017a5cc63d2 (diff) | |
download | www-a8dc6f01ae5617b46dc9078b9ff84169bc15c45a.tar.gz www-a8dc6f01ae5617b46dc9078b9ff84169bc15c45a.zip |
post copyright assignment
-rw-r--r-- | common/navigation.j2.inc | 1 | ||||
-rw-r--r-- | copyright.html.j2 | 29 | ||||
-rw-r--r-- | locale/de/LC_MESSAGES/messages.po | 2 | ||||
-rw-r--r-- | locale/en/LC_MESSAGES/messages.po | 2 | ||||
-rw-r--r-- | locale/es/LC_MESSAGES/messages.po | 2 | ||||
-rw-r--r-- | locale/fr/LC_MESSAGES/messages.po | 2 | ||||
-rw-r--r-- | locale/it/LC_MESSAGES/messages.po | 2 | ||||
-rw-r--r-- | pdf/copyright.pdf | bin | 0 -> 77869 bytes |
8 files changed, 35 insertions, 5 deletions
diff --git a/common/navigation.j2.inc b/common/navigation.j2.inc index d6204420..048e6752 100644 --- a/common/navigation.j2.inc +++ b/common/navigation.j2.inc | |||
@@ -12,6 +12,7 @@ | |||
12 | <li><a href="faq.html">FAQ</a></li> | 12 | <li><a href="faq.html">FAQ</a></li> |
13 | <li><a href="glossary.html">Glossary</a></li> | 13 | <li><a href="glossary.html">Glossary</a></li> |
14 | <li><a href="developers.html">Developer Introduction</a></li> | 14 | <li><a href="developers.html">Developer Introduction</a></li> |
15 | <li><a href="copyright.html">Copyright for Contributors</a></li> | ||
15 | <li><a href="bibliography.html">Bibliography</a></li> | 16 | <li><a href="bibliography.html">Bibliography</a></li> |
16 | </ul> | 17 | </ul> |
17 | </li> | 18 | </li> |
diff --git a/copyright.html.j2 b/copyright.html.j2 new file mode 100644 index 00000000..40011d36 --- /dev/null +++ b/copyright.html.j2 | |||
@@ -0,0 +1,29 @@ | |||
1 | {% extends "common/base.j2" %} | ||
2 | {% block body_content %} | ||
3 | <!-- Jumbotron --> | ||
4 | <div class="jumbotron"> | ||
5 | <div class="container text-center"> | ||
6 | <h1>{{ _("Copyright Assignment") }}</h1> | ||
7 | {% trans %} | ||
8 | <p>Contributors to GNU Taler with Git access must sign the | ||
9 | <a href="pdf/copyright.pdf">copyright assignment</a> to | ||
10 | ensure that the GNUnet e.V. --- Taler Systems SA agreement | ||
11 | on licensing and collaborative development of the GNUnet and | ||
12 | GNU Taler projects is satisfied.</p> | ||
13 | {% endtrans %} | ||
14 | {% trans %} | ||
15 | <p>The agreements ensure that the code will continue to be made | ||
16 | available under free software licenses, but gives us the freedom | ||
17 | to move code between GNUnet and GNU Taler and the ability to | ||
18 | dual-license.</p> | ||
19 | {% endtrans %} | ||
20 | {% trans %} | ||
21 | <p>Minor contributions (basically, anyone without Git access) do | ||
22 | not require copyright assignment. Pseudonymous contributions are | ||
23 | accepted, in this case simply sign the agreement with your | ||
24 | pseudonym. Scanned copies are sufficient, but snail mail is | ||
25 | preferred.</p> | ||
26 | {% endtrans %} | ||
27 | </div> | ||
28 | </div> | ||
29 | {% endblock body_content %} | ||
diff --git a/locale/de/LC_MESSAGES/messages.po b/locale/de/LC_MESSAGES/messages.po index c729ffef..0c352158 100644 --- a/locale/de/LC_MESSAGES/messages.po +++ b/locale/de/LC_MESSAGES/messages.po | |||
@@ -3,7 +3,7 @@ msgid "" | |||
3 | msgstr "" | 3 | msgstr "" |
4 | "Project-Id-Version: PROJECT VERSION\n" | 4 | "Project-Id-Version: PROJECT VERSION\n" |
5 | "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" | 5 | "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" |
6 | "POT-Creation-Date: 2017-05-04 13:31+0200\n" | 6 | "POT-Creation-Date: 2017-05-23 10:32+0200\n" |
7 | "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" | 7 | "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" |
8 | "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" | 8 | "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" |
9 | "Language: de\n" | 9 | "Language: de\n" |
diff --git a/locale/en/LC_MESSAGES/messages.po b/locale/en/LC_MESSAGES/messages.po index e45c2dc0..8e3d522d 100644 --- a/locale/en/LC_MESSAGES/messages.po +++ b/locale/en/LC_MESSAGES/messages.po | |||
@@ -3,7 +3,7 @@ msgid "" | |||
3 | msgstr "" | 3 | msgstr "" |
4 | "Project-Id-Version: PROJECT VERSION\n" | 4 | "Project-Id-Version: PROJECT VERSION\n" |
5 | "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" | 5 | "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" |
6 | "POT-Creation-Date: 2017-05-04 13:31+0200\n" | 6 | "POT-Creation-Date: 2017-05-23 10:32+0200\n" |
7 | "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" | 7 | "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" |
8 | "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" | 8 | "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" |
9 | "Language: en\n" | 9 | "Language: en\n" |
diff --git a/locale/es/LC_MESSAGES/messages.po b/locale/es/LC_MESSAGES/messages.po index 01c97e2d..cb6a6c43 100644 --- a/locale/es/LC_MESSAGES/messages.po +++ b/locale/es/LC_MESSAGES/messages.po | |||
@@ -3,7 +3,7 @@ msgid "" | |||
3 | msgstr "" | 3 | msgstr "" |
4 | "Project-Id-Version: PROJECT VERSION\n" | 4 | "Project-Id-Version: PROJECT VERSION\n" |
5 | "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" | 5 | "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" |
6 | "POT-Creation-Date: 2017-05-04 13:31+0200\n" | 6 | "POT-Creation-Date: 2017-05-23 10:32+0200\n" |
7 | "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" | 7 | "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" |
8 | "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" | 8 | "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" |
9 | "Language: es\n" | 9 | "Language: es\n" |
diff --git a/locale/fr/LC_MESSAGES/messages.po b/locale/fr/LC_MESSAGES/messages.po index 1d176169..4acbfc0c 100644 --- a/locale/fr/LC_MESSAGES/messages.po +++ b/locale/fr/LC_MESSAGES/messages.po | |||
@@ -3,7 +3,7 @@ msgid "" | |||
3 | msgstr "" | 3 | msgstr "" |
4 | "Project-Id-Version: PROJECT VERSION\n" | 4 | "Project-Id-Version: PROJECT VERSION\n" |
5 | "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" | 5 | "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" |
6 | "POT-Creation-Date: 2017-05-04 13:31+0200\n" | 6 | "POT-Creation-Date: 2017-05-23 10:32+0200\n" |
7 | "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" | 7 | "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" |
8 | "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" | 8 | "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" |
9 | "Language: fr\n" | 9 | "Language: fr\n" |
diff --git a/locale/it/LC_MESSAGES/messages.po b/locale/it/LC_MESSAGES/messages.po index 09fdd119..7f0cd641 100644 --- a/locale/it/LC_MESSAGES/messages.po +++ b/locale/it/LC_MESSAGES/messages.po | |||
@@ -3,7 +3,7 @@ msgid "" | |||
3 | msgstr "" | 3 | msgstr "" |
4 | "Project-Id-Version: PROJECT VERSION\n" | 4 | "Project-Id-Version: PROJECT VERSION\n" |
5 | "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" | 5 | "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" |
6 | "POT-Creation-Date: 2017-05-04 13:31+0200\n" | 6 | "POT-Creation-Date: 2017-05-23 10:32+0200\n" |
7 | "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" | 7 | "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" |
8 | "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" | 8 | "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" |
9 | "Language: it\n" | 9 | "Language: it\n" |
diff --git a/pdf/copyright.pdf b/pdf/copyright.pdf new file mode 100644 index 00000000..5e3644d9 --- /dev/null +++ b/pdf/copyright.pdf | |||
Binary files differ | |||