From: Jaroslav Kysela <perex@perex.cz>
Date: Thu, 22 Oct 2015 19:11:01 +0000 (+0200)
Subject: intl: new templates
X-Git-Tag: v4.2.1~1806
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=1371b0cff5b15038b0c7be605e04584c8d96387c;p=thirdparty%2Ftvheadend.git

intl: new templates
---

diff --git a/intl/js/tvheadend.js.pot b/intl/js/tvheadend.js.pot
index a15565814..bd6c45c78 100644
--- a/intl/js/tvheadend.js.pot
+++ b/intl/js/tvheadend.js.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-10-02 13:59+0200\n"
+"POT-Creation-Date: 2015-10-22 20:48+0200\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"
@@ -25,7 +25,7 @@ msgstr ""
 msgid "(?:st|nd|rd|th)#parseCodes.S.s"
 msgstr ""
 
-#: src/webui/static/app/chconf.js:6 src/webui/static/app/chconf.js:31
+#: src/webui/static/app/chconf.js:6 src/webui/static/app/chconf.js:27
 #: src/webui/static/app/epg.js:3 src/webui/static/app/epg.js:68
 msgid "(Clear filter)"
 msgstr ""
@@ -110,15 +110,15 @@ msgstr ""
 msgid "9 #monthNumber"
 msgstr ""
 
-#: src/webui/static/app/dvr.js:199
+#: src/webui/static/app/dvr.js:207
 msgid "Abort"
 msgstr ""
 
-#: src/webui/static/app/dvr.js:197
+#: src/webui/static/app/dvr.js:205
 msgid "Abort the selected recording"
 msgstr ""
 
-#: src/webui/static/app/tvheadend.js:510
+#: src/webui/static/app/tvheadend.js:540
 msgid "About"
 msgstr ""
 
@@ -138,19 +138,19 @@ msgstr ""
 msgid "Active"
 msgstr ""
 
-#: src/webui/static/app/idnode.js:1246 src/webui/static/app/idnode.js:1729
+#: src/webui/static/app/idnode.js:1324 src/webui/static/app/idnode.js:1823
 msgid "Add"
 msgstr ""
 
-#: src/webui/static/app/idnode.js:1244 src/webui/static/app/idnode.js:1727
+#: src/webui/static/app/idnode.js:1322 src/webui/static/app/idnode.js:1821
 msgid "Add a new entry"
 msgstr ""
 
-#: src/webui/static/app/idnode.js:993 src/webui/static/app/idnode.js:1023
+#: src/webui/static/app/idnode.js:1037 src/webui/static/app/idnode.js:1067
 msgid "Add {0}"
 msgstr ""
 
-#: src/webui/static/app/idnode.js:866
+#: src/webui/static/app/idnode.js:893
 msgid "Advanced Settings"
 msgstr ""
 
@@ -170,7 +170,7 @@ msgstr ""
 msgid "Age Rating"
 msgstr ""
 
-#: src/webui/static/app/idnode.js:1414 src/webui/static/app/idnode.js:1453
+#: src/webui/static/app/idnode.js:1508 src/webui/static/app/idnode.js:1547
 msgid "All"
 msgstr ""
 
@@ -190,11 +190,11 @@ msgstr ""
 msgid "April"
 msgstr ""
 
-#: src/webui/static/app/chconf.js:158
+#: src/webui/static/app/chconf.js:144
 msgid "Assign Number"
 msgstr ""
 
-#: src/webui/static/app/chconf.js:156
+#: src/webui/static/app/chconf.js:142
 msgid "Assign lowest free channel number"
 msgstr ""
 
@@ -214,7 +214,7 @@ msgstr ""
 msgid "August"
 msgstr ""
 
-#: src/webui/static/app/epg.js:1025
+#: src/webui/static/app/epg.js:1015
 msgid "Auto Recorder"
 msgstr ""
 
@@ -222,7 +222,7 @@ msgstr ""
 msgid "Auto-refresh"
 msgstr ""
 
-#: src/webui/static/app/epg.js:221
+#: src/webui/static/app/epg.js:221 src/webui/static/app/dvr.js:57
 msgid "Autorec"
 msgstr ""
 
@@ -230,15 +230,15 @@ msgstr ""
 msgid "Available"
 msgstr ""
 
-#: src/webui/static/app/status.js:358
+#: src/webui/static/app/status.js:366
 msgid "BER"
 msgstr ""
 
-#: src/webui/static/app/status.js:351
+#: src/webui/static/app/status.js:359
 msgid "Bandwidth (kb/s)"
 msgstr ""
 
-#: src/webui/static/app/status.js:660 src/webui/static/app/status.js:753
+#: src/webui/static/app/status.js:668 src/webui/static/app/status.js:761
 msgid "Bandwidth monitor"
 msgstr ""
 
@@ -246,7 +246,7 @@ msgstr ""
 msgid "Base"
 msgstr ""
 
-#: src/webui/static/app/idnode.js:864
+#: src/webui/static/app/idnode.js:891
 msgid "Basic Settings"
 msgstr ""
 
@@ -258,11 +258,11 @@ msgstr ""
 msgid "Begin mapping"
 msgstr ""
 
-#: src/webui/static/app/cteditor.js:41
+#: src/webui/static/app/cteditor.js:44
 msgid "Bouquet"
 msgstr ""
 
-#: src/webui/static/app/cteditor.js:42 src/webui/static/app/cteditor.js:68
+#: src/webui/static/app/cteditor.js:45 src/webui/static/app/cteditor.js:76
 msgid "Bouquets"
 msgstr ""
 
@@ -299,33 +299,33 @@ msgid "CAs"
 msgstr ""
 
 #: src/webui/static/app/i18n-post.js:111 src/webui/static/app/i18n-post.js:138
-#: src/webui/static/app/idnode.js:969
+#: src/webui/static/app/idnode.js:1013
 msgid "Cancel"
 msgstr ""
 
-#: src/webui/static/app/status.js:500
+#: src/webui/static/app/status.js:508
 msgid "Cancel Connection"
 msgstr ""
 
-#: src/webui/static/app/idnode.js:968
+#: src/webui/static/app/idnode.js:1012
 msgid "Cancel operation"
 msgstr ""
 
-#: src/webui/static/app/status.js:501
+#: src/webui/static/app/status.js:509
 msgid "Cancel the selected connection?"
 msgstr ""
 
-#: src/webui/static/app/status.js:497
+#: src/webui/static/app/status.js:505
 msgid "Cancel this connection"
 msgstr ""
 
-#: src/webui/static/app/chconf.js:221 src/webui/static/app/epg.js:537
-#: src/webui/static/app/epg.js:538 src/webui/static/app/epg.js:1029
-#: src/webui/static/app/status.js:102
+#: src/webui/static/app/chconf.js:207 src/webui/static/app/epg.js:537
+#: src/webui/static/app/epg.js:538 src/webui/static/app/epg.js:1019
+#: src/webui/static/app/status.js:104
 msgid "Channel"
 msgstr ""
 
-#: src/webui/static/app/tvheadend.js:449
+#: src/webui/static/app/tvheadend.js:478
 msgid "Channel / EPG"
 msgstr ""
 
@@ -337,7 +337,7 @@ msgstr ""
 msgid "Channel Tags"
 msgstr ""
 
-#: src/webui/static/app/chconf.js:222 src/webui/static/app/chconf.js:226
+#: src/webui/static/app/chconf.js:208 src/webui/static/app/chconf.js:212
 msgid "Channels"
 msgstr ""
 
@@ -357,11 +357,11 @@ msgstr ""
 msgid "Clean image cache on storage"
 msgstr ""
 
-#: src/webui/static/app/status.js:250 src/webui/static/app/status.js:253
+#: src/webui/static/app/status.js:258 src/webui/static/app/status.js:261
 msgid "Clear statistics"
 msgstr ""
 
-#: src/webui/static/app/status.js:254
+#: src/webui/static/app/status.js:262
 msgid "Clear statistics for selected input?"
 msgstr ""
 
@@ -373,15 +373,15 @@ msgstr ""
 msgid "Columns"
 msgstr ""
 
-#: src/webui/static/app/comet.js:54
+#: src/webui/static/app/comet.js:55
 msgid "Comet failure"
 msgstr ""
 
-#: src/webui/static/app/dvr.js:53
+#: src/webui/static/app/dvr.js:55
 msgid "Comment"
 msgstr ""
 
-#: src/webui/static/app/status.js:709
+#: src/webui/static/app/status.js:717
 msgid "Compression ratio"
 msgstr ""
 
@@ -389,11 +389,11 @@ msgstr ""
 msgid "Conditional Access Client"
 msgstr ""
 
-#: src/webui/static/app/tvheadend.js:392
+#: src/webui/static/app/tvheadend.js:421
 msgid "Configuration"
 msgstr ""
 
-#: src/webui/static/app/status.js:601
+#: src/webui/static/app/status.js:609
 msgid "Connections"
 msgstr ""
 
@@ -402,11 +402,11 @@ msgstr ""
 msgid "Content Type"
 msgstr ""
 
-#: src/webui/static/app/status.js:380
+#: src/webui/static/app/status.js:388
 msgid "Continuity Errors"
 msgstr ""
 
-#: src/webui/static/app/idnode.js:948
+#: src/webui/static/app/idnode.js:992
 msgid "Create"
 msgstr ""
 
@@ -424,7 +424,7 @@ msgstr ""
 msgid "Create network tags"
 msgstr ""
 
-#: src/webui/static/app/idnode.js:947
+#: src/webui/static/app/idnode.js:991
 msgid "Create new entry"
 msgstr ""
 
@@ -432,48 +432,48 @@ msgstr ""
 msgid "Create provider tags"
 msgstr ""
 
-#: src/webui/static/app/epg.js:1047
+#: src/webui/static/app/epg.js:1037
 msgid "Created from EPG query"
 msgstr ""
 
-#: src/webui/static/app/epg.js:1034
+#: src/webui/static/app/epg.js:1024
 #, javascript-format
 msgid "Currently this will match (and record) %d events."
 msgstr ""
 
-#: src/webui/static/app/tvheadend.js:431
+#: src/webui/static/app/tvheadend.js:460
 msgid "DVB Inputs"
 msgstr ""
 
-#: src/webui/static/app/epg.js:305 src/webui/static/app/dvr.js:464
+#: src/webui/static/app/epg.js:305 src/webui/static/app/dvr.js:472
 msgid "DVR"
 msgstr ""
 
-#: src/webui/static/app/dvr.js:438
+#: src/webui/static/app/dvr.js:446
 msgid "DVR - Failed Recordings"
 msgstr ""
 
-#: src/webui/static/app/dvr.js:357
+#: src/webui/static/app/dvr.js:365
 msgid "DVR - Finished Recordings"
 msgstr ""
 
-#: src/webui/static/app/dvr.js:276
+#: src/webui/static/app/dvr.js:284
 msgid "DVR - Upcoming/Current Recordings"
 msgstr ""
 
-#: src/webui/static/app/dvr.js:527
+#: src/webui/static/app/dvr.js:538
 msgid "DVR Autorec"
 msgstr ""
 
-#: src/webui/static/app/dvr.js:480
+#: src/webui/static/app/dvr.js:488
 msgid "DVR Autorec Entries"
 msgstr ""
 
-#: src/webui/static/app/dvr.js:479
+#: src/webui/static/app/dvr.js:487
 msgid "DVR Autorec Entry"
 msgstr ""
 
-#: src/webui/static/app/dvr.js:578
+#: src/webui/static/app/dvr.js:591
 msgid "DVR Timerec"
 msgstr ""
 
@@ -493,7 +493,7 @@ msgstr ""
 msgid "December"
 msgstr ""
 
-#: src/webui/static/app/idnode.js:1260 src/webui/static/app/idnode.js:1741
+#: src/webui/static/app/idnode.js:1338 src/webui/static/app/idnode.js:1835
 msgid "Delete"
 msgstr ""
 
@@ -505,29 +505,33 @@ msgstr ""
 msgid "Delete scheduled recording of this program"
 msgstr ""
 
-#: src/webui/static/app/idnode.js:1258 src/webui/static/app/idnode.js:1739
+#: src/webui/static/app/idnode.js:1336 src/webui/static/app/idnode.js:1833
 msgid "Delete selected entries"
 msgstr ""
 
+#: src/webui/static/app/status.js:132
+msgid "Descramble"
+msgstr ""
+
 #: src/webui/static/app/mpegts.js:264
 msgid "Detailed stream info"
 msgstr ""
 
 #: src/webui/static/app/mpegts.js:260 src/webui/static/app/epg.js:320
-#: src/webui/static/app/epg.js:321 src/webui/static/app/dvr.js:91
-#: src/webui/static/app/dvr.js:92
+#: src/webui/static/app/epg.js:321 src/webui/static/app/dvr.js:98
+#: src/webui/static/app/dvr.js:99
 msgid "Details"
 msgstr ""
 
-#: src/webui/static/app/dvr.js:593
+#: src/webui/static/app/dvr.js:606
 msgid "Digital Video Recorder"
 msgstr ""
 
-#: src/webui/static/app/dvr.js:453
+#: src/webui/static/app/dvr.js:461
 msgid "Digital Video Recorder Profile"
 msgstr ""
 
-#: src/webui/static/app/dvr.js:454
+#: src/webui/static/app/dvr.js:462
 msgid "Digital Video Recorder Profiles"
 msgstr ""
 
@@ -543,11 +547,11 @@ msgstr ""
 msgid "Displaying {0} - {1} of {2}"
 msgstr ""
 
-#: src/webui/static/app/dvr.js:217
+#: src/webui/static/app/dvr.js:225
 msgid "Do you really want to abort/unschedule the selection?"
 msgstr ""
 
-#: src/webui/static/app/dvr.js:325 src/webui/static/app/dvr.js:406
+#: src/webui/static/app/dvr.js:333 src/webui/static/app/dvr.js:414
 msgid "Do you really want to delete the selected recordings?"
 msgstr ""
 
@@ -555,7 +559,7 @@ msgstr ""
 msgid "Do you really want to delete the selection?"
 msgstr ""
 
-#: src/webui/static/app/dvr.js:187
+#: src/webui/static/app/dvr.js:195
 msgid "Do you really want to gracefully stop/unschedule the selection?"
 msgstr ""
 
@@ -567,27 +571,27 @@ msgstr ""
 msgid "Do you really want to remove this recording?"
 msgstr ""
 
-#: src/webui/static/app/epg.js:1008 src/webui/static/app/epg.js:1014
-#: src/webui/static/app/epg.js:1017 src/webui/static/app/epg.js:1020
-#: src/webui/static/app/epg.js:1023
+#: src/webui/static/app/epg.js:998 src/webui/static/app/epg.js:1004
+#: src/webui/static/app/epg.js:1007 src/webui/static/app/epg.js:1010
+#: src/webui/static/app/epg.js:1013
 msgid "Don't care"
 msgstr ""
 
-#: src/webui/static/app/dvr.js:296 src/webui/static/app/dvr.js:377
+#: src/webui/static/app/dvr.js:304 src/webui/static/app/dvr.js:385
 msgid "Download"
 msgstr ""
 
-#: src/webui/static/app/dvr.js:294 src/webui/static/app/dvr.js:375
+#: src/webui/static/app/dvr.js:302 src/webui/static/app/dvr.js:383
 msgid "Download the selected recording"
 msgstr ""
 
 #: src/webui/static/app/epg.js:111 src/webui/static/app/epg.js:521
-#: src/webui/static/app/epg.js:522 src/webui/static/app/epg.js:1032
-#: src/webui/static/app/dvr.js:44
+#: src/webui/static/app/epg.js:522 src/webui/static/app/epg.js:1022
+#: src/webui/static/app/dvr.js:46
 msgid "Duration"
 msgstr ""
 
-#: src/webui/static/app/epggrab.js:30 src/webui/static/app/epggrab.js:61
+#: src/webui/static/app/epggrab.js:30 src/webui/static/app/epggrab.js:84
 msgid "EPG Grab Configuration"
 msgstr ""
 
@@ -595,34 +599,46 @@ msgstr ""
 msgid "EPG Grabber"
 msgstr ""
 
-#: src/webui/static/app/epggrab.js:50
+#: src/webui/static/app/epggrab.js:41
+msgid "EPG Grabber Channel"
+msgstr ""
+
+#: src/webui/static/app/epggrab.js:42 src/webui/static/app/epggrab.js:51
+msgid "EPG Grabber Channels"
+msgstr ""
+
+#: src/webui/static/app/epggrab.js:73
 msgid "EPG Grabber Module"
 msgstr ""
 
-#: src/webui/static/app/epggrab.js:51
+#: src/webui/static/app/epggrab.js:74
 msgid "EPG Grabber Modules"
 msgstr ""
 
-#: src/webui/static/app/epggrab.js:52
+#: src/webui/static/app/epggrab.js:75
 msgid "EPG Grabber Name"
 msgstr ""
 
-#: src/webui/static/app/epg.js:955
+#: src/webui/static/app/epg.js:945
 msgid "EPG Update"
 msgstr ""
 
-#: src/webui/static/app/idnode.js:1347
+#: src/webui/static/app/idnode.js:1425
 msgid "Edit"
 msgstr ""
 
-#: src/webui/static/app/idnode.js:1345
+#: src/webui/static/app/idnode.js:1423
 msgid "Edit selected entry"
 msgstr ""
 
-#: src/webui/static/app/idnode.js:1361 src/webui/static/app/idnode.js:1385
+#: src/webui/static/app/idnode.js:1439 src/webui/static/app/idnode.js:1472
 msgid "Edit {0}"
 msgstr ""
 
+#: src/webui/static/app/idnode.js:1468
+msgid "Edit {0} ({1} entries)"
+msgstr ""
+
 #: src/webui/static/app/epg.js:869 src/webui/static/app/epg.js:880
 msgid "Electronic Program Guide"
 msgstr ""
@@ -633,7 +649,7 @@ msgstr ""
 msgid "Elementary Stream Filter"
 msgstr ""
 
-#: src/webui/static/app/tvheadend.js:720
+#: src/webui/static/app/tvheadend.js:750
 msgid "Enable debug output"
 msgstr ""
 
@@ -650,7 +666,7 @@ msgstr ""
 msgid "Episode"
 msgstr ""
 
-#: src/webui/static/app/status.js:130
+#: src/webui/static/app/status.js:138
 msgid "Errors"
 msgstr ""
 
@@ -658,7 +674,7 @@ msgstr ""
 msgid "Events"
 msgstr ""
 
-#: src/webui/static/app/dvr.js:116
+#: src/webui/static/app/dvr.js:123
 msgid "Every day"
 msgstr ""
 
@@ -666,11 +682,11 @@ msgstr ""
 msgid "Failed"
 msgstr ""
 
-#: src/webui/static/app/dvr.js:400
+#: src/webui/static/app/dvr.js:408
 msgid "Failed Recording"
 msgstr ""
 
-#: src/webui/static/app/dvr.js:401
+#: src/webui/static/app/dvr.js:409
 msgid "Failed Recordings"
 msgstr ""
 
@@ -682,7 +698,7 @@ msgstr ""
 msgid "February"
 msgstr ""
 
-#: src/webui/static/app/dvr.js:51
+#: src/webui/static/app/dvr.js:53
 msgid "File size"
 msgstr ""
 
@@ -706,11 +722,11 @@ msgstr ""
 msgid "Filters"
 msgstr ""
 
-#: src/webui/static/app/dvr.js:319
+#: src/webui/static/app/dvr.js:327
 msgid "Finished Recording"
 msgstr ""
 
-#: src/webui/static/app/dvr.js:320
+#: src/webui/static/app/dvr.js:328
 msgid "Finished Recordings"
 msgstr ""
 
@@ -726,7 +742,7 @@ msgstr ""
 msgid "Force new scan (all muxes) for selected networks"
 msgstr ""
 
-#: src/webui/static/app/tvheadend.js:659
+#: src/webui/static/app/tvheadend.js:689
 msgid "Free"
 msgstr ""
 
@@ -738,19 +754,19 @@ msgstr ""
 msgid "Friday"
 msgstr ""
 
-#: src/webui/static/app/tvheadend.js:308
+#: src/webui/static/app/tvheadend.js:337
 msgid "Fullscreen"
 msgstr ""
 
