diff --git a/AKModel/locale/de_DE/LC_MESSAGES/django.po b/AKModel/locale/de_DE/LC_MESSAGES/django.po index ff6e3e216e50a9276b5d2d3f1a587e0d260f6cda..cb194b1899f3550aa50c61697d7661b66af2a5b4 100644 --- a/AKModel/locale/de_DE/LC_MESSAGES/django.po +++ b/AKModel/locale/de_DE/LC_MESSAGES/django.po @@ -2,7 +2,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-05-10 16:22+0000\n" +"POT-Creation-Date: 2020-05-10 17:15+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" @@ -11,155 +11,152 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -#: AKModel/admin.py:32 +#: admin.py:32 msgid "Wish" msgstr "AK-Wunsch" -#: AKModel/admin.py:38 +#: admin.py:38 msgid "Is wish" msgstr "Ist ein Wunsch" -#: AKModel/admin.py:39 +#: admin.py:39 msgid "Is not a wish" msgstr "Ist kein Wunsch" -#: AKModel/admin.py:65 +#: admin.py:65 msgid "Export to wiki syntax" msgstr "In Wiki-Syntax exportieren" -#: AKModel/availability.py:38 AKModel/models.py:37 AKModel/models.py:57 -#: AKModel/models.py:109 AKModel/models.py:128 AKModel/models.py:160 -#: AKModel/models.py:210 AKModel/models.py:246 AKModel/models.py:276 +#: availability.py:38 models.py:37 models.py:57 models.py:109 models.py:128 +#: models.py:160 models.py:211 models.py:247 models.py:277 msgid "Event" msgstr "Event" -#: AKModel/availability.py:39 AKModel/models.py:58 AKModel/models.py:110 -#: AKModel/models.py:129 AKModel/models.py:161 AKModel/models.py:211 -#: AKModel/models.py:247 AKModel/models.py:277 +#: availability.py:39 models.py:58 models.py:110 models.py:129 models.py:161 +#: models.py:212 models.py:248 models.py:278 msgid "Associated event" msgstr "Zugehöriges Event" -#: AKModel/availability.py:47 +#: availability.py:47 msgid "Person" msgstr "Person" -#: AKModel/availability.py:48 +#: availability.py:48 msgid "Person whose availability this is" msgstr "Person deren Verfügbarkeit hier abgebildet wird" -#: AKModel/availability.py:56 AKModel/models.py:250 AKModel/models.py:269 +#: availability.py:56 models.py:251 models.py:270 msgid "Room" msgstr "Raum" -#: AKModel/availability.py:57 +#: availability.py:57 msgid "Room whose availability this is" msgstr "Raum dessen Verfügbarkeit hier abgebildet wird" -#: AKModel/availability.py:65 AKModel/models.py:214 AKModel/models.py:268 +#: availability.py:65 models.py:215 models.py:269 msgid "AK" msgstr "AK" -#: AKModel/availability.py:66 +#: availability.py:66 msgid "AK whose availability this is" msgstr "Verfügbarkeiten" -#: AKModel/availability.py:74 AKModel/models.py:113 +#: availability.py:74 models.py:113 msgid "AK Category" msgstr "AK Kategorie" -#: AKModel/availability.py:75 +#: availability.py:75 msgid "AK Category whose availability this is" msgstr "AK Kategorie dessen Verfügbarkeit hier abgebildet wird" -#: AKModel/availability.py:235 +#: availability.py:235 msgid "Availability" msgstr "Verfügbarkeit" -#: AKModel/availability.py:236 +#: availability.py:236 msgid "Availabilities" msgstr "Verfügbarkeiten" -#: AKModel/models.py:14 AKModel/models.py:104 AKModel/models.py:125 -#: AKModel/models.py:144 AKModel/models.py:158 AKModel/models.py:176 -#: AKModel/models.py:239 +#: models.py:14 models.py:104 models.py:125 models.py:144 models.py:158 +#: models.py:176 models.py:240 msgid "Name" msgstr "Name" -#: AKModel/models.py:15 +#: models.py:15 msgid "Name or iteration of the event" msgstr "Name oder Iteration des Events" -#: AKModel/models.py:16 +#: models.py:16 msgid "Short Form" msgstr "Kurzer Name" -#: AKModel/models.py:17 +#: models.py:17 msgid "Short name of letters/numbers/dots/dashes/underscores used in URLs." msgstr "" "Kurzname bestehend aus Buchstaben, Nummern, Punkten und Unterstrichen zur " "Nutzung in URLs" -#: AKModel/models.py:19 +#: models.py:19 msgid "Place" msgstr "Ort" -#: AKModel/models.py:20 +#: models.py:20 msgid "City etc. the event takes place in" msgstr "Stadt o.ä. in der das Event stattfindet" -#: AKModel/models.py:22 +#: models.py:22 msgid "Time Zone" msgstr "Zeitzone" -#: AKModel/models.py:22 +#: models.py:22 msgid "Time Zone where this event takes place in" msgstr "Zeitzone in der das Event stattfindet" -#: AKModel/models.py:23 +#: models.py:23 msgid "Start" msgstr "Start" -#: AKModel/models.py:23 +#: models.py:23 msgid "Time the event begins" msgstr "Zeit zu der das Event beginnt" -#: AKModel/models.py:24 +#: models.py:24 msgid "End" msgstr "Ende" -#: AKModel/models.py:24 +#: models.py:24 msgid "Time the event ends" msgstr "Zeit zu der das Event endet" -#: AKModel/models.py:26 +#: models.py:26 msgid "Active State" msgstr "Aktiver Status" -#: AKModel/models.py:26 +#: models.py:26 msgid "Marks currently active events" msgstr "Markiert aktuell aktive Events" -#: AKModel/models.py:28 +#: models.py:28 msgid "Base URL" msgstr "URL-Prefix" -#: AKModel/models.py:28 +#: models.py:28 msgid "Prefix for wiki link construction" msgstr "Prefix für die automatische Generierung von Wiki-Links" -#: AKModel/models.py:29 +#: models.py:29 msgid "Default Slot Length" msgstr "Standardslotlänge" -#: AKModel/models.py:30 +#: models.py:30 msgid "Default length in hours that is assumed for AKs in this event." msgstr "Standardlänge von Slots (in Stunden) für dieses Event" -#: AKModel/models.py:32 +#: models.py:32 msgid "Contact email address" msgstr "E-Mail Kontaktadresse" -#: AKModel/models.py:34 +#: models.py:34 msgid "" "An email address that is displayed on every page and can be used for all " "kinds of questions" @@ -167,294 +164,301 @@ msgstr "" "Eine Mailadresse die auf jeder Seite angezeigt wird und für alle Arten von " "Fragen genutzt werden kann" -#: AKModel/models.py:38 +#: models.py:38 msgid "Events" msgstr "Events" -#: AKModel/models.py:52 +#: models.py:52 msgid "Nickname" msgstr "Spitzname" -#: AKModel/models.py:52 +#: models.py:52 msgid "Name to identify an AK owner by" msgstr "Name durch den eine AK Leitung identifiziert wird" -#: AKModel/models.py:53 +#: models.py:53 msgid "Slug" msgstr "Slug" -#: AKModel/models.py:53 +#: models.py:53 msgid "Slug for URL generation" msgstr "Slug für URL-Generierung" -#: AKModel/models.py:54 +#: models.py:54 msgid "Institution" msgstr "Instutution" -#: AKModel/models.py:54 +#: models.py:54 msgid "Uni etc." msgstr "Universität o.ä." -#: AKModel/models.py:55 AKModel/models.py:185 +#: models.py:55 models.py:185 msgid "Web Link" msgstr "Internet Link" -#: AKModel/models.py:55 +#: models.py:55 msgid "Link to Homepage" msgstr "Link zu Homepage oder Webseite" -#: AKModel/models.py:61 +#: models.py:61 msgid "AK Owner" msgstr "AK Leitung" -#: AKModel/models.py:62 +#: models.py:62 msgid "AK Owners" msgstr "AK Leitungen" -#: AKModel/models.py:104 +#: models.py:104 msgid "Name of the AK Category" msgstr "Name des AK Kategorie" -#: AKModel/models.py:105 AKModel/models.py:126 +#: models.py:105 models.py:126 msgid "Color" msgstr "Farbe" -#: AKModel/models.py:105 AKModel/models.py:126 +#: models.py:105 models.py:126 msgid "Color for displaying" msgstr "Farbe für die Anzeige" -#: AKModel/models.py:106 AKModel/models.py:179 +#: models.py:106 models.py:179 msgid "Description" msgstr "Beschreibung" -#: AKModel/models.py:107 +#: models.py:107 msgid "Short description of this AK Category" msgstr "Beschreibung der AK-Kategorie" -#: AKModel/models.py:114 +#: models.py:114 msgid "AK Categories" msgstr "AK Kategorien" -#: AKModel/models.py:125 +#: models.py:125 msgid "Name of the AK Track" msgstr "Name des AK Tracks" -#: AKModel/models.py:132 +#: models.py:132 msgid "AK Track" msgstr "AK Track" -#: AKModel/models.py:133 +#: models.py:133 msgid "AK Tracks" msgstr "AK Tracks" -#: AKModel/models.py:144 +#: models.py:144 msgid "Name of the AK Tag" msgstr "Name das AK Tags" -#: AKModel/models.py:147 +#: models.py:147 msgid "AK Tag" msgstr "AK Tag" -#: AKModel/models.py:148 +#: models.py:148 msgid "AK Tags" msgstr "AK Tags" -#: AKModel/models.py:158 +#: models.py:158 msgid "Name of the Requirement" msgstr "Name der Anforderung" -#: AKModel/models.py:164 +#: models.py:164 msgid "AK Requirement" msgstr "AK Anforderung" -#: AKModel/models.py:165 +#: models.py:165 msgid "AK Requirements" msgstr "AK Anforderungen" -#: AKModel/models.py:176 +#: models.py:176 msgid "Name of the AK" msgstr "Name des AKs" -#: AKModel/models.py:177 +#: models.py:177 msgid "Short Name" msgstr "Kurzer Name" -#: AKModel/models.py:178 +#: models.py:178 msgid "Name displayed in the schedule" msgstr "Name zur Anzeige im AK Plan" -#: AKModel/models.py:179 +#: models.py:179 msgid "Description of the AK" msgstr "Beschreibung des AKs" -#: AKModel/models.py:181 +#: models.py:181 msgid "Owners" msgstr "Leitungen" -#: AKModel/models.py:182 +#: models.py:182 msgid "Those organizing the AK" msgstr "Menschen, die den AK organisieren und halten" -#: AKModel/models.py:185 +#: models.py:185 msgid "Link to wiki page" msgstr "Link zur Wiki Seite" -#: AKModel/models.py:187 +#: models.py:187 msgid "Category" msgstr "Kategorie" -#: AKModel/models.py:188 +#: models.py:188 msgid "Category of the AK" msgstr "Kategorie des AKs" -#: AKModel/models.py:189 +#: models.py:189 msgid "Tags" msgstr "Tags" -#: AKModel/models.py:189 +#: models.py:189 msgid "Tags provided by owners" msgstr "Tags, die durch die AK Leitung vergeben wurden" -#: AKModel/models.py:190 +#: models.py:190 msgid "Track" msgstr "Track" -#: AKModel/models.py:191 +#: models.py:191 msgid "Track the AK belongs to" msgstr "Track zu dem der AK gehört" -#: AKModel/models.py:193 +#: models.py:193 msgid "Resolution Intention" msgstr "Resolutionsabsicht" -#: AKModel/models.py:194 +#: models.py:194 msgid "Intends to submit a resolution" msgstr "Beabsichtigt eine Resolution einzureichen" -#: AKModel/models.py:195 +#: models.py:195 msgid "Present this AK" msgstr "AK Präsentieren" -#: AKModel/models.py:196 +#: models.py:196 msgid "Present results of this AK" msgstr "Die Ergebnisse dieses AKs vorstellen" -#: AKModel/models.py:198 +#: models.py:198 msgid "Requirements" msgstr "Anforderungen" -#: AKModel/models.py:199 +#: models.py:199 msgid "AK's Requirements" msgstr "Anforderungen des AKs" -#: AKModel/models.py:201 +#: models.py:201 msgid "Conflicting AKs" msgstr "AK Konflikte" -#: AKModel/models.py:202 +#: models.py:202 msgid "AKs that conflict and thus must not take place at the same time" msgstr "" "AKs, die Konflikte haben und deshalb nicht gleichzeitig stattfinden dürfen" -#: AKModel/models.py:203 +#: models.py:203 msgid "Prerequisite AKs" msgstr "Vorausgesetzte AKs" -#: AKModel/models.py:204 +#: models.py:204 msgid "AKs that should precede this AK in the schedule" msgstr "AKS die im AK Plan vor diesem AK stattfinden müssen" -#: AKModel/models.py:206 -msgid "Internal Notes" +#: models.py:206 +#, fuzzy +#| msgid "Internal Notes" +msgid "Organizational Notes" msgstr "Interne Notizen" -#: AKModel/models.py:206 -msgid "Notes to organizers" -msgstr "Notizen an die Organisator*innen" +#: models.py:207 +msgid "" +"Notes to organizers. These are public. For private notes, please send an e-" +"mail." +msgstr "Notizen an die Organisator*innen. Diese sind öffentlich, für private Anmerkungen bitte eine E-Mail schicken." -#: AKModel/models.py:208 +#: models.py:209 msgid "Interest" msgstr "Interesse" -#: AKModel/models.py:208 +#: models.py:209 msgid "Expected number of people" msgstr "Erwartete Personenzahl" -#: AKModel/models.py:215 +#: models.py:216 msgid "AKs" msgstr "AKs" -#: AKModel/models.py:239 +#: models.py:240 msgid "Name or number of the room" msgstr "Name oder Nummer des Raums" -#: AKModel/models.py:240 +#: models.py:241 msgid "Building" msgstr "Gebäude" -#: AKModel/models.py:241 +#: models.py:242 msgid "Name or number of the building" msgstr "Name oder Nummer des Gebäudes" -#: AKModel/models.py:242 +#: models.py:243 msgid "Capacity" msgstr "Kapazität" -#: AKModel/models.py:242 +#: models.py:243 msgid "Maximum number of people" msgstr "Maximale Personenzahl" -#: AKModel/models.py:243 +#: models.py:244 msgid "Properties" msgstr "Eigenschaften" -#: AKModel/models.py:244 +#: models.py:245 msgid "AK requirements fulfilled by the room" msgstr "AK Anforderungen, die dieser Raum erfüllt" -#: AKModel/models.py:251 +#: models.py:252 msgid "Rooms" msgstr "Räume" -#: AKModel/models.py:268 +#: models.py:269 msgid "AK being mapped" msgstr "AK, der zugeordnet wird" -#: AKModel/models.py:270 +#: models.py:271 msgid "Room the AK will take place in" msgstr "Raum in dem der AK stattfindet" -#: AKModel/models.py:271 +#: models.py:272 msgid "Slot Begin" msgstr "Beginn des Slots" -#: AKModel/models.py:271 +#: models.py:272 msgid "Time and date the slot begins" msgstr "Zeit und Datum zu der der AK beginnt" -#: AKModel/models.py:273 +#: models.py:274 msgid "Duration" msgstr "Dauer" -#: AKModel/models.py:274 +#: models.py:275 msgid "Length in hours" msgstr "Länge in Stunden" -#: AKModel/models.py:279 +#: models.py:280 msgid "Last update" msgstr "Letzte Aktualisierung" -#: AKModel/models.py:282 +#: models.py:283 msgid "AK Slot" msgstr "AK Slot" -#: AKModel/models.py:283 +#: models.py:284 msgid "AK Slots" msgstr "AK Slot" -#: AKModel/models.py:297 +#: models.py:298 msgid "Not scheduled yet" msgstr "Noch nicht geplant" +#~ msgid "Notes to organizers" +#~ msgstr "Notizen an die Organisator*innen" + #~ msgid "E-Mail Address" #~ msgstr "E-Mail Adresse" diff --git a/AKModel/migrations/0029_AK_notes.py b/AKModel/migrations/0029_AK_notes.py new file mode 100644 index 0000000000000000000000000000000000000000..6c7e07f135e0779244636adaee54cbee2fb98aad --- /dev/null +++ b/AKModel/migrations/0029_AK_notes.py @@ -0,0 +1,19 @@ +# Generated by Django 2.2.6 on 2020-05-10 17:17 + +from django.db import migrations, models + + +class Migration(migrations.Migration): + dependencies = [ + ('AKModel', '0028_unique_constraints'), + ] + + operations = [ + migrations.AlterField( + model_name='ak', + name='notes', + field=models.TextField(blank=True, + help_text='Notes to organizers. These are public. For private notes, please send an e-mail.', + verbose_name='Organizational Notes'), + ), + ] diff --git a/AKModel/models.py b/AKModel/models.py index c9aab78c92aa4cc427e837f889b052e48ef85c19..6040e0e190dae9193d5dcf19bee6daf4395fc1c1 100644 --- a/AKModel/models.py +++ b/AKModel/models.py @@ -203,7 +203,8 @@ class AK(models.Model): prerequisites = models.ManyToManyField(to='AK', blank=True, verbose_name=_('Prerequisite AKs'), help_text=_('AKs that should precede this AK in the schedule')) - notes = models.TextField(blank=True, verbose_name=_('Internal Notes'), help_text=_('Notes to organizers')) + notes = models.TextField(blank=True, verbose_name=_('Organizational Notes'), help_text=_( + 'Notes to organizers. These are public. For private notes, please send an e-mail.')) interest = models.IntegerField(default=-1, verbose_name=_('Interest'), help_text=_('Expected number of people')) diff --git a/AKSubmission/locale/de_DE/LC_MESSAGES/django.po b/AKSubmission/locale/de_DE/LC_MESSAGES/django.po index 4864a5b3edfa08c9b277de2a385307213aef21d8..834d6bcc49ed322ecde3b2598ffdd177b754611c 100644 --- a/AKSubmission/locale/de_DE/LC_MESSAGES/django.po +++ b/AKSubmission/locale/de_DE/LC_MESSAGES/django.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-05-10 16:22+0000\n" +"POT-Creation-Date: 2020-05-10 17:14+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" @@ -17,20 +17,20 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -#: AKSubmission/forms.py:43 +#: forms.py:43 msgid "Separate multiple tags with semicolon" msgstr "Mehrere Tags mit Semikolon trennen" -#: AKSubmission/forms.py:69 +#: forms.py:69 #, python-format msgid "\"%(duration)s\" is not a valid duration" msgstr "\"%(duration)s\" ist keine gültige Dauer" -#: AKSubmission/forms.py:112 +#: forms.py:112 msgid "Duration(s)" msgstr "Dauer(n)" -#: AKSubmission/forms.py:114 +#: forms.py:114 msgid "" "Enter at least one planned duration (in hours). If your AK should have " "multiple slots, use multiple lines" @@ -38,259 +38,261 @@ msgstr "" "Mindestens eine geplante Dauer (in Stunden) angeben. Wenn der AK mehrere " "Slots haben soll, mehrere Zeilen verwenden" -#: AKSubmission/templates/AKSubmission/ak_detail.html:10 -#: AKSubmission/templates/AKSubmission/ak_edit.html:8 -#: AKSubmission/templates/AKSubmission/ak_list.html:8 -#: AKSubmission/templates/AKSubmission/akowner_create_update.html:7 -#: AKSubmission/templates/AKSubmission/akslot_add_update.html:7 -#: AKSubmission/templates/AKSubmission/akslot_delete.html:7 -#: AKSubmission/templates/AKSubmission/submission_overview.html:6 -#: AKSubmission/templates/AKSubmission/submission_overview.html:23 -#: AKSubmission/templates/AKSubmission/submit_new.html:8 -#: AKSubmission/templates/AKSubmission/submit_new_wish.html:5 +#: templates/AKSubmission/ak_detail.html:10 +#: templates/AKSubmission/ak_edit.html:8 templates/AKSubmission/ak_list.html:8 +#: templates/AKSubmission/akowner_create_update.html:7 +#: templates/AKSubmission/akslot_add_update.html:7 +#: templates/AKSubmission/akslot_delete.html:7 +#: templates/AKSubmission/submission_overview.html:6 +#: templates/AKSubmission/submission_overview.html:23 +#: templates/AKSubmission/submit_new.html:8 +#: templates/AKSubmission/submit_new_wish.html:5 msgid "AKs" msgstr "AKs" -#: AKSubmission/templates/AKSubmission/ak_detail.html:10 -#: AKSubmission/templates/AKSubmission/akslot_delete.html:31 +#: templates/AKSubmission/ak_detail.html:10 +#: templates/AKSubmission/akslot_delete.html:31 msgid "AK" msgstr "AK" -#: AKSubmission/templates/AKSubmission/ak_detail.html:15 -#: AKSubmission/templates/AKSubmission/ak_edit.html:13 -#: AKSubmission/templates/AKSubmission/ak_list.html:22 -#: AKSubmission/templates/AKSubmission/akowner_create_update.html:12 -#: AKSubmission/templates/AKSubmission/akslot_add_update.html:12 -#: AKSubmission/templates/AKSubmission/akslot_delete.html:12 -#: AKSubmission/templates/AKSubmission/submission_overview.html:6 -#: AKSubmission/templates/AKSubmission/submission_overview.html:19 -#: AKSubmission/templates/AKSubmission/submit_new.html:18 -#: AKSubmission/templates/AKSubmission/submit_new_wish.html:10 +#: templates/AKSubmission/ak_detail.html:15 +#: templates/AKSubmission/ak_edit.html:13 +#: templates/AKSubmission/ak_list.html:22 +#: templates/AKSubmission/akowner_create_update.html:12 +#: templates/AKSubmission/akslot_add_update.html:12 +#: templates/AKSubmission/akslot_delete.html:12 +#: templates/AKSubmission/submission_overview.html:6 +#: templates/AKSubmission/submission_overview.html:19 +#: templates/AKSubmission/submit_new.html:18 +#: templates/AKSubmission/submit_new_wish.html:10 msgid "AK Submission" msgstr "AK-Eintragung" -#: AKSubmission/templates/AKSubmission/ak_detail.html:37 -#: AKSubmission/templates/AKSubmission/ak_list_table.html:32 +#: templates/AKSubmission/ak_detail.html:37 +#: templates/AKSubmission/ak_list_table.html:32 msgid "AK Wish" msgstr "AK-Wunsch" -#: AKSubmission/templates/AKSubmission/ak_detail.html:41 -#: AKSubmission/templates/AKSubmission/ak_list_table.html:10 +#: templates/AKSubmission/ak_detail.html:41 +#: templates/AKSubmission/ak_list_table.html:10 msgid "Who?" msgstr "Wer?" -#: AKSubmission/templates/AKSubmission/ak_detail.html:45 -#: AKSubmission/templates/AKSubmission/ak_list_table.html:11 +#: templates/AKSubmission/ak_detail.html:45 +#: templates/AKSubmission/ak_list_table.html:11 msgid "Category" msgstr "Kategorie" -#: AKSubmission/templates/AKSubmission/ak_detail.html:51 +#: templates/AKSubmission/ak_detail.html:51 msgid "Present this AK" msgstr "Diesen AK vorstellen" -#: AKSubmission/templates/AKSubmission/ak_detail.html:55 -#: AKSubmission/templates/AKSubmission/ak_list.html:35 -#: AKSubmission/templates/AKSubmission/ak_list_table.html:12 +#: templates/AKSubmission/ak_detail.html:55 +#: templates/AKSubmission/ak_list.html:35 +#: templates/AKSubmission/ak_list_table.html:12 msgid "Tags" msgstr "Tags" -#: AKSubmission/templates/AKSubmission/ak_detail.html:61 +#: templates/AKSubmission/ak_detail.html:61 msgid "Reso?" msgstr "Reso?" -#: AKSubmission/templates/AKSubmission/ak_detail.html:68 +#: templates/AKSubmission/ak_detail.html:68 msgid "Requirements" msgstr "Anforderungen" -#: AKSubmission/templates/AKSubmission/ak_detail.html:81 +#: templates/AKSubmission/ak_detail.html:81 msgid "Conflicting AKs" msgstr "AK Konflikte" -#: AKSubmission/templates/AKSubmission/ak_detail.html:89 +#: templates/AKSubmission/ak_detail.html:89 msgid "Prerequisite AKs" msgstr "AK Voraussetzungen" -#: AKSubmission/templates/AKSubmission/ak_detail.html:108 +#: templates/AKSubmission/ak_detail.html:97 +msgid "Notes" +msgstr "Notizen" + +#: templates/AKSubmission/ak_detail.html:114 msgid "When?" msgstr "Wann?" -#: AKSubmission/templates/AKSubmission/ak_detail.html:109 -#: AKSubmission/templates/AKSubmission/akslot_delete.html:35 +#: templates/AKSubmission/ak_detail.html:115 +#: templates/AKSubmission/akslot_delete.html:35 msgid "Duration" msgstr "Dauer" -#: AKSubmission/templates/AKSubmission/ak_detail.html:110 +#: templates/AKSubmission/ak_detail.html:116 msgid "Room" msgstr "Raum" -#: AKSubmission/templates/AKSubmission/ak_detail.html:136 +#: templates/AKSubmission/ak_detail.html:142 msgid "Add another slot" msgstr "Einen neuen AK-Slot hinzufügen" -#: AKSubmission/templates/AKSubmission/ak_edit.html:8 -#: AKSubmission/templates/AKSubmission/ak_edit.html:21 +#: templates/AKSubmission/ak_edit.html:8 templates/AKSubmission/ak_edit.html:21 msgid "Edit AK" msgstr "AK bearbeiten" -#: AKSubmission/templates/AKSubmission/ak_edit.html:16 +#: templates/AKSubmission/ak_edit.html:16 msgid "Edit" msgstr "Bearbeiten" -#: AKSubmission/templates/AKSubmission/ak_list.html:23 -#: AKSubmission/templates/AKSubmission/ak_list.html:27 +#: templates/AKSubmission/ak_list.html:23 +#: templates/AKSubmission/ak_list.html:27 msgid "AK List" msgstr "AK Liste" -#: AKSubmission/templates/AKSubmission/ak_list.html:29 +#: templates/AKSubmission/ak_list.html:29 msgid "Categories" msgstr "Kategorie" -#: AKSubmission/templates/AKSubmission/ak_list_table.html:9 +#: templates/AKSubmission/ak_list_table.html:9 msgid "Name" msgstr "Name" -#: AKSubmission/templates/AKSubmission/ak_list_table.html:23 +#: templates/AKSubmission/ak_list_table.html:23 msgid "present this AK" msgstr "Diesen AK vorstellen" -#: AKSubmission/templates/AKSubmission/ak_list_table.html:27 +#: templates/AKSubmission/ak_list_table.html:27 msgid "Reso" msgstr "Reso" -#: AKSubmission/templates/AKSubmission/akowner_create_update.html:7 -#: AKSubmission/templates/AKSubmission/akowner_create_update.html:13 -#: AKSubmission/templates/AKSubmission/akowner_create_update.html:18 +#: templates/AKSubmission/akowner_create_update.html:7 +#: templates/AKSubmission/akowner_create_update.html:13 +#: templates/AKSubmission/akowner_create_update.html:18 msgid "AK Owner" msgstr "AK-Leitung" -#: AKSubmission/templates/AKSubmission/akowner_create_update.html:24 -#: AKSubmission/templates/AKSubmission/akslot_add_update.html:26 -#: AKSubmission/templates/AKSubmission/submit_new.html:34 +#: templates/AKSubmission/akowner_create_update.html:24 +#: templates/AKSubmission/akslot_add_update.html:26 +#: templates/AKSubmission/submit_new.html:34 msgid "Reset" msgstr "Zurücksetzen" -#: AKSubmission/templates/AKSubmission/akowner_create_update.html:28 -#: AKSubmission/templates/AKSubmission/akslot_add_update.html:30 -#: AKSubmission/templates/AKSubmission/akslot_delete.html:42 -#: AKSubmission/templates/AKSubmission/submit_new.html:38 +#: templates/AKSubmission/akowner_create_update.html:28 +#: templates/AKSubmission/akslot_add_update.html:30 +#: templates/AKSubmission/akslot_delete.html:42 +#: templates/AKSubmission/submit_new.html:38 msgid "Cancel" msgstr "Abbrechen" -#: AKSubmission/templates/AKSubmission/akowner_create_update.html:31 -#: AKSubmission/templates/AKSubmission/akslot_add_update.html:33 +#: templates/AKSubmission/akowner_create_update.html:31 +#: templates/AKSubmission/akslot_add_update.html:33 msgid "Continue" msgstr "Weiter" -#: AKSubmission/templates/AKSubmission/akslot_add_update.html:7 -#: AKSubmission/templates/AKSubmission/akslot_add_update.html:15 -#: AKSubmission/templates/AKSubmission/akslot_add_update.html:20 -#: AKSubmission/templates/AKSubmission/akslot_delete.html:7 -#: AKSubmission/templates/AKSubmission/akslot_delete.html:15 -#: AKSubmission/templates/AKSubmission/akslot_delete.html:20 +#: templates/AKSubmission/akslot_add_update.html:7 +#: templates/AKSubmission/akslot_add_update.html:15 +#: templates/AKSubmission/akslot_add_update.html:20 +#: templates/AKSubmission/akslot_delete.html:7 +#: templates/AKSubmission/akslot_delete.html:15 +#: templates/AKSubmission/akslot_delete.html:20 msgid "AK Duration(s)" msgstr "AK-Dauer(n)" -#: AKSubmission/templates/AKSubmission/akslot_delete.html:25 +#: templates/AKSubmission/akslot_delete.html:25 msgid "Do you really want to delete this AK Slot?" msgstr "Willst du diesen AK-Slot wirklich löschen?" -#: AKSubmission/templates/AKSubmission/akslot_delete.html:45 +#: templates/AKSubmission/akslot_delete.html:45 msgid "Confirm" msgstr "Bestätigen" -#: AKSubmission/templates/AKSubmission/submission_base.html:13 +#: templates/AKSubmission/submission_base.html:13 msgid "Write to organizers of this event for questions and comments" msgstr "Fragen oder Kommentare? Schreib den Orgas dieses Events eine Mail" -#: AKSubmission/templates/AKSubmission/submission_overview.html:27 +#: templates/AKSubmission/submission_overview.html:27 msgid "" "On this page you can see a list of current AKs, change them and add new ones." msgstr "" "Auf dieser Seite kannst du eine Liste von aktuellen AKs sehen, diese " "bearbeiten und neue hinzufügen." -#: AKSubmission/templates/AKSubmission/submission_overview.html:34 -#: AKSubmission/templates/AKSubmission/submit_new_wish.html:5 -#: AKSubmission/templates/AKSubmission/submit_new_wish.html:11 -#: AKSubmission/templates/AKSubmission/submit_new_wish.html:15 +#: templates/AKSubmission/submission_overview.html:34 +#: templates/AKSubmission/submit_new_wish.html:5 +#: templates/AKSubmission/submit_new_wish.html:11 +#: templates/AKSubmission/submit_new_wish.html:15 msgid "New AK Wish" msgstr "Neuer AK-Wunsch" -#: AKSubmission/templates/AKSubmission/submission_overview.html:38 +#: templates/AKSubmission/submission_overview.html:38 msgid "Who" msgstr "Wer" -#: AKSubmission/templates/AKSubmission/submission_overview.html:41 +#: templates/AKSubmission/submission_overview.html:41 msgid "I do not own AKs yet" msgstr "Ich leite bisher keine AKs" -#: AKSubmission/templates/AKSubmission/submission_overview.html:49 -#: AKSubmission/templates/AKSubmission/submit_new.html:8 -#: AKSubmission/templates/AKSubmission/submit_new.html:21 -#: AKSubmission/templates/AKSubmission/submit_new.html:28 +#: templates/AKSubmission/submission_overview.html:49 +#: templates/AKSubmission/submit_new.html:8 +#: templates/AKSubmission/submit_new.html:21 +#: templates/AKSubmission/submit_new.html:28 msgid "New AK" msgstr "Neuer AK" -#: AKSubmission/templates/AKSubmission/submission_overview.html:55 +#: templates/AKSubmission/submission_overview.html:55 msgid "Edit Person Info" msgstr "Personen-Info bearbeiten" -#: AKSubmission/templates/AKSubmission/submission_overview.html:62 +#: templates/AKSubmission/submission_overview.html:62 msgid "This event is not active. You cannot add or change AKs" msgstr "" "Dieses Event is nicht aktiv. Es können keine AKs hinzugefügt oder bearbeitet " "werden" -#: AKSubmission/templates/AKSubmission/submission_overview.html:66 +#: templates/AKSubmission/submission_overview.html:66 msgid "Current AKs" msgstr "Aktuelle AKs" -#: AKSubmission/templates/AKSubmission/submit_new.html:41 +#: templates/AKSubmission/submit_new.html:41 msgid "Submit" msgstr "Eintragen" -#: AKSubmission/views.py:42 +#: views.py:42 msgid "Wishes" msgstr "Wünsche" -#: AKSubmission/views.py:42 +#: views.py:42 msgid "AKs one would like to have" msgstr "" "AKs die sich gewünscht wurden, aber bei denen noch nicht klar ist, wer sie " "macht. Falls du dir das vorstellen kannst, trag dich einfach ein" -#: AKSubmission/views.py:103 +#: views.py:103 msgid "AK successfully created" msgstr "AK erfolgreich angelegt" -#: AKSubmission/views.py:156 +#: views.py:156 msgid "AK successfully updated" msgstr "AK erfolgreich aktualisiert" -#: AKSubmission/views.py:211 +#: views.py:211 msgid "Person Info successfully updated" msgstr "Personen-Info erfolgreich aktualisiert" -#: AKSubmission/views.py:224 +#: views.py:224 msgid "No user selected" msgstr "Keine Person ausgewählt" -#: AKSubmission/views.py:250 +#: views.py:250 msgid "AK Slot successfully added" msgstr "AK-Slot erfolgreich angelegt" -#: AKSubmission/views.py:264 +#: views.py:264 msgid "You cannot edit a slot that has already been scheduled" msgstr "Bereits geplante AK-Slots können nicht mehr bearbeitet werden" -#: AKSubmission/views.py:274 +#: views.py:274 msgid "AK Slot successfully updated" msgstr "AK-Slot erfolgreich aktualisiert" -#: AKSubmission/views.py:287 +#: views.py:287 msgid "You cannot delete a slot that has already been scheduled" msgstr "Bereits geplante AK-Slots können nicht mehr gelöscht werden" -#: AKSubmission/views.py:297 +#: views.py:297 msgid "AK Slot successfully deleted" msgstr "AK-Slot erfolgreich angelegt" diff --git a/AKSubmission/templates/AKSubmission/ak_detail.html b/AKSubmission/templates/AKSubmission/ak_detail.html index 02030ffc9f7e33eaa5034fd803cbd84387ad08b3..d873f629a482b38ed603a9445b3e47d469e1948b 100644 --- a/AKSubmission/templates/AKSubmission/ak_detail.html +++ b/AKSubmission/templates/AKSubmission/ak_detail.html @@ -92,6 +92,12 @@ </td> </tr> {% endif %} + {% if ak.notes %} + <tr> + <td>{% trans "Notes" %}</td> + <td>{{ ak.notes }}</td> + </tr> + {% endif %} </table> <p style="margin-top: 30px;margin-bottom: 30px;">{{ ak.description }}</p>