From 8ddbe03ff817681dbc301d00e562ffe3e5cf5474 Mon Sep 17 00:00:00 2001
From: Xeniac <xeniac@posteo.at>
Date: Fri, 27 Apr 2018 10:10:02 +0200
Subject: [PATCH 01/23] adapted cleanup script to new file locations and
 parameters.

---
 bin/cleanup.sh | 23 +++++++++++------------
 1 file changed, 11 insertions(+), 12 deletions(-)

diff --git a/bin/cleanup.sh b/bin/cleanup.sh
index 5e79cbd..76dff17 100755
--- a/bin/cleanup.sh
+++ b/bin/cleanup.sh
@@ -4,18 +4,17 @@ echo "aktualisiere Übersetzungen..."
 cd src
 unset DJANGO_SETTINGS_MODULE
 for dir in *
-    do
-        if [ -d ${dir}/locale ]
-            echo "Übersetze $dir"
-            then
-		echo -n "$dir: " 
-                cd ${dir}
-                django-admin.py makemessages -l de
-                cd ..
-        fi
-    done
+do
+    if [ -d ${dir}/locale ]
+    then
+        echo -n "$dir: " 
+        cd ${dir}
+        django-admin.py makemessages -l de
+        cd ..
+    fi
+done
 sleep 5s
-export DJANGO_SETTINGS_MODULE="kasu.settings.production"
+export DJANGO_SETTINGS_MODULE="kasu.settings"
 ./manage.py compilemessages
 
 echo "lösche den Python Compiler Cache..."
@@ -23,5 +22,5 @@ find . -name "*.pyc" -exec rm -rf {} \;
 echo "Aktualisiere Statics"
 ./manage.py collectstatic --noinput -c
 echo "Erstelle Vorschaubilder"
-./manage.py generateimages
+./manage.py thumbnail_cleanup
 touch kasu/wsgi.py

From 3af8e64f1f77404c33e22c24db5ed13ad730c0fc Mon Sep 17 00:00:00 2001
From: Xeniac <xeniac@posteo.at>
Date: Fri, 27 Apr 2018 10:11:19 +0200
Subject: [PATCH 02/23] Added the full address to the next/upcoming event in
 the redbox.

---
 src/kasu/templates/base.html | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/kasu/templates/base.html b/src/kasu/templates/base.html
index 49f65ce..bb6a392 100644
--- a/src/kasu/templates/base.html
+++ b/src/kasu/templates/base.html
@@ -73,7 +73,9 @@
                 <li><span class="fa-li fa fa-calendar"></span><strong>{% trans "Start" %}:</strong>
                     <time datetime="{{current_event.start|date:'c'}}">{{current_event.start|date:'DATETIME_FORMAT'}}</time>
                 </li>
-                <li><span class="fa-li fa fa-map-marker"></span><strong>{% trans "Location" %}:</strong> {{ current_event.location }}</li>
+                <li><span class="fa-li fa fa-map-marker"></span><strong>{% trans "Location" %}:</strong> {{ current_event.location }}
+                - {{current_event.location.street_address}}, {{current_event.location.postal_code}} {{current_event.location.locality}}
+                </li>
             </ul>
             <div class="right"><a class="button" href="{{current_event.get_absolute_url}}">
             {% trans "More Details" %} <span class="fa fa-arrow-right"></span></a></div>
@@ -85,7 +87,9 @@
                 <li><span class="fa-li fa fa-calendar"></span><strong>{% trans "Start" %}:</strong>
                     <time datetime="{{next_event.start|date:'c'}}">{{next_event.start|date:'DATETIME_FORMAT' }}</time>
                 </li>
-                <li><span class="fa-li fa fa-map-marker"></span><strong>{% trans "Location" %}:</strong> {{ next_event.location }}</li>
+                <li><span class="fa-li fa fa-map-marker"></span><strong>{% trans "Location" %}:</strong> {{ next_event.location }}
+                - {{next_event.location.street_address}}, {{next_event.location.postal_code}} {{next_event.location.locality}}
+                </li>
             </ul>
             <div class="right"><a class="button" href="{{next_event.get_absolute_url}}">{% trans "More Details" %}
             <span class="fa fa-arrow-right"></span></a></div>

From 1d2fb4425011d62d863962df93fbf11cc36ee568 Mon Sep 17 00:00:00 2001
From: Xeniac <xeniac@posteo.at>
Date: Fri, 27 Apr 2018 10:12:39 +0200
Subject: [PATCH 03/23] Fixed typo Player List (Spieler Liste) is now Players
 list (Spielerliste)

---
 .../locale/de/LC_MESSAGES/django.mo           | Bin 4832 -> 4407 bytes
 .../locale/de/LC_MESSAGES/django.po           | 306 +++++++++---------
 .../mahjong_ranking/kyudanranking_list.html   |   6 +-
 3 files changed, 154 insertions(+), 158 deletions(-)

diff --git a/src/mahjong_ranking/locale/de/LC_MESSAGES/django.mo b/src/mahjong_ranking/locale/de/LC_MESSAGES/django.mo
index 8ac751060f9a5f2f0c6c223afc3d52478f8b4203..59433b8567ebcff64d04c4c9fc2c05edaa2fa333 100644
GIT binary patch
delta 1383
zcmYk*Ur3Wt7{~E5ZB}zDHOoJtOiNbSY{o`uVwxd@T_gqtQ88=SmY8h|lrDxw^zSB{
zL=@eOpdyNBf`J7ENzp&LNhkuP3n9D+k|OG+@6XOf<K_LF=e*}V=XuWAJ5w`WeW^HQ
z_`O-A`#(3}TjECija3+O8k3KEF%J*pVvN~1ZsS4g5W0AN9z8gUS|Wpb{}wL8`%aTu
z82E$^HytlA7e64E`N(Z4PNNd|iW~6<uE82+tH7O@gFU#A7;0P`mtY3h;$7=|^b!Ba
zqy8cq6}+_)1E|c~QJHsQ0Up9a>_=rjZ2L!0<1)A$AD}9IiduLQwWIH_8vmdVD|y(0
z?I{|n{47$G8AVlm4K?9SBv~_tTxP=h-1^o!h1#KMWDPTins*+RkS5i0Cu*HS)V!$@
z8d|8*KB&VGanQyw)DHDy8J<Q>c*8!=*!Z^fp6!2#I?6{l=`iLo))NntMJtXWJCZU#
zX{?~5jC7TeAC-BKn<{BV-ZeW>6?CDF=n(2?VyKEvA;p>@+kXK|iLavy7(*rg0(E3>
zFrW3!CmLL4mfH@T$Mv{{QERaqRmoXYLKo4GY1D$xP-pte`W<VC%lV@y!4@pRPE_Ji
z+n<#B{?5=)hF6ex%^lQ^jN>YNjhg5Ss)Bjcj{L%A%;Ef$Kr7Z^6r1oWYQYbv9hyPy
z;4Esr@0e0WPG;AH9&3rU%36y`EQA{0hT5?XR6_e~d;oQXG3yB|CmyhI8n+T(LnSm-
zV74uMPM_(hq+<@XfQxTU6BVJhz6_OMh3)sDw!W?~doXXMBYSRfajtuJZ+I{gPk4Ky
ziDdS=YlXwJ#UBXzH*NL?8XAKQ>52T+9sl)&g0+GAK*+T#oJjij#KV1w-f;4GywTh3
zYdacej%c{gyFC)`@irX`Cr-8uMEZ^l_AxjbsS78Yed$W~dq+e1n|obOeK1?<+3(1X
VEbGs8clAdjy^*-Gh+Hn3`3r1TnoR%z

delta 1809
zcmY+^OK4PA9LMo9i6$`*O&y~qG3FXgn;Iv*nW<?qc^H#ujfp}bh@~y|k__=eW&$(U
zM_1P_1fd|(h`0!X(1k8q&{<gOO2vr5N_LWkRM!Co7Y*&A^!vLx7J8Wf{hV_$IgkH2
zbMLjhYQ3^0%ot;yt>Z!Yw#=A)=wTW!<1T!PRk(tD%qov^{KvM-XsBIdt;0&%O<03%
zs42Qo|KE!naj4vc(HFm<qneJdu@rq=k6GM;1>As_Pz(7HKfxQg8=qqnzQYo%tyo)7
z9QD0M<YUHo?7<1^cNL*AAJK7xj?K7$b-0Y$!CTZ0{>ECYU=<%=J!%K-sQxtSdt<l>
zzeMfWNB-61P?<f4E%*~^-X|fIK`L)i8E~0ZJMTxj%rI)eW2n@9gBozknzf#_hNui(
zLXu&wq82i5`){Jg{~0x2Sfru}ezSjA#Qn6FY`cunl$mO*$7a-kJ*a^OY<t8yYWt6)
zj&cGY#EdzKowOTB(?J|ZG7*}~RN{2pL9OU9DihC8J6J|#;x#gcSwYrjR#B-h;T*J(
zI4U#ssQwn*jw#dz#!(ADh5W0T!Y1Z7c`6$C3Tonc9KqZ8F}}e)xScd<NByXU9mE8V
zq9#6vI@1f*Ti8l_3ALa<aT}J?&<2{Zmif(IRj`*wv{KXxPoXlC#jW@~@-f$WXeYN(
znfV0=@K@9VR<Q${xv71495vw&s7zf$ZFn9-O?Zonc61*#;3Mnr))&^-sD-VdzW*0$
zAu$F~=E_h<7`HZH1MOY5-G{xjhfxb*@-X@tU8G|t9am8U7f}P<N2UBBYGDhue+iZH
z7s%Z*2Z%007fVN`qMw<v(MBj6y3{JlXfmqlLH-Z@*C1uol}f!#IQFRM1*FC3tUo2l
zZd3+&GQSy(T5B&F?N&uuX^(1aZ&2Nz_hrOZlnKpm4ilZkQQ`=pqTPK)xP&f^etO+R
zKcTzOL+mA#M%{9~1sy_#Q;A;RDOC18Bua>3LPck<vV%DBIS-|Lh|pyjBUD-movAL)
zK0<{H936w|jfCEmx(_<K|Ci$8y1H2W(Ai8baHeK61t&KfIGOW)q4;wB*3!EhHpgoA
zC*1BtGU+5!>16j@b7kWZdU_IWm*cwW&Q!abblu8vuMi|A@?Nem;{~(%v@?7<?-v5!
z%Q-`t{It_|K9lpk$qp|VoX&dwOvmJGc3|#e<x(s)ccQ8-)>XVv^;K*~Mk55?OmHSQ
a9W5j9Gx@;D`ID!E;&OGqbnayBAO8YMP^Z-Z

diff --git a/src/mahjong_ranking/locale/de/LC_MESSAGES/django.po b/src/mahjong_ranking/locale/de/LC_MESSAGES/django.po
index 6ca0ee0..74fce0c 100644
--- a/src/mahjong_ranking/locale/de/LC_MESSAGES/django.po
+++ b/src/mahjong_ranking/locale/de/LC_MESSAGES/django.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: kasu.mahjong_ranking\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-06-19 22:46+0200\n"
-"PO-Revision-Date: 2016-09-28 00:24+0200\n"
-"Last-Translator: Christian Berg <xeniac.at@gmail.com>\n"
+"POT-Creation-Date: 2018-04-27 09:49+0200\n"
+"PO-Revision-Date: 2018-04-27 09:54+0105\n"
+"Last-Translator: b'Christian Berg <kasu@xendynastie.at>'\n"
 "Language-Team: Kasu <verein@kasu.at>\n"
 "Language: de\n"
 "MIME-Version: 1.0\n"
@@ -17,381 +17,377 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "X-Generator: Poedit 1.8.9\n"
-"X-Translated-Using: django-rosetta 0.7.6\n"
+"X-Translated-Using: django-rosetta 0.7.14\n"
 
-#: mahjong_ranking/admin.py:26
+#: admin.py:26
 msgid "Recalculate"
 msgstr "Neuberechnen"
 
-#: mahjong_ranking/admin.py:36
+#: admin.py:36
 msgid "Confirm"
 msgstr "Bestätigen"
 
-#: mahjong_ranking/admin.py:46
+#: admin.py:46
 msgid "Set unconfirmed"
 msgstr "Als unbestätigt markieren"
 
-#: mahjong_ranking/forms.py:21
+#: forms.py:21
 msgid "start"
 msgstr "Beginn"
 
-#: mahjong_ranking/models.py:89
-#: mahjong_ranking/templates/mahjong_ranking/player_dan_score.html:14
-#: mahjong_ranking/templates/mahjong_ranking/player_invalid_score.html:13
-#: mahjong_ranking/templates/mahjong_ranking/player_kyu_score.html:15
-#: mahjong_ranking/templates/mahjong_ranking/player_ladder_score.html:15
-#: mahjong_ranking/templates/mahjong_ranking/seasonranking_list.html:10
+#: models.py:91 templates/mahjong_ranking/player_dan_score.html:14
+#: templates/mahjong_ranking/player_invalid_score.html:13
+#: templates/mahjong_ranking/player_kyu_score.html:15
+#: templates/mahjong_ranking/player_ladder_score.html:15
+#: templates/mahjong_ranking/seasonranking_list.html:10
 msgid "Start"
 msgstr "Beginn"
 
-#: mahjong_ranking/models.py:90
+#: models.py:92
 msgid "This is crucial to get the right Hanchans that scores"
 msgstr "Wichtig damit die richtigen Hanchans in die Wertung kommen."
 
-#: mahjong_ranking/models.py:97
+#: models.py:99
 msgid "Player 1"
 msgstr "Spieler 1"
 
-#: mahjong_ranking/models.py:98 mahjong_ranking/models.py:100
-#: mahjong_ranking/models.py:117 mahjong_ranking/models.py:119
-#: mahjong_ranking/models.py:136 mahjong_ranking/models.py:138
-#: mahjong_ranking/models.py:155 mahjong_ranking/models.py:157
-#: mahjong_ranking/templates/mahjong_ranking/eventhanchan_list.html:19
-#: mahjong_ranking/templates/mahjong_ranking/eventranking_list.html:21
-#: mahjong_ranking/templates/mahjong_ranking/hanchan_confirm_delete.html:16
-#: mahjong_ranking/templates/mahjong_ranking/hanchan_form.html:19
-#: mahjong_ranking/templates/mahjong_ranking/kyudanranking_list.html:35
-#: mahjong_ranking/templates/mahjong_ranking/seasonranking_list.html:32
+#: models.py:100 models.py:102 models.py:119 models.py:121 models.py:138
+#: models.py:140 models.py:157 models.py:159
+#: templates/mahjong_ranking/eventhanchan_list.html:19
+#: templates/mahjong_ranking/eventranking_list.html:21
+#: templates/mahjong_ranking/hanchan_confirm_delete.html:16
+#: templates/mahjong_ranking/hanchan_form.html:19
+#: templates/mahjong_ranking/kyudanranking_list.html:35
+#: templates/mahjong_ranking/seasonranking_list.html:32
 msgid "Score"
 msgstr "Punkte"
 
-#: mahjong_ranking/models.py:110 mahjong_ranking/models.py:129
-#: mahjong_ranking/models.py:148 mahjong_ranking/models.py:167
-#: mahjong_ranking/models.py:169
-#: mahjong_ranking/templates/mahjong_ranking/hanchan_form.html:20
-#: mahjong_ranking/templates/mahjong_ranking/player_dan_score.html:18
-#: mahjong_ranking/templates/mahjong_ranking/player_invalid_score.html:17
+#: models.py:112 models.py:131 models.py:150 models.py:169 models.py:171
+#: templates/mahjong_ranking/hanchan_form.html:20
+#: templates/mahjong_ranking/player_dan_score.html:18
+#: templates/mahjong_ranking/player_invalid_score.html:17
 msgid "Comment"
 msgstr "Kommentar"
 
-#: mahjong_ranking/models.py:116
+#: models.py:118
 msgid "Player 2"
 msgstr "Spieler 2"
 
-#: mahjong_ranking/models.py:135
+#: models.py:137
 msgid "Player 3"
 msgstr "Spieler 3"
 
-#: mahjong_ranking/models.py:154
+#: models.py:156
 msgid "Player 4"
 msgstr "Spieler 4"
 
-#: mahjong_ranking/models.py:170
+#: models.py:173
 msgid "Has been Confirmed"
 msgstr "Wurde bestätigt"
 
-#: mahjong_ranking/models.py:172
+#: models.py:174
 msgid "Only valid and confirmed Hanchans will be counted in the rating."
 msgstr "Nur gültige und bestätigte Hanchans kommen in die Wertung."
 
-#: mahjong_ranking/models.py:177 mahjong_ranking/models.py:576
-#: mahjong_ranking/templates/mahjong_ranking/ladder_redbox.html:29
-#: mahjong_ranking/templates/mahjong_ranking/player_ladder_score.html:63
+#: models.py:179 models.py:603 templates/mahjong_ranking/ladder_redbox.html:29
+#: templates/mahjong_ranking/player_ladder_score.html:63
 msgid "Season"
 msgstr "Saison"
 
-#: mahjong_ranking/models.py:182
+#: models.py:184
 msgid "Hanchan"
 msgstr "Hanchan"
 
-#: mahjong_ranking/models.py:183
-#: mahjong_ranking/templates/mahjong_ranking/eventranking_list.html:17
+#: models.py:185 templates/mahjong_ranking/eventranking_list.html:17
 msgid "Hanchans"
 msgstr "Hanchans"
 
-#: mahjong_ranking/models.py:186
+#: models.py:188
 msgid "Hanchan from {0:%Y-%m-%d} at {0:%H:%M} with {1}"
 msgstr "Hanchan vom {0:%Y-%m-%d} um {0:%H:%M} mit {1}"
 
-#: mahjong_ranking/models.py:213
+#: models.py:215
 #, python-format
 msgid "%s can't attend the same game multiple times"
 msgstr "%s kann an einem Spiel nicht mehrfach teilnehmen."
 
-#: mahjong_ranking/models.py:221
+#: models.py:223
 msgid "Games in the future may not be added, Dr. Brown"
 msgstr "Spiele aus der Zukunft dürfen noch nicht erfasst werden. Dr. Brown."
 
-#: mahjong_ranking/models.py:223
+#: models.py:225
 msgid "Only games during the event are allowed"
 msgstr "Nur Spiele während der Veranstaltung zählen."
 
-#: mahjong_ranking/models.py:226
+#: models.py:228
 msgid "Gamescore is lower then 100.000 Pt."
 msgstr "Spielstand ist weniger als 100.000 Punkte"
 
-#: mahjong_ranking/models.py:228
+#: models.py:230
 msgid "Gamescore is over 100.000 Pt."
 msgstr "Spielstand ist über 100.000 Punkte."
 
-#: mahjong_ranking/models.py:352
+#: models.py:356
 msgid "Kyū/Dan Ranking"
 msgstr "Kyū/Dan Wertung"
 
-#: mahjong_ranking/models.py:353
+#: models.py:357
 msgid "Kyū/Dan Rankings"
 msgstr "Kyū/Dan Wertungen"
 
-#: mahjong_ranking/templates/mahjong_ranking/eventhanchan_list.html:7
+#: templates/mahjong_ranking/eventhanchan_list.html:7
 msgid "Played Hanchans"
 msgstr "Gespielte Hanchans"
 
-#: mahjong_ranking/templates/mahjong_ranking/eventhanchan_list.html:18
-#: mahjong_ranking/templates/mahjong_ranking/hanchan_confirm_delete.html:15
+#: templates/mahjong_ranking/eventhanchan_list.html:18
+#: templates/mahjong_ranking/hanchan_confirm_delete.html:15
 msgid "Place"
 msgstr "Platz"
 
-#: mahjong_ranking/templates/mahjong_ranking/eventhanchan_list.html:21
-#: mahjong_ranking/templates/mahjong_ranking/hanchan_confirm_delete.html:18
-#: mahjong_ranking/templates/mahjong_ranking/player_dan_score.html:17
+#: templates/mahjong_ranking/eventhanchan_list.html:21
+#: templates/mahjong_ranking/hanchan_confirm_delete.html:18
+#: templates/mahjong_ranking/player_dan_score.html:17
 msgid "Dan Points"
 msgstr "Dan Punkte"
 
-#: mahjong_ranking/templates/mahjong_ranking/eventhanchan_list.html:23
-#: mahjong_ranking/templates/mahjong_ranking/hanchan_confirm_delete.html:20
-#: mahjong_ranking/templates/mahjong_ranking/player_invalid_score.html:16
-#: mahjong_ranking/templates/mahjong_ranking/player_kyu_score.html:18
+#: templates/mahjong_ranking/eventhanchan_list.html:23
+#: templates/mahjong_ranking/hanchan_confirm_delete.html:20
+#: templates/mahjong_ranking/player_invalid_score.html:16
+#: templates/mahjong_ranking/player_kyu_score.html:18
 msgid "Kyu Points"
 msgstr "Kyu Punkte"
 
-#: mahjong_ranking/templates/mahjong_ranking/eventhanchan_list.html:37
-#: mahjong_ranking/templates/mahjong_ranking/hanchan_confirm_delete.html:4
-#: mahjong_ranking/templates/mahjong_ranking/hanchan_confirm_delete.html:33
-#: mahjong_ranking/templates/mahjong_ranking/player_dan_score.html:44
-#: mahjong_ranking/templates/mahjong_ranking/player_invalid_score.html:33
-#: mahjong_ranking/templates/mahjong_ranking/player_kyu_score.html:41
-#: mahjong_ranking/templates/mahjong_ranking/player_ladder_score.html:52
+#: templates/mahjong_ranking/eventhanchan_list.html:37
+#: templates/mahjong_ranking/hanchan_confirm_delete.html:4
+#: templates/mahjong_ranking/hanchan_confirm_delete.html:33
+#: templates/mahjong_ranking/player_dan_score.html:44
+#: templates/mahjong_ranking/player_invalid_score.html:33
+#: templates/mahjong_ranking/player_kyu_score.html:41
+#: templates/mahjong_ranking/player_ladder_score.html:52
 msgid "Delete Hanchan"
 msgstr "Hanchan löschen"
 
-#: mahjong_ranking/templates/mahjong_ranking/eventhanchan_list.html:43
-#: mahjong_ranking/templates/mahjong_ranking/hanchan_form.html:4
-#: mahjong_ranking/templates/mahjong_ranking/hanchan_form.html:14
-#: mahjong_ranking/templates/mahjong_ranking/player_dan_score.html:47
-#: mahjong_ranking/templates/mahjong_ranking/player_invalid_score.html:36
-#: mahjong_ranking/templates/mahjong_ranking/player_kyu_score.html:44
-#: mahjong_ranking/templates/mahjong_ranking/player_ladder_score.html:55
+#: templates/mahjong_ranking/eventhanchan_list.html:43
+#: templates/mahjong_ranking/hanchan_form.html:4
+#: templates/mahjong_ranking/hanchan_form.html:14
+#: templates/mahjong_ranking/player_dan_score.html:47
+#: templates/mahjong_ranking/player_invalid_score.html:36
+#: templates/mahjong_ranking/player_kyu_score.html:44
+#: templates/mahjong_ranking/player_ladder_score.html:55
 msgid "Edit Hanchan"
 msgstr "Hanchan bearbeiten"
 
-#: mahjong_ranking/templates/mahjong_ranking/eventhanchan_list.html:48
+#: templates/mahjong_ranking/eventhanchan_list.html:48
 msgid "No Hanchan has been added to this event yet."
 msgstr "Für diese Veranstaltung wurde noch keine Hanchan eingetragen."
 
-#: mahjong_ranking/templates/mahjong_ranking/eventhanchan_list.html:54
-#: mahjong_ranking/templates/mahjong_ranking/eventranking_list.html:51
+#: templates/mahjong_ranking/eventhanchan_list.html:54
+#: templates/mahjong_ranking/eventranking_list.html:51
 msgid "Edit Event"
 msgstr "Veranstaltung bearbeiten"
 
-#: mahjong_ranking/templates/mahjong_ranking/eventhanchan_list.html:55
-#: mahjong_ranking/templates/mahjong_ranking/eventranking_list.html:52
-#: mahjong_ranking/templates/mahjong_ranking/hanchan_form.html:4
-#: mahjong_ranking/templates/mahjong_ranking/hanchan_form.html:14
+#: templates/mahjong_ranking/eventhanchan_list.html:55
+#: templates/mahjong_ranking/eventranking_list.html:52
+#: templates/mahjong_ranking/hanchan_form.html:4
+#: templates/mahjong_ranking/hanchan_form.html:14
 msgid "Add Hanchan"
 msgstr "Hanchan hinzufügen"
 
-#: mahjong_ranking/templates/mahjong_ranking/eventranking_list.html:4
-#: mahjong_ranking/templates/mahjong_ranking/eventranking_list.html:5
+#: templates/mahjong_ranking/eventranking_list.html:4
+#: templates/mahjong_ranking/eventranking_list.html:5
 msgid "Tournament Ranking"
 msgstr "Turnierwertung"
 
-#: mahjong_ranking/templates/mahjong_ranking/eventranking_list.html:12
-#: mahjong_ranking/templates/mahjong_ranking/kyudanranking_list.html:30
-#: mahjong_ranking/templates/mahjong_ranking/seasonranking_list.html:23
+#: templates/mahjong_ranking/eventranking_list.html:12
+#: templates/mahjong_ranking/kyudanranking_list.html:30
+#: templates/mahjong_ranking/seasonranking_list.html:23
 msgid "Rank"
 msgstr "Rang"
 
-#: mahjong_ranking/templates/mahjong_ranking/eventranking_list.html:13
-#: mahjong_ranking/templates/mahjong_ranking/kyudanranking_list.html:17
-#: mahjong_ranking/templates/mahjong_ranking/seasonranking_list.html:24
+#: templates/mahjong_ranking/eventranking_list.html:13
+#: templates/mahjong_ranking/kyudanranking_list.html:17
+#: templates/mahjong_ranking/seasonranking_list.html:24
 msgid "Avatar"
 msgstr "Avatar"
 
-#: mahjong_ranking/templates/mahjong_ranking/eventranking_list.html:14
-#: mahjong_ranking/templates/mahjong_ranking/kyudanranking_list.html:20
-#: mahjong_ranking/templates/mahjong_ranking/seasonranking_list.html:25
+#: templates/mahjong_ranking/eventranking_list.html:14
+#: templates/mahjong_ranking/kyudanranking_list.html:20
+#: templates/mahjong_ranking/seasonranking_list.html:25
 msgid "Nickname"
 msgstr "Spitzname"
 
-#: mahjong_ranking/templates/mahjong_ranking/eventranking_list.html:15
-#: mahjong_ranking/templates/mahjong_ranking/seasonranking_list.html:26
+#: templates/mahjong_ranking/eventranking_list.html:15
+#: templates/mahjong_ranking/seasonranking_list.html:26
 msgid "Name"
 msgstr "Name"
 
-#: mahjong_ranking/templates/mahjong_ranking/eventranking_list.html:16
-#: mahjong_ranking/templates/mahjong_ranking/seasonranking_list.html:27
+#: templates/mahjong_ranking/eventranking_list.html:16
+#: templates/mahjong_ranking/seasonranking_list.html:27
 msgid "Average"
 msgstr "Durchschnitt"
 
-#: mahjong_ranking/templates/mahjong_ranking/eventranking_list.html:20
-#: mahjong_ranking/templates/mahjong_ranking/player_dan_score.html:15
-#: mahjong_ranking/templates/mahjong_ranking/player_invalid_score.html:15
-#: mahjong_ranking/templates/mahjong_ranking/player_kyu_score.html:16
-#: mahjong_ranking/templates/mahjong_ranking/player_ladder_score.html:16
-#: mahjong_ranking/templates/mahjong_ranking/seasonranking_list.html:31
+#: templates/mahjong_ranking/eventranking_list.html:20
+#: templates/mahjong_ranking/player_dan_score.html:15
+#: templates/mahjong_ranking/player_invalid_score.html:15
+#: templates/mahjong_ranking/player_kyu_score.html:16
+#: templates/mahjong_ranking/player_ladder_score.html:16
+#: templates/mahjong_ranking/seasonranking_list.html:31
 msgid "Placement"
 msgstr "Platzierung"
 
-#: mahjong_ranking/templates/mahjong_ranking/eventranking_list.html:22
-#: mahjong_ranking/templates/mahjong_ranking/seasonranking_list.html:33
+#: templates/mahjong_ranking/eventranking_list.html:22
+#: templates/mahjong_ranking/seasonranking_list.html:33
 msgid "count"
 msgstr "Anzahl"
 
-#: mahjong_ranking/templates/mahjong_ranking/eventranking_list.html:23
-#: mahjong_ranking/templates/mahjong_ranking/seasonranking_list.html:34
+#: templates/mahjong_ranking/eventranking_list.html:23
+#: templates/mahjong_ranking/seasonranking_list.html:34
 msgid "good"
 msgstr "gut"
 
-#: mahjong_ranking/templates/mahjong_ranking/eventranking_list.html:24
-#: mahjong_ranking/templates/mahjong_ranking/seasonranking_list.html:35
+#: templates/mahjong_ranking/eventranking_list.html:24
+#: templates/mahjong_ranking/seasonranking_list.html:35
 msgid "won"
 msgstr "gewonnen"
 
-#: mahjong_ranking/templates/mahjong_ranking/hanchan_confirm_delete.html:39
+#: templates/mahjong_ranking/hanchan_confirm_delete.html:39
 msgid "Cancel"
 msgstr "Abbruch"
 
-#: mahjong_ranking/templates/mahjong_ranking/hanchan_confirm_delete.html:40
+#: templates/mahjong_ranking/hanchan_confirm_delete.html:40
 msgid "Delete"
 msgstr "Löschen"
 
-#: mahjong_ranking/templates/mahjong_ranking/hanchan_form.html:18
+#: templates/mahjong_ranking/hanchan_form.html:18
 msgid "Player"
 msgstr "Spieler"
 
-#: mahjong_ranking/templates/mahjong_ranking/hanchan_form.html:58
+#: templates/mahjong_ranking/hanchan_form.html:58
 msgid "Total"
 msgstr "Total"
 
-#: mahjong_ranking/templates/mahjong_ranking/hanchan_form.html:71
+#: templates/mahjong_ranking/hanchan_form.html:71
 msgid "back"
 msgstr "Zurück"
 
-#: mahjong_ranking/templates/mahjong_ranking/hanchan_form.html:72
+#: templates/mahjong_ranking/hanchan_form.html:72
 msgid "save"
 msgstr "Speichern"
 
-#: mahjong_ranking/templates/mahjong_ranking/kyudanranking_list.html:4
-#: mahjong_ranking/templates/mahjong_ranking/kyudanranking_list.html:9
+#: templates/mahjong_ranking/kyudanranking_list.html:4
+#| msgid "Player List"
+msgid "Players list"
+msgstr "Spielerliste"
+
+#: templates/mahjong_ranking/kyudanranking_list.html:9
 msgid "Player List"
 msgstr "Spieler Liste"
 
-#: mahjong_ranking/templates/mahjong_ranking/kyudanranking_list.html:25
+#: templates/mahjong_ranking/kyudanranking_list.html:25
 msgid "Full Name"
 msgstr "Voller Name"
 
-#: mahjong_ranking/templates/mahjong_ranking/kyudanranking_list.html:40
+#: templates/mahjong_ranking/kyudanranking_list.html:40
 msgid "Games Total"
 msgstr "Spiele total"
 
-#: mahjong_ranking/templates/mahjong_ranking/ladder_redbox.html:3
+#: templates/mahjong_ranking/ladder_redbox.html:3
 msgid "Latest Hanchans"
 msgstr "Letzten Hanchans"
 
-#: mahjong_ranking/templates/mahjong_ranking/ladder_redbox.html:15
+#: templates/mahjong_ranking/ladder_redbox.html:15
 msgid "Latest Events"
 msgstr "Letzte Veranstaltungen"
 
-#: mahjong_ranking/templates/mahjong_ranking/ladder_redbox.html:27
+#: templates/mahjong_ranking/ladder_redbox.html:27
 msgid "Ladder Archive"
 msgstr "Ladder Archiv"
 
-#: mahjong_ranking/templates/mahjong_ranking/player_dan_score.html:4
-#: mahjong_ranking/templates/mahjong_ranking/player_dan_score.html:5
+#: templates/mahjong_ranking/player_dan_score.html:4
+#: templates/mahjong_ranking/player_dan_score.html:5
 msgid "Dan Score for"
 msgstr "Dan Wertung für"
 
-#: mahjong_ranking/templates/mahjong_ranking/player_dan_score.html:8
+#: templates/mahjong_ranking/player_dan_score.html:8
 msgid "Hanchans that apply to the Dan Score"
 msgstr "Hanchans welche zur Dan Wertung zählen"
 
-#: mahjong_ranking/templates/mahjong_ranking/player_dan_score.html:12
-#: mahjong_ranking/templates/mahjong_ranking/player_kyu_score.html:13
-#: mahjong_ranking/templates/mahjong_ranking/player_ladder_score.html:13
+#: templates/mahjong_ranking/player_dan_score.html:12
+#: templates/mahjong_ranking/player_kyu_score.html:13
+#: templates/mahjong_ranking/player_ladder_score.html:13
 msgid "Date"
 msgstr "Datum"
 
-#: mahjong_ranking/templates/mahjong_ranking/player_dan_score.html:13
-#: mahjong_ranking/templates/mahjong_ranking/player_invalid_score.html:12
-#: mahjong_ranking/templates/mahjong_ranking/player_kyu_score.html:14
-#: mahjong_ranking/templates/mahjong_ranking/player_ladder_score.html:14
+#: templates/mahjong_ranking/player_dan_score.html:13
+#: templates/mahjong_ranking/player_invalid_score.html:12
+#: templates/mahjong_ranking/player_kyu_score.html:14
+#: templates/mahjong_ranking/player_ladder_score.html:14
 msgid "Event"
 msgstr "Veranstaltung"
 
-#: mahjong_ranking/templates/mahjong_ranking/player_dan_score.html:16
-#: mahjong_ranking/templates/mahjong_ranking/player_invalid_score.html:14
-#: mahjong_ranking/templates/mahjong_ranking/player_kyu_score.html:17
-#: mahjong_ranking/templates/mahjong_ranking/player_ladder_score.html:17
+#: templates/mahjong_ranking/player_dan_score.html:16
+#: templates/mahjong_ranking/player_invalid_score.html:14
+#: templates/mahjong_ranking/player_kyu_score.html:17
+#: templates/mahjong_ranking/player_ladder_score.html:17
 msgid "Players"
 msgstr "Spieler"
 
-#: mahjong_ranking/templates/mahjong_ranking/player_invalid_score.html:4
-#: mahjong_ranking/templates/mahjong_ranking/player_invalid_score.html:6
+#: templates/mahjong_ranking/player_invalid_score.html:4
+#: templates/mahjong_ranking/player_invalid_score.html:6
 msgid "Unconfirmed Hanchans from"
 msgstr "Nicht bestätigte Hanchans von"
 
-#: mahjong_ranking/templates/mahjong_ranking/player_invalid_score.html:9
+#: templates/mahjong_ranking/player_invalid_score.html:9
 msgid "Invalid hanchans with"
 msgstr "Ungültige Hanchans mit"
 
-#: mahjong_ranking/templates/mahjong_ranking/player_kyu_score.html:4
-#: mahjong_ranking/templates/mahjong_ranking/player_kyu_score.html:6
+#: templates/mahjong_ranking/player_kyu_score.html:4
+#: templates/mahjong_ranking/player_kyu_score.html:6
 msgid "Kyu Score for"
 msgstr "Kyu Wertung für"
 
-#: mahjong_ranking/templates/mahjong_ranking/player_kyu_score.html:9
+#: templates/mahjong_ranking/player_kyu_score.html:9
 msgid "Hanchans that apply to the Kyu Score"
 msgstr "Hanchans welche zur Kyu Wertung zählen"
 
-#: mahjong_ranking/templates/mahjong_ranking/player_ladder_score.html:4
-#: mahjong_ranking/templates/mahjong_ranking/player_ladder_score.html:5
+#: templates/mahjong_ranking/player_ladder_score.html:4
+#: templates/mahjong_ranking/player_ladder_score.html:5
 msgid "Ladder Score for"
 msgstr "Ladder Wertung für"
 
-#: mahjong_ranking/templates/mahjong_ranking/player_ladder_score.html:8
+#: templates/mahjong_ranking/player_ladder_score.html:8
 msgid "Hanchans that apply to the Ladder Score"
 msgstr "Hanchans welche in der Ladder zählen"
 
-#: mahjong_ranking/templates/mahjong_ranking/player_ladder_score.html:71
+#: templates/mahjong_ranking/player_ladder_score.html:71
 msgid "Go"
 msgstr "Los"
 
-#: mahjong_ranking/templates/mahjong_ranking/seasonranking_list.html:11
+#: templates/mahjong_ranking/seasonranking_list.html:11
 msgid "End"
 msgstr "Ende"
 
-#: mahjong_ranking/templates/mahjong_ranking/seasonranking_list.html:12
+#: templates/mahjong_ranking/seasonranking_list.html:12
 msgid "Participants"
 msgstr "Teilnehmer"
 
-#: mahjong_ranking/views.py:98
+#: views.py:102
 #, python-format
 msgid "%s has been updated successfully."
 msgstr "%s wurde erfolgreich aktualisiert."
 
-#: mahjong_ranking/views.py:101
+#: views.py:105
 #, python-format
 msgid "%s has been added successfully. You can now add a new one."
 msgstr "%s wurde erfolgreich hinzugefügt. Du kannst eine neue eintragen."
 
-#: mahjong_ranking/views.py:119 mahjong_ranking/views.py:135
-msgid "Event does not exist"
-msgstr "Veranstaltung existiert nicht"
-
-#: mahjong_ranking/views.py:199
+#: views.py:169
 msgid "No user found matching the name {}"
 msgstr "Kein Benutzer mit dem Namen %s gefunden"
 
+#~ msgid "Event does not exist"
+#~ msgstr "Veranstaltung existiert nicht"
+
 #~ msgid "It's not allowed to enter future games."
 #~ msgstr "Spiele in der Zukunft sind nicht erlaubt."
 
diff --git a/src/mahjong_ranking/templates/mahjong_ranking/kyudanranking_list.html b/src/mahjong_ranking/templates/mahjong_ranking/kyudanranking_list.html
index 7b09151..c1e3f28 100755
--- a/src/mahjong_ranking/templates/mahjong_ranking/kyudanranking_list.html
+++ b/src/mahjong_ranking/templates/mahjong_ranking/kyudanranking_list.html
@@ -1,12 +1,12 @@
 {% extends "mahjong_ranking/page.html" %}
 {% load i18n thumbnail %}
 
-{% block title %}{% trans 'Player List' %}{% endblock %}
+{% block title %}{% trans 'Players list' %}{% endblock %}
 {% block extra_head %}
 <link rel="canonical" href="{% url 'kyudanranking-list' %}?page={{page_obj.number}}" />
 {% endblock %}
 
-{% block teaser %}<h1>{% trans 'Player List' %}</h1>{% endblock %}
+{% block teaser %}<h1>{% trans 'Players list' %}</h1>{% endblock %}
 
 {% block redbox %}{% include 'mahjong_ranking/ladder_redbox.html' %}{% endblock %}
 
@@ -59,4 +59,4 @@
 {% endfor %}
  </tbody>
 </table>
-{% endblock %}
\ No newline at end of file
+{% endblock %}

From 877715f6136939d0966a8e6e1204eaf8b74c579e Mon Sep 17 00:00:00 2001
From: Xeniac <xeniac@posteo.at>
Date: Fri, 27 Apr 2018 10:20:29 +0200
Subject: [PATCH 04/23] Event gallery shows most recent albums first. Doubled
 the shown events in the gallery to 24 per page.

---
 src/events/views.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/events/views.py b/src/events/views.py
index e92bd3a..d75118f 100644
--- a/src/events/views.py
+++ b/src/events/views.py
@@ -80,7 +80,8 @@ class EventGallery(generic.ListView):
         event_series__isnull=True,
         photo_count__gt=0
     )
-    paginate_by = 12
+    queryset = queryset.order_by('-start')
+    paginate_by = 24
 
 
 class EventListIcal(generic.View):

From 432673a967a4abe13f3d3bab42e2fd485b37d8ad Mon Sep 17 00:00:00 2001
From: Xeniac <xeniac@posteo.at>
Date: Fri, 27 Apr 2018 10:34:37 +0200
Subject: [PATCH 05/23] Updated all translations

---
 src/content/locale/de/LC_MESSAGES/django.mo   | Bin 3144 -> 3284 bytes
 src/content/locale/de/LC_MESSAGES/django.po   | 169 +++---
 src/events/locale/de/LC_MESSAGES/django.mo    | Bin 3952 -> 3695 bytes
 src/events/locale/de/LC_MESSAGES/django.po    | 209 ++++----
 src/kasu/locale/de/LC_MESSAGES/django.mo      | Bin 18151 -> 3473 bytes
 src/kasu/locale/de/LC_MESSAGES/django.po      | 100 ++--
 .../locale/de/LC_MESSAGES/django.mo           | Bin 2996 -> 3215 bytes
 .../locale/de/LC_MESSAGES/django.po           | 131 +++--
 .../locale/de/LC_MESSAGES/django.mo           | Bin 10390 -> 9860 bytes
 .../locale/de/LC_MESSAGES/django.po           | 352 ++++++------
 src/utils/locale/de/LC_MESSAGES/django.mo     | Bin 13006 -> 11847 bytes
 src/utils/locale/de/LC_MESSAGES/django.po     | 500 +++++++++---------
 12 files changed, 711 insertions(+), 750 deletions(-)

diff --git a/src/content/locale/de/LC_MESSAGES/django.mo b/src/content/locale/de/LC_MESSAGES/django.mo
index 61bad0e44b8c877919322d1bbe86956c605c06c8..5c3a5718cc2873e4926ba029ba8cf54edd6c7b68 100644
GIT binary patch
delta 1651
zcmZ|OPiz!b9Ki9{+P~XY`D2QrhKB}ffc;a`0$nMPN{J2iAFPpJ2+r=l?o2v6yUx5R
zZ9Qx>M2{XuI1w)<L}EAyiHQNd)R;ykA%U29kOT}jFC<<_Nbvhxr{QEXyPtXge!t&)
zZ@c=;t!G=eH*}p<{JqNOc|QMiNK2{To_Op4uh(h!;UD-U-o;+LpZWlwqTSK;-@NtM
zLwhr3aBJGX3uWCn5~rmm(~en`i6tDyQz(fSkVk#O*C2j|{rCk+pf6DpUBDr{gi`2L
z?8cu^;{Ae~@lHDa5WC2)x|y|ufegNg<H(pgjy&pQ+OD9?b5Rl`D21F)$1k81@=ZE^
z8B4UU;$B?GU=C;S1zf~k<X7i-k%TMQiK{3Henr{wEtHeFgL1@w<2rnZ>v4!<Acxw5
z5@#E3z#S-YCe!}I$P#q~FLTXDu_bre%{C;^(<lkHqfFe5%u$o+_;lKS4<+F#l)?=1
zs3u>sZW$%s$Jjn8l&d_Cvh%M|HuiHr=Pv<n(jgV!M%meYl!cuPN&y2Xg>6I$^b*QW
z^C)*ahFkCm@~C;fWPAa$_z`Z$iztQPKq>V14CgNs|D<CK@1i8$L>69^Mj79UvY>!c
z&>nmX51=IY9Jk>QsPQix#V)of^LHcvAZkBK+^N(z-r<G0>Nsx1YT8~zIf*kUzv{Ed
zp{TFY{!3~5N0b6rQ3||1n0(rG?aE~LL`N%d>P9!_v~`VcIyIx6NPAYF_IzJE&8Bfe
z?FIVXqqC7VxteyZZ5H$SYNPIWL9WuM=gWShmVdv#l#Tqjb~3L@Yk{n1{dTyeMm$p0
zzBg|qvTf+H(UCEME-&d!J8xX}y-M<7&zs4;o&&8$U`@cprKVAp&^Xpqbt6zFaLNQE
zXPx0l&3R#D_1Xl-DxaD3#La4Z2|b~Sj8&1dU{u6TDz2`Ys1kZj>k%+=oshlrLggy5
zj*TPrc9?w7J3F*DTNul}vPTytienSW_r1?m*Lp?^#lrZ`!f0VUGwVb)TMC^ZB6TAy
z>hj2IZs<kUa{@hO!kXSU??myzMH5t)0w#MV=h*!tEDUNfhn+1Mr(V>DOl%{H+m{^d
zJC{7_8}67$ZuY(0IXadM_ut4&QF_^U9Lkk@{pF6<ArtCj?RNX}PJ2ev!!1>To1#TD
z;{`USmvd9a|Gl*I#vaGx%8cI*v+~{C9H-2+xVmQQPQ{hqL|DzK>E!i+!^yV;Gntvd
zb$lCfPsxLUt<z*>wQsdkSH7{!*65Wp0X4-zO`V9tm1~uGu4CB*>R8hd*o3^r6}QZt
OxS{dNOiV@xH~k9@V>S=~

delta 1492
zcmY+^PiP!v7{~E<o4DC*Qd`q%l8u_z*4UVI<7U&)8kRKLN}9F-F)J3K!kD~d$L?;!
z%%l_r7s*8ty^H}*f){T^O6WnFP(%+R2p&WfYz~%+s30Ee$?tDxP<)wZKJUKs&in7#
z-R}m!8ffkIb#5BUH1RO;WyY9!taosuyxnO`559vr+{F9wBkaO!sW)&RpLbCGzQHVh
zk9oYEw*QKH?=NJWmbsTU<nBv4?#GAdFoc@8jJ-IE-FOZ)z>BB}F5+HXK}{SWmwAJm
z#(4`1_#x`~7BZ#T#xdqMpHn$R!yoB`eT+)g97J_2;1~|01~`ja$Wr?JB668mx#_u&
z6Bytl_%V*)Ej)^MQRDWpi#^P5`l;x}0_vy^qmFU{wUAlV3#U>27ShizAY+-A@H5i(
z3Mw@NtnL9kf*R*(RKEqJi+MhMegRu*c#VoC3Q!BUid<%cn_hemHQ)!R1$=@^&8Mgx
z-bAJ7N9@C2a6jHd_0Kb?<~e{`&=BhV@jU0RogJq^xvJnWE+Ll*x#{_vSi}u{0<WVM
z`~zx%yQqG5@fiMwns}I5sG3pK^C?vS6Q~89?BV>Cn|T^6Hc;P%_i+-hrycL0eh|N-
z2K*Db%-`G&V3zIcOIScQZAMeesEI46iJw6-^>2Ax`B%>Ll2)WIPKkJoQ0XV0YS)sT
zAEd6GSz?GN6H37pp`Wi7p#`Ztn9#m!Q!0CiBkfvpQZ404C!jJ&=vb9&6{X_Qb}dPd
za;N-`5(8<wPGyYHPfRB=PAFA6y~Bk5S9Ah8HJtzl&@N9VXvm}-Z4-apvAy+f=dnz@
zm|YmD*8I>$epGkXTU&Ep5L&-!qnfj4s*C4s&3P*>h&Quy@z2>pK5(InOz2&4aiwcz
z?{u+rqBuEiCy&oemEvn%L#_X{jF-x#QvSRbM#XC2HN(0WT@GgKsaoKNk?%F_vo2V*
zm8-7ld&?7EG`HID{QAW5<;E;;HCNZYRadM!uQ6lKdEvUPTycT(n{$`=K==PT&Da%}
zUtCyxE<Tyth=0nBWXkca++b!Z?&$t@Yq#6W#5+Cnhfce|R{hA;tqa2C8bd|aZzLN%
llWer3_iTKj*Y>}>9(=LAe2Lw@?wV$4&H3~Xn(<C=|36Dlvt|GQ

diff --git a/src/content/locale/de/LC_MESSAGES/django.po b/src/content/locale/de/LC_MESSAGES/django.po
index 2193de5..bc62173 100644
--- a/src/content/locale/de/LC_MESSAGES/django.po
+++ b/src/content/locale/de/LC_MESSAGES/django.po
@@ -8,271 +8,262 @@ msgid ""
 msgstr ""
 "Project-Id-Version: kasu.content\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-06-19 22:46+0200\n"
-"PO-Revision-Date: 2016-09-28 00:24+0200\n"
-"Last-Translator: Christian Berg <xeniac@posteo.at>\n"
+"POT-Creation-Date: 2018-04-27 09:49+0200\n"
+"PO-Revision-Date: 2018-04-27 10:05+0105\n"
+"Last-Translator: b'Christian Berg <kasu@xendynastie.at>'\n"
 "Language-Team: Deutsch <>\n"
 "Language: de\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"
-"X-Translated-Using: django-rosetta 0.7.2\n"
 "X-Generator: Poedit 1.8.9\n"
+"X-Translated-Using: django-rosetta 0.7.14\n"
 
-#: content/feeds.py:16
+#: feeds.py:18
 msgid "Current news from Kasu"
 msgstr "Aktuelle Nachrichten von Kasu"
 
-#: content/feeds.py:43
+#: feeds.py:51
 msgid "Latest comments on kasu.at"
 msgstr "Neueste Kommentare auf Kasu.at "
 
-#: content/feeds.py:44
+#: feeds.py:52
 msgid "Kasu - latest comments"
 msgstr "Kasu - neue Kommentare"
 
-#: content/forms.py:52 content/models.py:308
+#: forms.py:57 models.py:315
 msgid "Please upload a PDF-File to this PDF-Page."
 msgstr "Bitte eine PDF Datei für diese PDF Seite hochladen."
 
-#: content/models.py:62
+#: models.py:68
 msgid "Headline"
 msgstr "Schlagzeile"
 
-#: content/models.py:64
+#: models.py:70
 msgid "Content"
 msgstr "Inhalt"
 
-#: content/models.py:66 content/models.py:137
-#: content/templates/content/article_detail.html:25
+#: models.py:72 models.py:143 templates/content/article_detail.html:25
 msgid "Category"
 msgstr "Kategorie"
 
-#: content/models.py:67 content/models.py:130
+#: models.py:73 models.py:136
 msgid "Image"
 msgstr "Bild"
 
-#: content/models.py:69 content/models.py:132
+#: models.py:75 models.py:138
 msgid "Slug"
 msgstr "Slug"
 
-#: content/models.py:71 content/templates/content/article_detail.html:23
+#: models.py:77 templates/content/article_detail.html:23
 msgid "Author"
 msgstr "Autor"
 
-#: content/models.py:72
+#: models.py:78
 msgid "Status"
 msgstr "Status"
 
-#: content/models.py:74
+#: models.py:80
 msgid "Created"
 msgstr "Erstellt"
 
-#: content/models.py:75
+#: models.py:81
 msgid "Modified"
 msgstr "Bearbeitet"
 
-#: content/models.py:80
+#: models.py:86
 msgid "Article"
 msgstr "Artikel"
 
-#: content/models.py:81
+#: models.py:87
 msgid "Articles"
 msgstr "Artikel"
 
-#: content/models.py:126 content/models.py:127
+#: models.py:132 models.py:133
 msgid "Name"
 msgstr "Name"
 
-#: content/models.py:128 content/models.py:129
+#: models.py:134 models.py:135
 msgid "Description"
 msgstr "Beschreibung"
 
-#: content/models.py:138
+#: models.py:144
 msgid "Categories"
 msgstr "Kategorien"
 
-#: content/models.py:169 content/models.py:175
+#: models.py:176 models.py:182
 msgid "The short name for the menu-entry of this page"
 msgstr "Ein kurzer Name für den Menüeintrag"
 
-#: content/models.py:180 content/models.py:185
+#: models.py:187 models.py:192
 msgid "The page title as you'd like it to be seen by the public"
-msgstr ""
+msgstr "Der Seitentitel der öffentlich gemacht wird."
 
-#: content/models.py:187
+#: models.py:194
 msgid "slug"
 msgstr "Slug"
 
-#: content/models.py:190
+#: models.py:197
 msgid ""
-"The name of the page as it will appear in URLs e.g http://domain.com/blog/"
-"[my-slug]/"
+"The name of the page as it will appear in URLs e.g "
+"http://domain.com/blog/[my-slug]/"
 msgstr ""
+"Der Seitenname wie er in der URL erscheint. z.B: "
+"http://domain.com/blog/[slug]/"
 
-#: content/models.py:199
+#: models.py:206
 msgid "Path"
 msgstr "Pfad"
 
-#: content/models.py:211
+#: models.py:218
 msgid "Position"
 msgstr "Position"
 
-#: content/models.py:216
+#: models.py:223
 msgid "status"
 msgstr "Status"
 
-#: content/models.py:219 content/models.py:221
-#, fuzzy
+#: models.py:226 models.py:228
 #| msgid "Description"
 msgid "search description"
-msgstr "Beschreibung"
+msgstr "Suchbeschreibung"
 
-#: content/models.py:224
-#, fuzzy
+#: models.py:231
 #| msgid "Content"
 msgid "content type"
-msgstr "Inhalt"
+msgstr "Inhaltstyp"
 
-#: content/models.py:229
+#: models.py:236
 msgid "enable comments"
 msgstr "Kommentare möglich"
 
-#: content/models.py:234
+#: models.py:241
 msgid "Template"
 msgstr "Vorlage"
 
-#: content/models.py:242
-#, fuzzy
+#: models.py:249
 #| msgid "created on"
 msgid "first created at"
 msgstr "erstellt am"
 
-#: content/models.py:247
+#: models.py:254
 msgid "latest updated at"
-msgstr ""
+msgstr "letzte Änderung"
 
-#: content/models.py:322
+#: models.py:328
 msgid "Page"
 msgstr "Seite"
 
-#: content/models.py:323
+#: models.py:329
 msgid "Pages"
 msgstr "Seiten"
 
-#: content/templates/content/article_archive.html:5
-#: content/templates/content/article_archive.html:20
+#: templates/content/article_archive.html:5
+#: templates/content/article_archive.html:20
 msgid "Article Archive"
 msgstr "Nachrichtenarchiv"
 
-#: content/templates/content/article_archive.html:35
-#: content/templates/content/article_archive_month.html:5
-#: content/templates/content/article_archive_year.html:7
+#: templates/content/article_archive.html:35
+#: templates/content/article_archive_month.html:5
+#: templates/content/article_archive_year.html:7
 msgid "Archive"
 msgstr "Archiv"
 
-#: content/templates/content/article_archive.html:56
+#: templates/content/article_archive.html:56
 msgid "All Categories"
 msgstr "Alle Kategorien"
 
-#: content/templates/content/article_archive.html:71
+#: templates/content/article_archive.html:71
 msgid "created on"
 msgstr "erstellt am"
 
-#: content/templates/content/article_archive.html:73
+#: templates/content/article_archive.html:73
 msgid "by"
 msgstr "von"
 
-#: content/templates/content/article_archive.html:74
-#: content/templates/content/article_archive.html:75
+#: templates/content/article_archive.html:74
+#: templates/content/article_archive.html:75
 msgid "comments"
 msgstr "Kommentare"
 
-#: content/templates/content/article_archive.html:81
+#: templates/content/article_archive.html:81
 msgid "Read More"
 msgstr "Mehr lesen"
 
-#: content/templates/content/article_archive.html:86
+#: templates/content/article_archive.html:86
 msgid "We're sorry. Your search yielded no results."
 msgstr "Es tut uns leid. Deine Suche ergab keine Treffer."
 
-#: content/templates/content/article_archive.html:104
+#: templates/content/article_archive.html:104
 msgid "Add Article"
 msgstr "neuer Artikel "
 
-#: content/templates/content/article_archive_month.html:7
+#: templates/content/article_archive_month.html:7
 msgid "back"
 msgstr "Zurück"
 
-#: content/templates/content/article_detail.html:24
+#: templates/content/article_detail.html:24
 msgid "Created on"
 msgstr "Erstellt am"
 
-#: content/templates/content/article_detail.html:36
+#: templates/content/article_detail.html:36
 msgid "share on"
 msgstr "Teile auf"
 
-#: content/templates/content/article_detail.html:51
-#: content/templates/content/article_form.html:20 content/views.py:138
+#: templates/content/article_detail.html:51 views.py:156
 msgid "Edit Article"
 msgstr "Artikel bearbeiten"
 
-#: content/templates/content/article_form.html:20 content/views.py:139
-msgid "Create Article"
-msgstr "Artikel erstellen"
-
-#: content/templates/content/article_form.html:25
-#: content/templates/content/page_form.html:49
-#: content/templates/content/page_form.html:56
+#: templates/content/article_form.html:32 templates/content/page_form.html:42
+#: templates/content/page_form.html:49
 msgid "German"
 msgstr "Deutsch"
 
-#: content/templates/content/article_form.html:26
-#: content/templates/content/page_form.html:50
-#: content/templates/content/page_form.html:64
+#: templates/content/article_form.html:33 templates/content/page_form.html:43
+#: templates/content/page_form.html:57
 msgid "English"
 msgstr "Englisch"
 
-#: content/templates/content/article_form.html:45
-#: content/templates/content/page_form.html:73
+#: templates/content/article_form.html:59 templates/content/page_form.html:66
 msgid "reset"
 msgstr "Zurücksetzen"
 
-#: content/templates/content/article_form.html:46
-#: content/templates/content/page_form.html:74
+#: templates/content/article_form.html:60 templates/content/page_form.html:67
 msgid "save"
 msgstr "Speichern"
 
-#: content/templates/content/page_form.html:5
-#: content/templates/content/page_form.html:42
+#: templates/content/page_form.html:5 templates/content/page_form.html:35
 msgid "Edit Page"
 msgstr "Seite bearbeiten"
 
-#: content/templates/content/page_form.html:5
-#: content/templates/content/page_form.html:28
-#: content/templates/content/page_form.html:42
+#: templates/content/page_form.html:5 templates/content/page_form.html:19
+#: templates/content/page_form.html:35
 msgid "Add Page"
 msgstr "Seite hinzufügen"
 
-#: content/templates/content/page_form.html:27
+#: templates/content/page_form.html:18
 msgid "Edit"
 msgstr "Bearbeiten"
 
-#: content/templates/content/page_form.html:44
+#: templates/content/page_form.html:37
 msgid "HTML Specific"
 msgstr "HTML spezifisch"
 
-#: content/views.py:35
+#: views.py:53
 msgid "This Category does not exist."
 msgstr "Diese Kategorie existiert nicht."
 
-#: content/views.py:205
+#: views.py:157
+msgid "Create Article"
+msgstr "Artikel erstellen"
+
+#: views.py:233
 #, python-format
 msgid "No Page found matching the Path %s"
 msgstr "Keine Seite unter dem Pfad %s gefunden"
 
-#: content/views.py:219
+#: views.py:262
 #, python-format
 msgid "No PDF Document found matching the Path %s"
 msgstr "Kein PDF Dokument unter dem Pfad %s gefunden."
diff --git a/src/events/locale/de/LC_MESSAGES/django.mo b/src/events/locale/de/LC_MESSAGES/django.mo
index 58269194c092480d88ee27b8c02c318a488d86ee..e085359ca015219c5f0aafec0ae56568333295e5 100644
GIT binary patch
delta 1348
zcmYMzT}YEr9LMpKo0VIcmZX)+N=Rrdo{jb5=tX)Vp(qoBE{u9~Piv){Y;$BmgP^*Q
zkg%vOlAs8p2qFlAUZAc*sKASEBBThqDD<L|3aalfP9)Es&pH3|_CM!5PBl)}m)_3z
zUoiY_;aAUZU72debou|=OmQFe3Or>U#+lSF<7~W&v+ySJn7h2xejkJQ2v^{94B!{^
z8B;R9DU=iN@tTVjr~$P&2b*l%vGomDLwq}Gfdi-nQr3RtF@wC+UP6{Ir&0Zetmm<k
z_01Iu^J%#KH(<;Y)PNT_564l7yhlwqg-USR#(e~<s8?YfE=7$`U^Q;E?YphrxPW*b
z%UR!?p`fEZi<Nj0cj67yL|;*f{6HQP;G9|8RHN#(IEsy^{*O>QeTp2h8AB!b(zZ{a
z68nIqg%qYKXh0<|O<aqbr~wsUX5(Sh=MhDQm^eP1!8d~m>fhOgb{6M?bz*I(jqO3*
z`F>uS_b_UmY=HA;tQjDn0VgnmL#PZNpazVgcKQl+_peb`_Q}?Nqc&2*y{J8mORyD{
zXcuaoq_qz<Z!yUEYvSWJa1wQ7XRJf0D;Y*z!Kn2PYJ$hM{tUIiIBI8aP#b!ON^}wz
zV;MnxBMqpNSzV%_BWp!<?6js(J359+@Eo#9a|yMhYuJIeP>KA)2K4bSq=}cJPB4s`
zcRdbcJ8Jv{@|f<Ayfwi$BuVoVbpo^4HglRFF2Xw0z!+*^0<}<^wF8xC7ixSDs(-5T
z-e`Hzw>+K87eYNb&n<Y#kXtYZbJ;%AOO5bAf6|6WYAZ%cYa>oP5?d2;S`zV=uoH8f
zK>MyphgVGJ)7ea93w;xzm=pciFX|*>^ou&H0z2G%A<~(1GkK=Y<`SXq=FNw4>3kvW
zW<s01Tq?Bgh?^g1J?dqWgBd!fy_IfZLo)+2sR1|TMLNBaroiX2X#8Gv(C@F`O4?p;
aZz1INnPN6$wt3I4XOdn{fswj-d;b7IL7vtC

delta 1614
zcmY+EOGuPa6vwYQX_~2NzRGNRTGr?|=4&)7O(ZfCQ!2&9R}DImGchwsZ5nz&v@)24
z77+y*M7u0%<0^t4iwHMD7z9NiNVdp8TJ-zd73whm?|1M0&b{}XbMH6bi|0z>pK@HI
z25UyeXxB1hPQXSN5A5D@V@lzDm<HciPQn!W({Kg+0#o5E)YPB${Q_J`KMChDxC*Aj
zI+$!s+_ccZ$F#v!@G#VbK9~Uq?0C%fufR2ok3fFr0S^W6*zzgVdJ~YJdC5Zoy@m37
zZ#e}s+24Gok;99*#Q~xs4Nb^_S+D>qkWz??*$ow7gB@>!+4Q?%Aq+sxzXVsqtM>h<
z<wKau_;a|N{mnZXD(wfD2|vOPI0Lm%Jz*=5Ca3^9pfc>S{XTe?{z)kRBo?D-QXnNZ
zSy1D-Fdr7$_Z2X%h3c$BlYP+wHQo-n4yFqdi|K*Sl8otxe)_qTL78+wRp=z-l?g+g
z@kOYOuR*PM11hi)DF53lslSKD7y~NRB-DhjP?^p^o%Ii>BT8YG`bAKgl-qtQTt~kb
zD$rr5jV@VUhg$b0)Via#e<y?bt3>x15XYd7;1N{GUs%3|T42idr=d2Oh01Im@-x4A
zD9|)+@>*C7bth_}D$@y7v0f;@P~0{yLuGUeD#FK5C42&v(FE**ub=`cB+B)0J=DSt
zP!(*2TKE_ofoGuRFF>Z6Wn`uK*-#0`^Jo;&D1vgVf^uwtTKJ&lQK-QBp(dV&@*jj;
ziN*g29gQ~EdhGX~?W0#^M^q`9N8kSr8v1<lPz_Sn+tC)}MI8O2=_0z(UbG)=L$U^>
z5-aEeRDw35%}AysmP`T5R4G-jTHn9Uu?*EAAKHYLtim>QmX%1E%XEgaok(ATDnlVm
zIog1BBUvMAUTpEtYPkem*nDNb$ByV+beUvLs1|KS`dh9y<Grro<m5<rC^4U!h}U?$
z^`6RVx39|Y_3iZfyx#QABc86na4;GShdc+ISitZ0c`N_%tE~F#*X~4Pp6-Yfik@|1
z;fUYeG8hR)V?ih6ZVp5S+>I9kp`deW-??x!76_L+v8MEPCp2*083=f~1J01&eaJ~<
WrhQAQ8UK~$awQLkLy3aS<9`508;@N8

diff --git a/src/events/locale/de/LC_MESSAGES/django.po b/src/events/locale/de/LC_MESSAGES/django.po
index 74dd00b..25fbf67 100644
--- a/src/events/locale/de/LC_MESSAGES/django.po
+++ b/src/events/locale/de/LC_MESSAGES/django.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: kasu.events\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-06-19 22:46+0200\n"
-"PO-Revision-Date: 2016-09-28 00:24+0200\n"
-"Last-Translator: Christian Berg <xeniac@posteo.at>\n"
+"POT-Creation-Date: 2018-04-27 09:49+0200\n"
+"PO-Revision-Date: 2018-04-27 10:29+0105\n"
+"Last-Translator: b'Christian Berg <kasu@xendynastie.at>'\n"
 "Language-Team: Kasu <verein@kasu.at>\n"
 "Language: de\n"
 "MIME-Version: 1.0\n"
@@ -17,60 +17,61 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "X-Generator: Poedit 1.8.9\n"
-"X-Translated-Using: django-rosetta 0.7.6\n"
+"X-Translated-Using: django-rosetta 0.7.14\n"
 
-#: events/admin.py:14 events/models.py:82
+#: admin.py:14 models.py:82
 msgid "Event Series"
 msgstr "Veranstaltungsreihen"
 
-#: events/forms.py:18
+#: forms.py:17
 msgid "Images"
 msgstr "Bilder"
 
-#: events/forms.py:46
+#: forms.py:46
 msgid "start"
 msgstr "Beginn"
 
-#: events/forms.py:50
+#: forms.py:49
 msgid "end"
 msgstr "Ende"
 
-#: events/models.py:52 events/models.py:176 events/models.py:217
+#: mixins.py:57 views.py:149
+msgid "Event does not exist"
+msgstr "Veranstaltung gibt es nicht"
+
+#: models.py:52 models.py:176 models.py:217
 msgid "Name"
 msgstr "Name"
 
-#: events/models.py:53 events/models.py:177 events/models.py:225
+#: models.py:53 models.py:177 models.py:225
 msgid "Description"
 msgstr "Beschreibung"
 
-#: events/models.py:55 events/templates/events/event_detail.html:29
-#: events/templates/events/event_detail.html:87
-#: events/templates/events/event_list.html:28
-#: events/templates/events/photo_upload.html:13
+#: models.py:55 templates/events/event_detail.html:29
+#: templates/events/event_detail.html:87 templates/events/event_list.html:28
+#: templates/events/photo_upload.html:13
 msgid "Start"
 msgstr "Beginn"
 
-#: events/models.py:56 events/templates/events/event_detail.html:30
-#: events/templates/events/event_detail.html:89
+#: models.py:56 templates/events/event_detail.html:30
+#: templates/events/event_detail.html:89
 msgid "End"
 msgstr "Ende"
 
-#: events/models.py:57 events/models.py:185
-#: events/templates/events/event_detail.html:34
-#: events/templates/events/event_detail.html:80
-#: events/templates/events/event_detail.html:92
+#: models.py:57 models.py:185 templates/events/event_detail.html:34
+#: templates/events/event_detail.html:80 templates/events/event_detail.html:92
 msgid "Homepage"
 msgstr "Homepage"
 
-#: events/models.py:59 events/models.py:179 events/models.py:219
+#: models.py:59 models.py:179 models.py:219
 msgid "Image"
 msgstr "Bild"
 
-#: events/models.py:66
+#: models.py:66
 msgid "Mahjong Tournament"
 msgstr "Mahjong Turnier"
 
-#: events/models.py:68
+#: models.py:68
 msgid ""
 "This event is a tournament, different rules apply for         the kyu "
 "ranking."
@@ -78,11 +79,11 @@ msgstr ""
 "Diese Veranstaltung ist ein Turnier, es gelten andere Regeln für das Kyu "
 "Ranking."
 
-#: events/models.py:72
+#: models.py:72
 msgid "Mahjong Season"
 msgstr "Mahjong Saison"
 
-#: events/models.py:83
+#: models.py:83
 msgid ""
 "Wenn dieser Event zu einer Veranstaltungsreihe gehört         werden Ort, "
 "Beschreibung, Bild und Homepage von dem hier angegebenen         Event "
@@ -91,247 +92,231 @@ msgstr ""
 "Wenn dieser Termin zu einer Veranstaltungsreihe gehört werden Ort, "
 "Beschreibung, Bild und Homepage von dem hier angegebenen Event übernommen."
 
-#: events/models.py:92 events/models.py:195 events/models.py:247
+#: models.py:92 models.py:195 models.py:247
 msgid "first created at"
-msgstr ""
+msgstr "Erstellt am"
 
-#: events/models.py:97 events/models.py:200 events/models.py:252
+#: models.py:97 models.py:200 models.py:252
 msgid "latest updated at"
-msgstr ""
+msgstr "Geändert am"
 
-#: events/models.py:103
+#: models.py:103
 msgid "Event"
 msgstr "Termin"
 
-#: events/models.py:104
+#: models.py:104
 msgid "Events"
 msgstr "Termine"
 
-#: events/models.py:117
+#: models.py:117
 msgid "A event can't end before it had started"
 msgstr "Eine Veranstaltung kann nicht enden bevor sie begonnen hat"
 
-#: events/models.py:186
+#: models.py:186
 msgid "Postal Code"
 msgstr "Postleitzahl"
 
-#: events/models.py:187
+#: models.py:187
 msgid "Street Address"
 msgstr "Straße"
 
-#: events/models.py:188
+#: models.py:188
 msgid "Locality"
 msgstr "Ort"
 
-#: events/models.py:189
+#: models.py:189
 msgid "Country"
 msgstr "Land"
 
-#: events/models.py:204
+#: models.py:204
 msgid "Venue"
 msgstr "Veranstaltungsort"
 
-#: events/models.py:205
+#: models.py:205
 msgid "Venues"
 msgstr "Veranstaltungsorte"
 
-#: events/models.py:231
+#: models.py:231
 msgid "Startpage"
 msgstr "Startseite"
 
-#: events/models.py:234
+#: models.py:234
 msgid "Display this Photo on the Startpage Teaser"
 msgstr "Foto als Teaser auf der Startseite verwenden."
 
-#: events/models.py:236
+#: models.py:236
 msgid "Published on"
 msgstr "Veröffentlicht am"
 
-#: events/models.py:238
+#: models.py:238
 msgid "Number of views"
 msgstr "Wie oft gesehen"
 
-#: events/models.py:262 events/templates/events/event_archive.html:38
-#: events/templates/events/event_list.html:18
+#: models.py:262 templates/events/event_archive.html:38
+#: templates/events/event_list.html:18
 msgid "Event Image"
 msgstr "Veranstaltungsbild"
 
-#: events/models.py:263
+#: models.py:263
 msgid "Event Images"
 msgstr "Veranstaltungsbilder"
 
-#: events/templates/events/event_archive.html:5
-#: events/templates/events/event_archive.html:9
+#: templates/events/event_archive.html:5 templates/events/event_archive.html:9
 msgid "Event Archive"
 msgstr "Veranstaltungsarchiv"
 
-#: events/templates/events/event_archive.html:42
-#: events/templates/events/event_detail.html:85
-#: events/templates/events/event_list.html:22
-#: events/templates/events/photo_detail.html:53
+#: templates/events/event_archive.html:42
+#: templates/events/event_detail.html:85 templates/events/event_list.html:22
+#: templates/events/photo_detail.html:53
 msgid "Date"
 msgstr "Datum"
 
-#: events/templates/events/event_archive.html:47
+#: templates/events/event_archive.html:47
 msgid "Time"
 msgstr "Zeit"
 
-#: events/templates/events/event_archive.html:49
-#: events/templates/events/photo_upload.html:16
+#: templates/events/event_archive.html:49
+#: templates/events/photo_upload.html:16
 msgid "from"
 msgstr "von"
 
-#: events/templates/events/event_archive.html:49
-#: events/templates/events/photo_upload.html:16
+#: templates/events/event_archive.html:49
+#: templates/events/photo_upload.html:16
 msgid "to"
 msgstr "bis"
 
-#: events/templates/events/event_archive.html:57
-#: events/templates/events/event_detail.html:31
-#: events/templates/events/event_detail.html:72
-#: events/templates/events/event_list.html:32
-#: events/templates/events/photo_upload.html:23
+#: templates/events/event_archive.html:57
+#: templates/events/event_detail.html:31 templates/events/event_detail.html:72
+#: templates/events/event_list.html:32 templates/events/photo_upload.html:23
 msgid "Location"
 msgstr "Ort"
 
-#: events/templates/events/event_archive.html:58
-#: events/templates/events/event_list.html:35
-#: events/templates/events/photo_upload.html:25
-#: events/templates/events/photo_upload.html:26
+#: templates/events/event_archive.html:58 templates/events/event_list.html:35
+#: templates/events/photo_upload.html:25 templates/events/photo_upload.html:26
 msgid "Comments"
 msgstr "Kommentare"
 
-#: events/templates/events/event_archive.html:59
-#: events/templates/events/event_detail.html:36
-#: events/templates/events/event_detail.html:48
-#: events/templates/events/photo_upload.html:28
-#: events/templates/events/photo_upload.html:29
+#: templates/events/event_archive.html:59
+#: templates/events/event_detail.html:36 templates/events/event_detail.html:48
+#: templates/events/photo_list.html:4 templates/events/photo_upload.html:28
+#: templates/events/photo_upload.html:29
 msgid "Photos"
 msgstr "Fotos"
 
-#: events/templates/events/event_archive.html:60
-#: events/templates/events/event_archive.html:61
-#: events/templates/events/event_detail.html:35
-#: events/templates/events/event_detail.html:51
+#: templates/events/event_archive.html:60
+#: templates/events/event_archive.html:61
+#: templates/events/event_detail.html:35 templates/events/event_detail.html:51
 msgid "Hanchans"
 msgstr "Hanchans"
 
-#: events/templates/events/event_detail.html:37
+#: templates/events/event_detail.html:37
 msgid "tourney"
 msgstr "Turnier"
 
-#: events/templates/events/event_detail.html:37
+#: templates/events/event_detail.html:37
 msgid "other rules apply here"
 msgstr "hier gelten andere Regeln"
 
-#: events/templates/events/event_detail.html:45
+#: templates/events/event_detail.html:45
 msgid "Info"
 msgstr "Info"
 
-#: events/templates/events/event_detail.html:54
+#: templates/events/event_detail.html:54
 msgid "Mai-Star Games"
 msgstr "Mai-Star Spiele"
 
-#: events/templates/events/event_detail.html:57
+#: templates/events/event_detail.html:57
 msgid "Event Ranking"
 msgstr "Veranstaltungs Wertung"
 
-#: events/templates/events/event_detail.html:100
+#: templates/events/event_detail.html:100
 msgid "Share on Facebook"
 msgstr "Auf Facebook teilen"
 
-#: events/templates/events/event_detail.html:104
+#: templates/events/event_detail.html:104
 msgid "Share on Google+"
 msgstr "Auf Google+ teilen"
 
-#: events/templates/events/event_detail.html:109
+#: templates/events/event_detail.html:109
 msgid "Share on Twitter"
 msgstr "Auf Twitter teilen"
 
-#: events/templates/events/event_detail.html:113
+#: templates/events/event_detail.html:113
 msgid "Show on Google Maps"
 msgstr "Auf Google Maps zeigen"
 
-#: events/templates/events/event_detail.html:127
-#: events/templates/events/event_form.html:9 events/views.py:104
+#: templates/events/event_detail.html:127 templates/events/event_form.html:9
+#: views.py:62
 msgid "Edit Event"
 msgstr "Termin bearbeiten"
 
-#: events/templates/events/event_detail.html:131
+#: templates/events/event_detail.html:131
 msgid "Add Dates"
 msgstr "Termine hinzufügen"
 
-#: events/templates/events/event_form.html:9
-#: events/templates/events/page.html:9 events/views.py:106
+#: templates/events/event_form.html:9 templates/events/page.html:9 views.py:64
 msgid "Add Event"
 msgstr "Neuer Termin"
 
-#: events/templates/events/event_form.html:18
-#: events/templates/events/photo_list.html:35
+#: templates/events/event_form.html:18 templates/events/photo_list.html:35
 msgid "reset"
 msgstr "Zurücksetzen"
 
-#: events/templates/events/event_form.html:19
-#: events/templates/events/eventseries_form.html:25
+#: templates/events/event_form.html:19
+#: templates/events/eventseries_form.html:25
 msgid "save"
 msgstr "Speichern"
 
-#: events/templates/events/event_list.html:4
-#: events/templates/events/event_list.html:5
+#: templates/events/event_list.html:4 templates/events/event_list.html:5
 msgid "Upcoming Events"
 msgstr "Bevorstehende Veranstaltungen"
 
-#: events/templates/events/eventseries_form.html:24
+#: templates/events/eventseries_form.html:24
 msgid "back"
 msgstr "Zurück"
 
-#: events/templates/events/photo_confirm_delete.html:17
+#: templates/events/photo_confirm_delete.html:17
 msgid "Cancel"
 msgstr "Abbrechen"
 
-#: events/templates/events/photo_confirm_delete.html:21
-#: events/templates/events/photo_list.html:21
+#: templates/events/photo_confirm_delete.html:21
+#: templates/events/photo_list.html:21
 msgid "Delete"
 msgstr "Löschen"
 
-#: events/templates/events/photo_detail.html:44
+#: templates/events/photo_detail.html:44
 msgid "previous"
 msgstr "Zurück"
 
-#: events/templates/events/photo_detail.html:52
+#: templates/events/photo_detail.html:52
 msgid "Photographer"
 msgstr "Fotograf"
 
-#: events/templates/events/photo_detail.html:58
+#: templates/events/photo_detail.html:58
 msgid "share on"
 msgstr "Teile auf"
 
-#: events/templates/events/photo_detail.html:81
+#: templates/events/photo_detail.html:81
 msgid "download"
 msgstr "Herunterladen"
 
-#: events/templates/events/photo_detail.html:82
+#: templates/events/photo_detail.html:82
 msgid "Rotate counter clockwise"
 msgstr "mit dem Uhrzeiger drehen"
 
-#: events/templates/events/photo_detail.html:83
+#: templates/events/photo_detail.html:83
 msgid "Rotate clockwise"
 msgstr "gegen den Uhrzeiger drehen"
 
-#: events/templates/events/photo_detail.html:84
+#: templates/events/photo_detail.html:84
 msgid "Save"
 msgstr "Speichern"
 
-#: events/templates/events/photo_list.html:36
-#: events/templates/events/photo_upload.html:35
-#: events/templates/events/photo_upload.html:49
+#: templates/events/photo_list.html:36 templates/events/photo_upload.html:35
+#: templates/events/photo_upload.html:49
 msgid "Upload"
 msgstr "Hochladen"
 
-#: events/views.py:203
-msgid "Event does not exist"
-msgstr "Veranstaltung gibt es nicht"
-
 #~ msgid " Edit"
 #~ msgstr "Bearbeiten"
 
diff --git a/src/kasu/locale/de/LC_MESSAGES/django.mo b/src/kasu/locale/de/LC_MESSAGES/django.mo
index e0f35e462c52e9955e224bba224052d42274cc26..13501c0d1669b2dcc7c224e325ca6f4be78d1f11 100644
GIT binary patch
delta 1615
zcmYk*Pi$009Ki9Zt+ceDf+E;|zP3PH+wDHqQo4;nTUyZmv7{?R6M}i&4zDlWoo(J9
ztnpA!{)r(GM^56!c<>+>nn3)MXo5$h7fnncjo~5}6BG1ejQah(J`I!3`^?V1o%#KK
zGyUa4-Nm-`&D{-`6wRf#(=XR4bxg+fJZOClO8tiY*n+M1Z+Q^;Qw1JPIEp)Q9CzS6
zZpSm&i05z{8oUpat@(Ae#-Npn*HISwAoF9Cg|6Vk_&M&v?{GK%jI!WeBsTRY%KQJI
z1iFJSWquzvV+S6^zHHvdMzyX~g~20y5u*g~HcI60;e&V?^Y|&Uwz`#h8zt~NID+-0
zDesS=1Tc+~`Dq@K@mZALdnk$cxRd?Ws|=*tZ=wY74tC=Ec%9?ez)e1{5S3J7nsgq;
zvnUHDC>g$%&A)+?(1-XCUPW2=2C|g;7G=L5a9uL}iNRxdJA2`;?1cu>c!2pP+>3j0
z59Uz<m_k|j3`!sx<p@?#DzTP*{}#&o7jXtZLD~2B7V0kx{LO@vvXNiQ7u`q<Y7k|^
zBRGL`C};XEQgw9+(@Tp*K7WQCco!vrUED~?xC`Y7`cd{9M7cwUrT$W)XPJ-;UP6AW
zUdH`cK~5lT2Qp<tX|ln+O)4a<pPoxc*?$b<C+JcEX#-oN`^o)F|Mj}ENr_4_?4|F^
z<|G5TFw)xSlA#3mIDLpNM<hWH(&gO$Yf?F>rW|daE{RI^QrUxaho0-^A+3*2vgrkr
z&(h=)_Rytta$&aFQ*D3PUpqRRj@7DFZQ{sYaoT&PmV($h>G@hs8NU)l%j$#<tDaFO
zYU;V_Y8aT<Ug&A>ob`;K$ZNB;vKI$6!@&3Tk`oxmi|j}H$8&SqBx<e}YG+c%UQmhD
z^ZFGh+l}#BoIaeX^XzV~^^VuqqS)T)>$L;@(=DaIl(j0wUKrc!1Es-JtL0iXFutSZ
z^+=r#A|g#9hpo#s6MN-Y1x8hBeqij6LkF5d?FUh;LpzkO93IWN!@0r{$1RQx7YE#e
z>o%X9&n@WltWq<%NiWu8PQg7il5>l>!l>iAV};?3@AEBnb;XUFZgZXe;>knJGh3DN
zLT#^(<nkpQ#M)WZUbrYDla;KztR{65M>t!H(yHkwN~(6V*w$KF4ZZTRR`X%3#*MG5
zy0WBW$E!s4=Gc5UHM{Ypn$yeSJw;1&=={I6{ragc`@+%L?WOW^sDnjq>^D#6?Ve|r
zS|XxQ6Qpg7y*2Toy*Am|Gohn|{hY)^j+dNMGg7LRv{ar+H#c_S_(1bQTCFgkUSA#W
F`xi<(0;>Q3

literal 18151
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
ImU-*{0XB5#Q2+n{

diff --git a/src/kasu/locale/de/LC_MESSAGES/django.po b/src/kasu/locale/de/LC_MESSAGES/django.po
index b690e50..98d25e9 100644
--- a/src/kasu/locale/de/LC_MESSAGES/django.po
+++ b/src/kasu/locale/de/LC_MESSAGES/django.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: kasu.utils\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-06-19 22:46+0200\n"
+"POT-Creation-Date: 2018-04-27 09:49+0200\n"
 "PO-Revision-Date: 2016-09-28 00:24+0200\n"
 "Last-Translator: Christian Berg <xeniac.at@gmail.com>\n"
 "Language-Team: Kasu <verein@kasu.at>\n"
@@ -19,174 +19,176 @@ msgstr ""
 "X-Generator: Poedit 1.8.9\n"
 "X-Translated-Using: django-rosetta 0.7.6\n"
 
-#: kasu/settings.py:153
+#: settings.py:157
 msgid "German"
 msgstr "Deutsch"
 
-#: kasu/settings.py:153
+#: settings.py:157
 msgid "English"
 msgstr "Englisch"
 
-#: kasu/templates/404.html:8
+#: templates/404.html:8
 msgid "The page your requested does not exist on this server."
 msgstr "Die angeforderte Seite existiert auf diesem Server nicht."
 
-#: kasu/templates/base.html:22
+#: templates/base.html:22
 msgid "Current News"
 msgstr "Aktuelle Neuigkeiten"
 
-#: kasu/templates/base.html:24 kasu/templates/index.html:40
+#: templates/base.html:24 templates/index.html:40
 msgid "Recent Comments"
 msgstr "Kürzliche Kommentare"
 
-#: kasu/templates/base.html:45
+#: templates/base.html:45
 msgid "Menu"
 msgstr "Menü"
 
-#: kasu/templates/base.html:69
+#: templates/base.html:69 templates/redbox.html:3
 msgid "Current Event"
 msgstr "Aktuelle Veranstaltung"
 
-#: kasu/templates/base.html:72
+#: templates/base.html:72 templates/redbox.html:6
 msgid "Since"
 msgstr "seit"
 
-#: kasu/templates/base.html:73 kasu/templates/base.html:85
+#: templates/base.html:73 templates/base.html:85 templates/redbox.html:8
+#: templates/redbox.html:22
 msgid "Start"
 msgstr "Beginn"
 
-#: kasu/templates/base.html:76 kasu/templates/base.html:88
+#: templates/base.html:76 templates/base.html:88 templates/redbox.html:11
+#: templates/redbox.html:25
 msgid "Location"
 msgstr "Ort"
 
-#: kasu/templates/base.html:79 kasu/templates/base.html:90
+#: templates/base.html:79 templates/base.html:90 templates/redbox.html:14
+#: templates/redbox.html:28
 msgid "More Details"
 msgstr "Mehr Details"
 
-#: kasu/templates/base.html:81
+#: templates/base.html:81 templates/redbox.html:17
 msgid "Next Event"
 msgstr "Nächste Veranstaltung"
 
-#: kasu/templates/base.html:84
+#: templates/base.html:84 templates/redbox.html:20
 msgid "in"
 msgstr "in"
 
-#: kasu/templates/base.html:93
+#: templates/base.html:93 templates/redbox.html:30
 msgid "Upcoming events"
 msgstr "Bevorstehende Veranstaltungen"
 
-#: kasu/templates/base.html:143
+#: templates/base.html:143
 msgid "Add Subpage"
 msgstr "Unterseite Hinzufügen"
 
-#: kasu/templates/base.html:148
+#: templates/base.html:148
 msgid "Edit Page"
 msgstr "Seite bearbeiten"
 
-#: kasu/templates/base.html:156
+#: templates/base.html:156
 msgid "Imprint"
 msgstr "Impressum"
 
-#: kasu/templates/base.html:157
+#: templates/base.html:157
 msgid "contact"
 msgstr "Kontakt"
 
-#: kasu/templates/base.html:162
+#: templates/base.html:162
 msgid "Language"
 msgstr "Sprache"
 
-#: kasu/templates/base.html:171
+#: templates/base.html:171
 msgid "Go"
 msgstr "Los"
 
-#: kasu/templates/base.html:176
+#: templates/base.html:176
 msgid "Logged in as"
 msgstr "Angemeldet als"
 
-#: kasu/templates/base.html:178
+#: templates/base.html:178
 msgid "Admin"
 msgstr "Admin"
 
-#: kasu/templates/base.html:179
+#: templates/base.html:179
 msgid "Logout"
 msgstr "Abmelden"
 
-#: kasu/templates/base.html:181
+#: templates/base.html:181
 msgid "no user logged in"
 msgstr "Niemand angemeldet"
 
-#: kasu/templates/base.html:182 kasu/templates/comments/form.html:43
+#: templates/base.html:182 templates/comments/form.html:43
 msgid "register"
 msgstr "Registrieren"
 
-#: kasu/templates/base.html:183 kasu/templates/comments/form.html:44
+#: templates/base.html:183 templates/comments/form.html:44
 msgid "login"
 msgstr "anmelden"
 
-#: kasu/templates/base.html:185
+#: templates/base.html:185
 msgid "Login with Facebook"
 msgstr "über Facebook anmelden"
 
-#: kasu/templates/base.html:187
+#: templates/base.html:187
 msgid "Login with Twitter"
 msgstr "über Twitter anmelden"
 
-#: kasu/templates/base.html:189
+#: templates/base.html:189
 msgid "Login with Google"
 msgstr "über Google anmelden"
 
-#: kasu/templates/comments/form.html:5
+#: templates/comments/form.html:5
 msgid "New Comment"
 msgstr "Neuer Kommentar"
 
-#: kasu/templates/comments/form.html:20
+#: templates/comments/form.html:20
 msgid "now"
 msgstr "Jetzt"
 
-#: kasu/templates/comments/form.html:25
+#: templates/comments/form.html:25
 msgid "Preview"
 msgstr "Vorschau"
 
-#: kasu/templates/comments/form.html:26
+#: templates/comments/form.html:26
 msgid "Post"
 msgstr "Schreiben"
 
-#: kasu/templates/comments/form.html:34
+#: templates/comments/form.html:34
 msgid "not logged in"
 msgstr "Nicht angemeldet"
 
-#: kasu/templates/comments/form.html:38
+#: templates/comments/form.html:38
 msgid "Register now, or Login to leave a comment here."
 msgstr "Jetzt registrieren, oder anmelden um einen Kommentar zu schreiben."
 
-#: kasu/templates/comments/list.html:2 kasu/templates/index.html:25
+#: templates/comments/list.html:2 templates/index.html:25
 msgid "Comments"
 msgstr "Kommentare"
 
-#: kasu/templates/comments/posted.html:4 kasu/templates/comments/posted.html:7
+#: templates/comments/posted.html:4 templates/comments/posted.html:7
 msgid "Thank you for your comment"
 msgstr "Danke für deinen Kommentar."
 
-#: kasu/templates/comments/preview.html:4
-#: kasu/templates/comments/preview.html:6
+#: templates/comments/preview.html:4 templates/comments/preview.html:6
 msgid "Preview your comment"
 msgstr "Vorschau deines Kommentars"
 
-#: kasu/templates/comments/preview.html:10
+#: templates/comments/preview.html:10
 msgid "Please correct the error below"
 msgid_plural "Please correct the errors below"
 msgstr[0] "Bitte den Fehler weiter unten beheben"
 msgstr[1] "Bitte die Fehler weiter unten beheben"
 
-#: kasu/templates/index.html:4
+#: templates/index.html:4
 msgid "traditional Asian game culture"
 msgstr "traditionelle asiatische Spielkultur"
 
-#: kasu/templates/index.html:33
+#: templates/index.html:33
 msgid "Read More"
 msgstr "Mehr lesen"
 
-#: kasu/templates/index.html:47
+#: templates/index.html:47
 #, python-format
 msgid ""
 "\n"
@@ -203,23 +205,23 @@ msgstr ""
 "                <time datetime=\"%(submit_date)s\">%(since)s</time>\n"
 "                "
 
-#: kasu/templates/index.html:59
+#: templates/index.html:59
 msgid "Kasu in the social network"
 msgstr "Kasu im sozialem Netzwerk"
 
-#: kasu/templates/index.html:62 kasu/templates/index.html:65
+#: templates/index.html:62 templates/index.html:65
 msgid "Visit us on"
 msgstr "Besuche uns auf"
 
-#: kasu/templates/index.html:74
+#: templates/index.html:74
 msgid "Add Article"
 msgstr "Artikel hinzufügen"
 
-#: kasu/templates/paginator.html:8
+#: templates/paginator.html:8
 msgid "Previous"
 msgstr "Vorherige"
 
-#: kasu/templates/paginator.html:20
+#: templates/paginator.html:20
 msgid "Next"
 msgstr "Nächste"
 
diff --git a/src/maistar_ranking/locale/de/LC_MESSAGES/django.mo b/src/maistar_ranking/locale/de/LC_MESSAGES/django.mo
index 050fa34ae4a1d49a7eff2545df4538134bab8db3..9b38dec7c24ab05805e9a13585abc49524f5d4da 100644
GIT binary patch
delta 1268
zcmYk*O-K}B9LMn|cXf5uG)>K3C(ZJ0Y<Amf*C0v_BMdDHl3rjjQ6XPIjh2Fi0z(KY
z2QNm4I%S<qDGDMy1ktSy-SXn8Lx&&;f~4<neHMC{|MPjCnP=vi=l{$sRo$;nuapI6
z4dno_omkpnOeb~)s3?O$V|L&W7T{gX$A=igIn2YSwm**?X2G6+WzWB}=Rer<pRmxF
zwE4W=FyAoDjo(od{lZ*aLk<(9qkaKZ8J6Hitie)@U@^8~5%yp`UPg_Z!g8ENji1LL
z^P9Icw4(PI!;i>e{!-~h0xYiri&5iht<Bbh)}z)=YY!?zy~tsbRIJzxq82oPxy)};
zG&oF}>JCon0*1L;152?5D^R=Afy->uN!+P%yk#{u;3jNGJ@35r5-KBo$Sr0JIm`{J
zv>LamG~qqe3TIF$dt`l%Tj;+*rS1zV)vKucexfG)ZLhD{ehK@jlviREHlm)}hWqeL
znEaQ}NZEnYxS9TA)XHBX&oZyE9hXrP=8{LHvXDwEuR@KBSdUmwSi7yg);?4wh6~BR
z-h7f1O3^JlU>bGax6a`U`cG{CG=sGj=g`FqsLV|vJCk{M18yZ$Jfe}%;xtYrhuE+E
z-$f{`DlE{{5X_S)`X%daTPf6jE2Y_@@4_LPh;4*^)d->AS*cc5cqg-$P|B4(ZJml1
znAQighlmn&gjS=kU8Q!N%<oo7TU(;-%9iGA1ND9UU$iYM%F^yk%T{&c&Tum2jE-DO
zIb%uxW}w`k3G^-g2`uEq<E|HTqlX<Y(HcuMc~Q>`_jJ2w`>zj;4~>qv9m$FQRwwF3
z4!K^!jm90%YmLSj=db2nDe6j&3``~m7;&}VKNh;^KMNfX#9I>nkI*T<J^#VtO8(cJ
Ee-fu`t^fc4

delta 1015
zcmYk(K}Zx~6u|LMo7&l3t5wroV~wGRq*&Y8wnU4d^%50GP#uDeHW~*-M=)2|z?KLk
zDv%sHBoWl1L&ic_OF<Nv)uk>)g%EZsx^}5+|3?pMnf-p>d*7S+zIij#@hDkcX|Zk?
ze!Kan`7bp{WX#B_e|9n*C6?4xhA7UUjW;oZcX18g*Z3h?#7{N<T=TCq|L$+TYTh%6
zQ@E^t(}JHEBmWC!!v>zV8sjJrZq~RRTZq%R4tHV#_v2a|z$PqW7Y?J;h1hDUoScc=
zP)9EFhC$x!E#~nf%EmDUIY<KAa3e}xR_#>_>S6VmT14s8AWEkKjI+NfGm(uiBA1zF
zkb-M?2}8{%NlINOcH?HGIp!!X^4X5#CgK#Ql8*LZ2lit#7LgJ&rcPp2S~JB&PId+5
z4QJI`C<nTST;>6TwC=IGgz||#U<y}II{6!=^)?Ta``b}APNS@E(KsKa|E(nUl1SnJ
z$_74e!%19^w^8b9xB(YYI`J8~%om1!{Eo8Wc1|T7$f9&$A4=T`^|U%1qyMrnp@|FX
zWt5K0qMUpVrBiowy{7pm>I<A_{k6v9>@J_Cf*G7bnqubBY(3|UmMYFzFj8^Cvegz&
zTmHfitKOK%XWU%Ib)8(UZ&&Y*tQ*!MssEGt9!Y+RoC*)vC!3Cx0>51Hy*}rx7tYxQ
oYfrc9hF|SN@q<Ib`SRe)XTBGNUD4}y!7GiQ@rEWA>e1!KKMM713IG5A

diff --git a/src/maistar_ranking/locale/de/LC_MESSAGES/django.po b/src/maistar_ranking/locale/de/LC_MESSAGES/django.po
index 05fe21b..9e89965 100644
--- a/src/maistar_ranking/locale/de/LC_MESSAGES/django.po
+++ b/src/maistar_ranking/locale/de/LC_MESSAGES/django.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: kasu.mahjong_ranking\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-06-19 22:46+0200\n"
+"POT-Creation-Date: 2018-04-27 09:49+0200\n"
 "PO-Revision-Date: 2016-09-28 00:24+0200\n"
 "Last-Translator: Christian Berg <xeniac.at@gmail.com>\n"
 "Language-Team: Kasu <verein@kasu.at>\n"
@@ -19,208 +19,205 @@ msgstr ""
 "X-Generator: Poedit 1.8.9\n"
 "X-Translated-Using: django-rosetta 0.7.2\n"
 
-#: maistar_ranking/admin.py:19
+#: admin.py:24
 msgid "Recalculate"
 msgstr "Neuberechnen"
 
-#: maistar_ranking/forms.py:33
+#: forms.py:35
 #, python-format
 msgid "%s may only participate once."
 msgstr "%s darf nur einmal teilnehmen."
 
-#: maistar_ranking/models.py:20
+#: models.py:20
 msgid "Comment"
 msgstr "Kommentar"
 
-#: maistar_ranking/models.py:22
+#: models.py:22
 msgid "Player 1"
 msgstr "Spieler 1"
 
-#: maistar_ranking/models.py:24 maistar_ranking/models.py:30
-#: maistar_ranking/models.py:36 maistar_ranking/models.py:42
-#: maistar_ranking/models.py:48 maistar_ranking/models.py:54
-#: maistar_ranking/templates/maistar_ranking/ranking_list.html:19
+#: models.py:24 models.py:30 models.py:36 models.py:42 models.py:48
+#: models.py:54 templates/maistar_ranking/ranking_list.html:19
 msgid "Score"
 msgstr "Punkte"
 
-#: maistar_ranking/models.py:28
+#: models.py:28
 msgid "Player 2"
 msgstr "Spieler 2"
 
-#: maistar_ranking/models.py:34
+#: models.py:34
 msgid "Player 3"
 msgstr "Spieler 3"
 
-#: maistar_ranking/models.py:40
+#: models.py:40
 msgid "Player 4"
 msgstr "Spieler 4"
 
-#: maistar_ranking/models.py:46
+#: models.py:46
 msgid "Player 5"
 msgstr "Spieler 5"
 
-#: maistar_ranking/models.py:52
+#: models.py:52
 msgid "Player 6"
 msgstr "Spieler 6"
 
-#: maistar_ranking/models.py:58
+#: models.py:58
 msgid "Has been confirmed"
 msgstr "Wurde bestätigt"
 
-#: maistar_ranking/models.py:60
+#: models.py:60
 msgid "the game only counts whe it has been confirmed"
 msgstr "das Spiel zählt nur wenn es bestätigt wurde"
 
-#: maistar_ranking/models.py:63 maistar_ranking/models.py:148
-#: maistar_ranking/templates/maistar_ranking/player_game_list.html:6
-#: maistar_ranking/templates/maistar_ranking/ranking_list.html:4
-#: maistar_ranking/templates/maistar_ranking/ranking_list.html:72
+#: models.py:63 models.py:147 templates/maistar_ranking/player_game_list.html:6
+#: templates/maistar_ranking/ranking_list.html:4
+#: templates/maistar_ranking/ranking_list.html:72
 msgid "Season"
 msgstr "Saison"
 
-#: maistar_ranking/models.py:69
+#: models.py:74
 msgid "Mai-Star Game with {0} from {1:%Y-%m-%d}"
 msgstr "Mai-Star Spiel mit {0} vom {1:%Y-%m-%d}"
 
-#: maistar_ranking/templates/maistar_ranking/game_form.html:5
-#: maistar_ranking/templates/maistar_ranking/game_form.html:16
-#: maistar_ranking/templates/maistar_ranking/game_list.html:27
-#: maistar_ranking/templates/maistar_ranking/player_game_list.html:44
+#: templates/maistar_ranking/game_form.html:5
+#: templates/maistar_ranking/game_form.html:16
+#: templates/maistar_ranking/game_list.html:27
+#: templates/maistar_ranking/player_game_list.html:44
 msgid "Edit Game"
 msgstr "Spiel bearbeiten"
 
-#: maistar_ranking/templates/maistar_ranking/game_form.html:5
-#: maistar_ranking/templates/maistar_ranking/game_form.html:16
-#: maistar_ranking/templates/maistar_ranking/game_list.html:41
+#: templates/maistar_ranking/game_form.html:5
+#: templates/maistar_ranking/game_form.html:16
+#: templates/maistar_ranking/game_list.html:41
 msgid "Add Game"
 msgstr "Spiel hinzufügen"
 
-#: maistar_ranking/templates/maistar_ranking/game_form.html:76
+#: templates/maistar_ranking/game_form.html:76
 msgid "Back"
 msgstr "Zurück"
 
-#: maistar_ranking/templates/maistar_ranking/game_form.html:77
+#: templates/maistar_ranking/game_form.html:77
 msgid "Save"
 msgstr "Speichern"
 
-#: maistar_ranking/templates/maistar_ranking/game_list.html:4
-#: maistar_ranking/templates/maistar_ranking/player_game_list.html:6
+#: templates/maistar_ranking/game_list.html:4
+#: templates/maistar_ranking/player_game_list.html:6
 msgid "Mai-Star Games"
 msgstr "Mai-Star Spiele"
 
-#: maistar_ranking/templates/maistar_ranking/game_list.html:7
+#: templates/maistar_ranking/game_list.html:7
 msgid "Played Mai-Star Games"
 msgstr "Gespielte Mai-Star Spiele"
 
-#: maistar_ranking/templates/maistar_ranking/game_list.html:11
+#: templates/maistar_ranking/game_list.html:11
 msgid "Game"
 msgstr "Spiel"
 
-#: maistar_ranking/templates/maistar_ranking/game_list.html:14
+#: templates/maistar_ranking/game_list.html:14
 msgid "Place"
 msgstr "Platz"
 
-#: maistar_ranking/templates/maistar_ranking/game_list.html:19
-#: maistar_ranking/templates/maistar_ranking/player_game_list.html:36
+#: templates/maistar_ranking/game_list.html:19
+#: templates/maistar_ranking/player_game_list.html:36
 msgid "Points"
 msgstr "Punkte"
 
-#: maistar_ranking/templates/maistar_ranking/game_list.html:24
-#: maistar_ranking/templates/maistar_ranking/player_game_list.html:41
+#: templates/maistar_ranking/game_list.html:24
+#: templates/maistar_ranking/player_game_list.html:41
 msgid "Delete Game"
 msgstr "Spiel löschen"
 
-#: maistar_ranking/templates/maistar_ranking/game_list.html:33
+#: templates/maistar_ranking/game_list.html:33
 msgid "No Mai-Star games have been added to this event yet."
 msgstr "Für diese Veranstaltung wurden noch keine Mai-Star Spiele erfasst."
 
-#: maistar_ranking/templates/maistar_ranking/game_list.html:40
+#: templates/maistar_ranking/game_list.html:40
 msgid "Edit Event"
 msgstr "Veranstaltung bearbeiten"
 
-#: maistar_ranking/templates/maistar_ranking/hanchan_confirm_delete.html:4
-#: maistar_ranking/templates/maistar_ranking/hanchan_confirm_delete.html:10
+#: templates/maistar_ranking/hanchan_confirm_delete.html:4
+#: templates/maistar_ranking/hanchan_confirm_delete.html:10
 msgid "Delete game"
 msgstr "Spiel löschen"
 
-#: maistar_ranking/templates/maistar_ranking/hanchan_confirm_delete.html:13
+#: templates/maistar_ranking/hanchan_confirm_delete.html:13
 msgid "Cancel"
 msgstr "Abbrechen"
 
-#: maistar_ranking/templates/maistar_ranking/hanchan_confirm_delete.html:14
+#: templates/maistar_ranking/hanchan_confirm_delete.html:14
 msgid "Delete"
 msgstr "Löschen"
 
-#: maistar_ranking/templates/maistar_ranking/page.html:5
+#: templates/maistar_ranking/page.html:5
 msgid "Archive"
 msgstr "Archiv"
 
-#: maistar_ranking/templates/maistar_ranking/page.html:7
+#: templates/maistar_ranking/page.html:7
 msgid "Add Event"
 msgstr "Veranstaltung hinzufügen"
 
-#: maistar_ranking/templates/maistar_ranking/player_game_list.html:4
+#: templates/maistar_ranking/player_game_list.html:4
 msgid "Ladder Score for"
 msgstr "Ladder Wertung für"
 
-#: maistar_ranking/templates/maistar_ranking/player_game_list.html:9
+#: templates/maistar_ranking/player_game_list.html:9
 msgid "Mai-Star Games with"
 msgstr "Mai-Star Spiele mit"
 
-#: maistar_ranking/templates/maistar_ranking/player_game_list.html:14
+#: templates/maistar_ranking/player_game_list.html:14
 msgid "Date"
 msgstr "Datum"
 
-#: maistar_ranking/templates/maistar_ranking/player_game_list.html:15
+#: templates/maistar_ranking/player_game_list.html:15
 msgid "Event"
 msgstr "Veranstaltung"
 
-#: maistar_ranking/templates/maistar_ranking/player_game_list.html:16
+#: templates/maistar_ranking/player_game_list.html:16
 msgid "Players"
 msgstr "Spieler"
 
-#: maistar_ranking/templates/maistar_ranking/ranking_list.html:4
+#: templates/maistar_ranking/ranking_list.html:4
 msgid "Mai-Star Ranking"
 msgstr "Mai-Star Platzierung"
 
-#: maistar_ranking/templates/maistar_ranking/ranking_list.html:10
-#: maistar_ranking/templates/maistar_ranking/ranking_list.html:18
+#: templates/maistar_ranking/ranking_list.html:10
+#: templates/maistar_ranking/ranking_list.html:18
 msgid "Placement"
 msgstr "Platzierung"
 
-#: maistar_ranking/templates/maistar_ranking/ranking_list.html:11
+#: templates/maistar_ranking/ranking_list.html:11
 msgid "Avatar"
 msgstr "Avatar"
 
-#: maistar_ranking/templates/maistar_ranking/ranking_list.html:12
+#: templates/maistar_ranking/ranking_list.html:12
 msgid "Nickname"
 msgstr "Spitzname"
 
-#: maistar_ranking/templates/maistar_ranking/ranking_list.html:13
+#: templates/maistar_ranking/ranking_list.html:13
 msgid "Name"
 msgstr "Name"
 
-#: maistar_ranking/templates/maistar_ranking/ranking_list.html:14
+#: templates/maistar_ranking/ranking_list.html:14
 msgid "Average"
 msgstr "Durchschnitt"
 
-#: maistar_ranking/templates/maistar_ranking/ranking_list.html:15
+#: templates/maistar_ranking/ranking_list.html:15
 msgid "Games"
 msgstr "Spiele"
 
-#: maistar_ranking/templates/maistar_ranking/ranking_list.html:20
+#: templates/maistar_ranking/ranking_list.html:20
 msgid "count"
 msgstr "Anzahl"
 
-#: maistar_ranking/templates/maistar_ranking/ranking_list.html:21
+#: templates/maistar_ranking/ranking_list.html:21
 msgid "good"
 msgstr "Gut"
 
-#: maistar_ranking/templates/maistar_ranking/ranking_list.html:22
+#: templates/maistar_ranking/ranking_list.html:22
 msgid "won"
 msgstr "Gewonnen"
 
-#: maistar_ranking/templates/maistar_ranking/ranking_list.html:43
+#: templates/maistar_ranking/ranking_list.html:43
 msgid ""
 "Unfortunately, nobody has it been done in the ranking.\n"
 "                A player must have 6 games done, to be added to the ranking."
@@ -229,15 +226,15 @@ msgstr ""
 "als 6 Spiele innerhalb einer Saison absolviert haben, werden für das "
 "Endergebnis nicht gewertet."
 
-#: maistar_ranking/templates/maistar_ranking/ranking_list.html:52
+#: templates/maistar_ranking/ranking_list.html:52
 msgid "Latest Games"
 msgstr "Letzten Spiele"
 
-#: maistar_ranking/templates/maistar_ranking/ranking_list.html:63
+#: templates/maistar_ranking/ranking_list.html:63
 msgid "Latest Events"
 msgstr "Letzten Veranstaltungen"
 
-#: maistar_ranking/templates/maistar_ranking/ranking_list.html:70
+#: templates/maistar_ranking/ranking_list.html:70
 msgid "Ladder Archive"
 msgstr "Archiv"
 
diff --git a/src/membership/locale/de/LC_MESSAGES/django.mo b/src/membership/locale/de/LC_MESSAGES/django.mo
index 8f9377ecdcae608d2ed0e1374eb89969e76387d5..e1f31203315050ed5bd1a6b9f136fce85804accf 100644
GIT binary patch
delta 2101
zcmXxje@xVM9LMnw#DRCo4;AGEiLZbhn;-{b3d(iL!li*ZoHI(@AqRI054#^*M(f%#
zv_D+UQ>wM5{bRX)ca?#*TDH+2S+O<5{;D~`X3qM<tm#_M7x$F`kI(1x{e0h__viij
zd`Gt*>U_C4Y54ggSN}6Qvy8b;e~SLCJY$yN_w$S?#2MU$H<3rC%W2FF+=(UF;WEa9
zdoUkIa6TSKz5gaI#E-BVzj2x5T%g|>Acpx13-C7TMc2LjVF{{ViAC6e4)mh}cG&$#
zQG3~o+pr(I@H1SD4ua4$WvF?c`RqT3#wrFBaJBuQ1((tH<5Ap=+QBt+<84$T#cY$N
zS%FHl2{o_H?suZ%?!ra52Nz%zmH43~4ej_9R3fKQ0pCFd{2Z0>1+2jz?D4-*3uW<g
zDK0?8spFrHVm(%1H!j5(mf=xUyfdgHOnyq^5gK3MVJskOD~_T{G>IIynMT$$zoHVn
zf!f&}RN~o`L;XC|QRbr(D?#0%CQRT%xB|b#`&i%1(CA?xhq~0_Ui9G+RG<k|0+YBL
zf5zwW4)SZBqmK9BG3>=rY{!4G4cn-@5*bE6j-uANgaxe6A!ZgRM3vZ$+Q|c`ojr(J
zcnd0#K_q9BK-MrLNG$Ujs<iK+=8d7^e2t3pE$Z%E#IN|ue#43+jkl=Jk35**;41M|
zX6f>s!zfOp&T1<Mc^<n_x4DRIt-%`9U3naJGy|vv<F+qg9sN;MMK7S{U&JKGXQpZB
z#jEy%o2b(2#>j=JyHJg~Tr2H<J8Gv}a5Hw>zK*KM71W)%g<8<Tu5?sIsCdQ8?C-yf
z0jgoD@D#2??xVSky1iFX0kg|90hgdkU5(m+7qw$QDxvMDM0-$`ilQ#z5!C#Xs7icL
z&iO0DF$T2Y1S-%JuE$x_LRDN<RiXiPdpDv24qzibi?#S6R^w%?!v9c}t>jzO5jJ2C
zu0?%q$C5PsG)k>ZNghMJ(2FYBkllY8mFQtq<|j}kJc$Z?8kN}lsKkE4m+%@Yp<!+?
zr(jN@zK-*#JCW3l+f1V#bv6l90tZn6N7Uz%zKayYjIk}1_!4&DFW8M9R`KC5s#4?F
zh2PoZWdu`VJ*bU6i6oFT&(Ki7Gnj)PV*{SG$7fM5{)sx%yqZkE0(CU^qY~bPs?au6
zyxpjT`_Z^8el{HNZH!p~D;gXK$Kt_gu+Q3`+UZ<WF!wMq=$o5mr6SJS91W#TI6axh
zIcI&QG3#t8o}1lpcX}pts@CPt)dSuNxqRiBNLC;b4+SIf@V-DiJQS(3M^k5Ab#vj;
zS6mK<t24O2HyDkD!Uxj-6kd1aW@e>l7KgI(*VTKQ>zmeE-j>$pmQ+tk+19%wjo#MP
z-j&`)?;6*`fmpnLM>G(L4F=*v(N?S1(;kYl#c&{EZ3;#QtPM{DVhR6K!ARf12$RFX
zRe`wAlNv7>Prc!Gr=o68c4Kq;6Zi70)YQ_+^xLI797RE^GaMfn3<vvS`$B>Kcsk#D
Gao+z5n*L1y

delta 2655
zcmZwHdu&r>7{~FqK-XF>ZUe>;fiq!jzzW@9Fvb|$xNUM7mvW!N*;cp8)|#~=7>y^2
z1`Q%4jUWaS{~#j93$nyZTnyf$B80?5P{Tin26ZtZ#7KbX_jh{u!|0nm=kva&?R%c{
zzR$ZSR~}q*V3hN`G3NIiF0{HkjJb^U*pDS4V+!ymyc2KWCLB7{m;kopAJ~Osuw@v(
z!88uXBgmh5jf;N&F6QGGI2pemW*m2-zq!FPO@LpGz&zxZv5;q)us5#4T*gb#j~h@E
zws_+t>Ro!V86U+}cp69JI3_1oQ;z!Hf)S1}L+C8#h9+$CK4`|f8E?RSm_ogQk4quu
zp%R&fN_0Ld(MIIYtn<cgsCg4O64RK6Pooll(V@fK<_%OL{iq2)LQQxEmGK2E!^__N
ze4b9%jK{k$jGCtrwG|t2A|`Px?#FR>95vr(s4aBP(OFIB0`9?Sq*sk6QA;#{LA-{n
zqPc}ia46~P%?eS8Pw>W*P+K__mDns)4XwgnjA1eUfD?GW@v$yjxM5)_K7zG)6gAN$
zR00E7gn#00EF6_x$|E?K@tfF+Cvg#uX2TcYW>g}F(0wt~a|Un(&o>36rw0_{6r6#2
zv-PMq+lqSdcGUNtKo-mFMP9-jL2@#0p_cX&)c4M!<~fg==OU_hF5&w=V{W45(0PZu
z=lI||HtHTcPP!_-)7XPoP<z$F2I^S0Bgva0zEp{GQMJ;I+L~Rc1fTLeh^n1qs1^Md
z_5F*e`ZHJP=!e(64|2w5mp0FH5~>y|QN>l`jiabH-HOYw-Sc(Sid;k0OpuM%0}D`F
zRfL+ac!GES%ecX|nc4U<HleEdS5)<0M@=}AlGcPJsHLt%y+A$cjn|+OYDFcw1GQ4S
zk<~VbQQtp-T8UE=o$Q2PaYGM0kDBNgtiiv~eUO!1k$P11u0u`uFqY#1EX9v;GX92>
zFqgv7%Fae@VLfiaCe&#=>d>j9Q^v+?NxD%#NTZhQac}%A>dg<MGCzj;{@bXD-$NyK
z3YFN;xF2t!652;LI{zne5uQQSgp<#w+Pj4~826wO*o&I*1&w{ie28qP`I?(r;w!im
zui`qKHzj*)_aXlx%xPSO7rp!8l5ApKs2AIfB;c6m=xD+Za0q^iGx1CB{&mzF4Pt$@
zr(;p$a@5u|q7sgxR>;O6CQ%9RLh^UpgIwo$eNn0NKZ6cQnvDe8?bbmzT7({;!dy?N
zO(pbjEnO3_m8d6FRB8)|2Z)6l(3WR$w?N(L-uN~-Jl||1v?rWCw~?^B6&kd=ce0lq
za6h4a)SGS~Y(h<2u#{M$f!9>Pn+dIs+90BcSVP=Ps5xu7)Dp`yqBRhkhzPNQm{0hL
z#RR9&Z7p2&pG?cF<E5smzTK+mRCt4VIE&~a?jv+s_<v>^3AS19&+#Bs)oO7<bwFMH
ztLgl2Cv-el5^5?iwN8S9b_-AcFVvz$H4!5^2o8c<4*^_F<P+}MQ#Iah)95r4)SL+u
zD!4XcF40P;)wx&i63Sf7De>3zcGZS5C4tgRG%zLO1j;fe0#(79nYwL4nVW&SOhd3X
z&$4^dov}nZ-e#xc$wXNw^HQ*^@0+0CpIcnIGuG3ZOvSb(?C#jqRNs%o2mF0!M|S$0
zIpN5>a7C3BiBwn2o*t=)L_({Z!)s$Z<0&QyFSgUMYO5kr{y*PaVW-mJXpfypb=m1;
zPqnqEvnQTP$L)mG5bNo%YIemEal5VVp=2r@OU|&<wV@SuqNCUDh=rpuySv(2ZfE*O
qznXchpx9TDu?xoay;5NLe4)(eW6t?PeTNF8{yghHx!)N7Oz<C2$r!-^

diff --git a/src/membership/locale/de/LC_MESSAGES/django.po b/src/membership/locale/de/LC_MESSAGES/django.po
index f1a9257..555e4c9 100644
--- a/src/membership/locale/de/LC_MESSAGES/django.po
+++ b/src/membership/locale/de/LC_MESSAGES/django.po
@@ -7,196 +7,193 @@ msgid ""
 msgstr ""
 "Project-Id-Version: kasu.membership\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-06-19 22:46+0200\n"
-"PO-Revision-Date: 2016-09-28 00:24+0200\n"
-"Last-Translator: Christian Berg <xeniac@posteo.at>\n"
+"POT-Creation-Date: 2018-04-27 09:49+0200\n"
+"PO-Revision-Date: 2018-04-27 10:30+0105\n"
+"Last-Translator: b'Christian Berg <kasu@xendynastie.at>'\n"
 "Language-Team: Kasu <verein@kasu.at>\n"
 "Language: de\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"
-"X-Translated-Using: django-rosetta 0.7.2\n"
 "X-Generator: Poedit 1.8.9\n"
+"X-Translated-Using: django-rosetta 0.7.14\n"
 
-#: membership/admin.py:22
+#: __init__.py:11
+msgid "Male"
+msgstr "Männlich"
+
+#: __init__.py:12
+msgid "Female"
+msgstr "Weiblich"
+
+#: admin.py:22
 msgid "Activate selected User"
 msgstr "Ausgewählte Benutzer freischalten"
 
-#: membership/admin.py:31
+#: admin.py:38
 msgid "Cleanup selected Activation Requests"
 msgstr "Ausgewählte Aktivierungsanfragen bereinigen"
 
-#: membership/admin.py:37
+#: admin.py:47
 msgid "Group"
 msgstr "Gruppe"
 
-#: membership/admin.py:38
+#: admin.py:48
 msgid "Groups"
 msgstr "Gruppen"
 
-#: membership/admin.py:59 membership/models.py:164 membership/models.py:215
-#: membership/templates/membership/register_form.html:32
+#: admin.py:72 models.py:162 models.py:215
+#: templates/membership/register_form.html:32
 msgid "Membership"
 msgstr "Mitgliedschaft"
 
-#: membership/admin.py:64
+#: admin.py:77
 msgid "Permissions"
 msgstr "Berechtigung"
 
-#: membership/admin.py:66
+#: admin.py:79
 msgid "Important dates"
 msgstr "Wichtige Daten"
 
-#: membership/forms.py:23
+#: forms.py:23
 msgid "birthday"
 msgstr "Geburtstag"
 
-#: membership/forms.py:25
+#: forms.py:25
 msgid "Input format: yyyy-mm-dd"
 msgstr "Eingabeformat: tt.mm.jjjj"
 
-#: membership/forms.py:27
+#: forms.py:27
 msgid "Email"
 msgstr "E-Mail"
 
-#: membership/forms.py:39 membership/forms.py:46 membership/forms.py:53
+#: forms.py:42 forms.py:50 forms.py:58
 msgid ""
 "For your membership, we need this.             Please fill out this field "
 "yet."
 msgstr "Diese Angabe wird für eine Mitgliedschaft benötigt, bitte ausfüllen."
 
-#: membership/forms.py:59
+#: forms.py:65
 msgid ""
 "For your membership, we need this.              Please fill out this field "
 "yet."
 msgstr "Diese Angabe wird für eine Mitgliedschaft benötigt, bitte ausfüllen."
 
-#: membership/forms.py:72
+#: forms.py:78
 msgid "password"
 msgstr "Passwort"
 
-#: membership/forms.py:74
+#: forms.py:80
 msgid "password (again)"
 msgstr "Passwort (wiederholen)"
 
-#: membership/forms.py:97
+#: forms.py:102
 msgid "This username is already taken.         Please choose another."
-msgstr "Diesen Benutzername ist schon vergeben. Bitte einen anderen auswählen."
+msgstr ""
+"Diesen Benutzername ist schon vergeben. Bitte einen anderen auswählen."
 
-#: membership/forms.py:106
+#: forms.py:109
 msgid ""
 "This email address is already in             use. Please supply a different "
 "email address."
 msgstr "Die E-Mail Adresse wird schon verwendet. Bitte eine andere angeben."
 
-#: membership/forms.py:115
+#: forms.py:119
 msgid "The two password fields didn't match."
 msgstr "Die beiden Passwörter passen nicht."
 
-#: membership/models.py:20
-msgid "Male"
-msgstr "Männlich"
-
-#: membership/models.py:21
-msgid "Female"
-msgstr "Weiblich"
-
-#: membership/models.py:90
+#: models.py:83
 msgid "user"
 msgstr "Benutzer"
 
-#: membership/models.py:92
+#: models.py:85
 msgid "activation key"
 msgstr "Aktivierungsschlüssel"
 
-#: membership/models.py:96
+#: models.py:89
 msgid "pending activation"
 msgstr "Ausstehende Aktivierung"
 
-#: membership/models.py:97
+#: models.py:90
 msgid "pending activations"
 msgstr "Wartende Aktivierungen"
 
-#: membership/models.py:100
+#: models.py:93
 #, python-format
 msgid "user registration for %s"
 msgstr "Benutzerregistrierung für %s"
 
-#: membership/models.py:147
+#: models.py:148
 msgid "Gender"
 msgstr "Geschlecht"
 
-#: membership/models.py:166
+#: models.py:164
 msgid ""
 "Yes, I confirm that I am in agreement with the statutes         and would "
 "like to become a member."
 msgstr "Ja, ich bin mit den Statuen einverstanden und möchte Mitglied werden."
 
-#: membership/models.py:170
+#: models.py:168
 msgid "Birthday Date"
 msgstr "Geburtstag"
 
-#: membership/models.py:174
+#: models.py:172
 msgid "Telephone"
 msgstr "Telefon"
 
-#: membership/models.py:180
+#: models.py:178
 msgid "Address"
 msgstr "Adresse"
 
-#: membership/models.py:186
+#: models.py:184
 msgid "Postcode"
 msgstr "Postleitzahl"
 
-#: membership/models.py:191
+#: models.py:189
 msgid "Town/City"
 msgstr "Ort"
 
-#: membership/models.py:199
+#: models.py:197
 msgid "Paid until"
 msgstr "Bezahlt bis"
 
-#: membership/models.py:205
+#: models.py:203
 msgid "Confirmed"
 msgstr "Bestätigt"
 
-#: membership/models.py:207
+#: models.py:205
 msgid "This person has paid the membership fee."
 msgstr "Diese Person hat ihre Mitgliedschaft bezahlt"
 
-#: membership/models.py:216
+#: models.py:216
 msgid "Memberships"
 msgstr "Mitgliedschaften"
 
-#: membership/templates/membership/email/activation_email.txt:2
+#: templates/membership/email/activation_email.txt:2
 #, python-format
 msgid "Welcome %(user)s,"
 msgstr "Herzlich willkommen %(user)s,"
 
-#: membership/templates/membership/email/activation_email.txt:4
+#: templates/membership/email/activation_email.txt:4
 #, python-format
 msgid ""
 "We received an account request on %(site.domain)s for your email address.\n"
 "To activate your account please visit the following link:"
 msgstr ""
-"Jemand (hoffentlich du selbst) möchte mit dieser E-Mail Adresse einen neuen "
-"Benutzer Account für %(site.domain)s anlegen.\n"
-"Solltest du diesen Account aktivieren wollen, klicke bitte auf den unten "
-"stehenden Link, oder kopiere diesen in die Adresszeile deines Browsers:"
+"Jemand (hoffentlich du selbst) möchte mit dieser E-Mail Adresse einen neuen Benutzer Account für %(site.domain)s anlegen.\n"
+"Solltest du diesen Account aktivieren wollen, klicke bitte auf den unten stehenden Link, oder kopiere diesen in die Adresszeile deines Browsers:"
 
-#: membership/templates/membership/email/activation_email.txt:9
+#: templates/membership/email/activation_email.txt:9
 #, python-format
 msgid ""
-"If you do not want to open an account on %(site.domain)s, please ignore this "
-"email.\n"
+"If you do not want to open an account on %(site.domain)s, please ignore this email.\n"
 "Your information will then be deleted in a few days time."
 msgstr ""
-"Wenn du keinen Zugang für %(site.domain)s eröffnen willst, ignoriere diese E-"
-"Mail bitte.\n"
+"Wenn du keinen Zugang für %(site.domain)s eröffnen willst, ignoriere diese E-Mail bitte.\n"
 "Die Zugangsdaten werden dann in ein paar Tagen automatisch gelöscht."
 
-#: membership/templates/membership/email/activation_email.txt:12
+#: templates/membership/email/activation_email.txt:12
 #, python-format
 msgid ""
 "Best Regards,\n"
@@ -205,216 +202,210 @@ msgstr ""
 "mit den besten Wünschen\n"
 "Das Team von %(site.domain)s"
 
-#: membership/templates/membership/email/password_reset_email.html:2
+#: templates/membership/email/password_reset_email.html:2
 msgid "You're receiving this e-mail because you requested a password reset"
 msgstr ""
 "Du hast diese E-Mail erhalten, weil jemand die das Passwort zurücksetzen "
 "möchte. "
 
-#: membership/templates/membership/email/password_reset_email.html:3
+#: templates/membership/email/password_reset_email.html:3
 #, python-format
 msgid "for your user account at %(site_name)s"
 msgstr "Für deinen Benutzerzugang auf %(site_name)s"
 
-#: membership/templates/membership/email/password_reset_email.html:5
+#: templates/membership/email/password_reset_email.html:5
 msgid "Please go to the following page and choose a new password:"
 msgstr "Bitte gehe auf folgende Seite und wähle ein neues Passwort aus:"
 
-#: membership/templates/membership/email/password_reset_email.html:9
+#: templates/membership/email/password_reset_email.html:9
 msgid "Your username, in case you've forgotten:"
 msgstr "Dein Benutzername, für den Fall das du diesen vergessen hast:"
 
-#: membership/templates/membership/email/password_reset_email.html:11
+#: templates/membership/email/password_reset_email.html:11
 msgid "Thanks for using our site!"
 msgstr "Danke das du unsere Seite verwendest!"
 
-#: membership/templates/membership/email/password_reset_email.html:13
+#: templates/membership/email/password_reset_email.html:13
 #, python-format
 msgid "The %(site_name)s team"
 msgstr "Das %(site_name)s Team"
 
-#: membership/templates/membership/email/password_reset_subject.txt:2
+#: templates/membership/email/password_reset_subject.txt:2
 #, python-format
 msgid "Password reset on %(site_name)s"
 msgstr "Passwort auf %(site_name)s zurücksetzen"
 
-#: membership/templates/membership/hanchan_table.html:5
+#: templates/membership/hanchan_table.html:5
 msgid "Start"
 msgstr "Beginn"
 
-#: membership/templates/membership/hanchan_table.html:6
+#: templates/membership/hanchan_table.html:6
 msgid "Event"
 msgstr "Termin"
 
-#: membership/templates/membership/hanchan_table.html:7
+#: templates/membership/hanchan_table.html:7
 msgid "Players"
 msgstr "Spieler"
 
-#: membership/templates/membership/hanchan_table.html:8
+#: templates/membership/hanchan_table.html:8
 msgid "Kyu Points"
 msgstr "Kyū Punkte"
 
-#: membership/templates/membership/hanchan_table.html:9
+#: templates/membership/hanchan_table.html:9
 msgid "Dan Points"
 msgstr "Dan Punkte"
 
-#: membership/templates/membership/hanchan_table.html:10
+#: templates/membership/hanchan_table.html:10
 msgid "Bonus Points"
 msgstr "Bonus Punkte"
 
-#: membership/templates/membership/hanchan_table.html:11
+#: templates/membership/hanchan_table.html:11
 msgid "Comment"
 msgstr "Anmerkung"
 
-#: membership/templates/membership/hanchan_table.html:26
+#: templates/membership/hanchan_table.html:26
 msgid "This Hanchan does not validate"
 msgstr "Diese Hanchan ist ungültig"
 
-#: membership/templates/membership/membership_detail.html:6
+#: templates/membership/membership_detail.html:6
 msgid "profile for"
 msgstr "Profil für"
 
-#: membership/templates/membership/membership_detail.html:10
+#: templates/membership/membership_detail.html:10
 msgid "Ladder Hanchans"
 msgstr "Ladder Hanchans"
 
-#: membership/templates/membership/membership_detail.html:11
+#: templates/membership/membership_detail.html:11
 msgid "Kyu Hanchans"
 msgstr "Kyū Hanchans"
 
-#: membership/templates/membership/membership_detail.html:12
+#: templates/membership/membership_detail.html:12
 msgid "Dan Hanchans"
 msgstr "Dan Hanchans"
 
-#: membership/templates/membership/membership_detail.html:13
+#: templates/membership/membership_detail.html:13
 msgid "Invalid Hanchans"
 msgstr "Ungültige Hanchans"
 
-#: membership/templates/membership/membership_detail.html:14
+#: templates/membership/membership_detail.html:14
 msgid "Mai-Star Games"
 msgstr "Mai-Star Spiele"
 
-#: membership/templates/membership/membership_detail.html:20
+#: templates/membership/membership_detail.html:20
 msgid "Profile Image"
 msgstr "Profilbild"
 
-#: membership/templates/membership/membership_detail.html:28
+#: templates/membership/membership_detail.html:28
 msgid "Member Since"
 msgstr "Mitglied seit"
 
-#: membership/templates/membership/membership_detail.html:29
+#: templates/membership/membership_detail.html:29
 msgid "Last Login"
 msgstr "Letzte Anmeldung"
 
-#: membership/templates/membership/membership_detail.html:38
-#: membership/templates/membership/membership_detail.html:40
+#: templates/membership/membership_detail.html:38
+#: templates/membership/membership_detail.html:40
 msgid "Points"
 msgstr "Punkte"
 
-#: membership/templates/membership/membership_detail.html:42
+#: templates/membership/membership_detail.html:42
 msgid "Games Total"
 msgstr "Spiele gesamt"
 
-#: membership/templates/membership/membership_detail.html:43
-#: membership/templates/membership/membership_detail.html:45
+#: templates/membership/membership_detail.html:43
+#: templates/membership/membership_detail.html:45
 msgid "Won"
 msgstr "Gewonnen"
 
-#: membership/templates/membership/membership_detail.html:43
-#: membership/templates/membership/membership_detail.html:45
+#: templates/membership/membership_detail.html:43
+#: templates/membership/membership_detail.html:45
 msgid "Good"
 msgstr "Gut"
 
-#: membership/templates/membership/membership_detail.html:45
+#: templates/membership/membership_detail.html:45
 msgid "Current Season"
 msgstr "Aktuelle Saison"
 
-#: membership/templates/membership/membership_detail.html:55
+#: templates/membership/membership_detail.html:55
 msgid "Edit Profile"
 msgstr "Profil bearbeiten"
 
-#: membership/templates/membership/membership_detail.html:59
-#: membership/templates/registration/password_change_form.html:23
+#: templates/membership/membership_detail.html:59
+#: templates/registration/password_change_form.html:23
 msgid "Change Password"
 msgstr "Passwort ändern"
 
-#: membership/templates/membership/membership_detail.html:63
-#: membership/templates/membership/membership_detail.html:67
-#: membership/templates/membership/membership_detail.html:71
+#: templates/membership/membership_detail.html:63
+#: templates/membership/membership_detail.html:67
+#: templates/membership/membership_detail.html:71
 #, python-format
 msgid "Associate with %(name)s"
 msgstr "Verbinde mit %(name)s"
 
-#: membership/templates/membership/membership_form.html:4
-#: membership/templates/membership/membership_form.html:6
-#: membership/templates/membership/membership_form.html:11
+#: templates/membership/membership_form.html:4
+#: templates/membership/membership_form.html:6
+#: templates/membership/membership_form.html:11
 msgid "Edit Userprofile"
 msgstr "Profil bearbeiten"
 
-#: membership/templates/membership/membership_form.html:15
+#: templates/membership/membership_form.html:15
 msgid "Reset"
 msgstr "Zurücksetzen"
 
-#: membership/templates/membership/membership_form.html:16
+#: templates/membership/membership_form.html:16
 msgid "Save"
 msgstr "Speichern"
 
-#: membership/templates/membership/register_form.html:4
-#: membership/templates/membership/register_form.html:7
+#: templates/membership/register_form.html:4
+#: templates/membership/register_form.html:7
 msgid "Registration"
 msgstr "Registrieren"
 
-#: membership/templates/membership/register_form.html:9
+#: templates/membership/register_form.html:9
 msgid ""
 "After you've provided your account data, you'll receive\n"
-"      an email asking you to verify your email address. You have to click on "
-"the\n"
-"      link in this verification email to confirm your email address, "
-"otherwise\n"
+"      an email asking you to verify your email address. You have to click on the\n"
+"      link in this verification email to confirm your email address, otherwise\n"
 "      your can't login."
 msgstr ""
-"Nach dem du deine Daten eingegeben hast, wirst du eine E-Mail zur "
-"Bestätigung bekommen.\n"
-"Bitte klicke auf den Link in dieser E-Mail zur Verifizierung, erst dann ist "
-"die Anmeldung möglich."
+"Nach dem du deine Daten eingegeben hast, wirst du eine E-Mail zur Bestätigung bekommen.\n"
+"Bitte klicke auf den Link in dieser E-Mail zur Verifizierung, erst dann ist die Anmeldung möglich."
 
-#: membership/templates/membership/register_form.html:20
+#: templates/membership/register_form.html:20
 msgid "name"
 msgstr "Name"
 
-#: membership/templates/membership/register_form.html:26
-#: membership/templates/registration/login.html:41
+#: templates/membership/register_form.html:26
+#: templates/registration/login.html:41
 msgid "login"
 msgstr "Anmelden"
 
-#: membership/templates/membership/register_form.html:39
+#: templates/membership/register_form.html:39
 msgid "reset"
 msgstr "Zurücksetzen"
 
-#: membership/templates/membership/register_form.html:41
-#: membership/templates/registration/login.html:35
+#: templates/membership/register_form.html:41
+#: templates/registration/login.html:35
 msgid "register"
 msgstr "Registrieren"
 
-#: membership/templates/membership/register_successful.html:5
-#: membership/templates/membership/register_successful.html:7
-#: membership/templates/membership/register_successful.html:10
+#: templates/membership/register_successful.html:5
+#: templates/membership/register_successful.html:7
+#: templates/membership/register_successful.html:10
 msgid "Activation sent"
 msgstr "Aktivierung wurde zugesendet"
 
-#: membership/templates/registration/login.html:4
-#: membership/templates/registration/login.html:11
-#: membership/templates/registration/login.html:53
-#: membership/templates/registration/password_reset_complete.html:13
+#: templates/registration/login.html:4 templates/registration/login.html:11
+#: templates/registration/login.html:53
+#: templates/registration/password_reset_complete.html:13
 msgid "Login"
 msgstr "Anmelden"
 
-#: membership/templates/registration/login.html:17
+#: templates/registration/login.html:17
 msgid "Have you already registered?"
 msgstr "Bereits registriert?"
 
-#: membership/templates/registration/login.html:18
-#, fuzzy
+#: templates/registration/login.html:18
 #| msgid ""
 #| "\n"
 #| "<p>As a registered member you can:</p>\n"
@@ -441,17 +432,14 @@ msgstr ""
 " <li>Kommentare auf dieser Seite hinterlassen.</li>\n"
 " <li>Dich für unseren Newsletter anmelden</li>\n"
 " <li>Mitglied in unserem Verein werden</li>\n"
-" <li>Vereinsmitglieder haben auch vollen Zugang zu unserem Ranking System</"
-"li>\n"
-"</ul>\n"
+" <li>Vereinsmitglieder haben auch vollen Zugang zu unserem Ranking System</li>\n"
+"</ul>"
 
-#: membership/templates/registration/login.html:27
-#, fuzzy
+#: templates/registration/login.html:27
 #| msgid ""
 #| "\n"
 #| "<p>You can register here with your Google, or Facebook account.\n"
-#| "If you don't own such an account, or do not want to use it for "
-#| "authentication,\n"
+#| "If you don't own such an account, or do not want to use it for authentication,\n"
 #| "you can fill out our registration form.</p>\n"
 msgid ""
 "\n"
@@ -462,80 +450,79 @@ msgid ""
 "    "
 msgstr ""
 "\n"
-"<p>Du kannst dich auch über deinen Facebook, Google, oder Twitter Account "
-"anmelden.\n"
+"<p>Du kannst dich auch über deinen Facebook, Google, oder Twitter Account anmelden.\n"
 "Wenn du so etwas nicht besitzt, oder nicht verwenden möchtest, \n"
-"kannst du auch das Registrierungsformular ausfüllen.</p>\n"
+"kannst du auch das Registrierungsformular ausfüllen.</p>"
 
-#: membership/templates/registration/login.html:45
-#, fuzzy
+#: templates/registration/login.html:45
 #| msgid "Your username and password didn't match. Please try again."
 msgid ""
 "Your username and password didn't match. Please try\n"
 "      again."
 msgstr ""
-"Benutzername und Passwort stimmen nicht überein. Bitte noch einmal versuchen."
+"Benutzername und Passwort stimmen nicht überein. Bitte noch einmal "
+"versuchen."
 
-#: membership/templates/registration/login.html:50
+#: templates/registration/login.html:50
 msgid "Forgot your Password?"
 msgstr "Passwort vergessen?"
 
-#: membership/templates/registration/login.html:60
+#: templates/registration/login.html:60
 msgid "or login with an existing Account"
 msgstr "oder über einen existierenden Account anmelden"
 
-#: membership/templates/registration/login.html:63
+#: templates/registration/login.html:63
 msgid "Login with Facebook"
 msgstr "Über Facebook anmelden"
 
-#: membership/templates/registration/login.html:66
+#: templates/registration/login.html:66
 msgid "Login with Twitter"
 msgstr "Über Twitter anmelden"
 
-#: membership/templates/registration/login.html:69
+#: templates/registration/login.html:69
 msgid "Login with Google"
 msgstr "Über Google Anmelden"
 
-#: membership/templates/registration/password_change_done.html:4
-#: membership/templates/registration/password_change_done.html:7
+#: templates/registration/password_change_done.html:4
+#: templates/registration/password_change_done.html:7
 msgid "Password change successful"
 msgstr "Benutzerprofil erfolgreich geändert."
 
-#: membership/templates/registration/password_change_done.html:8
+#: templates/registration/password_change_done.html:8
 msgid "Your password was changed."
 msgstr "Passwort geändet"
 
-#: membership/templates/registration/password_change_form.html:4
-#: membership/templates/registration/password_change_form.html:9
-#: membership/templates/registration/password_change_form.html:16
+#: templates/registration/password_change_form.html:4
+#: templates/registration/password_change_form.html:9
+#: templates/registration/password_change_form.html:16
 msgid "Password change"
 msgstr "Passwort wechseln"
 
-#: membership/templates/registration/password_change_form.html:10
+#: templates/registration/password_change_form.html:10
 msgid ""
-"Please enter your old password, for security's sake, and then enter your new "
-"password twice so we can verify you typed it in correctly."
+"Please enter your old password, for security's sake, and then enter your new"
+" password twice so we can verify you typed it in correctly."
 msgstr ""
-"Zur Sicherheit bitte altes Passwort einmal  und das gewünschte neue Passwort "
-"zweimal angeben, so können Tippfehler abgefangen werden."
+"Zur Sicherheit bitte altes Passwort einmal  und das gewünschte neue Passwort"
+" zweimal angeben, so können Tippfehler abgefangen werden."
 
-#: membership/templates/registration/password_reset_complete.html:4
-#: membership/templates/registration/password_reset_complete.html:6
-#: membership/templates/registration/password_reset_complete.html:9
+#: templates/registration/password_reset_complete.html:4
+#: templates/registration/password_reset_complete.html:6
+#: templates/registration/password_reset_complete.html:9
 msgid "Password reset complete"
 msgstr "Das Rücksetzen des Passwortes ist abgeschlossen."
 
-#: membership/templates/registration/password_reset_complete.html:10
+#: templates/registration/password_reset_complete.html:10
 msgid "Your password has been set.  You may go ahead and log in now."
 msgstr "Das Passwort wurde gesetzt, Du kannst dich nun damit anmelden."
 
-#: membership/templates/registration/password_reset_confirm.html:4
-#: membership/templates/registration/password_reset_confirm.html:6
-#: membership/templates/registration/password_reset_confirm.html:15
+#: templates/registration/password_reset_confirm.html:4
+#: templates/registration/password_reset_confirm.html:6
+#: templates/registration/password_reset_confirm.html:15
 msgid "Enter new password"
 msgstr "Neues Passwort eingeben"
 
-#: membership/templates/registration/password_reset_confirm.html:12
+#: templates/registration/password_reset_confirm.html:12
 msgid ""
 "Please enter your new password twice so we can verify you typed it in "
 "correctly."
@@ -543,15 +530,15 @@ msgstr ""
 "Bitte das Passwort zweimal eingeben, um sicher zu stellen das es korrekt "
 "eingetippt wurde."
 
-#: membership/templates/registration/password_reset_confirm.html:18
+#: templates/registration/password_reset_confirm.html:18
 msgid "Change my password"
 msgstr "Passwort ändern"
 
-#: membership/templates/registration/password_reset_confirm.html:26
+#: templates/registration/password_reset_confirm.html:26
 msgid "Password reset unsuccessful"
 msgstr "Passwort rücksetzen fehlgeschlagen"
 
-#: membership/templates/registration/password_reset_confirm.html:27
+#: templates/registration/password_reset_confirm.html:27
 msgid ""
 "The password reset link was invalid, possibly because it has already been "
 "used.  Please request a new password reset."
@@ -559,22 +546,22 @@ msgstr ""
 "Der Link für die Rücksetzung des Passwortes war ungültig, vermutlich wurde "
 "er schon einmal benutzt. Bitte eine neue Rücksetzung beantragen."
 
-#: membership/templates/registration/password_reset_done.html:4
-#: membership/templates/registration/password_reset_done.html:6
-#: membership/templates/registration/password_reset_done.html:12
+#: templates/registration/password_reset_done.html:4
+#: templates/registration/password_reset_done.html:6
+#: templates/registration/password_reset_done.html:12
 msgid "Password reset successful"
 msgstr "Passwort erfolgreich zurückgesetzt."
 
-#: membership/templates/registration/password_reset_form.html:4
-#: membership/templates/registration/password_reset_form.html:6
+#: templates/registration/password_reset_form.html:4
+#: templates/registration/password_reset_form.html:6
 msgid "Password reset"
 msgstr "Passwort zurücksetzen"
 
-#: membership/templates/registration/password_reset_form.html:21
+#: templates/registration/password_reset_form.html:21
 msgid "Transmit"
 msgstr "Übermitteln"
 
-#: membership/views.py:63
+#: views.py:61
 msgid ""
 "Activation successful.         You can now login anytime with you username "
 "and password."
@@ -582,15 +569,14 @@ msgstr ""
 "Die Aktivierung war erfolgreich. Du kannst dich ab jetzt jederzeit mit "
 "deinem Benutzernamen und Passwort anmelden."
 
-#: membership/views.py:83
+#: views.py:88
 msgid "User Profile changed successfully"
 msgstr "Benutzerprofil erfolgreich geändert."
 
-#: membership/views.py:97
-#, fuzzy
+#: views.py:112
 #| msgid "No %(verbose_name)s found matching the query"
 msgid "No Membership found matching the query"
-msgstr "Kein %(verbose_name)s gefunden welche der Anfrage entspricht"
+msgstr "Keine Mitgliedschaft gefunden welche der Anfrage entspricht"
 
 #~ msgid "Given Name"
 #~ msgstr "Vorname"
@@ -599,9 +585,9 @@ msgstr "Kein %(verbose_name)s gefunden welche der Anfrage entspricht"
 #~ msgstr "Nachname"
 
 #~ msgid ""
-#~ "The Username can only contain the letters from A to Z,         Numbers, "
-#~ "and the underscore. It must be at least 2 characters long,         and "
-#~ "cannot be longer the 30. The first character must be a letter."
+#~ "The Username can only contain the letters from A to Z,         Numbers, and "
+#~ "the underscore. It must be at least 2 characters long,         and cannot be"
+#~ " longer the 30. The first character must be a letter."
 #~ msgstr ""
 #~ "Der Benutzername kann aus den Buchstaben A-Z, Ziffern und dem Unterstrich "
 #~ "bestehen. Es sollte wenigstens 2, aber maximal 30 Zeichen lang sein. Das "
diff --git a/src/utils/locale/de/LC_MESSAGES/django.mo b/src/utils/locale/de/LC_MESSAGES/django.mo
index 0e4652fe11acbc065f0bb247c51ee21d57dc5fa4..fe236ec29a698654da3fa5281d2e02660c07a100 100644
GIT binary patch
literal 11847
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

literal 13006
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

diff --git a/src/utils/locale/de/LC_MESSAGES/django.po b/src/utils/locale/de/LC_MESSAGES/django.po
index 6bac1e3..0a1e1d9 100644
--- a/src/utils/locale/de/LC_MESSAGES/django.po
+++ b/src/utils/locale/de/LC_MESSAGES/django.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: kasu.utils\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-06-19 22:46+0200\n"
+"POT-Creation-Date: 2018-04-27 09:49+0200\n"
 "PO-Revision-Date: 2016-09-28 00:24+0200\n"
 "Last-Translator: Christian Berg <xeniac@posteo.at>\n"
 "Language-Team: Kasu <verein@kasu.at>\n"
@@ -18,999 +18,999 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "X-Generator: Poedit 1.8.9\n"
 
-#: utils/__init__.py:17
+#: __init__.py:17
 msgid "Rejected"
 msgstr "Zurückgewiesen"
 
-#: utils/__init__.py:18
+#: __init__.py:18
 msgid "Waiting..."
 msgstr "Wartend..."
 
-#: utils/__init__.py:19
+#: __init__.py:19
 msgid "Published"
 msgstr "Veröffentlicht"
 
-#: utils/countries.py:4
+#: countries.py:5
 msgid "United Kingdom"
 msgstr "Vereinigtes Königreich"
 
-#: utils/countries.py:5
+#: countries.py:6
 msgid "Afghanistan"
 msgstr "Afghanistan"
 
-#: utils/countries.py:6
+#: countries.py:7
 msgid "Aland Islands"
 msgstr "Aland Islands"
 
-#: utils/countries.py:7
+#: countries.py:8
 msgid "Albania"
 msgstr "Albanien"
 
-#: utils/countries.py:8
+#: countries.py:9
 msgid "Algeria"
 msgstr "Algerien"
 
-#: utils/countries.py:9
+#: countries.py:10
 msgid "American Samoa"
 msgstr "Amerikanisch-Samoa"
 
-#: utils/countries.py:10
+#: countries.py:11
 msgid "Andorra"
 msgstr "Andorra"
 
-#: utils/countries.py:11
+#: countries.py:12
 msgid "Angola"
 msgstr "Angola"
 
-#: utils/countries.py:12
+#: countries.py:13
 msgid "Anguilla"
 msgstr "Anguilla"
 
-#: utils/countries.py:13
+#: countries.py:14
 msgid "Antarctica"
 msgstr "Antarktika"
 
-#: utils/countries.py:14
+#: countries.py:15
 msgid "Antigua and Barbuda"
 msgstr "Antigua und Barbuda"
 
-#: utils/countries.py:15
+#: countries.py:16
 msgid "Argentina"
 msgstr "Argentinien"
 
-#: utils/countries.py:16
+#: countries.py:17
 msgid "Armenia"
 msgstr "Armenien"
 
-#: utils/countries.py:17
+#: countries.py:18
 msgid "Aruba"
 msgstr "Aruba"
 
-#: utils/countries.py:18
+#: countries.py:19
 msgid "Australia"
 msgstr "Australien"
 
-#: utils/countries.py:19
+#: countries.py:20
 msgid "Austria"
 msgstr "Österreich"
 
-#: utils/countries.py:20
+#: countries.py:21
 msgid "Azerbaijan"
 msgstr "Aserbaidschan"
 
-#: utils/countries.py:21
+#: countries.py:22
 msgid "Bahamas"
 msgstr "Bahamas"
 
-#: utils/countries.py:22
+#: countries.py:23
 msgid "Bahrain"
 msgstr "Bahrein"
 
-#: utils/countries.py:23
+#: countries.py:24
 msgid "Bangladesh"
 msgstr "Bangladesch"
 
-#: utils/countries.py:24
+#: countries.py:25
 msgid "Barbados"
 msgstr "Barbados"
 
-#: utils/countries.py:25
+#: countries.py:26
 msgid "Belarus"
 msgstr "Weißrussland"
 
-#: utils/countries.py:26
+#: countries.py:27
 msgid "Belgium"
 msgstr "Belgien"
 
-#: utils/countries.py:27
+#: countries.py:28
 msgid "Belize"
 msgstr "Belize"
 
-#: utils/countries.py:28
+#: countries.py:29
 msgid "Benin"
 msgstr "Benin"
 
-#: utils/countries.py:29
+#: countries.py:30
 msgid "Bermuda"
 msgstr "Bermuda"
 
-#: utils/countries.py:30
+#: countries.py:31
 msgid "Bhutan"
 msgstr "Bhutan"
 
-#: utils/countries.py:31
+#: countries.py:32
 msgid "Bolivia"
 msgstr "Bolivien"
 
-#: utils/countries.py:32
+#: countries.py:33
 msgid "Bosnia and Herzegovina"
 msgstr "Bosnien und Herzegowina"
 
-#: utils/countries.py:33
+#: countries.py:34
 msgid "Botswana"
 msgstr "Botswana"
 
-#: utils/countries.py:34
+#: countries.py:35
 msgid "Bouvet Island"
 msgstr "Bouvet Island"
 
-#: utils/countries.py:35
+#: countries.py:36
 msgid "Brazil"
 msgstr "Brasilien"
 
-#: utils/countries.py:36
+#: countries.py:37
 msgid "British Indian Ocean Territory"
 msgstr "British Indian Ocean Territory"
 
-#: utils/countries.py:37
+#: countries.py:38
 msgid "Brunei Darussalam"
 msgstr "Brunei Darussalam"
 
-#: utils/countries.py:38
+#: countries.py:39
 msgid "Bulgaria"
 msgstr "Bulgarien"
 
-#: utils/countries.py:39
+#: countries.py:40
 msgid "Burkina Faso"
 msgstr "Burkina Faso"
 
-#: utils/countries.py:40
+#: countries.py:41
 msgid "Burundi"
 msgstr "Burundi"
 
-#: utils/countries.py:41
+#: countries.py:42
 msgid "Cambodia"
 msgstr "Kambodscha"
 
-#: utils/countries.py:42
+#: countries.py:43
 msgid "Cameroon"
 msgstr "Kamerun"
 
-#: utils/countries.py:43
+#: countries.py:44
 msgid "Canada"
 msgstr "Kanada"
 
-#: utils/countries.py:44
+#: countries.py:45
 msgid "Cape Verde"
 msgstr "Cape Verde"
 
-#: utils/countries.py:45
+#: countries.py:46
 msgid "Cayman Islands"
 msgstr "Cayman Islands"
 
-#: utils/countries.py:46
+#: countries.py:47
 msgid "Central African Republic"
 msgstr "Zentralafrikanische Republik"
 
-#: utils/countries.py:47
+#: countries.py:48
 msgid "Chad"
 msgstr "Tschad"
 
-#: utils/countries.py:48
+#: countries.py:49
 msgid "Chile"
 msgstr "Chile"
 
-#: utils/countries.py:49
+#: countries.py:50
 msgid "China"
 msgstr "China"
 
-#: utils/countries.py:50
+#: countries.py:51
 msgid "Christmas Island"
 msgstr "Christmas Island"
 
-#: utils/countries.py:51
+#: countries.py:52
 msgid "Cocos (Keeling) Islands"
 msgstr "Cocos (Keeling) Islands"
 
-#: utils/countries.py:52
+#: countries.py:53
 msgid "Colombia"
 msgstr "Kolumbien"
 
-#: utils/countries.py:53
+#: countries.py:54
 msgid "Comoros"
 msgstr "Komoren"
 
-#: utils/countries.py:54
+#: countries.py:55
 msgid "Congo"
 msgstr "Kongo"
 
-#: utils/countries.py:55
+#: countries.py:56
 msgid "Congo, The Democratic Republic of the"
 msgstr "Kongo, Demokratische Republik"
 
-#: utils/countries.py:56
+#: countries.py:57
 msgid "Cook Islands"
 msgstr "Cook-Inseln"
 
-#: utils/countries.py:57
+#: countries.py:58
 msgid "Costa Rica"
 msgstr "Costa Rica"
 
-#: utils/countries.py:58
+#: countries.py:59
 msgid "Cote d'Ivoire"
 msgstr "Cote d'Ivoire"
 
-#: utils/countries.py:59
+#: countries.py:60
 msgid "Croatia"
 msgstr "Kroatien"
 
-#: utils/countries.py:60
+#: countries.py:61
 msgid "Cuba"
 msgstr "Kuba"
 
-#: utils/countries.py:61
+#: countries.py:62
 msgid "Cyprus"
 msgstr "Zypern"
 
-#: utils/countries.py:62
+#: countries.py:63
 msgid "Czech Republic"
 msgstr "Tschechische Republik"
 
-#: utils/countries.py:63
+#: countries.py:64
 msgid "Denmark"
 msgstr "Dänemark"
 
-#: utils/countries.py:64
+#: countries.py:65
 msgid "Djibouti"
 msgstr "Dschibuti"
 
-#: utils/countries.py:65
+#: countries.py:66
 msgid "Dominica"
 msgstr "Dominica"
 
-#: utils/countries.py:66
+#: countries.py:67
 msgid "Dominican Republic"
 msgstr "Dominikanische Republik"
 
-#: utils/countries.py:67
+#: countries.py:68
 msgid "Ecuador"
 msgstr "Ecuador"
 
-#: utils/countries.py:68
+#: countries.py:69
 msgid "Egypt"
 msgstr "Ägypten"
 
-#: utils/countries.py:69
+#: countries.py:70
 msgid "El Salvador"
 msgstr "El Salvador"
 
-#: utils/countries.py:70
+#: countries.py:71
 msgid "Equatorial Guinea"
 msgstr "Äquatorial-Guinea"
 
-#: utils/countries.py:71
+#: countries.py:72
 msgid "Eritrea"
 msgstr "Eritrea"
 
-#: utils/countries.py:72
+#: countries.py:73
 msgid "Estonia"
 msgstr "Estland"
 
-#: utils/countries.py:73
+#: countries.py:74
 msgid "Ethiopia"
 msgstr "Äthiopien"
 
-#: utils/countries.py:74
+#: countries.py:75
 msgid "Falkland Islands (Malvinas)"
 msgstr "Falklandinseln (Malvinas)"
 
-#: utils/countries.py:75
+#: countries.py:76
 msgid "Faroe Islands"
 msgstr "Färöer-Inseln"
 
-#: utils/countries.py:76
+#: countries.py:77
 msgid "Fiji"
 msgstr "Fidschi"
 
-#: utils/countries.py:77
+#: countries.py:78
 msgid "Finland"
 msgstr "Finnland"
 
-#: utils/countries.py:78
+#: countries.py:79
 msgid "France"
 msgstr "Frankreich"
 
-#: utils/countries.py:79
+#: countries.py:80
 msgid "French Guiana"
 msgstr "Französisch-Guayana"
 
-#: utils/countries.py:80
+#: countries.py:81
 msgid "French Polynesia"
 msgstr "Französisch-Polynesien"
 
-#: utils/countries.py:81
+#: countries.py:82
 msgid "French Southern Territories"
 msgstr "Französisch Südliche Territorien"
 
-#: utils/countries.py:82
+#: countries.py:83
 msgid "Gabon"
 msgstr "Gabun"
 
-#: utils/countries.py:83
+#: countries.py:84
 msgid "Gambia"
 msgstr "Gambia"
 
-#: utils/countries.py:84
+#: countries.py:85
 msgid "Georgia"
 msgstr "Georgia"
 
-#: utils/countries.py:85
+#: countries.py:86
 msgid "Germany"
 msgstr "Deutschland"
 
-#: utils/countries.py:86
+#: countries.py:87
 msgid "Ghana"
 msgstr "Ghana"
 
-#: utils/countries.py:87
+#: countries.py:88
 msgid "Gibraltar"
 msgstr "Gibraltar"
 
-#: utils/countries.py:88
+#: countries.py:89
 msgid "Greece"
 msgstr "Griechenland"
 
-#: utils/countries.py:89
+#: countries.py:90
 msgid "Greenland"
 msgstr "Grönland"
 
-#: utils/countries.py:90
+#: countries.py:91
 msgid "Grenada"
 msgstr "Grenada"
 
-#: utils/countries.py:91
+#: countries.py:92
 msgid "Guadeloupe"
 msgstr "Guadeloupe"
 
-#: utils/countries.py:92
+#: countries.py:93
 msgid "Guam"
 msgstr "Guam"
 
-#: utils/countries.py:93
+#: countries.py:94
 msgid "Guatemala"
 msgstr "Guatemala"
 
-#: utils/countries.py:94
+#: countries.py:95
 msgid "Guernsey"
 msgstr "Guernsey"
 
-#: utils/countries.py:95
+#: countries.py:96
 msgid "Guinea"
 msgstr "Guinea"
 
-#: utils/countries.py:96
+#: countries.py:97
 msgid "Guinea-Bissau"
 msgstr "Guinea-Bissau"
 
-#: utils/countries.py:97
+#: countries.py:98
 msgid "Guyana"
 msgstr "Guyana"
 
-#: utils/countries.py:98
+#: countries.py:99
 msgid "Haiti"
 msgstr "Haiti"
 
-#: utils/countries.py:99
+#: countries.py:100
 msgid "Heard Island and McDonald Islands"
 msgstr "Heard und McDonald Inseln"
 
-#: utils/countries.py:100
+#: countries.py:101
 msgid "Holy See (Vatican City State)"
 msgstr "Heiliger Stuhl (Vatikanstadt)"
 
-#: utils/countries.py:101
+#: countries.py:102
 msgid "Honduras"
 msgstr "Honduras"
 
-#: utils/countries.py:102
+#: countries.py:103
 msgid "Hong Kong"
 msgstr "Hongkong"
 
-#: utils/countries.py:103
+#: countries.py:104
 msgid "Hungary"
 msgstr "Ungarn"
 
-#: utils/countries.py:104
+#: countries.py:105
 msgid "Iceland"
 msgstr "Island"
 
-#: utils/countries.py:105
+#: countries.py:106
 msgid "India"
 msgstr "Indien"
 
-#: utils/countries.py:106
+#: countries.py:107
 msgid "Indonesia"
 msgstr "Indonesien"
 
-#: utils/countries.py:107
+#: countries.py:108
 msgid "Iran, Islamic Republic of"
 msgstr "Iran, Islamische Republik"
 
-#: utils/countries.py:108
+#: countries.py:109
 msgid "Iraq"
 msgstr "Irak"
 
-#: utils/countries.py:109
+#: countries.py:110
 msgid "Ireland"
 msgstr "Irland"
 
-#: utils/countries.py:110
+#: countries.py:111
 msgid "Isle of Man"
 msgstr "Isle of Man"
 
-#: utils/countries.py:111
+#: countries.py:112
 msgid "Israel"
 msgstr "Israel"
 
-#: utils/countries.py:112
+#: countries.py:113
 msgid "Italy"
 msgstr "Italien"
 
-#: utils/countries.py:113
+#: countries.py:114
 msgid "Jamaica"
 msgstr "Jamaika"
 
-#: utils/countries.py:114
+#: countries.py:115
 msgid "Japan"
 msgstr "Japan"
 
-#: utils/countries.py:115
+#: countries.py:116
 msgid "Jersey"
 msgstr "Jersey"
 
-#: utils/countries.py:116
+#: countries.py:117
 msgid "Jordan"
 msgstr "Jordan"
 
-#: utils/countries.py:117
+#: countries.py:118
 msgid "Kazakhstan"
 msgstr "Kasachstan"
 
-#: utils/countries.py:118
+#: countries.py:119
 msgid "Kenya"
 msgstr "Kenia"
 
-#: utils/countries.py:119
+#: countries.py:120
 msgid "Kiribati"
 msgstr "Kiribati"
 
-#: utils/countries.py:120
+#: countries.py:121
 msgid "Korea, Democratic People's Republic of"
 msgstr "Korea, Demokratische Volksrepublik"
 
-#: utils/countries.py:121
+#: countries.py:122
 msgid "Korea, Republic of"
 msgstr "Korea, Republik"
 
-#: utils/countries.py:122
+#: countries.py:123
 msgid "Kuwait"
 msgstr "Kuwait"
 
-#: utils/countries.py:123
+#: countries.py:124
 msgid "Kyrgyzstan"
 msgstr "Kirgisistan"
 
-#: utils/countries.py:124
+#: countries.py:125
 msgid "Lao People's Democratic Republic"
 msgstr "Lao Demokratischen Volksrepublik"
 
-#: utils/countries.py:125
+#: countries.py:126
 msgid "Latvia"
 msgstr "Lettland"
 
-#: utils/countries.py:126
+#: countries.py:127
 msgid "Lebanon"
 msgstr "Libanon"
 
-#: utils/countries.py:127
+#: countries.py:128
 msgid "Lesotho"
 msgstr "Lesotho"
 
-#: utils/countries.py:128
+#: countries.py:129
 msgid "Liberia"
 msgstr "Liberia"
 
-#: utils/countries.py:129
+#: countries.py:130
 msgid "Libyan Arab Jamahiriya"
 msgstr "Libyen"
 
-#: utils/countries.py:130
+#: countries.py:131
 msgid "Liechtenstein"
 msgstr "Liechtenstein"
 
-#: utils/countries.py:131
+#: countries.py:132
 msgid "Lithuania"
 msgstr "Litauen"
 
-#: utils/countries.py:132
+#: countries.py:133
 msgid "Luxembourg"
 msgstr "Luxemburg"
 
-#: utils/countries.py:133
+#: countries.py:134
 msgid "Macao"
 msgstr "Macao"
 
-#: utils/countries.py:134
+#: countries.py:135
 msgid "Macedonia, The Former Yugoslav Republic of"
 msgstr "Mazedonien, die ehemalige jugoslawische Republik"
 
-#: utils/countries.py:135
+#: countries.py:136
 msgid "Madagascar"
 msgstr "Madagaskar"
 
-#: utils/countries.py:136
+#: countries.py:137
 msgid "Malawi"
 msgstr "Malawi"
 
-#: utils/countries.py:137
+#: countries.py:138
 msgid "Malaysia"
 msgstr "Malaysia"
 
-#: utils/countries.py:138
+#: countries.py:139
 msgid "Maldives"
 msgstr "Malediven"
 
-#: utils/countries.py:139
+#: countries.py:140
 msgid "Mali"
 msgstr "Mali"
 
-#: utils/countries.py:140
+#: countries.py:141
 msgid "Malta"
 msgstr "Malta"
 
-#: utils/countries.py:141
+#: countries.py:142
 msgid "Marshall Islands"
 msgstr "Marshall Islands"
 
-#: utils/countries.py:142
+#: countries.py:143
 msgid "Martinique"
 msgstr "Martinique"
 
-#: utils/countries.py:143
+#: countries.py:144
 msgid "Mauritania"
 msgstr "Mauretanien"
 
-#: utils/countries.py:144
+#: countries.py:145
 msgid "Mauritius"
 msgstr "Mauritius"
 
-#: utils/countries.py:145
+#: countries.py:146
 msgid "Mayotte"
 msgstr "Mayotte"
 
-#: utils/countries.py:146
+#: countries.py:147
 msgid "Mexico"
 msgstr "Mexiko"
 
-#: utils/countries.py:147
+#: countries.py:148
 msgid "Micronesia, Federated States of"
 msgstr "Mikronesien, Föderierte Staaten von"
 
-#: utils/countries.py:148
+#: countries.py:149
 msgid "Moldova"
 msgstr "Moldawien"
 
-#: utils/countries.py:149
+#: countries.py:150
 msgid "Monaco"
 msgstr "Monaco"
 
-#: utils/countries.py:150
+#: countries.py:151
 msgid "Mongolia"
 msgstr "Mongolei"
 
-#: utils/countries.py:151
+#: countries.py:152
 msgid "Montenegro"
 msgstr "Montenegro"
 
-#: utils/countries.py:152
+#: countries.py:153
 msgid "Montserrat"
 msgstr "Montserrat"
 
-#: utils/countries.py:153
+#: countries.py:154
 msgid "Morocco"
 msgstr "Marokko"
 
-#: utils/countries.py:154
+#: countries.py:155
 msgid "Mozambique"
 msgstr "Mosambik"
 
-#: utils/countries.py:155
+#: countries.py:156
 msgid "Myanmar"
 msgstr "Myanmar"
 
-#: utils/countries.py:156
+#: countries.py:157
 msgid "Namibia"
 msgstr "Namibia"
 
-#: utils/countries.py:157
+#: countries.py:158
 msgid "Nauru"
 msgstr "Nauru"
 
-#: utils/countries.py:158
+#: countries.py:159
 msgid "Nepal"
 msgstr "Nepal"
 
-#: utils/countries.py:159
+#: countries.py:160
 msgid "Netherlands"
 msgstr "Niederlande"
 
-#: utils/countries.py:160
+#: countries.py:161
 msgid "Netherlands Antilles"
 msgstr "Niederländische Antillen"
 
-#: utils/countries.py:161
+#: countries.py:162
 msgid "New Caledonia"
 msgstr "Neukaledonien"
 
-#: utils/countries.py:162
+#: countries.py:163
 msgid "New Zealand"
 msgstr "New Zealand"
 
-#: utils/countries.py:163
+#: countries.py:164
 msgid "Nicaragua"
 msgstr "Nicaragua"
 
-#: utils/countries.py:164
+#: countries.py:165
 msgid "Niger"
 msgstr "Niger"
 
-#: utils/countries.py:165
+#: countries.py:166
 msgid "Nigeria"
 msgstr "Nigeria"
 
-#: utils/countries.py:166
+#: countries.py:167
 msgid "Niue"
 msgstr "Niue"
 
-#: utils/countries.py:167
+#: countries.py:168
 msgid "Norfolk Island"
 msgstr "Norfolk Island"
 
-#: utils/countries.py:168
+#: countries.py:169
 msgid "Northern Mariana Islands"
 msgstr "Northern Mariana Islands"
 
-#: utils/countries.py:169
+#: countries.py:170
 msgid "Norway"
 msgstr "Norwegen"
 
-#: utils/countries.py:170
+#: countries.py:171
 msgid "Oman"
 msgstr "Oman"
 
-#: utils/countries.py:171
+#: countries.py:172
 msgid "Pakistan"
 msgstr "Pakistan"
 
-#: utils/countries.py:172
+#: countries.py:173
 msgid "Palau"
 msgstr "Palau"
 
-#: utils/countries.py:173
+#: countries.py:174
 msgid "Palestinian Territory, Occupied"
 msgstr "Palästinensische Autonomiegebiete"
 
-#: utils/countries.py:174
+#: countries.py:175
 msgid "Panama"
 msgstr "Panama"
 
-#: utils/countries.py:175
+#: countries.py:176
 msgid "Papua New Guinea"
 msgstr "Papua-Neuguinea"
 
-#: utils/countries.py:176
+#: countries.py:177
 msgid "Paraguay"
 msgstr "Paraguay"
 
-#: utils/countries.py:177
+#: countries.py:178
 msgid "Peru"
 msgstr "Peru"
 
-#: utils/countries.py:178
+#: countries.py:179
 msgid "Philippines"
 msgstr "Philippinen"
 
-#: utils/countries.py:179
+#: countries.py:180
 msgid "Pitcairn"
 msgstr "Pitcairn"
 
-#: utils/countries.py:180
+#: countries.py:181
 msgid "Poland"
 msgstr "Polen"
 
-#: utils/countries.py:181
+#: countries.py:182
 msgid "Portugal"
 msgstr "Portugal"
 
-#: utils/countries.py:182
+#: countries.py:183
 msgid "Puerto Rico"
 msgstr "Puerto Rico"
 
-#: utils/countries.py:183
+#: countries.py:184
 msgid "Qatar"
 msgstr "Katar"
 
-#: utils/countries.py:184
+#: countries.py:185
 msgid "Reunion"
 msgstr "Wiedervereinigung"
 
-#: utils/countries.py:185
+#: countries.py:186
 msgid "Romania"
 msgstr "Rumänien"
 
-#: utils/countries.py:186
+#: countries.py:187
 msgid "Russian Federation"
 msgstr "Russischen Föderation"
 
-#: utils/countries.py:187
+#: countries.py:188
 msgid "Rwanda"
 msgstr "Ruanda"
 
-#: utils/countries.py:188
+#: countries.py:189
 msgid "Saint Barthelemy"
 msgstr "Saint Barthelemy"
 
-#: utils/countries.py:189
+#: countries.py:190
 msgid "Saint Helena"
 msgstr "Saint Helena"
 
-#: utils/countries.py:190
+#: countries.py:191
 msgid "Saint Kitts and Nevis"
 msgstr "Saint Kitts und Nevis"
 
-#: utils/countries.py:191
+#: countries.py:192
 msgid "Saint Lucia"
 msgstr "Santa Lucia"
 
-#: utils/countries.py:192
+#: countries.py:193
 msgid "Saint Martin"
 msgstr "Santa Martin"
 
-#: utils/countries.py:193
+#: countries.py:194
 msgid "Saint Pierre and Miquelon"
 msgstr "Saint Pierre und Miquelon"
 
-#: utils/countries.py:194
+#: countries.py:195
 msgid "Saint Vincent and the Grenadines"
 msgstr "Saint Vincent und die Grenadinen"
 
-#: utils/countries.py:195
+#: countries.py:196
 msgid "Samoa"
 msgstr "Samoa"
 
-#: utils/countries.py:196
+#: countries.py:197
 msgid "San Marino"
 msgstr "San Marino"
 
-#: utils/countries.py:197
+#: countries.py:198
 msgid "Sao Tome and Principe"
 msgstr "Sao Tome und Principe"
 
-#: utils/countries.py:198
+#: countries.py:199
 msgid "Saudi Arabia"
 msgstr "Saudi-Arabien"
 
-#: utils/countries.py:199
+#: countries.py:200
 msgid "Senegal"
 msgstr "Senegal"
 
-#: utils/countries.py:200
+#: countries.py:201
 msgid "Serbia"
 msgstr "Serbien"
 
-#: utils/countries.py:201
+#: countries.py:202
 msgid "Seychelles"
 msgstr "Seychellen"
 
-#: utils/countries.py:202
+#: countries.py:203
 msgid "Sierra Leone"
 msgstr "Sierra Leone"
 
-#: utils/countries.py:203
+#: countries.py:204
 msgid "Singapore"
 msgstr "Singapur"
 
-#: utils/countries.py:204
+#: countries.py:205
 msgid "Slovakia"
 msgstr "Slowakei"
 
-#: utils/countries.py:205
+#: countries.py:206
 msgid "Slovenia"
 msgstr "Slowenien"
 
-#: utils/countries.py:206
+#: countries.py:207
 msgid "Solomon Islands"
 msgstr "Salomon-Inseln"
 
-#: utils/countries.py:207
+#: countries.py:208
 msgid "Somalia"
 msgstr "Somalia"
 
-#: utils/countries.py:208
+#: countries.py:209
 msgid "South Africa"
 msgstr "Südafrika"
 
-#: utils/countries.py:209
+#: countries.py:210
 msgid "South Georgia and the South Sandwich Islands"
 msgstr "Südgeorgien und die Südlichen Sandwichinseln"
 
-#: utils/countries.py:210
+#: countries.py:211
 msgid "Spain"
 msgstr "Spanien"
 
-#: utils/countries.py:211
+#: countries.py:212
 msgid "Sri Lanka"
 msgstr "Sri Lanka"
 
-#: utils/countries.py:212
+#: countries.py:213
 msgid "Sudan"
 msgstr "Sudan"
 
-#: utils/countries.py:213
+#: countries.py:214
 msgid "Suriname"
 msgstr "Suriname"
 
-#: utils/countries.py:214
+#: countries.py:215
 msgid "Svalbard and Jan Mayen"
 msgstr "Svalbard und Jan Mayen"
 
-#: utils/countries.py:215
+#: countries.py:216
 msgid "Swaziland"
 msgstr "Swaziland"
 
-#: utils/countries.py:216
+#: countries.py:217
 msgid "Sweden"
 msgstr "Schweden"
 
-#: utils/countries.py:217
+#: countries.py:218
 msgid "Switzerland"
 msgstr "Schweiz"
 
-#: utils/countries.py:218
+#: countries.py:219
 msgid "Syrian Arab Republic"
 msgstr "Arabische Republik Syrien"
 
-#: utils/countries.py:219
+#: countries.py:220
 msgid "Taiwan, Province of China"
 msgstr "Taiwan, Province of China"
 
-#: utils/countries.py:220
+#: countries.py:221
 msgid "Tajikistan"
 msgstr "Tadschikistan"
 
-#: utils/countries.py:221
+#: countries.py:222
 msgid "Tanzania, United Republic of"
 msgstr "Tansania, Vereinigte Republik"
 
-#: utils/countries.py:222
+#: countries.py:223
 msgid "Thailand"
 msgstr "Thailand"
 
-#: utils/countries.py:223
+#: countries.py:224
 msgid "Timor-Leste"
 msgstr "Timor-Leste"
 
-#: utils/countries.py:224
+#: countries.py:225
 msgid "Togo"
 msgstr "Togo"
 
-#: utils/countries.py:225
+#: countries.py:226
 msgid "Tokelau"
 msgstr "Tokelau"
 
-#: utils/countries.py:226
+#: countries.py:227
 msgid "Tonga"
 msgstr "Tonga"
 
-#: utils/countries.py:227
+#: countries.py:228
 msgid "Trinidad and Tobago"
 msgstr "Trinidad und Tobago"
 
-#: utils/countries.py:228
+#: countries.py:229
 msgid "Tunisia"
 msgstr "Tunesien"
 
-#: utils/countries.py:229
+#: countries.py:230
 msgid "Turkey"
 msgstr "Türkei"
 
-#: utils/countries.py:230
+#: countries.py:231
 msgid "Turkmenistan"
 msgstr "Turkmenistan"
 
-#: utils/countries.py:231
+#: countries.py:232
 msgid "Turks and Caicos Islands"
 msgstr "Turks-und Caicosinseln"
 
-#: utils/countries.py:232
+#: countries.py:233
 msgid "Tuvalu"
 msgstr "Tuvalu"
 
-#: utils/countries.py:233
+#: countries.py:234
 msgid "Uganda"
 msgstr "Uganda"
 
-#: utils/countries.py:234
+#: countries.py:235
 msgid "Ukraine"
 msgstr "Ukraine"
 
-#: utils/countries.py:235
+#: countries.py:236
 msgid "United Arab Emirates"
 msgstr "Vereinigte Arabische Emirate"
 
-#: utils/countries.py:236
+#: countries.py:237
 msgid "United States"
 msgstr "Vereinigte Staaten"
 
-#: utils/countries.py:237
+#: countries.py:238
 msgid "United States Minor Outlying Islands"
 msgstr "United States Minor Outlying Islands"
 
-#: utils/countries.py:238
+#: countries.py:239
 msgid "Uruguay"
 msgstr "Uruguay"
 
-#: utils/countries.py:239
+#: countries.py:240
 msgid "Uzbekistan"
 msgstr "Usbekistan"
 
-#: utils/countries.py:240
+#: countries.py:241
 msgid "Vanuatu"
 msgstr "Vanuatu"
 
-#: utils/countries.py:241
+#: countries.py:242
 msgid "Venezuela"
 msgstr "Venezuela"
 
-#: utils/countries.py:242
+#: countries.py:243
 msgid "Viet Nam"
 msgstr "Vietnam"
 
-#: utils/countries.py:243
+#: countries.py:244
 msgid "Virgin Islands, British"
 msgstr "Virgin Islands, British"
 
-#: utils/countries.py:244
+#: countries.py:245
 msgid "Virgin Islands, U.S."
 msgstr "Virgin Islands, US"
 
-#: utils/countries.py:245
+#: countries.py:246
 msgid "Wallis and Futuna"
 msgstr "Wallis und Futuna"
 
-#: utils/countries.py:246
+#: countries.py:247
 msgid "Western Sahara"
 msgstr "Westsahara"
 
-#: utils/countries.py:247
+#: countries.py:248
 msgid "Yemen"
 msgstr "Jemen"
 
-#: utils/countries.py:248
+#: countries.py:249
 msgid "Zambia"
 msgstr "Sambia"
 
-#: utils/countries.py:249
+#: countries.py:250
 msgid "Zimbabwe"
 msgstr "Zimbabwe"
 

From aa85d3fd94f224e1b99d2852f73a12484feb928a Mon Sep 17 00:00:00 2001
From: Xeniac <xeniac@posteo.at>
Date: Sat, 28 Apr 2018 11:11:12 +0200
Subject: [PATCH 06/23] requirements changed to django<2.0 for compatibility
 reasons.

---
 requirements/base.txt | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/requirements/base.txt b/requirements/base.txt
index 3537068..d12b48e 100644
--- a/requirements/base.txt
+++ b/requirements/base.txt
@@ -1,5 +1,5 @@
 beautifulsoup4
-django
+django<2.0
 django-appconf
 django-ckeditor
 django-contrib-comments
@@ -18,4 +18,4 @@ pytz
 requests
 requests-oauthlib
 social-auth-app-django
-social-auth-core
\ No newline at end of file
+social-auth-core

From 3b162fc59c6fcc53f81b9aaf7804cd209addac9d Mon Sep 17 00:00:00 2001
From: Xeniac <xeniac@posteo.at>
Date: Mon, 30 Apr 2018 10:16:04 +0200
Subject: [PATCH 07/23] All personal data can only seen by yourself.

---
 .../locale/de/LC_MESSAGES/django.mo           | Bin 9885 -> 10104 bytes
 .../locale/de/LC_MESSAGES/django.po           | 322 +++++++++---------
 .../membership/membership_detail.html         | 129 ++++---
 3 files changed, 216 insertions(+), 235 deletions(-)

diff --git a/src/membership/locale/de/LC_MESSAGES/django.mo b/src/membership/locale/de/LC_MESSAGES/django.mo
index 2db7ac48382b844f64e8add7f4f8cba4cd8a53b6..fa1d36d4c70d2696fbbaf4624fa4613eadf9cd01 100644
GIT binary patch
delta 2067
zcmYMze@xVM9LMp`1*m}h5WI>2{ZeqpA_x*{Q3(!{tU!&-1{?G}?<-y%-(%mqqp?P}
zRw>O1D;9H2m-?UPKSjIsN3k}|>W`XkjdE@-ZMpRa)*n`8TlIW(-xUKMpU>yM-}mSJ
zd4Jw_r0+(5=2Aue+lHTU{%ZI;oTnM%mH%59Fs7FI5=-G##@vd3VHpMsjd>OuP_Mj<
zKjS{U4JV3t2WPMZv$z`1An#|)c?K0MT*i95jtW#&Yz#3>9hPDf>cvjv5!36>pTctH
zBUpgrsCX0p{0&^ed=|IiJoe*N46?uJASz??1nR+En2*D#fV=(m7^*_!cn}YwDp1X_
zZpS86BAbzq%uZCI5!7>I{(K4*cN#0%-^?&rgU3;se~3Eq=cq)MP!+j|3j6~q@Gq#u
z|HKfk<Rz`Qpf-FE@4&6duZi+cSCYi_cmOk14Blf<jh~?cUPf)WjN9>7+>cv`+KFGI
zDpkmFX#-P^<Y1~$35HQ8Y)2iS)1P;tuJln<V%y58znbZJ7Si|%HsJ5L4r?h(H$IGm
zIE9V)9d5(`<x;?IR3eXK9S-2Dm_{Bof1vuhxRUF@GVDQ5^?!sxmIY;W9lNn?ZEmCO
z$l=W-YJ+K1sozAM@FUa-7f~CZMm_f<at3n^+1vb$gf<nyT!liYN^i(8&<kCtfRCX9
z_M@6=06*pH7svJ3%mtofy^jy?#C6=CnsO6*IE=cw^Y}4dKwdTToUQ{;p?c&B>Z&r!
z43z0j-(ni!9_BTu(r!h)Fo0^RVbqJRzy1=c#QS^?p?c#as@dN6=U<`@dJcQ>Le7k-
zBYl-7hH9cI)P@I8cQ%g-_zvo1$B=586L=ICQCBolO9P^diZ_jlcNkUblc)n^Q3pPY
ztMvW<mVq+;9#yIvsHQBX1NA}!suCTj1iDaxdr=$jL<NjuJErm94N;ZJqMG^(RNQOW
zh6Q{F8`<AHz@Q$V!@KZxREbZZHq7E6F5-TyvT{v&3{{ycsONt|Rqi)`9-t$YXesId
zHK^x9sJP9TQDz+sl-Ur@qK8W87CMY;GGQFX9@N+7II2gkVlP&bbsi3(5*b0ojcXn-
z<}IYC=3RoS2R^|qc($JU4=^a<>5XWkN_G_c@dJN75XvRkjXL2jR00uHz*)@4LwGM9
z@z=jX9c&48#moM@Ae^gAO}H_4S9i0Z%<uO<=s^YEfy#U^yl`_xxags%owBXnwreHa
z_@otatfb?(R%FteOr*V}6W?RmZqyoc#v+cFv=V!))LzGmBy2C*vQWL|R9;bR!cIAs
z!pxmnJ5$o$yrI=<Ywc`nZEC%5ZX{S;^xsPR!fU~&R}Uo}Ym+-_N7&|t(^=O=H|<#y
z3D=6oJob-Ak|`_Au3GAgrAFg1C+c{7>?Eyc5?(SzN(`NtJL)8zy##pC@uH5~vhYpa
RRDNMDqs?||?#a-Oe*i_W^a%g}

delta 1862
zcmYMzZD`G57{~EzIm|XQV~6c{*uk7L3_E8|G|VzFVmmcYO;e^s%aq6D#b2n&hH~cN
z&DaYMMV;uBho~7LX*JKG@MbM9WL9J``Tp!*R%f64zR&qz_jO<Q_5WGXveNl5(sRoA
ztLHP0PtzdH%zh8~Z%UF`Kl9ftB@Z<ljUO-rzvDU_oWggw0l(sA9D{38&4O5u>3AB4
z;RWP*$F4IN$wE8k;Y(DYJ|u=ErI`)KG}MDW<SPrh^DvHJz7Pjv6culcJKu^r%XX~9
zJy?N{(98bjB`RZ^j{4yo^k4}pV41tV3{{~h9>Z;@3jD%sOyhV;BoA4#2rAJ<sNb!0
z=QXIfTW}QnTRnqJJc!D?8Fk{zs6=j{Dsl%E_yH<#Co1vx7{G3KeK-$m!yNSCR8+jh
z{L__GVJ_C8lf$5q!C1VA3fPX?umhv`3L7v$)MAXID)kw;e(OQ@wmwvX$&^7S%t9T&
z=gxCcS2_ii*sKxMU(K|fh26Ljr{Ei$fc;pF<0wx)?!^*pMFskZO5ih2#9lmvS(K5X
zokjKY6|BWLmSN^7vjw<X^;ae_7D_RW+UP5CXv@wT*dT~1aUtqtYf&ewL2X=%O5`w-
zvmHbBvU5l%yN;^tL)7n{q2j!A7%0#uR1<aKJzlpzn2T+cr<3)MT-+qQ#*fs5FK`F;
zpss2Y_jniU(2Mz;DuN}bUfG4Z8V8kNldIFhpn!!qs-*8x4|E~dX+5Y1)gW3=N0m0)
zbsDM{=A)Xc%$=`CowOF0Vx4OORgqsv&p4LBaTItw>aOxp0SizkD?*B4^RN}8sH^#g
zYF-;Z5YUHe!kMU2&qp1g9ChM#sD!qn65WCS-v6Tv)P$|52X3M&@felBGgRQWsExZ(
z0e|3ZOr}%+ZHTH&IjV`PQE?Ao2+v?XKEXWf#mRdA$M7<$#Pd)amSZ(Wu>r4QDHiz$
zDzgjq`~9fO9dYL|RHCh@1H@64yoHL}hDz))DzPu<oM7Ogg_Th=axHcn^_slG0?eWF
zmf{lB6&*(<a1s^pyyi)CH&PUPK6#+jJ-CE<A68*0o0MQPs!}iVxc>?UUG5jNiKfhU
zqE2=cmB1;~-Q7nIKE+ws>8|VD)N?7QyY;*Cxu~nDL?yf)RiQ1YczXi;SH?~t;Y$vt
zCJts^8Wf9o8`DEGLLq-RTpTH!UKomXc*mx)68488#o=(G*Sl(1;^L%zo>)O}#a~2k
Bwo(89

diff --git a/src/membership/locale/de/LC_MESSAGES/django.po b/src/membership/locale/de/LC_MESSAGES/django.po
index de7d6c6..3d408f6 100644
--- a/src/membership/locale/de/LC_MESSAGES/django.po
+++ b/src/membership/locale/de/LC_MESSAGES/django.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: kasu.membership\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-01-11 22:50+0100\n"
-"PO-Revision-Date: 2018-01-12 15:22+0105\n"
+"POT-Creation-Date: 2018-04-30 10:10+0200\n"
+"PO-Revision-Date: 2018-04-30 10:14+0105\n"
 "Last-Translator: b'Christian Berg <kasu@xendynastie.at>'\n"
 "Language-Team: Kasu <verein@kasu.at>\n"
 "Language: de\n"
@@ -19,165 +19,163 @@ msgstr ""
 "X-Generator: Poedit 1.8.9\n"
 "X-Translated-Using: django-rosetta 0.7.14\n"
 
-#: src/membership/__init__.py:11
+#: __init__.py:11
 msgid "Male"
 msgstr "Männlich"
 
-#: src/membership/__init__.py:12
+#: __init__.py:12
 msgid "Female"
 msgstr "Weiblich"
 
-#: src/membership/admin.py:22
+#: admin.py:22
 msgid "Activate selected User"
 msgstr "Ausgewählte Benutzer freischalten"
 
-#: src/membership/admin.py:38
+#: admin.py:38
 msgid "Cleanup selected Activation Requests"
 msgstr "Ausgewählte Aktivierungsanfragen bereinigen"
 
-#: src/membership/admin.py:47
+#: admin.py:47
 msgid "Group"
 msgstr "Gruppe"
 
-#: src/membership/admin.py:48
+#: admin.py:48
 msgid "Groups"
 msgstr "Gruppen"
 
-#: src/membership/admin.py:72 src/membership/models.py:163
-#: src/membership/models.py:216
-#: src/membership/templates/membership/register_form.html:32
+#: admin.py:72 models.py:163 models.py:216
+#: templates/membership/register_form.html:32
 msgid "Membership"
 msgstr "Mitgliedschaft"
 
-#: src/membership/admin.py:77
+#: admin.py:77
 msgid "Permissions"
 msgstr "Berechtigung"
 
-#: src/membership/admin.py:79
+#: admin.py:79
 msgid "Important dates"
 msgstr "Wichtige Daten"
 
-#: src/membership/forms.py:23
+#: forms.py:23 templates/membership/membership_detail.html:46
 msgid "birthday"
 msgstr "Geburtstag"
 
-#: src/membership/forms.py:25
+#: forms.py:25
 msgid "Input format: yyyy-mm-dd"
 msgstr "Eingabeformat: tt.mm.jjjj"
 
-#: src/membership/forms.py:27
+#: forms.py:27 templates/membership/membership_detail.html:49
 msgid "Email"
 msgstr "E-Mail"
 
-#: src/membership/forms.py:42 src/membership/forms.py:50
-#: src/membership/forms.py:58
+#: forms.py:42 forms.py:50 forms.py:58
 msgid ""
 "For your membership, we need this.             Please fill out this field "
 "yet."
 msgstr "Diese Angabe wird für eine Mitgliedschaft benötigt, bitte ausfüllen."
 
-#: src/membership/forms.py:65
+#: forms.py:65
 msgid ""
 "For your membership, we need this.              Please fill out this field "
 "yet."
 msgstr "Diese Angabe wird für eine Mitgliedschaft benötigt, bitte ausfüllen."
 
-#: src/membership/forms.py:78
+#: forms.py:78
 msgid "password"
 msgstr "Passwort"
 
-#: src/membership/forms.py:80
+#: forms.py:80
 msgid "password (again)"
 msgstr "Passwort (wiederholen)"
 
-#: src/membership/forms.py:102
+#: forms.py:102
 msgid "This username is already taken.         Please choose another."
 msgstr ""
 "Diesen Benutzername ist schon vergeben. Bitte einen anderen auswählen."
 
-#: src/membership/forms.py:109
+#: forms.py:109
 msgid ""
 "This email address is already in             use. Please supply a different "
 "email address."
 msgstr "Die E-Mail Adresse wird schon verwendet. Bitte eine andere angeben."
 
-#: src/membership/forms.py:119
+#: forms.py:119
 msgid "The two password fields didn't match."
 msgstr "Die beiden Passwörter passen nicht."
 
-#: src/membership/models.py:84
+#: models.py:84
 msgid "user"
 msgstr "Benutzer"
 
-#: src/membership/models.py:86
+#: models.py:86
 msgid "activation key"
 msgstr "Aktivierungsschlüssel"
 
-#: src/membership/models.py:90
+#: models.py:90
 msgid "pending activation"
 msgstr "Ausstehende Aktivierung"
 
-#: src/membership/models.py:91
+#: models.py:91
 msgid "pending activations"
 msgstr "Wartende Aktivierungen"
 
-#: src/membership/models.py:94
+#: models.py:94
 #, python-format
 msgid "user registration for %s"
 msgstr "Benutzerregistrierung für %s"
 
-#: src/membership/models.py:149
+#: models.py:149
 msgid "Gender"
 msgstr "Geschlecht"
 
-#: src/membership/models.py:165
+#: models.py:165
 msgid ""
 "Yes, I confirm that I am in agreement with the statutes         and would "
 "like to become a member."
 msgstr "Ja, ich bin mit den Statuen einverstanden und möchte Mitglied werden."
 
-#: src/membership/models.py:169
+#: models.py:169
 msgid "Birthday Date"
 msgstr "Geburtstag"
 
-#: src/membership/models.py:173
+#: models.py:173 templates/membership/membership_detail.html:50
 msgid "Telephone"
 msgstr "Telefon"
 
-#: src/membership/models.py:179
+#: models.py:179 templates/membership/membership_detail.html:47
 msgid "Address"
 msgstr "Adresse"
 
-#: src/membership/models.py:185
+#: models.py:185
 msgid "Postcode"
 msgstr "Postleitzahl"
 
-#: src/membership/models.py:190
+#: models.py:190
 msgid "Town/City"
 msgstr "Ort"
 
-#: src/membership/models.py:198
+#: models.py:198
 msgid "Paid until"
 msgstr "Bezahlt bis"
 
-#: src/membership/models.py:204
+#: models.py:204
 msgid "Confirmed"
 msgstr "Bestätigt"
 
-#: src/membership/models.py:206
+#: models.py:206
 msgid "This person has paid the membership fee."
 msgstr "Diese Person hat ihre Mitgliedschaft bezahlt"
 
-#: src/membership/models.py:217
+#: models.py:217
 msgid "Memberships"
 msgstr "Mitgliedschaften"
 
-#: src/membership/templates/membership/email/activation_email.txt:2
+#: templates/membership/email/activation_email.txt:2
 #, python-format
 msgid "Welcome %(user)s,"
 msgstr "Herzlich willkommen %(user)s,"
 
-#: src/membership/templates/membership/email/activation_email.txt:4
+#: templates/membership/email/activation_email.txt:4
 #, python-format
 msgid ""
 "We received an account request on %(site.domain)s for your email address.\n"
@@ -186,7 +184,7 @@ msgstr ""
 "Jemand (hoffentlich du selbst) möchte mit dieser E-Mail Adresse einen neuen Benutzer Account für %(site.domain)s anlegen.\n"
 "Solltest du diesen Account aktivieren wollen, klicke bitte auf den unten stehenden Link, oder kopiere diesen in die Adresszeile deines Browsers:"
 
-#: src/membership/templates/membership/email/activation_email.txt:9
+#: templates/membership/email/activation_email.txt:9
 #, python-format
 msgid ""
 "If you do not want to open an account on %(site.domain)s, please ignore this email.\n"
@@ -195,7 +193,7 @@ msgstr ""
 "Wenn du keinen Zugang für %(site.domain)s eröffnen willst, ignoriere diese E-Mail bitte.\n"
 "Die Zugangsdaten werden dann in ein paar Tagen automatisch gelöscht."
 
-#: src/membership/templates/membership/email/activation_email.txt:12
+#: templates/membership/email/activation_email.txt:12
 #, python-format
 msgid ""
 "Best Regards,\n"
@@ -204,170 +202,185 @@ msgstr ""
 "mit den besten Wünschen\n"
 "Das Team von %(site.domain)s"
 
-#: src/membership/templates/membership/email/password_reset_email.html:2
+#: templates/membership/email/password_reset_email.html:2
 msgid "You're receiving this e-mail because you requested a password reset"
 msgstr ""
 "Du hast diese E-Mail erhalten, weil jemand die das Passwort zurücksetzen "
 "möchte. "
 
-#: src/membership/templates/membership/email/password_reset_email.html:3
+#: templates/membership/email/password_reset_email.html:3
 #, python-format
 msgid "for your user account at %(site_name)s"
 msgstr "Für deinen Benutzerzugang auf %(site_name)s"
 
-#: src/membership/templates/membership/email/password_reset_email.html:5
+#: templates/membership/email/password_reset_email.html:5
 msgid "Please go to the following page and choose a new password:"
 msgstr "Bitte gehe auf folgende Seite und wähle ein neues Passwort aus:"
 
-#: src/membership/templates/membership/email/password_reset_email.html:9
+#: templates/membership/email/password_reset_email.html:9
 msgid "Your username, in case you've forgotten:"
 msgstr "Dein Benutzername, für den Fall das du diesen vergessen hast:"
 
-#: src/membership/templates/membership/email/password_reset_email.html:11
+#: templates/membership/email/password_reset_email.html:11
 msgid "Thanks for using our site!"
 msgstr "Danke das du unsere Seite verwendest!"
 
-#: src/membership/templates/membership/email/password_reset_email.html:13
+#: templates/membership/email/password_reset_email.html:13
 #, python-format
 msgid "The %(site_name)s team"
 msgstr "Das %(site_name)s Team"
 
-#: src/membership/templates/membership/email/password_reset_subject.txt:2
+#: templates/membership/email/password_reset_subject.txt:2
 #, python-format
 msgid "Password reset on %(site_name)s"
 msgstr "Passwort auf %(site_name)s zurücksetzen"
 
-#: src/membership/templates/membership/hanchan_table.html:5
+#: templates/membership/hanchan_table.html:5
 msgid "Start"
 msgstr "Beginn"
 
-#: src/membership/templates/membership/hanchan_table.html:6
+#: templates/membership/hanchan_table.html:6
 msgid "Event"
 msgstr "Termin"
 
-#: src/membership/templates/membership/hanchan_table.html:7
+#: templates/membership/hanchan_table.html:7
 msgid "Players"
 msgstr "Spieler"
 
-#: src/membership/templates/membership/hanchan_table.html:8
+#: templates/membership/hanchan_table.html:8
 msgid "Kyu Points"
 msgstr "Kyū Punkte"
 
-#: src/membership/templates/membership/hanchan_table.html:9
+#: templates/membership/hanchan_table.html:9
 msgid "Dan Points"
 msgstr "Dan Punkte"
 
-#: src/membership/templates/membership/hanchan_table.html:10
+#: templates/membership/hanchan_table.html:10
 msgid "Bonus Points"
 msgstr "Bonus Punkte"
 
-#: src/membership/templates/membership/hanchan_table.html:11
+#: templates/membership/hanchan_table.html:11
 msgid "Comment"
 msgstr "Anmerkung"
 
-#: src/membership/templates/membership/hanchan_table.html:26
+#: templates/membership/hanchan_table.html:26
 msgid "This Hanchan does not validate"
 msgstr "Diese Hanchan ist ungültig"
 
-#: src/membership/templates/membership/membership_detail.html:6
+#: templates/membership/membership_detail.html:5
 msgid "profile for"
 msgstr "Profil für"
 
-#: src/membership/templates/membership/membership_detail.html:10
+#: templates/membership/membership_detail.html:9
 msgid "Ladder Hanchans"
 msgstr "Ladder Hanchans"
 
-#: src/membership/templates/membership/membership_detail.html:11
+#: templates/membership/membership_detail.html:10
 msgid "Kyu Hanchans"
 msgstr "Kyū Hanchans"
 
-#: src/membership/templates/membership/membership_detail.html:12
+#: templates/membership/membership_detail.html:11
 msgid "Dan Hanchans"
 msgstr "Dan Hanchans"
 
-#: src/membership/templates/membership/membership_detail.html:13
+#: templates/membership/membership_detail.html:12
 msgid "Invalid Hanchans"
 msgstr "Ungültige Hanchans"
 
-#: src/membership/templates/membership/membership_detail.html:14
+#: templates/membership/membership_detail.html:13
 msgid "Mai-Star Games"
 msgstr "Mai-Star Spiele"
 
-#: src/membership/templates/membership/membership_detail.html:20
+#: templates/membership/membership_detail.html:17
 msgid "Profile Image"
 msgstr "Profilbild"
 
-#: src/membership/templates/membership/membership_detail.html:28
-msgid "Member Since"
-msgstr "Mitglied seit"
-
-#: src/membership/templates/membership/membership_detail.html:29
-msgid "Last Login"
-msgstr "Letzte Anmeldung"
-
-#: src/membership/templates/membership/membership_detail.html:39
-#: src/membership/templates/membership/membership_detail.html:43
+#: templates/membership/membership_detail.html:26
+#: templates/membership/membership_detail.html:29
 msgid "Points"
 msgstr "Punkte"
 
-#: src/membership/templates/membership/membership_detail.html:40
+#: templates/membership/membership_detail.html:26
 msgid "Maximum"
 msgstr "Maximum"
 
-#: src/membership/templates/membership/membership_detail.html:45
+#: templates/membership/membership_detail.html:32
 msgid "Games Total"
 msgstr "Spiele gesamt"
 
-#: src/membership/templates/membership/membership_detail.html:46
-#: src/membership/templates/membership/membership_detail.html:48
+#: templates/membership/membership_detail.html:32
+#: templates/membership/membership_detail.html:35
 msgid "Won"
 msgstr "Gewonnen"
 
-#: src/membership/templates/membership/membership_detail.html:46
-#: src/membership/templates/membership/membership_detail.html:48
+#: templates/membership/membership_detail.html:32
+#: templates/membership/membership_detail.html:35
 msgid "Good"
 msgstr "Gut"
 
-#: src/membership/templates/membership/membership_detail.html:48
+#: templates/membership/membership_detail.html:35
 msgid "Current Season"
 msgstr "Aktuelle Saison"
 
-#: src/membership/templates/membership/membership_detail.html:58
+#: templates/membership/membership_detail.html:42
+msgid "private data"
+msgstr "Private Daten"
+
+#: templates/membership/membership_detail.html:43
+msgid "This data can only be seen by yourself and members of the board."
+msgstr ""
+"Diese Angaben können nur von dir selbst und von Mitgliedern des Vorstandes "
+"eingesehen werden."
+
+#: templates/membership/membership_detail.html:45
+#: templates/membership/register_form.html:20
+msgid "name"
+msgstr "Name"
+
+#: templates/membership/membership_detail.html:52
+msgid "Member Since"
+msgstr "Mitglied seit"
+
+#: templates/membership/membership_detail.html:53
+msgid "Last Login"
+msgstr "Letzte Anmeldung"
+
+#: templates/membership/membership_detail.html:64
 msgid "Edit Profile"
 msgstr "Profil bearbeiten"
 
-#: src/membership/templates/membership/membership_detail.html:62
-#: src/membership/templates/registration/password_change_form.html:23
+#: templates/membership/membership_detail.html:65
+#: templates/registration/password_change_form.html:23
 msgid "Change Password"
 msgstr "Passwort ändern"
 
-#: src/membership/templates/membership/membership_detail.html:66
-#: src/membership/templates/membership/membership_detail.html:70
-#: src/membership/templates/membership/membership_detail.html:74
+#: templates/membership/membership_detail.html:67
+#: templates/membership/membership_detail.html:69
+#: templates/membership/membership_detail.html:71
 #, python-format
 msgid "Associate with %(name)s"
 msgstr "Verbinde mit %(name)s"
 
-#: src/membership/templates/membership/membership_form.html:4
-#: src/membership/templates/membership/membership_form.html:6
-#: src/membership/templates/membership/membership_form.html:11
+#: templates/membership/membership_form.html:4
+#: templates/membership/membership_form.html:6
+#: templates/membership/membership_form.html:11
 msgid "Edit Userprofile"
 msgstr "Profil bearbeiten"
 
-#: src/membership/templates/membership/membership_form.html:15
+#: templates/membership/membership_form.html:15
 msgid "Reset"
 msgstr "Zurücksetzen"
 
-#: src/membership/templates/membership/membership_form.html:16
+#: templates/membership/membership_form.html:16
 msgid "Save"
 msgstr "Speichern"
 
-#: src/membership/templates/membership/register_form.html:4
-#: src/membership/templates/membership/register_form.html:7
+#: templates/membership/register_form.html:4
+#: templates/membership/register_form.html:7
 msgid "Registration"
 msgstr "Registrieren"
 
-#: src/membership/templates/membership/register_form.html:9
+#: templates/membership/register_form.html:9
 msgid ""
 "After you've provided your account data, you'll receive\n"
 "      an email asking you to verify your email address. You have to click on the\n"
@@ -377,51 +390,37 @@ msgstr ""
 "Nach dem du deine Daten eingegeben hast, wirst du eine E-Mail zur Bestätigung bekommen.\n"
 "Bitte klicke auf den Link in dieser E-Mail zur Verifizierung, erst dann ist die Anmeldung möglich."
 
-#: src/membership/templates/membership/register_form.html:20
-msgid "name"
-msgstr "Name"
-
-#: src/membership/templates/membership/register_form.html:26
-#: src/membership/templates/registration/login.html:41
+#: templates/membership/register_form.html:26
+#: templates/registration/login.html:41
 msgid "login"
 msgstr "Anmelden"
 
-#: src/membership/templates/membership/register_form.html:39
+#: templates/membership/register_form.html:39
 msgid "reset"
 msgstr "Zurücksetzen"
 
-#: src/membership/templates/membership/register_form.html:41
-#: src/membership/templates/registration/login.html:35
+#: templates/membership/register_form.html:41
+#: templates/registration/login.html:35
 msgid "register"
 msgstr "Registrieren"
 
-#: src/membership/templates/membership/register_successful.html:5
-#: src/membership/templates/membership/register_successful.html:7
-#: src/membership/templates/membership/register_successful.html:10
+#: templates/membership/register_successful.html:5
+#: templates/membership/register_successful.html:7
+#: templates/membership/register_successful.html:10
 msgid "Activation sent"
 msgstr "Aktivierung wurde zugesendet"
 
-#: src/membership/templates/registration/login.html:4
-#: src/membership/templates/registration/login.html:11
-#: src/membership/templates/registration/login.html:53
-#: src/membership/templates/registration/password_reset_complete.html:13
+#: templates/registration/login.html:4 templates/registration/login.html:11
+#: templates/registration/login.html:53
+#: templates/registration/password_reset_complete.html:13
 msgid "Login"
 msgstr "Anmelden"
 
-#: src/membership/templates/registration/login.html:17
+#: templates/registration/login.html:17
 msgid "Have you already registered?"
 msgstr "Bereits registriert?"
 
-#: src/membership/templates/registration/login.html:18
-#| msgid ""
-#| "\n"
-#| "<p>As a registered member you can:</p>\n"
-#| "<ul>\n"
-#| " <li>leave comments on this page.</li>\n"
-#| " <li>subscribe to our Newsletter</li>\n"
-#| " <li>apply to a membership to our club</li>\n"
-#| " <li>club-members have access to our ranking-system</li>\n"
-#| "</ul>\n"
+#: templates/registration/login.html:18
 msgid ""
 "\n"
 "    <p>As a registered member you can:</p>\n"
@@ -442,12 +441,7 @@ msgstr ""
 " <li>Vereinsmitglieder haben auch vollen Zugang zu unserem Ranking System</li>\n"
 "</ul>"
 
-#: src/membership/templates/registration/login.html:27
-#| msgid ""
-#| "\n"
-#| "<p>You can register here with your Google, or Facebook account.\n"
-#| "If you don't own such an account, or do not want to use it for authentication,\n"
-#| "you can fill out our registration form.</p>\n"
+#: templates/registration/login.html:27
 msgid ""
 "\n"
 "    <p>You can register here with your Google, or Facebook account.\n"
@@ -461,8 +455,7 @@ msgstr ""
 "Wenn du so etwas nicht besitzt, oder nicht verwenden möchtest, \n"
 "kannst du auch das Registrierungsformular ausfüllen.</p>"
 
-#: src/membership/templates/registration/login.html:45
-#| msgid "Your username and password didn't match. Please try again."
+#: templates/registration/login.html:45
 msgid ""
 "Your username and password didn't match. Please try\n"
 "      again."
@@ -470,42 +463,42 @@ msgstr ""
 "Benutzername und Passwort stimmen nicht überein. Bitte noch einmal "
 "versuchen."
 
-#: src/membership/templates/registration/login.html:50
+#: templates/registration/login.html:50
 msgid "Forgot your Password?"
 msgstr "Passwort vergessen?"
 
-#: src/membership/templates/registration/login.html:60
+#: templates/registration/login.html:60
 msgid "or login with an existing Account"
 msgstr "oder über einen existierenden Account anmelden"
 
-#: src/membership/templates/registration/login.html:63
+#: templates/registration/login.html:63
 msgid "Login with Facebook"
 msgstr "Über Facebook anmelden"
 
-#: src/membership/templates/registration/login.html:66
+#: templates/registration/login.html:66
 msgid "Login with Twitter"
 msgstr "Über Twitter anmelden"
 
-#: src/membership/templates/registration/login.html:69
+#: templates/registration/login.html:69
 msgid "Login with Google"
 msgstr "Über Google Anmelden"
 
-#: src/membership/templates/registration/password_change_done.html:4
-#: src/membership/templates/registration/password_change_done.html:7
+#: templates/registration/password_change_done.html:4
+#: templates/registration/password_change_done.html:7
 msgid "Password change successful"
 msgstr "Benutzerprofil erfolgreich geändert."
 
-#: src/membership/templates/registration/password_change_done.html:8
+#: templates/registration/password_change_done.html:8
 msgid "Your password was changed."
 msgstr "Passwort geändet"
 
-#: src/membership/templates/registration/password_change_form.html:4
-#: src/membership/templates/registration/password_change_form.html:9
-#: src/membership/templates/registration/password_change_form.html:16
+#: templates/registration/password_change_form.html:4
+#: templates/registration/password_change_form.html:9
+#: templates/registration/password_change_form.html:16
 msgid "Password change"
 msgstr "Passwort wechseln"
 
-#: src/membership/templates/registration/password_change_form.html:10
+#: templates/registration/password_change_form.html:10
 msgid ""
 "Please enter your old password, for security's sake, and then enter your new"
 " password twice so we can verify you typed it in correctly."
@@ -513,23 +506,23 @@ msgstr ""
 "Zur Sicherheit bitte altes Passwort einmal  und das gewünschte neue Passwort"
 " zweimal angeben, so können Tippfehler abgefangen werden."
 
-#: src/membership/templates/registration/password_reset_complete.html:4
-#: src/membership/templates/registration/password_reset_complete.html:6
-#: src/membership/templates/registration/password_reset_complete.html:9
+#: templates/registration/password_reset_complete.html:4
+#: templates/registration/password_reset_complete.html:6
+#: templates/registration/password_reset_complete.html:9
 msgid "Password reset complete"
 msgstr "Das Rücksetzen des Passwortes ist abgeschlossen."
 
-#: src/membership/templates/registration/password_reset_complete.html:10
+#: templates/registration/password_reset_complete.html:10
 msgid "Your password has been set.  You may go ahead and log in now."
 msgstr "Das Passwort wurde gesetzt, Du kannst dich nun damit anmelden."
 
-#: src/membership/templates/registration/password_reset_confirm.html:4
-#: src/membership/templates/registration/password_reset_confirm.html:6
-#: src/membership/templates/registration/password_reset_confirm.html:15
+#: templates/registration/password_reset_confirm.html:4
+#: templates/registration/password_reset_confirm.html:6
+#: templates/registration/password_reset_confirm.html:15
 msgid "Enter new password"
 msgstr "Neues Passwort eingeben"
 
-#: src/membership/templates/registration/password_reset_confirm.html:12
+#: templates/registration/password_reset_confirm.html:12
 msgid ""
 "Please enter your new password twice so we can verify you typed it in "
 "correctly."
@@ -537,15 +530,15 @@ msgstr ""
 "Bitte das Passwort zweimal eingeben, um sicher zu stellen das es korrekt "
 "eingetippt wurde."
 
-#: src/membership/templates/registration/password_reset_confirm.html:18
+#: templates/registration/password_reset_confirm.html:18
 msgid "Change my password"
 msgstr "Passwort ändern"
 
-#: src/membership/templates/registration/password_reset_confirm.html:26
+#: templates/registration/password_reset_confirm.html:26
 msgid "Password reset unsuccessful"
 msgstr "Passwort rücksetzen fehlgeschlagen"
 
-#: src/membership/templates/registration/password_reset_confirm.html:27
+#: templates/registration/password_reset_confirm.html:27
 msgid ""
 "The password reset link was invalid, possibly because it has already been "
 "used.  Please request a new password reset."
@@ -553,22 +546,22 @@ msgstr ""
 "Der Link für die Rücksetzung des Passwortes war ungültig, vermutlich wurde "
 "er schon einmal benutzt. Bitte eine neue Rücksetzung beantragen."
 
-#: src/membership/templates/registration/password_reset_done.html:4
-#: src/membership/templates/registration/password_reset_done.html:6
-#: src/membership/templates/registration/password_reset_done.html:12
+#: templates/registration/password_reset_done.html:4
+#: templates/registration/password_reset_done.html:6
+#: templates/registration/password_reset_done.html:12
 msgid "Password reset successful"
 msgstr "Passwort erfolgreich zurückgesetzt."
 
-#: src/membership/templates/registration/password_reset_form.html:4
-#: src/membership/templates/registration/password_reset_form.html:6
+#: templates/registration/password_reset_form.html:4
+#: templates/registration/password_reset_form.html:6
 msgid "Password reset"
 msgstr "Passwort zurücksetzen"
 
-#: src/membership/templates/registration/password_reset_form.html:21
+#: templates/registration/password_reset_form.html:21
 msgid "Transmit"
 msgstr "Übermitteln"
 
-#: src/membership/views.py:61
+#: views.py:61
 msgid ""
 "Activation successful.         You can now login anytime with you username "
 "and password."
@@ -576,12 +569,11 @@ msgstr ""
 "Die Aktivierung war erfolgreich. Du kannst dich ab jetzt jederzeit mit "
 "deinem Benutzernamen und Passwort anmelden."
 
-#: src/membership/views.py:88
+#: views.py:88
 msgid "User Profile changed successfully"
 msgstr "Benutzerprofil erfolgreich geändert."
 
-#: src/membership/views.py:112
-#| msgid "No %(verbose_name)s found matching the query"
+#: views.py:112
 msgid "No Membership found matching the query"
 msgstr "Kein Mitglied gefunden welche der Anfrage entspricht"
 
diff --git a/src/membership/templates/membership/membership_detail.html b/src/membership/templates/membership/membership_detail.html
index d1af67c..009de68 100644
--- a/src/membership/templates/membership/membership_detail.html
+++ b/src/membership/templates/membership/membership_detail.html
@@ -1,5 +1,4 @@
-{% extends "base.html" %}
-{% load i18n comments thumbnail %}
+{% extends "base.html" %}{% load i18n comments thumbnail %}
 
 {% block title %}{{ membership.first_name }} {{membership.last_name}}{% endblock %}
 
@@ -7,84 +6,74 @@
 
 {% block navigation %}
 <ul id="navigation">
-    <li><a href="{% url 'player-ladder-score' membership.username %}">{% trans "Ladder Hanchans" %}</a></li>
-    <li><a href="{% url 'player-kyu-score' membership.username %}">{% trans "Kyu Hanchans" %}</a></li>
-    <li><a href="{% url 'player-dan-score' membership.username %}">{% trans "Dan Hanchans" %}</a></li>
-    <li><a href="{% url 'player-invalid-score' membership.username %}">{% trans "Invalid Hanchans" %}</a></li>
-    <li><a href="{% url 'maistar-player-games' membership.username %}">{% trans "Mai-Star Games" %}</a></li>
-</ul>
-{% endblock %}
+  <li><a href="{% url 'player-ladder-score' membership.username %}">{% trans "Ladder Hanchans" %}</a></li>
+  <li><a href="{% url 'player-kyu-score' membership.username %}">{% trans "Kyu Hanchans" %}</a></li>
+  <li><a href="{% url 'player-dan-score' membership.username %}">{% trans "Dan Hanchans" %}</a></li>
+  <li><a href="{% url 'player-invalid-score' membership.username %}">{% trans "Invalid Hanchans" %}</a></li>
+  <li><a href="{% url 'maistar-player-games' membership.username %}">{% trans "Mai-Star Games" %}</a></li>
+</ul>{% endblock %}
 
-{% block maincontent %}
-{% if membership.avatar %}
-    <img class="grid_3" src="{% thumbnail membership.avatar '220x220' crop='smart' %}" alt="{% trans 'Profile Image' %}"/>
-{% else %}
-    <div class="grid_3"> Noch kein Foto hoch geladen</div>
-{% endif %}
+{% block maincontent %}{% if membership.avatar %}
+<img class="grid_3" src="{% thumbnail membership.avatar '220x220' crop='smart' %}" alt="{% trans 'Profile Image' %}"/>{% else %}
+<div class="grid_3"> Noch kein Foto hoch geladen</div>{% endif %}
 
 <div class="grid_6">
-    <ul>
-        <li><strong>Name:</strong> {{membership.first_name}} {{membership.last_name}}</li>
-        <li><strong>{% trans "Member Since" %}:</strong> {{membership.date_joined}}</li>
-        <li><strong>{% trans "Last Login" %}:</strong> {{membership.last_login}}</li>
-        {% if website %}
-        <li><strong>Homepage:</strong> <a href="{{website}}">{{website}}</a></li>
-        {% endif %}
-    </ul>
-    {% if kyu_dan_ranking %}
-    <h3>Mahjong</h3>
-    <ul>
-        {% if kyu_dan_ranking.dan %}
-        <li>
-            <strong>{{kyu_dan_ranking.dan}}. Dan: </strong> {{ kyu_dan_ranking.dan_points }} {% trans 'Points' %}
-            ({% trans 'Maximum' %}: {{ kyu_dan_ranking.max_dan_points }})
-        </li>
-        {% elif kyu_dan_ranking.kyu%}
-        <li><strong>{{kyu_dan_ranking.kyu}}. Kyu: </strong> {{ kyu_dan_ranking.kyu_points }} {% trans 'Points' %}</li>
-        {% endif %}
-        <li><strong>{% trans 'Games Total' %}: </strong> {{ kyu_dan_ranking.hanchan_count }} Hanchans -
-            {{kyu_dan_ranking.won_hanchans }} {% trans 'Won' %} / {{ kyu_dan_ranking.good_hanchans }} {% trans 'Good' %}
-        </li>
-        <li><strong>{% trans 'Current Season' %}: </strong> {{ ladder_ranking.hanchan_count }} Hanchans - {{ ladder_ranking.won_hanchans }} {% trans 'Won' %} / {{ ladder_ranking.good_hanchans }} {% trans 'Good' %}
-        </li>
-    </ul>
+  {% if kyu_dan_ranking %}
+  <h3>Mahjong</h3>
+  <ul>
+    {% if kyu_dan_ranking.dan %}
+    <li>
+      <strong>{{kyu_dan_ranking.dan}}. Dan: </strong> {{ kyu_dan_ranking.dan_points }} {% trans 'Points' %} ({% trans 'Maximum' %}: {{ kyu_dan_ranking.max_dan_points }})
+    </li>
+    {% elif kyu_dan_ranking.kyu%}
+    <li><strong>{{kyu_dan_ranking.kyu}}. Kyu: </strong> {{ kyu_dan_ranking.kyu_points }} {% trans 'Points' %}</li>
     {% endif %}
+    <li>
+      <strong>{% trans 'Games Total' %}: </strong> {{ kyu_dan_ranking.hanchan_count }} Hanchans - {{kyu_dan_ranking.won_hanchans }} {% trans 'Won' %} / {{ kyu_dan_ranking.good_hanchans }} {% trans 'Good' %}
+    </li>
+    <li>
+      <strong>{% trans 'Current Season' %}: </strong> {{ ladder_ranking.hanchan_count }} Hanchans - {{ ladder_ranking.won_hanchans }} {% trans 'Won' %} / {{ ladder_ranking.good_hanchans }} {% trans 'Good' %}
+    </li>
+  </ul>
+  {% endif %}
+
+  {% if membership == user or perms.membership.change_membership%}
+
+  <h3>{% trans 'private data' %}</h3>
+  <p>{% blocktrans %}This data can only be seen by yourself and members of the board.{% endblocktrans %} </p>
+  <ul>
+    <li><strong>{% trans "name" %}:</strong> {{membership.first_name}} {{membership.last_name}}</li>
+    <li><strong>{% trans "birthday" %}:</strong> {{membership.birthday}}</li>
+    <li><strong>{% trans "Address" %}:</strong> <address>{{ membership.street_name }}<br/> {{ membership.post_code }} {{ membership.city }}</address></li>
+
+    <li><strong>{% trans "Email" %}:</strong> <a href="mailto:{{ membership.email }}">{{membership.email}}</a></li>
+    <li><strong>{% trans "Telephone" %}:</strong> <a href="tel:{{ membership.telephone }}">{{membership.telephone}}</a></li>
+
+    <li><strong>{% trans "Member Since" %}:</strong> {{membership.date_joined}}</li>
+    <li><strong>{% trans "Last Login" %}:</strong> {{membership.last_login}}</li>
+    {% if website %}
+    <li><strong>Homepage:</strong> <a href="{{website}}">{{website}}</a></li>
+    {% endif %}
+  </ul>
+  {% endif %}
+
 </div>
 
 {% ifequal membership user %}
 <div class="grid_3">
-    <a href="{% url 'membership-edit' membership.username %}" class="button">
-        <span class="fa fa-pencil"></span>
-        {% trans "Edit Profile" %}
-    </a>
-    <a href="{% url 'password_change' %}" class="button">
-        <span class="fa fa-key"></span>
-        {% trans 'Change Password' %}
-    </a>
-    <a class="button" href="{% url 'social:begin' 'facebook' %}" rel="nofollow">
-        <span class="fa fa-facebook"></span>
-        {% blocktrans with 'Facebook' as name %}Associate with {{ name }}{% endblocktrans %}
-    </a>
-    <a class="button" href="{% url 'social:begin' 'twitter' %}" rel="nofollow">
-        <span class="fa fa-twitter"></span>
-        {% blocktrans with 'Twitter' as name %}Associate with {{ name }}{% endblocktrans %}
-    </a>
-    <a class="button" href="{% url 'social:begin' 'google-oauth2' %}" rel="nofollow">
-        <span class="fa fa-google-plus"></span>
-        {% blocktrans with 'Google' as name %}Associate with {{ name }}{% endblocktrans %}
-    </a>
+  <a href="{% url 'membership-edit' membership.username %}" class="button"> <span class="fa fa-pencil"></span> {% trans "Edit Profile" %} </a>
+  <a href="{% url 'password_change' %}" class="button"> <span class="fa fa-key"></span> {% trans 'Change Password' %} </a>
+  <a class="button" href="{% url 'social:begin' 'facebook' %}" rel="nofollow">
+    <span class="fa fa-facebook"></span> {% blocktrans with 'Facebook' as name %}Associate with {{ name }}{% endblocktrans %} </a>
+  <a class="button" href="{% url 'social:begin' 'twitter' %}" rel="nofollow">
+    <span class="fa fa-twitter"></span> {% blocktrans with 'Twitter' as name %}Associate with {{ name }}{% endblocktrans %} </a>
+  <a class="button" href="{% url 'social:begin' 'google-oauth2' %}" rel="nofollow">
+    <span class="fa fa-google-plus"></span> {% blocktrans with 'Google' as name %}Associate with {{ name }}{% endblocktrans %} </a>
 
-</div>
-{% endifequal %}
+</div>{% endifequal %}
 
-{% block score_list %} {% endblock %}
-{% endblock %}
+{% block score_list %} {% endblock %}{% endblock %}
 
-{% block comments %}
-{% if membership %}
-    {% render_comment_list for membership %}
-    {% render_comment_form for membership %}
-{% endif %}
-{% endblock %}
+{% block comments %}{% if membership %}{% render_comment_list for membership %}{% render_comment_form for membership %}{% endif %}{% endblock %}
 
 {% block buttonbar%}{%endblock%}

From 722c155c17ea79336357f71aeb0cb8a69b816c0f Mon Sep 17 00:00:00 2001
From: Xeniac <xeniac@posteo.at>
Date: Mon, 30 Apr 2018 11:12:20 +0200
Subject: [PATCH 08/23] Personal data is only needed for a club membership.

---
 src/membership/forms.py                       |  43 ++++++------------
 .../locale/de/LC_MESSAGES/django.mo           | Bin 10104 -> 9990 bytes
 .../locale/de/LC_MESSAGES/django.po           |  40 ++++++++--------
 .../templates/membership/register_form.html   |  16 ++-----
 4 files changed, 39 insertions(+), 60 deletions(-)

diff --git a/src/membership/forms.py b/src/membership/forms.py
index 2214837..62a0658 100644
--- a/src/membership/forms.py
+++ b/src/membership/forms.py
@@ -25,6 +25,10 @@ class MembershipForm(forms.ModelForm):
         help_text=_('Input format: yyyy-mm-dd')
     )
     email = forms.EmailField(label=_('Email'), required=True)
+    required_membership_fields = (
+        'first_name', 'last_name', 'birthday',
+        'street_name', 'post_code', 'city'
+    )
 
     class Meta:
         """get the user model dyamicly"""
@@ -35,36 +39,15 @@ class MembershipForm(forms.ModelForm):
             'post_code', 'city'
         )
 
-    def clean_birthday(self):
-        """If the user wants to be a member the birthday field is mandatory."""
-        if self.cleaned_data['membership'] \
-                and not self.cleaned_data['birthday']:
-            raise forms.ValidationError(_('For your membership, we need this. \
-            Please fill out this field yet.'))
-        return self.cleaned_data['birthday']
+    def clean(self):
+        cleaned_data = super().clean()
+        errormsg = _('For your membership, we need this. \
+            Please fill out this field yet.')
+        membership = cleaned_data.get('membership')
+        for fieldname in self.required_membership_fields:
+            if membership and not cleaned_data.get(fieldname):
+                self.add_error(fieldname, errormsg)
 
-    def clean_street_name(self):
-        """If the user wants to be a member the address is mandatory."""
-        if self.cleaned_data['membership'] \
-                and not self.cleaned_data['street_name']:
-            raise forms.ValidationError(_('For your membership, we need this. \
-            Please fill out this field yet.'))
-        return self.cleaned_data['street_name']
-
-    def clean_post_code(self):
-        """If the user wants to be a member the address is mandatory."""
-        if self.cleaned_data['membership'] \
-                and not self.cleaned_data['post_code']:
-            raise forms.ValidationError(_('For your membership, we need this. \
-            Please fill out this field yet.'))
-        return self.cleaned_data['post_code']
-
-    def clean_city(self):
-        """If the user wants to be a member the address is mandatory."""
-        if self.cleaned_data['membership'] and not self.cleaned_data['city']:
-            raise forms.ValidationError(_('For your membership, we need this. \
-             Please fill out this field yet.'))
-        return self.cleaned_data['city']
 
 
 class RegistrationForm(MembershipForm):
@@ -122,7 +105,7 @@ class RegistrationForm(MembershipForm):
     def save(self, commit=True):
         """ Create the new User, set him/her inactive, create an acitivation
         request for the user and send him/her an activation email.
-        
+
         :param commit: commit the SQL and send the email if True
         :return: the created User Object
         """
diff --git a/src/membership/locale/de/LC_MESSAGES/django.mo b/src/membership/locale/de/LC_MESSAGES/django.mo
index fa1d36d4c70d2696fbbaf4624fa4613eadf9cd01..3b4bdf7070fcd3bffaae1b88f0e3eef5352ec08d 100644
GIT binary patch
delta 1768
zcmXZbc}P@I6vy#vYBi2aHI3zNX@i=kR-zS#(NNMd6or9B(A1PeYN573(Fm6QRT>kK
zD40bBffZP^LPZ-Dl?MGGZGS`?VTBcy1oizj55&*C_q}({x#!;b<!Sb`9SX!5V-oDf
zjKXZRVIjui9E`?A7=^2>xfjPU--40Yh~u!?nz!Rf=3VH)ljy`B$e*zjRL>_wn}CU6
zkjjDrWmpfgF`0P*?#HF5LZ9PA{DdkXA|_Oz6II}3)O&f>yc89;93AMvvFJq=+z=B8
z?X-mj6>=EWi4G)(IgSc^4psS8bm2W~{WB`zZ%jlRZByqm`8NS)U>YvQ1l){CxDOSt
zJHS8*dvF<Ez!n@y)Y*6d)vEhA8vBr3W&l;-d(;lUqc$*X&Hti~GLkl_usDpz9NdQU
za0&)4GDv0c63g%pR$?iA%EBW!7jL2hs&6VJ3MZiho3IGg+RGS@57CQHa6V3_|E0Jc
zRnU1XBfojVK#9hT54CO<DnU7_)yq*k+=<%Z9#rBc)O#n8n#~y`m${CFG*3|-dWUND
zH`M!oQSnA|BO}OfVj1XCIq*i9F}awAgY>J9^%x#b##g9I8OA}@VJhnA4&pUzM?N(b
zY_ABbQFrGUs*oO3p;s&)VlMg33kLeo#?4TR(@-B~BgbfFq5`<B_2sBmud%E}-H}Gr
zrE9U~U8o(O#D#bk)tR5DJ7i}!0VPUcpfk%v1<FG0EFbBXDaNC?1i7DP5ZSExg9;d*
z5(=1uYIO;!a5rklD^Z2`PzBbaHr$*-|8*-nS<nZ)s1Dph74QgE=`&Q~H>iL^I1|IU
zx&ITQI^ss%>Izic-B^f0%)&dEiJvh89clDmtu5w9s)TN=#3k5*r?3q3(?gxvih6$s
zs&jj-c`K^WPSgfYqdIvW756Htuv@6YK4L4H09RQRwIRo1F5p`1NBwLHxOutQfD5r3
zbyOcwg$$ws4{IJ~Ogh`5IVO*wYWZSZfGcqYcHmt6g6ddc8ee-Dl%XE9qAGlh+TmMN
z0bfx8Q(U2+p$qewPerY-Mt!#db;i4_c@Wi^)2O4mgev@YXx(A@87RPOROKIB#}h|I
z#8z+frq}ptyuP~nD*x8tM0-#0u05l-B)ZKuqNq6d!08%MG^=;Wxhm3G;j8ocYwK(L
a4V$X{z76&3tJZC72$m-e^!k(I?Ee7Q;I&2o

delta 1731
zcmXZbPe@cz6vy#9>SQ+lOS96^%+gW(Q%PDRrG}+hG+KiQ3R>pIFcHHbLWYRc60<Ty
zqDXC}29d_lq9ll{7KK5W(xNgFS|~00W3{O7uX!MT?tSmRbI&>VPP==_efgR<*ccP*
zFeU_(FdQ>56!UNemRR${7|FaA?bwV_c*>ezz-7#Punhaqjq@0Txddfs4xrXmh8nL4
zVo<{a1w3ZGXux>p&Df3I7=g|(W7c8@Dv>?ND^r0=v<|iIgf(wN#qGpsyo4)p2$lH#
zFt5MjXFO0M)2NQTLk0eX3j7t7`5$y)Fm2NFO{fibU>uerf2N*)Yw#o{Vi(5ZC_3>e
zD&9vg18ul~<@g;tu$ZWM_zKmk5XxPSkw^|E7L{Nss=^#p0eRNE0Cl8$QHhn|YCMju
zcotL8`;);s1_|_~5O-n~wqY91U_RRDmjV`|64{SQ=)rT?iYzt1Fc2N|yAC6;2wQL$
z`cMgd!$S5q5v%+gl_SNQ)2IzPQLVm$s_+4-!U@#IPf+VVBQ=;sWN-5qiEW~|aq5r@
z)#|ON^#!PS`!I<8jhlfkl?NZ&jA_I~%;Es2cz%$V8*m*5s7tvUTd)Robg%It&LW?h
zKFZ6*JE%J{he~7tmFRCv2Nxle{Y^XrwYC)Xfd_S|YEU0GS<la)THJ2gkGdNpsLOWG
zn!i9*I)x=TYnep$>P!Rb4z;0I8+I|!nf0LpUPo0nh;-8o;{Z;ej;J=lf18_70XtCv
zZ=hN|f-1m=s(2EW&|6fZA5fiIN}&I`mEqh#eUO6cL@p|U0#x7<)W#L4fc2Pzt@wXK
zRA+psTm2jrcM-GE&TlXcw_`FM!Hsx6k^Za2!#vQ2KCHqC?7-Od{$Ir)sxxz_^<Pk(
z`(e#(+(;!Fjw&D?wcdq_n}td&7nN8w_F#*bfieo<hH*?L6>G2v^|KkmOq|COj3(_s
ztVShLiwfMRxy_iXNO#RGf~w_@uox%NgJCSr$D^o@c?TG{8H`ykY%YI>g{TTEQ3=$c
z0`_1K_Ty%}X+3|5s%#o{#tYWmp6c&RJnE>@QHgK!KaVy=3>5efD)Xw;+i}4`z3Gn8
l-Zzfq@nOgNkbvwhy%%F#0ogg@V=<NX-bClj_+4kE;~&rlq?rH!

diff --git a/src/membership/locale/de/LC_MESSAGES/django.po b/src/membership/locale/de/LC_MESSAGES/django.po
index 3d408f6..dfb5e8d 100644
--- a/src/membership/locale/de/LC_MESSAGES/django.po
+++ b/src/membership/locale/de/LC_MESSAGES/django.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: kasu.membership\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-04-30 10:10+0200\n"
-"PO-Revision-Date: 2018-04-30 10:14+0105\n"
+"POT-Creation-Date: 2018-04-30 10:57+0200\n"
+"PO-Revision-Date: 2018-04-30 10:59+0105\n"
 "Last-Translator: b'Christian Berg <kasu@xendynastie.at>'\n"
 "Language-Team: Kasu <verein@kasu.at>\n"
 "Language: de\n"
@@ -44,7 +44,6 @@ msgid "Groups"
 msgstr "Gruppen"
 
 #: admin.py:72 models.py:163 models.py:216
-#: templates/membership/register_form.html:32
 msgid "Membership"
 msgstr "Mitgliedschaft"
 
@@ -68,38 +67,32 @@ msgstr "Eingabeformat: tt.mm.jjjj"
 msgid "Email"
 msgstr "E-Mail"
 
-#: forms.py:42 forms.py:50 forms.py:58
+#: forms.py:44
 msgid ""
 "For your membership, we need this.             Please fill out this field "
 "yet."
 msgstr "Diese Angabe wird für eine Mitgliedschaft benötigt, bitte ausfüllen."
 
-#: forms.py:65
-msgid ""
-"For your membership, we need this.              Please fill out this field "
-"yet."
-msgstr "Diese Angabe wird für eine Mitgliedschaft benötigt, bitte ausfüllen."
-
-#: forms.py:78
+#: forms.py:61
 msgid "password"
 msgstr "Passwort"
 
-#: forms.py:80
+#: forms.py:63
 msgid "password (again)"
 msgstr "Passwort (wiederholen)"
 
-#: forms.py:102
+#: forms.py:85
 msgid "This username is already taken.         Please choose another."
 msgstr ""
 "Diesen Benutzername ist schon vergeben. Bitte einen anderen auswählen."
 
-#: forms.py:109
+#: forms.py:92
 msgid ""
 "This email address is already in             use. Please supply a different "
 "email address."
 msgstr "Die E-Mail Adresse wird schon verwendet. Bitte eine andere angeben."
 
-#: forms.py:119
+#: forms.py:102
 msgid "The two password fields didn't match."
 msgstr "Die beiden Passwörter passen nicht."
 
@@ -333,7 +326,6 @@ msgstr ""
 "eingesehen werden."
 
 #: templates/membership/membership_detail.html:45
-#: templates/membership/register_form.html:20
 msgid "name"
 msgstr "Name"
 
@@ -390,16 +382,21 @@ msgstr ""
 "Nach dem du deine Daten eingegeben hast, wirst du eine E-Mail zur Bestätigung bekommen.\n"
 "Bitte klicke auf den Link in dieser E-Mail zur Verifizierung, erst dann ist die Anmeldung möglich."
 
-#: templates/membership/register_form.html:26
+#: templates/membership/register_form.html:20
 #: templates/registration/login.html:41
 msgid "login"
 msgstr "Anmelden"
 
-#: templates/membership/register_form.html:39
+#: templates/membership/register_form.html:26
+#| msgid "Membership"
+msgid "Club membership"
+msgstr "Vereinsmitgliedschaft"
+
+#: templates/membership/register_form.html:33
 msgid "reset"
 msgstr "Zurücksetzen"
 
-#: templates/membership/register_form.html:41
+#: templates/membership/register_form.html:35
 #: templates/registration/login.html:35
 msgid "register"
 msgstr "Registrieren"
@@ -577,6 +574,11 @@ msgstr "Benutzerprofil erfolgreich geändert."
 msgid "No Membership found matching the query"
 msgstr "Kein Mitglied gefunden welche der Anfrage entspricht"
 
+#~ msgid ""
+#~ "For your membership, we need this.              Please fill out this field "
+#~ "yet."
+#~ msgstr "Diese Angabe wird für eine Mitgliedschaft benötigt, bitte ausfüllen."
+
 #~ msgid "Given Name"
 #~ msgstr "Vorname"
 
diff --git a/src/membership/templates/membership/register_form.html b/src/membership/templates/membership/register_form.html
index 59519bf..eadc98e 100644
--- a/src/membership/templates/membership/register_form.html
+++ b/src/membership/templates/membership/register_form.html
@@ -16,21 +16,15 @@
 {% block maincontent %}
 <form method="post" action="{% url 'membership-register' %}">
   {% csrf_token %}
-  <fieldset class="grid_5">
-    <legend>{% trans "name"%}</legend>
-    {% get_fieldset "gender, first_name, last_name, username" from form as form1 %}
-    {% with form1 as form %}{% include "form.html" %}{% endwith %}
-  </fieldset>
-
   <fieldset class="grid_7">
     <legend>{% trans "login"%}</legend>
-    {% get_fieldset "email, password1, password2, recaptcha" from form as form1 %}
+    {% get_fieldset "username, email, password1, password2, recaptcha" from form as form1 %}
     {% with form1 as form %}{% include "form.html" %}{% endwith %}
   </fieldset>
 
-  <fieldset class="grid_12">
-    <legend>{% trans "Membership"%}</legend>
-    {% get_fieldset "membership, birthday, street_name, post_code, city, telephone, website" from form as form2 %}
+  <fieldset class="grid_5">
+    <legend>{% trans "Club membership"%}</legend>
+    {% get_fieldset "membership, first_name, last_name, gender, birthday, street_name, post_code, city, telephone, website" from form as form2 %}
     {% with form2 as form %}{% include "form.html" %}{% endwith %}
   </fieldset>
 
@@ -42,4 +36,4 @@
     </p>
   </div>
 </form>
-{% endblock %}
\ No newline at end of file
+{% endblock %}

From 2f5f834bbab21240680e8fb6f49d40e0708cf7e7 Mon Sep 17 00:00:00 2001
From: Xeniac <xeniac@posteo.at>
Date: Mon, 30 Apr 2018 11:37:32 +0200
Subject: [PATCH 09/23] Track without cookies.

---
 src/kasu/static/js/piwik.js | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/kasu/static/js/piwik.js b/src/kasu/static/js/piwik.js
index 23d43a5..5ebbf1a 100644
--- a/src/kasu/static/js/piwik.js
+++ b/src/kasu/static/js/piwik.js
@@ -4,10 +4,12 @@
   _paq.push(['trackPageView']);
   _paq.push(['enableLinkTracking']);
   (function() {
-    var u="//kasu.at/piwik/";
+    var u="/piwik/";
     _paq.push(['setTrackerUrl', u+'piwik.php']);
     _paq.push(['setSiteId', '1']);
+    _paq.push(['disableCookies']);
+	_paq.push(['trackPageView']);
     var d=document, g=d.createElement('script'), s=d.getElementsByTagName('script')[0];
     g.type='text/javascript'; g.async=true; g.defer=true; g.src=u+'piwik.js'; s.parentNode.insertBefore(g,s);
   })();
-/* End Piwik Code */
\ No newline at end of file
+/* End Piwik Code */

From 9fdf72570273547e36754d1603193bb6f3bbf211 Mon Sep 17 00:00:00 2001
From: Xeniac <xeniac@posteo.at>
Date: Tue, 1 May 2018 20:27:22 +0200
Subject: [PATCH 10/23] Don't display members real name anywhere!

---
 .../templates/mahjong_ranking/kyudanranking_list.html       | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/src/mahjong_ranking/templates/mahjong_ranking/kyudanranking_list.html b/src/mahjong_ranking/templates/mahjong_ranking/kyudanranking_list.html
index c1e3f28..b4cd34f 100755
--- a/src/mahjong_ranking/templates/mahjong_ranking/kyudanranking_list.html
+++ b/src/mahjong_ranking/templates/mahjong_ranking/kyudanranking_list.html
@@ -20,11 +20,6 @@
    {% trans 'Nickname' %}
    <a href="{% url 'kyudanranking-list' order_by='-username' %}?page={{page_obj.number}}" class="fa fa-sort-desc" rel="nofollow"></a>
    </th>
-   <th>
-    <a href="{% url 'kyudanranking-list' order_by='+full_name'%}?page={{page_obj.number}}" class="fa fa-sort-asc" rel="nofollow"></a>
-    {% trans 'Full Name' %}
-    <a href="{% url 'kyudanranking-list' order_by='-full_name' %}?page={{page_obj.number}}" class="fa fa-sort-desc" rel="nofollow"></a>
-   </th>
    <th>
     <a href="{% url 'kyudanranking-list' order_by='+rank' %}?page={{page_obj.number}}" class="fa fa-sort-asc" rel="nofollow"></a>
     {% trans 'Rank' %}
@@ -51,7 +46,6 @@
        width="70" height="70" alt="" /></a>
    </td>
    <td><a href="{{ ranking.get_absolute_url }}">{{ ranking.user }}</a></td>
-   <td>{% if user.is_authenticated %}{{ranking.user.last_name}} {{ranking.user.first_name}}{% else %}---{% endif %}</td>
    <td>{% if ranking.dan %} {{ranking.dan}}. Dan {% else %} {{ranking.kyu}} Kyu {% endif %}</td>
    <td class="right">{% if ranking.dan %} {{ranking.dan_points}} {% else %} {{ranking.kyu_points}} {% endif %}</td>
    <td class="right">{{ranking.hanchan_count}}</td>

From ac9b3e06c014608d158880827568b4710b13cbab Mon Sep 17 00:00:00 2001
From: Xeniac <xeniac@posteo.at>
Date: Tue, 1 May 2018 20:27:57 +0200
Subject: [PATCH 11/23] Don't display full name anywhere.

---
 .../templates/mahjong_ranking/seasonranking_list.html         | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/src/mahjong_ranking/templates/mahjong_ranking/seasonranking_list.html b/src/mahjong_ranking/templates/mahjong_ranking/seasonranking_list.html
index 0d2792d..e8ed7ab 100755
--- a/src/mahjong_ranking/templates/mahjong_ranking/seasonranking_list.html
+++ b/src/mahjong_ranking/templates/mahjong_ranking/seasonranking_list.html
@@ -23,7 +23,6 @@
             <th rowspan="2">{% trans "Rank" %}</th>
             <th rowspan="2">{% trans "Avatar" %}</th>
             <th rowspan="2">{% trans "Nickname" %}</th>
-            <th rowspan="2">{% trans "Name" %}</th>
             <th colspan="2">{% trans 'Average' %}</th>
             <th colspan="3">Hanchans</th>
         </tr>
@@ -42,7 +41,6 @@
                    src="{% thumbnail player.user.avatar|default:'unknown_profile.jpg' 'avatar' %}"
                    width="70" height="70" class="avatar" alt=""/></a></td>
             <td><a href="{{ player.get_absolute_url }}?season={{season}}">{{player.user}}</a></td>
-            <td>{% if user.is_authenticated %}{{player.user.last_name}} {{player.user.first_name}}{% else %}---{% endif %}</td>
             <td class="center">{{player.avg_placement|floatformat:2 }}</td>
             <td class="right">{{player.avg_score|floatformat:0|intcomma }}</td>
             <td class="right">{{player.hanchan_count}}</td>
@@ -57,4 +55,4 @@
         </tr>
         {% endfor %}
     </table>
-{% endblock %}
\ No newline at end of file
+{% endblock %}

From 121167f1fed14ffb386e980673e163bce59b7647 Mon Sep 17 00:00:00 2001
From: Xeniac <xeniac@posteo.at>
Date: Thu, 3 May 2018 09:45:06 +0200
Subject: [PATCH 12/23] Added a admin action to cleanup personal data from
 inactive members.

---
 src/membership/admin.py                       |  38 ++++++++++++++++--
 .../locale/de/LC_MESSAGES/django.mo           | Bin 9990 -> 10291 bytes
 .../locale/de/LC_MESSAGES/django.po           |  34 +++++++++++-----
 src/membership/models.py                      |  10 +++--
 4 files changed, 64 insertions(+), 18 deletions(-)

diff --git a/src/membership/admin.py b/src/membership/admin.py
index d2daa27..22ab74b 100644
--- a/src/membership/admin.py
+++ b/src/membership/admin.py
@@ -1,11 +1,11 @@
 """ Admin Interface to manage the memberships."""
 # import stuff we need from django
-from django.contrib import admin
+from django.contrib import admin, messages
 from django.contrib.auth.admin import UserAdmin, GroupAdmin
 from django.contrib.auth.models import Group
+from django.core.exceptions import PermissionDenied
 from django.utils.translation import ugettext as _
 from easy_thumbnails import fields, widgets
-
 from membership.models import Membership, ActivationRequest
 
 
@@ -16,13 +16,14 @@ def activate_user(modeladmin, request, queryset):
     :param request: An HttpRequest representing the current request.
     :param queryset: A QuerySet containing the objects selected by the user.
     """
-    [activation.activate() for activation in queryset ]
+    [activation.activate() for activation in queryset]
 
 
 activate_user.short_description = _('Activate selected User')
 
 
-def cleanup_activation(modeladmin, request, queryset):  # Ignore PyLintBear (W0613)
+def cleanup_activation(modeladmin, request,
+                       queryset):  # Ignore PyLintBear (W0613)
     """Delete every selected activation request that has been expired.
 
     :param modeladmin: The ModelAdmin that triggered this action.
@@ -38,6 +39,33 @@ cleanup_activation.short_description = _(
     "Cleanup selected Activation Requests")
 
 
+def clear_personal_data(modeladmin, request, queryset):
+    """deactivates the account and removes all personal user information.
+
+    :param modeladmin: The ModelAdmin that triggered this action.
+    :param request: An HttpRequest representing the current request.
+    :param queryset: A QuerySet containing the objects selected by the user.
+    """
+    cleared_memberships = 0
+    if not modeladmin.has_delete_permission(request):
+        raise PermissionDenied
+    for membership in queryset:
+        if membership.membership == False:
+            [ setattr(membership, fieldname, None) for fieldname in membership.nullable_personal_data ]
+            [ setattr(membership, fieldname, "") for fieldname in membership.blankable_personal_data ]
+            membership.is_active = False
+            membership.confirmed = False
+            membership.membership = False
+            membership.save()
+            cleared_memberships += 1
+        else:
+            modeladmin.message_user(request, _("Can't remove personal data from active member %s.") % membership.username, messages.ERROR)
+    if cleared_memberships > 0:
+        modeladmin.message_user(request, _("Cleared %d personal data profiles.") % cleared_memberships, messages.INFO)
+
+clear_personal_data.short_description = _("Clear personal Data")
+
+
 class ProxyGroup(Group):
     """A Proxy to list Usergroups from django.contrib.auth here."""
 
@@ -50,6 +78,8 @@ class ProxyGroup(Group):
 
 class MembershipAdmin(UserAdmin):
     """Admin interface to manage membership. e.g. users."""
+    actions = [clear_personal_data, ]
+
     formfield_overrides = {
         fields.ThumbnailerImageField: {
             'widget': widgets.ImageClearableFileInput},
diff --git a/src/membership/locale/de/LC_MESSAGES/django.mo b/src/membership/locale/de/LC_MESSAGES/django.mo
index 3b4bdf7070fcd3bffaae1b88f0e3eef5352ec08d..75599b43bf9084f3184524a75a331d177b1ffe64 100644
GIT binary patch
delta 2187
zcmZwIe@xVM9LMnw0SN~NVxasGz7=>>dV!!bDq^D`O4t>tjI4EdU*yK|MeZ)lwRJh0
zRMT8CH_K63&U7=Dozq%aOjnC?&XvQ>wHE!b*4m`jU$L>CFYY_}qu7qe_w)IFzwgic
z^ZvXKcC{t^@$d7}_8Wepd`kG7Ox4JkbqnUrOfjaF@g!3lGmI%fU#2lR_#k%RdekeU
zcnweC5<KED#*3fgLcEIE_%~J?6E`VY$v`!j$BjlT#|^j`pTk>mFKWRLQ45_#)-Ye;
zO?U|v_$MT`nRdrBn9DeWo9S4HTBmGo95-ea7dJAo7TfTC%*R)ecg<n<{s)-G_%tfe
zm^*(KRk;b=gI7_B#@Oysd=Ztv2y)Aeq7wWBb6DSe;Z97V0#BiK{wprR8C1p#*`{`C
z@k@!^g{nj?D)7Ciz%8i6AIIhRv^zh9N^Bn%;X4@TW6tnPXLTOS@MkQ<G@dTTQdGb?
z)Phau$2J_ox3CVqY*Ur&LfXWHklalKmEa4g4emj0U^tia*TexPbe3<TGCPWDvUB(h
zUcn0VQ;t#`#0K1toj8e=SWTJgu@e>VbyOnn;w^X_cj5))74z6)>aT_mQtvM8!AATV
z@57v%lL@tAgYKgiI)<v;H>d@sP^JDIwV_2ckaoBPwQvdQxq4(TrWwh>bi}#PS@)t!
zq_Il98}-5gRKP>1fbXH2>Nt+`wfr2*a2Mxyk@+Ls)VF0D=clH810#4Eb#!-7-Z5N-
zylUdtxLD0aItQ)hxd)X<6SiPGD&rB?QCz|JGhBv$;GO7UH3eLQD*ZZCybVZum;fs7
zfII&@as+Yna`M6)L^aR*sAfFrj?bei@hvvvcc_Y$v$~pVEoz}A)KNZ)inAWI<4wq^
zm>|B5+fheXL?aclzPX(X1#CnG+=w~?8<qJ0sscMuiR?oqco4PY1gcplP|yE>s=zcV
zfqzhOZ{Vw?g>zBy%CMI8O%)e&3!=Jm0M+d~QGt(PHI8E?{)OdOY#DPKHlRuyL@hXg
zowyx`@DeuQCOT1-89_aN7~?A433p-)mFWa(2bWPVOrZk*hDvN2l~@6twij2T5;}vl
zgZUAk!dcX}=}EFw&m6*Lynv}#P)_}oNfB==uotsa_-BJ0lj&qqC4Uy1a0j;ImspP_
z%aav*0^1n(q2|X>3C^H4nCDF<unZONVNAnzZwG%yx#)0jyo7r3HPjg&b;skV%3MYr
z)i0>T|8(bPQGv5LA0?h&nJ8NDQEFAd@y4u(-Pb>8TU+f&wBHGYtzaM)u(~7teO6#|
zEX18YyRXZRSQSy<@I}ufwRRvf|L_AmY#PJN*+Hu!IDca<%GOAKcPMN}eTk)6Js!{M
zl~pxX)!lV9YldIRFU`C@Oq|H~q(8*^=T14{(B>Z7BCPFLgZ+*b=v5Am)f$Rz35T>u
z)avCqhdGC5W0vj2y6uP)v$olhpzZjEKQ8jO`2QP?J=h^9w8eJJ|J)5ZO5dMM*ts6m
Km&hod&H5MPtQ{)=

delta 1915
zcmYMzduYvJ9LMozZDTvf7{|u23yx#MvESLnn5N0eWjHp3kh1I#(JW>ZIcjWwF<L~H
zYp9h=onbD8Hc886ijrHBTN-jn<o5pf{bKE$*YiB*_k5r4^L?IQq_i#+e$ppqm*KC9
z&mcZc(dyCe{@?g0V^ZngXJ~kwG0FG~dtp+%F$-`QYRV>jk9F7&Yh291?U;aPu?Myz
z^TVc-Mjr;Ap%*{fKbRD^9WV=tWdhg}$D;z2Adi~)PQM%z>94|A+>DA_=k)htH~I%K
zgvT(6_01O={2Mn>^*}$2!8BB$q0V>~szMfS!<ncGJjDL^7L`B@+oWldPzeq}J?D4&
zMX0z_(Zl*CM58yBqcW~W?X(`1$Zk|=_n`tGK?OdIO8g@F@VYbp4z=Jn9DwlzQ#>zU
zI+9#W$LSbOp|OI-K-`K7cnG!N2`t4kSdZO^T8P_GmAZjk19Jyi%RE3O_zJbd&!`Q2
zcly6kM;S|*lvuAs>aWW*f`PR-5r^S9OvA@mj6ZN87Ez{5+=CPFDk`ALrbJvg7(G~v
z`KZdCN8RfVEXUh833F8cA{sRwJEImX)&r=868qYv8;4q8Dyr0Fs2#3H?Qj!n;ab#l
zN0FS(Nn|Z^83}3bqAK(fRq0P*8k+DM6)-Nz4%icQsXTav*KZW2V;AMR!*~Ke4#6j=
zOBuyEuEsRf(e1=bxEGmf=27o_T#33nhf#@yPtZ`N7aTiq6#Yl2iSb+vl{g(WF$+0H
zlZOfrbjHh2rC#h<iMk`3QJ1dX=^sFC_!v&n`+tgtO7j(UiQH^Q3#FjW%!>+?iP~8<
zQY=$|2XO{+KTQ|1S@Q!GFFDnYHv(1av8cp@s147>IKBTBG?ZZ_YR7e`OWA~)5J6R-
z4VA!6RHFA#3qMB%{D^rN&CUJ0AgUrk)TN$>in|d5*oc{W|F6;T;yWCQ9$rqBwg9zY
z5EtSMtjFV6jM*7>WvWomuR~RCi_>pFCEA4AKr^b6EvUE`F|5qmXehHc*nqmqN@xdi
zD&`C>!A{g`V{!9zN2+lO9zq?}8&o1)sJP$Nk1{5MT~Qq4C#cSTI!?y9Ug|%G#y$on
z;CocbMl(Bv#i;QHRD!oqJA8pk-~%dPs?UCFe3(stBx-ySYTh!`5pQt%ji|~r`!emb
zYGpu~w>v*{q5?ccW&YY1De2xC-I(W|7HM%;xB_|pTq`4B73LR=v~n!VRXWQ*yP{_K
ln&qo1{lTTx6@?i&R$#2(`uAL<B-s_)xPM?MGG@?E_a8o%yw3mt

diff --git a/src/membership/locale/de/LC_MESSAGES/django.po b/src/membership/locale/de/LC_MESSAGES/django.po
index dfb5e8d..a922f6c 100644
--- a/src/membership/locale/de/LC_MESSAGES/django.po
+++ b/src/membership/locale/de/LC_MESSAGES/django.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: kasu.membership\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-04-30 10:57+0200\n"
-"PO-Revision-Date: 2018-04-30 10:59+0105\n"
+"POT-Creation-Date: 2018-05-03 09:36+0200\n"
+"PO-Revision-Date: 2018-05-03 09:39+0105\n"
 "Last-Translator: b'Christian Berg <kasu@xendynastie.at>'\n"
 "Language-Team: Kasu <verein@kasu.at>\n"
 "Language: de\n"
@@ -31,27 +31,42 @@ msgstr "Weiblich"
 msgid "Activate selected User"
 msgstr "Ausgewählte Benutzer freischalten"
 
-#: admin.py:38
+#: admin.py:39
 msgid "Cleanup selected Activation Requests"
 msgstr "Ausgewählte Aktivierungsanfragen bereinigen"
 
-#: admin.py:47
+#: admin.py:62
+#, python-format
+msgid "Can't remove personal data from active member %s."
+msgstr ""
+"Persönliche Daten von aktiven Mitglied %s können nicht entfernt werden."
+
+#: admin.py:64
+#, python-format
+msgid "Cleared %d personal data profiles."
+msgstr "Persönliche Daten in %d Profilen entfernt."
+
+#: admin.py:66
+msgid "Clear personal Data"
+msgstr "Persönliche Daten bereinigen"
+
+#: admin.py:75
 msgid "Group"
 msgstr "Gruppe"
 
-#: admin.py:48
+#: admin.py:76
 msgid "Groups"
 msgstr "Gruppen"
 
-#: admin.py:72 models.py:163 models.py:216
+#: admin.py:102 models.py:163 models.py:218
 msgid "Membership"
 msgstr "Mitgliedschaft"
 
-#: admin.py:77
+#: admin.py:107
 msgid "Permissions"
 msgstr "Berechtigung"
 
-#: admin.py:79
+#: admin.py:109
 msgid "Important dates"
 msgstr "Wichtige Daten"
 
@@ -159,7 +174,7 @@ msgstr "Bestätigt"
 msgid "This person has paid the membership fee."
 msgstr "Diese Person hat ihre Mitgliedschaft bezahlt"
 
-#: models.py:217
+#: models.py:219
 msgid "Memberships"
 msgstr "Mitgliedschaften"
 
@@ -388,7 +403,6 @@ msgid "login"
 msgstr "Anmelden"
 
 #: templates/membership/register_form.html:26
-#| msgid "Membership"
 msgid "Club membership"
 msgstr "Vereinsmitgliedschaft"
 
diff --git a/src/membership/models.py b/src/membership/models.py
index 7b746d2..6aa9669 100644
--- a/src/membership/models.py
+++ b/src/membership/models.py
@@ -7,8 +7,8 @@ from os import path
 
 from django.conf import settings
 from django.contrib.auth.models import AbstractUser
-from django.urls import reverse
 from django.db import models
+from django.urls import reverse
 from django.utils import timezone
 from django.utils.translation import ugettext as _
 from easy_thumbnails.fields import ThumbnailerImageField
@@ -150,7 +150,7 @@ class Membership(AbstractUser):
         max_length=1,
         choices=GENDER_CHOICES,
         blank=True,
-        null=True
+        null=True,
     )
     website = models.URLField(blank=True)
     avatar = ThumbnailerImageField(
@@ -206,8 +206,10 @@ class Membership(AbstractUser):
         help_text=_('This person has paid the membership fee.')
     )
 
-    # comment = models.TextField(blank=True)
-    # objects = MembershipManager()
+    nullable_personal_data = (
+    'gender', 'birthday', 'telephone', 'street_name', 'post_code', 'city')
+    blankable_personal_data = (
+    'email', 'password', 'first_name', 'last_name', 'website',)
 
     class Meta(object):
         """To manage object ordering and dispalynames on the admin interface."""

From 3e64f4d75747fa0361186d709729fbf768db5459 Mon Sep 17 00:00:00 2001
From: Xeniac <xeniac@posteo.at>
Date: Thu, 3 May 2018 10:12:23 +0200
Subject: [PATCH 13/23] You can only fill in your personal data if you apply
 for a full membership.

---
 src/membership/forms.py                          |  2 +-
 .../templates/membership/register_form.html      | 16 +++++++++++++++-
 2 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/src/membership/forms.py b/src/membership/forms.py
index 62a0658..9ade0e2 100644
--- a/src/membership/forms.py
+++ b/src/membership/forms.py
@@ -69,7 +69,7 @@ class RegistrationForm(MembershipForm):
         fields = ('first_name', 'last_name', 'username', 'email',
                   'username', 'gender', 'first_name', 'last_name', 'email',
                   'avatar',
-                  'website', 'membership', 'birthday', 'telephone',
+                  'membership', 'birthday', 'telephone',
                   'street_name',
                   'post_code', 'city'
                   )
diff --git a/src/membership/templates/membership/register_form.html b/src/membership/templates/membership/register_form.html
index eadc98e..a6983ea 100644
--- a/src/membership/templates/membership/register_form.html
+++ b/src/membership/templates/membership/register_form.html
@@ -24,7 +24,7 @@
 
   <fieldset class="grid_5">
     <legend>{% trans "Club membership"%}</legend>
-    {% get_fieldset "membership, first_name, last_name, gender, birthday, street_name, post_code, city, telephone, website" from form as form2 %}
+    {% get_fieldset "membership, first_name, last_name, gender, birthday, street_name, post_code, city, telephone" from form as form2 %}
     {% with form2 as form %}{% include "form.html" %}{% endwith %}
   </fieldset>
 
@@ -36,4 +36,18 @@
     </p>
   </div>
 </form>
+<script type="text/javascript">
+function togglePersonalData(event) {
+    var membership = document.getElementById("id_membership").checked;
+    var input_elements = ["id_first_name", "id_last_name", "id_gender", "id_birthday", "id_street_name", "id_post_code", "id_city", "id_telephone"];
+    for (var i = 0; i < input_elements.length; i++) {
+      element_id = input_elements[i]
+      element = document.getElementById(element_id);
+      element.disabled = !membership;
+    };
+};
+
+document.addEventListener('DOMContentLoaded',function() {document.querySelector('#id_membership').onchange=togglePersonalData;},false);
+togglePersonalData();
+</script>
 {% endblock %}

From 0f71bb536077f3553f60b94143b60c6e5ad8a0ea Mon Sep 17 00:00:00 2001
From: Xeniac <xeniac@posteo.at>
Date: Thu, 3 May 2018 10:32:27 +0200
Subject: [PATCH 14/23] First draft of a disclaimer (german)

---
 .../templates/membership/register_form.html     | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/src/membership/templates/membership/register_form.html b/src/membership/templates/membership/register_form.html
index a6983ea..43e8842 100644
--- a/src/membership/templates/membership/register_form.html
+++ b/src/membership/templates/membership/register_form.html
@@ -28,6 +28,23 @@
     {% with form2 as form %}{% include "form.html" %}{% endwith %}
   </fieldset>
 
+  <p class="warning">
+    <strong>Datenschutzhinweis:</strong>
+    <ul>
+    <li>Der angegebene Benutzername wird auf dieser Homepage öffentlich
+      gemacht.</li>
+    <li>Die E-Mail Adresse wird nur für die Verifizierung und dringende
+      persönliche Mitteilungen verwendet.</li>
+    <li>Die Passwörter werden nach modernsten Sicherheitsstandards
+      verschlüsselt
+      abgespeichert und sind nach aktuellen Status nicht knackbar.</li>
+    <li>Alle anderen Angaben sind nur für Vereinsmitglieder von Belang und
+      werden vertraulich behandelt. Nur Vorstandsmitglieder haben Zugriff
+      auf diese Daten und sie werden nicht ohne vorheriger Genemigung mit
+      anderen Personen oder Organisationen geteilt.</li>
+
+  </p>
+
   <div class="grid_12">
     <p class="buttonbar">
       <button type="reset"><span class="fa fa-undo"></span> {% trans 'reset' %}

From 9f0126be540929519f054ec326ae4e43e4269990 Mon Sep 17 00:00:00 2001
From: Christian Berg <xeniac@posteo.at>
Date: Thu, 3 May 2018 16:23:39 +0200
Subject: [PATCH 15/23] Dirty check club member must be at least 16 years old.

---
 src/membership/forms.py | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/src/membership/forms.py b/src/membership/forms.py
index 9ade0e2..cf92d96 100644
--- a/src/membership/forms.py
+++ b/src/membership/forms.py
@@ -3,7 +3,7 @@ Created on 03.10.2011
 
 @author: Christian
 """
-
+from datetime import date, timedelta
 from captcha.fields import ReCaptchaField
 from django import forms
 from django.conf import settings
@@ -47,7 +47,12 @@ class MembershipForm(forms.ModelForm):
         for fieldname in self.required_membership_fields:
             if membership and not cleaned_data.get(fieldname):
                 self.add_error(fieldname, errormsg)
-
+        if membership and cleaned_data.get('birthday'):
+            birthday = cleaned_data.get('birthday')
+            print("Today:", date.today())
+            print("Birthday:", birthday)
+            if date.today().year - cleaned_data.get('birthday').year < 16:
+                self.add_error('birthday', 'Midestalter für Mitlieder ist 16 Jahre!')
 
 
 class RegistrationForm(MembershipForm):

From 5affdb0f5cd3f118908dc1440fcff235c7736461 Mon Sep 17 00:00:00 2001
From: Christian Berg <xeniac@posteo.at>
Date: Thu, 3 May 2018 16:35:40 +0200
Subject: [PATCH 16/23] Better age check

---
 src/membership/forms.py | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/src/membership/forms.py b/src/membership/forms.py
index cf92d96..c685344 100644
--- a/src/membership/forms.py
+++ b/src/membership/forms.py
@@ -49,10 +49,12 @@ class MembershipForm(forms.ModelForm):
                 self.add_error(fieldname, errormsg)
         if membership and cleaned_data.get('birthday'):
             birthday = cleaned_data.get('birthday')
-            print("Today:", date.today())
-            print("Birthday:", birthday)
-            if date.today().year - cleaned_data.get('birthday').year < 16:
-                self.add_error('birthday', 'Midestalter für Mitlieder ist 16 Jahre!')
+            today = date.today()
+            age = today.year - birthday.year - (
+                    (today.month, today.day) < (birthday.month, birthday.day))
+            if age < 16:
+                self.add_error('birthday',
+                               'Midestalter für Mitlieder ist 16 Jahre!')
 
 
 class RegistrationForm(MembershipForm):

From 3dcd1aeffaa5d873e719b91ff551c58cd7b96399 Mon Sep 17 00:00:00 2001
From: Xeniac <xeniac@posteo.at>
Date: Fri, 4 May 2018 11:32:33 +0200
Subject: [PATCH 17/23] Changed membership forms, text can now be changed via
 admin tool.

---
 src/content/context_processors.py             |   6 +-
 .../locale/de/LC_MESSAGES/django.mo           | Bin 10291 -> 8700 bytes
 .../locale/de/LC_MESSAGES/django.po           | 174 +++++++++---------
 .../templates/membership/register_form.html   |  31 +---
 .../templates/registration/logged_out.html    |  43 +++++
 .../templates/registration/login.html         |  92 ++++-----
 src/membership/urls.py                        |   1 +
 7 files changed, 172 insertions(+), 175 deletions(-)
 create mode 100755 src/membership/templates/registration/logged_out.html

diff --git a/src/content/context_processors.py b/src/content/context_processors.py
index 1cd1456..93260ac 100644
--- a/src/content/context_processors.py
+++ b/src/content/context_processors.py
@@ -3,7 +3,7 @@
 from django.core.cache import cache
 
 from . import models
-
+from utils import STATUS_PUBLISHED
 
 def content_menus(request):
     """ Generate the menu tree and add these info to the template context.
@@ -25,7 +25,9 @@ def content_menus(request):
     # erzeuge das Top-Level Menü
     top_level_pages = cache.get('top_level_pages')
     if top_level_pages is None:
-        top_level_pages = models.Page.objects.filter(parent=None)
+        top_level_pages = models.Page.objects.filter(
+            parent=None, status=STATUS_PUBLISHED
+        )
         top_level_pages = top_level_pages.exclude(slug='index')
         top_level_pages = top_level_pages.order_by('position')
         top_level_pages = top_level_pages.prefetch_related('subpages')
diff --git a/src/membership/locale/de/LC_MESSAGES/django.mo b/src/membership/locale/de/LC_MESSAGES/django.mo
index 75599b43bf9084f3184524a75a331d177b1ffe64..28f4a43cb8cdd2670fecf1e07abe73fd783e3d57 100644
GIT binary patch
delta 1992
zcmYM!e@N7K9LMp`S$Sz^rRg<qOYhV)&|+ss=%~3>9?_C=P+`Az>Q~Qko_2ZkgV_ab
zTm>@LcS8S_!IrU#$(LAGFvDQP>YqRe207R!6+yANP1qQFzUCJu=lAjXeDCx9yx*Vq
z=kq;h$KRXMPYUJ_8UA|te}n(e=c#9m&-=fAntAk>U<K~MI@FLsF3WKUtMD4;;UxO-
zCk*2&)bnKvjVZudtS}~Rw$NC{jSsO5PoM@4BhQ#o%)v2Sj1#DdA7L&|x&7z3l>VQ%
z02lI*0xd@MLzs<K*o<qii1=oJ#v*Rm?tlw8pZ=Gq2fuRfkK!Qxo2Uevi2fSxLIv(c
zC3X_|m_aTYci!!fpyqQ>iH+eh;+qFF^6^Lai(gSIT|ib!q!3k!VpM<-GQ_MwKBk^a
zC2n!=$5DZgU;s0y`7WWhY7|THKBkLlJfrbC&SQ3(rW6&h8h7AY%;3k^fIc=@rHmle
zHqFS#?B>D{W1&`>L@nT`+aExRXHKCK8_c8rI$R^%Na44*64#M#3GT&4JdUk+8&{#9
z<!!{bQ4^j(C2|@=_!*u;2UXei?2pd%R&2xVxCy^rO8qy`nBj&ps%5lRxE&SfG!oN{
zq5_PgN_`)-vR9aezq{YhB2yU;8>~Gp;G)C55>=UcRE3*R^R=XDs8oAV6Gl;osuRaO
z><{X#Xe^w2J=-x!|0HUQe#0XC3)f*j9i5E`Dqst4#e=BCuDIU98v5z)X{?|zi`D37
zKWLhFQKj93ny?M2rs+XVJmB6xi!9m<xn4${jWN_=8+ZGUQ7fLp2tGwBlQwTMifuQW
zQGr@ed$k`mQ53b(7+%Ca)RyE^CLP`&s>BVbd74or-iJy!hFbYiR03yE3pj_%_5NR=
zp%s6FBxN3=9{d?qff-Z+|DXb76IBTmq9!iKI;=wl?nYH4g*wa`)V$X)jQ4OA{(%*G
z|4TV}<+vG@Sqv30g{?S%8GMY5_yO;#Dl?24KZ2^<4YxmzO7tOW0Y9L||ALzL1uC%_
zOe?bhKm4C!7%T8D@|~H+1DM4D(d!b$8vFty_z1OC0p3+5Qi7VeT73@hPGpEVz^{!;
z{}DFfC-^=-D5d@zX#|6FB|C_k_z>#;7%IV8)C!mIaw~xV>TQX*zK0616E(gSIVR?i
z+dqS<$VJo^T}LH+D?~~4#dqA$1e2(YpP;=u=d5!%w=Bz<_IW+N_N0~QuoC^<(fDC!
zI`2ldJzUu5O+<Sv)0?z66is>Sg5hvOZM|LY56!jLhMjHxw><Wd;@i&4Kq|{QwxZ0F
z`%a?Aig#EY(SGNA$)q<p*H0z7f}K_@-enzbkHw>1R-z`@*4^K41?`^7K<>nyHY?ee
XoVe3z->f{B)BIo94l8MAs;>SEX%5|^

delta 3627
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

diff --git a/src/membership/locale/de/LC_MESSAGES/django.po b/src/membership/locale/de/LC_MESSAGES/django.po
index a922f6c..e15a9d4 100644
--- a/src/membership/locale/de/LC_MESSAGES/django.po
+++ b/src/membership/locale/de/LC_MESSAGES/django.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: kasu.membership\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-05-03 09:36+0200\n"
-"PO-Revision-Date: 2018-05-03 09:39+0105\n"
+"POT-Creation-Date: 2018-05-04 11:29+0200\n"
+"PO-Revision-Date: 2018-05-04 11:31+0105\n"
 "Last-Translator: b'Christian Berg <kasu@xendynastie.at>'\n"
 "Language-Team: Kasu <verein@kasu.at>\n"
 "Language: de\n"
@@ -88,26 +88,26 @@ msgid ""
 "yet."
 msgstr "Diese Angabe wird für eine Mitgliedschaft benötigt, bitte ausfüllen."
 
-#: forms.py:61
+#: forms.py:68
 msgid "password"
 msgstr "Passwort"
 
-#: forms.py:63
+#: forms.py:70
 msgid "password (again)"
 msgstr "Passwort (wiederholen)"
 
-#: forms.py:85
+#: forms.py:92
 msgid "This username is already taken.         Please choose another."
 msgstr ""
 "Diesen Benutzername ist schon vergeben. Bitte einen anderen auswählen."
 
-#: forms.py:92
+#: forms.py:99
 msgid ""
 "This email address is already in             use. Please supply a different "
 "email address."
 msgstr "Die E-Mail Adresse wird schon verwendet. Bitte eine andere angeben."
 
-#: forms.py:102
+#: forms.py:109
 msgid "The two password fields didn't match."
 msgstr "Die beiden Passwörter passen nicht."
 
@@ -383,35 +383,22 @@ msgid "Save"
 msgstr "Speichern"
 
 #: templates/membership/register_form.html:4
-#: templates/membership/register_form.html:7
 msgid "Registration"
 msgstr "Registrieren"
 
-#: templates/membership/register_form.html:9
-msgid ""
-"After you've provided your account data, you'll receive\n"
-"      an email asking you to verify your email address. You have to click on the\n"
-"      link in this verification email to confirm your email address, otherwise\n"
-"      your can't login."
-msgstr ""
-"Nach dem du deine Daten eingegeben hast, wirst du eine E-Mail zur Bestätigung bekommen.\n"
-"Bitte klicke auf den Link in dieser E-Mail zur Verifizierung, erst dann ist die Anmeldung möglich."
+#: templates/membership/register_form.html:10
+msgid "Login crendentials"
+msgstr "Anmeldedaten"
 
-#: templates/membership/register_form.html:20
-#: templates/registration/login.html:41
-msgid "login"
-msgstr "Anmelden"
-
-#: templates/membership/register_form.html:26
+#: templates/membership/register_form.html:16
 msgid "Club membership"
 msgstr "Vereinsmitgliedschaft"
 
-#: templates/membership/register_form.html:33
+#: templates/membership/register_form.html:27
 msgid "reset"
 msgstr "Zurücksetzen"
 
-#: templates/membership/register_form.html:35
-#: templates/registration/login.html:35
+#: templates/membership/register_form.html:29
 msgid "register"
 msgstr "Registrieren"
 
@@ -421,76 +408,42 @@ msgstr "Registrieren"
 msgid "Activation sent"
 msgstr "Aktivierung wurde zugesendet"
 
-#: templates/registration/login.html:4 templates/registration/login.html:11
-#: templates/registration/login.html:53
+#: templates/registration/logged_out.html:16
+#: templates/registration/login.html:16
+#| msgid ""
+#| "Your username and password didn't match. Please try\n"
+#| "      again."
+msgid "Your username and password didn't match. Please try again."
+msgstr "Anmeldung fehlgeschlagen, bitte Benutzername und Passwort überprüfen."
+
+#: templates/registration/logged_out.html:19
+#: templates/registration/login.html:19
+msgid "Forgot your Password?"
+msgstr "Passwort vergessen?"
+
+#: templates/registration/logged_out.html:23
+#: templates/registration/login.html:23
 #: templates/registration/password_reset_complete.html:13
 msgid "Login"
 msgstr "Anmelden"
 
-#: templates/registration/login.html:17
-msgid "Have you already registered?"
-msgstr "Bereits registriert?"
+#: templates/registration/logged_out.html:29
+#: templates/registration/login.html:29
+msgid "or"
+msgstr "oder"
 
-#: templates/registration/login.html:18
-msgid ""
-"\n"
-"    <p>As a registered member you can:</p>\n"
-"    <ul>\n"
-"      <li>leave comments on this page.</li>\n"
-"      <li>subscribe to our Newsletter</li>\n"
-"      <li>apply to a membership to our club</li>\n"
-"      <li>club-members have access to our ranking-system</li>\n"
-"    </ul>\n"
-"    "
-msgstr ""
-"\n"
-"<p>Als registrierter auf dieser Seite kannst du:</p>\n"
-"<ul>\n"
-" <li>Kommentare auf dieser Seite hinterlassen.</li>\n"
-" <li>Dich für unseren Newsletter anmelden</li>\n"
-" <li>Mitglied in unserem Verein werden</li>\n"
-" <li>Vereinsmitglieder haben auch vollen Zugang zu unserem Ranking System</li>\n"
-"</ul>"
-
-#: templates/registration/login.html:27
-msgid ""
-"\n"
-"    <p>You can register here with your Google, or Facebook account.\n"
-"      If you don't own such an account, or do not want to use it for\n"
-"      authentication,\n"
-"      you can fill out our registration form.</p>\n"
-"    "
-msgstr ""
-"\n"
-"<p>Du kannst dich auch über deinen Facebook, Google, oder Twitter Account anmelden.\n"
-"Wenn du so etwas nicht besitzt, oder nicht verwenden möchtest, \n"
-"kannst du auch das Registrierungsformular ausfüllen.</p>"
-
-#: templates/registration/login.html:45
-msgid ""
-"Your username and password didn't match. Please try\n"
-"      again."
-msgstr ""
-"Benutzername und Passwort stimmen nicht überein. Bitte noch einmal "
-"versuchen."
-
-#: templates/registration/login.html:50
-msgid "Forgot your Password?"
-msgstr "Passwort vergessen?"
-
-#: templates/registration/login.html:60
-msgid "or login with an existing Account"
-msgstr "oder über einen existierenden Account anmelden"
-
-#: templates/registration/login.html:63
+#: templates/registration/logged_out.html:33
+#: templates/registration/login.html:33
 msgid "Login with Facebook"
 msgstr "Über Facebook anmelden"
 
-#: templates/registration/login.html:66
+#: templates/registration/logged_out.html:35
+#: templates/registration/login.html:35
 msgid "Login with Twitter"
 msgstr "Über Twitter anmelden"
 
-#: templates/registration/login.html:69
+#: templates/registration/logged_out.html:37
+#: templates/registration/login.html:37
 msgid "Login with Google"
 msgstr "Über Google Anmelden"
 
@@ -588,6 +541,57 @@ msgstr "Benutzerprofil erfolgreich geändert."
 msgid "No Membership found matching the query"
 msgstr "Kein Mitglied gefunden welche der Anfrage entspricht"
 
+#~ msgid ""
+#~ "After you've provided your account data, you'll receive\n"
+#~ "      an email asking you to verify your email address. You have to click on the\n"
+#~ "      link in this verification email to confirm your email address, otherwise\n"
+#~ "      your can't login."
+#~ msgstr ""
+#~ "Nach dem du deine Daten eingegeben hast, wirst du eine E-Mail zur Bestätigung bekommen.\n"
+#~ "Bitte klicke auf den Link in dieser E-Mail zur Verifizierung, erst dann ist die Anmeldung möglich."
+
+#~ msgid "login"
+#~ msgstr "Anmelden"
+
+#~ msgid "Have you already registered?"
+#~ msgstr "Bereits registriert?"
+
+#~ msgid ""
+#~ "\n"
+#~ "    <p>As a registered member you can:</p>\n"
+#~ "    <ul>\n"
+#~ "      <li>leave comments on this page.</li>\n"
+#~ "      <li>subscribe to our Newsletter</li>\n"
+#~ "      <li>apply to a membership to our club</li>\n"
+#~ "      <li>club-members have access to our ranking-system</li>\n"
+#~ "    </ul>\n"
+#~ "    "
+#~ msgstr ""
+#~ "\n"
+#~ "<p>Als registrierter auf dieser Seite kannst du:</p>\n"
+#~ "<ul>\n"
+#~ " <li>Kommentare auf dieser Seite hinterlassen.</li>\n"
+#~ " <li>Dich für unseren Newsletter anmelden</li>\n"
+#~ " <li>Mitglied in unserem Verein werden</li>\n"
+#~ " <li>Vereinsmitglieder haben auch vollen Zugang zu unserem Ranking System</li>\n"
+#~ "</ul>"
+
+#~ msgid ""
+#~ "\n"
+#~ "    <p>You can register here with your Google, or Facebook account.\n"
+#~ "      If you don't own such an account, or do not want to use it for\n"
+#~ "      authentication,\n"
+#~ "      you can fill out our registration form.</p>\n"
+#~ "    "
+#~ msgstr ""
+#~ "\n"
+#~ "<p>Du kannst dich auch über deinen Facebook, Google, oder Twitter Account anmelden.\n"
+#~ "Wenn du so etwas nicht besitzt, oder nicht verwenden möchtest, \n"
+#~ "kannst du auch das Registrierungsformular ausfüllen.</p>"
+
+#~ msgid "or login with an existing Account"
+#~ msgstr "oder über einen existierenden Account anmelden"
+
 #~ msgid ""
 #~ "For your membership, we need this.              Please fill out this field "
 #~ "yet."
diff --git a/src/membership/templates/membership/register_form.html b/src/membership/templates/membership/register_form.html
index 43e8842..f28cbd2 100644
--- a/src/membership/templates/membership/register_form.html
+++ b/src/membership/templates/membership/register_form.html
@@ -3,21 +3,11 @@
 
 {% block title %}{% trans "Registration"%}{% endblock %}
 
-{% block teaser%}
-<h1>{% trans "Registration"%}</h1>
-<div id="teaser_text">
-{% blocktrans %}After you've provided your account data, you'll receive
-      an email asking you to verify your email address. You have to click on the
-      link in this verification email to confirm your email address, otherwise
-      your can't login.{% endblocktrans %}
-</div>
-{% endblock %}
-
 {% block maincontent %}
 <form method="post" action="{% url 'membership-register' %}">
   {% csrf_token %}
   <fieldset class="grid_7">
-    <legend>{% trans "login"%}</legend>
+    <legend>{% trans "Login crendentials"%}</legend>
     {% get_fieldset "username, email, password1, password2, recaptcha" from form as form1 %}
     {% with form1 as form %}{% include "form.html" %}{% endwith %}
   </fieldset>
@@ -28,22 +18,9 @@
     {% with form2 as form %}{% include "form.html" %}{% endwith %}
   </fieldset>
 
-  <p class="warning">
-    <strong>Datenschutzhinweis:</strong>
-    <ul>
-    <li>Der angegebene Benutzername wird auf dieser Homepage öffentlich
-      gemacht.</li>
-    <li>Die E-Mail Adresse wird nur für die Verifizierung und dringende
-      persönliche Mitteilungen verwendet.</li>
-    <li>Die Passwörter werden nach modernsten Sicherheitsstandards
-      verschlüsselt
-      abgespeichert und sind nach aktuellen Status nicht knackbar.</li>
-    <li>Alle anderen Angaben sind nur für Vereinsmitglieder von Belang und
-      werden vertraulich behandelt. Nur Vorstandsmitglieder haben Zugriff
-      auf diese Daten und sie werden nicht ohne vorheriger Genemigung mit
-      anderen Personen oder Organisationen geteilt.</li>
-
-  </p>
+  <div class="grid_12">
+    {{ current_page.content }}
+  </div>
 
   <div class="grid_12">
     <p class="buttonbar">
diff --git a/src/membership/templates/registration/logged_out.html b/src/membership/templates/registration/logged_out.html
new file mode 100755
index 0000000..a542834
--- /dev/null
+++ b/src/membership/templates/registration/logged_out.html
@@ -0,0 +1,43 @@
+{% extends "base.html" %}{% load i18n %}
+
+{% block description %}Anmelden auf Kasu.at{% endblock %}
+
+{% block extra_head %}
+<link rel="canonical" href="{% url 'login' %}"/>{% endblock %}
+
+
+{% block maincontent %}
+<form method="post" action="{% url 'login' %}">
+  {% csrf_token %}
+  <div class="grid_5">
+    <fieldset>
+      <legend>&nbsp;</legend>
+      {% csrf_token %} {% include 'form.html' %} {% if form.errors %}
+      <p>{% blocktrans %}Your username and password didn't match. Please try again.{% endblocktrans %}</p>
+      {% endif %} <input type="hidden" name="next" value="{{next}}"/>
+      <p>
+        <a href="{% url 'password_reset' %}"> {% trans 'Forgot your Password?'%}</a>
+      </p>
+      <div class="buttonbar">
+        <button type="submit">
+          <span class="fa fa-sign-in"></span> {% trans 'Login' %}
+        </button>
+      </div>
+    </fieldset>
+  </div>
+  <div class="grid_2">
+    <h2>{% trans 'or' %}</h2>
+  </div>
+  <div class="grid_5">
+    <a class="button" rel="nofollow" href="{% url 'social:begin' 'facebook' %}">
+      <span class="fa fa-facebook fa-2x"></span> {% trans 'Login with Facebook' %}</a><br/>
+    <a class="button" rel="nofollow" href="{% url 'social:begin' 'twitter' %}">
+      <span class="fa fa-twitter fa-2x"></span> {% trans 'Login with Twitter' %}</a><br/>
+    <a class="button" rel="nofollow" href="{% url 'social:begin' 'google-oauth2' %}">
+      <span class="fa fa-google-plus fa-2x"></span> {% trans 'Login with Google' %}</a>
+  </div>
+</form>
+<div class="grid_12">
+  {{ current_page.content }}
+</div>{% endblock %}
+
diff --git a/src/membership/templates/registration/login.html b/src/membership/templates/registration/login.html
index 47f3904..a542834 100755
--- a/src/membership/templates/registration/login.html
+++ b/src/membership/templates/registration/login.html
@@ -1,73 +1,43 @@
-{% extends "base.html" %}
-{% load i18n %}
+{% extends "base.html" %}{% load i18n %}
 
-{% block title %}{% trans 'Login' %}{% endblock %}
 {% block description %}Anmelden auf Kasu.at{% endblock %}
 
 {% block extra_head %}
-<link rel="canonical" href="{% url 'login' %}"/>
-{% endblock %}
+<link rel="canonical" href="{% url 'login' %}"/>{% endblock %}
+
 
-{% block teaser %}<h1>{% trans 'Login' %}</h1>{% endblock %}
 {% block maincontent %}
 <form method="post" action="{% url 'login' %}">
-  <h2 class="grid_12">Auf der Seite Anmelden</h2>
-
-  <div class="grid_7">
-    <h2>{% trans "Have you already registered?" %}</h2>
-    {% blocktrans %}
-    <p>As a registered member you can:</p>
-    <ul>
-      <li>leave comments on this page.</li>
-      <li>subscribe to our Newsletter</li>
-      <li>apply to a membership to our club</li>
-      <li>club-members have access to our ranking-system</li>
-    </ul>
-    {% endblocktrans %}
-    {% blocktrans %}
-    <p>You can register here with your Google, or Facebook account.
-      If you don't own such an account, or do not want to use it for
-      authentication,
-      you can fill out our registration form.</p>
-    {% endblocktrans %}
-    <p class="buttonbar">
-      <a href="{% url 'membership-register' %}" class="button"><span
-              class="fa fa-user-plus"></span> {%trans "register"%}</a></p>
-  </div>
-
-
   {% csrf_token %}
-  <fieldset class="grid_5">
-    <legend>{% trans 'login' %}</legend>
-    {% csrf_token %}
-    {% include 'form.html' %}
-    {% if form.errors %}
-    <p>{% blocktrans %}Your username and password didn't match. Please try
-      again.{% endblocktrans %}</p>
-    {% endif %}
-    <input type="hidden" name="next" value="{{next}}"/>
-    <p><a href="{% url 'password_reset' %}">
-      {% trans 'Forgot your Password?'%}</a></p>
-    <div class="buttonbar">
-      <button type="submit"><span class="fa fa-sign-in"></span>
-        {% trans 'Login' %}
-      </button>
-    </div>
-  </fieldset>
-
-
   <div class="grid_5">
-    <h2>{% trans "or login with an existing Account" %}</h2>
-    <a rel="nofollow" href="{% url 'social:begin' 'facebook' %}"><span
-            class="fa fa-facebook fa-5x"
-            title="{% trans 'Login with Facebook' %}"></span></a>
-    <a rel="nofollow" href="{% url 'social:begin' 'twitter' %}"><span
-            class="fa fa-twitter fa-5x"
-            title="{% trans 'Login with Twitter' %}"></span></a>
-    <a rel="nofollow" href="{% url 'social:begin' 'google-oauth2' %}"><span
-            class="fa fa-google-plus fa-5x"
-            title="{% trans 'Login with Google' %}"></span></a>
+    <fieldset>
+      <legend>&nbsp;</legend>
+      {% csrf_token %} {% include 'form.html' %} {% if form.errors %}
+      <p>{% blocktrans %}Your username and password didn't match. Please try again.{% endblocktrans %}</p>
+      {% endif %} <input type="hidden" name="next" value="{{next}}"/>
+      <p>
+        <a href="{% url 'password_reset' %}"> {% trans 'Forgot your Password?'%}</a>
+      </p>
+      <div class="buttonbar">
+        <button type="submit">
+          <span class="fa fa-sign-in"></span> {% trans 'Login' %}
+        </button>
+      </div>
+    </fieldset>
+  </div>
+  <div class="grid_2">
+    <h2>{% trans 'or' %}</h2>
+  </div>
+  <div class="grid_5">
+    <a class="button" rel="nofollow" href="{% url 'social:begin' 'facebook' %}">
+      <span class="fa fa-facebook fa-2x"></span> {% trans 'Login with Facebook' %}</a><br/>
+    <a class="button" rel="nofollow" href="{% url 'social:begin' 'twitter' %}">
+      <span class="fa fa-twitter fa-2x"></span> {% trans 'Login with Twitter' %}</a><br/>
+    <a class="button" rel="nofollow" href="{% url 'social:begin' 'google-oauth2' %}">
+      <span class="fa fa-google-plus fa-2x"></span> {% trans 'Login with Google' %}</a>
   </div>
 </form>
-{% endblock %}
+<div class="grid_12">
+  {{ current_page.content }}
+</div>{% endblock %}
 
diff --git a/src/membership/urls.py b/src/membership/urls.py
index 7cf1a3b..4547ae8 100644
--- a/src/membership/urls.py
+++ b/src/membership/urls.py
@@ -9,6 +9,7 @@ from django.conf.urls import url
 from . import views
 
 urlpatterns = [
+    url(r'^$',views.MembershipDetail.as_view()),
     url(r'^activate/(?P<activation_key>[\d\w]+)/$',
         views.ActivateRegistration.as_view(),
         name='membership-activate-registration'),

From baa9660b7cc467c7ebcf65e327ff575e8234f479 Mon Sep 17 00:00:00 2001
From: Xeniac <xeniac@posteo.at>
Date: Fri, 4 May 2018 11:57:19 +0200
Subject: [PATCH 18/23] fixed: load all toplevel pages from the db, but only
 show active pages in the top menu.

---
 src/content/context_processors.py | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/src/content/context_processors.py b/src/content/context_processors.py
index 93260ac..b1b93bf 100644
--- a/src/content/context_processors.py
+++ b/src/content/context_processors.py
@@ -25,9 +25,7 @@ def content_menus(request):
     # erzeuge das Top-Level Menü
     top_level_pages = cache.get('top_level_pages')
     if top_level_pages is None:
-        top_level_pages = models.Page.objects.filter(
-            parent=None, status=STATUS_PUBLISHED
-        )
+        top_level_pages = models.Page.objects.filter(parent=None)
         top_level_pages = top_level_pages.exclude(slug='index')
         top_level_pages = top_level_pages.order_by('position')
         top_level_pages = top_level_pages.prefetch_related('subpages')
@@ -52,7 +50,7 @@ def content_menus(request):
             break
         current_path = current_path[0:current_path.rfind('.')]
 
-    return {'top_menu_items': top_level_pages,
+    return {'top_menu_items': top_level_pages.filter(status=STATUS_PUBLISHED),
             'current_top_page': current_top_page,
             'current_path': current_path,
             'current_page': current_page}

From c3d213934e68fc7cd443349379206ca3dc138425 Mon Sep 17 00:00:00 2001
From: Xeniac <xeniac@posteo.at>
Date: Fri, 4 May 2018 12:53:23 +0200
Subject: [PATCH 19/23] Added a themed an customizeable logged out message
 page.

---
 .../templates/registration/logged_out.html    | 41 +------------------
 1 file changed, 2 insertions(+), 39 deletions(-)

diff --git a/src/membership/templates/registration/logged_out.html b/src/membership/templates/registration/logged_out.html
index a542834..e970477 100755
--- a/src/membership/templates/registration/logged_out.html
+++ b/src/membership/templates/registration/logged_out.html
@@ -1,43 +1,6 @@
 {% extends "base.html" %}{% load i18n %}
 
-{% block description %}Anmelden auf Kasu.at{% endblock %}
-
-{% block extra_head %}
-<link rel="canonical" href="{% url 'login' %}"/>{% endblock %}
-
-
-{% block maincontent %}
-<form method="post" action="{% url 'login' %}">
-  {% csrf_token %}
-  <div class="grid_5">
-    <fieldset>
-      <legend>&nbsp;</legend>
-      {% csrf_token %} {% include 'form.html' %} {% if form.errors %}
-      <p>{% blocktrans %}Your username and password didn't match. Please try again.{% endblocktrans %}</p>
-      {% endif %} <input type="hidden" name="next" value="{{next}}"/>
-      <p>
-        <a href="{% url 'password_reset' %}"> {% trans 'Forgot your Password?'%}</a>
-      </p>
-      <div class="buttonbar">
-        <button type="submit">
-          <span class="fa fa-sign-in"></span> {% trans 'Login' %}
-        </button>
-      </div>
-    </fieldset>
-  </div>
-  <div class="grid_2">
-    <h2>{% trans 'or' %}</h2>
-  </div>
-  <div class="grid_5">
-    <a class="button" rel="nofollow" href="{% url 'social:begin' 'facebook' %}">
-      <span class="fa fa-facebook fa-2x"></span> {% trans 'Login with Facebook' %}</a><br/>
-    <a class="button" rel="nofollow" href="{% url 'social:begin' 'twitter' %}">
-      <span class="fa fa-twitter fa-2x"></span> {% trans 'Login with Twitter' %}</a><br/>
-    <a class="button" rel="nofollow" href="{% url 'social:begin' 'google-oauth2' %}">
-      <span class="fa fa-google-plus fa-2x"></span> {% trans 'Login with Google' %}</a>
-  </div>
-</form>
-<div class="grid_12">
+{% block content %}
   {{ current_page.content }}
-</div>{% endblock %}
+{% endblock %}
 

From 4b68f62929e9750e1aea8985b1495aef900fc0d8 Mon Sep 17 00:00:00 2001
From: Christian Berg <xeniac@posteo.at>
Date: Mon, 7 May 2018 23:37:48 +0200
Subject: [PATCH 20/23] removed social auth methods for login

---
 requirements/base.txt                         |  2 -
 src/kasu/settings.py                          | 19 +--------
 src/kasu/templates/base.html                  |  6 ---
 src/kasu/urls.py                              |  1 -
 .../membership/membership_detail.html         | 39 +++++++------------
 .../templates/registration/login.html         | 22 +++--------
 6 files changed, 20 insertions(+), 69 deletions(-)

diff --git a/requirements/base.txt b/requirements/base.txt
index 2c55f0f..e04f50b 100644
--- a/requirements/base.txt
+++ b/requirements/base.txt
@@ -17,5 +17,3 @@ PyJWT
 pytz
 requests
 requests-oauthlib
-social-auth-app-django
-social-auth-core
diff --git a/src/kasu/settings.py b/src/kasu/settings.py
index 9af87a5..3f3f30f 100644
--- a/src/kasu/settings.py
+++ b/src/kasu/settings.py
@@ -49,7 +49,6 @@ PREREQ_APPS = [
     'ckeditor',
     'ckeditor_uploader',
     'easy_thumbnails',
-    'social_django',
 ]
 PROJECT_APPS = [
     'kasu',
@@ -103,8 +102,6 @@ TEMPLATES = [
                 'django.contrib.messages.context_processors.messages',
                 'django.contrib.messages.context_processors.messages',
                 'events.context_processors.events_overview',
-                'social_django.context_processors.backends',
-                'social_django.context_processors.login_redirect'
             ],
             'loaders': [
                 ('django.template.loaders.cached.Loader', [
@@ -132,24 +129,10 @@ DEFAULT_FROM_EMAIL = ""
 # Login Settings
 ACCOUNT_ACTIVATION_DAYS = 5
 AUTH_USER_MODEL = 'membership.Membership'
-AUTHENTICATION_BACKENDS = ('social_core.backends.facebook.FacebookOAuth2',
-                           'social_core.backends.google.GoogleOAuth2',
-                           'social_core.backends.twitter.TwitterOAuth',
-                           'django.contrib.auth.backends.ModelBackend',)
+AUTHENTICATION_BACKENDS = ('django.contrib.auth.backends.ModelBackend',)
 LOGIN_URL = '/membership/login/'
 LOGIN_ERROR_URL = '/membership/login/error/'
 LOGIN_REDIRECT_URL = '/users/'
-SOCIAL_AUTH_CHANGE_SIGNAL_ONLY = False
-SOCIAL_AUTH_ENABLED_BACKENDS = ('facebook-oauth2', 'google-oauth2', 'twitter')
-SOCIAL_AUTH_NEW_USER_REDIRECT_URL = '/users/'
-SOCIAL_AUTH_SLUGIFY_USERNAMES = True
-SOCIAL_AUTH_FACEBOOK_KEY = ''
-SOCIAL_AUTH_FACEBOOK_SECRET = ''
-SOCIAL_AUTH_FACEBOOK_SCOPE = ['user_about_me', 'email']
-SOCIAL_AUTH_GOOGLE_OAUTH2_KEY = ''
-SOCIAL_AUTH_GOOGLE_OAUTH2_SECRET = ''
-SOCIAL_AUTH_TWITTER_KEY = ''
-SOCIAL_AUTH_TWITTER_SECRET = ''
 
 # Localization
 USE_I18N = True
diff --git a/src/kasu/templates/base.html b/src/kasu/templates/base.html
index bb6a392..14e5dff 100644
--- a/src/kasu/templates/base.html
+++ b/src/kasu/templates/base.html
@@ -185,12 +185,6 @@
     {% trans "no user logged in" %} -
     <a rel="nofollow" href="{% url 'membership-register' %}">{% trans "register" %}</a>
     <a rel="nofollow" href="{% url 'login' %}?next={{ request.path_info }}">{% trans "login" %}</a>
-    <a rel="nofollow" href="{% url 'social:begin' 'facebook' %}" class="fa fa-facebook"
-       title="{% trans 'Login with Facebook' %}" aria-label="{% trans 'Login with Facebook' %}"></a>
-    <a rel="nofollow" href="{% url 'social:begin' 'twitter' %}" class="fa fa-twitter"
-       title="{% trans 'Login with Twitter' %}" aria-label="{% trans 'Login with Twitter' %}"></a>
-    <a rel="nofollow" href="{% url 'social:begin' 'google-oauth2' %}" class="fa fa-google"
-       title="{% trans 'Login with Google' %}" aria-label="{% trans 'Login with Google' %}"></a>
     {% endif %}
 </nav>
 </body>
diff --git a/src/kasu/urls.py b/src/kasu/urls.py
index 05be4a4..44de711 100644
--- a/src/kasu/urls.py
+++ b/src/kasu/urls.py
@@ -62,7 +62,6 @@ urlpatterns = [  # Ignore PyLintBear (C0103)
     url(r'^(?P<path>[\-\d\w\/]+)\.html$',
         views.PageHtml.as_view(), name='view-page'),
     url(r'^(?P<path>[\-\d\w\/]+)\.pdf$', views.PagePdf.as_view()),
-    url('', include('social_django.urls', namespace='social'))
 ]
 
 if settings.DEBUG:
diff --git a/src/membership/templates/membership/membership_detail.html b/src/membership/templates/membership/membership_detail.html
index 009de68..ca1e764 100644
--- a/src/membership/templates/membership/membership_detail.html
+++ b/src/membership/templates/membership/membership_detail.html
@@ -17,7 +17,7 @@
 <img class="grid_3" src="{% thumbnail membership.avatar '220x220' crop='smart' %}" alt="{% trans 'Profile Image' %}"/>{% else %}
 <div class="grid_3"> Noch kein Foto hoch geladen</div>{% endif %}
 
-<div class="grid_6">
+<div class="{% if membership == user or perms.membership.change_membership%}grid_4{% else %}grid_9{% endif %}" >
   {% if kyu_dan_ranking %}
   <h3>Mahjong</h3>
   <ul>
@@ -36,41 +36,28 @@
     </li>
   </ul>
   {% endif %}
-
+</div>
   {% if membership == user or perms.membership.change_membership%}
-
+  <div class="grid_5">
   <h3>{% trans 'private data' %}</h3>
   <p>{% blocktrans %}This data can only be seen by yourself and members of the board.{% endblocktrans %} </p>
   <ul>
-    <li><strong>{% trans "name" %}:</strong> {{membership.first_name}} {{membership.last_name}}</li>
-    <li><strong>{% trans "birthday" %}:</strong> {{membership.birthday}}</li>
-    <li><strong>{% trans "Address" %}:</strong> <address>{{ membership.street_name }}<br/> {{ membership.post_code }} {{ membership.city }}</address></li>
-
-    <li><strong>{% trans "Email" %}:</strong> <a href="mailto:{{ membership.email }}">{{membership.email}}</a></li>
-    <li><strong>{% trans "Telephone" %}:</strong> <a href="tel:{{ membership.telephone }}">{{membership.telephone}}</a></li>
-
+    {% if membership.first_name %}<li><strong>{% trans "name" %}:</strong> {{membership.first_name}} {{membership.last_name}}</li>{% endif %}
+    {% if membership.birthday %}<li><strong>{% trans "birthday" %}:</strong> {{membership.birthday}}</li>{% endif %}
+    {% if membership.street_name %}<li><strong>{% trans "Address" %}:</strong> <address>{{ membership.street_name }}<br/> {{ membership.post_code }} {{ membership.city }}</address></li>{% endif %}
+    {% if membership.email %}<li><strong>{% trans "Email" %}:</strong> <a href="mailto:{{ membership.email }}">{{membership.email}}</a></li>{% endif %}
+    {% if membership.telephone %}<li><strong>{% trans "Telephone" %}:</strong> <a href="tel:{{ membership.telephone }}">{{membership.telephone}}</a></li>{% endif %}
     <li><strong>{% trans "Member Since" %}:</strong> {{membership.date_joined}}</li>
     <li><strong>{% trans "Last Login" %}:</strong> {{membership.last_login}}</li>
-    {% if website %}
-    <li><strong>Homepage:</strong> <a href="{{website}}">{{website}}</a></li>
-    {% endif %}
   </ul>
+    {% ifequal membership user %}
+    <a href="{% url 'membership-edit' membership.username %}" class="button"> <span class="fa fa-pencil"></span> {% trans "Edit Profile" %} </a>
+    <a href="{% url 'password_change' %}" class="button"> <span class="fa fa-key"></span> {% trans 'Change Password' %}</a>
+    {% endifequal %}
+  </div>
   {% endif %}
 
-</div>
 
-{% ifequal membership user %}
-<div class="grid_3">
-  <a href="{% url 'membership-edit' membership.username %}" class="button"> <span class="fa fa-pencil"></span> {% trans "Edit Profile" %} </a>
-  <a href="{% url 'password_change' %}" class="button"> <span class="fa fa-key"></span> {% trans 'Change Password' %} </a>
-  <a class="button" href="{% url 'social:begin' 'facebook' %}" rel="nofollow">
-    <span class="fa fa-facebook"></span> {% blocktrans with 'Facebook' as name %}Associate with {{ name }}{% endblocktrans %} </a>
-  <a class="button" href="{% url 'social:begin' 'twitter' %}" rel="nofollow">
-    <span class="fa fa-twitter"></span> {% blocktrans with 'Twitter' as name %}Associate with {{ name }}{% endblocktrans %} </a>
-  <a class="button" href="{% url 'social:begin' 'google-oauth2' %}" rel="nofollow">
-    <span class="fa fa-google-plus"></span> {% blocktrans with 'Google' as name %}Associate with {{ name }}{% endblocktrans %} </a>
-
-</div>{% endifequal %}
 
 {% block score_list %} {% endblock %}{% endblock %}
 
diff --git a/src/membership/templates/registration/login.html b/src/membership/templates/registration/login.html
index a542834..f09c442 100755
--- a/src/membership/templates/registration/login.html
+++ b/src/membership/templates/registration/login.html
@@ -9,9 +9,12 @@
 {% block maincontent %}
 <form method="post" action="{% url 'login' %}">
   {% csrf_token %}
-  <div class="grid_5">
+  <div class="grid_6">
+    {{ current_page.content }}
+  </div>
+  <div class="grid_6">
     <fieldset>
-      <legend>&nbsp;</legend>
+      <legend>{% trans 'login' %}</legend>
       {% csrf_token %} {% include 'form.html' %} {% if form.errors %}
       <p>{% blocktrans %}Your username and password didn't match. Please try again.{% endblocktrans %}</p>
       {% endif %} <input type="hidden" name="next" value="{{next}}"/>
@@ -25,19 +28,6 @@
       </div>
     </fieldset>
   </div>
-  <div class="grid_2">
-    <h2>{% trans 'or' %}</h2>
-  </div>
-  <div class="grid_5">
-    <a class="button" rel="nofollow" href="{% url 'social:begin' 'facebook' %}">
-      <span class="fa fa-facebook fa-2x"></span> {% trans 'Login with Facebook' %}</a><br/>
-    <a class="button" rel="nofollow" href="{% url 'social:begin' 'twitter' %}">
-      <span class="fa fa-twitter fa-2x"></span> {% trans 'Login with Twitter' %}</a><br/>
-    <a class="button" rel="nofollow" href="{% url 'social:begin' 'google-oauth2' %}">
-      <span class="fa fa-google-plus fa-2x"></span> {% trans 'Login with Google' %}</a>
-  </div>
 </form>
-<div class="grid_12">
-  {{ current_page.content }}
-</div>{% endblock %}
+{% endblock %}
 

From e95ad8bf0a22a183cbe31c646af7be292d397779 Mon Sep 17 00:00:00 2001
From: Christian Berg <xeniac@posteo.at>
Date: Tue, 8 May 2018 12:07:39 +0200
Subject: [PATCH 21/23] User must confirm that he have read and understood the
 privacy plicity. This policity and the stautes are now linked in the
 help_text.

---
 src/kasu/templates/form.html |  4 ++--
 src/membership/forms.py      | 15 ++++++++++++++-
 2 files changed, 16 insertions(+), 3 deletions(-)

diff --git a/src/kasu/templates/form.html b/src/kasu/templates/form.html
index 8175adc..b3a070d 100644
--- a/src/kasu/templates/form.html
+++ b/src/kasu/templates/form.html
@@ -5,8 +5,8 @@
   <label {% if field.html_name != 'recaptcha' %} for="id_{{ field.html_name}}" {% endif %}
          class="field_name {{ field.css_classes }}">{{ field.label}}</label>
   {{ field }}
-  {% if field.help_text and not field.field.widget.input_type %}
-  {{field.help_text}}
+  {% if field.field.widget.input_type == 'checkbox' %}
+  <label for="id_{{field.name}}">{{field.help_text|safe}}</label>
   {% elif field.help_text %}
   <p class="help_text">{{field.help_text}}</p>
   {% endif %}
diff --git a/src/membership/forms.py b/src/membership/forms.py
index c685344..e996b3e 100644
--- a/src/membership/forms.py
+++ b/src/membership/forms.py
@@ -10,9 +10,10 @@ from django.conf import settings
 from django.contrib import auth
 from django.contrib.sites.models import Site
 from django.utils.translation import ugettext_lazy as _
-
+from django.utils.safestring import mark_safe
 from utils.massmailer import MassMailer
 from . import models
+from content.models import Page
 
 
 class MembershipForm(forms.ModelForm):
@@ -68,6 +69,18 @@ class RegistrationForm(MembershipForm):
         widget=forms.PasswordInput(), label=_('password'))
     password2 = forms.CharField(
         widget=forms.PasswordInput(), label=_('password (again)'))
+    privacy_policy = forms.BooleanField(
+        label=_('Privacy policy'),
+        help_text=_(
+            'I have read and understood the <a href="%s">privacy policy</a>') %
+            Page.objects.get(slug='privacypolicy').get_absolute_url())
+    membership = forms.BooleanField(
+        label=_('Membership'),
+        help_text=_(
+            'Yes, I confirm that I am in agreement with the '
+            '<a href="%s">statutes</a> and would like to become a member.') %
+            Page.objects.get(slug='statutes').get_absolute_url())
+
     recaptcha = ReCaptchaField()
 
     class Meta:

From fae5f30cfafafbb3d2f9a4fa5d7452dc82f1b778 Mon Sep 17 00:00:00 2001
From: Christian Berg <xeniac@posteo.at>
Date: Tue, 8 May 2018 12:09:56 +0200
Subject: [PATCH 22/23] User must confirm that he have read and understood the
 privacy plicity. This policity and the stautes are now linked in the
 help_text.

---
 src/membership/admin.py                       |   4 +-
 .../locale/de/LC_MESSAGES/django.mo           | Bin 8700 -> 9486 bytes
 .../locale/de/LC_MESSAGES/django.po           | 336 +++++++++---------
 .../templates/membership/register_form.html   |   2 +-
 4 files changed, 176 insertions(+), 166 deletions(-)

diff --git a/src/membership/admin.py b/src/membership/admin.py
index 22ab74b..70a8135 100644
--- a/src/membership/admin.py
+++ b/src/membership/admin.py
@@ -92,9 +92,9 @@ class MembershipAdmin(UserAdmin):
         'is_active',
         'membership',
         'confirmed',
-        'paid_until',
+        'last_login',
     )
-    list_editable = ('confirmed', 'paid_until',)
+    list_editable = ('confirmed', )
     list_display_links = ('username',)
     fieldsets = (
         (None, {'fields': (('username', 'password'), 'gender', 'avatar',
diff --git a/src/membership/locale/de/LC_MESSAGES/django.mo b/src/membership/locale/de/LC_MESSAGES/django.mo
index 28f4a43cb8cdd2670fecf1e07abe73fd783e3d57..4b7825c2962fae055effb224ced8371e65b742fd 100644
GIT binary patch
delta 2755
zcmZwHdrZ}39LMqJa1jwyE&`eteh6Ml;-Zp@N+9Mn2t~YLphwP64srOQhXZ2&9Gf+}
zn9WhHO><_=rK>eNu5zs?ZELQ})X|zYvX;&{{;;-YPFd^yIsDwx^^EU%J-^@KJkR&}
zKF{wrSh;US_?NV}Hw?`oCJ=jLjnR$4VSLbP5{=2kRX7^`xE{MP0WaV*yo4jsGs2i;
z9F4^|0rk6TOv6UZ!|j-EOxPTtGnpGFQ2+QnYT$lkOmhuK;Z4-Q{~&)RDQW0B6H~a(
z#dw^JnyA#hu0pM)7OSxyGw?VjF~8|`|KVGV<BN-^fqruD_hT8?SMgQMB?~2b6360K
zs01z}e`bIWC3qY4f3cKB*XgKnC!rF|!%@s{=Fri^OHeCci5jRD^~24`+@=+$;tu!z
zVblc2@gY2os#G6l;qRD@cX1q!=gaX}f*NlXhBaXWof@=p4}OfLSjOlo-A){iyO6KU
zOURh!O;n=CP%Dd|7INCX{sOgyU!xNI0d<ycU?)<xu$h8g)Nc|V!gBl!>v0gL<GR$L
zE!c$`uosokIn2R}xEudM{!BOZ<s6%ru@(2>7QBO%*ucqKh;OG;e`R)s8(Q%l)PyBt
zhF02$ny3v``YzN;-$JeQ9rye9kX+44WDau%8Or>Ks?ZHo$#0>?i{S)noTM-v4U~#H
zOqtm0F{TjpRNSOqdMwk}&>$9~w(KaD;0e?j`4u(M04~SdsDu_VsI0|&^x;I@k25g*
zAsyy2Kch<fCu+dE$Tpc_oE#0DiMpSQDsh2pIqHn8M&>jd-0SVAm3HG&d=6ESbEvb^
zkBk>K19Y@kw@?G!L9NikzO2MVJc4zo!*>h$7ZcA>)_~cl0cW8~T!Biw3bpbER3Z*)
zAv@gfpT|T!|F6^0gojZB9YalY3N^r4oQ-{`2@=^4RUiX(c&DLGbrlw)52xb+%)?&H
z#jB_UhEspdmx1+q{wLDegWXt;dK6TN3e*plp|+?FwFRy2{Vr6(yHQ)WAN9L~s0ogu
z5<G!Q@I1bT*HMY>;N=izQRWbxM*I}@cw|{ahh-x!<@!a`7M({W)Q1}QH%#WRCh!cB
zyBWiYRjFs<I-HM7um@}LGL~Th<xmCNa;d*22y;VUe1pn#80l%H6EPpBqXw?SIBayU
zn^6BBKpno_?)5=bWj;b}*_WuqzjN<jLXCGlkNPX~Ke)j{qRBL&_WQx66}J*pFS<Gh
zDOj}BJl3X;*h*;cmDCJE$v;gzPACDjLZXP6r3>aaE7YN}_-K2C&kb&0#1Wf`3PRhZ
zHjS7W?G1fYy8Qrda{H>_T4IZPtu1(hSnOVla48@4gvy~-LRbV_6@8KTa5b@j&|a#Q
z6YGgbiIv1WB9>T0sG4dG1h0^2)8T!FSVcS)y<^N{$YUBdEp+A(dUV<d9mE2H$2|Iu
zhG=_|Pwl0ePJ0Z&uHD!4KJXHHZ11%yx3diWgbtqGA8Kn<*SU0TqM67ccub@3<{H$y
zTuqPFz4kDjYGNv}k<h`@VN;t==-r{iJk)wdB)k&&AR#$sq2>2>*;df@`Yf;GvpOB0
z9qb6TxBIM+-?kQbEq~D7x^VK8j>%=)f-PO%rk&Qd_CQP1&IN_uvdAZi8J<Xd(wdm$
z|9%x&J9295xch$F5%PvQLw1LL)w4HcN~AjFsAoi=y}89Pj<?P3`8)MW!d$DUsI+)a
zPk&mD+n*PSPcQMr&MheJDI4>7BsF7G%<|<;ev;l|TfUYD60{b3L$=e=<nIhUYX@5c
zXWtEWI?bBWYPJJ*hwW&6R+m=DVk2!?Gd+>3V=u&H{O=DVr^a849edw0YPAg8iLT;E
ac7EiA>@%K`6;7KS@Y#;3)<SA>-v1X$M>==_

delta 2104
zcmY+^e`wTo9LMp`-KKN3AMVH9@~rJ{yX9oEy18W=Wb@Y!Lyuf(GE2SNzPZcoE^jxK
zXr5s)Ev~3*5D}<BZBk0(i`0y0VGxr3BS}Kwf-EWuq*e`z==titl8xIvKA+Eh?)`ax
z-k;C+UVPxMb(yP`h2w_5B>%Vb|7wAH#*`HOr<Z0a{c;TAc5FjU$?{f%<G2h@VJTk5
z68r{3cpdfq`bEZ6Vk-uX$(Ri^su*|z>+v9J;tAwCW(tdO8q4q;D)1$|1!tZ9kGPor
zAGiP)@g*%(hUy1!AuhuRwxEag%_xmq8OS*kj$tAFw^3hw#~Gi(Ed38q33jvkZMY4!
za1xc+A>?JUylLKRPJa>=&qgISja95~F3_mJubmHmLG5$_St*ffR3(<676>3yObhZd
z9lYI%8=Ub$)WZAGhhwOCZ=#NB3hVGZW|q+SfyPoSAUaJ`hgz^1AH<b7hR<RrmT<r-
zWf-Zpi6AfY2yaX=7HX#{)CLYX{ZXWN<}fO;Y$^5E<(gz*1V6?`Y$x4X+<{&A6!zkW
z*o0oTw;Jz91w4pK<Ol}vWju^Fs<Nv%AKmMX7{krD4&Pf${qLhO$AB_wWwv&>8MV+6
zWKA=LT3`lM>hq|bT}L<m=6pVngfcD;SZ7?xn=W@Fsxlp@3U{O8^<-$MR69@sqo_;u
zIL^2@AJkLPRh@r4`!GfS5bB72MGyXo?N~uacO#5ium?BdE>vPC9nazl`kBvZ+(Ba=
zo6*a8&@^jNrQMDS7(=RQhERb=o$=?9O`CDY3Dn(~MqRcUr+)>t<5>*j_ef<j=5A(j
z>}EY`p&ry(J%$PtMeTF|kK>c5BdMTFy1af=i91noBB&BSib{9@weth01dgIM@Cw%G
z`9DTOJANNY%3MT!@fxZEbEpLVMlG<ARh2+BDsTg~VH;}UII1EesLMQtihBw}_$fBw
z?-<ncU&qaB!1bui22cx*U@wm17+%3H+|9G9%A7#WpF~yejMJY%C3+FHfv-^WzeUCU
z36<C!W|WzaAO4pxghBiS`OJKWJJHPr(c==u75Em0@e=B&d_1d4q!typS$!_=7G#Rq
z$*+w{|1@^vbNCQmsH6U?Y54v5lI=nT-iI2WMkP3p+F>~lw-WH7o|drVCe#93Q1g3{
zYhv~}{iCRg97i3|X;i{z1J0R##()A`MrC|8kc$+*;9WC3oa~E7)0TgKJU!rVY)V9j
ztmXEX#bs_gSW@M>cT;jtJdyvfJKAT(lF7a1rm=7`xo6P2dE{XNrLB~GPw7^-{d##r
zfxWyc?J81SlT76%s%MMZ{Gm{1Yez2Y3FO-=L-rX@yQ^?jOQ<dPv-cy<HY*j2C;Bb_
zP&|DjsbTwM&2G27)pwU`?YTE%R?2@PA%8S6WDWLP36mesC*@!B|4}C~XR`gw(l6Zh
Y-r8#g_C)<@S8?Ru{Q9j_E*5<EAGrhq`v3p{

diff --git a/src/membership/locale/de/LC_MESSAGES/django.po b/src/membership/locale/de/LC_MESSAGES/django.po
index e15a9d4..288a97c 100644
--- a/src/membership/locale/de/LC_MESSAGES/django.po
+++ b/src/membership/locale/de/LC_MESSAGES/django.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: kasu.membership\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-05-04 11:29+0200\n"
-"PO-Revision-Date: 2018-05-04 11:31+0105\n"
+"POT-Creation-Date: 2018-05-08 00:17+0200\n"
+"PO-Revision-Date: 2018-05-08 00:19+0105\n"
 "Last-Translator: b'Christian Berg <kasu@xendynastie.at>'\n"
 "Language-Team: Kasu <verein@kasu.at>\n"
 "Language: de\n"
@@ -17,173 +17,200 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "X-Generator: Poedit 1.8.9\n"
-"X-Translated-Using: django-rosetta 0.7.14\n"
+"X-Translated-Using: django-rosetta 0.8.1\n"
 
-#: __init__.py:11
+#: .\membership\__init__.py:11
 msgid "Male"
 msgstr "Männlich"
 
-#: __init__.py:12
+#: .\membership\__init__.py:12
 msgid "Female"
 msgstr "Weiblich"
 
-#: admin.py:22
+#: .\membership\admin.py:22
 msgid "Activate selected User"
 msgstr "Ausgewählte Benutzer freischalten"
 
-#: admin.py:39
+#: .\membership\admin.py:39
 msgid "Cleanup selected Activation Requests"
 msgstr "Ausgewählte Aktivierungsanfragen bereinigen"
 
-#: admin.py:62
+#: .\membership\admin.py:62
 #, python-format
 msgid "Can't remove personal data from active member %s."
 msgstr ""
 "Persönliche Daten von aktiven Mitglied %s können nicht entfernt werden."
 
-#: admin.py:64
+#: .\membership\admin.py:64
 #, python-format
 msgid "Cleared %d personal data profiles."
 msgstr "Persönliche Daten in %d Profilen entfernt."
 
-#: admin.py:66
+#: .\membership\admin.py:66
 msgid "Clear personal Data"
 msgstr "Persönliche Daten bereinigen"
 
-#: admin.py:75
+#: .\membership\admin.py:75
 msgid "Group"
 msgstr "Gruppe"
 
-#: admin.py:76
+#: .\membership\admin.py:76
 msgid "Groups"
 msgstr "Gruppen"
 
-#: admin.py:102 models.py:163 models.py:218
+#: .\membership\admin.py:102 .\membership\forms.py:78
+#: .\membership\models.py:163 .\membership\models.py:218
 msgid "Membership"
 msgstr "Mitgliedschaft"
 
-#: admin.py:107
+#: .\membership\admin.py:107
 msgid "Permissions"
 msgstr "Berechtigung"
 
-#: admin.py:109
+#: .\membership\admin.py:109
 msgid "Important dates"
 msgstr "Wichtige Daten"
 
-#: forms.py:23 templates/membership/membership_detail.html:46
+#: .\membership\forms.py:24
+#: .\membership\templates\membership\membership_detail.html:46
 msgid "birthday"
 msgstr "Geburtstag"
 
-#: forms.py:25
+#: .\membership\forms.py:26
 msgid "Input format: yyyy-mm-dd"
 msgstr "Eingabeformat: tt.mm.jjjj"
 
-#: forms.py:27 templates/membership/membership_detail.html:49
+#: .\membership\forms.py:28
+#: .\membership\templates\membership\membership_detail.html:48
 msgid "Email"
 msgstr "E-Mail"
 
-#: forms.py:44
+#: .\membership\forms.py:45
 msgid ""
 "For your membership, we need this.             Please fill out this field "
 "yet."
 msgstr "Diese Angabe wird für eine Mitgliedschaft benötigt, bitte ausfüllen."
 
-#: forms.py:68
+#: .\membership\forms.py:69
 msgid "password"
 msgstr "Passwort"
 
-#: forms.py:70
+#: .\membership\forms.py:71
 msgid "password (again)"
 msgstr "Passwort (wiederholen)"
 
-#: forms.py:92
+#: .\membership\forms.py:73
+msgid "Privacy policy"
+msgstr "Datenschutzerklärung"
+
+#: .\membership\forms.py:75
+#, python-format
+msgid "I have read and understood the <a href=\"%s\">privacy policy</a>"
+msgstr ""
+"Ich habe die <a href=\"%s\"> Datenschutzerklärung</a> gelesen und verstanden"
+
+#: .\membership\forms.py:80
+#, python-format
+#| msgid ""
+#| "Yes, I confirm that I am in agreement with the statutes         and would "
+#| "like to become a member."
+msgid ""
+"Yes, I confirm that I am in agreement with the <a href=\"%s\">statutes</a> "
+"and would like to become a member."
+msgstr ""
+"Ja, ich bin mit den <a href=\"%s\">Statuen</a> einverstanden und möchte "
+"Mitglied werden."
+
+#: .\membership\forms.py:105
 msgid "This username is already taken.         Please choose another."
 msgstr ""
 "Diesen Benutzername ist schon vergeben. Bitte einen anderen auswählen."
 
-#: forms.py:99
+#: .\membership\forms.py:112
 msgid ""
 "This email address is already in             use. Please supply a different "
 "email address."
 msgstr "Die E-Mail Adresse wird schon verwendet. Bitte eine andere angeben."
 
-#: forms.py:109
+#: .\membership\forms.py:122
 msgid "The two password fields didn't match."
 msgstr "Die beiden Passwörter passen nicht."
 
-#: models.py:84
+#: .\membership\models.py:84
 msgid "user"
 msgstr "Benutzer"
 
-#: models.py:86
+#: .\membership\models.py:86
 msgid "activation key"
 msgstr "Aktivierungsschlüssel"
 
-#: models.py:90
+#: .\membership\models.py:90
 msgid "pending activation"
 msgstr "Ausstehende Aktivierung"
 
-#: models.py:91
+#: .\membership\models.py:91
 msgid "pending activations"
 msgstr "Wartende Aktivierungen"
 
-#: models.py:94
+#: .\membership\models.py:94
 #, python-format
 msgid "user registration for %s"
 msgstr "Benutzerregistrierung für %s"
 
-#: models.py:149
+#: .\membership\models.py:149
 msgid "Gender"
 msgstr "Geschlecht"
 
-#: models.py:165
+#: .\membership\models.py:165
 msgid ""
 "Yes, I confirm that I am in agreement with the statutes         and would "
 "like to become a member."
 msgstr "Ja, ich bin mit den Statuen einverstanden und möchte Mitglied werden."
 
-#: models.py:169
+#: .\membership\models.py:169
 msgid "Birthday Date"
 msgstr "Geburtstag"
 
-#: models.py:173 templates/membership/membership_detail.html:50
+#: .\membership\models.py:173
+#: .\membership\templates\membership\membership_detail.html:49
 msgid "Telephone"
 msgstr "Telefon"
 
-#: models.py:179 templates/membership/membership_detail.html:47
+#: .\membership\models.py:179
+#: .\membership\templates\membership\membership_detail.html:47
 msgid "Address"
 msgstr "Adresse"
 
-#: models.py:185
+#: .\membership\models.py:185
 msgid "Postcode"
 msgstr "Postleitzahl"
 
-#: models.py:190
+#: .\membership\models.py:190
 msgid "Town/City"
 msgstr "Ort"
 
-#: models.py:198
+#: .\membership\models.py:198
 msgid "Paid until"
 msgstr "Bezahlt bis"
 
-#: models.py:204
+#: .\membership\models.py:204
 msgid "Confirmed"
 msgstr "Bestätigt"
 
-#: models.py:206
+#: .\membership\models.py:206
 msgid "This person has paid the membership fee."
 msgstr "Diese Person hat ihre Mitgliedschaft bezahlt"
 
-#: models.py:219
+#: .\membership\models.py:219
 msgid "Memberships"
 msgstr "Mitgliedschaften"
 
-#: templates/membership/email/activation_email.txt:2
+#: .\membership\templates\membership\email\activation_email.txt:2
 #, python-format
 msgid "Welcome %(user)s,"
 msgstr "Herzlich willkommen %(user)s,"
 
-#: templates/membership/email/activation_email.txt:4
+#: .\membership\templates\membership\email\activation_email.txt:4
 #, python-format
 msgid ""
 "We received an account request on %(site.domain)s for your email address.\n"
@@ -192,7 +219,7 @@ msgstr ""
 "Jemand (hoffentlich du selbst) möchte mit dieser E-Mail Adresse einen neuen Benutzer Account für %(site.domain)s anlegen.\n"
 "Solltest du diesen Account aktivieren wollen, klicke bitte auf den unten stehenden Link, oder kopiere diesen in die Adresszeile deines Browsers:"
 
-#: templates/membership/email/activation_email.txt:9
+#: .\membership\templates\membership\email\activation_email.txt:9
 #, python-format
 msgid ""
 "If you do not want to open an account on %(site.domain)s, please ignore this email.\n"
@@ -201,7 +228,7 @@ msgstr ""
 "Wenn du keinen Zugang für %(site.domain)s eröffnen willst, ignoriere diese E-Mail bitte.\n"
 "Die Zugangsdaten werden dann in ein paar Tagen automatisch gelöscht."
 
-#: templates/membership/email/activation_email.txt:12
+#: .\membership\templates\membership\email\activation_email.txt:12
 #, python-format
 msgid ""
 "Best Regards,\n"
@@ -210,259 +237,230 @@ msgstr ""
 "mit den besten Wünschen\n"
 "Das Team von %(site.domain)s"
 
-#: templates/membership/email/password_reset_email.html:2
+#: .\membership\templates\membership\email\password_reset_email.html:2
 msgid "You're receiving this e-mail because you requested a password reset"
 msgstr ""
 "Du hast diese E-Mail erhalten, weil jemand die das Passwort zurücksetzen "
 "möchte. "
 
-#: templates/membership/email/password_reset_email.html:3
+#: .\membership\templates\membership\email\password_reset_email.html:3
 #, python-format
 msgid "for your user account at %(site_name)s"
 msgstr "Für deinen Benutzerzugang auf %(site_name)s"
 
-#: templates/membership/email/password_reset_email.html:5
+#: .\membership\templates\membership\email\password_reset_email.html:5
 msgid "Please go to the following page and choose a new password:"
 msgstr "Bitte gehe auf folgende Seite und wähle ein neues Passwort aus:"
 
-#: templates/membership/email/password_reset_email.html:9
+#: .\membership\templates\membership\email\password_reset_email.html:9
 msgid "Your username, in case you've forgotten:"
 msgstr "Dein Benutzername, für den Fall das du diesen vergessen hast:"
 
-#: templates/membership/email/password_reset_email.html:11
+#: .\membership\templates\membership\email\password_reset_email.html:11
 msgid "Thanks for using our site!"
 msgstr "Danke das du unsere Seite verwendest!"
 
-#: templates/membership/email/password_reset_email.html:13
+#: .\membership\templates\membership\email\password_reset_email.html:13
 #, python-format
 msgid "The %(site_name)s team"
 msgstr "Das %(site_name)s Team"
 
-#: templates/membership/email/password_reset_subject.txt:2
+#: .\membership\templates\membership\email\password_reset_subject.txt:2
 #, python-format
 msgid "Password reset on %(site_name)s"
 msgstr "Passwort auf %(site_name)s zurücksetzen"
 
-#: templates/membership/hanchan_table.html:5
+#: .\membership\templates\membership\hanchan_table.html:5
 msgid "Start"
 msgstr "Beginn"
 
-#: templates/membership/hanchan_table.html:6
+#: .\membership\templates\membership\hanchan_table.html:6
 msgid "Event"
 msgstr "Termin"
 
-#: templates/membership/hanchan_table.html:7
+#: .\membership\templates\membership\hanchan_table.html:7
 msgid "Players"
 msgstr "Spieler"
 
-#: templates/membership/hanchan_table.html:8
+#: .\membership\templates\membership\hanchan_table.html:8
 msgid "Kyu Points"
 msgstr "Kyū Punkte"
 
-#: templates/membership/hanchan_table.html:9
+#: .\membership\templates\membership\hanchan_table.html:9
 msgid "Dan Points"
 msgstr "Dan Punkte"
 
-#: templates/membership/hanchan_table.html:10
+#: .\membership\templates\membership\hanchan_table.html:10
 msgid "Bonus Points"
 msgstr "Bonus Punkte"
 
-#: templates/membership/hanchan_table.html:11
+#: .\membership\templates\membership\hanchan_table.html:11
 msgid "Comment"
 msgstr "Anmerkung"
 
-#: templates/membership/hanchan_table.html:26
+#: .\membership\templates\membership\hanchan_table.html:26
 msgid "This Hanchan does not validate"
 msgstr "Diese Hanchan ist ungültig"
 
-#: templates/membership/membership_detail.html:5
+#: .\membership\templates\membership\membership_detail.html:5
 msgid "profile for"
 msgstr "Profil für"
 
-#: templates/membership/membership_detail.html:9
+#: .\membership\templates\membership\membership_detail.html:9
 msgid "Ladder Hanchans"
 msgstr "Ladder Hanchans"
 
-#: templates/membership/membership_detail.html:10
+#: .\membership\templates\membership\membership_detail.html:10
 msgid "Kyu Hanchans"
 msgstr "Kyū Hanchans"
 
-#: templates/membership/membership_detail.html:11
+#: .\membership\templates\membership\membership_detail.html:11
 msgid "Dan Hanchans"
 msgstr "Dan Hanchans"
 
-#: templates/membership/membership_detail.html:12
+#: .\membership\templates\membership\membership_detail.html:12
 msgid "Invalid Hanchans"
 msgstr "Ungültige Hanchans"
 
-#: templates/membership/membership_detail.html:13
+#: .\membership\templates\membership\membership_detail.html:13
 msgid "Mai-Star Games"
 msgstr "Mai-Star Spiele"
 
-#: templates/membership/membership_detail.html:17
+#: .\membership\templates\membership\membership_detail.html:17
 msgid "Profile Image"
 msgstr "Profilbild"
 
-#: templates/membership/membership_detail.html:26
-#: templates/membership/membership_detail.html:29
+#: .\membership\templates\membership\membership_detail.html:26
+#: .\membership\templates\membership\membership_detail.html:29
 msgid "Points"
 msgstr "Punkte"
 
-#: templates/membership/membership_detail.html:26
+#: .\membership\templates\membership\membership_detail.html:26
 msgid "Maximum"
 msgstr "Maximum"
 
-#: templates/membership/membership_detail.html:32
+#: .\membership\templates\membership\membership_detail.html:32
 msgid "Games Total"
 msgstr "Spiele gesamt"
 
-#: templates/membership/membership_detail.html:32
-#: templates/membership/membership_detail.html:35
+#: .\membership\templates\membership\membership_detail.html:32
+#: .\membership\templates\membership\membership_detail.html:35
 msgid "Won"
 msgstr "Gewonnen"
 
-#: templates/membership/membership_detail.html:32
-#: templates/membership/membership_detail.html:35
+#: .\membership\templates\membership\membership_detail.html:32
+#: .\membership\templates\membership\membership_detail.html:35
 msgid "Good"
 msgstr "Gut"
 
-#: templates/membership/membership_detail.html:35
+#: .\membership\templates\membership\membership_detail.html:35
 msgid "Current Season"
 msgstr "Aktuelle Saison"
 
-#: templates/membership/membership_detail.html:42
+#: .\membership\templates\membership\membership_detail.html:42
 msgid "private data"
 msgstr "Private Daten"
 
-#: templates/membership/membership_detail.html:43
+#: .\membership\templates\membership\membership_detail.html:43
 msgid "This data can only be seen by yourself and members of the board."
 msgstr ""
 "Diese Angaben können nur von dir selbst und von Mitgliedern des Vorstandes "
 "eingesehen werden."
 
-#: templates/membership/membership_detail.html:45
+#: .\membership\templates\membership\membership_detail.html:45
 msgid "name"
 msgstr "Name"
 
-#: templates/membership/membership_detail.html:52
+#: .\membership\templates\membership\membership_detail.html:50
 msgid "Member Since"
 msgstr "Mitglied seit"
 
-#: templates/membership/membership_detail.html:53
+#: .\membership\templates\membership\membership_detail.html:51
 msgid "Last Login"
 msgstr "Letzte Anmeldung"
 
-#: templates/membership/membership_detail.html:64
+#: .\membership\templates\membership\membership_detail.html:54
 msgid "Edit Profile"
 msgstr "Profil bearbeiten"
 
-#: templates/membership/membership_detail.html:65
-#: templates/registration/password_change_form.html:23
+#: .\membership\templates\membership\membership_detail.html:55
+#: .\membership\templates\registration\password_change_form.html:23
 msgid "Change Password"
 msgstr "Passwort ändern"
 
-#: templates/membership/membership_detail.html:67
-#: templates/membership/membership_detail.html:69
-#: templates/membership/membership_detail.html:71
-#, python-format
-msgid "Associate with %(name)s"
-msgstr "Verbinde mit %(name)s"
-
-#: templates/membership/membership_form.html:4
-#: templates/membership/membership_form.html:6
-#: templates/membership/membership_form.html:11
+#: .\membership\templates\membership\membership_form.html:4
+#: .\membership\templates\membership\membership_form.html:6
+#: .\membership\templates\membership\membership_form.html:11
 msgid "Edit Userprofile"
 msgstr "Profil bearbeiten"
 
-#: templates/membership/membership_form.html:15
+#: .\membership\templates\membership\membership_form.html:15
 msgid "Reset"
 msgstr "Zurücksetzen"
 
-#: templates/membership/membership_form.html:16
+#: .\membership\templates\membership\membership_form.html:16
 msgid "Save"
 msgstr "Speichern"
 
-#: templates/membership/register_form.html:4
+#: .\membership\templates\membership\register_form.html:4
 msgid "Registration"
 msgstr "Registrieren"
 
-#: templates/membership/register_form.html:10
+#: .\membership\templates\membership\register_form.html:10
 msgid "Login crendentials"
 msgstr "Anmeldedaten"
 
-#: templates/membership/register_form.html:16
+#: .\membership\templates\membership\register_form.html:16
 msgid "Club membership"
 msgstr "Vereinsmitgliedschaft"
 
-#: templates/membership/register_form.html:27
+#: .\membership\templates\membership\register_form.html:27
 msgid "reset"
 msgstr "Zurücksetzen"
 
-#: templates/membership/register_form.html:29
+#: .\membership\templates\membership\register_form.html:29
 msgid "register"
 msgstr "Registrieren"
 
-#: templates/membership/register_successful.html:5
-#: templates/membership/register_successful.html:7
-#: templates/membership/register_successful.html:10
+#: .\membership\templates\membership\register_successful.html:5
+#: .\membership\templates\membership\register_successful.html:7
+#: .\membership\templates\membership\register_successful.html:10
 msgid "Activation sent"
 msgstr "Aktivierung wurde zugesendet"
 
-#: templates/registration/logged_out.html:16
-#: templates/registration/login.html:16
-#| msgid ""
-#| "Your username and password didn't match. Please try\n"
-#| "      again."
+#: .\membership\templates\registration\login.html:17
+msgid "login"
+msgstr "Anmelden"
+
+#: .\membership\templates\registration\login.html:19
 msgid "Your username and password didn't match. Please try again."
 msgstr "Anmeldung fehlgeschlagen, bitte Benutzername und Passwort überprüfen."
 
-#: templates/registration/logged_out.html:19
-#: templates/registration/login.html:19
+#: .\membership\templates\registration\login.html:22
 msgid "Forgot your Password?"
 msgstr "Passwort vergessen?"
 
-#: templates/registration/logged_out.html:23
-#: templates/registration/login.html:23
-#: templates/registration/password_reset_complete.html:13
+#: .\membership\templates\registration\login.html:26
+#: .\membership\templates\registration\password_reset_complete.html:13
 msgid "Login"
 msgstr "Anmelden"
 
-#: templates/registration/logged_out.html:29
-#: templates/registration/login.html:29
-msgid "or"
-msgstr "oder"
-
-#: templates/registration/logged_out.html:33
-#: templates/registration/login.html:33
-msgid "Login with Facebook"
-msgstr "Über Facebook anmelden"
-
-#: templates/registration/logged_out.html:35
-#: templates/registration/login.html:35
-msgid "Login with Twitter"
-msgstr "Über Twitter anmelden"
-
-#: templates/registration/logged_out.html:37
-#: templates/registration/login.html:37
-msgid "Login with Google"
-msgstr "Über Google Anmelden"
-
-#: templates/registration/password_change_done.html:4
-#: templates/registration/password_change_done.html:7
+#: .\membership\templates\registration\password_change_done.html:4
+#: .\membership\templates\registration\password_change_done.html:7
 msgid "Password change successful"
 msgstr "Benutzerprofil erfolgreich geändert."
 
-#: templates/registration/password_change_done.html:8
+#: .\membership\templates\registration\password_change_done.html:8
 msgid "Your password was changed."
 msgstr "Passwort geändet"
 
-#: templates/registration/password_change_form.html:4
-#: templates/registration/password_change_form.html:9
-#: templates/registration/password_change_form.html:16
+#: .\membership\templates\registration\password_change_form.html:4
+#: .\membership\templates\registration\password_change_form.html:9
+#: .\membership\templates\registration\password_change_form.html:16
 msgid "Password change"
 msgstr "Passwort wechseln"
 
-#: templates/registration/password_change_form.html:10
+#: .\membership\templates\registration\password_change_form.html:10
 msgid ""
 "Please enter your old password, for security's sake, and then enter your new"
 " password twice so we can verify you typed it in correctly."
@@ -470,23 +468,23 @@ msgstr ""
 "Zur Sicherheit bitte altes Passwort einmal  und das gewünschte neue Passwort"
 " zweimal angeben, so können Tippfehler abgefangen werden."
 
-#: templates/registration/password_reset_complete.html:4
-#: templates/registration/password_reset_complete.html:6
-#: templates/registration/password_reset_complete.html:9
+#: .\membership\templates\registration\password_reset_complete.html:4
+#: .\membership\templates\registration\password_reset_complete.html:6
+#: .\membership\templates\registration\password_reset_complete.html:9
 msgid "Password reset complete"
 msgstr "Das Rücksetzen des Passwortes ist abgeschlossen."
 
-#: templates/registration/password_reset_complete.html:10
+#: .\membership\templates\registration\password_reset_complete.html:10
 msgid "Your password has been set.  You may go ahead and log in now."
 msgstr "Das Passwort wurde gesetzt, Du kannst dich nun damit anmelden."
 
-#: templates/registration/password_reset_confirm.html:4
-#: templates/registration/password_reset_confirm.html:6
-#: templates/registration/password_reset_confirm.html:15
+#: .\membership\templates\registration\password_reset_confirm.html:4
+#: .\membership\templates\registration\password_reset_confirm.html:6
+#: .\membership\templates\registration\password_reset_confirm.html:15
 msgid "Enter new password"
 msgstr "Neues Passwort eingeben"
 
-#: templates/registration/password_reset_confirm.html:12
+#: .\membership\templates\registration\password_reset_confirm.html:12
 msgid ""
 "Please enter your new password twice so we can verify you typed it in "
 "correctly."
@@ -494,15 +492,15 @@ msgstr ""
 "Bitte das Passwort zweimal eingeben, um sicher zu stellen das es korrekt "
 "eingetippt wurde."
 
-#: templates/registration/password_reset_confirm.html:18
+#: .\membership\templates\registration\password_reset_confirm.html:18
 msgid "Change my password"
 msgstr "Passwort ändern"
 
-#: templates/registration/password_reset_confirm.html:26
+#: .\membership\templates\registration\password_reset_confirm.html:26
 msgid "Password reset unsuccessful"
 msgstr "Passwort rücksetzen fehlgeschlagen"
 
-#: templates/registration/password_reset_confirm.html:27
+#: .\membership\templates\registration\password_reset_confirm.html:27
 msgid ""
 "The password reset link was invalid, possibly because it has already been "
 "used.  Please request a new password reset."
@@ -510,22 +508,22 @@ msgstr ""
 "Der Link für die Rücksetzung des Passwortes war ungültig, vermutlich wurde "
 "er schon einmal benutzt. Bitte eine neue Rücksetzung beantragen."
 
-#: templates/registration/password_reset_done.html:4
-#: templates/registration/password_reset_done.html:6
-#: templates/registration/password_reset_done.html:12
+#: .\membership\templates\registration\password_reset_done.html:4
+#: .\membership\templates\registration\password_reset_done.html:6
+#: .\membership\templates\registration\password_reset_done.html:12
 msgid "Password reset successful"
 msgstr "Passwort erfolgreich zurückgesetzt."
 
-#: templates/registration/password_reset_form.html:4
-#: templates/registration/password_reset_form.html:6
+#: .\membership\templates\registration\password_reset_form.html:4
+#: .\membership\templates\registration\password_reset_form.html:6
 msgid "Password reset"
 msgstr "Passwort zurücksetzen"
 
-#: templates/registration/password_reset_form.html:21
+#: .\membership\templates\registration\password_reset_form.html:21
 msgid "Transmit"
 msgstr "Übermitteln"
 
-#: views.py:61
+#: .\membership\views.py:61
 msgid ""
 "Activation successful.         You can now login anytime with you username "
 "and password."
@@ -533,14 +531,29 @@ msgstr ""
 "Die Aktivierung war erfolgreich. Du kannst dich ab jetzt jederzeit mit "
 "deinem Benutzernamen und Passwort anmelden."
 
-#: views.py:88
+#: .\membership\views.py:88
 msgid "User Profile changed successfully"
 msgstr "Benutzerprofil erfolgreich geändert."
 
-#: views.py:112
+#: .\membership\views.py:112
 msgid "No Membership found matching the query"
 msgstr "Kein Mitglied gefunden welche der Anfrage entspricht"
 
+#~ msgid "Associate with %(name)s"
+#~ msgstr "Verbinde mit %(name)s"
+
+#~ msgid "or"
+#~ msgstr "oder"
+
+#~ msgid "Login with Facebook"
+#~ msgstr "Über Facebook anmelden"
+
+#~ msgid "Login with Twitter"
+#~ msgstr "Über Twitter anmelden"
+
+#~ msgid "Login with Google"
+#~ msgstr "Über Google Anmelden"
+
 #~ msgid ""
 #~ "After you've provided your account data, you'll receive\n"
 #~ "      an email asking you to verify your email address. You have to click on the\n"
@@ -550,9 +563,6 @@ msgstr "Kein Mitglied gefunden welche der Anfrage entspricht"
 #~ "Nach dem du deine Daten eingegeben hast, wirst du eine E-Mail zur Bestätigung bekommen.\n"
 #~ "Bitte klicke auf den Link in dieser E-Mail zur Verifizierung, erst dann ist die Anmeldung möglich."
 
-#~ msgid "login"
-#~ msgstr "Anmelden"
-
 #~ msgid "Have you already registered?"
 #~ msgstr "Bereits registriert?"
 
diff --git a/src/membership/templates/membership/register_form.html b/src/membership/templates/membership/register_form.html
index f28cbd2..bbda764 100644
--- a/src/membership/templates/membership/register_form.html
+++ b/src/membership/templates/membership/register_form.html
@@ -8,7 +8,7 @@
   {% csrf_token %}
   <fieldset class="grid_7">
     <legend>{% trans "Login crendentials"%}</legend>
-    {% get_fieldset "username, email, password1, password2, recaptcha" from form as form1 %}
+    {% get_fieldset "username, email, password1, password2, privacy_policy, recaptcha" from form as form1 %}
     {% with form1 as form %}{% include "form.html" %}{% endwith %}
   </fieldset>
 

From 07686411847748b2d0a5fdb391051461310af6d7 Mon Sep 17 00:00:00 2001
From: Christian Berg <xeniac@posteo.at>
Date: Tue, 8 May 2018 12:12:15 +0200
Subject: [PATCH 23/23] removed unneeded import

---
 src/content/locale/de/LC_MESSAGES/django.mo   | Bin 3305 -> 3621 bytes
 src/content/locale/de/LC_MESSAGES/django.po   | 158 +++---
 src/events/locale/de/LC_MESSAGES/django.mo    | Bin 3707 -> 4095 bytes
 src/events/locale/de/LC_MESSAGES/django.po    | 210 ++++----
 src/kasu/locale/de/LC_MESSAGES/django.mo      | Bin 3473 -> 3275 bytes
 src/kasu/locale/de/LC_MESSAGES/django.po      | 115 ++--
 .../locale/de/LC_MESSAGES/django.mo           | Bin 4415 -> 4819 bytes
 .../locale/de/LC_MESSAGES/django.po           | 469 ++++++++--------
 .../locale/de/LC_MESSAGES/django.mo           | Bin 3215 -> 3215 bytes
 .../locale/de/LC_MESSAGES/django.po           | 134 ++---
 src/membership/forms.py                       |   1 -
 src/utils/locale/de/LC_MESSAGES/django.mo     | Bin 11847 -> 11847 bytes
 src/utils/locale/de/LC_MESSAGES/django.po     | 500 +++++++++---------
 13 files changed, 790 insertions(+), 797 deletions(-)

diff --git a/src/content/locale/de/LC_MESSAGES/django.mo b/src/content/locale/de/LC_MESSAGES/django.mo
index e1a691501fcd1b11c3a89dfb3fad0d824c07f96b..a0fbddfbb32d779e1729342ae7bf29a91c7ad542 100644
GIT binary patch
delta 1310
zcmXxkO-K}B9LMp$uKQwXYra%#?zFwBsbizHxf&IFF@nON=u#neNTCjGotB89K=c%X
zUBZI|MVAh-8+EFnu8|Q0i%01NFVW3z_5H2SKFohU&olGPGyms#W_LaHtZSh?oG`Ob
z5l)mu)NCs@VgfsG8+sT=-<icE?Gvbe=P-tsa0^~_*Jn`A6;R_8U3(tYZy{=-?Vz&6
z1--b04fqb5@FO<j7t}zjs28naGp?f&*g%fzO^p|$QzxcT_j9Om^Vo;uxDN}laP!6^
zE@*(quH&-n_!Kq33M!F`yT67U_KTD5|Hg~BfjK-&wu3l}X?%qP_!X7NKdi@wkf$|3
zoRenUf?Aq1YKeQX1#`F^&!7^$j2dVPTk$$_SkYa7fJ$%<OLb-sQCpB_aE)^wHGX)F
ziaOp#lCq-faNo5TQ7>FV4tv5$EAayL+-uZ;Z;^M{3Ti7WsF{C9O{|`aR4s{0xD%OJ
zXg(D^coLPsX;fwt$YGP5G}9ZXy}gBda1J%#b9cXlKJ7QyjXzL{H}Q5Q+KL({g-6lD
z1n;*CR5Z{P*I^p<z)e&_cW@l<VirH(LHvsu^!O5o@D!?l0ri6_qQ<@FoJVr9MQp=m
zwRyjlsqDh{$YB*uTH>GR;UCvdvVqkZpc3?ut*y>RGaVt6h*nQ!C!vqApEyJuAbJRu
zW1Cpm>new_o6yIm*&QKNw6_^mD94H2gpy<O)=sGCr>3IhG{Y`Jd!Hh-Vw$ar_FY@3
zRp}u1YybPG1jHDj;{J=OU+Z4lnrW?Qb!tT`=DWrK>gS~8*SDmiZ=_a+sSLWtC~8&p
d`?q}gbL3m3IqL_xOc0C>jr0e@<(Ki%=zkLTSq%UH

delta 988
zcmXZbKS&%w6vy$W=j!?A{1e3((ReCn;on<vqY;*15ka&PK^w6UL9nqpMT<oPNh>H;
zhg~EpX*8X7N(gEoU<g<w;B^5TOTohLPe+#d%<Q~*^Jez^-0=U^Monb=UB=WtTZ%s!
z$MG7=F^5HX=e)-X#(4$LaaCBzxE@Qe*}d;XtqV|jLN^{m#Z44gWVLi=c%h9m$Ybj?
zW%vn;aSN4b2er{ICh#k&&|~!Q43+O3>+#0TKOm2J1hr!cwqW3KeoajALJ6j6G@eBT
z&Z9QiL=}>C^Sh`*4&3}9PB1>k0jy-Q8%MAam$4JKQTb0XAAdx2w7~`H#J^EjbA!6#
zTdc$ftilA>z#i6wN|eGE*pA8*y7$A#5*x+CJhO4sC-69h^3<U6M{RTz_y&ow&;`7A
z<4M$pGpNGmkjEBjv~C5Ja1Ebs3iT<osFQy|9qc=5{S~U<f5^ciyQ8Cp`OK<-QdDKt
zs6?%(llGv#Z67w_DDv0>jpj4hg{#<xd#J*Hp$h$jiu;Rwn8P^x+e>z#Z%I@@2WmkY
zRZu?;<2wxSBc|{KlbAyvV;ocQ0rC%GAu8{Xa|{W!Nvy_MjYB$1bn5T}>Q|jbF2(lo
mHGXsBD||Wus=!>?QK5GoOZZ*BpX}`&4ALEG|L8XU)_VlpTThAr

diff --git a/src/content/locale/de/LC_MESSAGES/django.po b/src/content/locale/de/LC_MESSAGES/django.po
index f61f37f..093f781 100644
--- a/src/content/locale/de/LC_MESSAGES/django.po
+++ b/src/content/locale/de/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: kasu.content\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-01-11 22:50+0100\n"
+"POT-Creation-Date: 2018-05-08 00:17+0200\n"
 "PO-Revision-Date: 2018-01-12 15:25+0105\n"
 "Last-Translator: b'Christian Berg <kasu@xendynastie.at>'\n"
 "Language-Team: Deutsch <>\n"
@@ -20,258 +20,252 @@ msgstr ""
 "X-Generator: Poedit 1.8.9\n"
 "X-Translated-Using: django-rosetta 0.7.14\n"
 
-#: src/content/feeds.py:18
+#: .\content\feeds.py:18
 msgid "Current news from Kasu"
 msgstr "Aktuelle Nachrichten von Kasu"
 
-#: src/content/feeds.py:51
+#: .\content\feeds.py:51
 msgid "Latest comments on kasu.at"
 msgstr "Neueste Kommentare auf Kasu.at "
 
-#: src/content/feeds.py:52
+#: .\content\feeds.py:52
 msgid "Kasu - latest comments"
 msgstr "Kasu - neue Kommentare"
 
-#: src/content/forms.py:57 src/content/models.py:318
+#: .\content\forms.py:57 .\content\models.py:318
 msgid "Please upload a PDF-File to this PDF-Page."
 msgstr "Bitte eine PDF Datei für diese PDF Seite hochladen."
 
-#: src/content/models.py:76
+#: .\content\models.py:76
 msgid "Headline"
 msgstr "Schlagzeile"
 
-#: src/content/models.py:78
+#: .\content\models.py:78
 msgid "Content"
 msgstr "Inhalt"
 
-#: src/content/models.py:82 src/content/models.py:150
-#: src/content/templates/content/article_detail.html:25
+#: .\content\models.py:82 .\content\models.py:150
+#: .\content\templates\content\article_detail.html:25
 msgid "Category"
 msgstr "Kategorie"
 
-#: src/content/models.py:83 src/content/models.py:143
+#: .\content\models.py:83 .\content\models.py:143
 msgid "Image"
 msgstr "Bild"
 
-#: src/content/models.py:85 src/content/models.py:145
+#: .\content\models.py:85 .\content\models.py:145
 msgid "Slug"
 msgstr "Slug"
 
-#: src/content/models.py:88
-#: src/content/templates/content/article_detail.html:23
+#: .\content\models.py:88 .\content\templates\content\article_detail.html:23
 msgid "Author"
 msgstr "Autor"
 
-#: src/content/models.py:89
+#: .\content\models.py:89
 msgid "Status"
 msgstr "Status"
 
-#: src/content/models.py:91
+#: .\content\models.py:91
 msgid "Created"
 msgstr "Erstellt"
 
-#: src/content/models.py:92
+#: .\content\models.py:92
 msgid "Modified"
 msgstr "Bearbeitet"
 
-#: src/content/models.py:97
+#: .\content\models.py:97
 msgid "Article"
 msgstr "Artikel"
 
-#: src/content/models.py:98
+#: .\content\models.py:98
 msgid "Articles"
 msgstr "Artikel"
 
-#: src/content/models.py:139 src/content/models.py:140
+#: .\content\models.py:139 .\content\models.py:140
 msgid "Name"
 msgstr "Name"
 
-#: src/content/models.py:141 src/content/models.py:142
+#: .\content\models.py:141 .\content\models.py:142
 msgid "Description"
 msgstr "Beschreibung"
 
-#: src/content/models.py:151
+#: .\content\models.py:151
 msgid "Categories"
 msgstr "Kategorien"
 
-#: src/content/models.py:182 src/content/models.py:188
+#: .\content\models.py:182 .\content\models.py:188
 msgid "The short name for the menu-entry of this page"
 msgstr "Ein kurzer Name für den Menüeintrag"
 
-#: src/content/models.py:193 src/content/models.py:198
+#: .\content\models.py:193 .\content\models.py:198
 msgid "The page title as you'd like it to be seen by the public"
 msgstr "Der Seitentitel der öffentlich angezeigt werden soll"
 
-#: src/content/models.py:200
+#: .\content\models.py:200
 msgid "slug"
 msgstr "Slug"
 
-#: src/content/models.py:203
+#: .\content\models.py:203
 msgid ""
-"The name of the page as it will appear in URLs e.g "
-"http://domain.com/blog/[my-slug]/"
-msgstr ""
-"Wie die Seite in der URL aufscheint also http://domain.com/blog/[slug]"
+"The name of the page as it will appear in URLs e.g http://domain.com/blog/"
+"[my-slug]/"
+msgstr "Wie die Seite in der URL aufscheint also http://domain.com/blog/[slug]"
 
-#: src/content/models.py:212
+#: .\content\models.py:212
 msgid "Path"
 msgstr "Pfad"
 
-#: src/content/models.py:224
+#: .\content\models.py:224
 msgid "Position"
 msgstr "Position"
 
-#: src/content/models.py:229
+#: .\content\models.py:229
 msgid "status"
 msgstr "Status"
 
-#: src/content/models.py:232 src/content/models.py:234
-#| msgid "Description"
+#: .\content\models.py:232 .\content\models.py:234
 msgid "search description"
 msgstr "Beschreibung für Suchfunktion"
 
-#: src/content/models.py:237
-#| msgid "Content"
+#: .\content\models.py:237
 msgid "content type"
 msgstr "Inhaltstyp"
 
-#: src/content/models.py:242
+#: .\content\models.py:242
 msgid "enable comments"
 msgstr "Kommentare möglich"
 
-#: src/content/models.py:247
+#: .\content\models.py:247
 msgid "Template"
 msgstr "Vorlage"
 
-#: src/content/models.py:255
-#| msgid "created on"
+#: .\content\models.py:255
 msgid "first created at"
 msgstr "erstellt am"
 
-#: src/content/models.py:260
+#: .\content\models.py:260
 msgid "latest updated at"
 msgstr "letzte Aktualisierung am"
 
-#: src/content/models.py:331
+#: .\content\models.py:331
 msgid "Page"
 msgstr "Seite"
 
-#: src/content/models.py:332
+#: .\content\models.py:332
 msgid "Pages"
 msgstr "Seiten"
 
-#: src/content/templates/content/article_archive.html:5
-#: src/content/templates/content/article_archive.html:20
+#: .\content\templates\content\article_archive.html:5
+#: .\content\templates\content\article_archive.html:20
 msgid "Article Archive"
 msgstr "Nachrichtenarchiv"
 
-#: src/content/templates/content/article_archive.html:35
-#: src/content/templates/content/article_archive_month.html:5
-#: src/content/templates/content/article_archive_year.html:7
+#: .\content\templates\content\article_archive.html:35
+#: .\content\templates\content\article_archive_month.html:5
+#: .\content\templates\content\article_archive_year.html:7
 msgid "Archive"
 msgstr "Archiv"
 
-#: src/content/templates/content/article_archive.html:56
+#: .\content\templates\content\article_archive.html:56
 msgid "All Categories"
 msgstr "Alle Kategorien"
 
-#: src/content/templates/content/article_archive.html:71
+#: .\content\templates\content\article_archive.html:71
 msgid "created on"
 msgstr "erstellt am"
 
-#: src/content/templates/content/article_archive.html:73
+#: .\content\templates\content\article_archive.html:73
 msgid "by"
 msgstr "von"
 
-#: src/content/templates/content/article_archive.html:74
-#: src/content/templates/content/article_archive.html:75
+#: .\content\templates\content\article_archive.html:74
+#: .\content\templates\content\article_archive.html:75
 msgid "comments"
 msgstr "Kommentare"
 
-#: src/content/templates/content/article_archive.html:81
+#: .\content\templates\content\article_archive.html:81
 msgid "Read More"
 msgstr "Mehr lesen"
 
-#: src/content/templates/content/article_archive.html:86
+#: .\content\templates\content\article_archive.html:86
 msgid "We're sorry. Your search yielded no results."
 msgstr "Es tut uns leid. Deine Suche ergab keine Treffer."
 
-#: src/content/templates/content/article_archive.html:104
+#: .\content\templates\content\article_archive.html:104
 msgid "Add Article"
 msgstr "neuer Artikel "
 
-#: src/content/templates/content/article_archive_month.html:7
+#: .\content\templates\content\article_archive_month.html:7
 msgid "back"
 msgstr "Zurück"
 
-#: src/content/templates/content/article_detail.html:24
+#: .\content\templates\content\article_detail.html:24
 msgid "Created on"
 msgstr "Erstellt am"
 
-#: src/content/templates/content/article_detail.html:36
+#: .\content\templates\content\article_detail.html:36
 msgid "share on"
 msgstr "Teile auf"
 
-#: src/content/templates/content/article_detail.html:51
-#: src/content/views.py:156
+#: .\content\templates\content\article_detail.html:51 .\content\views.py:156
 msgid "Edit Article"
 msgstr "Artikel bearbeiten"
 
-#: src/content/templates/content/article_form.html:32
-#: src/content/templates/content/page_form.html:42
-#: src/content/templates/content/page_form.html:49
+#: .\content\templates\content\article_form.html:32
+#: .\content\templates\content\page_form.html:42
+#: .\content\templates\content\page_form.html:49
 msgid "German"
 msgstr "Deutsch"
 
-#: src/content/templates/content/article_form.html:33
-#: src/content/templates/content/page_form.html:43
-#: src/content/templates/content/page_form.html:57
+#: .\content\templates\content\article_form.html:33
+#: .\content\templates\content\page_form.html:43
+#: .\content\templates\content\page_form.html:57
 msgid "English"
 msgstr "Englisch"
 
-#: src/content/templates/content/article_form.html:59
-#: src/content/templates/content/page_form.html:66
+#: .\content\templates\content\article_form.html:59
+#: .\content\templates\content\page_form.html:66
 msgid "reset"
 msgstr "Zurücksetzen"
 
-#: src/content/templates/content/article_form.html:60
-#: src/content/templates/content/page_form.html:67
+#: .\content\templates\content\article_form.html:60
+#: .\content\templates\content\page_form.html:67
 msgid "save"
 msgstr "Speichern"
 
-#: src/content/templates/content/page_form.html:5
-#: src/content/templates/content/page_form.html:35
+#: .\content\templates\content\page_form.html:5
+#: .\content\templates\content\page_form.html:35
 msgid "Edit Page"
 msgstr "Seite bearbeiten"
 
-#: src/content/templates/content/page_form.html:5
-#: src/content/templates/content/page_form.html:19
-#: src/content/templates/content/page_form.html:35
+#: .\content\templates\content\page_form.html:5
+#: .\content\templates\content\page_form.html:19
+#: .\content\templates\content\page_form.html:35
 msgid "Add Page"
 msgstr "Seite hinzufügen"
 
-#: src/content/templates/content/page_form.html:18
+#: .\content\templates\content\page_form.html:18
 msgid "Edit"
 msgstr "Bearbeiten"
 
-#: src/content/templates/content/page_form.html:37
+#: .\content\templates\content\page_form.html:37
 msgid "HTML Specific"
 msgstr "HTML spezifisch"
 
-#: src/content/views.py:53
+#: .\content\views.py:53
 msgid "This Category does not exist."
 msgstr "Diese Kategorie existiert nicht."
 
-#: src/content/views.py:157
+#: .\content\views.py:157
 msgid "Create Article"
 msgstr "Artikel erstellen"
 
-#: src/content/views.py:233
+#: .\content\views.py:233
 #, python-format
 msgid "No Page found matching the Path %s"
 msgstr "Keine Seite unter dem Pfad %s gefunden"
 
-#: src/content/views.py:262
+#: .\content\views.py:262
 #, python-format
 msgid "No PDF Document found matching the Path %s"
 msgstr "Kein PDF Dokument unter dem Pfad %s gefunden."
diff --git a/src/events/locale/de/LC_MESSAGES/django.mo b/src/events/locale/de/LC_MESSAGES/django.mo
index 01454b99e7de6869c8fbecc8370aad0eec4ac7f5..24227aaad343851cb1882bb838fe569d8109c9fa 100644
GIT binary patch
delta 1524
zcmZA1O-NKx7{>889mkK!CL1lwF+Z}Vw8?SGG|Ox>YE^<2LbWK6B4`oRqLR9h&@7^i
zC@2O31FPLEERcvOa}`0G0^6BI1V#`BQc?DQW{#T<^WNV%=iYnndp`7cc&_Stsdv=O
z4*R%JCiBc9_yG&C(4RGg{H&5o0oGwYMp3UeBR^~762Ju3;~p%+vzUtm$k3L=V!Y}%
zFY`i*j)inQa5o;g_86AZ{|5QlCoW20+W7-D;2-2?xn!k;icrr5o#nWQb`37Um}__C
zd)XIy=m>J77nR6y)PQGDGwOH!NnA|(CYIwc>Vwa)1Yf%Q@0_18ME@)*(EwR#WlK;A
zRd`hPQmID`bPkosMN|UUP%qwc?G)aneGm0~g3+kjF4PitqY~VQy5EON>;x{we$?|f
zP~&<jDtd6p-MH^=q%nv7$4K%vicc4qJ;yfM7g!d}Y!tO(uaR5!9<}EmQR99?eP{;t
z;h(7IbGStLz6Gf$!*<jQ-Kd%GNA3L~)SjJk?E%zGZo76GD`=0S5}ibS=!^3^YTRF_
zapzpy&k4-s`xeMlSa#H&giu>h>x`oY=ydJfs1Nj_W_AP_(~hAMJ&h~yGU|*Bp;qPz
zYQ@G;&rL|aZ_`vXqra#O%g91Y7)H$~f<4%XO5_q&ViGm*Flq(UsDWSLAihPt-^Xki
z+D@Y0KacE!dFbiTT%n>&2XQ$*M7=nMdhr$NLle#^RH9!|@6Vu~pGA&{l@U9Mc0y-}
zJThgIbDp)@|4v$QLQ5GVRuL+iVN0f#9efA%&91Ez-ash18rP>S*iI}X))9?_ie{|R
zL}-<p)u3!8HfsO>FDvPYx=zh*y{l_!TM7MV+d$|HsH`Eh8mrZyXeCv&#3~7*n$Th1
zLTH6m>U23kXs@>sVM0ZxSqDg^HcRHJ!!uv>Cs;+W;+d`KK%IduB4Q&4eQ{rLb2Qdk
S9gDR!wKT-yBX<g>^8NuATWuEr

delta 1133
zcmXZbUucbC9Ki9%&R(-KJ2p;^e`gG(oL1+Y#>I)*m6Td&yPH2rO-fUXLOG?_#nPb^
zE-a;#NNJ^%QCw+-+JzfwP0EGh0*jU7`<>_X_I%#w|L^xa@2Rh!Uw1WI4g3ZhE&sa(
z4^nT&OVJuGrhW^T;2mtj`^Xa>Q`r9mTW}J$;%iLf4@_Yl6HHOGVsjFz3lnlQETv&n
z>?p>14`ylKi*9fP4PYpG3VFg=3j3?b9^o=NZY+8oGt_V6a(o!;FB0;1!W$Zv;WQe^
zCv?H@Xhw6fJw;<1^)_6Eo#^}uw&SkYzdw2uSI|C!ED=W0lf8llbfd~kA20XNg?^%e
z{6U_O=A50_j@ENHjveUuNi@@!=n+q$0ltm>GiYF+aV5^7<1-YlTg~y}LV2`fW9%qk
z1N9OzCv@YpMIr3K3iaQlVP@T2uqU<$&1?X@^TQObdjj2P7?~PQqvJ1N7yE}XUX1W5
zI$;XU^c{Nl@6kK^8tZj5lPvdQe*xEGFB<3|y3w)dNp#&a=(^`){UWB=Ka4KC@UftG
zQbVs`Jo*S-;CZaSLN}O3Gy8yMG>ZoM4cA};jea9}^klZ9C)SIO>sSAOL%f*LIW)p+
zNRr_un$cZ6fDh0>{$d_e{D)k)6FtEKy6{e{;XZW!4Dy686wd#J#2DtW&yS{ww2ia{
ySL0@MVh=iTH@Z=O^bi{8adiGLI({TG@i8ekwwAg|r48kBWm~aOEKTIov&lc$aa|t(

diff --git a/src/events/locale/de/LC_MESSAGES/django.po b/src/events/locale/de/LC_MESSAGES/django.po
index 5652376..e8a75a1 100644
--- a/src/events/locale/de/LC_MESSAGES/django.po
+++ b/src/events/locale/de/LC_MESSAGES/django.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: kasu.events\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-01-11 22:50+0100\n"
+"POT-Creation-Date: 2018-05-08 00:17+0200\n"
 "PO-Revision-Date: 2018-01-12 15:25+0105\n"
 "Last-Translator: b'Christian Berg <kasu@xendynastie.at>'\n"
 "Language-Team: Kasu <verein@kasu.at>\n"
@@ -19,58 +19,58 @@ msgstr ""
 "X-Generator: Poedit 1.8.9\n"
 "X-Translated-Using: django-rosetta 0.7.14\n"
 
-#: src/events/admin.py:14 src/events/models.py:82
+#: .\events\admin.py:14 .\events\models.py:82
 msgid "Event Series"
 msgstr "Veranstaltungsreihen"
 
-#: src/events/forms.py:17
+#: .\events\forms.py:17
 msgid "Images"
 msgstr "Bilder"
 
-#: src/events/forms.py:46
+#: .\events\forms.py:46
 msgid "start"
 msgstr "Beginn"
 
-#: src/events/forms.py:49
+#: .\events\forms.py:49
 msgid "end"
 msgstr "Ende"
 
-#: src/events/models.py:52 src/events/models.py:176 src/events/models.py:217
+#: .\events\models.py:52 .\events\models.py:176 .\events\models.py:217
 msgid "Name"
 msgstr "Name"
 
-#: src/events/models.py:53 src/events/models.py:177 src/events/models.py:225
+#: .\events\models.py:53 .\events\models.py:177 .\events\models.py:225
 msgid "Description"
 msgstr "Beschreibung"
 
-#: src/events/models.py:55 src/events/templates/events/event_detail.html:29
-#: src/events/templates/events/event_detail.html:87
-#: src/events/templates/events/event_list.html:28
-#: src/events/templates/events/photo_upload.html:13
+#: .\events\models.py:55 .\events\templates\events\event_detail.html:29
+#: .\events\templates\events\event_detail.html:87
+#: .\events\templates\events\event_list.html:28
+#: .\events\templates\events\photo_upload.html:13
 msgid "Start"
 msgstr "Beginn"
 
-#: src/events/models.py:56 src/events/templates/events/event_detail.html:30
-#: src/events/templates/events/event_detail.html:89
+#: .\events\models.py:56 .\events\templates\events\event_detail.html:30
+#: .\events\templates\events\event_detail.html:89
 msgid "End"
 msgstr "Ende"
 
-#: src/events/models.py:57 src/events/models.py:185
-#: src/events/templates/events/event_detail.html:34
-#: src/events/templates/events/event_detail.html:80
-#: src/events/templates/events/event_detail.html:92
+#: .\events\models.py:57 .\events\models.py:185
+#: .\events\templates\events\event_detail.html:34
+#: .\events\templates\events\event_detail.html:80
+#: .\events\templates\events\event_detail.html:92
 msgid "Homepage"
 msgstr "Homepage"
 
-#: src/events/models.py:59 src/events/models.py:179 src/events/models.py:219
+#: .\events\models.py:59 .\events\models.py:179 .\events\models.py:219
 msgid "Image"
 msgstr "Bild"
 
-#: src/events/models.py:66
+#: .\events\models.py:66
 msgid "Mahjong Tournament"
 msgstr "Mahjong Turnier"
 
-#: src/events/models.py:68
+#: .\events\models.py:68
 msgid ""
 "This event is a tournament, different rules apply for         the kyu "
 "ranking."
@@ -78,11 +78,11 @@ msgstr ""
 "Diese Veranstaltung ist ein Turnier, es gelten andere Regeln für das Kyu "
 "Ranking."
 
-#: src/events/models.py:72
+#: .\events\models.py:72
 msgid "Mahjong Season"
 msgstr "Mahjong Saison"
 
-#: src/events/models.py:83
+#: .\events\models.py:83
 msgid ""
 "Wenn dieser Event zu einer Veranstaltungsreihe gehört         werden Ort, "
 "Beschreibung, Bild und Homepage von dem hier angegebenen         Event "
@@ -91,245 +91,245 @@ msgstr ""
 "Wenn dieser Termin zu einer Veranstaltungsreihe gehört werden Ort, "
 "Beschreibung, Bild und Homepage von dem hier angegebenen Event übernommen."
 
-#: src/events/models.py:92 src/events/models.py:195 src/events/models.py:248
+#: .\events\models.py:92 .\events\models.py:195 .\events\models.py:248
 msgid "first created at"
 msgstr "erstellt am"
 
-#: src/events/models.py:97 src/events/models.py:200 src/events/models.py:253
+#: .\events\models.py:97 .\events\models.py:200 .\events\models.py:253
 msgid "latest updated at"
 msgstr "letzte Aktualisierung am"
 
-#: src/events/models.py:103
+#: .\events\models.py:103
 msgid "Event"
 msgstr "Termin"
 
-#: src/events/models.py:104
+#: .\events\models.py:104
 msgid "Events"
 msgstr "Termine"
 
-#: src/events/models.py:117
+#: .\events\models.py:117
 msgid "A event can't end before it had started"
 msgstr "Eine Veranstaltung kann nicht enden bevor sie begonnen hat"
 
-#: src/events/models.py:186
+#: .\events\models.py:186
 msgid "Postal Code"
 msgstr "Postleitzahl"
 
-#: src/events/models.py:187
+#: .\events\models.py:187
 msgid "Street Address"
 msgstr "Straße"
 
-#: src/events/models.py:188
+#: .\events\models.py:188
 msgid "Locality"
 msgstr "Ort"
 
-#: src/events/models.py:189
+#: .\events\models.py:189
 msgid "Country"
 msgstr "Land"
 
-#: src/events/models.py:204
+#: .\events\models.py:204
 msgid "Venue"
 msgstr "Veranstaltungsort"
 
-#: src/events/models.py:205
+#: .\events\models.py:205
 msgid "Venues"
 msgstr "Veranstaltungsorte"
 
-#: src/events/models.py:232
+#: .\events\models.py:232
 msgid "Startpage"
 msgstr "Startseite"
 
-#: src/events/models.py:235
+#: .\events\models.py:235
 msgid "Display this Photo on the Startpage Teaser"
 msgstr "Foto als Teaser auf der Startseite verwenden."
 
-#: src/events/models.py:237
+#: .\events\models.py:237
 msgid "Published on"
 msgstr "Veröffentlicht am"
 
-#: src/events/models.py:239
+#: .\events\models.py:239
 msgid "Number of views"
 msgstr "Wie oft gesehen"
 
-#: src/events/models.py:263 src/events/templates/events/event_archive.html:38
-#: src/events/templates/events/event_list.html:18
+#: .\events\models.py:263 .\events\templates\events\event_archive.html:38
+#: .\events\templates\events\event_list.html:18
 msgid "Event Image"
 msgstr "Veranstaltungsbild"
 
-#: src/events/models.py:264
+#: .\events\models.py:264
 msgid "Event Images"
 msgstr "Veranstaltungsbilder"
 
-#: src/events/templates/events/event_archive.html:5
-#: src/events/templates/events/event_archive.html:9
+#: .\events\templates\events\event_archive.html:5
+#: .\events\templates\events\event_archive.html:9
 msgid "Event Archive"
 msgstr "Veranstaltungsarchiv"
 
-#: src/events/templates/events/event_archive.html:42
-#: src/events/templates/events/event_detail.html:85
-#: src/events/templates/events/event_list.html:22
-#: src/events/templates/events/photo_detail.html:53
+#: .\events\templates\events\event_archive.html:42
+#: .\events\templates\events\event_detail.html:85
+#: .\events\templates\events\event_list.html:22
+#: .\events\templates\events\photo_detail.html:53
 msgid "Date"
 msgstr "Datum"
 
-#: src/events/templates/events/event_archive.html:47
+#: .\events\templates\events\event_archive.html:47
 msgid "Time"
 msgstr "Zeit"
 
-#: src/events/templates/events/event_archive.html:49
-#: src/events/templates/events/photo_upload.html:16
+#: .\events\templates\events\event_archive.html:49
+#: .\events\templates\events\photo_upload.html:16
 msgid "from"
 msgstr "von"
 
-#: src/events/templates/events/event_archive.html:49
-#: src/events/templates/events/photo_upload.html:16
+#: .\events\templates\events\event_archive.html:49
+#: .\events\templates\events\photo_upload.html:16
 msgid "to"
 msgstr "bis"
 
-#: src/events/templates/events/event_archive.html:57
-#: src/events/templates/events/event_detail.html:31
-#: src/events/templates/events/event_detail.html:72
-#: src/events/templates/events/event_list.html:32
-#: src/events/templates/events/photo_upload.html:23
+#: .\events\templates\events\event_archive.html:57
+#: .\events\templates\events\event_detail.html:31
+#: .\events\templates\events\event_detail.html:72
+#: .\events\templates\events\event_list.html:32
+#: .\events\templates\events\photo_upload.html:23
 msgid "Location"
 msgstr "Ort"
 
-#: src/events/templates/events/event_archive.html:58
-#: src/events/templates/events/event_list.html:35
-#: src/events/templates/events/photo_upload.html:25
-#: src/events/templates/events/photo_upload.html:26
+#: .\events\templates\events\event_archive.html:58
+#: .\events\templates\events\event_list.html:35
+#: .\events\templates\events\photo_upload.html:25
+#: .\events\templates\events\photo_upload.html:26
 msgid "Comments"
 msgstr "Kommentare"
 
-#: src/events/templates/events/event_archive.html:59
-#: src/events/templates/events/event_detail.html:36
-#: src/events/templates/events/event_detail.html:48
-#: src/events/templates/events/photo_list.html:4
-#: src/events/templates/events/photo_upload.html:28
-#: src/events/templates/events/photo_upload.html:29
+#: .\events\templates\events\event_archive.html:59
+#: .\events\templates\events\event_detail.html:36
+#: .\events\templates\events\event_detail.html:48
+#: .\events\templates\events\photo_list.html:4
+#: .\events\templates\events\photo_upload.html:28
+#: .\events\templates\events\photo_upload.html:29
 msgid "Photos"
 msgstr "Fotos"
 
-#: src/events/templates/events/event_archive.html:60
-#: src/events/templates/events/event_archive.html:61
-#: src/events/templates/events/event_detail.html:35
-#: src/events/templates/events/event_detail.html:51
+#: .\events\templates\events\event_archive.html:60
+#: .\events\templates\events\event_archive.html:61
+#: .\events\templates\events\event_detail.html:35
+#: .\events\templates\events\event_detail.html:51
 msgid "Hanchans"
 msgstr "Hanchans"
 
-#: src/events/templates/events/event_detail.html:37
+#: .\events\templates\events\event_detail.html:37
 msgid "tourney"
 msgstr "Turnier"
 
-#: src/events/templates/events/event_detail.html:37
+#: .\events\templates\events\event_detail.html:37
 msgid "other rules apply here"
 msgstr "hier gelten andere Regeln"
 
-#: src/events/templates/events/event_detail.html:45
+#: .\events\templates\events\event_detail.html:45
 msgid "Info"
 msgstr "Info"
 
-#: src/events/templates/events/event_detail.html:54
+#: .\events\templates\events\event_detail.html:54
 msgid "Mai-Star Games"
 msgstr "Mai-Star Spiele"
 
-#: src/events/templates/events/event_detail.html:57
+#: .\events\templates\events\event_detail.html:57
 msgid "Event Ranking"
 msgstr "Veranstaltungs Wertung"
 
-#: src/events/templates/events/event_detail.html:100
+#: .\events\templates\events\event_detail.html:100
 msgid "Share on Facebook"
 msgstr "Auf Facebook teilen"
 
-#: src/events/templates/events/event_detail.html:104
+#: .\events\templates\events\event_detail.html:104
 msgid "Share on Google+"
 msgstr "Auf Google+ teilen"
 
-#: src/events/templates/events/event_detail.html:109
+#: .\events\templates\events\event_detail.html:109
 msgid "Share on Twitter"
 msgstr "Auf Twitter teilen"
 
-#: src/events/templates/events/event_detail.html:113
+#: .\events\templates\events\event_detail.html:113
 msgid "Show on Google Maps"
 msgstr "Auf Google Maps zeigen"
 
-#: src/events/templates/events/event_detail.html:127
-#: src/events/templates/events/event_form.html:9 src/events/views.py:62
+#: .\events\templates\events\event_detail.html:127
+#: .\events\templates\events\event_form.html:9 .\events\views.py:62
 msgid "Edit Event"
 msgstr "Termin bearbeiten"
 
-#: src/events/templates/events/event_detail.html:131
+#: .\events\templates\events\event_detail.html:131
 msgid "Add Dates"
 msgstr "Termine hinzufügen"
 
-#: src/events/templates/events/event_form.html:9
-#: src/events/templates/events/page.html:9 src/events/views.py:64
+#: .\events\templates\events\event_form.html:9
+#: .\events\templates\events\page.html:9 .\events\views.py:64
 msgid "Add Event"
 msgstr "Neuer Termin"
 
-#: src/events/templates/events/event_form.html:18
-#: src/events/templates/events/photo_list.html:35
+#: .\events\templates\events\event_form.html:18
+#: .\events\templates\events\photo_list.html:35
 msgid "reset"
 msgstr "Zurücksetzen"
 
-#: src/events/templates/events/event_form.html:19
-#: src/events/templates/events/eventseries_form.html:25
+#: .\events\templates\events\event_form.html:19
+#: .\events\templates\events\eventseries_form.html:25
 msgid "save"
 msgstr "Speichern"
 
-#: src/events/templates/events/event_list.html:4
-#: src/events/templates/events/event_list.html:5
+#: .\events\templates\events\event_list.html:4
+#: .\events\templates\events\event_list.html:5
 msgid "Upcoming Events"
 msgstr "Bevorstehende Veranstaltungen"
 
-#: src/events/templates/events/eventseries_form.html:24
+#: .\events\templates\events\eventseries_form.html:24
 msgid "back"
 msgstr "Zurück"
 
-#: src/events/templates/events/photo_confirm_delete.html:17
+#: .\events\templates\events\photo_confirm_delete.html:17
 msgid "Cancel"
 msgstr "Abbrechen"
 
-#: src/events/templates/events/photo_confirm_delete.html:21
-#: src/events/templates/events/photo_list.html:21
+#: .\events\templates\events\photo_confirm_delete.html:21
+#: .\events\templates\events\photo_list.html:21
 msgid "Delete"
 msgstr "Löschen"
 
-#: src/events/templates/events/photo_detail.html:44
+#: .\events\templates\events\photo_detail.html:44
 msgid "previous"
 msgstr "Zurück"
 
-#: src/events/templates/events/photo_detail.html:52
+#: .\events\templates\events\photo_detail.html:52
 msgid "Photographer"
 msgstr "Fotograf"
 
-#: src/events/templates/events/photo_detail.html:58
+#: .\events\templates\events\photo_detail.html:58
 msgid "share on"
 msgstr "Teile auf"
 
-#: src/events/templates/events/photo_detail.html:81
+#: .\events\templates\events\photo_detail.html:81
 msgid "download"
 msgstr "Herunterladen"
 
-#: src/events/templates/events/photo_detail.html:82
+#: .\events\templates\events\photo_detail.html:82
 msgid "Rotate counter clockwise"
 msgstr "mit dem Uhrzeiger drehen"
 
-#: src/events/templates/events/photo_detail.html:83
+#: .\events\templates\events\photo_detail.html:83
 msgid "Rotate clockwise"
 msgstr "gegen den Uhrzeiger drehen"
 
-#: src/events/templates/events/photo_detail.html:84
+#: .\events\templates\events\photo_detail.html:84
 msgid "Save"
 msgstr "Speichern"
 
-#: src/events/templates/events/photo_list.html:36
-#: src/events/templates/events/photo_upload.html:35
-#: src/events/templates/events/photo_upload.html:49
+#: .\events\templates\events\photo_list.html:36
+#: .\events\templates\events\photo_upload.html:35
+#: .\events\templates\events\photo_upload.html:49
 msgid "Upload"
 msgstr "Hochladen"
 
-#: src/events/views.py:149
+#: .\events\views.py:150
 msgid "Event does not exist"
 msgstr "Veranstaltung gibt es nicht"
 
diff --git a/src/kasu/locale/de/LC_MESSAGES/django.mo b/src/kasu/locale/de/LC_MESSAGES/django.mo
index 13501c0d1669b2dcc7c224e325ca6f4be78d1f11..c6d7576145a21c5a043a036b8a5c261c47d1e7b4 100644
GIT binary patch
delta 1018
zcmXxjJ4{ny6u|LAA5hx*fZ_v-6;$wn)nbBH6HR38$lw4AG2&=+GbT1c69y+kd?hAM
z>TU<)>V^y^Cc4p}0|PpcV2nEX|J&;c=l<^f?svb(`O1Ux%3!nIpLrNWl^i1Pbwymj
z?<p?CS~_AAzhD7BW;(Vp%ku{2a1*!TZ!BUDFMDwSd$5AtIED^g?X)+e#?3w&>gYhz
ziL>ZHSJ4k|B4fv`r2P)Mp!-StW6bmX3@_rVq<tM-z&9MgEp(n7gZ4%<qK}&$G?eia
zjw5|yCUFj3;59sh3uynh=mM6}2|l4aTSdQL!#-R`EAtB}Vsz8l1>~{9{88fO4P`%#
zZJsxHTf$}Pw;NZ{0e_%7{FAh2d2mNVxDzMPfv1q6qJd60jeHW9aS-Q{_qVZWhr8Tt
z$3=92N9csl(Ia?)?)Y``{vEoo6>Q*Fbb^zV!|&^8#V(=kvq+bi$6a^>r*N@A{XNt7
zG*F%Rfc^+S<2l^I{a9rcE}((#Yz8g$6?DRR?8ob9B^J;PEFpjKl*?g!i4;1Hk<Od<
z{9Tc&b)Zr5e^?PGGaTIT91Y7}CJ&G<_y}pZSi{X6C7pZ^X;jD)<Z;sfw!P$djf*=m
z4v}m)4w9b#FzI>uBeIN^d~9hVT^eyO9-QHRjgb!juG!XT=1EuUXSSHiPgZO7;actd
P#MxFcS4g*J3zMn84d+dY

delta 1228
zcmZA0J4{ni9LMoPTPU`mfDc}x7gTJuwS@4n3?{zNpvJ|Rm=H|SYbC9{k(7vWsFRPd
zh_Q)@xH&lJVh5vfW7Ie~I4ChpjwU!6qkez42SPmQxu4try*=muKj-v)`+R3<sU=i4
zv_ATF`a+E{M|B_MLW_lr`GIkaVn=P&UgTr?xzyu9Y{bLZfM;<7j$;_FU>z1PfHT#2
z$;@)oLEtuOpeNR6sDWPMW_*jy_z_$18*0E6BscR5_5NQ}q76J$ybUARg@-U^<5>)w
zk}-L1w(y{cO5i>!^M|+z7chk{kg?4d>oO|w?>K}(%GCQKs07APm7nLLiYHLN&!7s)
zVk7gLo7`x%@1hcz!yWhtU$Y$*T;h9<th5qil(P*dPy^1OD!gUmcTfdA#U^}(8g~&H
z%6vf0_X$g?^fNc@xNKkeZC?mc#zx}x*ov*V6;r4Lj-v)1M<wE-wjhUEiCO#n9_syh
zJcZ9u^Ztyo{u<y90WD>iU+X~+l7mU0CLG2icm}nn50F(iW%Lg%ruqH`yKn`SKr<&&
z6?dbyAdZ?ZfjUEjT7NCkNdl_i0`gmP5qD!A*#W=pv1&p!O|ZUch1BBoq<?4sG2HK?
zYX#KySMlf5`SbsJ-8QJKRN-EFn~kXg9T>Gvx++w1JLw1L+9D;Lpljb(n^sP%sjW@X
zRj8`h%J$M7da{R$T8vJy{sGf>H66lTbS<3@OkL$`@Nv!HRKdA1RlMqqW-hsto|iMH
zz3gi2gy&`R?)u0%-YvS*mFu-lfyh9zf7t0uj|`+MbKz+4*y6iMcY19gCsVlQ<}bSi
TQ;k;#`#)+2Tnksqk)gmpvv_-;

diff --git a/src/kasu/locale/de/LC_MESSAGES/django.po b/src/kasu/locale/de/LC_MESSAGES/django.po
index 9f2c8dd..feffee8 100644
--- a/src/kasu/locale/de/LC_MESSAGES/django.po
+++ b/src/kasu/locale/de/LC_MESSAGES/django.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: kasu.utils\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-01-11 22:50+0100\n"
+"POT-Creation-Date: 2018-05-08 00:17+0200\n"
 "PO-Revision-Date: 2016-09-28 00:24+0200\n"
 "Last-Translator: Christian Berg <xeniac.at@gmail.com>\n"
 "Language-Team: Kasu <verein@kasu.at>\n"
@@ -19,175 +19,163 @@ msgstr ""
 "X-Generator: Poedit 1.8.9\n"
 "X-Translated-Using: django-rosetta 0.7.6\n"
 
-#: src/kasu/settings.py:158
+#: .\kasu\settings.py:141
 msgid "German"
 msgstr "Deutsch"
 
-#: src/kasu/settings.py:158
+#: .\kasu\settings.py:141
 msgid "English"
 msgstr "Englisch"
 
-#: src/kasu/templates/404.html:8
+#: .\kasu\templates\404.html:8
 msgid "The page your requested does not exist on this server."
 msgstr "Die angeforderte Seite existiert auf diesem Server nicht."
 
-#: src/kasu/templates/base.html:22
+#: .\kasu\templates\base.html:22
 msgid "Current News"
 msgstr "Aktuelle Neuigkeiten"
 
-#: src/kasu/templates/base.html:24 src/kasu/templates/index.html:40
+#: .\kasu\templates\base.html:24 .\kasu\templates\index.html:40
 msgid "Recent Comments"
 msgstr "Kürzliche Kommentare"
 
-#: src/kasu/templates/base.html:45
+#: .\kasu\templates\base.html:45
 msgid "Menu"
 msgstr "Menü"
 
-#: src/kasu/templates/base.html:69
+#: .\kasu\templates\base.html:69
 msgid "Current Event"
 msgstr "Aktuelle Veranstaltung"
 
-#: src/kasu/templates/base.html:72
+#: .\kasu\templates\base.html:72
 msgid "Since"
 msgstr "seit"
 
-#: src/kasu/templates/base.html:73 src/kasu/templates/base.html:85
+#: .\kasu\templates\base.html:73 .\kasu\templates\base.html:87
 msgid "Start"
 msgstr "Beginn"
 
-#: src/kasu/templates/base.html:76 src/kasu/templates/base.html:88
+#: .\kasu\templates\base.html:76 .\kasu\templates\base.html:90
 msgid "Location"
 msgstr "Ort"
 
-#: src/kasu/templates/base.html:79 src/kasu/templates/base.html:90
+#: .\kasu\templates\base.html:81 .\kasu\templates\base.html:94
 msgid "More Details"
 msgstr "Mehr Details"
 
-#: src/kasu/templates/base.html:81
+#: .\kasu\templates\base.html:83
 msgid "Next Event"
 msgstr "Nächste Veranstaltung"
 
-#: src/kasu/templates/base.html:84
+#: .\kasu\templates\base.html:86
 msgid "in"
 msgstr "in"
 
-#: src/kasu/templates/base.html:93
+#: .\kasu\templates\base.html:97
 msgid "Upcoming events"
 msgstr "Bevorstehende Veranstaltungen"
 
-#: src/kasu/templates/base.html:143
+#: .\kasu\templates\base.html:147
 msgid "Add Subpage"
 msgstr "Unterseite Hinzufügen"
 
-#: src/kasu/templates/base.html:148
+#: .\kasu\templates\base.html:152
 msgid "Edit Page"
 msgstr "Seite bearbeiten"
 
-#: src/kasu/templates/base.html:156
+#: .\kasu\templates\base.html:160
 msgid "Imprint"
 msgstr "Impressum"
 
-#: src/kasu/templates/base.html:157
+#: .\kasu\templates\base.html:161
 msgid "contact"
 msgstr "Kontakt"
 
-#: src/kasu/templates/base.html:162
+#: .\kasu\templates\base.html:166
 msgid "Language"
 msgstr "Sprache"
 
-#: src/kasu/templates/base.html:171
+#: .\kasu\templates\base.html:175
 msgid "Go"
 msgstr "Los"
 
-#: src/kasu/templates/base.html:176
+#: .\kasu\templates\base.html:180
 msgid "Logged in as"
 msgstr "Angemeldet als"
 
-#: src/kasu/templates/base.html:178
+#: .\kasu\templates\base.html:182
 msgid "Admin"
 msgstr "Admin"
 
-#: src/kasu/templates/base.html:179
+#: .\kasu\templates\base.html:183
 msgid "Logout"
 msgstr "Abmelden"
 
-#: src/kasu/templates/base.html:181
+#: .\kasu\templates\base.html:185
 msgid "no user logged in"
 msgstr "Niemand angemeldet"
 
-#: src/kasu/templates/base.html:182 src/kasu/templates/comments/form.html:43
+#: .\kasu\templates\base.html:186 .\kasu\templates\comments\form.html:43
 msgid "register"
 msgstr "Registrieren"
 
-#: src/kasu/templates/base.html:183 src/kasu/templates/comments/form.html:44
+#: .\kasu\templates\base.html:187 .\kasu\templates\comments\form.html:44
 msgid "login"
 msgstr "anmelden"
 
-#: src/kasu/templates/base.html:185
-msgid "Login with Facebook"
-msgstr "über Facebook anmelden"
-
-#: src/kasu/templates/base.html:187
-msgid "Login with Twitter"
-msgstr "über Twitter anmelden"
-
-#: src/kasu/templates/base.html:189
-msgid "Login with Google"
-msgstr "über Google anmelden"
-
-#: src/kasu/templates/comments/form.html:5
+#: .\kasu\templates\comments\form.html:5
 msgid "New Comment"
 msgstr "Neuer Kommentar"
 
-#: src/kasu/templates/comments/form.html:20
+#: .\kasu\templates\comments\form.html:20
 msgid "now"
 msgstr "Jetzt"
 
-#: src/kasu/templates/comments/form.html:25
+#: .\kasu\templates\comments\form.html:25
 msgid "Preview"
 msgstr "Vorschau"
 
-#: src/kasu/templates/comments/form.html:26
+#: .\kasu\templates\comments\form.html:26
 msgid "Post"
 msgstr "Schreiben"
 
-#: src/kasu/templates/comments/form.html:34
+#: .\kasu\templates\comments\form.html:34
 msgid "not logged in"
 msgstr "Nicht angemeldet"
 
-#: src/kasu/templates/comments/form.html:38
+#: .\kasu\templates\comments\form.html:38
 msgid "Register now, or Login to leave a comment here."
 msgstr "Jetzt registrieren, oder anmelden um einen Kommentar zu schreiben."
 
-#: src/kasu/templates/comments/list.html:2 src/kasu/templates/index.html:25
+#: .\kasu\templates\comments\list.html:2 .\kasu\templates\index.html:25
 msgid "Comments"
 msgstr "Kommentare"
 
-#: src/kasu/templates/comments/posted.html:4
-#: src/kasu/templates/comments/posted.html:7
+#: .\kasu\templates\comments\posted.html:4
+#: .\kasu\templates\comments\posted.html:7
 msgid "Thank you for your comment"
 msgstr "Danke für deinen Kommentar."
 
-#: src/kasu/templates/comments/preview.html:4
-#: src/kasu/templates/comments/preview.html:6
+#: .\kasu\templates\comments\preview.html:4
+#: .\kasu\templates\comments\preview.html:6
 msgid "Preview your comment"
 msgstr "Vorschau deines Kommentars"
 
-#: src/kasu/templates/comments/preview.html:10
+#: .\kasu\templates\comments\preview.html:10
 msgid "Please correct the error below"
 msgid_plural "Please correct the errors below"
 msgstr[0] "Bitte den Fehler weiter unten beheben"
 msgstr[1] "Bitte die Fehler weiter unten beheben"
 
-#: src/kasu/templates/index.html:4
+#: .\kasu\templates\index.html:4
 msgid "traditional Asian game culture"
 msgstr "traditionelle asiatische Spielkultur"
 
-#: src/kasu/templates/index.html:33
+#: .\kasu\templates\index.html:33
 msgid "Read More"
 msgstr "Mehr lesen"
 
-#: src/kasu/templates/index.html:47
+#: .\kasu\templates\index.html:47
 #, python-format
 msgid ""
 "\n"
@@ -204,26 +192,35 @@ msgstr ""
 "                <time datetime=\"%(submit_date)s\">%(since)s</time>\n"
 "                "
 
-#: src/kasu/templates/index.html:59
+#: .\kasu\templates\index.html:59
 msgid "Kasu in the social network"
 msgstr "Kasu im sozialem Netzwerk"
 
-#: src/kasu/templates/index.html:62 src/kasu/templates/index.html:65
+#: .\kasu\templates\index.html:62 .\kasu\templates\index.html:65
 msgid "Visit us on"
 msgstr "Besuche uns auf"
 
-#: src/kasu/templates/index.html:74
+#: .\kasu\templates\index.html:74
 msgid "Add Article"
 msgstr "Artikel hinzufügen"
 
-#: src/kasu/templates/paginator.html:8
+#: .\kasu\templates\paginator.html:8
 msgid "Previous"
 msgstr "Vorherige"
 
-#: src/kasu/templates/paginator.html:20
+#: .\kasu\templates\paginator.html:20
 msgid "Next"
 msgstr "Nächste"
 
+#~ msgid "Login with Facebook"
+#~ msgstr "über Facebook anmelden"
+
+#~ msgid "Login with Twitter"
+#~ msgstr "über Twitter anmelden"
+
+#~ msgid "Login with Google"
+#~ msgstr "über Google anmelden"
+
 #~ msgid "United Kingdom"
 #~ msgstr "Vereinigtes Königreich"
 
diff --git a/src/mahjong_ranking/locale/de/LC_MESSAGES/django.mo b/src/mahjong_ranking/locale/de/LC_MESSAGES/django.mo
index 588ddda9244b5f14b1d4e16fd15f970e1a17e852..7fb95f499d66dccdf70a2cb2cc38b369cc8128fd 100644
GIT binary patch
delta 1776
zcmY+^OGs2v9LMo9z8xR=?ERQ5%d*Kkldmk(Y)msq%d$;WVz(L+D`$#Y#E^>ukq}%Y
zWGz}mizrAUf}kXW(smIojW%Jn%ZMnV?{7RVI{3ezbB=e;<A2V~i=y|%g9S0y81pWP
z2jzH*F`KXxYw!lH#<!S(GsvI$$s-m2+I9*JwX>{+=%u{^v#<m;MJ4L<+b|m&QcW!W
z;(j{xfg_lSr%)e^Vj}ioGG0S1WB|)>7}ww%T!G&(0ljH<L8$i%kw4SOV=eBpM$%%&
ztfym`jy!ych4>z|plQ@XW-$j7(v8W*eAEt#QT^qp_Zo2lwxf33g?!YUMrHOq7U3P#
zykjvc^;D)&JKxBx+G!QiWol6aHlb2?7&YKg>nZCw>t!SfrVlk<KWZU2QJEV-jej3C
zUhE+iP4LA2<26>$p0sTbpHgO0aS1L(4OosEXsd14Swpse59;Vzaoj^jFhF}TY1)Y`
zNG4)tfJ#0ck5DUmg<AOpY9}92nV3SxFw@A|%nwxRbq-ocE-EvNQ2jpC`vF{xwWy7B
zpymr>67!oYR2a+jp(Y;05Z=ZO_!-w?CTY@+0;q*mpdV{d6Q4nyY1BG`#k9v!3;K$S
z@Hc7$`E=$mzgejYmhsRE>ro48N3FCI7vcrv&kXR;5!^;)<}U8Q2dD+i;AYI{rf$au
z)PylqrutEt8N`?-9HF8eJwgrm)H-IJw0=OnH-*a77t}&#ZTlDM2vZnTX5msSu<bJ3
zM!OQVklsA<Pj<~EI#%L!)CBiX13W~f{0VAd&usrIRLUoiyJhN#N<tS)N2W>iHB&Z9
z2xUW;T18*)V7#UW`ELX=X0{Tm2&Ga#CR*5h(PDJg<pi6ImwKKB#GZI-?uSOZRZ&(-
z<F&b8P~D&T60#Nj!fJlAn+OmsL^GkH-Bl3|p-ZE$p6)^|p}SB`Y$TLM-ERE~`Un-0
z5-(eLDtqgQ1Y#GVqO(_7PIRcEls6E%EPDx+VnS!Ei?fMP;o`=RLG@)s6QPT$qx-)M
zO(cEyhQcRLy1i~smpk-4IWYP&`A<T2#I$vHUUqvUzV2`&`Z#@|Cs^Tks(p@A6R0Y6
zf{x>DYxN&+FNP!GvpxP$XVk6n1)V^(-<f|e=!`adD?EwSn**a)GnRQW4)sJCu<LZ#
eJu!4E^Wf<3%#Oq?(|#`OcDucr#vMAA^XVU(RGYH^

delta 1348
zcmXZbPe@cz6vy#9{+Usynbb;6sYX*I{4>tj7+9G_w2+EG(-u)mOkj>wV^Tsm_Gcq5
z5~f;|RM;XT5@~SZLW3YMuog*e5;GElKw3yhNznJFS03;4?s<34J?CEEY{~1Q!Obzl
z-%N_`>z3nt#<lnt3o(>xj2m0fiRaLT7wkA{$34~?n8Evg^x$3862qw9KSM8$rkdE=
z#7P1h2u!1X@ClRgJ93#H+|qFgRmckZF_~;Tu^P8w3npPVs=#Zgd3~6MV_1w6)_EuW
zml8;3b~cvb7OX>c(1a@JEM{USW??U?gFzdAjG8xw8*vKN@dwnxv#6b&!y-&4Sc>H_
z9_o2$LhZmkRL8@pjz>@lUm-=CH^^n)SwC98SQk+{w1li>{-6qRkW6tWDt|UAUo4LY
zEwIDB@MDN^$c{TuJ98Pg;%!vINA~?wJAQ5*webY%2q*BZ!<b17Fup|<2XP$PiI`d8
zVH1IT+E+!DsGSILQwN8T-<k$g2TiD>X+<4L2dbm%NVDdqjSpZR;~`W7<EV9}Q4P$Y
zhxN@j9+dbOa+y_bhcS%<-G#@n7_Xu_8bTHJ1S@a^weV-unSQmp_y;Lr>_-)P5_9o9
zs)1g`_5JnR2@g<}zCd!ADOANXn1c(bL@THc(l|Hmj0fv57gazrR$?#i!<VQ9f1-Bk
zH>%-PjA=m^S=CWKDq)ee+*)I;M-|q9ntuvaNGodR!l)yRT6-{`ai1MO#J!A%QH9KB
zngeT}(ISEE1eQ^Wv-!r9C?B=ug{Z<xY}}99@|vvp8Rv5Rw5uxpNOvUSJKokAP7JvI
zC3$>D+q<rq6Op!_aI`CNKO@KC2~-3EzF@F6R8>|Lh)=i+GKd6yflzI*Ix+7KIa2mi
q26iWMJOz&Ues80@`C=pzj;`mt<84XyuH_7y#!KyCUc{HP7XAaq{fz+t

diff --git a/src/mahjong_ranking/locale/de/LC_MESSAGES/django.po b/src/mahjong_ranking/locale/de/LC_MESSAGES/django.po
index ee79ef1..ba8ca05 100644
--- a/src/mahjong_ranking/locale/de/LC_MESSAGES/django.po
+++ b/src/mahjong_ranking/locale/de/LC_MESSAGES/django.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: kasu.mahjong_ranking\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-01-11 22:50+0100\n"
-"PO-Revision-Date: 2018-01-12 15:23+0105\n"
+"POT-Creation-Date: 2018-05-08 00:17+0200\n"
+"PO-Revision-Date: 2018-05-08 00:20+0105\n"
 "Last-Translator: b'Christian Berg <kasu@xendynastie.at>'\n"
 "Language-Team: Kasu <verein@kasu.at>\n"
 "Language: de\n"
@@ -17,387 +17,390 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "X-Generator: Poedit 1.8.9\n"
-"X-Translated-Using: django-rosetta 0.7.14\n"
+"X-Translated-Using: django-rosetta 0.8.1\n"
 
-#: src/mahjong_ranking/admin.py:24
+#: .\mahjong_ranking\admin.py:24
 msgid "Recalculate"
 msgstr "Neuberechnen"
 
-#: src/mahjong_ranking/admin.py:34
+#: .\mahjong_ranking\admin.py:34
 msgid "Confirm"
 msgstr "Bestätigen"
 
-#: src/mahjong_ranking/admin.py:44
+#: .\mahjong_ranking\admin.py:44
 msgid "Set unconfirmed"
 msgstr "Als unbestätigt markieren"
 
-#: src/mahjong_ranking/forms.py:22
+#: .\mahjong_ranking\forms.py:22
 msgid "start"
 msgstr "Beginn"
 
-#: src/mahjong_ranking/models.py:91
-#: src/mahjong_ranking/templates/mahjong_ranking/player_dan_score.html:14
-#: src/mahjong_ranking/templates/mahjong_ranking/player_invalid_score.html:13
-#: src/mahjong_ranking/templates/mahjong_ranking/player_kyu_score.html:15
-#: src/mahjong_ranking/templates/mahjong_ranking/player_ladder_score.html:15
-#: src/mahjong_ranking/templates/mahjong_ranking/seasonranking_list.html:10
+#: .\mahjong_ranking\models.py:91
+#: .\mahjong_ranking\templates\mahjong_ranking\player_dan_score.html:14
+#: .\mahjong_ranking\templates\mahjong_ranking\player_invalid_score.html:13
+#: .\mahjong_ranking\templates\mahjong_ranking\player_kyu_score.html:15
+#: .\mahjong_ranking\templates\mahjong_ranking\player_ladder_score.html:15
+#: .\mahjong_ranking\templates\mahjong_ranking\seasonranking_list.html:10
 msgid "Start"
 msgstr "Beginn"
 
-#: src/mahjong_ranking/models.py:92
+#: .\mahjong_ranking\models.py:92
 msgid "This is crucial to get the right Hanchans that scores"
 msgstr "Wichtig damit die richtigen Hanchans in die Wertung kommen."
 
-#: src/mahjong_ranking/models.py:99
+#: .\mahjong_ranking\models.py:99
 msgid "Player 1"
 msgstr "Spieler 1"
 
-#: src/mahjong_ranking/models.py:100 src/mahjong_ranking/models.py:102
-#: src/mahjong_ranking/models.py:119 src/mahjong_ranking/models.py:121
-#: src/mahjong_ranking/models.py:138 src/mahjong_ranking/models.py:140
-#: src/mahjong_ranking/models.py:157 src/mahjong_ranking/models.py:159
-#: src/mahjong_ranking/templates/mahjong_ranking/eventhanchan_list.html:19
-#: src/mahjong_ranking/templates/mahjong_ranking/eventranking_list.html:21
-#: src/mahjong_ranking/templates/mahjong_ranking/hanchan_confirm_delete.html:16
-#: src/mahjong_ranking/templates/mahjong_ranking/hanchan_form.html:19
-#: src/mahjong_ranking/templates/mahjong_ranking/kyudanranking_list.html:35
-#: src/mahjong_ranking/templates/mahjong_ranking/seasonranking_list.html:32
+#: .\mahjong_ranking\models.py:100 .\mahjong_ranking\models.py:102
+#: .\mahjong_ranking\models.py:119 .\mahjong_ranking\models.py:121
+#: .\mahjong_ranking\models.py:138 .\mahjong_ranking\models.py:140
+#: .\mahjong_ranking\models.py:157 .\mahjong_ranking\models.py:159
+#: .\mahjong_ranking\templates\mahjong_ranking\eventhanchan_list.html:19
+#: .\mahjong_ranking\templates\mahjong_ranking\eventranking_list.html:21
+#: .\mahjong_ranking\templates\mahjong_ranking\hanchan_confirm_delete.html:16
+#: .\mahjong_ranking\templates\mahjong_ranking\hanchan_form.html:19
+#: .\mahjong_ranking\templates\mahjong_ranking\kyudanranking_list.html:30
+#: .\mahjong_ranking\templates\mahjong_ranking\seasonranking_list.html:31
 msgid "Score"
 msgstr "Punkte"
 
-#: src/mahjong_ranking/models.py:112 src/mahjong_ranking/models.py:131
-#: src/mahjong_ranking/models.py:150 src/mahjong_ranking/models.py:169
-#: src/mahjong_ranking/models.py:171
-#: src/mahjong_ranking/templates/mahjong_ranking/hanchan_form.html:20
-#: src/mahjong_ranking/templates/mahjong_ranking/player_dan_score.html:18
-#: src/mahjong_ranking/templates/mahjong_ranking/player_invalid_score.html:17
+#: .\mahjong_ranking\models.py:112 .\mahjong_ranking\models.py:131
+#: .\mahjong_ranking\models.py:150 .\mahjong_ranking\models.py:169
+#: .\mahjong_ranking\models.py:171
+#: .\mahjong_ranking\templates\mahjong_ranking\hanchan_form.html:20
+#: .\mahjong_ranking\templates\mahjong_ranking\player_dan_score.html:18
+#: .\mahjong_ranking\templates\mahjong_ranking\player_invalid_score.html:17
 msgid "Comment"
 msgstr "Kommentar"
 
-#: src/mahjong_ranking/models.py:118
+#: .\mahjong_ranking\models.py:118
 msgid "Player 2"
 msgstr "Spieler 2"
 
-#: src/mahjong_ranking/models.py:137
+#: .\mahjong_ranking\models.py:137
 msgid "Player 3"
 msgstr "Spieler 3"
 
-#: src/mahjong_ranking/models.py:156
+#: .\mahjong_ranking\models.py:156
 msgid "Player 4"
 msgstr "Spieler 4"
 
-#: src/mahjong_ranking/models.py:173
+#: .\mahjong_ranking\models.py:173
 msgid "Has been Confirmed"
 msgstr "Wurde bestätigt"
 
-#: src/mahjong_ranking/models.py:174
+#: .\mahjong_ranking\models.py:174
 msgid "Only valid and confirmed Hanchans will be counted in the rating."
 msgstr "Nur gültige und bestätigte Hanchans kommen in die Wertung."
 
-#: src/mahjong_ranking/models.py:179 src/mahjong_ranking/models.py:607
-#: src/mahjong_ranking/templates/mahjong_ranking/ladder_redbox.html:29
-#: src/mahjong_ranking/templates/mahjong_ranking/player_ladder_score.html:63
+#: .\mahjong_ranking\models.py:179 .\mahjong_ranking\models.py:607
+#: .\mahjong_ranking\templates\mahjong_ranking\ladder_redbox.html:29
+#: .\mahjong_ranking\templates\mahjong_ranking\player_ladder_score.html:63
 msgid "Season"
 msgstr "Saison"
 
-#: src/mahjong_ranking/models.py:184
+#: .\mahjong_ranking\models.py:184
 msgid "Hanchan"
 msgstr "Hanchan"
 
-#: src/mahjong_ranking/models.py:185
-#: src/mahjong_ranking/templates/mahjong_ranking/eventranking_list.html:17
+#: .\mahjong_ranking\models.py:185
+#: .\mahjong_ranking\templates\mahjong_ranking\eventranking_list.html:17
 msgid "Hanchans"
 msgstr "Hanchans"
 
-#: src/mahjong_ranking/models.py:188
+#: .\mahjong_ranking\models.py:188
 msgid "Hanchan from {0:%Y-%m-%d} at {0:%H:%M} with {1}"
 msgstr "Hanchan vom {0:%Y-%m-%d} um {0:%H:%M} mit {1}"
 
-#: src/mahjong_ranking/models.py:215
+#: .\mahjong_ranking\models.py:215
 #, python-format
 msgid "%s can't attend the same game multiple times"
 msgstr "%s kann an einem Spiel nicht mehrfach teilnehmen."
 
-#: src/mahjong_ranking/models.py:223
+#: .\mahjong_ranking\models.py:223
 msgid "Games in the future may not be added, Dr. Brown"
 msgstr "Spiele aus der Zukunft dürfen noch nicht erfasst werden. Dr. Brown."
 
-#: src/mahjong_ranking/models.py:225
+#: .\mahjong_ranking\models.py:225
 msgid "Only games during the event are allowed"
 msgstr "Nur Spiele während der Veranstaltung zählen."
 
-#: src/mahjong_ranking/models.py:228
+#: .\mahjong_ranking\models.py:228
 msgid "Gamescore is lower then 100.000 Pt."
 msgstr "Spielstand ist weniger als 100.000 Punkte"
 
-#: src/mahjong_ranking/models.py:230
+#: .\mahjong_ranking\models.py:230
 msgid "Gamescore is over 100.000 Pt."
 msgstr "Spielstand ist über 100.000 Punkte."
 
-#: src/mahjong_ranking/models.py:362
+#: .\mahjong_ranking\models.py:362
 msgid "Kyū/Dan Ranking"
 msgstr "Kyū/Dan Wertung"
 
-#: src/mahjong_ranking/models.py:363
+#: .\mahjong_ranking\models.py:363
 msgid "Kyū/Dan Rankings"
 msgstr "Kyū/Dan Wertungen"
 
-#: src/mahjong_ranking/templates/mahjong_ranking/eventhanchan_form.html:11
-#: src/mahjong_ranking/templates/mahjong_ranking/eventhanchan_list.html:55
-#| msgid "Edit Hanchan"
+#: .\mahjong_ranking\templates\mahjong_ranking\eventhanchan_form.html:11
+#: .\mahjong_ranking\templates\mahjong_ranking\eventhanchan_list.html:55
 msgid "Edit Hanchans"
 msgstr "Hanchans bearbeiten"
 
-#: src/mahjong_ranking/templates/mahjong_ranking/eventhanchan_form.html:82
-#: src/mahjong_ranking/templates/mahjong_ranking/eventhanchan_list.html:56
-#: src/mahjong_ranking/templates/mahjong_ranking/eventranking_list.html:52
-#: src/mahjong_ranking/templates/mahjong_ranking/hanchan_form.html:4
-#: src/mahjong_ranking/templates/mahjong_ranking/hanchan_form.html:14
-msgid "Add Hanchan"
-msgstr "Hanchan hinzufügen"
-
-#: src/mahjong_ranking/templates/mahjong_ranking/eventhanchan_form.html:84
-#: src/mahjong_ranking/templates/mahjong_ranking/eventhanchan_list.html:37
-#: src/mahjong_ranking/templates/mahjong_ranking/hanchan_confirm_delete.html:4
-#: src/mahjong_ranking/templates/mahjong_ranking/hanchan_confirm_delete.html:33
-#: src/mahjong_ranking/templates/mahjong_ranking/player_dan_score.html:44
-#: src/mahjong_ranking/templates/mahjong_ranking/player_invalid_score.html:33
-#: src/mahjong_ranking/templates/mahjong_ranking/player_kyu_score.html:41
-#: src/mahjong_ranking/templates/mahjong_ranking/player_ladder_score.html:52
-msgid "Delete Hanchan"
-msgstr "Hanchan löschen"
-
-#: src/mahjong_ranking/templates/mahjong_ranking/eventhanchan_form.html:94
-#: src/mahjong_ranking/templates/mahjong_ranking/hanchan_form.html:71
-msgid "back"
-msgstr "Zurück"
-
-#: src/mahjong_ranking/templates/mahjong_ranking/eventhanchan_form.html:95
-#: src/mahjong_ranking/templates/mahjong_ranking/hanchan_form.html:72
-msgid "save"
-msgstr "Speichern"
-
-#: src/mahjong_ranking/templates/mahjong_ranking/eventhanchan_list.html:7
-msgid "Played Hanchans"
-msgstr "Gespielte Hanchans"
-
-#: src/mahjong_ranking/templates/mahjong_ranking/eventhanchan_list.html:18
-#: src/mahjong_ranking/templates/mahjong_ranking/hanchan_confirm_delete.html:15
-msgid "Place"
-msgstr "Platz"
-
-#: src/mahjong_ranking/templates/mahjong_ranking/eventhanchan_list.html:21
-#: src/mahjong_ranking/templates/mahjong_ranking/hanchan_confirm_delete.html:18
-#: src/mahjong_ranking/templates/mahjong_ranking/player_dan_score.html:17
-msgid "Dan Points"
-msgstr "Dan Punkte"
-
-#: src/mahjong_ranking/templates/mahjong_ranking/eventhanchan_list.html:23
-#: src/mahjong_ranking/templates/mahjong_ranking/hanchan_confirm_delete.html:20
-#: src/mahjong_ranking/templates/mahjong_ranking/player_invalid_score.html:16
-#: src/mahjong_ranking/templates/mahjong_ranking/player_kyu_score.html:18
-msgid "Kyu Points"
-msgstr "Kyu Punkte"
-
-#: src/mahjong_ranking/templates/mahjong_ranking/eventhanchan_list.html:43
-#: src/mahjong_ranking/templates/mahjong_ranking/hanchan_form.html:4
-#: src/mahjong_ranking/templates/mahjong_ranking/hanchan_form.html:14
-#: src/mahjong_ranking/templates/mahjong_ranking/player_dan_score.html:47
-#: src/mahjong_ranking/templates/mahjong_ranking/player_invalid_score.html:36
-#: src/mahjong_ranking/templates/mahjong_ranking/player_kyu_score.html:44
-#: src/mahjong_ranking/templates/mahjong_ranking/player_ladder_score.html:55
-msgid "Edit Hanchan"
-msgstr "Hanchan bearbeiten"
-
-#: src/mahjong_ranking/templates/mahjong_ranking/eventhanchan_list.html:48
-msgid "No Hanchan has been added to this event yet."
-msgstr "Für diese Veranstaltung wurde noch keine Hanchan eingetragen."
-
-#: src/mahjong_ranking/templates/mahjong_ranking/eventhanchan_list.html:54
-#: src/mahjong_ranking/templates/mahjong_ranking/eventranking_list.html:51
-msgid "Edit Event"
-msgstr "Veranstaltung bearbeiten"
-
-#: src/mahjong_ranking/templates/mahjong_ranking/eventranking_list.html:4
-#: src/mahjong_ranking/templates/mahjong_ranking/eventranking_list.html:5
-msgid "Tournament Ranking"
-msgstr "Turnierwertung"
-
-#: src/mahjong_ranking/templates/mahjong_ranking/eventranking_list.html:12
-#: src/mahjong_ranking/templates/mahjong_ranking/kyudanranking_list.html:30
-#: src/mahjong_ranking/templates/mahjong_ranking/seasonranking_list.html:23
-msgid "Rank"
-msgstr "Rang"
-
-#: src/mahjong_ranking/templates/mahjong_ranking/eventranking_list.html:13
-#: src/mahjong_ranking/templates/mahjong_ranking/kyudanranking_list.html:17
-#: src/mahjong_ranking/templates/mahjong_ranking/seasonranking_list.html:24
-msgid "Avatar"
-msgstr "Avatar"
-
-#: src/mahjong_ranking/templates/mahjong_ranking/eventranking_list.html:14
-#: src/mahjong_ranking/templates/mahjong_ranking/kyudanranking_list.html:20
-#: src/mahjong_ranking/templates/mahjong_ranking/seasonranking_list.html:25
-msgid "Nickname"
-msgstr "Spitzname"
-
-#: src/mahjong_ranking/templates/mahjong_ranking/eventranking_list.html:15
-#: src/mahjong_ranking/templates/mahjong_ranking/seasonranking_list.html:26
-msgid "Name"
-msgstr "Name"
-
-#: src/mahjong_ranking/templates/mahjong_ranking/eventranking_list.html:16
-#: src/mahjong_ranking/templates/mahjong_ranking/seasonranking_list.html:27
-msgid "Average"
-msgstr "Durchschnitt"
-
-#: src/mahjong_ranking/templates/mahjong_ranking/eventranking_list.html:20
-#: src/mahjong_ranking/templates/mahjong_ranking/player_dan_score.html:15
-#: src/mahjong_ranking/templates/mahjong_ranking/player_invalid_score.html:15
-#: src/mahjong_ranking/templates/mahjong_ranking/player_kyu_score.html:16
-#: src/mahjong_ranking/templates/mahjong_ranking/player_ladder_score.html:16
-#: src/mahjong_ranking/templates/mahjong_ranking/seasonranking_list.html:31
-msgid "Placement"
-msgstr "Platzierung"
-
-#: src/mahjong_ranking/templates/mahjong_ranking/eventranking_list.html:22
-#: src/mahjong_ranking/templates/mahjong_ranking/seasonranking_list.html:33
-msgid "count"
-msgstr "Anzahl"
-
-#: src/mahjong_ranking/templates/mahjong_ranking/eventranking_list.html:23
-#: src/mahjong_ranking/templates/mahjong_ranking/seasonranking_list.html:34
-msgid "good"
-msgstr "gut"
-
-#: src/mahjong_ranking/templates/mahjong_ranking/eventranking_list.html:24
-#: src/mahjong_ranking/templates/mahjong_ranking/seasonranking_list.html:35
-msgid "won"
-msgstr "gewonnen"
-
-#: src/mahjong_ranking/templates/mahjong_ranking/hanchan_confirm_delete.html:39
-msgid "Cancel"
-msgstr "Abbruch"
-
-#: src/mahjong_ranking/templates/mahjong_ranking/hanchan_confirm_delete.html:40
-msgid "Delete"
-msgstr "Löschen"
-
-#: src/mahjong_ranking/templates/mahjong_ranking/hanchan_form.html:18
-msgid "Player"
-msgstr "Spieler"
-
-#: src/mahjong_ranking/templates/mahjong_ranking/hanchan_form.html:58
+#: .\mahjong_ranking\templates\mahjong_ranking\eventhanchan_form.html:49
+#: .\mahjong_ranking\templates\mahjong_ranking\hanchan_form.html:58
 msgid "Total"
 msgstr "Total"
 
-#: src/mahjong_ranking/templates/mahjong_ranking/kyudanranking_list.html:4
-#: src/mahjong_ranking/templates/mahjong_ranking/kyudanranking_list.html:9
-msgid "Player List"
-msgstr "Spieler Liste"
+#: .\mahjong_ranking\templates\mahjong_ranking\eventhanchan_form.html:51
+msgid "Difference"
+msgstr "Unterschied"
 
-#: src/mahjong_ranking/templates/mahjong_ranking/kyudanranking_list.html:25
-msgid "Full Name"
-msgstr "Voller Name"
+#: .\mahjong_ranking\templates\mahjong_ranking\eventhanchan_form.html:103
+#: .\mahjong_ranking\templates\mahjong_ranking\eventhanchan_list.html:56
+#: .\mahjong_ranking\templates\mahjong_ranking\eventranking_list.html:52
+#: .\mahjong_ranking\templates\mahjong_ranking\hanchan_form.html:4
+#: .\mahjong_ranking\templates\mahjong_ranking\hanchan_form.html:14
+msgid "Add Hanchan"
+msgstr "Hanchan hinzufügen"
 
-#: src/mahjong_ranking/templates/mahjong_ranking/kyudanranking_list.html:40
+#: .\mahjong_ranking\templates\mahjong_ranking\eventhanchan_form.html:105
+#: .\mahjong_ranking\templates\mahjong_ranking\eventhanchan_list.html:37
+#: .\mahjong_ranking\templates\mahjong_ranking\hanchan_confirm_delete.html:4
+#: .\mahjong_ranking\templates\mahjong_ranking\hanchan_confirm_delete.html:33
+#: .\mahjong_ranking\templates\mahjong_ranking\player_dan_score.html:44
+#: .\mahjong_ranking\templates\mahjong_ranking\player_invalid_score.html:33
+#: .\mahjong_ranking\templates\mahjong_ranking\player_kyu_score.html:41
+#: .\mahjong_ranking\templates\mahjong_ranking\player_ladder_score.html:52
+msgid "Delete Hanchan"
+msgstr "Hanchan löschen"
+
+#: .\mahjong_ranking\templates\mahjong_ranking\eventhanchan_form.html:118
+#: .\mahjong_ranking\templates\mahjong_ranking\hanchan_form.html:71
+msgid "back"
+msgstr "Zurück"
+
+#: .\mahjong_ranking\templates\mahjong_ranking\eventhanchan_form.html:119
+#: .\mahjong_ranking\templates\mahjong_ranking\hanchan_form.html:72
+msgid "save"
+msgstr "Speichern"
+
+#: .\mahjong_ranking\templates\mahjong_ranking\eventhanchan_list.html:7
+msgid "Played Hanchans"
+msgstr "Gespielte Hanchans"
+
+#: .\mahjong_ranking\templates\mahjong_ranking\eventhanchan_list.html:18
+#: .\mahjong_ranking\templates\mahjong_ranking\hanchan_confirm_delete.html:15
+msgid "Place"
+msgstr "Platz"
+
+#: .\mahjong_ranking\templates\mahjong_ranking\eventhanchan_list.html:21
+#: .\mahjong_ranking\templates\mahjong_ranking\hanchan_confirm_delete.html:18
+#: .\mahjong_ranking\templates\mahjong_ranking\player_dan_score.html:17
+msgid "Dan Points"
+msgstr "Dan Punkte"
+
+#: .\mahjong_ranking\templates\mahjong_ranking\eventhanchan_list.html:23
+#: .\mahjong_ranking\templates\mahjong_ranking\hanchan_confirm_delete.html:20
+#: .\mahjong_ranking\templates\mahjong_ranking\player_invalid_score.html:16
+#: .\mahjong_ranking\templates\mahjong_ranking\player_kyu_score.html:18
+msgid "Kyu Points"
+msgstr "Kyu Punkte"
+
+#: .\mahjong_ranking\templates\mahjong_ranking\eventhanchan_list.html:43
+#: .\mahjong_ranking\templates\mahjong_ranking\hanchan_form.html:4
+#: .\mahjong_ranking\templates\mahjong_ranking\hanchan_form.html:14
+#: .\mahjong_ranking\templates\mahjong_ranking\player_dan_score.html:47
+#: .\mahjong_ranking\templates\mahjong_ranking\player_invalid_score.html:36
+#: .\mahjong_ranking\templates\mahjong_ranking\player_kyu_score.html:44
+#: .\mahjong_ranking\templates\mahjong_ranking\player_ladder_score.html:55
+msgid "Edit Hanchan"
+msgstr "Hanchan bearbeiten"
+
+#: .\mahjong_ranking\templates\mahjong_ranking\eventhanchan_list.html:48
+msgid "No Hanchan has been added to this event yet."
+msgstr "Für diese Veranstaltung wurde noch keine Hanchan eingetragen."
+
+#: .\mahjong_ranking\templates\mahjong_ranking\eventhanchan_list.html:54
+#: .\mahjong_ranking\templates\mahjong_ranking\eventranking_list.html:51
+msgid "Edit Event"
+msgstr "Veranstaltung bearbeiten"
+
+#: .\mahjong_ranking\templates\mahjong_ranking\eventranking_list.html:4
+#: .\mahjong_ranking\templates\mahjong_ranking\eventranking_list.html:5
+msgid "Tournament Ranking"
+msgstr "Turnierwertung"
+
+#: .\mahjong_ranking\templates\mahjong_ranking\eventranking_list.html:12
+#: .\mahjong_ranking\templates\mahjong_ranking\kyudanranking_list.html:25
+#: .\mahjong_ranking\templates\mahjong_ranking\seasonranking_list.html:23
+msgid "Rank"
+msgstr "Rang"
+
+#: .\mahjong_ranking\templates\mahjong_ranking\eventranking_list.html:13
+#: .\mahjong_ranking\templates\mahjong_ranking\kyudanranking_list.html:17
+#: .\mahjong_ranking\templates\mahjong_ranking\seasonranking_list.html:24
+msgid "Avatar"
+msgstr "Avatar"
+
+#: .\mahjong_ranking\templates\mahjong_ranking\eventranking_list.html:14
+#: .\mahjong_ranking\templates\mahjong_ranking\kyudanranking_list.html:20
+#: .\mahjong_ranking\templates\mahjong_ranking\seasonranking_list.html:25
+msgid "Nickname"
+msgstr "Spitzname"
+
+#: .\mahjong_ranking\templates\mahjong_ranking\eventranking_list.html:15
+msgid "Name"
+msgstr "Name"
+
+#: .\mahjong_ranking\templates\mahjong_ranking\eventranking_list.html:16
+#: .\mahjong_ranking\templates\mahjong_ranking\seasonranking_list.html:26
+msgid "Average"
+msgstr "Durchschnitt"
+
+#: .\mahjong_ranking\templates\mahjong_ranking\eventranking_list.html:20
+#: .\mahjong_ranking\templates\mahjong_ranking\player_dan_score.html:15
+#: .\mahjong_ranking\templates\mahjong_ranking\player_invalid_score.html:15
+#: .\mahjong_ranking\templates\mahjong_ranking\player_kyu_score.html:16
+#: .\mahjong_ranking\templates\mahjong_ranking\player_ladder_score.html:16
+#: .\mahjong_ranking\templates\mahjong_ranking\seasonranking_list.html:30
+msgid "Placement"
+msgstr "Platzierung"
+
+#: .\mahjong_ranking\templates\mahjong_ranking\eventranking_list.html:22
+#: .\mahjong_ranking\templates\mahjong_ranking\seasonranking_list.html:32
+msgid "count"
+msgstr "Anzahl"
+
+#: .\mahjong_ranking\templates\mahjong_ranking\eventranking_list.html:23
+#: .\mahjong_ranking\templates\mahjong_ranking\seasonranking_list.html:33
+msgid "good"
+msgstr "gut"
+
+#: .\mahjong_ranking\templates\mahjong_ranking\eventranking_list.html:24
+#: .\mahjong_ranking\templates\mahjong_ranking\seasonranking_list.html:34
+msgid "won"
+msgstr "gewonnen"
+
+#: .\mahjong_ranking\templates\mahjong_ranking\hanchan_confirm_delete.html:39
+msgid "Cancel"
+msgstr "Abbruch"
+
+#: .\mahjong_ranking\templates\mahjong_ranking\hanchan_confirm_delete.html:40
+msgid "Delete"
+msgstr "Löschen"
+
+#: .\mahjong_ranking\templates\mahjong_ranking\hanchan_form.html:18
+msgid "Player"
+msgstr "Spieler"
+
+#: .\mahjong_ranking\templates\mahjong_ranking\kyudanranking_list.html:4
+#: .\mahjong_ranking\templates\mahjong_ranking\kyudanranking_list.html:9
+#| msgid "Player List"
+msgid "Players list"
+msgstr "Spielerliste"
+
+#: .\mahjong_ranking\templates\mahjong_ranking\kyudanranking_list.html:35
 msgid "Games Total"
 msgstr "Spiele total"
 
-#: src/mahjong_ranking/templates/mahjong_ranking/ladder_redbox.html:3
+#: .\mahjong_ranking\templates\mahjong_ranking\ladder_redbox.html:3
 msgid "Latest Hanchans"
 msgstr "Letzten Hanchans"
 
-#: src/mahjong_ranking/templates/mahjong_ranking/ladder_redbox.html:15
+#: .\mahjong_ranking\templates\mahjong_ranking\ladder_redbox.html:15
 msgid "Latest Events"
 msgstr "Letzte Veranstaltungen"
 
-#: src/mahjong_ranking/templates/mahjong_ranking/ladder_redbox.html:27
+#: .\mahjong_ranking\templates\mahjong_ranking\ladder_redbox.html:27
 msgid "Ladder Archive"
 msgstr "Ladder Archiv"
 
-#: src/mahjong_ranking/templates/mahjong_ranking/player_dan_score.html:4
-#: src/mahjong_ranking/templates/mahjong_ranking/player_dan_score.html:5
+#: .\mahjong_ranking\templates\mahjong_ranking\player_dan_score.html:4
+#: .\mahjong_ranking\templates\mahjong_ranking\player_dan_score.html:5
 msgid "Dan Score for"
 msgstr "Dan Wertung für"
 
-#: src/mahjong_ranking/templates/mahjong_ranking/player_dan_score.html:8
+#: .\mahjong_ranking\templates\mahjong_ranking\player_dan_score.html:8
 msgid "Hanchans that apply to the Dan Score"
 msgstr "Hanchans welche zur Dan Wertung zählen"
 
-#: src/mahjong_ranking/templates/mahjong_ranking/player_dan_score.html:12
-#: src/mahjong_ranking/templates/mahjong_ranking/player_kyu_score.html:13
-#: src/mahjong_ranking/templates/mahjong_ranking/player_ladder_score.html:13
+#: .\mahjong_ranking\templates\mahjong_ranking\player_dan_score.html:12
+#: .\mahjong_ranking\templates\mahjong_ranking\player_kyu_score.html:13
+#: .\mahjong_ranking\templates\mahjong_ranking\player_ladder_score.html:13
 msgid "Date"
 msgstr "Datum"
 
-#: src/mahjong_ranking/templates/mahjong_ranking/player_dan_score.html:13
-#: src/mahjong_ranking/templates/mahjong_ranking/player_invalid_score.html:12
-#: src/mahjong_ranking/templates/mahjong_ranking/player_kyu_score.html:14
-#: src/mahjong_ranking/templates/mahjong_ranking/player_ladder_score.html:14
+#: .\mahjong_ranking\templates\mahjong_ranking\player_dan_score.html:13
+#: .\mahjong_ranking\templates\mahjong_ranking\player_invalid_score.html:12
+#: .\mahjong_ranking\templates\mahjong_ranking\player_kyu_score.html:14
+#: .\mahjong_ranking\templates\mahjong_ranking\player_ladder_score.html:14
 msgid "Event"
 msgstr "Veranstaltung"
 
-#: src/mahjong_ranking/templates/mahjong_ranking/player_dan_score.html:16
-#: src/mahjong_ranking/templates/mahjong_ranking/player_invalid_score.html:14
-#: src/mahjong_ranking/templates/mahjong_ranking/player_kyu_score.html:17
-#: src/mahjong_ranking/templates/mahjong_ranking/player_ladder_score.html:17
+#: .\mahjong_ranking\templates\mahjong_ranking\player_dan_score.html:16
+#: .\mahjong_ranking\templates\mahjong_ranking\player_invalid_score.html:14
+#: .\mahjong_ranking\templates\mahjong_ranking\player_kyu_score.html:17
+#: .\mahjong_ranking\templates\mahjong_ranking\player_ladder_score.html:17
 msgid "Players"
 msgstr "Spieler"
 
-#: src/mahjong_ranking/templates/mahjong_ranking/player_invalid_score.html:4
-#: src/mahjong_ranking/templates/mahjong_ranking/player_invalid_score.html:6
+#: .\mahjong_ranking\templates\mahjong_ranking\player_invalid_score.html:4
+#: .\mahjong_ranking\templates\mahjong_ranking\player_invalid_score.html:6
 msgid "Unconfirmed Hanchans from"
 msgstr "Nicht bestätigte Hanchans von"
 
-#: src/mahjong_ranking/templates/mahjong_ranking/player_invalid_score.html:9
+#: .\mahjong_ranking\templates\mahjong_ranking\player_invalid_score.html:9
 msgid "Invalid hanchans with"
 msgstr "Ungültige Hanchans mit"
 
-#: src/mahjong_ranking/templates/mahjong_ranking/player_kyu_score.html:4
-#: src/mahjong_ranking/templates/mahjong_ranking/player_kyu_score.html:6
+#: .\mahjong_ranking\templates\mahjong_ranking\player_kyu_score.html:4
+#: .\mahjong_ranking\templates\mahjong_ranking\player_kyu_score.html:6
 msgid "Kyu Score for"
 msgstr "Kyu Wertung für"
 
-#: src/mahjong_ranking/templates/mahjong_ranking/player_kyu_score.html:9
+#: .\mahjong_ranking\templates\mahjong_ranking\player_kyu_score.html:9
 msgid "Hanchans that apply to the Kyu Score"
 msgstr "Hanchans welche zur Kyu Wertung zählen"
 
-#: src/mahjong_ranking/templates/mahjong_ranking/player_ladder_score.html:4
-#: src/mahjong_ranking/templates/mahjong_ranking/player_ladder_score.html:5
+#: .\mahjong_ranking\templates\mahjong_ranking\player_ladder_score.html:4
+#: .\mahjong_ranking\templates\mahjong_ranking\player_ladder_score.html:5
 msgid "Ladder Score for"
 msgstr "Ladder Wertung für"
 
-#: src/mahjong_ranking/templates/mahjong_ranking/player_ladder_score.html:8
+#: .\mahjong_ranking\templates\mahjong_ranking\player_ladder_score.html:8
 msgid "Hanchans that apply to the Ladder Score"
 msgstr "Hanchans welche in der Ladder zählen"
 
-#: src/mahjong_ranking/templates/mahjong_ranking/player_ladder_score.html:71
+#: .\mahjong_ranking\templates\mahjong_ranking\player_ladder_score.html:71
 msgid "Go"
 msgstr "Los"
 
-#: src/mahjong_ranking/templates/mahjong_ranking/seasonranking_list.html:11
+#: .\mahjong_ranking\templates\mahjong_ranking\seasonranking_list.html:11
 msgid "End"
 msgstr "Ende"
 
-#: src/mahjong_ranking/templates/mahjong_ranking/seasonranking_list.html:12
+#: .\mahjong_ranking\templates\mahjong_ranking\seasonranking_list.html:12
 msgid "Participants"
 msgstr "Teilnehmer"
 
-#: src/mahjong_ranking/views.py:104
+#: .\mahjong_ranking\views.py:104
 #, python-format
 msgid "%s has been updated successfully."
 msgstr "%s wurde erfolgreich aktualisiert."
 
-#: src/mahjong_ranking/views.py:107
+#: .\mahjong_ranking\views.py:107
 #, python-format
 msgid "%s has been added successfully. You can now add a new one."
 msgstr "%s wurde erfolgreich hinzugefügt. Du kannst eine neue eintragen."
 
-#: src/mahjong_ranking/views.py:207
+#: .\mahjong_ranking\views.py:207
 msgid "No user found matching the name {}"
 msgstr "Kein Benutzer mit dem Namen %s gefunden"
 
+#~ msgid "Full Name"
+#~ msgstr "Voller Name"
+
 #~ msgid "Event does not exist"
 #~ msgstr "Veranstaltung existiert nicht"
 
diff --git a/src/maistar_ranking/locale/de/LC_MESSAGES/django.mo b/src/maistar_ranking/locale/de/LC_MESSAGES/django.mo
index 9b38dec7c24ab05805e9a13585abc49524f5d4da..c9540a3c167c2975cbc66d0712e3c7ff67d6b79d 100644
GIT binary patch
delta 23
ecmeB|?3diIke$m^*T6!-z`)ATeDiAdCoBL`Oa|-#

delta 23
ecmeB|?3diIke$m!*T`JKz|zXZa`S5TCoBL`y$1RK

diff --git a/src/maistar_ranking/locale/de/LC_MESSAGES/django.po b/src/maistar_ranking/locale/de/LC_MESSAGES/django.po
index 67ae8c4..5a51d2a 100644
--- a/src/maistar_ranking/locale/de/LC_MESSAGES/django.po
+++ b/src/maistar_ranking/locale/de/LC_MESSAGES/django.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: kasu.mahjong_ranking\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-01-11 22:50+0100\n"
+"POT-Creation-Date: 2018-05-08 00:17+0200\n"
 "PO-Revision-Date: 2016-09-28 00:24+0200\n"
 "Last-Translator: Christian Berg <xeniac.at@gmail.com>\n"
 "Language-Team: Kasu <verein@kasu.at>\n"
@@ -19,208 +19,208 @@ msgstr ""
 "X-Generator: Poedit 1.8.9\n"
 "X-Translated-Using: django-rosetta 0.7.2\n"
 
-#: src/maistar_ranking/admin.py:24
+#: .\maistar_ranking\admin.py:24
 msgid "Recalculate"
 msgstr "Neuberechnen"
 
-#: src/maistar_ranking/forms.py:35
+#: .\maistar_ranking\forms.py:35
 #, python-format
 msgid "%s may only participate once."
 msgstr "%s darf nur einmal teilnehmen."
 
-#: src/maistar_ranking/models.py:21
+#: .\maistar_ranking\models.py:21
 msgid "Comment"
 msgstr "Kommentar"
 
-#: src/maistar_ranking/models.py:24
+#: .\maistar_ranking\models.py:24
 msgid "Player 1"
 msgstr "Spieler 1"
 
-#: src/maistar_ranking/models.py:26 src/maistar_ranking/models.py:33
-#: src/maistar_ranking/models.py:40 src/maistar_ranking/models.py:47
-#: src/maistar_ranking/models.py:54 src/maistar_ranking/models.py:61
-#: src/maistar_ranking/templates/maistar_ranking/ranking_list.html:19
+#: .\maistar_ranking\models.py:26 .\maistar_ranking\models.py:33
+#: .\maistar_ranking\models.py:40 .\maistar_ranking\models.py:47
+#: .\maistar_ranking\models.py:54 .\maistar_ranking\models.py:61
+#: .\maistar_ranking\templates\maistar_ranking\ranking_list.html:19
 msgid "Score"
 msgstr "Punkte"
 
-#: src/maistar_ranking/models.py:31
+#: .\maistar_ranking\models.py:31
 msgid "Player 2"
 msgstr "Spieler 2"
 
-#: src/maistar_ranking/models.py:38
+#: .\maistar_ranking\models.py:38
 msgid "Player 3"
 msgstr "Spieler 3"
 
-#: src/maistar_ranking/models.py:45
+#: .\maistar_ranking\models.py:45
 msgid "Player 4"
 msgstr "Spieler 4"
 
-#: src/maistar_ranking/models.py:52
+#: .\maistar_ranking\models.py:52
 msgid "Player 5"
 msgstr "Spieler 5"
 
-#: src/maistar_ranking/models.py:59
+#: .\maistar_ranking\models.py:59
 msgid "Player 6"
 msgstr "Spieler 6"
 
-#: src/maistar_ranking/models.py:65
+#: .\maistar_ranking\models.py:65
 msgid "Has been confirmed"
 msgstr "Wurde bestätigt"
 
-#: src/maistar_ranking/models.py:67
+#: .\maistar_ranking\models.py:67
 msgid "the game only counts whe it has been confirmed"
 msgstr "das Spiel zählt nur wenn es bestätigt wurde"
 
-#: src/maistar_ranking/models.py:70 src/maistar_ranking/models.py:153
-#: src/maistar_ranking/templates/maistar_ranking/player_game_list.html:6
-#: src/maistar_ranking/templates/maistar_ranking/ranking_list.html:4
-#: src/maistar_ranking/templates/maistar_ranking/ranking_list.html:72
+#: .\maistar_ranking\models.py:70 .\maistar_ranking\models.py:153
+#: .\maistar_ranking\templates\maistar_ranking\player_game_list.html:6
+#: .\maistar_ranking\templates\maistar_ranking\ranking_list.html:4
+#: .\maistar_ranking\templates\maistar_ranking\ranking_list.html:72
 msgid "Season"
 msgstr "Saison"
 
-#: src/maistar_ranking/models.py:80
+#: .\maistar_ranking\models.py:80
 msgid "Mai-Star Game with {0} from {1:%Y-%m-%d}"
 msgstr "Mai-Star Spiel mit {0} vom {1:%Y-%m-%d}"
 
-#: src/maistar_ranking/templates/maistar_ranking/game_form.html:5
-#: src/maistar_ranking/templates/maistar_ranking/game_form.html:16
-#: src/maistar_ranking/templates/maistar_ranking/game_list.html:27
-#: src/maistar_ranking/templates/maistar_ranking/player_game_list.html:44
+#: .\maistar_ranking\templates\maistar_ranking\game_form.html:5
+#: .\maistar_ranking\templates\maistar_ranking\game_form.html:16
+#: .\maistar_ranking\templates\maistar_ranking\game_list.html:27
+#: .\maistar_ranking\templates\maistar_ranking\player_game_list.html:44
 msgid "Edit Game"
 msgstr "Spiel bearbeiten"
 
-#: src/maistar_ranking/templates/maistar_ranking/game_form.html:5
-#: src/maistar_ranking/templates/maistar_ranking/game_form.html:16
-#: src/maistar_ranking/templates/maistar_ranking/game_list.html:41
+#: .\maistar_ranking\templates\maistar_ranking\game_form.html:5
+#: .\maistar_ranking\templates\maistar_ranking\game_form.html:16
+#: .\maistar_ranking\templates\maistar_ranking\game_list.html:41
 msgid "Add Game"
 msgstr "Spiel hinzufügen"
 
-#: src/maistar_ranking/templates/maistar_ranking/game_form.html:76
+#: .\maistar_ranking\templates\maistar_ranking\game_form.html:76
 msgid "Back"
 msgstr "Zurück"
 
-#: src/maistar_ranking/templates/maistar_ranking/game_form.html:77
+#: .\maistar_ranking\templates\maistar_ranking\game_form.html:77
 msgid "Save"
 msgstr "Speichern"
 
-#: src/maistar_ranking/templates/maistar_ranking/game_list.html:4
-#: src/maistar_ranking/templates/maistar_ranking/player_game_list.html:6
+#: .\maistar_ranking\templates\maistar_ranking\game_list.html:4
+#: .\maistar_ranking\templates\maistar_ranking\player_game_list.html:6
 msgid "Mai-Star Games"
 msgstr "Mai-Star Spiele"
 
-#: src/maistar_ranking/templates/maistar_ranking/game_list.html:7
+#: .\maistar_ranking\templates\maistar_ranking\game_list.html:7
 msgid "Played Mai-Star Games"
 msgstr "Gespielte Mai-Star Spiele"
 
-#: src/maistar_ranking/templates/maistar_ranking/game_list.html:11
+#: .\maistar_ranking\templates\maistar_ranking\game_list.html:11
 msgid "Game"
 msgstr "Spiel"
 
-#: src/maistar_ranking/templates/maistar_ranking/game_list.html:14
+#: .\maistar_ranking\templates\maistar_ranking\game_list.html:14
 msgid "Place"
 msgstr "Platz"
 
-#: src/maistar_ranking/templates/maistar_ranking/game_list.html:19
-#: src/maistar_ranking/templates/maistar_ranking/player_game_list.html:36
+#: .\maistar_ranking\templates\maistar_ranking\game_list.html:19
+#: .\maistar_ranking\templates\maistar_ranking\player_game_list.html:36
 msgid "Points"
 msgstr "Punkte"
 
-#: src/maistar_ranking/templates/maistar_ranking/game_list.html:24
-#: src/maistar_ranking/templates/maistar_ranking/player_game_list.html:41
+#: .\maistar_ranking\templates\maistar_ranking\game_list.html:24
+#: .\maistar_ranking\templates\maistar_ranking\player_game_list.html:41
 msgid "Delete Game"
 msgstr "Spiel löschen"
 
-#: src/maistar_ranking/templates/maistar_ranking/game_list.html:33
+#: .\maistar_ranking\templates\maistar_ranking\game_list.html:33
 msgid "No Mai-Star games have been added to this event yet."
 msgstr "Für diese Veranstaltung wurden noch keine Mai-Star Spiele erfasst."
 
-#: src/maistar_ranking/templates/maistar_ranking/game_list.html:40
+#: .\maistar_ranking\templates\maistar_ranking\game_list.html:40
 msgid "Edit Event"
 msgstr "Veranstaltung bearbeiten"
 
-#: src/maistar_ranking/templates/maistar_ranking/hanchan_confirm_delete.html:4
-#: src/maistar_ranking/templates/maistar_ranking/hanchan_confirm_delete.html:10
+#: .\maistar_ranking\templates\maistar_ranking\hanchan_confirm_delete.html:4
+#: .\maistar_ranking\templates\maistar_ranking\hanchan_confirm_delete.html:10
 msgid "Delete game"
 msgstr "Spiel löschen"
 
-#: src/maistar_ranking/templates/maistar_ranking/hanchan_confirm_delete.html:13
+#: .\maistar_ranking\templates\maistar_ranking\hanchan_confirm_delete.html:13
 msgid "Cancel"
 msgstr "Abbrechen"
 
-#: src/maistar_ranking/templates/maistar_ranking/hanchan_confirm_delete.html:14
+#: .\maistar_ranking\templates\maistar_ranking\hanchan_confirm_delete.html:14
 msgid "Delete"
 msgstr "Löschen"
 
-#: src/maistar_ranking/templates/maistar_ranking/page.html:5
+#: .\maistar_ranking\templates\maistar_ranking\page.html:5
 msgid "Archive"
 msgstr "Archiv"
 
-#: src/maistar_ranking/templates/maistar_ranking/page.html:7
+#: .\maistar_ranking\templates\maistar_ranking\page.html:7
 msgid "Add Event"
 msgstr "Veranstaltung hinzufügen"
 
-#: src/maistar_ranking/templates/maistar_ranking/player_game_list.html:4
+#: .\maistar_ranking\templates\maistar_ranking\player_game_list.html:4
 msgid "Ladder Score for"
 msgstr "Ladder Wertung für"
 
-#: src/maistar_ranking/templates/maistar_ranking/player_game_list.html:9
+#: .\maistar_ranking\templates\maistar_ranking\player_game_list.html:9
 msgid "Mai-Star Games with"
 msgstr "Mai-Star Spiele mit"
 
-#: src/maistar_ranking/templates/maistar_ranking/player_game_list.html:14
+#: .\maistar_ranking\templates\maistar_ranking\player_game_list.html:14
 msgid "Date"
 msgstr "Datum"
 
-#: src/maistar_ranking/templates/maistar_ranking/player_game_list.html:15
+#: .\maistar_ranking\templates\maistar_ranking\player_game_list.html:15
 msgid "Event"
 msgstr "Veranstaltung"
 
-#: src/maistar_ranking/templates/maistar_ranking/player_game_list.html:16
+#: .\maistar_ranking\templates\maistar_ranking\player_game_list.html:16
 msgid "Players"
 msgstr "Spieler"
 
-#: src/maistar_ranking/templates/maistar_ranking/ranking_list.html:4
+#: .\maistar_ranking\templates\maistar_ranking\ranking_list.html:4
 msgid "Mai-Star Ranking"
 msgstr "Mai-Star Platzierung"
 
-#: src/maistar_ranking/templates/maistar_ranking/ranking_list.html:10
-#: src/maistar_ranking/templates/maistar_ranking/ranking_list.html:18
+#: .\maistar_ranking\templates\maistar_ranking\ranking_list.html:10
+#: .\maistar_ranking\templates\maistar_ranking\ranking_list.html:18
 msgid "Placement"
 msgstr "Platzierung"
 
-#: src/maistar_ranking/templates/maistar_ranking/ranking_list.html:11
+#: .\maistar_ranking\templates\maistar_ranking\ranking_list.html:11
 msgid "Avatar"
 msgstr "Avatar"
 
-#: src/maistar_ranking/templates/maistar_ranking/ranking_list.html:12
+#: .\maistar_ranking\templates\maistar_ranking\ranking_list.html:12
 msgid "Nickname"
 msgstr "Spitzname"
 
-#: src/maistar_ranking/templates/maistar_ranking/ranking_list.html:13
+#: .\maistar_ranking\templates\maistar_ranking\ranking_list.html:13
 msgid "Name"
 msgstr "Name"
 
-#: src/maistar_ranking/templates/maistar_ranking/ranking_list.html:14
+#: .\maistar_ranking\templates\maistar_ranking\ranking_list.html:14
 msgid "Average"
 msgstr "Durchschnitt"
 
-#: src/maistar_ranking/templates/maistar_ranking/ranking_list.html:15
+#: .\maistar_ranking\templates\maistar_ranking\ranking_list.html:15
 msgid "Games"
 msgstr "Spiele"
 
-#: src/maistar_ranking/templates/maistar_ranking/ranking_list.html:20
+#: .\maistar_ranking\templates\maistar_ranking\ranking_list.html:20
 msgid "count"
 msgstr "Anzahl"
 
-#: src/maistar_ranking/templates/maistar_ranking/ranking_list.html:21
+#: .\maistar_ranking\templates\maistar_ranking\ranking_list.html:21
 msgid "good"
 msgstr "Gut"
 
-#: src/maistar_ranking/templates/maistar_ranking/ranking_list.html:22
+#: .\maistar_ranking\templates\maistar_ranking\ranking_list.html:22
 msgid "won"
 msgstr "Gewonnen"
 
-#: src/maistar_ranking/templates/maistar_ranking/ranking_list.html:43
+#: .\maistar_ranking\templates\maistar_ranking\ranking_list.html:43
 msgid ""
 "Unfortunately, nobody has it been done in the ranking.\n"
 "                A player must have 6 games done, to be added to the ranking."
@@ -229,15 +229,15 @@ msgstr ""
 "als 6 Spiele innerhalb einer Saison absolviert haben, werden für das "
 "Endergebnis nicht gewertet."
 
-#: src/maistar_ranking/templates/maistar_ranking/ranking_list.html:52
+#: .\maistar_ranking\templates\maistar_ranking\ranking_list.html:52
 msgid "Latest Games"
 msgstr "Letzten Spiele"
 
-#: src/maistar_ranking/templates/maistar_ranking/ranking_list.html:63
+#: .\maistar_ranking\templates\maistar_ranking\ranking_list.html:63
 msgid "Latest Events"
 msgstr "Letzten Veranstaltungen"
 
-#: src/maistar_ranking/templates/maistar_ranking/ranking_list.html:70
+#: .\maistar_ranking\templates\maistar_ranking\ranking_list.html:70
 msgid "Ladder Archive"
 msgstr "Archiv"
 
diff --git a/src/membership/forms.py b/src/membership/forms.py
index e996b3e..6126566 100644
--- a/src/membership/forms.py
+++ b/src/membership/forms.py
@@ -10,7 +10,6 @@ from django.conf import settings
 from django.contrib import auth
 from django.contrib.sites.models import Site
 from django.utils.translation import ugettext_lazy as _
-from django.utils.safestring import mark_safe
 from utils.massmailer import MassMailer
 from . import models
 from content.models import Page
diff --git a/src/utils/locale/de/LC_MESSAGES/django.mo b/src/utils/locale/de/LC_MESSAGES/django.mo
index fe236ec29a698654da3fa5281d2e02660c07a100..b60127f2728e86b613a28a44a4b525471867bea6 100644
GIT binary patch
delta 23
ecmX>eb3A6lD+Ml7T>}dR0|P5V^UYrrf_VXM3kV(n

delta 23
ecmX>eb3A6lD+MkST_bY^14}Ct%gtXDf_VXMd<ZN6

diff --git a/src/utils/locale/de/LC_MESSAGES/django.po b/src/utils/locale/de/LC_MESSAGES/django.po
index 3deb814..271537e 100644
--- a/src/utils/locale/de/LC_MESSAGES/django.po
+++ b/src/utils/locale/de/LC_MESSAGES/django.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: kasu.utils\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-01-11 22:50+0100\n"
+"POT-Creation-Date: 2018-05-08 00:17+0200\n"
 "PO-Revision-Date: 2016-09-28 00:24+0200\n"
 "Last-Translator: Christian Berg <xeniac@posteo.at>\n"
 "Language-Team: Kasu <verein@kasu.at>\n"
@@ -18,999 +18,999 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "X-Generator: Poedit 1.8.9\n"
 
-#: src/utils/__init__.py:17
+#: .\utils\__init__.py:17
 msgid "Rejected"
 msgstr "Zurückgewiesen"
 
-#: src/utils/__init__.py:18
+#: .\utils\__init__.py:18
 msgid "Waiting..."
 msgstr "Wartend..."
 
-#: src/utils/__init__.py:19
+#: .\utils\__init__.py:19
 msgid "Published"
 msgstr "Veröffentlicht"
 
-#: src/utils/countries.py:5
+#: .\utils\countries.py:5
 msgid "United Kingdom"
 msgstr "Vereinigtes Königreich"
 
-#: src/utils/countries.py:6
+#: .\utils\countries.py:6
 msgid "Afghanistan"
 msgstr "Afghanistan"
 
-#: src/utils/countries.py:7
+#: .\utils\countries.py:7
 msgid "Aland Islands"
 msgstr "Aland Islands"
 
-#: src/utils/countries.py:8
+#: .\utils\countries.py:8
 msgid "Albania"
 msgstr "Albanien"
 
-#: src/utils/countries.py:9
+#: .\utils\countries.py:9
 msgid "Algeria"
 msgstr "Algerien"
 
-#: src/utils/countries.py:10
+#: .\utils\countries.py:10
 msgid "American Samoa"
 msgstr "Amerikanisch-Samoa"
 
-#: src/utils/countries.py:11
+#: .\utils\countries.py:11
 msgid "Andorra"
 msgstr "Andorra"
 
-#: src/utils/countries.py:12
+#: .\utils\countries.py:12
 msgid "Angola"
 msgstr "Angola"
 
-#: src/utils/countries.py:13
+#: .\utils\countries.py:13
 msgid "Anguilla"
 msgstr "Anguilla"
 
-#: src/utils/countries.py:14
+#: .\utils\countries.py:14
 msgid "Antarctica"
 msgstr "Antarktika"
 
-#: src/utils/countries.py:15
+#: .\utils\countries.py:15
 msgid "Antigua and Barbuda"
 msgstr "Antigua und Barbuda"
 
-#: src/utils/countries.py:16
+#: .\utils\countries.py:16
 msgid "Argentina"
 msgstr "Argentinien"
 
-#: src/utils/countries.py:17
+#: .\utils\countries.py:17
 msgid "Armenia"
 msgstr "Armenien"
 
-#: src/utils/countries.py:18
+#: .\utils\countries.py:18
 msgid "Aruba"
 msgstr "Aruba"
 
-#: src/utils/countries.py:19
+#: .\utils\countries.py:19
 msgid "Australia"
 msgstr "Australien"
 
-#: src/utils/countries.py:20
+#: .\utils\countries.py:20
 msgid "Austria"
 msgstr "Österreich"
 
-#: src/utils/countries.py:21
+#: .\utils\countries.py:21
 msgid "Azerbaijan"
 msgstr "Aserbaidschan"
 
-#: src/utils/countries.py:22
+#: .\utils\countries.py:22
 msgid "Bahamas"
 msgstr "Bahamas"
 
-#: src/utils/countries.py:23
+#: .\utils\countries.py:23
 msgid "Bahrain"
 msgstr "Bahrein"
 
-#: src/utils/countries.py:24
+#: .\utils\countries.py:24
 msgid "Bangladesh"
 msgstr "Bangladesch"
 
-#: src/utils/countries.py:25
+#: .\utils\countries.py:25
 msgid "Barbados"
 msgstr "Barbados"
 
-#: src/utils/countries.py:26
+#: .\utils\countries.py:26
 msgid "Belarus"
 msgstr "Weißrussland"
 
-#: src/utils/countries.py:27
+#: .\utils\countries.py:27
 msgid "Belgium"
 msgstr "Belgien"
 
-#: src/utils/countries.py:28
+#: .\utils\countries.py:28
 msgid "Belize"
 msgstr "Belize"
 
-#: src/utils/countries.py:29
+#: .\utils\countries.py:29
 msgid "Benin"
 msgstr "Benin"
 
-#: src/utils/countries.py:30
+#: .\utils\countries.py:30
 msgid "Bermuda"
 msgstr "Bermuda"
 
-#: src/utils/countries.py:31
+#: .\utils\countries.py:31
 msgid "Bhutan"
 msgstr "Bhutan"
 
-#: src/utils/countries.py:32
+#: .\utils\countries.py:32
 msgid "Bolivia"
 msgstr "Bolivien"
 
-#: src/utils/countries.py:33
+#: .\utils\countries.py:33
 msgid "Bosnia and Herzegovina"
 msgstr "Bosnien und Herzegowina"
 
-#: src/utils/countries.py:34
+#: .\utils\countries.py:34
 msgid "Botswana"
 msgstr "Botswana"
 
-#: src/utils/countries.py:35
+#: .\utils\countries.py:35
 msgid "Bouvet Island"
 msgstr "Bouvet Island"
 
-#: src/utils/countries.py:36
+#: .\utils\countries.py:36
 msgid "Brazil"
 msgstr "Brasilien"
 
-#: src/utils/countries.py:37
+#: .\utils\countries.py:37
 msgid "British Indian Ocean Territory"
 msgstr "British Indian Ocean Territory"
 
-#: src/utils/countries.py:38
+#: .\utils\countries.py:38
 msgid "Brunei Darussalam"
 msgstr "Brunei Darussalam"
 
-#: src/utils/countries.py:39
+#: .\utils\countries.py:39
 msgid "Bulgaria"
 msgstr "Bulgarien"
 
-#: src/utils/countries.py:40
+#: .\utils\countries.py:40
 msgid "Burkina Faso"
 msgstr "Burkina Faso"
 
-#: src/utils/countries.py:41
+#: .\utils\countries.py:41
 msgid "Burundi"
 msgstr "Burundi"
 
-#: src/utils/countries.py:42
+#: .\utils\countries.py:42
 msgid "Cambodia"
 msgstr "Kambodscha"
 
-#: src/utils/countries.py:43
+#: .\utils\countries.py:43
 msgid "Cameroon"
 msgstr "Kamerun"
 
-#: src/utils/countries.py:44
+#: .\utils\countries.py:44
 msgid "Canada"
 msgstr "Kanada"
 
-#: src/utils/countries.py:45
+#: .\utils\countries.py:45
 msgid "Cape Verde"
 msgstr "Cape Verde"
 
-#: src/utils/countries.py:46
+#: .\utils\countries.py:46
 msgid "Cayman Islands"
 msgstr "Cayman Islands"
 
-#: src/utils/countries.py:47
+#: .\utils\countries.py:47
 msgid "Central African Republic"
 msgstr "Zentralafrikanische Republik"
 
-#: src/utils/countries.py:48
+#: .\utils\countries.py:48
 msgid "Chad"
 msgstr "Tschad"
 
-#: src/utils/countries.py:49
+#: .\utils\countries.py:49
 msgid "Chile"
 msgstr "Chile"
 
-#: src/utils/countries.py:50
+#: .\utils\countries.py:50
 msgid "China"
 msgstr "China"
 
-#: src/utils/countries.py:51
+#: .\utils\countries.py:51
 msgid "Christmas Island"
 msgstr "Christmas Island"
 
-#: src/utils/countries.py:52
+#: .\utils\countries.py:52
 msgid "Cocos (Keeling) Islands"
 msgstr "Cocos (Keeling) Islands"
 
-#: src/utils/countries.py:53
+#: .\utils\countries.py:53
 msgid "Colombia"
 msgstr "Kolumbien"
 
-#: src/utils/countries.py:54
+#: .\utils\countries.py:54
 msgid "Comoros"
 msgstr "Komoren"
 
-#: src/utils/countries.py:55
+#: .\utils\countries.py:55
 msgid "Congo"
 msgstr "Kongo"
 
-#: src/utils/countries.py:56
+#: .\utils\countries.py:56
 msgid "Congo, The Democratic Republic of the"
 msgstr "Kongo, Demokratische Republik"
 
-#: src/utils/countries.py:57
+#: .\utils\countries.py:57
 msgid "Cook Islands"
 msgstr "Cook-Inseln"
 
-#: src/utils/countries.py:58
+#: .\utils\countries.py:58
 msgid "Costa Rica"
 msgstr "Costa Rica"
 
-#: src/utils/countries.py:59
+#: .\utils\countries.py:59
 msgid "Cote d'Ivoire"
 msgstr "Cote d'Ivoire"
 
-#: src/utils/countries.py:60
+#: .\utils\countries.py:60
 msgid "Croatia"
 msgstr "Kroatien"
 
-#: src/utils/countries.py:61
+#: .\utils\countries.py:61
 msgid "Cuba"
 msgstr "Kuba"
 
-#: src/utils/countries.py:62
+#: .\utils\countries.py:62
 msgid "Cyprus"
 msgstr "Zypern"
 
-#: src/utils/countries.py:63
+#: .\utils\countries.py:63
 msgid "Czech Republic"
 msgstr "Tschechische Republik"
 
-#: src/utils/countries.py:64
+#: .\utils\countries.py:64
 msgid "Denmark"
 msgstr "Dänemark"
 
-#: src/utils/countries.py:65
+#: .\utils\countries.py:65
 msgid "Djibouti"
 msgstr "Dschibuti"
 
-#: src/utils/countries.py:66
+#: .\utils\countries.py:66
 msgid "Dominica"
 msgstr "Dominica"
 
-#: src/utils/countries.py:67
+#: .\utils\countries.py:67
 msgid "Dominican Republic"
 msgstr "Dominikanische Republik"
 
-#: src/utils/countries.py:68
+#: .\utils\countries.py:68
 msgid "Ecuador"
 msgstr "Ecuador"
 
-#: src/utils/countries.py:69
+#: .\utils\countries.py:69
 msgid "Egypt"
 msgstr "Ägypten"
 
-#: src/utils/countries.py:70
+#: .\utils\countries.py:70
 msgid "El Salvador"
 msgstr "El Salvador"
 
-#: src/utils/countries.py:71
+#: .\utils\countries.py:71
 msgid "Equatorial Guinea"
 msgstr "Äquatorial-Guinea"
 
-#: src/utils/countries.py:72
+#: .\utils\countries.py:72
 msgid "Eritrea"
 msgstr "Eritrea"
 
-#: src/utils/countries.py:73
+#: .\utils\countries.py:73
 msgid "Estonia"
 msgstr "Estland"
 
-#: src/utils/countries.py:74
+#: .\utils\countries.py:74
 msgid "Ethiopia"
 msgstr "Äthiopien"
 
-#: src/utils/countries.py:75
+#: .\utils\countries.py:75
 msgid "Falkland Islands (Malvinas)"
 msgstr "Falklandinseln (Malvinas)"
 
-#: src/utils/countries.py:76
+#: .\utils\countries.py:76
 msgid "Faroe Islands"
 msgstr "Färöer-Inseln"
 
-#: src/utils/countries.py:77
+#: .\utils\countries.py:77
 msgid "Fiji"
 msgstr "Fidschi"
 
-#: src/utils/countries.py:78
+#: .\utils\countries.py:78
 msgid "Finland"
 msgstr "Finnland"
 
-#: src/utils/countries.py:79
+#: .\utils\countries.py:79
 msgid "France"
 msgstr "Frankreich"
 
-#: src/utils/countries.py:80
+#: .\utils\countries.py:80
 msgid "French Guiana"
 msgstr "Französisch-Guayana"
 
-#: src/utils/countries.py:81
+#: .\utils\countries.py:81
 msgid "French Polynesia"
 msgstr "Französisch-Polynesien"
 
-#: src/utils/countries.py:82
+#: .\utils\countries.py:82
 msgid "French Southern Territories"
 msgstr "Französisch Südliche Territorien"
 
-#: src/utils/countries.py:83
+#: .\utils\countries.py:83
 msgid "Gabon"
 msgstr "Gabun"
 
-#: src/utils/countries.py:84
+#: .\utils\countries.py:84
 msgid "Gambia"
 msgstr "Gambia"
 
-#: src/utils/countries.py:85
+#: .\utils\countries.py:85
 msgid "Georgia"
 msgstr "Georgia"
 
-#: src/utils/countries.py:86
+#: .\utils\countries.py:86
 msgid "Germany"
 msgstr "Deutschland"
 
-#: src/utils/countries.py:87
+#: .\utils\countries.py:87
 msgid "Ghana"
 msgstr "Ghana"
 
-#: src/utils/countries.py:88
+#: .\utils\countries.py:88
 msgid "Gibraltar"
 msgstr "Gibraltar"
 
-#: src/utils/countries.py:89
+#: .\utils\countries.py:89
 msgid "Greece"
 msgstr "Griechenland"
 
-#: src/utils/countries.py:90
+#: .\utils\countries.py:90
 msgid "Greenland"
 msgstr "Grönland"
 
-#: src/utils/countries.py:91
+#: .\utils\countries.py:91
 msgid "Grenada"
 msgstr "Grenada"
 
-#: src/utils/countries.py:92
+#: .\utils\countries.py:92
 msgid "Guadeloupe"
 msgstr "Guadeloupe"
 
-#: src/utils/countries.py:93
+#: .\utils\countries.py:93
 msgid "Guam"
 msgstr "Guam"
 
-#: src/utils/countries.py:94
+#: .\utils\countries.py:94
 msgid "Guatemala"
 msgstr "Guatemala"
 
-#: src/utils/countries.py:95
+#: .\utils\countries.py:95
 msgid "Guernsey"
 msgstr "Guernsey"
 
-#: src/utils/countries.py:96
+#: .\utils\countries.py:96
 msgid "Guinea"
 msgstr "Guinea"
 
-#: src/utils/countries.py:97
+#: .\utils\countries.py:97
 msgid "Guinea-Bissau"
 msgstr "Guinea-Bissau"
 
-#: src/utils/countries.py:98
+#: .\utils\countries.py:98
 msgid "Guyana"
 msgstr "Guyana"
 
-#: src/utils/countries.py:99
+#: .\utils\countries.py:99
 msgid "Haiti"
 msgstr "Haiti"
 
-#: src/utils/countries.py:100
+#: .\utils\countries.py:100
 msgid "Heard Island and McDonald Islands"
 msgstr "Heard und McDonald Inseln"
 
-#: src/utils/countries.py:101
+#: .\utils\countries.py:101
 msgid "Holy See (Vatican City State)"
 msgstr "Heiliger Stuhl (Vatikanstadt)"
 
-#: src/utils/countries.py:102
+#: .\utils\countries.py:102
 msgid "Honduras"
 msgstr "Honduras"
 
-#: src/utils/countries.py:103
+#: .\utils\countries.py:103
 msgid "Hong Kong"
 msgstr "Hongkong"
 
-#: src/utils/countries.py:104
+#: .\utils\countries.py:104
 msgid "Hungary"
 msgstr "Ungarn"
 
-#: src/utils/countries.py:105
+#: .\utils\countries.py:105
 msgid "Iceland"
 msgstr "Island"
 
-#: src/utils/countries.py:106
+#: .\utils\countries.py:106
 msgid "India"
 msgstr "Indien"
 
-#: src/utils/countries.py:107
+#: .\utils\countries.py:107
 msgid "Indonesia"
 msgstr "Indonesien"
 
-#: src/utils/countries.py:108
+#: .\utils\countries.py:108
 msgid "Iran, Islamic Republic of"
 msgstr "Iran, Islamische Republik"
 
-#: src/utils/countries.py:109
+#: .\utils\countries.py:109
 msgid "Iraq"
 msgstr "Irak"
 
-#: src/utils/countries.py:110
+#: .\utils\countries.py:110
 msgid "Ireland"
 msgstr "Irland"
 
-#: src/utils/countries.py:111
+#: .\utils\countries.py:111
 msgid "Isle of Man"
 msgstr "Isle of Man"
 
-#: src/utils/countries.py:112
+#: .\utils\countries.py:112
 msgid "Israel"
 msgstr "Israel"
 
-#: src/utils/countries.py:113
+#: .\utils\countries.py:113
 msgid "Italy"
 msgstr "Italien"
 
-#: src/utils/countries.py:114
+#: .\utils\countries.py:114
 msgid "Jamaica"
 msgstr "Jamaika"
 
-#: src/utils/countries.py:115
+#: .\utils\countries.py:115
 msgid "Japan"
 msgstr "Japan"
 
-#: src/utils/countries.py:116
+#: .\utils\countries.py:116
 msgid "Jersey"
 msgstr "Jersey"
 
-#: src/utils/countries.py:117
+#: .\utils\countries.py:117
 msgid "Jordan"
 msgstr "Jordan"
 
-#: src/utils/countries.py:118
+#: .\utils\countries.py:118
 msgid "Kazakhstan"
 msgstr "Kasachstan"
 
-#: src/utils/countries.py:119
+#: .\utils\countries.py:119
 msgid "Kenya"
 msgstr "Kenia"
 
-#: src/utils/countries.py:120
+#: .\utils\countries.py:120
 msgid "Kiribati"
 msgstr "Kiribati"
 
-#: src/utils/countries.py:121
+#: .\utils\countries.py:121
 msgid "Korea, Democratic People's Republic of"
 msgstr "Korea, Demokratische Volksrepublik"
 
-#: src/utils/countries.py:122
+#: .\utils\countries.py:122
 msgid "Korea, Republic of"
 msgstr "Korea, Republik"
 
-#: src/utils/countries.py:123
+#: .\utils\countries.py:123
 msgid "Kuwait"
 msgstr "Kuwait"
 
-#: src/utils/countries.py:124
+#: .\utils\countries.py:124
 msgid "Kyrgyzstan"
 msgstr "Kirgisistan"
 
-#: src/utils/countries.py:125
+#: .\utils\countries.py:125
 msgid "Lao People's Democratic Republic"
 msgstr "Lao Demokratischen Volksrepublik"
 
-#: src/utils/countries.py:126
+#: .\utils\countries.py:126
 msgid "Latvia"
 msgstr "Lettland"
 
-#: src/utils/countries.py:127
+#: .\utils\countries.py:127
 msgid "Lebanon"
 msgstr "Libanon"
 
-#: src/utils/countries.py:128
+#: .\utils\countries.py:128
 msgid "Lesotho"
 msgstr "Lesotho"
 
-#: src/utils/countries.py:129
+#: .\utils\countries.py:129
 msgid "Liberia"
 msgstr "Liberia"
 
-#: src/utils/countries.py:130
+#: .\utils\countries.py:130
 msgid "Libyan Arab Jamahiriya"
 msgstr "Libyen"
 
-#: src/utils/countries.py:131
+#: .\utils\countries.py:131
 msgid "Liechtenstein"
 msgstr "Liechtenstein"
 
-#: src/utils/countries.py:132
+#: .\utils\countries.py:132
 msgid "Lithuania"
 msgstr "Litauen"
 
-#: src/utils/countries.py:133
+#: .\utils\countries.py:133
 msgid "Luxembourg"
 msgstr "Luxemburg"
 
-#: src/utils/countries.py:134
+#: .\utils\countries.py:134
 msgid "Macao"
 msgstr "Macao"
 
-#: src/utils/countries.py:135
+#: .\utils\countries.py:135
 msgid "Macedonia, The Former Yugoslav Republic of"
 msgstr "Mazedonien, die ehemalige jugoslawische Republik"
 
-#: src/utils/countries.py:136
+#: .\utils\countries.py:136
 msgid "Madagascar"
 msgstr "Madagaskar"
 
-#: src/utils/countries.py:137
+#: .\utils\countries.py:137
 msgid "Malawi"
 msgstr "Malawi"
 
-#: src/utils/countries.py:138
+#: .\utils\countries.py:138
 msgid "Malaysia"
 msgstr "Malaysia"
 
-#: src/utils/countries.py:139
+#: .\utils\countries.py:139
 msgid "Maldives"
 msgstr "Malediven"
 
-#: src/utils/countries.py:140
+#: .\utils\countries.py:140
 msgid "Mali"
 msgstr "Mali"
 
-#: src/utils/countries.py:141
+#: .\utils\countries.py:141
 msgid "Malta"
 msgstr "Malta"
 
-#: src/utils/countries.py:142
+#: .\utils\countries.py:142
 msgid "Marshall Islands"
 msgstr "Marshall Islands"
 
-#: src/utils/countries.py:143
+#: .\utils\countries.py:143
 msgid "Martinique"
 msgstr "Martinique"
 
-#: src/utils/countries.py:144
+#: .\utils\countries.py:144
 msgid "Mauritania"
 msgstr "Mauretanien"
 
-#: src/utils/countries.py:145
+#: .\utils\countries.py:145
 msgid "Mauritius"
 msgstr "Mauritius"
 
-#: src/utils/countries.py:146
+#: .\utils\countries.py:146
 msgid "Mayotte"
 msgstr "Mayotte"
 
-#: src/utils/countries.py:147
+#: .\utils\countries.py:147
 msgid "Mexico"
 msgstr "Mexiko"
 
-#: src/utils/countries.py:148
+#: .\utils\countries.py:148
 msgid "Micronesia, Federated States of"
 msgstr "Mikronesien, Föderierte Staaten von"
 
-#: src/utils/countries.py:149
+#: .\utils\countries.py:149
 msgid "Moldova"
 msgstr "Moldawien"
 
-#: src/utils/countries.py:150
+#: .\utils\countries.py:150
 msgid "Monaco"
 msgstr "Monaco"
 
-#: src/utils/countries.py:151
+#: .\utils\countries.py:151
 msgid "Mongolia"
 msgstr "Mongolei"
 
-#: src/utils/countries.py:152
+#: .\utils\countries.py:152
 msgid "Montenegro"
 msgstr "Montenegro"
 
-#: src/utils/countries.py:153
+#: .\utils\countries.py:153
 msgid "Montserrat"
 msgstr "Montserrat"
 
-#: src/utils/countries.py:154
+#: .\utils\countries.py:154
 msgid "Morocco"
 msgstr "Marokko"
 
-#: src/utils/countries.py:155
+#: .\utils\countries.py:155
 msgid "Mozambique"
 msgstr "Mosambik"
 
-#: src/utils/countries.py:156
+#: .\utils\countries.py:156
 msgid "Myanmar"
 msgstr "Myanmar"
 
-#: src/utils/countries.py:157
+#: .\utils\countries.py:157
 msgid "Namibia"
 msgstr "Namibia"
 
-#: src/utils/countries.py:158
+#: .\utils\countries.py:158
 msgid "Nauru"
 msgstr "Nauru"
 
-#: src/utils/countries.py:159
+#: .\utils\countries.py:159
 msgid "Nepal"
 msgstr "Nepal"
 
-#: src/utils/countries.py:160
+#: .\utils\countries.py:160
 msgid "Netherlands"
 msgstr "Niederlande"
 
-#: src/utils/countries.py:161
+#: .\utils\countries.py:161
 msgid "Netherlands Antilles"
 msgstr "Niederländische Antillen"
 
-#: src/utils/countries.py:162
+#: .\utils\countries.py:162
 msgid "New Caledonia"
 msgstr "Neukaledonien"
 
-#: src/utils/countries.py:163
+#: .\utils\countries.py:163
 msgid "New Zealand"
 msgstr "New Zealand"
 
-#: src/utils/countries.py:164
+#: .\utils\countries.py:164
 msgid "Nicaragua"
 msgstr "Nicaragua"
 
-#: src/utils/countries.py:165
+#: .\utils\countries.py:165
 msgid "Niger"
 msgstr "Niger"
 
-#: src/utils/countries.py:166
+#: .\utils\countries.py:166
 msgid "Nigeria"
 msgstr "Nigeria"
 
-#: src/utils/countries.py:167
+#: .\utils\countries.py:167
 msgid "Niue"
 msgstr "Niue"
 
-#: src/utils/countries.py:168
+#: .\utils\countries.py:168
 msgid "Norfolk Island"
 msgstr "Norfolk Island"
 
-#: src/utils/countries.py:169
+#: .\utils\countries.py:169
 msgid "Northern Mariana Islands"
 msgstr "Northern Mariana Islands"
 
-#: src/utils/countries.py:170
+#: .\utils\countries.py:170
 msgid "Norway"
 msgstr "Norwegen"
 
-#: src/utils/countries.py:171
+#: .\utils\countries.py:171
 msgid "Oman"
 msgstr "Oman"
 
-#: src/utils/countries.py:172
+#: .\utils\countries.py:172
 msgid "Pakistan"
 msgstr "Pakistan"
 
-#: src/utils/countries.py:173
+#: .\utils\countries.py:173
 msgid "Palau"
 msgstr "Palau"
 
-#: src/utils/countries.py:174
+#: .\utils\countries.py:174
 msgid "Palestinian Territory, Occupied"
 msgstr "Palästinensische Autonomiegebiete"
 
-#: src/utils/countries.py:175
+#: .\utils\countries.py:175
 msgid "Panama"
 msgstr "Panama"
 
-#: src/utils/countries.py:176
+#: .\utils\countries.py:176
 msgid "Papua New Guinea"
 msgstr "Papua-Neuguinea"
 
-#: src/utils/countries.py:177
+#: .\utils\countries.py:177
 msgid "Paraguay"
 msgstr "Paraguay"
 
-#: src/utils/countries.py:178
+#: .\utils\countries.py:178
 msgid "Peru"
 msgstr "Peru"
 
-#: src/utils/countries.py:179
+#: .\utils\countries.py:179
 msgid "Philippines"
 msgstr "Philippinen"
 
-#: src/utils/countries.py:180
+#: .\utils\countries.py:180
 msgid "Pitcairn"
 msgstr "Pitcairn"
 
-#: src/utils/countries.py:181
+#: .\utils\countries.py:181
 msgid "Poland"
 msgstr "Polen"
 
-#: src/utils/countries.py:182
+#: .\utils\countries.py:182
 msgid "Portugal"
 msgstr "Portugal"
 
-#: src/utils/countries.py:183
+#: .\utils\countries.py:183
 msgid "Puerto Rico"
 msgstr "Puerto Rico"
 
-#: src/utils/countries.py:184
+#: .\utils\countries.py:184
 msgid "Qatar"
 msgstr "Katar"
 
-#: src/utils/countries.py:185
+#: .\utils\countries.py:185
 msgid "Reunion"
 msgstr "Wiedervereinigung"
 
-#: src/utils/countries.py:186
+#: .\utils\countries.py:186
 msgid "Romania"
 msgstr "Rumänien"
 
-#: src/utils/countries.py:187
+#: .\utils\countries.py:187
 msgid "Russian Federation"
 msgstr "Russischen Föderation"
 
-#: src/utils/countries.py:188
+#: .\utils\countries.py:188
 msgid "Rwanda"
 msgstr "Ruanda"
 
-#: src/utils/countries.py:189
+#: .\utils\countries.py:189
 msgid "Saint Barthelemy"
 msgstr "Saint Barthelemy"
 
-#: src/utils/countries.py:190
+#: .\utils\countries.py:190
 msgid "Saint Helena"
 msgstr "Saint Helena"
 
-#: src/utils/countries.py:191
+#: .\utils\countries.py:191
 msgid "Saint Kitts and Nevis"
 msgstr "Saint Kitts und Nevis"
 
-#: src/utils/countries.py:192
+#: .\utils\countries.py:192
 msgid "Saint Lucia"
 msgstr "Santa Lucia"
 
-#: src/utils/countries.py:193
+#: .\utils\countries.py:193
 msgid "Saint Martin"
 msgstr "Santa Martin"
 
-#: src/utils/countries.py:194
+#: .\utils\countries.py:194
 msgid "Saint Pierre and Miquelon"
 msgstr "Saint Pierre und Miquelon"
 
-#: src/utils/countries.py:195
+#: .\utils\countries.py:195
 msgid "Saint Vincent and the Grenadines"
 msgstr "Saint Vincent und die Grenadinen"
 
-#: src/utils/countries.py:196
+#: .\utils\countries.py:196
 msgid "Samoa"
 msgstr "Samoa"
 
-#: src/utils/countries.py:197
+#: .\utils\countries.py:197
 msgid "San Marino"
 msgstr "San Marino"
 
-#: src/utils/countries.py:198
+#: .\utils\countries.py:198
 msgid "Sao Tome and Principe"
 msgstr "Sao Tome und Principe"
 
-#: src/utils/countries.py:199
+#: .\utils\countries.py:199
 msgid "Saudi Arabia"
 msgstr "Saudi-Arabien"
 
-#: src/utils/countries.py:200
+#: .\utils\countries.py:200
 msgid "Senegal"
 msgstr "Senegal"
 
-#: src/utils/countries.py:201
+#: .\utils\countries.py:201
 msgid "Serbia"
 msgstr "Serbien"
 
-#: src/utils/countries.py:202
+#: .\utils\countries.py:202
 msgid "Seychelles"
 msgstr "Seychellen"
 
-#: src/utils/countries.py:203
+#: .\utils\countries.py:203
 msgid "Sierra Leone"
 msgstr "Sierra Leone"
 
-#: src/utils/countries.py:204
+#: .\utils\countries.py:204
 msgid "Singapore"
 msgstr "Singapur"
 
-#: src/utils/countries.py:205
+#: .\utils\countries.py:205
 msgid "Slovakia"
 msgstr "Slowakei"
 
-#: src/utils/countries.py:206
+#: .\utils\countries.py:206
 msgid "Slovenia"
 msgstr "Slowenien"
 
-#: src/utils/countries.py:207
+#: .\utils\countries.py:207
 msgid "Solomon Islands"
 msgstr "Salomon-Inseln"
 
-#: src/utils/countries.py:208
+#: .\utils\countries.py:208
 msgid "Somalia"
 msgstr "Somalia"
 
-#: src/utils/countries.py:209
+#: .\utils\countries.py:209
 msgid "South Africa"
 msgstr "Südafrika"
 
-#: src/utils/countries.py:210
+#: .\utils\countries.py:210
 msgid "South Georgia and the South Sandwich Islands"
 msgstr "Südgeorgien und die Südlichen Sandwichinseln"
 
-#: src/utils/countries.py:211
+#: .\utils\countries.py:211
 msgid "Spain"
 msgstr "Spanien"
 
-#: src/utils/countries.py:212
+#: .\utils\countries.py:212
 msgid "Sri Lanka"
 msgstr "Sri Lanka"
 
-#: src/utils/countries.py:213
+#: .\utils\countries.py:213
 msgid "Sudan"
 msgstr "Sudan"
 
-#: src/utils/countries.py:214
+#: .\utils\countries.py:214
 msgid "Suriname"
 msgstr "Suriname"
 
-#: src/utils/countries.py:215
+#: .\utils\countries.py:215
 msgid "Svalbard and Jan Mayen"
 msgstr "Svalbard und Jan Mayen"
 
-#: src/utils/countries.py:216
+#: .\utils\countries.py:216
 msgid "Swaziland"
 msgstr "Swaziland"
 
-#: src/utils/countries.py:217
+#: .\utils\countries.py:217
 msgid "Sweden"
 msgstr "Schweden"
 
-#: src/utils/countries.py:218
+#: .\utils\countries.py:218
 msgid "Switzerland"
 msgstr "Schweiz"
 
-#: src/utils/countries.py:219
+#: .\utils\countries.py:219
 msgid "Syrian Arab Republic"
 msgstr "Arabische Republik Syrien"
 
-#: src/utils/countries.py:220
+#: .\utils\countries.py:220
 msgid "Taiwan, Province of China"
 msgstr "Taiwan, Province of China"
 
-#: src/utils/countries.py:221
+#: .\utils\countries.py:221
 msgid "Tajikistan"
 msgstr "Tadschikistan"
 
-#: src/utils/countries.py:222
+#: .\utils\countries.py:222
 msgid "Tanzania, United Republic of"
 msgstr "Tansania, Vereinigte Republik"
 
-#: src/utils/countries.py:223
+#: .\utils\countries.py:223
 msgid "Thailand"
 msgstr "Thailand"
 
-#: src/utils/countries.py:224
+#: .\utils\countries.py:224
 msgid "Timor-Leste"
 msgstr "Timor-Leste"
 
-#: src/utils/countries.py:225
+#: .\utils\countries.py:225
 msgid "Togo"
 msgstr "Togo"
 
-#: src/utils/countries.py:226
+#: .\utils\countries.py:226
 msgid "Tokelau"
 msgstr "Tokelau"
 
-#: src/utils/countries.py:227
+#: .\utils\countries.py:227
 msgid "Tonga"
 msgstr "Tonga"
 
-#: src/utils/countries.py:228
+#: .\utils\countries.py:228
 msgid "Trinidad and Tobago"
 msgstr "Trinidad und Tobago"
 
-#: src/utils/countries.py:229
+#: .\utils\countries.py:229
 msgid "Tunisia"
 msgstr "Tunesien"
 
-#: src/utils/countries.py:230
+#: .\utils\countries.py:230
 msgid "Turkey"
 msgstr "Türkei"
 
-#: src/utils/countries.py:231
+#: .\utils\countries.py:231
 msgid "Turkmenistan"
 msgstr "Turkmenistan"
 
-#: src/utils/countries.py:232
+#: .\utils\countries.py:232
 msgid "Turks and Caicos Islands"
 msgstr "Turks-und Caicosinseln"
 
-#: src/utils/countries.py:233
+#: .\utils\countries.py:233
 msgid "Tuvalu"
 msgstr "Tuvalu"
 
-#: src/utils/countries.py:234
+#: .\utils\countries.py:234
 msgid "Uganda"
 msgstr "Uganda"
 
-#: src/utils/countries.py:235
+#: .\utils\countries.py:235
 msgid "Ukraine"
 msgstr "Ukraine"
 
-#: src/utils/countries.py:236
+#: .\utils\countries.py:236
 msgid "United Arab Emirates"
 msgstr "Vereinigte Arabische Emirate"
 
-#: src/utils/countries.py:237
+#: .\utils\countries.py:237
 msgid "United States"
 msgstr "Vereinigte Staaten"
 
-#: src/utils/countries.py:238
+#: .\utils\countries.py:238
 msgid "United States Minor Outlying Islands"
 msgstr "United States Minor Outlying Islands"
 
-#: src/utils/countries.py:239
+#: .\utils\countries.py:239
 msgid "Uruguay"
 msgstr "Uruguay"
 
-#: src/utils/countries.py:240
+#: .\utils\countries.py:240
 msgid "Uzbekistan"
 msgstr "Usbekistan"
 
-#: src/utils/countries.py:241
+#: .\utils\countries.py:241
 msgid "Vanuatu"
 msgstr "Vanuatu"
 
-#: src/utils/countries.py:242
+#: .\utils\countries.py:242
 msgid "Venezuela"
 msgstr "Venezuela"
 
-#: src/utils/countries.py:243
+#: .\utils\countries.py:243
 msgid "Viet Nam"
 msgstr "Vietnam"
 
-#: src/utils/countries.py:244
+#: .\utils\countries.py:244
 msgid "Virgin Islands, British"
 msgstr "Virgin Islands, British"
 
-#: src/utils/countries.py:245
+#: .\utils\countries.py:245
 msgid "Virgin Islands, U.S."
 msgstr "Virgin Islands, US"
 
-#: src/utils/countries.py:246
+#: .\utils\countries.py:246
 msgid "Wallis and Futuna"
 msgstr "Wallis und Futuna"
 
-#: src/utils/countries.py:247
+#: .\utils\countries.py:247
 msgid "Western Sahara"
 msgstr "Westsahara"
 
-#: src/utils/countries.py:248
+#: .\utils\countries.py:248
 msgid "Yemen"
 msgstr "Jemen"
 
-#: src/utils/countries.py:249
+#: .\utils\countries.py:249
 msgid "Zambia"
 msgstr "Sambia"
 
-#: src/utils/countries.py:250
+#: .\utils\countries.py:250
 msgid "Zimbabwe"
 msgstr "Zimbabwe"