Merge branch 'unify-terminology' into 'master'

Improve translation (and original strings)

See merge request kif/akplanning!71

AKDashboard/locale/de_DE/LC_MESSAGES/django.po

@@ -35,7 +35,7 @@ msgstr "Text, der auf dem Button angezeigt wird"
 
 #: AKDashboard/models.py:23
 msgid "Link URL"
-msgstr "Link URL"
+msgstr "Link-URL"
 
 #: AKDashboard/models.py:23
 msgid "URL this button links to"
@@ -83,7 +83,7 @@ msgstr "Kürzlich"
 
 #: AKDashboard/templates/AKDashboard/dashboard_row.html:12
 msgid "AK List"
-msgstr "AK Liste"
+msgstr "AK-Liste"
 
 #: AKDashboard/templates/AKDashboard/dashboard_row.html:23
 msgid "Current AKs"

AKModel/locale/de_DE/LC_MESSAGES/django.po

@@ -11,28 +11,29 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: AKModel/admin.py:38 AKModel/admin.py:39
+#: AKModel/admin.py:41 AKModel/admin.py:42
 #: AKModel/templates/admin/AKModel/status.html:7
+#: AKModel/templates/admin/ak_index.html:15
 msgid "Status"
 msgstr "Status"
 
-#: AKModel/admin.py:117
+#: AKModel/admin.py:120
 msgid "Wish"
 msgstr "AK-Wunsch"
 
-#: AKModel/admin.py:123
+#: AKModel/admin.py:126
 msgid "Is wish"
 msgstr "Ist ein Wunsch"
 
-#: AKModel/admin.py:124
+#: AKModel/admin.py:127
 msgid "Is not a wish"
 msgstr "Ist kein Wunsch"
 
-#: AKModel/admin.py:151
+#: AKModel/admin.py:154
 msgid "Export to wiki syntax"
 msgstr "In Wiki-Syntax exportieren"
 
-#: AKModel/availability/forms.py:20 AKModel/availability/models.py:235
+#: AKModel/availability/forms.py:20 AKModel/availability/models.py:239
 msgid "Availability"
 msgstr "Verfügbarkeit"
 
@@ -58,13 +59,14 @@ msgstr "Bitte Verfügbarkeiten eintragen!"
 
 #: AKModel/availability/models.py:38 AKModel/models.py:47 AKModel/models.py:76
 #: AKModel/models.py:128 AKModel/models.py:147 AKModel/models.py:179
-#: AKModel/models.py:233 AKModel/models.py:279 AKModel/models.py:309
+#: AKModel/models.py:233 AKModel/models.py:292 AKModel/models.py:324
+#: AKModel/models.py:410
 msgid "Event"
 msgstr "Event"
 
 #: AKModel/availability/models.py:39 AKModel/models.py:77 AKModel/models.py:129
 #: AKModel/models.py:148 AKModel/models.py:180 AKModel/models.py:234
-#: AKModel/models.py:280 AKModel/models.py:310
+#: AKModel/models.py:293 AKModel/models.py:325 AKModel/models.py:411
 msgid "Associated event"
 msgstr "Zugehöriges Event"
 
@@ -76,8 +78,8 @@ msgstr "Person"
 msgid "Person whose availability this is"
 msgstr "Person deren Verfügbarkeit hier abgebildet wird"
 
-#: AKModel/availability/models.py:56 AKModel/models.py:283
-#: AKModel/models.py:302
+#: AKModel/availability/models.py:56 AKModel/models.py:296
+#: AKModel/models.py:315 AKModel/models.py:419
 msgid "Room"
 msgstr "Raum"
 
@@ -86,7 +88,7 @@ msgid "Room whose availability this is"
 msgstr "Raum dessen Verfügbarkeit hier abgebildet wird"
 
 #: AKModel/availability/models.py:65 AKModel/models.py:239
-#: AKModel/models.py:301 AKModel/models.py:351
+#: AKModel/models.py:314 AKModel/models.py:366
 msgid "AK"
 msgstr "AK"
 
@@ -95,20 +97,21 @@ msgid "AK whose availability this is"
 msgstr "Verfügbarkeiten"
 
 #: AKModel/availability/models.py:74 AKModel/models.py:132
+#: AKModel/models.py:425
 msgid "AK Category"