-#: src/webui/static/app/epg.js:842 src/webui/static/app/epg.js:1010
+#: src/webui/static/app/epg.js:842 src/webui/static/app/epg.js:1000
 msgid "Fulltext"
 msgstr ""
 
-#: src/webui/static/app/tvheadend.js:649
+#: src/webui/static/app/tvheadend.js:679
 msgid "GB"
 msgstr ""
 
-#: src/webui/static/app/tvheadend.js:401
+#: src/webui/static/app/tvheadend.js:430
 msgid "General"
 msgstr ""
 
@@ -758,16 +774,20 @@ msgstr ""
 msgid "General Configuration"
 msgstr ""
 
-#: src/webui/static/app/epg.js:1031
+#: src/webui/static/app/epg.js:1021
 msgid "Genre"
 msgstr ""
 
+#: src/webui/static/app/idnode.js:1171
+msgid "Grid Update"
+msgstr ""
+
 #: src/webui/static/app/i18n-post.js:211
 msgid "Group By This Field"
 msgstr ""
 
-#: src/webui/static/app/idnode.js:905 src/webui/static/app/idnode.js:1500
-#: src/webui/static/app/idnode.js:1848 src/webui/static/app/idnode.js:2206
+#: src/webui/static/app/idnode.js:946 src/webui/static/app/idnode.js:1594
+#: src/webui/static/app/idnode.js:1942 src/webui/static/app/idnode.js:2300
 #: src/webui/static/app/epg.js:866
 msgid "Help"
 msgstr ""
@@ -776,23 +796,23 @@ msgstr ""
 msgid "Help for"
 msgstr ""
 
-#: src/webui/static/app/idnode.js:1430
+#: src/webui/static/app/idnode.js:1524
 msgid "Hide"
 msgstr ""
 
-#: src/webui/static/app/idnode.js:1816
+#: src/webui/static/app/idnode.js:1910
 msgid "Hide passwords"
 msgstr ""
 
-#: src/webui/static/app/status.js:84
+#: src/webui/static/app/status.js:86
 msgid "Hostname"
 msgstr ""
 
-#: src/webui/static/app/status.js:74
+#: src/webui/static/app/status.js:76
 msgid "ID"
 msgstr ""
 
-#: src/webui/static/app/status.js:554
+#: src/webui/static/app/status.js:562
 msgid "IP Address"
 msgstr ""
 
@@ -816,7 +836,7 @@ msgstr ""
 msgid "Image cache"
 msgstr ""
 
-#: src/webui/static/app/status.js:707
+#: src/webui/static/app/status.js:715
 msgid "In"
 msgstr ""
 
@@ -824,11 +844,11 @@ msgstr ""
 msgid "Include encrypted services"
 msgstr ""
 
-#: src/webui/static/app/status.js:331 src/webui/static/app/status.js:797
+#: src/webui/static/app/status.js:339 src/webui/static/app/status.js:805
 msgid "Input"
 msgstr ""
 
-#: src/webui/static/app/status.js:136
+#: src/webui/static/app/status.js:144
 msgid "Input (kb/s)"
 msgstr ""
 
@@ -856,7 +876,7 @@ msgstr ""
 msgid "June"
 msgstr ""
 
-#: src/webui/static/app/tvheadend.js:653
+#: src/webui/static/app/tvheadend.js:683
 msgid "KB"
 msgstr ""
 
@@ -864,7 +884,7 @@ msgstr ""
 msgid "Last Page"
 msgstr ""
 
-#: src/webui/static/app/tvheadend.js:264
+#: src/webui/static/app/tvheadend.js:293
 msgid "Live TV Player"
 msgstr ""
 
@@ -875,12 +895,12 @@ msgstr ""
 #: src/webui/static/app/i18n-post.js:5 src/webui/static/app/i18n-post.js:17
 #: src/webui/static/app/i18n-post.js:197 src/webui/static/app/epg.js:618
 #: src/webui/static/app/epg.js:641 src/webui/static/app/epg.js:665
-#: src/webui/static/app/epg.js:686 src/webui/static/app/tvheadend.js:202
-#: src/webui/static/app/tvheadend.js:240
+#: src/webui/static/app/epg.js:686 src/webui/static/app/tvheadend.js:231
+#: src/webui/static/app/tvheadend.js:269
 msgid "Loading..."
 msgstr ""
 
-#: src/webui/static/app/tvheadend.js:630
+#: src/webui/static/app/tvheadend.js:660
 msgid "Logged in as"
 msgstr ""
 
@@ -888,7 +908,7 @@ msgstr ""
 msgid "Look for new SAT>IP servers"
 msgstr ""
 
-#: src/webui/static/app/tvheadend.js:651
+#: src/webui/static/app/tvheadend.js:681
 msgid "MB"
 msgstr ""
 
@@ -900,7 +920,7 @@ msgstr ""
 msgid "Map Selected"
 msgstr ""
 
-#: src/webui/static/app/chconf.js:145
+#: src/webui/static/app/chconf.js:131
 msgid "Map Services"
 msgstr ""
 
@@ -908,7 +928,7 @@ msgstr ""
 msgid "Map services"
 msgstr ""
 
-#: src/webui/static/app/mpegts.js:242 src/webui/static/app/chconf.js:143
+#: src/webui/static/app/mpegts.js:242 src/webui/static/app/chconf.js:129
 msgid "Map services to channels"
 msgstr ""
 
@@ -952,35 +972,35 @@ msgstr ""
 msgid "Monday"
 msgstr ""
 
-#: src/webui/static/app/idnode.js:1316 src/webui/static/app/idnode.js:1788
+#: src/webui/static/app/idnode.js:1394 src/webui/static/app/idnode.js:1882
 msgid "Move Down"
 msgstr ""
 
-#: src/webui/static/app/idnode.js:1291 src/webui/static/app/idnode.js:1767
+#: src/webui/static/app/idnode.js:1369 src/webui/static/app/idnode.js:1861
 msgid "Move Up"
 msgstr ""
 
-#: src/webui/static/app/chconf.js:182
+#: src/webui/static/app/chconf.js:168
 msgid "Move channel one number down"
 msgstr ""
 
-#: src/webui/static/app/chconf.js:169
+#: src/webui/static/app/chconf.js:155
 msgid "Move channel one number up"
 msgstr ""
 
-#: src/webui/static/app/idnode.js:1314
+#: src/webui/static/app/idnode.js:1392
 msgid "Move selected entries down"
 msgstr ""
 
-#: src/webui/static/app/idnode.js:1289
+#: src/webui/static/app/idnode.js:1367
 msgid "Move selected entries up"
 msgstr ""
 
-#: src/webui/static/app/idnode.js:1786
+#: src/webui/static/app/idnode.js:1880
 msgid "Move selected entry down"
 msgstr ""
 
-#: src/webui/static/app/idnode.js:1765
+#: src/webui/static/app/idnode.js:1859
 msgid "Move selected entry up"
 msgstr ""
 
@@ -1025,11 +1045,11 @@ msgstr ""
 msgid "No data to display"
 msgstr ""
 
-#: src/webui/static/app/dvr.js:118
+#: src/webui/static/app/dvr.js:125
 msgid "No days"
 msgstr ""
 
-#: src/webui/static/app/tvheadend.js:633
+#: src/webui/static/app/tvheadend.js:663
 msgid "No verified access"
 msgstr ""
 
@@ -1038,7 +1058,7 @@ msgstr ""
 msgid "No {0} to display"
 msgstr ""
 
-#: src/webui/static/app/idnode.js:1415 src/webui/static/app/mpegts.js:208
+#: src/webui/static/app/idnode.js:1509 src/webui/static/app/mpegts.js:208
 #: src/webui/static/app/mpegts.js:218
 msgid "None"
 msgstr ""
@@ -1059,11 +1079,11 @@ msgstr ""
 msgid "Number"
 msgstr ""
 
-#: src/webui/static/app/chconf.js:184
+#: src/webui/static/app/chconf.js:170
 msgid "Number Down"
 msgstr ""
 
-#: src/webui/static/app/chconf.js:171
+#: src/webui/static/app/chconf.js:157
 msgid "Number Up"
 msgstr ""
 
@@ -1091,15 +1111,15 @@ msgstr ""
 msgid "Other Stream Filters"
 msgstr ""
 
-#: src/webui/static/app/status.js:708
+#: src/webui/static/app/status.js:716
 msgid "Out"
 msgstr ""
 
-#: src/webui/static/app/status.js:144
+#: src/webui/static/app/status.js:152
 msgid "Output (kb/s)"
 msgstr ""
 
-#: src/webui/static/app/status.js:364
+#: src/webui/static/app/status.js:372
 msgid "PER"
 msgstr ""
 
@@ -1107,11 +1127,11 @@ msgstr ""
 msgid "Page"
 msgstr ""
 
-#: src/webui/static/app/idnode.js:1875 src/webui/static/app/idnode.js:2061
+#: src/webui/static/app/idnode.js:1969 src/webui/static/app/idnode.js:2155
 msgid "Parameters"
 msgstr ""
 
-#: src/webui/static/app/idnode.js:1413
+#: src/webui/static/app/idnode.js:1507
 msgid "Parent disabled"
 msgstr ""
 
@@ -1127,7 +1147,7 @@ msgstr ""
 msgid "Passwords"
 msgstr ""
 
-#: src/webui/static/app/tvheadend.js:293
+#: src/webui/static/app/tvheadend.js:322
 msgid "Pause"
 msgstr ""
 
@@ -1138,11 +1158,11 @@ msgstr ""
 #: src/webui/static/app/mpegts.js:126 src/webui/static/app/mpegts.js:127
 #: src/webui/static/app/mpegts.js:131 src/webui/static/app/mpegts.js:307
 #: src/webui/static/app/mpegts.js:308 src/webui/static/app/mpegts.js:312
-#: src/webui/static/app/chconf.js:237 src/webui/static/app/chconf.js:238
-#: src/webui/static/app/chconf.js:245 src/webui/static/app/dvr.js:344
-#: src/webui/static/app/dvr.js:345 src/webui/static/app/dvr.js:351
-#: src/webui/static/app/dvr.js:425 src/webui/static/app/dvr.js:426
-#: src/webui/static/app/dvr.js:432 src/webui/static/app/tvheadend.js:276
+#: src/webui/static/app/chconf.js:223 src/webui/static/app/chconf.js:224
+#: src/webui/static/app/chconf.js:231 src/webui/static/app/dvr.js:352
+#: src/webui/static/app/dvr.js:353 src/webui/static/app/dvr.js:359
+#: src/webui/static/app/dvr.js:433 src/webui/static/app/dvr.js:434
+#: src/webui/static/app/dvr.js:440 src/webui/static/app/tvheadend.js:305
 msgid "Play"
 msgstr ""
 
@@ -1166,7 +1186,7 @@ msgstr ""
 msgid "Previous Page"
 msgstr ""
 
-#: src/webui/static/app/dvr.js:455
+#: src/webui/static/app/dvr.js:463
 msgid "Profile Name"
 msgstr ""
 
@@ -1178,7 +1198,7 @@ msgstr ""
 msgid "Re-fetch images"
 msgstr ""
 
-#: src/webui/static/app/idnode.js:868
+#: src/webui/static/app/idnode.js:895
 msgid "Read-only Info"
 msgstr ""
 
@@ -1198,11 +1218,11 @@ msgstr ""
 msgid "Record this program now"
 msgstr ""
 
-#: src/webui/static/app/tvheadend.js:477
+#: src/webui/static/app/tvheadend.js:507
 msgid "Recording"
 msgstr ""
 
-#: src/webui/static/app/dvr.js:100
+#: src/webui/static/app/dvr.js:107
 msgid "Recording details"
 msgstr ""
 
@@ -1210,7 +1230,7 @@ msgstr ""
 msgid "Refresh"
 msgstr ""
 
-#: src/webui/static/app/chconf.js:208
+#: src/webui/static/app/chconf.js:194
 msgid "Reset (clear) the selected icon URLs"
 msgstr ""
 
@@ -1218,7 +1238,7 @@ msgstr ""
 msgid "Reset All"
 msgstr ""
 
-#: src/webui/static/app/chconf.js:210
+#: src/webui/static/app/chconf.js:196
 msgid "Reset Icon"
 msgstr ""
 
@@ -1226,8 +1246,8 @@ msgstr ""
 msgid "Reset all filters (show all)"
 msgstr ""
 
-#: src/webui/static/app/idnode.js:1230 src/webui/static/app/idnode.js:1714
-#: src/webui/static/app/idnode.js:2171
+#: src/webui/static/app/idnode.js:1308 src/webui/static/app/idnode.js:1808
+#: src/webui/static/app/idnode.js:2265
 msgid "Revert pending changes (marked with red border)"
 msgstr ""
 
@@ -1239,7 +1259,7 @@ msgstr ""
 msgid "SAT>IP Server Configuration"
 msgstr ""
 
-#: src/webui/static/app/status.js:394
+#: src/webui/static/app/status.js:402
 msgid "SNR"
 msgstr ""
 
@@ -1251,21 +1271,21 @@ msgstr ""
 msgid "Saturday"
 msgstr ""
 
-#: src/webui/static/app/idnode.js:884 src/webui/static/app/idnode.js:1205
-#: src/webui/static/app/idnode.js:1694 src/webui/static/app/idnode.js:2154
+#: src/webui/static/app/idnode.js:925 src/webui/static/app/idnode.js:1283
+#: src/webui/static/app/idnode.js:1788 src/webui/static/app/idnode.js:2248
 msgid "Save"
 msgstr ""
 
-#: src/webui/static/app/idnode.js:1203 src/webui/static/app/idnode.js:1692
-#: src/webui/static/app/idnode.js:2152
+#: src/webui/static/app/idnode.js:1281 src/webui/static/app/idnode.js:1786
+#: src/webui/static/app/idnode.js:2246
 msgid "Save pending changes (marked with red border)"
 msgstr ""
 
-#: src/webui/static/app/dvr.js:40
+#: src/webui/static/app/dvr.js:42
 msgid "Scheduled Start Time"
 msgstr ""
 
-#: src/webui/static/app/dvr.js:42
+#: src/webui/static/app/dvr.js:44
 msgid "Scheduled Stop Time"
 msgstr ""
 
@@ -1281,11 +1301,11 @@ msgstr ""
 msgid "Search title..."
 msgstr ""
 
-#: src/webui/static/app/tvheadend.js:209
+#: src/webui/static/app/tvheadend.js:238
 msgid "Select channel..."
 msgstr ""
 
-#: src/webui/static/app/tvheadend.js:246
+#: src/webui/static/app/tvheadend.js:275
 msgid "Select stream profile..."
 msgstr ""
 
@@ -1305,7 +1325,7 @@ msgstr ""
 msgid "September"
 msgstr ""
 
-#: src/webui/static/app/mpegts.js:294 src/webui/static/app/status.js:108
+#: src/webui/static/app/mpegts.js:294 src/webui/static/app/status.js:110
 msgid "Service"
 msgstr ""
 
@@ -1325,7 +1345,7 @@ msgstr ""
 msgid "Services"
 msgstr ""
 
-#: src/webui/static/app/idnode.js:826
+#: src/webui/static/app/idnode.js:853
 msgid "Settings"
 msgstr ""
 
@@ -1333,15 +1353,15 @@ msgstr ""
 msgid "Show in Groups"
 msgstr ""
 
-#: src/webui/static/app/idnode.js:1810
+#: src/webui/static/app/idnode.js:1904
 msgid "Show or hide passwords"
 msgstr ""
 
-#: src/webui/static/app/idnode.js:1812 src/webui/static/app/idnode.js:1816
+#: src/webui/static/app/idnode.js:1906 src/webui/static/app/idnode.js:1910
 msgid "Show passwords"
 msgstr ""
 
-#: src/webui/static/app/status.js:414
+#: src/webui/static/app/status.js:422
 msgid "Signal Strength"
 msgstr ""
 
@@ -1361,7 +1381,7 @@ msgstr ""
 msgid "Stars"
 msgstr ""
 
-#: src/webui/static/app/status.js:114
+#: src/webui/static/app/status.js:116
 msgid "Start"
 msgstr ""
 
@@ -1370,19 +1390,19 @@ msgstr ""
 msgid "Start Time"
 msgstr ""
 
-#: src/webui/static/app/status.js:564
+#: src/webui/static/app/status.js:572
 msgid "Started"
 msgstr ""
 
-#: src/webui/static/app/status.js:124
+#: src/webui/static/app/status.js:126
 msgid "State"
 msgstr ""
 
-#: src/webui/static/app/dvr.js:49 src/webui/static/app/status.js:611
+#: src/webui/static/app/dvr.js:51 src/webui/static/app/status.js:619
 msgid "Status"
 msgstr ""
 
-#: src/webui/static/app/dvr.js:169 src/webui/static/app/tvheadend.js:300
+#: src/webui/static/app/dvr.js:177 src/webui/static/app/tvheadend.js:329
 msgid "Stop"
 msgstr ""
 
@@ -1394,16 +1414,16 @@ msgstr ""
 msgid "Stop recording of this program"
 msgstr ""
 
-#: src/webui/static/app/dvr.js:167
+#: src/webui/static/app/dvr.js:175
 msgid "Stop the selected recording"
 msgstr ""
 
-#: src/webui/static/app/tvheadend.js:656
+#: src/webui/static/app/tvheadend.js:686
 msgid "Storage space"
 msgstr ""
 
-#: src/webui/static/app/status.js:336 src/webui/static/app/status.js:466
-#: src/webui/static/app/tvheadend.js:465
+#: src/webui/static/app/status.js:344 src/webui/static/app/status.js:474
+#: src/webui/static/app/tvheadend.js:495
 msgid "Stream"
 msgstr ""
 
@@ -1420,11 +1440,11 @@ msgstr ""
 msgid "Stream Profiles"
 msgstr ""
 
-#: src/webui/static/app/status.js:341
+#: src/webui/static/app/status.js:349
 msgid "Subs No."
 msgstr ""
 
-#: src/webui/static/app/status.js:191
+#: src/webui/static/app/status.js:199
 msgid "Subscriptions"
 msgstr ""
 
@@ -1448,15 +1468,15 @@ msgstr ""
 msgid "Sunday"
 msgstr ""
 
-#: src/webui/static/app/chconf.js:197
+#: src/webui/static/app/chconf.js:183
 msgid "Swap Numbers"
 msgstr ""
 
-#: src/webui/static/app/chconf.js:195
+#: src/webui/static/app/chconf.js:181
 msgid "Swap the numbers for the two selected channels"
 msgstr ""
 
-#: src/webui/static/app/tvheadend.js:716
+#: src/webui/static/app/tvheadend.js:746
 msgid "System log"
 msgstr ""
 
@@ -1464,7 +1484,7 @@ msgstr ""
 msgid "TV adapters"
 msgstr ""
 
-#: src/webui/static/app/epg.js:1030
+#: src/webui/static/app/epg.js:1020
 msgid "Tag"
 msgstr ""
 
@@ -1476,7 +1496,7 @@ msgstr ""
 msgid "Teletext Stream Filters"
 msgstr ""
 
-#: src/webui/static/app/dvr.js:326 src/webui/static/app/dvr.js:407
+#: src/webui/static/app/dvr.js:334 src/webui/static/app/dvr.js:415
 msgid "The associated file will be removed from storage."
 msgstr ""
 
@@ -1534,7 +1554,7 @@ msgstr ""
 msgid "This field is required"
 msgstr ""
 
-#: src/webui/static/app/epg.js:1025
+#: src/webui/static/app/epg.js:1015
 msgid ""
 "This will create an automatic rule that continuously scans the EPG for "
 "programs to record that match this query"
@@ -1548,11 +1568,15 @@ msgstr ""
 msgid "Thursday"
 msgstr ""
 
-#: src/webui/static/app/dvr.js:542
+#: src/webui/static/app/dvr.js:553
 msgid "Time Schedule"
 msgstr ""
 
-#: src/webui/static/app/dvr.js:543
+#: src/webui/static/app/dvr.js:59
+msgid "Time Scheduler"
+msgstr ""
+
+#: src/webui/static/app/dvr.js:554
 msgid "Time Schedules"
 msgstr ""
 
