Skip to content

Commit

Permalink
Merge pull request #176 from volunteer-planner/hotfix/fix_need_deletion
Browse files Browse the repository at this point in the history 
Hotfix/Fix need (shift) deletion bug
  • Loading branch information
@Doca
Doca committed Oct 7, 2015
2 parents db4813e + bd9c7fa commit 714b2c3
Show file tree
Hide file tree
Showing 6 changed files with 555 additions and 367 deletions.
53 changes: 26 additions & 27 deletions locale/de/LC_MESSAGES/django.po
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,20 +3,23 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
# Translators:
# audrey liehn <[email protected]>, 2015
# Caroline Elis <[email protected]>, 2015
# Christoph, 2015
# Christoph, 2015
# Christoph, 2015
# Dorian Cantzen <[email protected]>, 2015
# Fabian Lindenberg, 2015
# Fabian Lindenberg, 2015
# Franziska Böttger <[email protected]>, 2015
# Peter Palmreuther <[email protected]>, 2015
msgid ""
msgstr ""
"Project-Id-Version: volunteer-planner.org\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2015-10-05 00:54+0200\n"
"PO-Revision-Date: 2015-10-04 22:25+0000\n"
"POT-Creation-Date: 2015-10-07 16:04+0200\n"
"PO-Revision-Date: 2015-10-07 14:05+0000\n"
"Last-Translator: Christoph\n"
"Language-Team: German (http://www.transifex.com/coders4help/volunteer-planner/language/de/)\n"
"MIME-Version: 1.0\n"
Expand Down Expand Up @@ -64,7 +67,6 @@ msgid "There is already a blueprint for this location!"
msgstr "Es gibt bereits eine Vorlage für diese Unterkunft"

#: blueprint/models.py:8
#| msgid "Imprint"
msgid "Blueprint"
msgstr "Vorlage"

Expand All @@ -76,7 +78,7 @@ msgstr "Vorlagen"
msgid "blueprint title"
msgstr "Vorlagen Titel"

#: blueprint/models.py:12 scheduler/models.py:58 scheduler/models.py:163
#: blueprint/models.py:12 scheduler/models.py:58 scheduler/models.py:161
msgid "location"
msgstr "Ort"

Expand Down Expand Up @@ -171,7 +173,6 @@ msgid "Privacy Policy"
msgstr "Privatsphäre"

#: non_logged_in_area/templates/faqs.html:10
#| msgid "How does volunteer-planner work?"
msgctxt "FAQ Q1"
msgid "How does volunteer-planner work?"
msgstr "Wie funktioniert der Volunteer Planner?"
Expand Down Expand Up @@ -203,7 +204,6 @@ msgid "Get there on time and start helping out."
msgstr "Sei zu Schichtbeginn vor Ort und hilf."

#: non_logged_in_area/templates/faqs.html:51
#| msgid "How can I unsubscribe from a shift?"
msgctxt "FAQ Q2"
msgid "How can I unsubscribe from a shift?"
msgstr "Ich kann meine Schicht doch nicht wahrnehmen. Was soll ich tun?"
Expand Down Expand Up @@ -258,7 +258,6 @@ msgid ""
msgstr "Du musst nicht geimpft sein. Aber: An allen Orten, an denen viele Menschen auf engem Raum zusammenleben, können sich Krankheiten leichter verbreiten. Somit sind die üblichen Impfungen empfehlenswert."

#: non_logged_in_area/templates/faqs.html:114
#| msgid "How does volunteer-planner work?"
msgctxt "FAQ Q6"
msgid "Who is volunteer-planner.org?"
msgstr "Wer macht den volunteer-planner.org?"
Expand Down Expand Up @@ -428,7 +427,7 @@ msgstr "Untertitel"
msgid "text"
msgstr "Text"

#: places/models.py:20 scheduler/models.py:143 shiftmailer/models.py:10
#: places/models.py:20 scheduler/models.py:141 shiftmailer/models.py:10
msgid "name"
msgstr "Name"

Expand Down Expand Up @@ -460,7 +459,7 @@ msgstr "Gebiet"
msgid "areas"
msgstr "Gebiete"

#: places/models.py:132 scheduler/models.py:160
#: places/models.py:132 scheduler/models.py:158
msgid "place"
msgstr "Ort"

Expand All @@ -472,7 +471,7 @@ msgstr "Orte"
msgid "Scheduler"
msgstr "Schichtplaner"