-msgstr "AK Kategorie"
+msgstr "AK-Kategorie"
 
 #: AKModel/availability/models.py:75
 msgid "AK Category whose availability this is"
-msgstr "AK Kategorie dessen Verfügbarkeit hier abgebildet wird"
+msgstr "AK-Kategorie, deren Verfügbarkeit hier abgebildet wird"
 
-#: AKModel/availability/models.py:236
+#: AKModel/availability/models.py:240
 msgid "Availabilities"
 msgstr "Verfügbarkeiten"
 
 #: AKModel/models.py:16 AKModel/models.py:123 AKModel/models.py:144
 #: AKModel/models.py:163 AKModel/models.py:177 AKModel/models.py:195
-#: AKModel/models.py:272
+#: AKModel/models.py:285
 msgid "Name"
 msgstr "Name"
 
@@ -232,7 +235,7 @@ msgstr "Spitzname"
 
 #: AKModel/models.py:71
 msgid "Name to identify an AK owner by"
-msgstr "Name durch den eine AK Leitung identifiziert wird"
+msgstr "Name, durch den eine AK-Leitung identifiziert wird"
 
 #: AKModel/models.py:72
 msgid "Slug"
@@ -258,17 +261,17 @@ msgstr "Internet Link"
 msgid "Link to Homepage"
 msgstr "Link zu Homepage oder Webseite"
 
-#: AKModel/models.py:80
+#: AKModel/models.py:80 AKModel/models.py:418
 msgid "AK Owner"
-msgstr "AK Leitung"
+msgstr "AK-Leitung"
 
 #: AKModel/models.py:81
 msgid "AK Owners"
-msgstr "AK Leitungen"
+msgstr "AK-Leitungen"
 
 #: AKModel/models.py:123
 msgid "Name of the AK Category"
-msgstr "Name des AK Kategorie"
+msgstr "Name der AK-Kategorie"
 
 #: AKModel/models.py:124 AKModel/models.py:145
 msgid "Color"
@@ -288,43 +291,43 @@ msgstr "Beschreibung der AK-Kategorie"
 
 #: AKModel/models.py:133
 msgid "AK Categories"
-msgstr "AK Kategorien"
+msgstr "AK-Kategorien"
 
 #: AKModel/models.py:144
 msgid "Name of the AK Track"
-msgstr "Name des AK Tracks"
+msgstr "Name des AK-Tracks"
 
 #: AKModel/models.py:151
 msgid "AK Track"
-msgstr "AK Track"
+msgstr "AK-Track"
 
 #: AKModel/models.py:152
 msgid "AK Tracks"
-msgstr "AK Tracks"
+msgstr "AK-Tracks"
 
 #: AKModel/models.py:163
 msgid "Name of the AK Tag"
-msgstr "Name das AK Tags"
+msgstr "Name das AK-Tags"
 
 #: AKModel/models.py:166
 msgid "AK Tag"
-msgstr "AK Tag"
+msgstr "AK-Tag"
 
 #: AKModel/models.py:167
 msgid "AK Tags"
-msgstr "AK Tags"
+msgstr "AK-Tags"
 
 #: AKModel/models.py:177
 msgid "Name of the Requirement"
 msgstr "Name der Anforderung"
 
-#: AKModel/models.py:183
+#: AKModel/models.py:183 AKModel/models.py:422
 msgid "AK Requirement"
-msgstr "AK Anforderung"
+msgstr "AK-Anforderung"
 
 #: AKModel/models.py:184
 msgid "AK Requirements"
-msgstr "AK Anforderungen"
+msgstr "AK-Anforderungen"
 
 #: AKModel/models.py:195
 msgid "Name of the AK"
@@ -336,7 +339,7 @@ msgstr "Kurzer Name"
 
 #: AKModel/models.py:197
 msgid "Name displayed in the schedule"
-msgstr "Name zur Anzeige im AK Plan"
+msgstr "Name zur Anzeige im AK-Plan"
 
 #: AKModel/models.py:198
 msgid "Description of the AK"
@@ -376,7 +379,7 @@ msgstr "Tags"
 
 #: AKModel/models.py:209
 msgid "Tags provided by owners"
-msgstr "Tags, die durch die AK Leitung vergeben wurden"
+msgstr "Tags, die durch die AK-Leitung vergeben wurden"
 
 #: AKModel/models.py:210
 msgid "Track"