@@ -1565,7 +1589,7 @@ msgid "Timeshift Configuration"
 msgstr ""
 
 #: src/webui/static/app/epg.js:474 src/webui/static/app/epg.js:475
-#: src/webui/static/app/epg.js:1028 src/webui/static/app/status.js:96
+#: src/webui/static/app/epg.js:1018 src/webui/static/app/status.js:98
 msgid "Title"
 msgstr ""
 
@@ -1573,15 +1597,15 @@ msgstr ""
 msgid "Today"
 msgstr ""
 
-#: src/webui/static/app/tvheadend.js:318
+#: src/webui/static/app/tvheadend.js:347
 msgid "Toggle mute"
 msgstr ""
 
-#: src/webui/static/app/tvheadend.js:659
+#: src/webui/static/app/tvheadend.js:689
 msgid "Total"
 msgstr ""
 
-#: src/webui/static/app/status.js:375
+#: src/webui/static/app/status.js:383
 msgid "Transport Errors"
 msgstr ""
 
@@ -1601,41 +1625,41 @@ msgstr ""
 msgid "Tune to the over-the-air EPG muxes to grab new events now"
 msgstr ""
 
-#: src/webui/static/app/tvheadend.js:695
+#: src/webui/static/app/tvheadend.js:725
 msgid "Tvheadend Web-Panel"
 msgstr ""
 
 #: src/webui/static/app/caclient.js:46 src/webui/static/app/esfilter.js:32
-#: src/webui/static/app/mpegts.js:76 src/webui/static/app/status.js:549
+#: src/webui/static/app/mpegts.js:76 src/webui/static/app/status.js:557
 msgid "Type"
 msgstr ""
 
-#: src/webui/static/app/status.js:370
+#: src/webui/static/app/status.js:378
 msgid "Uncorrected Blocks"
 msgstr ""
 
-#: src/webui/static/app/idnode.js:1232 src/webui/static/app/idnode.js:1716
-#: src/webui/static/app/idnode.js:2173
+#: src/webui/static/app/idnode.js:1310 src/webui/static/app/idnode.js:1810
+#: src/webui/static/app/idnode.js:2267
 msgid "Undo"
 msgstr ""
 
-#: src/webui/static/app/status.js:407 src/webui/static/app/status.js:427
+#: src/webui/static/app/status.js:415 src/webui/static/app/status.js:435
 msgid "Unknown"
 msgstr ""
 
-#: src/webui/static/app/dvr.js:242
+#: src/webui/static/app/dvr.js:250
 msgid "Upcoming / Current Recordings"
 msgstr ""
 
-#: src/webui/static/app/dvr.js:241
+#: src/webui/static/app/dvr.js:249
 msgid "Upcoming Recording"
 msgstr ""
 
-#: src/webui/static/app/status.js:90 src/webui/static/app/status.js:559
+#: src/webui/static/app/status.js:92 src/webui/static/app/status.js:567
 msgid "Username"
 msgstr ""
 
-#: src/webui/static/app/tvheadend.js:416
+#: src/webui/static/app/tvheadend.js:445
 msgid "Users"
 msgstr ""
 
@@ -1647,7 +1671,7 @@ msgstr ""
 msgid "Video Stream Filters"
 msgstr ""
 
-#: src/webui/static/app/tvheadend.js:327
+#: src/webui/static/app/tvheadend.js:356
 msgid "Volume"
 msgstr ""
 
@@ -1667,11 +1691,11 @@ msgstr ""
 msgid "Wednesday"
 msgstr ""
 
-#: src/webui/static/app/status.js:346
+#: src/webui/static/app/status.js:354
 msgid "Weight"
 msgstr ""
 
-#: src/webui/static/app/dvr.js:31
+#: src/webui/static/app/dvr.js:33
 msgid "Will be skipped"
 msgstr ""
 
@@ -1691,7 +1715,7 @@ msgstr ""
 msgid "You must select one item in this group"
 msgstr ""
 
-#: src/webui/static/app/dvr.js:31
+#: src/webui/static/app/dvr.js:33
 msgid "because it is a rerun of:"
 msgstr ""
 
@@ -1714,11 +1738,11 @@ msgstr ""
 msgid "hrs"
 msgstr ""
 
-#: src/webui/static/app/tvheadend.js:634
+#: src/webui/static/app/tvheadend.js:664
 msgid "login"
 msgstr ""
 
-#: src/webui/static/app/tvheadend.js:631
+#: src/webui/static/app/tvheadend.js:661
 msgid "logout"
 msgstr ""
 
@@ -1748,7 +1772,7 @@ msgstr ""
 
 #: src/webui/static/app/idnode.js:350 src/webui/static/app/idnode.js:352
 #: src/webui/static/app/epg.js:420 src/webui/static/app/epg.js:423
-#: src/webui/static/app/dvr.js:44
+#: src/webui/static/app/dvr.js:46
 msgid "min"
 msgstr ""
 
diff --git a/intl/tvheadend.pot b/intl/tvheadend.pot
index 98bf017b4..c6ab2bf9b 100644
--- a/intl/tvheadend.pot
+++ b/intl/tvheadend.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-10-02 13:59+0200\n"
+"POT-Creation-Date: 2015-10-22 20:48+0200\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"
@@ -24,7 +24,7 @@ msgid ""
 "https://tvheadend.org\n"
 msgstr ""
 
-#: src/input/mpegts/mpegts_mux.c:587
+#: src/input/mpegts/mpegts_mux.c:588
 msgid "# Channels"
 msgstr ""
 
@@ -36,52 +36,52 @@ msgstr ""
 msgid "# Muxes"
 msgstr ""
 
-#: src/bouquet.c:891 src/input/mpegts/mpegts_network.c:224
-#: src/input/mpegts/mpegts_mux.c:580
+#: src/bouquet.c:992 src/input/mpegts/mpegts_network.c:224
+#: src/input/mpegts/mpegts_mux.c:581
 msgid "# Services"
 msgstr ""
 
-#: src/bouquet.c:884
+#: src/bouquet.c:985
 msgid "# Services Seen"
 msgstr ""
 
-#: src/dvr/dvr_config.c:661
+#: src/dvr/dvr_config.c:663
 msgid "(Default Profile)"
 msgstr ""
 
-#: src/input/mpegts/linuxdvb/linuxdvb_switch.c:69
+#: src/input/mpegts/linuxdvb/linuxdvb_switch.c:70
 msgid "0"
 msgstr ""
 
-#: src/input/mpegts/linuxdvb/linuxdvb_switch.c:70
+#: src/input/mpegts/linuxdvb/linuxdvb_switch.c:71
 msgid "1"
 msgstr ""
 
-#: src/input/mpegts/linuxdvb/linuxdvb_switch.c:79
+#: src/input/mpegts/linuxdvb/linuxdvb_switch.c:80
 msgid "10"
 msgstr ""
 
-#: src/input/mpegts/linuxdvb/linuxdvb_switch.c:80
+#: src/input/mpegts/linuxdvb/linuxdvb_switch.c:81
 msgid "11"
 msgstr ""
 
-#: src/input/mpegts/linuxdvb/linuxdvb_switch.c:81
+#: src/input/mpegts/linuxdvb/linuxdvb_switch.c:82
 msgid "12"
 msgstr ""
 
-#: src/input/mpegts/linuxdvb/linuxdvb_switch.c:82
+#: src/input/mpegts/linuxdvb/linuxdvb_switch.c:83
 msgid "13"
 msgstr ""
 
-#: src/input/mpegts/linuxdvb/linuxdvb_switch.c:83
+#: src/input/mpegts/linuxdvb/linuxdvb_switch.c:84
 msgid "14"
 msgstr ""
 
-#: src/input/mpegts/linuxdvb/linuxdvb_switch.c:84
+#: src/input/mpegts/linuxdvb/linuxdvb_switch.c:85
 msgid "15"
 msgstr ""
 
-#: src/input/mpegts/linuxdvb/linuxdvb_switch.c:71
+#: src/input/mpegts/linuxdvb/linuxdvb_switch.c:72
 msgid "2"
 msgstr ""
 
@@ -89,11 +89,11 @@ msgstr ""
 msgid "2-Port Switch (Universal LNB)"
 msgstr ""
 
-#: src/input/mpegts/linuxdvb/linuxdvb_switch.c:72
+#: src/input/mpegts/linuxdvb/linuxdvb_switch.c:73
 msgid "3"
 msgstr ""
 
-#: src/input/mpegts/linuxdvb/linuxdvb_switch.c:73
+#: src/input/mpegts/linuxdvb/linuxdvb_switch.c:74
 msgid "4"
 msgstr ""
 
@@ -101,7 +101,7 @@ msgstr ""
 msgid "4-Port Switch (Universal LNB)"
 msgstr ""
 
-#: src/input/mpegts/linuxdvb/linuxdvb_switch.c:74
+#: src/input/mpegts/linuxdvb/linuxdvb_switch.c:75
 msgid "5"
 msgstr ""
 
@@ -113,7 +113,7 @@ msgstr ""
 msgid "5.1"
 msgstr ""
 
-#: src/input/mpegts/linuxdvb/linuxdvb_switch.c:75
+#: src/input/mpegts/linuxdvb/linuxdvb_switch.c:76
 msgid "6"
 msgstr ""
 
@@ -121,7 +121,7 @@ msgstr ""
 msgid "6.1"
 msgstr ""
 
-#: src/input/mpegts/linuxdvb/linuxdvb_switch.c:76
+#: src/input/mpegts/linuxdvb/linuxdvb_switch.c:77
 msgid "7"
 msgstr ""
 
@@ -129,34 +129,34 @@ msgstr ""
 msgid "7.1"
 msgstr ""
 
-#: src/input/mpegts/linuxdvb/linuxdvb_switch.c:77
+#: src/input/mpegts/linuxdvb/linuxdvb_switch.c:78
 msgid "8"
 msgstr ""
 
-#: src/input/mpegts/linuxdvb/linuxdvb_switch.c:78
+#: src/input/mpegts/linuxdvb/linuxdvb_switch.c:79
 msgid "9"
 msgstr ""
 
 #: src/input/mpegts/linuxdvb/linuxdvb_satconf.c:357
-#: src/input/mpegts/linuxdvb/linuxdvb_switch.c:94
+#: src/input/mpegts/linuxdvb/linuxdvb_switch.c:95
 msgid "A"
 msgstr ""
 
 #: src/input/mpegts/linuxdvb/linuxdvb_satconf.c:392
-#: src/input/mpegts/linuxdvb/linuxdvb_switch.c:56
+#: src/input/mpegts/linuxdvb/linuxdvb_switch.c:57
 msgid "AA"
 msgstr ""
 
 #: src/input/mpegts/linuxdvb/linuxdvb_satconf.c:403
-#: src/input/mpegts/linuxdvb/linuxdvb_switch.c:57
+#: src/input/mpegts/linuxdvb/linuxdvb_switch.c:58
 msgid "AB"
 msgstr ""
 
-#: src/input/mpegts/mpegts_mux.c:478
+#: src/input/mpegts/mpegts_mux.c:479
 msgid "AC-3 = descriptor 6"
 msgstr ""
 
-#: src/input/mpegts/mpegts_mux.c:594
+#: src/input/mpegts/mpegts_mux.c:595
 msgid "AC-3 Detection"
 msgstr ""
 
@@ -168,51 +168,51 @@ msgstr ""
 msgid "AES Constant Code Word Client"
 msgstr ""
 
-#: src/config.c:1790
+#: src/config.c:1849
 msgid "AF11"
 msgstr ""
 
-#: src/config.c:1791
+#: src/config.c:1850
 msgid "AF12"
 msgstr ""
 
-#: src/config.c:1792
+#: src/config.c:1851
 msgid "AF13"
 msgstr ""
 
-#: src/config.c:1794
+#: src/config.c:1853
 msgid "AF21"
 msgstr ""
 
-#: src/config.c:1795
+#: src/config.c:1854
 msgid "AF22"
 msgstr ""
 
-#: src/config.c:1796
+#: src/config.c:1855
 msgid "AF23"
 msgstr ""
 
-#: src/config.c:1798
+#: src/config.c:1857
 msgid "AF31"
 msgstr ""
 
-#: src/config.c:1799
+#: src/config.c:1858
 msgid "AF32"
 msgstr ""
 
-#: src/config.c:1800
+#: src/config.c:1859
 msgid "AF33"
 msgstr ""
 
-#: src/config.c:1802
+#: src/config.c:1861
 msgid "AF41"
 msgstr ""
 
-#: src/config.c:1803
+#: src/config.c:1862
 msgid "AF42"
 msgstr ""
 
-#: src/config.c:1804
+#: src/config.c:1863
 msgid "AF43"
 msgstr ""
 
@@ -220,8 +220,8 @@ msgstr ""
 msgid "ANY"
 msgstr ""
 
-#: src/satip/server.c:657 src/input/mpegts/mpegts_mux_dvb.c:642
-#: src/input/mpegts/iptv/iptv_mux.c:141
+#: src/satip/server.c:664 src/input/mpegts/mpegts_mux_dvb.c:642
+#: src/input/mpegts/iptv/iptv_mux.c:156
 msgid "ATSC"
 msgstr ""
 
@@ -237,11 +237,11 @@ msgstr ""
 msgid "AUTO"
 msgstr ""
 
-#: src/streaming.c:438
+#: src/streaming.c:446
 msgid "Aborted by user"
 msgstr ""
 
-#: src/access.c:1373
+#: src/access.c:1361
 msgid "Access"
 msgstr ""
 
@@ -250,19 +250,19 @@ msgstr ""
 msgid "Action"
 msgstr ""
 
-#: src/streaming.c:425
+#: src/streaming.c:433
 msgid "Adapter in use by another subscription"
 msgstr ""
 
-#: src/main.c:720
+#: src/main.c:723
 msgid "Add file and line numbers to debug"
 msgstr ""
 
-#: src/main.c:721
+#: src/main.c:724
 msgid "Add the thread ID to debug"
 msgstr ""
 
-#: src/access.c:1501
+#: src/access.c:1489
 msgid "Admin"
 msgstr ""
 
@@ -275,7 +275,7 @@ msgstr ""
 msgid "Advanced (Non-Universal LNBs, Rotors, etc.)"
 msgstr ""
 
-#: src/access.c:1432
+#: src/access.c:1420
 msgid "Advanced Streaming"
 msgstr ""
 
@@ -287,15 +287,15 @@ msgstr ""
 msgid "Advertisement / Shopping"
 msgstr ""
 
-#: src/access.c:1345
+#: src/access.c:1333
 msgid "All (Streaming plus DVR)"
 msgstr ""
 
-#: src/access.c:1466
+#: src/access.c:1454
 msgid "All DVR"
 msgstr ""
 
-#: src/access.c:1472
+#: src/access.c:1460
 msgid "All DVR (rw)"
 msgstr ""
 
@@ -305,11 +305,11 @@ msgid ""
 "equipment."
 msgstr ""
 
-#: src/main.c:669
+#: src/main.c:670
 msgid "Alternate PID path"
 msgstr ""
 
-#: src/main.c:664
+#: src/main.c:665
 msgid "Alternate configuration path"
 msgstr ""
 
@@ -321,9 +321,9 @@ msgstr ""
 msgid "Animals"
 msgstr ""
 
-#: src/dvr/dvr_autorec.c:583 src/dvr/dvr_autorec.c:619
-#: src/dvr/dvr_autorec.c:633 src/dvr/dvr_autorec.c:640
-#: src/dvr/dvr_timerec.c:432
+#: src/dvr/dvr_autorec.c:618 src/dvr/dvr_autorec.c:654
+#: src/dvr/dvr_autorec.c:668 src/dvr/dvr_autorec.c:675
+#: src/dvr/dvr_timerec.c:433
 msgid "Any"
 msgstr ""
 
@@ -351,46 +351,54 @@ msgstr ""
 msgid "Auto"
 msgstr ""
 
-#: src/service.c:140
+#: src/service.c:143
 msgid "Auto Check Disabled"
 msgstr ""
 
-#: src/service.c:139
+#: src/service.c:142
 msgid "Auto Check Enabled"
 msgstr ""
 
-#: src/channels.c:332
+#: src/channels.c:344
 msgid "Auto EPG Channel"
 msgstr ""
 
-#: src/dvr/dvr_db.c:2290
+#: src/channels.c:305
+msgid "Auto Name"
+msgstr ""
+
+#: src/dvr/dvr_db.c:2590
 msgid "Auto Record"
 msgstr ""
 
-#: src/dvr/dvr_db.c:2298
+#: src/dvr/dvr_db.c:2598
+msgid "Auto Recorrd Caption"
+msgstr ""
+
+#: src/dvr/dvr_db.c:2605
 msgid "Auto Time Record"
 msgstr ""
 
-#: src/bouquet.c:817
+#: src/bouquet.c:893
 msgid "Auto-Map to Channels"
 msgstr ""
 
-#: src/service.c:165
+#: src/service.c:168
 msgid "Automatic Checking"
 msgstr ""
 
 #: src/input/mpegts/linuxdvb/linuxdvb_satconf.c:368
-#: src/input/mpegts/linuxdvb/linuxdvb_switch.c:95
+#: src/input/mpegts/linuxdvb/linuxdvb_switch.c:96
 msgid "B"
 msgstr ""
 
 #: src/input/mpegts/linuxdvb/linuxdvb_satconf.c:414
-#: src/input/mpegts/linuxdvb/linuxdvb_switch.c:58
+#: src/input/mpegts/linuxdvb/linuxdvb_switch.c:59
 msgid "BA"
 msgstr ""
 
 #: src/input/mpegts/linuxdvb/linuxdvb_satconf.c:425
-#: src/input/mpegts/linuxdvb/linuxdvb_switch.c:59
+#: src/input/mpegts/linuxdvb/linuxdvb_switch.c:60
 msgid "BB"
 msgstr ""
 
@@ -406,23 +414,23 @@ msgstr ""
 msgid "Based on software from"
 msgstr ""
 
-#: src/input/mpegts/satip/satip.c:359
+#: src/input/mpegts/satip/satip.c:381
 msgid "Boot ID"
 msgstr ""
 
-#: src/bouquet.c:792
+#: src/bouquet.c:868
 msgid "Bouquet"
 msgstr ""
 
-#: src/channels.c:382
+#: src/channels.c:394
 msgid "Bouquet (auto)"
 msgstr ""
 
-#: src/dvr/dvr_autorec.c:1077
+#: src/dvr/dvr_autorec.c:1127
 msgid "Brand"
 msgstr ""
 
-#: src/dvr/dvr_db.c:2314
+#: src/dvr/dvr_db.c:2644
 msgid "Broadcast"
 msgstr ""
 
@@ -455,11 +463,11 @@ msgstr ""
 msgid "CA Stream Filter"
 msgstr ""
 
-#: src/service.c:196
+#: src/service.c:199
 msgid "CAID"
 msgstr ""
 
-#: src/descrambler/capmt.c:2180
+#: src/descrambler/capmt.c:2217
 msgid "CAPMT (Linux DVBAPI)"
 msgstr ""
 
@@ -471,47 +479,47 @@ msgstr ""
 msgid "CAPMT Query Interval (ms)"
 msgstr ""
 
-#: src/input/mpegts/mpegts_mux.c:548 src/input/mpegts/mpegts_service.c:157
+#: src/input/mpegts/mpegts_mux.c:549 src/input/mpegts/mpegts_service.c:164
 msgid "CRID Authority"
 msgstr ""
 
-#: src/config.c:1788
+#: src/config.c:1847
 msgid "CS0"
 msgstr ""
 
-#: src/config.c:1789
+#: src/config.c:1848
 msgid "CS1"
 msgstr ""
 
-#: src/config.c:1793
+#: src/config.c:1852
 msgid "CS2"
 msgstr ""
 
-#: src/config.c:1797
+#: src/config.c:1856
 msgid "CS3"
 msgstr ""
 
-#: src/config.c:1801
+#: src/config.c:1860
 msgid "CS4"
 msgstr ""
 
-#: src/config.c:1805
+#: src/config.c:1864
 msgid "CS5"
 msgstr ""
 
-#: src/config.c:1807
+#: src/config.c:1866
 msgid "CS6"
 msgstr ""
 
-#: src/config.c:1808
+#: src/config.c:1867
 msgid "CS7"
 msgstr ""
 
