2006-03-08: 3.4.4betav3.4.4beta

- Added script "convert.sh" to convert the AutoTimer information in VDR's timers.conf to the new format (see "convert.sh" for usage).
- Use the summary/aux timer field to store AutoTimer information to be compatible to VDR v1.3.44 and later.
- Removed "Add summary to new timers" option. The EPG summary is no longer copied to the timer's summary/aux field (for VDR 1.3.44+) or always copied (VDR 1.3.43-).
- Made summary textfield readonly while adding/editing a timer.
- Unless NO_EVENTID or NO_EVENTID_ON is used the EPG-ID is stored in every (auto)timer set using VDRAdmin-AM.
- For every timer the current start/stop margins are saved in its summary/aux field. These are used for checking AutoTimers by time.
- Fixed bug while checking for already programmed (auto)timers if not using EPG-ID.

1 files changed, 60 insertions, 56 deletions

diff --git a/po/vdradmin.pot b/po/vdradmin.pot
index 3fcdd1b..7d8eb94 100644
--- a/po/vdradmin.pot
+++ b/po/vdradmin.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-03-01 08:07+0100\n"
+"POT-Creation-Date: 2006-03-08 11:04+0100\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"
@@ -107,94 +107,94 @@ msgstr ""
 msgid "AutoTimer Checking:"
 msgstr ""
 
-#: ../template/default/timer_new.html:85
+#: ../template/default/timer_new.html:86
 #: ../template/default/help_timer_new.html:39
 msgid "Transmission Identification"
 msgstr ""
 
-#: ../template/default/timer_new.html:87 ../template/default/rec_list.html:70
+#: ../template/default/timer_new.html:88 ../template/default/rec_list.html:70
 #: ../template/default/help_timer_new.html:41
 msgid "Time"
 msgstr ""
 
-#: ../template/default/timer_new.html:88 ../template/default/tv.html:197
+#: ../template/default/timer_new.html:89 ../template/default/tv.html:197
 #: ../template/default/help_timer_new.html:43
 msgid "off"
 msgstr ""
 
-#: ../template/default/timer_new.html:94 ../template/default/prog_list.html:27
+#: ../template/default/timer_new.html:95 ../template/default/prog_list.html:27
 #: ../template/default/help_timer_new.html:47
 #: ../template/default/help_at_timer_new.html:46
 #: ../template/default/at_timer_new.html:93
 msgid "Channel:"
 msgstr ""
 
-#: ../template/default/timer_new.html:106
+#: ../template/default/timer_new.html:107
 #: ../template/default/help_timer_new.html:49
 msgid "Day Of Recording:"
 msgstr ""
 
-#: ../template/default/timer_new.html:110
+#: ../template/default/timer_new.html:111
 #: ../template/default/at_timer_new.html:81
 msgid "Monday"
 msgstr ""
 
-#: ../template/default/timer_new.html:111
+#: ../template/default/timer_new.html:112
 #: ../template/default/at_timer_new.html:82
 msgid "Tuesday"
 msgstr ""
 
-#: ../template/default/timer_new.html:112
+#: ../template/default/timer_new.html:113
 #: ../template/default/at_timer_new.html:83
 msgid "Wednesday"
 msgstr ""
 
-#: ../template/default/timer_new.html:113
+#: ../template/default/timer_new.html:114
 #: ../template/default/at_timer_new.html:84
 msgid "Thursday"
 msgstr ""
 
-#: ../template/default/timer_new.html:114
+#: ../template/default/timer_new.html:115
 #: ../template/default/at_timer_new.html:85
 msgid "Friday"
 msgstr ""
 
-#: ../template/default/timer_new.html:115
+#: ../template/default/timer_new.html:116
 #: ../template/default/at_timer_new.html:86
 msgid "Saturday"
 msgstr ""
 
-#: ../template/default/timer_new.html:116
+#: ../template/default/timer_new.html:117
 #: ../template/default/at_timer_new.html:87
 msgid "Sunday"
 msgstr ""
 
-#: ../template/default/timer_new.html:122
+#: ../template/default/timer_new.html:123
 #: ../template/default/help_timer_new.html:57
 msgid "Start Time:"
 msgstr ""
 
-#: ../template/default/timer_new.html:127
-#: ../template/default/timer_new.html:138
+#: ../template/default/timer_new.html:128
+#: ../template/default/timer_new.html:139
 #: ../template/default/prog_summary.html:26
 #: ../template/default/prog_timeline.html:95
 #: ../template/default/prog_timeline.html:108
 #: ../template/default/prog_timeline.html:123
 #: ../template/default/at_timer_new.html:111