@@ -396,13 +399,13 @@ msgstr "Beabsichtigt eine Resolution einzureichen"
 
 #: AKModel/models.py:215
 msgid "Present this AK"
-msgstr "AK Präsentieren"
+msgstr "AK präsentieren"
 
 #: AKModel/models.py:216
 msgid "Present results of this AK"
 msgstr "Die Ergebnisse dieses AKs vorstellen"
 
-#: AKModel/models.py:218 AKModel/templates/admin/AKModel/status.html:79
+#: AKModel/models.py:218 AKModel/templates/admin/AKModel/status.html:83
 msgid "Requirements"
 msgstr "Anforderungen"
 
@@ -412,7 +415,7 @@ msgstr "Anforderungen des AKs"
 
 #: AKModel/models.py:221
 msgid "Conflicting AKs"
-msgstr "AK Konflikte"
+msgstr "AK-Konflikte"
 
 #: AKModel/models.py:222
 msgid "AKs that conflict and thus must not take place at the same time"
@@ -425,7 +428,7 @@ msgstr "Vorausgesetzte AKs"
 
 #: AKModel/models.py:224
 msgid "AKs that should precede this AK in the schedule"
-msgstr "AKS die im AK Plan vor diesem AK stattfinden müssen"
+msgstr "AKs die im AK-Plan vor diesem AK stattfinden müssen"
 
 #: AKModel/models.py:226
 msgid "Organizational Notes"
@@ -455,106 +458,244 @@ msgstr "Interessenszähler"
 msgid "People who have indicated interest online"
 msgstr "Anzahl Personen, die online Interesse bekundet haben"
 
-#: AKModel/models.py:240 AKModel/templates/admin/AKModel/status.html:49
+#: AKModel/models.py:240 AKModel/models.py:413
+#: AKModel/templates/admin/AKModel/status.html:49
 #: AKModel/templates/admin/AKModel/status.html:56
 msgid "AKs"
 msgstr "AKs"
 
-#: AKModel/models.py:272
+#: AKModel/models.py:285
 msgid "Name or number of the room"
 msgstr "Name oder Nummer des Raums"
 
-#: AKModel/models.py:273
+#: AKModel/models.py:286
 msgid "Location"
 msgstr "Ort"
 
-#: AKModel/models.py:274
+#: AKModel/models.py:287
 msgid "Name or number of the location"
 msgstr "Name oder Nummer des Ortes"
 
-#: AKModel/models.py:275
+#: AKModel/models.py:288
 msgid "Capacity"
 msgstr "Kapazität"
 
-#: AKModel/models.py:275
+#: AKModel/models.py:288
 msgid "Maximum number of people"
 msgstr "Maximale Personenzahl"
 
-#: AKModel/models.py:276
+#: AKModel/models.py:289
 msgid "Properties"
 msgstr "Eigenschaften"
 
-#: AKModel/models.py:277
+#: AKModel/models.py:290
 msgid "AK requirements fulfilled by the room"
-msgstr "AK Anforderungen, die dieser Raum erfüllt"
+msgstr "AK-Anforderungen, die dieser Raum erfüllt"
 
-#: AKModel/models.py:284 AKModel/templates/admin/AKModel/status.html:33
+#: AKModel/models.py:297 AKModel/templates/admin/AKModel/status.html:33
 msgid "Rooms"
 msgstr "Räume"
 
-#: AKModel/models.py:301
+#: AKModel/models.py:314
 msgid "AK being mapped"
 msgstr "AK, der zugeordnet wird"
 
-#: AKModel/models.py:303
+#: AKModel/models.py:316
 msgid "Room the AK will take place in"
 msgstr "Raum in dem der AK stattfindet"
 
-#: AKModel/models.py:304
+#: AKModel/models.py:317
 msgid "Slot Begin"
 msgstr "Beginn des Slots"
 
-#: AKModel/models.py:304
+#: AKModel/models.py:317
 msgid "Time and date the slot begins"
 msgstr "Zeit und Datum zu der der AK beginnt"
 
-#: AKModel/models.py:306
+#: AKModel/models.py:319
 msgid "Duration"
 msgstr "Dauer"
 
-#: AKModel/models.py:307
+#: AKModel/models.py:320
 msgid "Length in hours"
 msgstr "Länge in Stunden"
 