-#: src/dvr/dvr_config.c:802
+#: src/dvr/dvr_config.c:804
 msgid "Cache Scheme"
 msgstr ""
 
-#: src/descrambler/capmt.c:2193
+#: src/descrambler/capmt.c:2230
 msgid "Camd.socket Filename / IP Address (TCP mode)"
 msgstr ""
 
@@ -520,49 +528,57 @@ msgstr ""
 msgid "Cartoons"
 msgstr ""
 
-#: src/channels.c:287 src/service.c:173 src/dvr/dvr_db.c:2120
-#: src/dvr/dvr_autorec.c:962 src/dvr/dvr_timerec.c:583
+#: src/channels.c:290 src/service.c:176 src/dvr/dvr_db.c:2411
+#: src/dvr/dvr_autorec.c:997 src/dvr/dvr_timerec.c:584
 msgid "Channel"
 msgstr ""
 
-#: src/dvr/dvr_db.c:2130
+#: src/dvr/dvr_db.c:2421
 msgid "Channel Icon"
 msgstr ""
 
-#: src/dvr/dvr_db.c:2137
+#: src/dvr/dvr_db.c:2428
 msgid "Channel Name"
 msgstr ""
 
-#: src/bouquet.c:904
+#: src/bouquet.c:1005
 msgid "Channel Number Offset"
 msgstr ""
 
-#: src/channels.c:1085 src/dvr/dvr_autorec.c:971
+#: src/channels.c:1131 src/dvr/dvr_autorec.c:1006
 msgid "Channel Tag"
 msgstr ""
 
-#: src/bouquet.c:852
+#: src/bouquet.c:928
 msgid "Channel Tag Reference"
 msgstr ""
 
-#: src/access.c:1541
+#: src/access.c:1529
 msgid "Channel Tags"
 msgstr ""
 
-#: src/config.c:1976
+#: src/config.c:2035
 msgid "Channel icon name lower-case"
 msgstr ""
 
-#: src/config.c:1969
+#: src/config.c:2028
 msgid "Channel icon path (see Help)"
 msgstr ""
 
-#: src/profile.c:1520
+#: src/input/mpegts/iptv/iptv_mux.c:169
+msgid "Channel number"
+msgstr ""
+
+#: src/input/mpegts/iptv/iptv.c:722
+msgid "Channel numbers from"
+msgstr ""
+
+#: src/profile.c:1520 src/epggrab/channel.c:499
 msgid "Channels"
 msgstr ""
 
-#: src/input/mpegts/mpegts_network.c:202 src/input/mpegts/mpegts_mux.c:572
-#: src/input/mpegts/mpegts_service.c:178
+#: src/input/mpegts/mpegts_network.c:202 src/input/mpegts/mpegts_mux.c:573
+#: src/input/mpegts/mpegts_service.c:185
 msgid "Character Set"
 msgstr ""
 
@@ -586,7 +602,7 @@ msgstr ""
 msgid "Classical music"
 msgstr ""
 
-#: src/streaming.c:540
+#: src/streaming.c:548
 msgid "Clean effects"
 msgstr ""
 
@@ -594,15 +610,15 @@ msgstr ""
 msgid "Client Name"
 msgstr ""
 
-#: src/dvr/dvr_config.c:819
+#: src/dvr/dvr_config.c:828
 msgid "Clone Scheduled Entry On Error"
 msgstr ""
 
-#: src/input/mpegts/linuxdvb/linuxdvb_switch.c:148
-msgid "Cmd Delay Time (ms) (10-500)"
+#: src/input/mpegts/linuxdvb/linuxdvb_switch.c:156
+msgid "Cmd Delay Time (ms) (10-200)"
 msgstr ""
 
-#: src/descrambler/cwc.c:1725
+#: src/descrambler/cwc.c:1736
 msgid "Code Word Client (newcamd)"
 msgstr ""
 
@@ -610,23 +626,28 @@ msgstr ""
 msgid "Comedy"
 msgstr ""
 
-#: src/access.c:1550 src/access.c:1784 src/access.c:1908 src/channels.c:1144
+#: src/input/mpegts/linuxdvb/linuxdvb_rotor.c:105
+msgid "Command Time (ms) (10-100)"
+msgstr ""
+
+#: src/access.c:1538 src/access.c:1772 src/access.c:1896 src/channels.c:1190
 #: src/esfilter.c:688 src/esfilter.c:755 src/esfilter.c:822 src/esfilter.c:889
-#: src/esfilter.c:964 src/esfilter.c:1025 src/profile.c:315 src/bouquet.c:898
-#: src/dvr/dvr_db.c:2364 src/dvr/dvr_autorec.c:1115 src/dvr/dvr_timerec.c:661
-#: src/dvr/dvr_config.c:785 src/descrambler/caclient.c:275
+#: src/esfilter.c:964 src/esfilter.c:1025 src/profile.c:315 src/bouquet.c:999
+#: src/epggrab/channel.c:508 src/dvr/dvr_db.c:2694 src/dvr/dvr_autorec.c:1165
+#: src/dvr/dvr_timerec.c:668 src/dvr/dvr_config.c:787
+#: src/descrambler/caclient.c:275
 msgid "Comment"
 msgstr ""
 
-#: src/dvr/dvr_db.c:291
+#: src/dvr/dvr_db.c:340
 msgid "Commercial break"
 msgstr ""
 
-#: src/input/mpegts/linuxdvb/linuxdvb_switch.c:121
+#: src/input/mpegts/linuxdvb/linuxdvb_switch.c:122
 msgid "Committed"
 msgstr ""
 
-#: src/dvr/dvr_db.c:314
+#: src/dvr/dvr_db.c:363
 msgid "Completed OK"
 msgstr ""
 
@@ -634,23 +655,23 @@ msgstr ""
 msgid "Conditional Access Client"
 msgstr ""
 
-#: src/config.c:1816
+#: src/config.c:1875
 msgid "Configuration"
 msgstr ""
 
-#: src/input/mpegts/satip/satip.c:366
+#: src/input/mpegts/satip/satip.c:388
 msgid "Configuration ID"
 msgstr ""
 
-#: src/dvr/dvr_config.c:775
+#: src/dvr/dvr_config.c:777
 msgid "Configuration Name"
 msgstr ""
 
-#: src/config.c:1851
+#: src/config.c:1910
 msgid "Configuration version"
 msgstr ""
 
-#: src/access.c:1507
+#: src/access.c:1495
 msgid "Connection Limit Type"
 msgstr ""
 
@@ -658,14 +679,18 @@ msgstr ""
 msgid "Constellation"
 msgstr ""
 
-#: src/profile.c:1505 src/dvr/dvr_db.c:2207
+#: src/profile.c:1505 src/dvr/dvr_db.c:2507
 msgid "Container"
 msgstr ""
 
-#: src/dvr/dvr_db.c:2306 src/dvr/dvr_autorec.c:1039
+#: src/dvr/dvr_db.c:2636 src/dvr/dvr_autorec.c:1074
 msgid "Content Type"
 msgstr ""
 
+#: src/input/mpegts/iptv/iptv.c:713
+msgid "Contents character set"
+msgstr ""
+
 #: src/epg.c:1984
 msgid "Contest"
 msgstr ""
@@ -674,7 +699,7 @@ msgstr ""
 msgid "Continue On Access Error"
 msgstr ""
 
-#: src/config.c:1874
+#: src/config.c:1933
 msgid "Cookie expiration (days)"
 msgstr ""
 
@@ -690,15 +715,19 @@ msgstr ""
 msgid "Copy layout"
 msgstr ""
 
-#: src/bouquet.c:845
+#: src/bouquet.c:921
 msgid "Create Tag"
 msgstr ""
 
-#: src/input/mpegts/mpegts_service.c:208
+#: src/input/mpegts/iptv/iptv.c:706
+msgid "Create bouquet"
+msgstr ""
+
+#: src/input/mpegts/mpegts_service.c:215
 msgid "Created"
 msgstr ""
 
-#: src/dvr/dvr_db.c:2235 src/dvr/dvr_autorec.c:1108 src/dvr/dvr_timerec.c:654
+#: src/dvr/dvr_db.c:2535 src/dvr/dvr_autorec.c:1158 src/dvr/dvr_timerec.c:661
 msgid "Creator"
 msgstr ""
 
@@ -706,7 +735,7 @@ msgstr ""
 msgid "Cron"
 msgstr ""
 
-#: src/epggrab.c:278
+#: src/epggrab.c:282
 msgid "Cron multi-line"
 msgstr ""
 
@@ -718,7 +747,7 @@ msgstr ""
 msgid "Current affairs"
 msgstr ""
 
-#: src/main.c:679
+#: src/main.c:680
 msgid "DBus - use the session message bus instead of the system one"
 msgstr ""
 
@@ -726,27 +755,27 @@ msgstr ""
 msgid "DES Constant Code Word Client"
 msgstr ""
 
-#: src/descrambler/cwc.c:1756
+#: src/descrambler/cwc.c:1767
 msgid "DES Key"
 msgstr ""
 
-#: src/config.c:1889
+#: src/config.c:1948
 msgid "DSCP/TOS for streaming"
 msgstr ""
 
-#: src/dvr/dvr_db.c:2277
+#: src/dvr/dvr_db.c:2577
 msgid "DVB EPG ID"
 msgstr ""
 
-#: src/config.c:1834
+#: src/config.c:1893
 msgid "DVB Scan Files"
 msgstr ""
 
-#: src/config.c:1934
+#: src/config.c:1993
 msgid "DVB scan files path"
 msgstr ""
 
-#: src/satip/server.c:643
+#: src/satip/server.c:650
 msgid "DVB-C"
 msgstr ""
 
@@ -754,15 +783,15 @@ msgstr ""
 msgid "DVB-C Network"
 msgstr ""
 
-#: src/satip/server.c:650
+#: src/satip/server.c:657
 msgid "DVB-C2"
 msgstr ""
 
-#: src/satip/server.c:664
+#: src/satip/server.c:671
 msgid "DVB-Cable/AnnexB"
 msgstr ""
 
-#: src/satip/server.c:615
+#: src/satip/server.c:622
 msgid "DVB-S"
 msgstr ""
 
@@ -794,11 +823,11 @@ msgstr ""
 msgid "DVB-S Toneburst"
 msgstr ""
 
-#: src/satip/server.c:622
+#: src/satip/server.c:629
 msgid "DVB-S2"
 msgstr ""
 
-#: src/satip/server.c:629 src/input/mpegts/mpegts_mux_dvb.c:210
+#: src/satip/server.c:636 src/input/mpegts/mpegts_mux_dvb.c:210
 msgid "DVB-T"
 msgstr ""
 
@@ -806,7 +835,7 @@ msgstr ""
 msgid "DVB-T Network"
 msgstr ""
 
-#: src/satip/server.c:636
+#: src/satip/server.c:643
 msgid "DVB-T2"
 msgstr ""
 
@@ -814,35 +843,43 @@ msgstr ""
 msgid "DVBC_ANNEX_AC"
 msgstr ""
 
-#: src/access.c:1347
+#: src/access.c:1335
 msgid "DVR"
 msgstr ""
 
-#: src/dvr/dvr_autorec.c:921
+#: src/dvr/dvr_autorec.c:956
 msgid "DVR Auto-Record Entry"
 msgstr ""
 
-#: src/dvr/dvr_config.c:733
+#: src/dvr/dvr_config.c:735
 msgid "DVR Behaviour"
 msgstr ""
 
-#: src/dvr/dvr_db.c:2217 src/dvr/dvr_autorec.c:1068 src/dvr/dvr_timerec.c:638
+#: src/dvr/dvr_db.c:2517 src/dvr/dvr_autorec.c:1118 src/dvr/dvr_timerec.c:645
 msgid "DVR Configuration"
 msgstr ""
 
-#: src/dvr/dvr_config.c:725
+#: src/dvr/dvr_config.c:727
 msgid "DVR Configuration Profile"
 msgstr ""
 
-#: src/access.c:1486
+#: src/access.c:1474
 msgid "DVR Configuration Profiles"
 msgstr ""
 
-#: src/dvr/dvr_db.c:2050
+#: src/dvr/dvr_db.c:2341
 msgid "DVR Entry"
 msgstr ""
 
-#: src/dvr/dvr_config.c:811
+#: src/dvr/dvr_config.c:821
+msgid "DVR File Removal Time (days)"
+msgstr ""
+
+#: src/dvr/dvr_db.c:2491 src/dvr/dvr_autorec.c:1097 src/dvr/dvr_timerec.c:633
+msgid "DVR Log Retention (days)"
+msgstr ""
+
+#: src/dvr/dvr_config.c:813
 msgid "DVR Log Retention Time (days)"
 msgstr ""
 
@@ -866,15 +903,15 @@ msgstr ""
 msgid "DVR Override Unimportant"
 msgstr ""
 
-#: src/channels.c:355
+#: src/channels.c:367
 msgid "DVR Post"
 msgstr ""
 
-#: src/channels.c:348
+#: src/channels.c:360
 msgid "DVR Pre"
 msgstr ""
 
-#: src/dvr/dvr_timerec.c:548
+#: src/dvr/dvr_timerec.c:549
 msgid "DVR Time-Record Entry"
 msgstr ""
 
@@ -882,11 +919,11 @@ msgstr ""
 msgid "Dance"
 msgstr ""
 
-#: src/dvr/dvr_db.c:2270
+#: src/dvr/dvr_db.c:2570
 msgid "Data Errors"
 msgstr ""
 
-#: src/dvr/dvr_autorec.c:1015 src/dvr/dvr_timerec.c:613
+#: src/dvr/dvr_autorec.c:1050 src/dvr/dvr_timerec.c:614
 msgid "Days of Week"
 msgstr ""
 
@@ -895,7 +932,7 @@ msgstr ""
 msgid "Debate"
 msgstr ""
 
-#: src/main.c:711
+#: src/main.c:714
 msgid "Debug Options"
 msgstr ""
 
@@ -923,7 +960,7 @@ msgstr ""
 msgid "Debugging"
 msgstr ""
 
-#: src/config.c:1787 src/profile.c:300
+#: src/config.c:1846 src/profile.c:300
 msgid "Default"
 msgstr ""
 
@@ -931,7 +968,7 @@ msgstr ""
 msgid "Default Priority"
 msgstr ""
 
-#: src/config.c:1905
+#: src/config.c:1964
 msgid "Default language(s)"
 msgstr ""
 
@@ -948,11 +985,11 @@ msgstr ""
 msgid "Descramble Services (Limit Per Mux)"
 msgstr ""
 
-#: src/config.c:1897
+#: src/config.c:1956
 msgid "Descrambler buffer (TS packets)"
 msgstr ""
 
-#: src/dvr/dvr_db.c:2176 src/dvr/dvr_db.c:2183
+#: src/dvr/dvr_db.c:2467 src/dvr/dvr_db.c:2474
 msgid "Description"
 msgstr ""
 
@@ -960,7 +997,7 @@ msgstr ""
 msgid "Detective"
 msgstr ""
 
-#: src/input/mpegts/satip/satip.c:373
+#: src/input/mpegts/satip/satip.c:395
 msgid "Device ID"
 msgstr ""
 
@@ -973,11 +1010,11 @@ msgstr ""
 msgid "Device Path"
 msgstr ""
 
-#: src/dvr/dvr_db.c:2249 src/dvr/dvr_autorec.c:943 src/dvr/dvr_timerec.c:577
+#: src/dvr/dvr_db.c:2549 src/dvr/dvr_autorec.c:978 src/dvr/dvr_timerec.c:578
 msgid "Directory"
 msgstr ""
 
-#: src/dvr/dvr_config.c:908
+#: src/dvr/dvr_config.c:924
 msgid "Directory Permissions (octal, e.g. 0775)"
 msgstr ""
 
@@ -985,19 +1022,23 @@ msgstr ""
 msgid "Disable"
 msgstr ""
 
-#: src/main.c:730
+#: src/main.c:733
 msgid "Disable DVB bouquets"
 msgstr ""
 
-#: src/main.c:728
+#: src/main.c:693
+msgid "Disable SAT>IP client"
+msgstr ""
+
+#: src/main.c:731
 msgid "Disable all access control checks"
 msgstr ""
 
-#: src/input/mpegts/satip/satip.c:275
+#: src/input/mpegts/satip/satip.c:297
 msgid "Disable device/firmware-specific workarounds"
 msgstr ""
 
-#: src/main.c:714
+#: src/main.c:717
 msgid "Disable syslog (all messages)"
 msgstr ""
 
@@ -1006,11 +1047,11 @@ msgstr ""
 msgid "Discussion"
 msgstr ""
 
-#: src/input/mpegts/linuxdvb/linuxdvb_satconf.c:1376
+#: src/input/mpegts/linuxdvb/linuxdvb_satconf.c:1436
 msgid "DiseqC"
 msgstr ""
 
-#: src/input/mpegts/linuxdvb/linuxdvb_rotor.c:89
+#: src/input/mpegts/linuxdvb/linuxdvb_rotor.c:92
 msgid "DiseqC Rotor"
 msgstr ""
 
@@ -1018,7 +1059,7 @@ msgstr ""
 msgid "DiseqC repeats"
 msgstr ""
 
-#: src/input/mpegts/linuxdvb/linuxdvb_switch.c:115
+#: src/input/mpegts/linuxdvb/linuxdvb_switch.c:116
 msgid "DiseqC switch"
 msgstr ""
 
@@ -1030,19 +1071,19 @@ msgstr ""
 msgid "Documentary"
 msgstr ""
 
-#: src/dvr/dvr_config.c:972
+#: src/dvr/dvr_config.c:988
 msgid "Don't Include Title In Filename"
 msgstr ""
 
-#: src/dvr/dvr_db.c:2284
+#: src/dvr/dvr_db.c:2584
 msgid "Don't Reschedule"
 msgstr ""
 
-#: src/main.c:665
+#: src/main.c:666
 msgid "Don't backup configuration tree at upgrade"
 msgstr ""
 
-#: src/dvr/dvr_config.c:686
+#: src/dvr/dvr_config.c:688
 msgid "Don't keep"
 msgstr ""
 
@@ -1051,19 +1092,19 @@ msgstr ""
 msgid "Drama"
 msgstr ""
 
-#: src/dvr/dvr_autorec.c:1054
+#: src/dvr/dvr_autorec.c:1089
 msgid "Duplicate Handling"
 msgstr ""
 
-#: src/dvr/dvr_db.c:2113
+#: src/dvr/dvr_db.c:2404
 msgid "Duration"
 msgstr ""
 
-#: src/config.c:1806
+#: src/config.c:1865
 msgid "EF"
 msgstr ""
 
-#: src/input/mpegts/mpegts_mux.c:603
+#: src/input/mpegts/mpegts_mux.c:604
 msgid "EIT - skip TSID check"
 msgstr ""
 
@@ -1075,23 +1116,31 @@ msgstr ""
 msgid "EPG Grabber"
 msgstr ""
 
-#: src/epggrab.c:227
+#: src/epggrab.c:231
 msgid "EPG Grabber Configuration"
 msgstr ""
 
-#: src/input/mpegts/mpegts_mux.c:505
+#: src/input/mpegts/iptv/iptv_mux.c:181
+msgid "EPG Name"
+msgstr ""
+
+#: src/input/mpegts/mpegts_mux.c:506
 msgid "EPG Scan"
 msgstr ""
 
-#: src/channels.c:339
+#: src/channels.c:351
 msgid "EPG Source"
 msgstr ""
 
-#: src/dvr/dvr_config.c:843
+#: src/dvr/dvr_config.c:859
 msgid "EPG Update Window"
 msgstr ""
 
-#: src/epggrab.c:303
+#: src/epggrab/channel.c:450
+msgid "EPG grabber channel"
+msgstr ""
+
+#: src/epggrab.c:307
 msgid "EPG scan timeout in seconds (30-7200)"
 msgstr ""
 
@@ -1115,59 +1164,64 @@ msgstr ""
 msgid "Enable (auto)"
 msgstr ""
 
-#: src/main.c:677
+#: src/main.c:678
 msgid "Enable DBus"
 msgstr ""
 
-#: src/config.c:1948
+#: src/config.c:2007
 msgid "Enable NTP driver"
 msgstr ""
 
-#: src/main.c:727
+#: src/main.c:730
 msgid "Enable coredumps for daemon"
 msgstr ""
 