#: scheduler/models.py:56 scheduler/models.py:128
#: scheduler/models.py:56 scheduler/models.py:126
msgid "help type"
msgstr "Hilfebereich"

Expand Down Expand Up @@ -504,35 +503,35 @@ msgstr "Schichthelfer"
msgid "shift helpers"
msgstr "Schichthelfer"

#: scheduler/models.py:129
#: scheduler/models.py:127
msgid "help types"
msgstr "Hilfebereiche"

#: scheduler/models.py:145
#: scheduler/models.py:143
msgid "address"
msgstr "Adresse"

#: scheduler/models.py:147
#: scheduler/models.py:145
msgid "city"
msgstr "Ort"

#: scheduler/models.py:149
#: scheduler/models.py:147
msgid "postal code"
msgstr "Postleitzahl"

#: scheduler/models.py:151
#: scheduler/models.py:149
msgid "latitude"
msgstr "Breite"

#: scheduler/models.py:153
#: scheduler/models.py:151
msgid "longitude"
msgstr "Länge"

#: scheduler/models.py:155
#: scheduler/models.py:153
msgid "description"
msgstr "Beschreibung"

#: scheduler/models.py:164
#: scheduler/models.py:162
msgid "locations"
msgstr "Orte"

Expand Down Expand Up @@ -640,8 +639,8 @@ msgid ""
"\n"
"leider musste auf Wunsch der Zuständigen die folgende Schicht abgesagt werden:\n"
"\n"
"%(shift.topic.title)s, %(shift.location.name)s\n"
"%(shift.starting_time.date)s von %(shift.starting_time.time)s bis %(shift.ending_time.time)s\n"
"%(shift_title)s, %(location)s\n"
"%(from_date)s von %(from_time)s bis %(to_time)s\n"
"\n"
"Dies hier ist eine automatisch generierte Email. Bei Fragen, wenden Sie sich bitte an die Emailadresse, die bei den Unterkünften in der Beschreibung angegeben ist.\n"
"\n"
Expand All @@ -657,12 +656,12 @@ msgid ""
"\n"
"wir mussten die folgende Schicht zeitlich anpassen:\n"
"\n"
"%(shift.topic.title)s, %(shift.location.name)s\n"
"%(old.starting_time.date)s von %(old.starting_time.time)s bis %(old.ending_time.time)s\n"
"%(shift_title)s, %(location)s\n"
"%(old_from_date)s von %(old_from_time)s bis %(old_to_time)s\n"
"\n"
"Die neuen Schichtzeiten sind:\n"
"\n"
"am %(shift.starting_time.date)s von %(shift.starting_time.time)s bis %(shift.ending_time.time)s.\n"
"%(from_date)s von %(from_time)s bis %(to_time)s\n"
"\n"
"Wenn Sie zur neuen Uhrzeit unglücklicher Weise nicht mehr helfen kännen, bitten\n"
"wir Sie, sich im Volunteer-Planner aus dieser Schicht auszutragen, damit jemand\n"
Expand Down Expand Up @@ -773,21 +772,21 @@ msgstr "Benutzeraccout aktiviert"
msgid "Activation problem"
msgstr "Benutzeraccount konnte nicht aktiviert werden"

#: templates/registration/activate.html:14
#: templates/registration/activate.html:15
msgctxt ""
"login link title in registration confirmation success text 'You may now "
"%(login_link)s'"
msgid "login"
msgstr "einloggen"

#: templates/registration/activate.html:15
#: templates/registration/activate.html:17
#, python-format
msgid ""
"Thanks %(account)s, activation complete! You may now %(login_link)s using "
"the username and password you set at registration."
msgstr "Danke %(account)s, die Aktivierung ist abgeschlossen! Du kannst dich jetzt mit deinem Benutzernamen und Passwort %(login_link)s."

#: templates/registration/activate.html:20
#: templates/registration/activate.html:25
msgid ""
"Oops &ndash; Either you activated your account already, or the activation "
"key is invalid or has expired."
Expand Down Expand Up @@ -859,7 +858,7 @@ msgctxt "login link title reset password complete page"
msgid "log in"
msgstr "einloggen"

#: templates/registration/password_reset_complete.html:9
#: templates/registration/password_reset_complete.html:10
#, python-format
msgctxt "reset password complete page"
msgid "Your password has been reset! You may now %(login_link)s again."
Expand Down
Loading

0 comments on commit 714b2c3

Please sign in to comment.