-#: AKModel/models.py:312
+#: AKModel/models.py:322
+msgid "Scheduling fixed"
+msgstr "Planung fix"
+
+#: AKModel/models.py:322
+msgid "Length and time of this AK should not be changed"
+msgstr "Dauer und Zeit dieses AKs sollten nicht verändert werden"
+
+#: AKModel/models.py:327
 msgid "Last update"
 msgstr "Letzte Aktualisierung"
 
-#: AKModel/models.py:315
+#: AKModel/models.py:330
 msgid "AK Slot"
-msgstr "AK Slot"
+msgstr "AK-Slot"
 
-#: AKModel/models.py:316
+#: AKModel/models.py:331 AKModel/models.py:415
 msgid "AK Slots"
-msgstr "AK Slot"
+msgstr "AK-Slot"
 
-#: AKModel/models.py:330
+#: AKModel/models.py:345
 msgid "Not scheduled yet"
 msgstr "Noch nicht geplant"
 
-#: AKModel/models.py:351
+#: AKModel/models.py:367
 #, fuzzy
 #| msgid "Track the AK belongs to"
 msgid "AK this message belongs to"
 msgstr "Track zu dem der AK gehört"
 
-#: AKModel/models.py:352
+#: AKModel/models.py:368
 msgid "Message text"
 msgstr "Nachrichtentext"
 
-#: AKModel/models.py:352
+#: AKModel/models.py:369
 msgid "Message to the organizers. This is not publicly visible."
 msgstr ""
 "Nachricht an die Organisator*innen. Diese ist nicht öffentlich sichtbar."
 
-#: AKModel/models.py:356
+#: AKModel/models.py:373
 msgid "AK Orga Message"
 msgstr "AK-Organachricht"
 
-#: AKModel/models.py:357
+#: AKModel/models.py:374
 msgid "AK Orga Messages"
 msgstr "AK-Organachrichten"
 
+#: AKModel/models.py:383
+msgid "Constraint Violation"
+msgstr "Constraintverletzung"
+
+#: AKModel/models.py:384
+msgid "Constraint Violations"
+msgstr "Constraintverletzungen"
+
+#: AKModel/models.py:388
+msgid "Owner has two parallel slots"
+msgstr "Leitung hat zwei Slots parallel"
+
+#: AKModel/models.py:389
+msgid "AK Slot was scheduled outside the AK's availabilities"
+msgstr "AK Slot wurde außerhalb der Verfügbarkeit des AKs platziert"
+
+#: AKModel/models.py:390
+msgid "Room has two AK slots scheduled at the same time"
+msgstr "Raum hat AK Slots gleichzeitig"
+
+#: AKModel/models.py:391
+msgid "Room does not satisfy the requirement of the scheduled AK"
+msgstr "Room erfüllt die Anforderungen des platzierten AKs nicht"
+
+#: AKModel/models.py:392
+msgid "AK Slot is scheduled at the same time as an AK listed as a conflict"
+msgstr "AK Slot wurde wurde zur gleichen Zeit wie ein Konflikt des AKs platziert"
+
+#: AKModel/models.py:393
+msgid "AK Slot is scheduled before an AK listed as a prerequisite"
+msgstr "AK Slot wurde vor einem als Voraussetzung gelisteten AK platziert"
+
+#: AKModel/models.py:395
+msgid "AK Slot for AK with intention to submit a resolution is scheduled after "
+"resolution deadline"
+msgstr "AK Slot eines AKs mit Resoabsicht wurde nach der Resodeadline platziert"
+
+#: AKModel/models.py:396
+msgid "AK Slot in a category is outside that categories availabilities"
+msgstr "AK Slot wurde außerhalb der Verfügbarkeiten seiner Kategorie"
+
+#: AKModel/models.py:397
+msgid "Two AK Slots for the same AK scheduled at the same time"
+msgstr "Zwei AK Slots eines AKs wurden zur selben Zeit platziert"
+
+#: AKModel/models.py:398
+msgid "AK Slot is scheduled in a room with less space than interest"
+msgstr "AK Slot wurde in einem Raum mit weniger Plätzen als am AK Interessierten platziert"
+
+#: AKModel/models.py:399
+msgid "AK Slot is scheduled outside the event's availabilities"
+msgstr "AK Slot wurde außerhalb der Verfügbarkeit des Events platziert"
+
+#: AKModel/models.py:402
+msgid "Warning"
+msgstr "Warnung"
+
+#: AKModel/models.py:403
+msgid "Violation"
+msgstr "Verletzung"
+
+#: AKModel/models.py:405
+msgid "Type"
+msgstr "Art"
+
+#: AKModel/models.py:406
+msgid "Type of violation, i.e. what kind of constraint was violated"
+msgstr "Art der Verletzung, gibt an welche Art Constraint verletzt wurde"
+
+#: AKModel/models.py:407
+msgid "Level"
+msgstr "Level"
+
+#: AKModel/models.py:408
+msgid "Severity level of the violation"
+msgstr "Schweregrad der Verletzung"
+
+#: AKModel/models.py:414
+msgid "AK(s) belonging to this constraint"
+msgstr "AK(s), die zu diesem Constraint gehören"
+
+#: AKModel/models.py:416
+msgid "AK Slot(s) belonging to this constraint"
+msgstr "AK Slot(s), die zu diesem Constraint gehören"
+
+#: AKModel/models.py:418
+msgid "AK Owner belonging to this constraint"
+msgstr "AK Leitung(en), die zu diesem Constraint gehören"
+
+#: AKModel/models.py:420
+msgid "Room belonging to this constraint"
+msgstr "Raum, der zu diesem Constraint gehört"
+
+#: AKModel/models.py:423
+msgid "AK Requirement belonging to this constraint"
+msgstr "AK Anforderung, die zu diesem Constraint gehört"
+
+#: AKModel/models.py:425
+msgid "AK Category belonging to this constraint"
+msgstr "AK Kategorie, di zu diesem Constraint gehört"
+
+#: AKModel/models.py:427
+msgid "Comment"
+msgstr "Kommentar"
+
+#: AKModel/models.py:427
+msgid "Comment or further details for this violation"
+msgstr "Kommentar oder weitere Details zu dieser Vereletzung"
+
+#: AKModel/models.py:430
+msgid "Timestamp"
+msgstr "Timestamp"
+
+#: AKModel/models.py:430
+msgid "Time of creation"
+msgstr "Zeitpunkt der ERstellung"
+
+#: AKModel/models.py:431
+msgid "Manually Resolved"
+msgstr "Manuell behoben"
+
+#: AKModel/models.py:432
+msgid "Mark this violation manually as resolved"
+msgstr "Markiere diese Verletzung manuell als behoben"
+
+#: AKModel/models.py:454
+msgid "Details"
+msgstr "Details"
+
 #: AKModel/site.py:10
 msgid "Administration"
 msgstr "Verwaltung"