-#: src/main.c:712
+#: src/main.c:715
 msgid "Enable debug on stderr"
 msgstr ""
 
-#: src/main.c:716
+#: src/main.c:719
 msgid "Enable debug subsystems"
 msgstr ""
 
-#: src/main.c:715
+#: src/main.c:718
 msgid "Enable debug to file"
 msgstr ""
 
-#: src/main.c:713
+#: src/main.c:716
 msgid "Enable debug to syslog"
 msgstr ""
 
-#: src/main.c:718
+#: src/main.c:721
 msgid "Enable trace subsystems"
 msgstr ""
 
-#: src/main.c:725
+#: src/main.c:728
 msgid "Enable webUI debug (non-minified JS)"
 msgstr ""
 
-#: src/access.c:1392 src/access.c:1756 src/access.c:1895 src/channels.c:296
-#: src/channels.c:1094 src/service.c:158 src/imagecache.c:84
-#: src/esfilter.c:621 src/profile.c:293 src/bouquet.c:802
-#: src/epggrab/module.c:141 src/dvr/dvr_db.c:2060 src/dvr/dvr_autorec.c:931
-#: src/dvr/dvr_timerec.c:558 src/dvr/dvr_config.c:765
-#: src/descrambler/caclient.c:262 src/input/mpegts/mpegts_input.c:225
-#: src/input/mpegts/mpegts_mux.c:497 src/input/mpegts/mpegts_mux_sched.c:126
-#: src/input/mpegts/linuxdvb/linuxdvb_satconf.c:1210
+#: src/access.c:1380 src/access.c:1744 src/access.c:1883 src/channels.c:299
+#: src/channels.c:1140 src/service.c:161 src/imagecache.c:84
+#: src/esfilter.c:621 src/profile.c:293 src/bouquet.c:878
+#: src/epggrab/module.c:141 src/epggrab/channel.c:460 src/dvr/dvr_db.c:2351
+#: src/dvr/dvr_autorec.c:966 src/dvr/dvr_timerec.c:559
+#: src/dvr/dvr_config.c:767 src/descrambler/caclient.c:262
+#: src/input/mpegts/mpegts_input.c:226 src/input/mpegts/mpegts_mux.c:498
+#: src/input/mpegts/mpegts_mux_sched.c:126
+#: src/input/mpegts/linuxdvb/linuxdvb_satconf.c:1270
 #: src/input/mpegts/satip/satip_satconf.c:188 src/timeshift.c:150
 #: src/input/mpegts/linuxdvb/linuxdvb_ca.c:188
 msgid "Enabled"
 msgstr ""
 
-#: src/service.c:189
+#: src/service.c:192
 msgid "Encrypted"
 msgstr ""
 
+#: src/htsp_server.c:656
+msgid "Encrypted service"
+msgstr ""
+
 #: src/epg.c:2013
 msgid "Entertainment programmes for 10 to 16"
 msgstr ""
@@ -1180,24 +1234,24 @@ msgstr ""
 msgid "Environment"
 msgstr ""
 
-#: src/input/mpegts/iptv/iptv_mux.c:182
+#: src/input/mpegts/iptv/iptv_mux.c:216
 msgid "Environment (pipe)"
 msgstr ""
 
-#: src/dvr/dvr_db.c:2322
+#: src/dvr/dvr_db.c:2652
 msgid "Episode"
 msgstr ""
 
-#: src/dvr/dvr_db.c:427
+#: src/dvr/dvr_db.c:484
 #, c-format
 msgid "Episode %d"
 msgstr ""
 
-#: src/dvr/dvr_db.c:2256
+#: src/dvr/dvr_db.c:2556
 msgid "Error Code"
 msgstr ""
 
-#: src/dvr/dvr_db.c:2263
+#: src/dvr/dvr_db.c:2563
 msgid "Errors"
 msgstr ""
 
@@ -1205,11 +1259,11 @@ msgstr ""
 msgid "Even Key"
 msgstr ""
 
-#: src/dvr/dvr_autorec.c:750
+#: src/dvr/dvr_autorec.c:785
 msgid "Every day"
 msgstr ""
 
-#: src/access.c:1534
+#: src/access.c:1522
 msgid "Exclude Channel Tags"
 msgstr ""
 
@@ -1233,19 +1287,23 @@ msgstr ""
 msgid "External EPG Grabber"
 msgstr ""
 
-#: src/dvr/dvr_db.c:2074 src/dvr/dvr_autorec.c:998
+#: src/bouquet.c:943
+msgid "External URL"
+msgstr ""
+
+#: src/dvr/dvr_db.c:2365 src/dvr/dvr_autorec.c:1033
 msgid "Extra Start Time"
 msgstr ""
 
-#: src/dvr/dvr_db.c:2098 src/dvr/dvr_autorec.c:1006
+#: src/dvr/dvr_db.c:2389 src/dvr/dvr_autorec.c:1041
 msgid "Extra Stop Time"
 msgstr ""
 
-#: src/dvr/dvr_config.c:835
+#: src/dvr/dvr_config.c:851
 msgid "Extra Time After Recordings (minutes)"
 msgstr ""
 
-#: src/dvr/dvr_config.c:827
+#: src/dvr/dvr_config.c:843
 msgid "Extra Time Before Recordings (minutes)"
 msgstr ""
 
@@ -1269,7 +1327,7 @@ msgstr ""
 msgid "Factual topics"
 msgstr ""
 
-#: src/access.c:1478
+#: src/access.c:1466
 msgid "Failed DVR"
 msgstr ""
 
@@ -1277,31 +1335,39 @@ msgstr ""
 msgid "Fantasy"
 msgstr ""
 
-#: src/dvr/dvr_db.c:310
+#: src/input/mpegts/satip/satip.c:220
+msgid "Fast input switch"
+msgstr ""
+
+#: src/dvr/dvr_db.c:359
 msgid "File Missing"
 msgstr ""
 
-#: src/dvr/dvr_db.c:301
+#: src/dvr/dvr_db.c:350
 msgid "File Not Created"
 msgstr ""
 
-#: src/dvr/dvr_config.c:866
+#: src/dvr/dvr_config.c:882
 msgid "File Permissions (octal, e.g. 0664)"
 msgstr ""
 
-#: src/dvr/dvr_db.c:2336
+#: src/dvr/dvr_db.c:2666
 msgid "File Size"
 msgstr ""
 
-#: src/dvr/dvr_db.c:2242
+#: src/dvr/dvr_db.c:2499 src/dvr/dvr_autorec.c:1104 src/dvr/dvr_timerec.c:639
+msgid "File removal (days)"
+msgstr ""
+
+#: src/dvr/dvr_db.c:2542
 msgid "Filename"
 msgstr ""
 
-#: src/dvr/dvr_config.c:874
+#: src/dvr/dvr_config.c:890
 msgid "Filename Character Set"
 msgstr ""
 
-#: src/dvr/dvr_config.c:749
+#: src/dvr/dvr_config.c:751
 msgid "Filename Options"
 msgstr ""
 
@@ -1333,7 +1399,7 @@ msgstr ""
 msgid "Force (auto)"
 msgstr ""
 
-#: src/input/mpegts/mpegts_service.c:201
+#: src/input/mpegts/mpegts_service.c:208
 msgid "Force CA ID (e.g. 0x2600)"
 msgstr ""
 
@@ -1345,11 +1411,11 @@ msgstr ""
 msgid "Force Priority"
 msgstr ""
 
-#: src/epggrab.c:287
+#: src/epggrab.c:291
 msgid "Force initial EPG scan at startup"
 msgstr ""
 
-#: src/input/mpegts/satip/satip.c:254
+#: src/input/mpegts/satip/satip.c:269
 msgid "Force pilot for DVB-S2"
 msgstr ""
 
@@ -1361,11 +1427,11 @@ msgstr ""
 msgid "Foreign countries"
 msgstr ""
 
-#: src/main.c:666
+#: src/main.c:667
 msgid "Fork and run as daemon"
 msgstr ""
 
-#: src/dvr/dvr_config.c:900
+#: src/dvr/dvr_config.c:916
 msgid "Format String"
 msgstr ""
 
@@ -1386,11 +1452,11 @@ msgstr ""
 msgid "Frequency (kHz)"
 msgstr ""
 
-#: src/dvr/dvr_autorec.c:732
+#: src/dvr/dvr_autorec.c:767
 msgid "Fri"
 msgstr ""
 
-#: src/input/mpegts/satip/satip.c:303
+#: src/input/mpegts/satip/satip.c:325
 #: src/input/mpegts/tvhdhomerun/tvhdhomerun.c:163
 msgid "Friendly Name"
 msgstr ""
@@ -1409,15 +1475,15 @@ msgstr ""
 msgid "Full DiseqC"
 msgstr ""
 
-#: src/input/mpegts/satip/satip.c:212
+#: src/input/mpegts/satip/satip.c:227
 msgid "Full Mux Rx mode supported"
 msgstr ""
 
-#: src/dvr/dvr_config.c:741
+#: src/dvr/dvr_config.c:743
 msgid "Full Pathname Specification"
 msgstr ""
 
-#: src/dvr/dvr_autorec.c:956
+#: src/dvr/dvr_autorec.c:991
 msgid "Full-text"
 msgstr ""
 
@@ -1425,15 +1491,15 @@ msgstr ""
 msgid "Further education"
 msgstr ""
 
-#: src/input/mpegts/linuxdvb/linuxdvb_rotor.c:444
+#: src/input/mpegts/linuxdvb/linuxdvb_rotor.c:464
 msgid "GOTOX"
 msgstr ""
 
-#: src/input/mpegts/linuxdvb/linuxdvb_rotor.c:102
+#: src/input/mpegts/linuxdvb/linuxdvb_rotor.c:122
 msgid "GOTOX Position"
 msgstr ""
 
-#: src/input/mpegts/linuxdvb/linuxdvb_rotor.c:97
+#: src/input/mpegts/linuxdvb/linuxdvb_rotor.c:117
 msgid "GOTOX Rotor"
 msgstr ""
 
@@ -1450,16 +1516,16 @@ msgstr ""
 msgid "General"
 msgstr ""
 
-#: src/epggrab.c:233
+#: src/epggrab.c:237
 msgid "General Config"
 msgstr ""
 
-#: src/input/mpegts/linuxdvb/linuxdvb_switch.c:253
-#: src/input/mpegts/linuxdvb/linuxdvb_en50494.c:297
+#: src/input/mpegts/linuxdvb/linuxdvb_switch.c:260
+#: src/input/mpegts/linuxdvb/linuxdvb_en50494.c:304
 msgid "Generic"
 msgstr ""
 
-#: src/main.c:659
+#: src/main.c:660
 msgid "Generic Options"
 msgstr ""
 
@@ -1487,7 +1553,7 @@ msgstr ""
 msgid "HDHomeRun DVB-T Frontend"
 msgstr ""
 
-#: src/access.c:1460
+#: src/access.c:1448
 msgid "HTSP DVR"
 msgstr ""
 
@@ -1499,11 +1565,11 @@ msgstr ""
 msgid "HTSP Stream Profile"
 msgstr ""
 
-#: src/access.c:1438
+#: src/access.c:1426
 msgid "HTSP Streaming"
 msgstr ""
 
-#: src/config.c:1881
+#: src/config.c:1940
 msgid "HTTP CORS Origin"
 msgstr ""
 
@@ -1511,7 +1577,7 @@ msgstr ""
 msgid "Handicraft"
 msgstr ""
 
-#: src/streaming.c:541
+#: src/streaming.c:549
 msgid "Hearing impaired"
 msgstr ""
 
@@ -1519,7 +1585,7 @@ msgstr ""
 msgid "Hierarchy"
 msgstr ""
 
-#: src/profile.c:248 src/dvr/dvr_db.c:1680
+#: src/profile.c:248 src/dvr/dvr_db.c:1862
 msgid "High"
 msgstr ""
 
@@ -1535,36 +1601,44 @@ msgstr ""
 msgid "Horror"
 msgstr ""
 
-#: src/descrambler/cwc.c:1743
+#: src/descrambler/cwc.c:1754
 msgid "Hostname/IP"
 msgstr ""
 
+#: src/epggrab/channel.c:473
+msgid "ID"
+msgstr ""
+
 #: src/input/mpegts/mpegts_mux.c:381
 msgid "IDLE"
 msgstr ""
 
-#: src/input/mpegts/satip/satip.c:282
+#: src/input/mpegts/satip/satip.c:304
 #: src/input/mpegts/tvhdhomerun/tvhdhomerun.c:149
 msgid "IP Address"
 msgstr ""
 
-#: src/access.c:1856 src/access.c:1885
+#: src/access.c:1844 src/access.c:1873
 msgid "IP Blocking"
 msgstr ""
 
-#: src/input/mpegts/iptv/iptv.c:89
+#: src/input/mpegts/iptv/iptv.c:137
 msgid "IPTV"
 msgstr ""
 
-#: src/input/mpegts/iptv/iptv.c:95
+#: src/input/mpegts/iptv/iptv.c:692
+msgid "IPTV Automatic Network"
+msgstr ""
+
+#: src/input/mpegts/iptv/iptv.c:144
 msgid "IPTV Input"
 msgstr ""
 
-#: src/input/mpegts/iptv/iptv_mux.c:106
+#: src/input/mpegts/iptv/iptv_mux.c:115
 msgid "IPTV Multiplex"
 msgstr ""
 
-#: src/input/mpegts/iptv/iptv.c:446
+#: src/input/mpegts/iptv/iptv.c:579
 msgid "IPTV Network"
 msgstr ""
 
@@ -1572,15 +1646,23 @@ msgstr ""
 msgid "ISI (Stream ID)"
 msgstr ""
 
-#: src/channels.c:1124
+#: src/epggrab/channel.c:492
+msgid "Icon"
+msgstr ""
+
+#: src/channels.c:1170
 msgid "Icon (full URL)"
 msgstr ""
 
-#: src/channels.c:325 src/channels.c:1131
+#: src/channels.c:337 src/channels.c:1177 src/input/mpegts/iptv/iptv_mux.c:187
 msgid "Icon URL"
 msgstr ""
 
-#: src/channels.c:1138
+#: src/input/mpegts/iptv/iptv.c:638
+msgid "Icon base URL"
+msgstr ""
+
+#: src/channels.c:1184
 msgid "Icon has title"
 msgstr ""
 
@@ -1588,7 +1670,7 @@ msgstr ""
 msgid "Icons from"
 msgstr ""
 
-#: src/input/mpegts/mpegts_input.c:271
+#: src/input/mpegts/mpegts_input.c:272
 msgid "Idle Scan"
 msgstr ""
 
@@ -1596,7 +1678,7 @@ msgstr ""
 msgid "Idle Scan Muxes"
 msgstr ""
 
-#: src/main.c:670
+#: src/main.c:671
 msgid ""
 "If no user account exists then create one with\n"
 "no username and no password. Use with care as\n"
@@ -1609,7 +1691,7 @@ msgstr ""
 msgid "If you'd like to support the project, please consider a donation."
 msgstr ""
 
-#: src/input/mpegts/mpegts_service.c:171
+#: src/input/mpegts/mpegts_service.c:178
 msgid "Ignore EPG (EIT)"
 msgstr ""
 
@@ -1617,7 +1699,7 @@ msgstr ""
 msgid "Ignore Provider's Channel Numbers"
 msgstr ""
 
-#: src/input/mpegts/mpegts_mux.c:479
+#: src/input/mpegts/mpegts_mux.c:480
 msgid "Ignore descriptor 5"
 msgstr ""
 
@@ -1629,39 +1711,39 @@ msgstr ""
 msgid "Image Cache"
 msgstr ""
 
-#: src/main.c:726
+#: src/main.c:729
 msgid "Immediately abort"
 msgstr ""
 
-#: src/profile.c:247 src/dvr/dvr_db.c:1679
+#: src/profile.c:247 src/dvr/dvr_db.c:1861
 msgid "Important"
 msgstr ""
 
-#: src/dvr/dvr_config.c:937
+#: src/dvr/dvr_config.c:953
 msgid "Include Channel Name In Filename"
 msgstr ""
 
-#: src/dvr/dvr_config.c:944
+#: src/dvr/dvr_config.c:960
 msgid "Include Date In Filename"
 msgstr ""
 
-#: src/dvr/dvr_config.c:958
+#: src/dvr/dvr_config.c:974
 msgid "Include Episode In Filename"
 msgstr ""
 
-#: src/dvr/dvr_config.c:965
+#: src/dvr/dvr_config.c:981
 msgid "Include Subtitle In Filename"
 msgstr ""
 
-#: src/dvr/dvr_config.c:951
+#: src/dvr/dvr_config.c:967
 msgid "Include Time In Filename"
 msgstr ""
 
-#: src/access.c:1385 src/esfilter.c:614 src/descrambler/caclient.c:255
+#: src/access.c:1373 src/esfilter.c:614 src/descrambler/caclient.c:255
 msgid "Index"
 msgstr ""
 
-#: src/config.c:1916
+#: src/config.c:1975
 msgid "Information area"
 msgstr ""
 
@@ -1673,15 +1755,19 @@ msgstr ""
 msgid "Init Rotor Time (seconds)"
 msgstr ""
 
-#: src/input/mpegts/mpegts_input.c:263
+#: src/input/mpegts/mpegts_input.c:264
 msgid "Initial Scan"
 msgstr ""
 
+#: src/input.c:29
+msgid "Input Base"
+msgstr ""
+
 #: src/input/mpegts/linuxdvb/linuxdvb_frontend.c:120
 msgid "Input Buffer (Bytes)"
 msgstr ""
 
-#: src/input.c:29
+#: src/input.c:36
 msgid "Input Instance"
 msgstr ""
 
@@ -1689,11 +1775,11 @@ msgstr ""
 msgid "Input Path"
 msgstr ""
 
-#: src/input/mpegts/iptv/iptv_mux.c:135
+#: src/input/mpegts/iptv/iptv_mux.c:150
 msgid "Interface"
 msgstr ""
 
-#: src/channels.c:1112 src/epggrab/module.c:58
+#: src/channels.c:1158 src/epggrab/module.c:58
 msgid "Internal"
 msgstr ""
 
@@ -1701,7 +1787,7 @@ msgstr ""
 msgid "Internal EPG Grabber"
 msgstr ""
 
-#: src/epggrab.c:237
+#: src/epggrab.c:241
 msgid "Internal Grabber"
 msgstr ""
 
@@ -1710,16 +1796,16 @@ msgstr ""
 msgid "Interview"
 msgstr ""
 
-#: src/dvr/dvr_db.c:295 src/dvr/dvr_db.c:320 src/dvr/dvr_timerec.c:454
+#: src/dvr/dvr_db.c:344 src/dvr/dvr_db.c:369 src/dvr/dvr_timerec.c:455
 msgid "Invalid"
 msgstr ""
 
-#: src/main.c:807
+#: src/main.c:811
 #, c-format
 msgid "Invalid adapter number '%s'\n"
 msgstr ""
 
-#: src/streaming.c:414
+#: src/streaming.c:420
 msgid "Invalid target"
 msgstr ""
 
@@ -1731,11 +1817,11 @@ msgstr ""
 msgid "Keep"
 msgstr ""
 
-#: src/input/mpegts/iptv/iptv_mux.c:166
+#: src/input/mpegts/iptv/iptv_mux.c:200
 msgid "Kill signal (pipe)"
 msgstr ""
 
-#: src/input/mpegts/iptv/iptv_mux.c:174
+#: src/input/mpegts/iptv/iptv_mux.c:208
 msgid "Kill timeout (pipe/secs)"
 msgstr ""
 
@@ -1747,16 +1833,16 @@ msgstr ""
 msgid "LNB"
 msgstr ""
 
-#: src/input/mpegts/linuxdvb/linuxdvb_satconf.c:1241
+#: src/input/mpegts/linuxdvb/linuxdvb_satconf.c:1301
 msgid "LNB Type"
 msgstr ""
 
-#: src/access.c:1411 src/esfilter.c:646 src/esfilter.c:713 src/esfilter.c:780
+#: src/access.c:1399 src/esfilter.c:646 src/esfilter.c:713 src/esfilter.c:780
 #: src/esfilter.c:847 src/esfilter.c:989 src/profile.c:1528
 msgid "Language"
 msgstr ""
 
