merged master into stable after new deployment

2 files changed, 125 insertions, 83 deletions

diff --git a/locale/DE/LC_MESSAGES/django.mo b/locale/DE/LC_MESSAGES/django.mo
index 6f1e394..9adeb17 100644
--- a/locale/DE/LC_MESSAGES/django.mo
+++ b/locale/DE/LC_MESSAGES/django.mo
diff --git a/locale/DE/LC_MESSAGES/django.po b/locale/DE/LC_MESSAGES/django.po
index 063babb..1838efe 100644
--- a/locale/DE/LC_MESSAGES/django.po
+++ b/locale/DE/LC_MESSAGES/django.po
@@ -1,16 +1,16 @@
 # Radio Helsinki program/schedule management
 # Copyright (C) 2011, Ernesto Rico-Schmidt
 # This file is distributed under the same license as the helsinki package.
-# Ernesto Rico-Schmidt <e.rico.schmidt@gmail.com>, 2011.
+# Ernesto Rico-Schmidt <e.rico.schmidt@gmail.com>, 2011-2016.
 #
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: helsinki-program\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-12-28 16:28+0100\n"
+"POT-Creation-Date: 2016-01-07 09:10+0100\n"
 "PO-Revision-Date: 2011-06-02 22:25+0200\n"
-"Last-Translator: Ernesto Rico-Schmidt <e.rico.schmidt@gmail.com>\n"
+"Last-Translator: Ernesto Rico-Schmidt <ernesto@helsinki.at>\n"
 "Language-Team: LANGUAGE <de@li.org>\n"
 "Language: \n"
 "MIME-Version: 1.0\n"
@@ -18,279 +18,321 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
-#: program/admin.py:55
-msgid "Renew selected time slots"
+#: program/admin.py:77
+#, python-format
+msgid "1 program slot was renewed until %s"
+msgstr "eine Sendezeit wurde verlängert bis %s"
+
+#: program/admin.py:79
+#, python-format
+msgid "%s program slots were renewed until %s"
+msgstr "%s Sendezeiten wurden verlängert bis %s"
+
+#: program/admin.py:81
+msgid "Renew selected program slots"
 msgstr "Ausgewählte Sendezeiten verlängern"
 
-#: program/models.py:13
+#: program/models.py:18
 msgid "Format"
 msgstr "Format"
 
-#: program/models.py:14 program/models.py:27 program/models.py:40
-#: program/models.py:53 program/models.py:89
+#: program/models.py:19 program/models.py:43 program/models.py:100
+#: program/models.py:157 program/models.py:239
 msgid "Slug"
 msgstr "Slug"
 
-#: program/models.py:18 program/models.py:84
+#: program/models.py:20 program/models.py:33
+msgid "Color"
+msgstr "Farbe"
+
+#: program/models.py:21
+msgid "Text color"
+msgstr "Textfarbe"
+
+#: program/models.py:22
+msgid "Enabled"
+msgstr "Aktiviert"
+
+#: program/models.py:26 program/models.py:234
 msgid "Broadcast format"
 msgstr "Sendungsformat"
 
-#: program/models.py:19
+#: program/models.py:27
 msgid "Broadcast formats"
 msgstr "Sendungsformate"
 
-#: program/models.py:25
+#: program/models.py:41
 msgid "Information"
 msgstr "Zusatzinformation"
 
-#: program/models.py:26 program/models.py:39 program/models.py:52
+#: program/models.py:42 program/models.py:99 program/models.py:156
 msgid "Abbreviation"
 msgstr "Abkürzung"
 
-#: program/models.py:31 program/models.py:32 program/models.py:85
+#: program/models.py:44 program/models.py:101 program/models.py:158
+msgid "Button image"
+msgstr "Bild-Button"
+
+#: program/models.py:45 program/models.py:102 program/models.py:159
+msgid "Button image (hover)"
+msgstr "Bild-Button (hover)"
+
+#: program/models.py:46 program/models.py:103 program/models.py:160
+msgid "Big button image"
+msgstr "Bild-Button groß"
+
+#: program/models.py:50 program/models.py:51 program/models.py:235
 msgid "Show information"
 msgstr "Zusatzinformation"
 