@@ -603,15 +744,13 @@ msgid "Cancel"
 msgstr "Abbrechen"
 
 #: AKModel/templates/admin/AKModel/status.html:16
-#, fuzzy
-#| msgid "AK Categories"
 msgid "Categories"
-msgstr "AK Kategorien"
+msgstr "Kategorien"
 
 #: AKModel/templates/admin/AKModel/status.html:18
 #, fuzzy
 #| msgid "No categories yet"
-msgid "No categroies yet"
+msgid "No categories yet"
 msgstr "Bisher keine Kategorien"
 
 #: AKModel/templates/admin/AKModel/status.html:31
@@ -638,27 +777,32 @@ msgstr "Slots"
 msgid "Unscheduled Slots"
 msgstr "Ungeplante Slots"
 
-#: AKModel/templates/admin/AKModel/status.html:75
+#: AKModel/templates/admin/AKModel/status.html:76
+#: AKModel/templates/admin/ak_index.html:16
+msgid "Scheduling"
+msgstr "Scheduling"
+
+#: AKModel/templates/admin/AKModel/status.html:78
 msgid "Export AKs as CSV"
 msgstr "AKs als CSV exportieren"
 
-#: AKModel/templates/admin/AKModel/status.html:76
+#: AKModel/templates/admin/AKModel/status.html:80
 msgid "Export AKs for Wiki"
 msgstr "AKs im Wiki-Format exportieren"
 
-#: AKModel/templates/admin/AKModel/status.html:81
+#: AKModel/templates/admin/AKModel/status.html:85
 msgid "No requirements yet"
 msgstr "Bisher keine Anforderungen"
 
-#: AKModel/templates/admin/AKModel/status.html:94
+#: AKModel/templates/admin/AKModel/status.html:98
 msgid "Add Requirement"
 msgstr "Anforderungen hinzufügen"
 