-#: src/config.c:1826
+#: src/config.c:1885
 msgid "Language Settings"
 msgstr ""
 
@@ -1765,11 +1851,11 @@ msgstr ""
 msgid "Languages"
 msgstr ""
 
-#: src/input/mpegts/mpegts_service.c:215
+#: src/input/mpegts/mpegts_service.c:222
 msgid "Last Seen"
 msgstr ""
 
-#: src/config.c:1859
+#: src/config.c:1918
 msgid "Last updated from"
 msgstr ""
 
@@ -1781,15 +1867,15 @@ msgstr ""
 msgid "Leisure hobbies"
 msgstr ""
 
-#: src/access.c:1514
+#: src/access.c:1502
 msgid "Limit Connections"
 msgstr ""
 
-#: src/input/mpegts/mpegts_input.c:289
+#: src/input/mpegts/mpegts_input.c:290
 msgid "Linked Input"
 msgstr ""
 
-#: src/input/mpegts/linuxdvb/linuxdvb_frontend.c:231
+#: src/input/mpegts/linuxdvb/linuxdvb_frontend.c:285
 msgid "Linux ATSC Frontend"
 msgstr ""
 
@@ -1809,7 +1895,7 @@ msgstr ""
 msgid "Linux DVB Multiplex"
 msgstr ""
 
-#: src/input/mpegts/linuxdvb/linuxdvb_frontend.c:221
+#: src/input/mpegts/linuxdvb/linuxdvb_frontend.c:275
 msgid "Linux DVB-C Frontend"
 msgstr ""
 
@@ -1817,7 +1903,7 @@ msgstr ""
 msgid "Linux DVB-C Multiplex"
 msgstr ""
 
-#: src/input/mpegts/linuxdvb/linuxdvb_frontend.c:196
+#: src/input/mpegts/linuxdvb/linuxdvb_frontend.c:222
 msgid "Linux DVB-S Frontend"
 msgstr ""
 
@@ -1825,6 +1911,10 @@ msgstr ""
 msgid "Linux DVB-S Multiplex"
 msgstr ""
 
+#: src/input/mpegts/linuxdvb/linuxdvb_frontend.c:254
+msgid "Linux DVB-S Slave Frontend"
+msgstr ""
+
 #: src/input/mpegts/linuxdvb/linuxdvb_frontend.c:146
 msgid "Linux DVB-T Frontend"
 msgstr ""
@@ -1841,11 +1931,11 @@ msgstr ""
 msgid "LinuxDVB Network"
 msgstr ""
 
-#: src/main.c:696
+#: src/main.c:699
 msgid "Listen on IPv6"
 msgstr ""
 
-#: src/descrambler/capmt.c:2200
+#: src/descrambler/capmt.c:2237
 msgid "Listen/Connect Port"
 msgstr ""
 
@@ -1861,19 +1951,19 @@ msgstr ""
 msgid "Local Channel Number"
 msgstr ""
 
-#: src/input/mpegts/satip/satip.c:401
+#: src/input/mpegts/satip/satip.c:423
 msgid "Local Discovery IP Address"
 msgstr ""
 
-#: src/input/mpegts/satip/satip.c:268
+#: src/input/mpegts/satip/satip.c:283
 msgid "Local bind IP address"
 msgstr ""
 
-#: src/input/mpegts/satip/satip.c:387
+#: src/input/mpegts/satip/satip.c:409
 msgid "Location"
 msgstr ""
 
-#: src/input/mpegts/mpegts_service.c:193
+#: src/input/mpegts/mpegts_service.c:200
 msgid "Lock Preferred CA PID"
 msgstr ""
 
@@ -1882,7 +1972,7 @@ msgstr ""
 msgid "Log"
 msgstr ""
 
-#: src/config.c:1777
+#: src/config.c:1836
 msgid "Login/Logout"
 msgstr ""
 
@@ -1890,11 +1980,11 @@ msgstr ""
 msgid "Longtitude Direction West"
 msgstr ""
 
-#: src/profile.c:250 src/dvr/dvr_db.c:1682
+#: src/profile.c:250 src/dvr/dvr_db.c:1864
 msgid "Low"
 msgstr ""
 
-#: src/dvr/dvr_db.c:1711
+#: src/dvr/dvr_db.c:1900
 msgid "MPEG-PS (DVD)"
 msgstr ""
 
@@ -1902,15 +1992,15 @@ msgstr ""
 msgid "MPEG-PS (DVD)/av-lib"
 msgstr ""
 
-#: src/dvr/dvr_db.c:1710
+#: src/dvr/dvr_db.c:1899
 msgid "MPEG-TS"
 msgstr ""
 
-#: src/input/mpegts/mpegts_input.c:217
+#: src/input/mpegts/mpegts_input.c:218
 msgid "MPEG-TS Input"
 msgstr ""
 
-#: src/input/mpegts/mpegts_mux.c:487
+#: src/input/mpegts/mpegts_mux.c:488
 msgid "MPEG-TS Multiplex"
 msgstr ""
 
@@ -1930,7 +2020,7 @@ msgstr ""
 msgid "MPEG-TS Pass-through/built-in"
 msgstr ""
 
-#: src/input/mpegts/mpegts_service.c:734
+#: src/input/mpegts/mpegts_service.c:807
 msgid "MPEG-TS Raw Service"
 msgstr ""
 
@@ -1946,38 +2036,40 @@ msgstr ""
 msgid "Magazines"
 msgstr ""
 
-#: src/dvr/dvr_config.c:923
+#: src/dvr/dvr_config.c:939
 msgid "Make Subdirectories Per Channel"
 msgstr ""
 
-#: src/dvr/dvr_config.c:916
+#: src/dvr/dvr_config.c:932
 msgid "Make Subdirectories Per Day"
 msgstr ""
 
-#: src/dvr/dvr_config.c:930
+#: src/dvr/dvr_config.c:946
 msgid "Make Subdirectories Per Title"
 msgstr ""
 
-#: src/input/mpegts/satip/satip.c:324
+#: src/input/mpegts/satip/satip.c:346
 msgid "Manufacturer"
 msgstr ""
 
-#: src/input/mpegts/satip/satip.c:331
+#: src/input/mpegts/satip/satip.c:353
 msgid "Manufacturer URL"
 msgstr ""
 
-#: src/bouquet.c:831
+#: src/bouquet.c:907
 msgid "Map No Name"
 msgstr ""
 
-#: src/bouquet.c:838
+#: src/bouquet.c:914
 msgid "Map Radio"
 msgstr ""
 
-#: src/bouquet.c:824
+#: src/bouquet.c:900
 msgid "Map Zero Numbers"
 msgstr ""
 
+#: src/input/mpegts/linuxdvb/linuxdvb_frontend.c:238
+#: src/input/mpegts/linuxdvb/linuxdvb_frontend.c:259
 #: src/input/mpegts/satip/satip_frontend.c:292
 #: src/input/mpegts/satip/satip_frontend.c:314
 msgid "Master Tuner"
@@ -1987,7 +2079,7 @@ msgstr ""
 msgid "Matroska"
 msgstr ""
 
-#: src/dvr/dvr_db.c:1707
+#: src/dvr/dvr_db.c:1896
 msgid "Matroska (mkv)"
 msgstr ""
 
@@ -2003,24 +2095,24 @@ msgstr ""
 msgid "Matroska/av-lib"
 msgstr ""
 
-#: src/input/mpegts/iptv/iptv.c:475
-msgid "Maximum Bandwidth (Kbps)"
+#: src/access.c:1516
+msgid "Maximal Channel Number"
 msgstr ""
 
-#: src/access.c:1528
-msgid "Maximum Channel Num"
+#: src/input/mpegts/iptv/iptv.c:624
+msgid "Maximum Bandwidth (Kbps)"
 msgstr ""
 
-#: src/dvr/dvr_autorec.c:1032
+#: src/dvr/dvr_autorec.c:1067
 msgid "Maximum Duration"
 msgstr ""
 
-#: src/input/mpegts/iptv/iptv.c:468
+#: src/input/mpegts/iptv/iptv.c:617
 msgid "Maximum Input Streams"
 msgstr ""
 
 #: src/input/mpegts/linuxdvb/linuxdvb_frontend.c:92
-#: src/input/mpegts/satip/satip.c:226
+#: src/input/mpegts/satip/satip.c:241
 msgid "Maximum PIDs"
 msgstr ""
 
@@ -2036,11 +2128,15 @@ msgstr ""
 msgid "Maximum Size (MB)"
 msgstr ""
 
-#: src/input/mpegts/satip/satip.c:233
+#: src/dvr/dvr_autorec.c:1111
+msgid "Maximum count (0=unlimited)"
+msgstr ""
+
+#: src/input/mpegts/satip/satip.c:248
 msgid "Maximum length of PIDs"
 msgstr ""
 
-#: src/input/mpegts/iptv/iptv.c:482
+#: src/input/mpegts/iptv/iptv.c:631
 msgid "Maximum timeout (seconds)"
 msgstr ""
 
@@ -2052,35 +2148,35 @@ msgstr ""
 msgid "Melodrama"
 msgstr ""
 
-#: src/access.c:1521
-msgid "Min Channel Num"
-msgstr ""
-
 #: src/input/mpegts/linuxdvb/linuxdvb_satconf.c:269
 msgid "Min Rotor Time (seconds)"
 msgstr ""
 
-#: src/dvr/dvr_autorec.c:1025
+#: src/access.c:1509
+msgid "Minimal Channel Number"
+msgstr ""
+
+#: src/dvr/dvr_autorec.c:1060
 msgid "Minimum Duration"
 msgstr ""
 
-#: src/service.c:141
+#: src/service.c:144
 msgid "Missing In PAT/SDT"
 msgstr ""
 
-#: src/descrambler/capmt.c:2185
+#: src/descrambler/capmt.c:2222
 msgid "Mode"
 msgstr ""
 
-#: src/input/mpegts/satip/satip.c:338
+#: src/input/mpegts/satip/satip.c:360
 msgid "Model Description"
 msgstr ""
 
-#: src/input/mpegts/satip/satip.c:345
+#: src/input/mpegts/satip/satip.c:367
 msgid "Model Name"
 msgstr ""
 
-#: src/input/mpegts/satip/satip.c:352
+#: src/input/mpegts/satip/satip.c:374
 msgid "Model Number"
 msgstr ""
 
@@ -2088,7 +2184,11 @@ msgstr ""
 msgid "Modulation"
 msgstr ""
 
-#: src/dvr/dvr_autorec.c:728
+#: src/epggrab/channel.c:466
+msgid "Module"
+msgstr ""
+
+#: src/dvr/dvr_autorec.c:763
 msgid "Mon"
 msgstr ""
 
@@ -2096,7 +2196,7 @@ msgstr ""
 msgid "Mono"
 msgstr ""
 
-#: src/main.c:723
+#: src/main.c:726
 msgid "More verbose libav log"
 msgstr ""
 
@@ -2130,11 +2230,11 @@ msgstr ""
 msgid "Mux"
 msgstr ""
 
-#: src/satip/server.c:607
+#: src/satip/server.c:614
 msgid "Mux Handling"
 msgstr ""
 
-#: src/input/mpegts/iptv/iptv_mux.c:147
+#: src/input/mpegts/iptv/iptv_mux.c:162
 msgid "Mux Name"
 msgstr ""
 
@@ -2146,22 +2246,22 @@ msgstr ""
 msgid "Mux UUID"
 msgstr ""
 
-#: src/streaming.c:423
+#: src/streaming.c:431
 msgid "Mux not enabled"
 msgstr ""
 
 #: src/input/mpegts/mpegts_mux.c:388
-#: src/input/mpegts/linuxdvb/linuxdvb_switch.c:55
-#: src/input/mpegts/linuxdvb/linuxdvb_switch.c:68
-#: src/input/mpegts/linuxdvb/linuxdvb_switch.c:93
+#: src/input/mpegts/linuxdvb/linuxdvb_switch.c:56
+#: src/input/mpegts/linuxdvb/linuxdvb_switch.c:69
+#: src/input/mpegts/linuxdvb/linuxdvb_switch.c:94
 msgid "NONE"
 msgstr ""
 
-#: src/channels.c:302 src/channels.c:1106 src/bouquet.c:861
-#: src/epggrab/module.c:124 src/dvr/dvr_autorec.c:937
-#: src/dvr/dvr_timerec.c:564 src/input/mpegts/mpegts_input.c:249
-#: src/input/mpegts/mpegts_mux.c:527
-#: src/input/mpegts/linuxdvb/linuxdvb_satconf.c:1216
+#: src/channels.c:313 src/channels.c:1152 src/bouquet.c:937
+#: src/epggrab/module.c:124 src/epggrab/channel.c:479
+#: src/dvr/dvr_autorec.c:972 src/dvr/dvr_timerec.c:565
+#: src/input/mpegts/mpegts_input.c:250 src/input/mpegts/mpegts_mux.c:528
+#: src/input/mpegts/linuxdvb/linuxdvb_satconf.c:1276
 #: src/input/mpegts/satip/satip_satconf.c:194
 msgid "Name"
 msgstr ""
@@ -2174,7 +2274,7 @@ msgstr ""
 msgid "Nature"
 msgstr ""
 
-#: src/input/mpegts/mpegts_mux.c:513 src/input/mpegts/mpegts_service.c:94
+#: src/input/mpegts/mpegts_mux.c:514 src/input/mpegts/mpegts_service.c:94
 #: src/input/mpegts/tvhdhomerun/tvhdhomerun.c:142
 msgid "Network"
 msgstr ""
@@ -2205,17 +2305,17 @@ msgstr ""
 msgid "Network Type"
 msgstr ""
 
-#: src/input/mpegts/mpegts_mux.c:520
+#: src/input/mpegts/mpegts_mux.c:521
 msgid "Network UUID"
 msgstr ""
 
-#: src/access.c:1404 src/access.c:1901
+#: src/access.c:1392 src/access.c:1889
 msgid "Network prefix"
 msgstr ""
 
-#: src/input/mpegts/mpegts_input.c:279
+#: src/input/mpegts/mpegts_input.c:280
 #: src/input/mpegts/linuxdvb/linuxdvb_satconf.c:333
-#: src/input/mpegts/linuxdvb/linuxdvb_satconf.c:1231
+#: src/input/mpegts/linuxdvb/linuxdvb_satconf.c:1291
 #: src/input/mpegts/satip/satip_satconf.c:224
 msgid "Networks"
 msgstr ""
@@ -2236,49 +2336,49 @@ msgstr ""
 msgid "No PIN"
 msgstr ""
 
-#: src/streaming.c:443
+#: src/streaming.c:451
 msgid "No access"
 msgstr ""
 
-#: src/main.c:816
+#: src/main.c:824
 msgid "No adapters specified!\n"
 msgstr ""
 
-#: src/dvr/dvr_autorec.c:752
+#: src/dvr/dvr_autorec.c:787
 msgid "No days"
 msgstr ""
 
-#: src/streaming.c:441
+#: src/streaming.c:449
 msgid "No descrambler"
 msgstr ""
 
-#: src/streaming.c:421
+#: src/streaming.c:429
 msgid "No free adapter"
 msgstr ""
 
-#: src/streaming.c:445
+#: src/streaming.c:453
 msgid "No input detected"
 msgstr ""
 
-#: src/streaming.c:435
+#: src/streaming.c:443
 msgid "No service assigned to channel"
 msgstr ""
 
-#: src/streaming.c:429
+#: src/streaming.c:437
 msgid "No service enabled"
 msgstr ""
 
-#: src/streaming.c:433
+#: src/streaming.c:441
 msgid "No source available"
 msgstr ""
 
-#: src/profile.c:265 src/input/mpegts/linuxdvb/linuxdvb_switch.c:252
-#: src/input/mpegts/linuxdvb/linuxdvb_rotor.c:458
-#: src/input/mpegts/linuxdvb/linuxdvb_en50494.c:296
+#: src/profile.c:265 src/input/mpegts/linuxdvb/linuxdvb_switch.c:259
+#: src/input/mpegts/linuxdvb/linuxdvb_rotor.c:478
+#: src/input/mpegts/linuxdvb/linuxdvb_en50494.c:303
 msgid "None"
 msgstr ""
 
-#: src/profile.c:249 src/dvr/dvr_db.c:1681
+#: src/profile.c:249 src/dvr/dvr_db.c:1863
 msgid "Normal"
 msgstr ""
 
@@ -2286,27 +2386,27 @@ msgstr ""
 msgid "Not Linked"
 msgstr ""
 
-#: src/profile.c:1355 src/dvr/dvr_db.c:1678 src/dvr/dvr_db.c:1706
+#: src/profile.c:1355 src/dvr/dvr_db.c:1860 src/dvr/dvr_db.c:1895
 msgid "Not set"
 msgstr ""
 
-#: src/dvr/dvr_config.c:697
+#: src/dvr/dvr_config.c:699
 msgid "Not set (none or channel configuration)"
 msgstr ""
 
-#: src/dvr/dvr_db.c:2035 src/dvr/dvr_autorec.c:626
+#: src/dvr/dvr_db.c:2326 src/dvr/dvr_autorec.c:661
 msgid "Not set (use channel or DVR configuration)"
 msgstr ""
 
-#: src/channels.c:311
+#: src/channels.c:323 src/epggrab/channel.c:486
 msgid "Number"
 msgstr ""
 
-#: src/main.c:738
+#: src/main.c:741
 msgid "Number of tsfile tuners"
 msgstr ""
 
-#: src/streaming.c:403 src/input/mpegts/mpegts_mux.c:389
+#: src/streaming.c:409 src/input/mpegts/mpegts_mux.c:389
 msgid "OK"
 msgstr ""
 
@@ -2314,19 +2414,19 @@ msgstr ""
 msgid "OK (partial)"
 msgstr ""
 
-#: src/descrambler/capmt.c:2169
+#: src/descrambler/capmt.c:2206
 msgid "OSCam (rev >= 9095)"
 msgstr ""
 
-#: src/descrambler/capmt.c:2168
+#: src/descrambler/capmt.c:2205
 msgid "OSCam TCP (rev >= 9574)"
 msgstr ""
 
-#: src/descrambler/capmt.c:2166
+#: src/descrambler/capmt.c:2203
 msgid "OSCam net protocol (rev >= 10389)"
 msgstr ""
 
-#: src/descrambler/capmt.c:2167
+#: src/descrambler/capmt.c:2204
 msgid "OSCam pc-nodmx (rev >= 9756)"
 msgstr ""
 
@@ -2338,7 +2438,7 @@ msgstr ""
 msgid "Off"
 msgstr ""
 
-#: src/descrambler/capmt.c:2170
+#: src/descrambler/capmt.c:2207
 msgid "Older OSCam"
 msgstr ""
 
@@ -2350,11 +2450,11 @@ msgstr ""
 msgid "On-Demand"
 msgstr ""
 
-#: src/descrambler/cwc.c:1772
+#: src/descrambler/cwc.c:1783
 msgid "One Mux (EMM)"
 msgstr ""
 
-#: src/input/mpegts/mpegts_mux.c:465
+#: src/input/mpegts/mpegts_mux.c:466
 msgid "Only Bulsatcom 39E"
 msgstr ""
 
@@ -2362,36 +2462,40 @@ msgstr ""
 msgid "Only EIT"
 msgstr ""
 
-#: src/input/mpegts/mpegts_mux.c:468
+#: src/input/mpegts/mpegts_mux.c:469
 msgid "Only OpenTV Sky Ausat"
 msgstr ""
 
-#: src/input/mpegts/mpegts_mux.c:467
+#: src/input/mpegts/mpegts_mux.c:468
 msgid "Only OpenTV Sky Italia"
 msgstr ""
 
-#: src/input/mpegts/mpegts_mux.c:466
+#: src/input/mpegts/mpegts_mux.c:467
 msgid "Only OpenTV Sky UK"
 msgstr ""
 
+#: src/input/mpegts/mpegts_mux.c:462
+msgid "Only PSIP (ATSC)"
+msgstr ""
+
 #: src/input/mpegts/mpegts_service.c:79
 msgid "Only Preferred CA PID"
 msgstr ""
 