-#: ../template/default/at_timer_new.html:122 ../vdradmind.pl:3908
+#: ../template/default/at_timer_new.html:122 ../vdradmind.pl:3925
 msgid "o'clock"
 msgstr ""
 
-#: ../template/default/timer_new.html:133
+#: ../template/default/timer_new.html:134
 #: ../template/default/help_timer_new.html:59
 msgid "End Time:"
 msgstr ""
 
-#: ../template/default/timer_new.html:144
+#: ../template/default/timer_new.html:145
 msgid "Use VPS:"
 msgstr ""
 
-#: ../template/default/timer_new.html:150
+#: ../template/default/timer_new.html:151
 #: ../template/default/at_timer_list.html:24
 #: ../template/default/config.html:279 ../template/default/config.html:371
 #: ../template/default/timer_list.html:27
@@ -206,7 +206,7 @@ msgstr ""
 msgid "Priority:"
 msgstr ""
 
-#: ../template/default/timer_new.html:156
+#: ../template/default/timer_new.html:157
 #: ../template/default/at_timer_list.html:24
 #: ../template/default/config.html:285 ../template/default/config.html:377
 #: ../template/default/timer_list.html:27
@@ -218,22 +218,26 @@ msgstr ""
 msgid "Lifetime:"
 msgstr ""
 
-#: ../template/default/timer_new.html:162
+#: ../template/default/timer_new.html:163
 #: ../template/default/help_timer_new.html:65
 msgid "Title of Recording:"
 msgstr ""
 
-#: ../template/default/timer_new.html:168 ../template/default/rec_edit.html:57
+#: ../template/default/timer_new.html:169 ../template/default/rec_edit.html:57
 #: ../template/default/help_timer_new.html:67
 msgid "Summary:"
 msgstr ""
 
-#: ../template/default/timer_new.html:180 ../template/default/config.html:659
+#: ../template/default/timer_new.html:169
+msgid "readonly"
+msgstr ""
+
+#: ../template/default/timer_new.html:181 ../template/default/config.html:659
 #: ../template/default/at_timer_new.html:176
 msgid "Save"
 msgstr ""
 
-#: ../template/default/timer_new.html:181 ../template/default/rec_edit.html:70
+#: ../template/default/timer_new.html:182 ../template/default/rec_edit.html:70
 #: ../template/default/at_timer_new.html:178
 msgid "Cancel"
 msgstr ""
@@ -341,7 +345,7 @@ msgstr ""
 
 #: ../template/default/prog_summary.html:7
 #: ../template/default/prog_timeline.html:7
-#: ../template/default/navigation.html:30 ../vdradmind.pl:4483
+#: ../template/default/navigation.html:30 ../vdradmind.pl:4500
 msgid "What's On Now?"
 msgstr ""
 
@@ -466,7 +470,7 @@ msgstr ""
 
 #: ../template/default/config.html:213 ../template/default/help_config.html:38
 #: ../template/default/help_config.html:86
-#: ../template/default/navigation.html:38 ../vdradmind.pl:4485
+#: ../template/default/navigation.html:38 ../vdradmind.pl:4502
 msgid "Timeline"
 msgstr ""
 
@@ -740,7 +744,7 @@ msgid "Delete Selected Timers"
 msgstr ""
 
 #: ../template/default/prog_list.html:6 ../template/default/navigation.html:42
-#: ../vdradmind.pl:4486
+#: ../vdradmind.pl:4503
 msgid "Channels"
 msgstr ""
 
@@ -806,7 +810,7 @@ msgstr ""
 #: ../template/default/rec_list.html:6 ../template/default/rec_list.html:18
 #: ../template/default/help_rec_list.html:6
 #: ../template/default/help_rec_list.html:18
-#: ../template/default/navigation.html:54 ../vdradmind.pl:4488
+#: ../template/default/navigation.html:54 ../vdradmind.pl:4505
 msgid "Recordings"
 msgstr ""
 
@@ -1176,7 +1180,7 @@ msgid "to"
 msgstr ""
 
 #: ../template/default/prog_list2.html:6
-#: ../template/default/navigation.html:34 ../vdradmind.pl:2565
+#: ../template/default/navigation.html:34 ../vdradmind.pl:2601
 msgid "Playing Today"
 msgstr ""
 
@@ -1663,113 +1667,113 @@ msgstr ""
 msgid "Spanish:"
 msgstr ""
 
-#: ../vdradmind.pl:289
+#: ../vdradmind.pl:292
 msgid "What's your VDR hostname (e.g video.intra.net)?"
 msgstr ""
 