-#: program/models.py:38 program/models.py:44 program/models.py:86
+#: program/models.py:72 program/models.py:129 program/models.py:186
+msgid "Buttons"
+msgstr "Buttonts"
+
+#: program/models.py:98 program/models.py:107 program/models.py:236
 msgid "Show topic"
 msgstr "Thema/Schwerpunkt"
 
-#: program/models.py:45
+#: program/models.py:108
 msgid "Show topics"
 msgstr "Themen/Schwerpunkte"
 
-#: program/models.py:51
+#: program/models.py:155
 msgid "Focus"
 msgstr "Tendenz"
 
-#: program/models.py:57 program/models.py:58 program/models.py:87
+#: program/models.py:164 program/models.py:165 program/models.py:237
 msgid "Music focus"
 msgstr "Musiktendenz"
 
-#: program/models.py:64 program/models.py:88 program/models.py:130
+#: program/models.py:212 program/models.py:238 program/models.py:278
 msgid "Name"
 msgstr "Name"
 
-#: program/models.py:65 program/models.py:93
+#: program/models.py:213
+msgid "Always visible"
+msgstr "Immer sichtbar"
+
+#: program/models.py:214 program/models.py:246 program/models.py:311
+msgid "Is active"
+msgstr "Is aktiv"
+
+#: program/models.py:215 program/models.py:244
 msgid "E-Mail"
 msgstr "E-Mail"
 
-#: program/models.py:66 program/models.py:94
+#: program/models.py:216 program/models.py:245
 msgid "Website"
 msgstr "Website"
 
-#: program/models.py:70
+#: program/models.py:220
 msgid "Host"
 msgstr "Sendungsmacher"
 
-#: program/models.py:71 program/models.py:82
+#: program/models.py:221 program/models.py:232
 msgid "Hosts"
 msgstr "Sendungsmacher"
 
-#: program/models.py:81
+#: program/models.py:231
 msgid "Predecessor"
 msgstr "Vorgänger"
 
-#: program/models.py:83
+#: program/models.py:233
 msgid "Owners"
 msgstr "Eingentümer"
 
-#: program/models.py:90
+#: program/models.py:240
 msgid "Image"
 msgstr "Bild"
 
-#: program/models.py:91
+#: program/models.py:241
+msgid "show Image"
+msgstr "Zeige Bild"
+
+#: program/models.py:242
 msgid "Short description"
 msgstr "Kurzbeschreibung"
 
-#: program/models.py:92
+#: program/models.py:243
 msgid "Description"
 msgstr "Beschreibung"
 
-#: program/models.py:95
+#: program/models.py:247
 msgid "CBA series ID"
 msgstr "ID der Sendereihe auf CBA"
 
-#: program/models.py:101 program/models.py:156
+#: program/models.py:248 program/models.py:313
+msgid "Automation ID"
+msgstr "ID in der Automatiserung"
+
+#: program/models.py:254 program/models.py:306
 msgid "Show"
 msgstr "Sendung"
 
-#: program/models.py:102
+#: program/models.py:255
 msgid "Shows"
 msgstr "Sendungen"
 
-#: program/models.py:114
-msgid "Has active program slots"
-msgstr "Hat aktive Sendezeiten"
-
-#: program/models.py:118
+#: program/models.py:266
 msgid "Monthly"
 msgstr "monatlich"
 
-#: program/models.py:119
+#: program/models.py:267
 msgid "Weekly"
 msgstr "wöchentlich"
 
-#: program/models.py:120
+#: program/models.py:268
 msgid "Daily"
 msgstr "täglich"
 
-#: program/models.py:123
+#: program/models.py:271
 msgid "First"
 msgstr "Erster"
 
-#: program/models.py:124
+#: program/models.py:272
 msgid "Second"
 msgstr "Zweiter"
 
-#: program/models.py:125
+#: program/models.py:273
 msgid "Third"
 msgstr "Dritter"
 
-#: program/models.py:126
+#: program/models.py:274
 msgid "Fourth"
 msgstr "Vierter"
 
-#: program/models.py:127
+#: program/models.py:275
 msgid "Fifth"
 msgstr "Fünfter"
 
-#: program/models.py:128
+#: program/models.py:276
 msgid "Last"
 msgstr "Letzter"
 