-#: src/input/mpegts/mpegts_mux.c:462
+#: src/input/mpegts/mpegts_mux.c:463
 msgid "Only UK Freesat"
 msgstr ""
 
-#: src/input/mpegts/mpegts_mux.c:463
+#: src/input/mpegts/mpegts_mux.c:464
 msgid "Only UK Freeview"
 msgstr ""
 
-#: src/input/mpegts/mpegts_mux.c:464
+#: src/input/mpegts/mpegts_mux.c:465
 msgid "Only Viasat Baltic"
 msgstr ""
 
-#: src/main.c:683
-msgid "Only use specified DVB adapters (comma separated)"
+#: src/main.c:684
+msgid "Only use specified DVB adapters (comma separated, -1 = none)"
 msgstr ""
 
 #: src/input/mpegts/mpegts_service.c:136
@@ -2412,7 +2516,7 @@ msgstr ""
 msgid "Orbital Positions"
 msgstr ""
 
-#: src/input/mpegts/mpegts_mux.c:534
+#: src/input/mpegts/mpegts_mux.c:535
 msgid "Original Network ID"
 msgstr ""
 
@@ -2420,7 +2524,7 @@ msgstr ""
 msgid "Other Stream Filter"
 msgstr ""
 
-#: src/main.c:742
+#: src/main.c:745
 msgid "Output directory for tsdebug"
 msgstr ""
 
@@ -2428,11 +2532,11 @@ msgstr ""
 msgid "Over-the-air"
 msgstr ""
 
-#: src/epggrab.c:294
+#: src/epggrab.c:298
 msgid "Over-the-air Cron multi-line"
 msgstr ""
 
-#: src/input/mpegts/mpegts_input.c:256
+#: src/input/mpegts/mpegts_input.c:257
 msgid "Over-the-air EPG"
 msgstr ""
 
@@ -2440,11 +2544,11 @@ msgstr ""
 msgid "Over-the-air EPG Grabber"
 msgstr ""
 
-#: src/epggrab.c:241
+#: src/epggrab.c:245
 msgid "Over-the-air Grabbers"
 msgstr ""
 
-#: src/dvr/dvr_db.c:2227 src/dvr/dvr_autorec.c:1101 src/dvr/dvr_timerec.c:647
+#: src/dvr/dvr_db.c:2527 src/dvr/dvr_autorec.c:1151 src/dvr/dvr_timerec.c:654
 msgid "Owner"
 msgstr ""
 
@@ -2457,11 +2561,11 @@ msgstr ""
 msgid "PID"
 msgstr ""
 
-#: src/input/mpegts/satip/satip.c:261
+#: src/input/mpegts/satip/satip.c:276
 msgid "PIDs 21 in setup"
 msgstr ""
 
-#: src/input/mpegts/satip/satip.c:247
+#: src/input/mpegts/satip/satip.c:262
 msgid "PIDs in setup"
 msgstr ""
 
@@ -2487,15 +2591,19 @@ msgstr ""
 msgid "PLS Mode"
 msgstr ""
 
-#: src/access.c:1768 src/descrambler/cwc.c:1736
+#: src/dvr/dvr_db.c:2620
+msgid "Parent Entry"
+msgstr ""
+
+#: src/access.c:1756 src/descrambler/cwc.c:1747
 msgid "Password"
 msgstr ""
 
-#: src/access.c:1776
+#: src/access.c:1764
 msgid "Password2"
 msgstr ""
 
-#: src/access.c:1746
+#: src/access.c:1734
 msgid "Passwords"
 msgstr ""
 
@@ -2507,7 +2615,7 @@ msgstr ""
 msgid "Performing arts"
 msgstr ""
 
-#: src/epggrab.c:271
+#: src/epggrab.c:275
 msgid "Periodic save EPG to disk"
 msgstr ""
 
@@ -2515,11 +2623,11 @@ msgstr ""
 msgid "Physiology"
 msgstr ""
 
-#: src/config.c:1842
+#: src/config.c:1901
 msgid "Picon"
 msgstr ""
 
-#: src/config.c:1983
+#: src/config.c:2042
 msgid "Picon path (see Help)"
 msgstr ""
 
@@ -2543,7 +2651,7 @@ msgstr ""
 msgid "Popular culture"
 msgstr ""
 
-#: src/descrambler/cwc.c:1750
+#: src/descrambler/cwc.c:1761
 msgid "Port"
 msgstr ""
 
@@ -2552,7 +2660,7 @@ msgstr ""
 msgid "Position"
 msgstr ""
 
-#: src/dvr/dvr_config.c:852
+#: src/dvr/dvr_config.c:868
 msgid "Post-Processor Command"
 msgstr ""
 
@@ -2560,6 +2668,11 @@ msgstr ""
 msgid "Power Save"
 msgstr ""
 
+#: src/input/mpegts/linuxdvb/linuxdvb_switch.c:149
+#: src/input/mpegts/linuxdvb/linuxdvb_rotor.c:98
+msgid "Powerup Time (ms) (10-200)"
+msgstr ""
+
 #: src/input/mpegts/mpegts_network_dvb.c:206
 #: src/input/mpegts/mpegts_network_dvb.c:225
 #: src/input/mpegts/mpegts_network_dvb.c:244
@@ -2571,11 +2684,11 @@ msgstr ""
 msgid "Pre-school children's programmes"
 msgstr ""
 
-#: src/config.c:1962
+#: src/config.c:2021
 msgid "Prefer picons over channel name"
 msgstr ""
 
-#: src/input/mpegts/mpegts_service.c:186
+#: src/input/mpegts/mpegts_service.c:193
 msgid "Preferred CA PID"
 msgstr ""
 
@@ -2583,7 +2696,7 @@ msgstr ""
 msgid "Preferred Service Video Type"
 msgstr ""
 
-#: src/input/mpegts/satip/satip.c:380
+#: src/input/mpegts/satip/satip.c:402
 msgid "Presentation"
 msgstr ""
 
@@ -2591,19 +2704,19 @@ msgstr ""
 msgid "Press"
 msgstr ""
 
-#: src/epggrab/module.c:148 src/dvr/dvr_db.c:2190 src/dvr/dvr_autorec.c:1046
-#: src/dvr/dvr_timerec.c:623 src/input/mpegts/mpegts_input.c:233
-#: src/input/mpegts/linuxdvb/linuxdvb_satconf.c:1223
-#: src/input/mpegts/satip/satip_satconf.c:201 src/input/mpegts/iptv/iptv.c:452
-#: src/input/mpegts/iptv/iptv_mux.c:111
+#: src/epggrab/module.c:148 src/dvr/dvr_db.c:2481 src/dvr/dvr_autorec.c:1081
+#: src/dvr/dvr_timerec.c:624 src/input/mpegts/mpegts_input.c:234
+#: src/input/mpegts/linuxdvb/linuxdvb_satconf.c:1283
+#: src/input/mpegts/satip/satip_satconf.c:201 src/input/mpegts/iptv/iptv.c:601
+#: src/input/mpegts/iptv/iptv_mux.c:120
 msgid "Priority"
 msgstr ""
 
-#: src/service.c:183
+#: src/service.c:186
 msgid "Priority (-10..10)"
 msgstr ""
 
-#: src/channels.c:1118
+#: src/channels.c:1164
 msgid "Private"
 msgstr ""
 
@@ -2611,7 +2724,7 @@ msgstr ""
 msgid "Profile Name"
 msgstr ""
 
-#: src/input/mpegts/mpegts_service.c:150
+#: src/input/mpegts/mpegts_service.c:157
 msgid "Provider"
 msgstr ""
 
@@ -2636,7 +2749,7 @@ msgstr ""
 msgid "Quiz"
 msgstr ""
 
-#: src/input/mpegts/satip/satip.c:289
+#: src/input/mpegts/satip/satip.c:311
 msgid "RTSP Port"
 msgstr ""
 
@@ -2644,43 +2757,55 @@ msgstr ""
 msgid "RTSP Port (554 or 9983), 0 = disable"
 msgstr ""
 
+#: src/input/mpegts/satip/satip.c:213
+msgid "RTSP/TCP (embedded data)"
+msgstr ""
+
 #: src/imagecache.c:96
 msgid "Re-fetch period (hours)"
 msgstr ""
 
+#: src/bouquet.c:959 src/input/mpegts/iptv/iptv.c:728
+msgid "Re-fetch period (mins)"
+msgstr ""
+
+#: src/dvr/dvr_config.c:836
+msgid "Re-record When Errors (0=off)"
+msgstr ""
+
 #: src/imagecache.c:102
 msgid "Re-try period (hours)"
 msgstr ""
 
-#: src/dvr/dvr_autorec.c:893
+#: src/dvr/dvr_autorec.c:928
 msgid "Record all"
 msgstr ""
 
-#: src/dvr/dvr_autorec.c:899
+#: src/dvr/dvr_autorec.c:934
 msgid "Record if different description"
 msgstr ""
 
-#: src/dvr/dvr_autorec.c:895
+#: src/dvr/dvr_autorec.c:930
 msgid "Record if different episode number"
 msgstr ""
 
-#: src/dvr/dvr_autorec.c:897
+#: src/dvr/dvr_autorec.c:932
 msgid "Record if different subtitle"
 msgstr ""
 
-#: src/dvr/dvr_autorec.c:903
+#: src/dvr/dvr_autorec.c:938
 msgid "Record once per day"
 msgstr ""
 
-#: src/dvr/dvr_autorec.c:901
+#: src/dvr/dvr_autorec.c:936
 msgid "Record once per week"
 msgstr ""
 
-#: src/dvr/dvr_config.c:737
+#: src/dvr/dvr_config.c:739
 msgid "Recording File Options"
 msgstr ""
 
-#: src/dvr/dvr_config.c:859
+#: src/dvr/dvr_config.c:875
 msgid "Recording System Path"
 msgstr ""
 
@@ -2702,11 +2827,15 @@ msgstr ""
 msgid "Remarkable people"
 msgstr ""
 
-#: src/dvr/dvr_config.c:979
+#: src/dvr/dvr_config.c:995
 msgid "Remove All Unsafe Characters From Filename"
 msgstr ""
 
-#: src/dvr/dvr_config.c:986
+#: src/input/mpegts/iptv/iptv.c:741
+msgid "Remove HTTP arguments"
+msgstr ""
+
+#: src/dvr/dvr_config.c:1002
 msgid "Replace Whitespace In Title with '-'"
 msgstr ""
 
@@ -2718,15 +2847,15 @@ msgstr ""
 msgid "Reports"
 msgstr ""
 
-#: src/dvr/dvr_db.c:2357
+#: src/dvr/dvr_db.c:2687
 msgid "Rerun of"
 msgstr ""
 
-#: src/bouquet.c:809
+#: src/bouquet.c:885
 msgid "Rescan"
 msgstr ""
 
-#: src/streaming.c:545
+#: src/streaming.c:553
 msgid "Reserved"
 msgstr ""
 
@@ -2734,7 +2863,7 @@ msgstr ""
 msgid "Resolution (height)"
 msgstr ""
 
-#: src/input/mpegts/iptv/iptv_mux.c:159
+#: src/input/mpegts/iptv/iptv_mux.c:193
 msgid "Respawn (pipe)"
 msgstr ""
 
@@ -2742,10 +2871,6 @@ msgstr ""
 msgid "Restart On Error"
 msgstr ""
 
-#: src/dvr/dvr_db.c:2200 src/dvr/dvr_autorec.c:1062 src/dvr/dvr_timerec.c:632
-msgid "Retention"
-msgstr ""
-
 #: src/profile.c:1027
 msgid "Rewrite EIT"
 msgstr ""
@@ -2754,7 +2879,7 @@ msgstr ""
 msgid "Rewrite PAT"
 msgstr ""
 
-#: src/profile.c:1006
+#: src/profile.c:1006 src/satip/server.c:607
 msgid "Rewrite PMT"
 msgstr ""
 
@@ -2774,19 +2899,19 @@ msgstr ""
 msgid "Romance"
 msgstr ""
 
-#: src/input/mpegts/linuxdvb/linuxdvb_satconf.c:1259
+#: src/input/mpegts/linuxdvb/linuxdvb_satconf.c:1319
 msgid "Rotor Type"
 msgstr ""
 
-#: src/main.c:668
+#: src/main.c:669
 msgid "Run as group"
 msgstr ""
 
-#: src/main.c:667
+#: src/main.c:668
 msgid "Run as user"
 msgstr ""
 
-#: src/dvr/dvr_db.c:289
+#: src/dvr/dvr_db.c:338
 msgid "Running"
 msgstr ""
 
@@ -2794,7 +2919,7 @@ msgstr ""
 msgid "SAT>IP ATSC Frontend"
 msgstr ""
 
-#: src/input/mpegts/satip/satip.c:194
+#: src/input/mpegts/satip/satip.c:195
 msgid "SAT>IP Client"
 msgstr ""
 
@@ -2818,7 +2943,7 @@ msgstr ""
 msgid "SAT>IP DVB-T Frontend"
 msgstr ""
 
-#: src/main.c:687
+#: src/main.c:688
 msgid ""
 "SAT>IP RTSP port number for server\n"
 "(default: -1 = disable, 0 = webconfig, standard port is 554)"
@@ -2841,49 +2966,53 @@ msgstr ""
 msgid "SD: Standard Definition"
 msgstr ""
 
-#: src/input/mpegts/iptv/iptv_mux.c:95
+#: src/input/mpegts/iptv/iptv_mux.c:104
 msgid "SIGHUP"
 msgstr ""
 
-#: src/input/mpegts/iptv/iptv_mux.c:94
+#: src/input/mpegts/iptv/iptv_mux.c:103
 msgid "SIGINT"
 msgstr ""
 
-#: src/input/mpegts/iptv/iptv_mux.c:92
+#: src/input/mpegts/iptv/iptv_mux.c:101
 msgid "SIGKILL"
 msgstr ""
 
-#: src/input/mpegts/iptv/iptv_mux.c:93
+#: src/input/mpegts/iptv/iptv_mux.c:102
 msgid "SIGTERM"
 msgstr ""
 
-#: src/input/mpegts/iptv/iptv_mux.c:96
+#: src/input/mpegts/iptv/iptv_mux.c:105
 msgid "SIGUSR1"
 msgstr ""
 
-#: src/input/mpegts/iptv/iptv_mux.c:97
+#: src/input/mpegts/iptv/iptv_mux.c:106
 msgid "SIGUSR2"
 msgstr ""
 
-#: src/dvr/dvr_db.c:1708
+#: src/input/mpegts/iptv/iptv.c:735
+msgid "SSL verify peer"
+msgstr ""
+
+#: src/dvr/dvr_db.c:1897
 msgid "Same as source (pass through)"
 msgstr ""
 
-#: src/dvr/dvr_autorec.c:733
+#: src/dvr/dvr_autorec.c:768
 msgid "Sat"
 msgstr ""
 
-#: src/input/mpegts/linuxdvb/linuxdvb_frontend.c:202
+#: src/input/mpegts/linuxdvb/linuxdvb_frontend.c:228
 msgid "SatConfig"
 msgstr ""
 
-#: src/input/mpegts/linuxdvb/linuxdvb_satconf.c:1201
+#: src/input/mpegts/linuxdvb/linuxdvb_satconf.c:1261
 #: src/input/mpegts/satip/satip_satconf.c:180
 msgid "Satconf"
 msgstr ""
 
-#: src/input/mpegts/linuxdvb/linuxdvb_rotor.c:108
-#: src/input/mpegts/linuxdvb/linuxdvb_rotor.c:124
+#: src/input/mpegts/linuxdvb/linuxdvb_rotor.c:128
+#: src/input/mpegts/linuxdvb/linuxdvb_rotor.c:144
 msgid "Satellite Longitude"
 msgstr ""
 
@@ -2891,31 +3020,35 @@ msgstr ""
 msgid "Satellite Positions"
 msgstr ""
 
+#: src/input/mpegts/iptv/iptv.c:585
+msgid "Scan After Create"
+msgstr ""
+
 #: src/input/mpegts/mpegts_network.c:238
 msgid "Scan Queue length"
 msgstr ""
 
-#: src/input/mpegts/mpegts_mux.c:564
+#: src/input/mpegts/mpegts_mux.c:565
 msgid "Scan Result"
 msgstr ""
 
-#: src/input/mpegts/mpegts_mux.c:555
+#: src/input/mpegts/mpegts_mux.c:556
 msgid "Scan Status"
 msgstr ""
 
-#: src/dvr/dvr_db.c:2350
+#: src/dvr/dvr_db.c:2680
 msgid "Schedule Status"
 msgstr ""
 
-#: src/dvr/dvr_db.c:2084
+#: src/dvr/dvr_db.c:2375
 msgid "Scheduled Start Time"
 msgstr ""
 
-#: src/dvr/dvr_db.c:2106
+#: src/dvr/dvr_db.c:2397
 msgid "Scheduled Stop Time"
 msgstr ""
 
-#: src/dvr/dvr_db.c:279
+#: src/dvr/dvr_db.c:328
 msgid "Scheduled for recording"
 msgstr ""
 
@@ -2931,11 +3064,11 @@ msgstr ""
 msgid "Science fiction"
 msgstr ""
 
-#: src/dvr/dvr_autorec.c:1085
+#: src/dvr/dvr_autorec.c:1135
 msgid "Season"
 msgstr ""
 
-#: src/dvr/dvr_db.c:427
+#: src/dvr/dvr_db.c:484
 #, c-format
 msgid "Season %d"
 msgstr ""
@@ -2948,11 +3081,11 @@ msgstr ""
 msgid "Send full PLAY cmd"
 msgstr ""
 
-#: src/input/mpegts/satip/satip.c:310
+#: src/input/mpegts/satip/satip.c:332
 msgid "Serial Number"
 msgstr ""
 
-#: src/dvr/dvr_autorec.c:1093
+#: src/dvr/dvr_autorec.c:1143
 msgid "Series Link"
 msgstr ""
 
@@ -2964,11 +3097,11 @@ msgstr ""
 msgid "Serious music"
 msgstr ""
 
-#: src/config.c:1822 src/input/mpegts/satip/satip.c:394
+#: src/config.c:1881 src/input/mpegts/satip/satip.c:416
 msgid "Server"
 msgstr ""
 
-#: src/main.c:695
+#: src/main.c:698
 msgid "Server Connectivity"
 msgstr ""
 
@@ -2976,17 +3109,17 @@ msgstr ""
 msgid "Server UUID"
 msgstr ""
 
-#: src/service.c:148 src/esfilter.c:654 src/esfilter.c:721 src/esfilter.c:788
+#: src/service.c:151 src/esfilter.c:654 src/esfilter.c:721 src/esfilter.c:788
 #: src/esfilter.c:855 src/esfilter.c:930 src/esfilter.c:997
 msgid "Service"
 msgstr ""
 
-#: src/main.c:663
+#: src/main.c:664
 msgid "Service Configuration"
 msgstr ""
 
-#: src/input/mpegts/mpegts_service.c:115 src/descrambler/constcw.c:314
-#: src/descrambler/constcw.c:374
+#: src/input/mpegts/mpegts_service.c:115 src/input/mpegts/iptv/iptv.c:593
+#: src/descrambler/constcw.c:314 src/descrambler/constcw.c:374
 msgid "Service ID"
 msgstr ""
 
@@ -2994,23 +3127,23 @@ msgstr ""
 msgid "Service IDs as Channel Numbers"
 msgstr ""
 
-#: src/input/mpegts/mpegts_service.c:143 src/input/mpegts/iptv/iptv_mux.c:153
+#: src/input/mpegts/mpegts_service.c:150 src/input/mpegts/iptv/iptv_mux.c:175
 msgid "Service Name"
 msgstr ""
 
-#: src/service.c:206
+#: src/service.c:209
 msgid "Service Raw"
 msgstr ""
 
-#: src/input/mpegts/mpegts_service.c:164
+#: src/input/mpegts/mpegts_service.c:171
 msgid "Service Type"
 msgstr ""
 
-#: src/channels.c:363 src/bouquet.c:875
+#: src/channels.c:375 src/bouquet.c:976
 msgid "Services"
 msgstr ""
 
-#: src/bouquet.c:761
+#: src/bouquet.c:831
 #, c-format
 msgid "Services Count %zi"
 msgstr ""
@@ -3023,19 +3156,19 @@ msgstr ""
 msgid "Show"
 msgstr ""
 