-#: AKModel/templates/admin/AKModel/status.html:97
+#: AKModel/templates/admin/AKModel/status.html:101
 msgid "Messages"
 msgstr "Nachrichten"
 
-#: AKModel/templates/admin/AKModel/status.html:99
+#: AKModel/templates/admin/AKModel/status.html:103
 msgid "Delete all messages"
 msgstr "Alle Nachrichten löschen"
 
@@ -672,11 +816,11 @@ msgstr "Eventstatus"
 
 #: AKModel/views.py:144
 msgid "AK CSV Export"
-msgstr "AK CSV Export"
+msgstr "AK-CSV-Export"
 
 #: AKModel/views.py:158
 msgid "AK Wiki Export"
-msgstr "AK Wiki Export"
+msgstr "AK-Wiki-Export"
 
 #: AKModel/views.py:178
 msgid "AK Orga Messages successfully deleted"

AKModel/models.py

@@ -319,7 +319,7 @@ class AKSlot(models.Model):
     duration = models.DecimalField(max_digits=4, decimal_places=2, default=2, verbose_name=_('Duration'),
                                    help_text=_('Length in hours'))
 
-    fixed = models.BooleanField(default=False, verbose_name=_('Scheduling Fixed'), help_text=_('Length and time of this AK should not be changed'))
+    fixed = models.BooleanField(default=False, verbose_name=_('Scheduling fixed'), help_text=_('Length and time of this AK should not be changed'))
 
     event = models.ForeignKey(to=Event, on_delete=models.CASCADE, verbose_name=_('Event'),
                               help_text=_('Associated event'))

AKModel/templates/admin/AKModel/status.html

@@ -15,7 +15,7 @@
             <div class="col-md-8">
                 <h3 class="block-header">{% trans "Categories" %}</h3>
                 {% if event.akcategory_set.count == 0 %}
-                    <p class="text-danger">{% trans "No categroies yet" %}</p>
+                    <p class="text-danger">{% trans "No categories yet" %}</p>
                 {% else %}
                     <p>
                         {{ event.akcategory_set.count }}:

AKPlan/locale/de_DE/LC_MESSAGES/django.po

@@ -23,74 +23,74 @@ msgstr ""
 msgid "Plan"
 msgstr "Plan"
 
-#: AKPlan/templates/AKPlan/plan_base.html:29
+#: AKPlan/templates/AKPlan/plan_base.html:28
 msgid "Write to organizers of this event for questions and comments"
 msgstr "Fragen oder Kommentare? Schreib den Orgas dieses Events eine Mail"
 
-#: AKPlan/templates/AKPlan/plan_index.html:40
+#: AKPlan/templates/AKPlan/plan_index.html:31
 msgid "Day"
 msgstr "Tag"
 
-#: AKPlan/templates/AKPlan/plan_index.html:50
+#: AKPlan/templates/AKPlan/plan_index.html:41
 msgid "Event"
 msgstr "Veranstaltung"
 
-#: AKPlan/templates/AKPlan/plan_index.html:62
+#: AKPlan/templates/AKPlan/plan_index.html:53
 #: AKPlan/templates/AKPlan/plan_room.html:13
-#: AKPlan/templates/AKPlan/plan_room.html:48
-#: AKPlan/templates/AKPlan/plan_wall.html:66
+#: AKPlan/templates/AKPlan/plan_room.html:59
+#: AKPlan/templates/AKPlan/plan_wall.html:57
 msgid "Room"
 msgstr "Raum"
 
-#: AKPlan/templates/AKPlan/plan_index.html:81
+#: AKPlan/templates/AKPlan/plan_index.html:74
 #: AKPlan/templates/AKPlan/plan_room.html:11
 #: AKPlan/templates/AKPlan/plan_track.html:9
 msgid "AK Plan"
 msgstr "AK-Plan"
 
-#: AKPlan/templates/AKPlan/plan_index.html:93
-#: AKPlan/templates/AKPlan/plan_room.html:38
+#: AKPlan/templates/AKPlan/plan_index.html:86
+#: AKPlan/templates/AKPlan/plan_room.html:49
 msgid "Rooms"
 msgstr "Räume"
 
-#: AKPlan/templates/AKPlan/plan_index.html:106
+#: AKPlan/templates/AKPlan/plan_index.html:99
 #: AKPlan/templates/AKPlan/plan_track.html:36
 msgid "Tracks"
 msgstr "Tracks"
 