-#: ../vdradmind.pl:290
+#: ../vdradmind.pl:293
 msgid "On which port does VDR listen to SVDRP queries?"
 msgstr ""
 
-#: ../vdradmind.pl:291
+#: ../vdradmind.pl:294
 msgid "On which address should VDRAdmin-AM listen (0.0.0.0 for any)?"
 msgstr ""
 
-#: ../vdradmind.pl:292
+#: ../vdradmind.pl:295
 msgid "On which port should VDRAdmin-AM listen?"
 msgstr ""
 
-#: ../vdradmind.pl:293
+#: ../vdradmind.pl:296
 msgid "Username?"
 msgstr ""
 
-#: ../vdradmind.pl:294
+#: ../vdradmind.pl:297
 msgid "Password?"
 msgstr ""
 
-#: ../vdradmind.pl:295
+#: ../vdradmind.pl:298
 msgid "Where are your recordings stored?"
 msgstr ""
 
-#: ../vdradmind.pl:296
+#: ../vdradmind.pl:299
 msgid "Where are your VDR's configuration files located?"
 msgstr ""
 
-#: ../vdradmind.pl:302
+#: ../vdradmind.pl:305
 msgid "Config file written successfully."
 msgstr ""
 
-#: ../vdradmind.pl:354
+#: ../vdradmind.pl:357
 #, perl-format
 msgid "vdradmind.pl %s started with pid %d."
 msgstr ""
 
-#: ../vdradmind.pl:408 ../vdradmind.pl:1000 ../vdradmind.pl:1865
+#: ../vdradmind.pl:411 ../vdradmind.pl:1003 ../vdradmind.pl:1916
 msgid "Not found"
 msgstr ""
 
-#: ../vdradmind.pl:408 ../vdradmind.pl:1866
+#: ../vdradmind.pl:411 ../vdradmind.pl:1917
 msgid "The requested URL was not found on this server!"
 msgstr ""
 
-#: ../vdradmind.pl:476 ../vdradmind.pl:996 ../vdradmind.pl:1868
+#: ../vdradmind.pl:479 ../vdradmind.pl:999 ../vdradmind.pl:1919
 msgid "Forbidden"
 msgstr ""
 
-#: ../vdradmind.pl:476 ../vdradmind.pl:1869
+#: ../vdradmind.pl:479 ../vdradmind.pl:1920
 msgid "You don't have permission to access this function!"
 msgstr ""
 
-#: ../vdradmind.pl:996 ../vdradmind.pl:1870
+#: ../vdradmind.pl:999 ../vdradmind.pl:1921
 #, perl-format
 msgid "Access to file \"%s\" denied!"
 msgstr ""
 
-#: ../vdradmind.pl:1000 ../vdradmind.pl:1867
+#: ../vdradmind.pl:1003 ../vdradmind.pl:1918
 #, perl-format
 msgid "The URL \"%s\" was not found on this server!"
 msgstr ""
 
-#: ../vdradmind.pl:1871
+#: ../vdradmind.pl:1922
 #, perl-format
 msgid "Can't open file \"%s\"!"
 msgstr ""
 
-#: ../vdradmind.pl:1872
+#: ../vdradmind.pl:1923
 #, perl-format
 msgid "Can't connect to VDR at %s!"
 msgstr ""
 
-#: ../vdradmind.pl:1873
+#: ../vdradmind.pl:1924
 #, perl-format
 msgid "Error while sending command to VDR at %s"
 msgstr ""
 
-#: ../vdradmind.pl:2565
+#: ../vdradmind.pl:2601
 msgid "Playing Tomorrow"
 msgstr ""
 
-#: ../vdradmind.pl:2565
+#: ../vdradmind.pl:2601
 #, perl-format
 msgid "Playing on the %d."
 msgstr ""
 
-#: ../vdradmind.pl:3908
+#: ../vdradmind.pl:3925
 msgid "Suitable matches for:"
 msgstr ""
 
-#: ../vdradmind.pl:3963
+#: ../vdradmind.pl:3980
 msgid "Schedule"
 msgstr ""
 
-#: ../vdradmind.pl:4484
+#: ../vdradmind.pl:4501
 msgid "Playing Today?"
 msgstr ""
 
-#: ../vdradmind.pl:4487
+#: ../vdradmind.pl:4504
 msgid "Timers"
 msgstr ""
 
-#: ../vdradmind.pl:4550
+#: ../vdradmind.pl:4567
 msgid "System default"
 msgstr ""