-#: src/main.c:660
+#: src/main.c:661
 msgid "Show this page"
 msgstr ""
 
-#: src/main.c:661
+#: src/main.c:662
 msgid "Show version information"
 msgstr ""
 
-#: src/streaming.c:431
+#: src/streaming.c:439
 msgid "Signal quality too poor"
 msgstr ""
 
-#: src/input/mpegts/satip/satip.c:219
+#: src/input/mpegts/satip/satip.c:234
 msgid "Signal scale (240 or 100)"
 msgstr ""
 
@@ -3047,7 +3180,7 @@ msgstr ""
 msgid "Site Longitude"
 msgstr ""
 
-#: src/dvr/dvr_config.c:892
+#: src/dvr/dvr_config.c:908
 msgid "Skip Commercials"
 msgstr ""
 
@@ -3059,6 +3192,14 @@ msgstr ""
 msgid "Skip Initial Scan"
 msgstr ""
 
+#: src/input/mpegts/satip/satip.c:290
+msgid "Skip TS packets (0-200)"
+msgstr ""
+
+#: src/dvr/dvr_db.c:2628
+msgid "Slave Entry"
+msgstr ""
+
 #: src/input/mpegts/linuxdvb/linuxdvb_ca.c:255
 msgid "Slot State"
 msgstr ""
@@ -3079,23 +3220,23 @@ msgstr ""
 msgid "Social advisory"
 msgstr ""
 
-#: src/channels.c:1100
+#: src/channels.c:1146
 msgid "Sort Index"
 msgstr ""
 
-#: src/bouquet.c:867
+#: src/bouquet.c:968
 msgid "Source"
 msgstr ""
 
-#: src/streaming.c:410
+#: src/streaming.c:416
 msgid "Source deleted"
 msgstr ""
 
-#: src/streaming.c:408
+#: src/streaming.c:414
 msgid "Source quality is bad"
 msgstr ""
 
-#: src/streaming.c:406
+#: src/streaming.c:412
 msgid "Source reconfigured"
 msgstr ""
 
@@ -3103,27 +3244,27 @@ msgstr ""
 msgid "Special events (Olympic Games, World Cup, etc.)"
 msgstr ""
 
-#: src/main.c:706
+#: src/main.c:709
 msgid "Specify User-Agent header for the http client"
 msgstr ""
 
-#: src/main.c:702
+#: src/main.c:705
 msgid "Specify alternative htsp port"
 msgstr ""
 
-#: src/main.c:698
+#: src/main.c:701
 msgid "Specify alternative http port"
 msgstr ""
 
-#: src/main.c:700
+#: src/main.c:703
 msgid "Specify alternative http webroot"
 msgstr ""
 
-#: src/main.c:697
+#: src/main.c:700
 msgid "Specify bind address"
 msgstr ""
 
-#: src/main.c:704
+#: src/main.c:707
 msgid "Specify extra htsp port"
 msgstr ""
 
@@ -3143,27 +3284,27 @@ msgstr ""
 msgid "Squash"
 msgstr ""
 
-#: src/input/mpegts/mpegts_mux.c:477
+#: src/input/mpegts/mpegts_mux.c:478
 msgid "Standard"
 msgstr ""
 
-#: src/dvr/dvr_timerec.c:592
+#: src/dvr/dvr_timerec.c:593
 msgid "Start"
 msgstr ""
 
-#: src/dvr/dvr_autorec.c:980
+#: src/dvr/dvr_autorec.c:1015
 msgid "Start After"
 msgstr ""
 
-#: src/dvr/dvr_autorec.c:989
+#: src/dvr/dvr_autorec.c:1024
 msgid "Start Before"
 msgstr ""
 
-#: src/dvr/dvr_db.c:2066
+#: src/dvr/dvr_db.c:2357
 msgid "Start Time"
 msgstr ""
 
-#: src/dvr/dvr_db.c:2343 src/descrambler/caclient.c:281
+#: src/dvr/dvr_db.c:2673 src/descrambler/caclient.c:281
 msgid "Status"
 msgstr ""
 
@@ -3175,11 +3316,11 @@ msgstr ""
 msgid "Stereo"
 msgstr ""
 
-#: src/dvr/dvr_timerec.c:602
+#: src/dvr/dvr_timerec.c:603
 msgid "Stop"
 msgstr ""
 
-#: src/dvr/dvr_db.c:2091
+#: src/dvr/dvr_db.c:2382
 msgid "Stop Time"
 msgstr ""
 
@@ -3187,7 +3328,7 @@ msgstr ""
 msgid "Storage Path"
 msgstr ""
 
-#: src/config.c:1778
+#: src/config.c:1837
 msgid "Storage space"
 msgstr ""
 
@@ -3196,7 +3337,7 @@ msgstr ""
 msgid "Stream Index"
 msgstr ""
 
-#: src/profile.c:275 src/dvr/dvr_config.c:792
+#: src/profile.c:275 src/dvr/dvr_config.c:794
 msgid "Stream Profile"
 msgstr ""
 
@@ -3205,24 +3346,24 @@ msgstr ""
 msgid "Stream Type"
 msgstr ""
 
-#: src/access.c:1346 src/access.c:1426
+#: src/access.c:1334 src/access.c:1414
 msgid "Streaming"
 msgstr ""
 
-#: src/input/mpegts/mpegts_input.c:241 src/input/mpegts/iptv/iptv.c:460
-#: src/input/mpegts/iptv/iptv_mux.c:119
+#: src/input/mpegts/mpegts_input.c:242 src/input/mpegts/iptv/iptv.c:609
+#: src/input/mpegts/iptv/iptv_mux.c:128
 msgid "Streaming Priority"
 msgstr ""
 
-#: src/access.c:1445
+#: src/access.c:1433
 msgid "Streaming Profiles"
 msgstr ""
 
-#: src/dvr/dvr_config.c:745
+#: src/dvr/dvr_config.c:747
 msgid "Subdirectory Options"
 msgstr ""
 
-#: src/main.c:732
+#: src/main.c:735
 msgid "Subscribe to a service permanently"
 msgstr ""
 
@@ -3230,11 +3371,15 @@ msgstr ""
 msgid "Subscription Weight"
 msgstr ""
 
-#: src/streaming.c:412
+#: src/streaming.c:418
 msgid "Subscription overridden"
 msgstr ""
 
-#: src/dvr/dvr_db.c:2161 src/dvr/dvr_db.c:2168
+#: src/input/mpegts/iptv/iptv_mux.c:144
+msgid "Substitute formatters"
+msgstr ""
+
+#: src/dvr/dvr_db.c:2452 src/dvr/dvr_db.c:2459
 msgid "Subtitle"
 msgstr ""
 
@@ -3246,7 +3391,7 @@ msgstr ""
 msgid "Subtitle Stream Filter"
 msgstr ""
 
-#: src/dvr/dvr_autorec.c:734
+#: src/dvr/dvr_autorec.c:769
 msgid "Sun"
 msgstr ""
 
@@ -3258,11 +3403,11 @@ msgstr ""
 msgid "Switch Then Rotor"
 msgstr ""
 
-#: src/input/mpegts/linuxdvb/linuxdvb_satconf.c:1250
+#: src/input/mpegts/linuxdvb/linuxdvb_satconf.c:1310
 msgid "Switch Type"
 msgstr ""
 
-#: src/input/mpegts/linuxdvb/linuxdvb_switch.c:105
+#: src/input/mpegts/linuxdvb/linuxdvb_switch.c:106
 #, c-format
 msgid "Switch: %s"
 msgstr ""
@@ -3271,23 +3416,23 @@ msgstr ""
 msgid "Symbol Rate (Sym/s)"
 msgstr ""
 
-#: src/dvr/dvr_config.c:687
+#: src/dvr/dvr_config.c:689
 msgid "Sync"
 msgstr ""
 
-#: src/dvr/dvr_config.c:688
+#: src/dvr/dvr_config.c:690
 msgid "Sync + Don't keep"
 msgstr ""
 
-#: src/dvr/dvr_config.c:685
+#: src/dvr/dvr_config.c:687
 msgid "System"
 msgstr ""
 
-#: src/dvr/dvr_config.c:884
+#: src/dvr/dvr_config.c:900
 msgid "Tag Files With Metadata"
 msgstr ""
 
-#: src/channels.c:373
+#: src/channels.c:385
 msgid "Tags"
 msgstr ""
 
@@ -3313,10 +3458,11 @@ msgstr ""
 msgid "Tennis"
 msgstr ""
 
-#: src/main.c:737
+#: src/main.c:740
 msgid "Testing options"
 msgstr ""
 
+#: src/input/mpegts/linuxdvb/linuxdvb_frontend.c:201
 #: src/input/mpegts/satip/satip_frontend.c:266
 msgid "This Tuner"
 msgstr ""
@@ -3325,19 +3471,23 @@ msgstr ""
 msgid "Thriller"
 msgstr ""
 
-#: src/dvr/dvr_autorec.c:731
+#: src/dvr/dvr_autorec.c:766
 msgid "Thu"
 msgstr ""
 
-#: src/config.c:1779
+#: src/config.c:1838
 msgid "Time"
 msgstr ""
 
-#: src/config.c:1838
+#: src/dvr/dvr_db.c:2613
+msgid "Time Record Caption"
+msgstr ""
+
+#: src/config.c:1897
 msgid "Time Update"
 msgstr ""
 
-#: src/dvr/dvr_db.c:317
+#: src/dvr/dvr_db.c:366
 msgid "Time missed"
 msgstr ""
 
@@ -3362,11 +3512,11 @@ msgstr ""
 msgid "Timout (secs)"
 msgstr ""
 
-#: src/dvr/dvr_db.c:2146 src/dvr/dvr_db.c:2153 src/dvr/dvr_timerec.c:570
+#: src/dvr/dvr_db.c:2437 src/dvr/dvr_db.c:2444 src/dvr/dvr_timerec.c:571
 msgid "Title"
 msgstr ""
 
-#: src/dvr/dvr_autorec.c:949
+#: src/dvr/dvr_autorec.c:984
 msgid "Title (Regexp)"
 msgstr ""
 
@@ -3374,7 +3524,7 @@ msgstr ""
 msgid "Toggle details"
 msgstr ""
 
-#: src/input/mpegts/linuxdvb/linuxdvb_switch.c:135
+#: src/input/mpegts/linuxdvb/linuxdvb_switch.c:136
 msgid "Tone Burst"
 msgstr ""
 
@@ -3406,11 +3556,11 @@ msgstr ""
 msgid "Transponder ID"
 msgstr ""
 
-#: src/input/mpegts/mpegts_mux.c:541
+#: src/input/mpegts/mpegts_mux.c:542
 msgid "Transport Stream ID"
 msgstr ""
 
-#: src/dvr/dvr_autorec.c:729
+#: src/dvr/dvr_autorec.c:764
 msgid "Tue"
 msgstr ""
 
@@ -3422,7 +3572,7 @@ msgstr ""
 msgid "Tune Repeats"
 msgstr ""
 
-#: src/input/mpegts/satip/satip.c:202 src/input/mpegts/satip/satip.c:317
+#: src/input/mpegts/satip/satip.c:203 src/input/mpegts/satip/satip.c:339
 msgid "Tuner Configuration"
 msgstr ""
 
@@ -3430,7 +3580,7 @@ msgstr ""
 msgid "Tuner bind IP address"
 msgstr ""
 
-#: src/streaming.c:427
+#: src/streaming.c:435
 msgid "Tuning failed"
 msgstr ""
 
@@ -3438,7 +3588,7 @@ msgstr ""
 msgid "Turn off LNB when idle"
 msgstr ""
 
-#: src/config.c:1867
+#: src/config.c:1926
 msgid "Tvheadend server name"
 msgstr ""
 
@@ -3450,32 +3600,33 @@ msgstr ""
 msgid "UDP RTP Port Number (2 ports)"
 msgstr ""
 
-#: src/dvr/dvr_db.c:2329 src/input/mpegts/iptv/iptv_mux.c:127
+#: src/dvr/dvr_db.c:2659 src/input/mpegts/iptv/iptv.c:697
+#: src/input/mpegts/iptv/iptv_mux.c:136
 msgid "URL"
 msgstr ""
 
-#: src/main.c:692
+#: src/main.c:695
 msgid "URL with the SAT>IP server XML location"
 msgstr ""
 
-#: src/input/mpegts/linuxdvb/linuxdvb_rotor.c:448
+#: src/input/mpegts/linuxdvb/linuxdvb_rotor.c:468
 msgid "USALS"
 msgstr ""
 
-#: src/input/mpegts/linuxdvb/linuxdvb_rotor.c:119
+#: src/input/mpegts/linuxdvb/linuxdvb_rotor.c:139
 msgid "USALS Rotor"
 msgstr ""
 
-#: src/input/mpegts/satip/satip.c:296
+#: src/input/mpegts/satip/satip.c:318
 #: src/input/mpegts/tvhdhomerun/tvhdhomerun.c:156
 msgid "UUID"
 msgstr ""
 
-#: src/input/mpegts/linuxdvb/linuxdvb_switch.c:142
+#: src/input/mpegts/linuxdvb/linuxdvb_switch.c:143
 msgid "Uncommited First"
 msgstr ""
 
-#: src/input/mpegts/linuxdvb/linuxdvb_switch.c:128
+#: src/input/mpegts/linuxdvb/linuxdvb_switch.c:129
 msgid "Uncommitted"
 msgstr ""
 
@@ -3487,11 +3638,11 @@ msgstr ""
 msgid "Unicable Switch (Universal LNB, experimental)"
 msgstr ""
 
-#: src/input/mpegts/linuxdvb/linuxdvb_satconf.c:1268
+#: src/input/mpegts/linuxdvb/linuxdvb_satconf.c:1328
 msgid "Unicable Type"
 msgstr ""
 
-#: src/profile.c:251 src/dvr/dvr_db.c:1683
+#: src/profile.c:251 src/dvr/dvr_db.c:1865
 msgid "Unimportant"
 msgstr ""
 
@@ -3499,11 +3650,11 @@ msgstr ""
 msgid "Universal LNB only"
 msgstr ""
 
-#: src/epggrab/module.c:60 src/dvr/dvr_timerec.c:95 src/dvr/dvr_config.c:684
+#: src/epggrab/module.c:60 src/dvr/dvr_timerec.c:95 src/dvr/dvr_config.c:686
 msgid "Unknown"
 msgstr ""
 
-#: src/streaming.c:448
+#: src/streaming.c:456
 #, c-format
 msgid "Unknown reason (%i)"
 msgstr ""
@@ -3520,31 +3671,31 @@ msgstr ""
 msgid "Unset (default)"
 msgstr ""
 
-#: src/descrambler/cwc.c:1765
+#: src/descrambler/cwc.c:1776
 msgid "Update Card (EMM)"
 msgstr ""
 
-#: src/dvr/dvr_config.c:705
+#: src/dvr/dvr_config.c:707
 msgid "Update Disabled"
 msgstr ""
 
-#: src/epggrab.c:264
+#: src/epggrab.c:268
 msgid "Update channel icon"
 msgstr ""
 
-#: src/epggrab.c:250
+#: src/epggrab.c:254
 msgid "Update channel name"
 msgstr ""
 
-#: src/epggrab.c:257
+#: src/epggrab.c:261
 msgid "Update channel number"
 msgstr ""
 
-#: src/config.c:1941
+#: src/config.c:2000
 msgid "Update time"
 msgstr ""
 
-#: src/config.c:1955
+#: src/config.c:2014
 msgid "Update tolerance (ms)"
 msgstr ""
 
@@ -3553,11 +3704,11 @@ msgstr ""
 msgid "Usage: %s [OPTIONS]\n"
 msgstr ""
 
-#: src/dvr/dvr_config.c:993
+#: src/dvr/dvr_config.c:1009
 msgid "Use Windows-compatible filenames"
 msgstr ""
 
-#: src/main.c:708
+#: src/main.c:711
 msgid "Use XSPF playlist instead of M3U"
 msgstr ""
 
@@ -3569,31 +3720,31 @@ msgstr ""
 msgid "Use original"
 msgstr ""
 
-#: src/dvr/dvr_db.c:303
+#: src/dvr/dvr_db.c:352
 msgid "User Access Error"
 msgstr ""
 
-#: src/channels.c:318
+#: src/channels.c:330
 msgid "User Icon"
 msgstr ""
 
-#: src/dvr/dvr_db.c:305
+#: src/dvr/dvr_db.c:354
 msgid "User Limit Reached"
 msgstr ""
 
-#: src/streaming.c:416
+#: src/streaming.c:422
 msgid "User access error"
 msgstr ""
 
-#: src/config.c:1926
+#: src/config.c:1985
 msgid "User language"
 msgstr ""
 
-#: src/streaming.c:418
+#: src/streaming.c:424
 msgid "User limit reached"
 msgstr ""
 
-#: src/access.c:1398 src/access.c:1762 src/descrambler/cwc.c:1730
+#: src/access.c:1386 src/access.c:1750 src/descrambler/cwc.c:1741
 msgid "Username"
 msgstr ""
 
@@ -3613,7 +3764,7 @@ msgstr ""
 msgid "Video CODEC"
 msgstr ""
 
-#: src/access.c:1454
+#: src/access.c:1442
 msgid "Video Recorder"
 msgstr ""
 
@@ -3621,7 +3772,7 @@ msgstr ""
 msgid "Video Stream Filter"
 msgstr ""
 
-#: src/streaming.c:542
+#: src/streaming.c:550
 msgid "Visually impaired commentary/audio description"
 msgstr ""
 
@@ -3649,11 +3800,11 @@ msgstr ""
 msgid "WEBTV profile VP8/Vorbis/WEBM"
 msgstr ""
 
-#: src/dvr/dvr_db.c:287
+#: src/dvr/dvr_db.c:336
 msgid "Waiting for program start"
 msgstr ""
 
-#: src/dvr/dvr_db.c:285
+#: src/dvr/dvr_db.c:334
 msgid "Waiting for stream"
 msgstr ""
 
@@ -3665,23 +3816,27 @@ msgstr ""
 msgid "Water sport"
 msgstr ""
 
+#: src/streaming.c:426
+msgid "Weak stream"
+msgstr ""
+
 #: src/epg.c:1968
 msgid "Weather report"
 msgstr ""
 
-#: src/access.c:1495
+#: src/access.c:1483
 msgid "Web Interface"
 msgstr ""
 
-#: src/access.c:1418
+#: src/access.c:1406
 msgid "Web Interface Language"
 msgstr ""
 
-#: src/config.c:1830
+#: src/config.c:1889
 msgid "Web User Interface"
 msgstr ""
 
-#: src/dvr/dvr_autorec.c:730
+#: src/dvr/dvr_autorec.c:765
 msgid "Wed"
 msgstr ""
 
@@ -3689,11 +3844,11 @@ msgstr ""
 msgid "Western"
 msgstr ""
 
-#: src/descrambler/capmt.c:2171
+#: src/descrambler/capmt.c:2208
 msgid "Wrapper (capmt_ca.so)"
 msgstr ""
 
-#: src/input/mpegts/satip/satip.c:240
+#: src/input/mpegts/satip/satip.c:255
 msgid "addpids/delpids supported"
 msgstr ""
 
@@ -3701,29 +3856,33 @@ msgstr ""
 msgid "en50494"
 msgstr ""
 
-#: src/dvr/dvr_db.c:2004
+#: src/dvr/dvr_db.c:2295
 msgid "hrs"
 msgstr ""
 
-#: src/main.c:767
+#: src/main.c:770
 #, c-format
 msgid "invalid option specified [%s]"
 msgstr ""
 
-#: src/dvr/dvr_db.c:2005
+#: src/dvr/dvr_db.c:2296
 msgid "min"
 msgstr ""
 
-#: src/dvr/dvr_db.c:2006
+#: src/dvr/dvr_db.c:2297
 msgid "mins"
 msgstr ""
 
-#: src/main.c:774
+#: src/main.c:777
 #, c-format
 msgid "option %s requires a value"
 msgstr ""
 
-#: src/main.c:739
+#: src/bouquet.c:951
+msgid "ssl_peer_verify"
+msgstr ""
+
+#: src/main.c:742
 msgid "tsfile input (mux file)"
 msgstr ""