-#: AKPlan/templates/AKPlan/plan_index.html:118
+#: AKPlan/templates/AKPlan/plan_index.html:111
 msgid "AK Wall"
 msgstr "AK-Wall"
 
-#: AKPlan/templates/AKPlan/plan_index.html:131
-#: AKPlan/templates/AKPlan/plan_wall.html:93
+#: AKPlan/templates/AKPlan/plan_index.html:124
+#: AKPlan/templates/AKPlan/plan_wall.html:86
 msgid "Current AKs"
 msgstr "Aktuelle AKs"
 
-#: AKPlan/templates/AKPlan/plan_index.html:138
-#: AKPlan/templates/AKPlan/plan_wall.html:98
+#: AKPlan/templates/AKPlan/plan_index.html:131
+#: AKPlan/templates/AKPlan/plan_wall.html:91
 msgid "Next AKs"
 msgstr "Nächste AKs"
 
-#: AKPlan/templates/AKPlan/plan_index.html:146
+#: AKPlan/templates/AKPlan/plan_index.html:139
 msgid "This event is not active."
 msgstr "Dieses Event ist nicht aktiv."
 
-#: AKPlan/templates/AKPlan/plan_index.html:157
-#: AKPlan/templates/AKPlan/plan_room.html:66
+#: AKPlan/templates/AKPlan/plan_index.html:152
+#: AKPlan/templates/AKPlan/plan_room.html:77
 #: AKPlan/templates/AKPlan/plan_track.html:58
 msgid "Plan is not visible (yet)."
 msgstr "Plan ist (noch) nicht sichtbar"
 
-#: AKPlan/templates/AKPlan/plan_room.html:52
+#: AKPlan/templates/AKPlan/plan_room.html:63
 msgid "Go to virtual room"
 msgstr "Zum virtuellen Raum"
 
-#: AKPlan/templates/AKPlan/plan_room.html:73
+#: AKPlan/templates/AKPlan/plan_room.html:84
 msgid "Capacity"
 msgstr "Kapazität"
 
-#: AKPlan/templates/AKPlan/plan_room.html:77
+#: AKPlan/templates/AKPlan/plan_room.html:88
 msgid "Properties"
 msgstr "Eigenschaften"
 

AKSubmission/locale/de_DE/LC_MESSAGES/django.po

@@ -177,8 +177,8 @@ msgid "Track"
 msgstr "Track"
 
 #: AKSubmission/templates/AKSubmission/ak_detail.html:114
-msgid "Present this AK"
-msgstr "Diesen AK vorstellen"
+msgid "Present AK results"
+msgstr "AK-Ergebnisse vorstellen"
 
 #: AKSubmission/templates/AKSubmission/ak_detail.html:118
 #: AKSubmission/templates/AKSubmission/ak_table.html:12
@@ -186,8 +186,8 @@ msgid "Tags"
 msgstr "Tags"
 
 #: AKSubmission/templates/AKSubmission/ak_detail.html:124
-msgid "Reso?"
-msgstr "Reso?"
+msgid "Reso intention?"
+msgstr "Resoabsicht?"
 
 #: AKSubmission/templates/AKSubmission/ak_detail.html:131
 msgid "Requirements"
@@ -195,11 +195,11 @@ msgstr "Anforderungen"
 
 #: AKSubmission/templates/AKSubmission/ak_detail.html:144
 msgid "Conflicting AKs"
-msgstr "AK Konflikte"
+msgstr "AK-Konflikte"
 
 #: AKSubmission/templates/AKSubmission/ak_detail.html:152
 msgid "Prerequisite AKs"
-msgstr "AK Voraussetzungen"
+msgstr "Vorausgesetzte AKs"
 
 #: AKSubmission/templates/AKSubmission/ak_detail.html:160
 msgid "Notes"
@@ -262,13 +262,13 @@ msgstr "Zeit"
 
 #: AKSubmission/templates/AKSubmission/ak_history.html:48
 #: AKSubmission/templates/AKSubmission/ak_table.html:26
-msgid "present this AK"
-msgstr "Diesen AK vorstellen"
+msgid "Present results of this AK"
+msgstr "Die Ergebnisse dieses AKs vorstellen"
 
 #: AKSubmission/templates/AKSubmission/ak_history.html:52
 #: AKSubmission/templates/AKSubmission/ak_table.html:30