-#: program/models.py:131
+#: program/models.py:279
 msgid "Frequency"
 msgstr "Häufigkeit"
 
-#: program/models.py:132
+#: program/models.py:280
 msgid "Interval"
 msgstr "Intervall"
 
-#: program/models.py:133
+#: program/models.py:281
 msgid "Set position"
 msgstr "Position"
 
-#: program/models.py:134
+#: program/models.py:283
 msgid "Count"
 msgstr "Zähler"
 
-#: program/models.py:138 program/models.py:154
+#: program/models.py:287 program/models.py:304
 msgid "Recurrence rule"
 msgstr "Wiederholungsregel"
 
-#: program/models.py:139
+#: program/models.py:288
 msgid "Recurrence rules"
 msgstr "Wiederholungsregel"
 
-#: program/models.py:146
+#: program/models.py:296
 msgid "Monday"
 msgstr "Montag"
 
-#: program/models.py:147
+#: program/models.py:297
 msgid "Tuesday"
 msgstr "Dienstag"
 
-#: program/models.py:148
+#: program/models.py:298
 msgid "Wednesday"
 msgstr "Mittwoch"
 
-#: program/models.py:149
+#: program/models.py:299
 msgid "Thursday"
 msgstr "Donnerstag"
 
-#: program/models.py:150
+#: program/models.py:300
 msgid "Friday"
 msgstr "Freitag"
 
-#: program/models.py:151
+#: program/models.py:301
 msgid "Saturday"
 msgstr "Samstag"
 
-#: program/models.py:152
+#: program/models.py:302
 msgid "Sunday"
 msgstr "Sonntag"
 
-#: program/models.py:155
+#: program/models.py:305
 msgid "Weekday"
 msgstr "Wochentag"
 
-#: program/models.py:157
+#: program/models.py:307
 msgid "First date"
 msgstr "Erstes Datum"
 
-#: program/models.py:158 program/models.py:277
+#: program/models.py:308 program/models.py:451
 msgid "Start time"
 msgstr "Beginnzeit"
 
-#: program/models.py:159 program/models.py:278
+#: program/models.py:309 program/models.py:452
 msgid "End time"
 msgstr "Endzeit"
 
-#: program/models.py:160
+#: program/models.py:310
 msgid "Last date"
 msgstr "Letztes Datum"
 
-#: program/models.py:161
+#: program/models.py:312
 msgid "Is repetition"
 msgstr "Is Wiederholung"
 
-#: program/models.py:168 program/models.py:276
+#: program/models.py:320 program/models.py:450
 msgid "Program slot"
 msgstr "Sendezeit"
 
-#: program/models.py:169
+#: program/models.py:321
 msgid "Program slots"
 msgstr "Sendezeiten"
 
-#: program/models.py:241
-msgid "Time slot count"
-msgstr "Zeitschlitze"
-
-#: program/models.py:285 program/models.py:308
+#: program/models.py:459 program/models.py:482
 msgid "Time slot"
 msgstr "Zeitschlitz"
 
-#: program/models.py:286
+#: program/models.py:460
 msgid "Time slots"
 msgstr "Zeitschlitze"
 
-#: program/models.py:304
+#: program/models.py:478
 msgid "Cancellation"
 msgstr "Ausfall"
 
-#: program/models.py:305
+#: program/models.py:479
 msgid "Recommendation"
 msgstr "Empfehlung"
 
-#: program/models.py:306
+#: program/models.py:480
 msgid "Repetition"
 msgstr "Wiederholung"
 
-#: program/models.py:309
-msgid "Owner"
-msgstr "Eigentümer"
-
-#: program/models.py:310
+#: program/models.py:483
 msgid "Title"
 msgstr "Titel"
 
-#: program/models.py:311
+#: program/models.py:484
 msgid "Content"
 msgstr "Inhalt"
 
-#: program/models.py:312
+#: program/models.py:485
 msgid "Status"
 msgstr "Status"
 
-#: program/models.py:313
+#: program/models.py:486
 msgid "CBA entry ID"
 msgstr "ID des Beitrags auf der CBA"
 
-#: program/models.py:321
+#: program/models.py:494
 msgid "Note"
 msgstr "Notiz"
 
-#: program/models.py:322
+#: program/models.py:495
 msgid "Notes"
 msgstr "Notizen"