-msgid "Reso"
-msgstr "Reso"
+msgid "Intends to submit a resolution"
+msgstr "Beabsichtigt eine Resolution einzureichen"
 
 #: AKSubmission/templates/AKSubmission/ak_list.html:6 AKSubmission/views.py:39
 msgid "All AKs"

AKSubmission/templates/AKSubmission/ak_detail.html

@@ -121,7 +121,7 @@
             </td>
         </tr>
         <tr>
-            <td>{% trans "Reso?" %}</td>
+            <td>{% trans "Reso intention?" %}</td>
             <td>
                 {{ ak.reso | bool_symbol }}
             </td>

AKSubmission/templates/AKSubmission/ak_history.html

@@ -45,11 +45,11 @@
                     <b>{{ h.name }}</b>
                     {% if h.present %}
                         <span class="badge badge-dark badge-pill"
-                              title="{% trans 'present this AK' %}">{% fa5_icon "bullhorn" 'fas' %}</span>
+                              title="{% trans 'Present results of this AK' %}">{% fa5_icon "bullhorn" 'fas' %}</span>
                     {% endif %}
                     {% if h.reso %}
                         <span class="badge badge-dark badge-pill"
-                              title="{% trans 'Reso' %}">{% fa5_icon "scroll" 'fas' %}</span>
+                              title="{% trans 'Intends to submit a resolution' %}">{% fa5_icon "scroll" 'fas' %}</span>
                     {% endif %}
                 </td>
                 <td>{% category_linked_badge h.category event.slug %}</td>

AKSubmission/templates/AKSubmission/ak_table.html

@@ -23,11 +23,11 @@
                 </a>
                 {% if ak.present %}
                     <span class="badge badge-dark badge-pill"
-                          title="{% trans 'present this AK' %}">{% fa5_icon "bullhorn" 'fas' %}</span>
+                          title="{% trans 'Present results of this AK' %}">{% fa5_icon "bullhorn" 'fas' %}</span>
                 {% endif %}
                 {% if ak.reso %}
                     <span class="badge badge-dark badge-pill"
-                          title="{% trans 'Reso' %}">{% fa5_icon "scroll" 'fas' %}</span>
+                          title="{% trans 'Intends to submit a resolution' %}">{% fa5_icon "scroll" 'fas' %}</span>
                 {% endif %}
             </td>
             <td>

locale/de_DE/LC_MESSAGES/django.po

@@ -34,6 +34,35 @@ msgstr "Virtueller Raum"
 msgid "Virtual Rooms"
 msgstr "Virtuelle Räume"
 
+#: AKScheduling/templates/admin/AKScheduling/scheduling.html:10
+msgid "Scheduling for"
+msgstr "Scheduling für"
+
+#: AKScheduling/templates/admin/AKScheduling/scheduling.html:94
+msgid "Day (Horizontal)"
+msgstr "Tag (horizontal)"
+
+#: AKScheduling/templates/admin/AKScheduling/scheduling.html:101
+msgid "Day (Vertical)"
+msgstr "Tag (vertikal)"
+
+#: AKScheduling/templates/admin/AKScheduling/scheduling.html:112
+msgid "Event (Horizontal)"
+msgstr "Event (horizontal)"
+
+#: AKScheduling/templates/admin/AKScheduling/scheduling.html:121
+msgid "Event (Vertical)"
+msgstr "Event (vertikal)"
+
+#: AKScheduling/templates/admin/AKScheduling/scheduling.html:148
+msgid "Room"
+msgstr "Raum"
+
+#: AKScheduling/templates/admin/AKScheduling/scheduling.html:204
+#: AKScheduling/templates/admin/AKScheduling/unscheduled.html:34
+msgid "Event Status"
+msgstr "Event-Status"
+
 #: AKScheduling/templates/admin/AKScheduling/unscheduled.html:7
 msgid "Unscheduled AK Slots"
 msgstr "Noch nicht geschedulte AK-Slots"
@@ -42,10 +71,6 @@ msgstr "Noch nicht geschedulte AK-Slots"
 msgid "Count"
 msgstr "Anzahl"
 
-#: AKScheduling/templates/admin/AKScheduling/unscheduled.html:34
-msgid "Event Status"
-msgstr "Event-Status"
-
 #: templates/base.html:29
 msgid ""
 "Are you sure you want to change the language now? This will clear the form!"