From: Jaroslav Kysela <perex@perex.cz>
Date: Tue, 15 Dec 2015 20:23:52 +0000 (+0100)
Subject: remove non-ASCII characters from quick tips, new intl template
X-Git-Tag: v4.2.1~1299
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=eb2976d3f59e6397d0e3fc5016b1beaf9737d9ec;p=thirdparty%2Ftvheadend.git

remove non-ASCII characters from quick tips, new intl template
---

diff --git a/intl/js/tvheadend.js.pot b/intl/js/tvheadend.js.pot
index 43466818b..6cc1240e3 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-12-03 14:21+0100\n"
+"POT-Creation-Date: 2015-12-15 21:23+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -118,43 +118,43 @@ msgstr ""
 msgid "Abort the selected recording"
 msgstr ""
 
-#: src/webui/static/app/tvheadend.js:581
+#: src/webui/static/app/tvheadend.js:601
 msgid "About"
 msgstr ""
 
-#: src/webui/static/app/acleditor.js:64
+#: src/webui/static/app/acleditor.js:65
 msgid "Access Control Entries"
 msgstr ""
 
-#: src/webui/static/app/acleditor.js:26
+#: src/webui/static/app/acleditor.js:27
 msgid "Access Entries"
 msgstr ""
 
-#: src/webui/static/app/acleditor.js:25
+#: src/webui/static/app/acleditor.js:26
 msgid "Access Entry"
 msgstr ""
 
-#: src/webui/static/app/servicemapper.js:24
+#: src/webui/static/app/servicemapper.js:22
 msgid "Active"
 msgstr ""
 
-#: src/webui/static/app/idnode.js:1522 src/webui/static/app/idnode.js:2056
+#: src/webui/static/app/idnode.js:1701 src/webui/static/app/idnode.js:2191
 msgid "Add"
 msgstr ""
 
-#: src/webui/static/app/idnode.js:1520 src/webui/static/app/idnode.js:2054
+#: src/webui/static/app/idnode.js:1699 src/webui/static/app/idnode.js:2189
 msgid "Add a new entry"
 msgstr ""
 
-#: src/webui/static/app/idnode.js:1213 src/webui/static/app/idnode.js:1244
+#: src/webui/static/app/idnode.js:1285 src/webui/static/app/idnode.js:1466
 msgid "Add {0}"
 msgstr ""
 
-#: src/webui/static/app/idnode.js:583 src/webui/static/app/idnode.js:599
+#: src/webui/static/app/idnode.js:584 src/webui/static/app/idnode.js:600
 msgid "Advanced"
 msgstr ""
 
-#: src/webui/static/app/idnode.js:976
+#: src/webui/static/app/idnode.js:1013
 msgid "Advanced Settings"
 msgstr ""
 
@@ -162,7 +162,7 @@ msgstr ""
 msgid "After"
 msgstr ""
 
-#: src/webui/static/app/mpegts.js:211
+#: src/webui/static/app/mpegts.js:212
 msgid "After filtering and reordering (without PCR and PMT)"
 msgstr ""
 
@@ -174,11 +174,11 @@ msgstr ""
 msgid "Age Rating"
 msgstr ""
 
-#: src/webui/static/app/idnode.js:1713 src/webui/static/app/idnode.js:1752
+#: src/webui/static/app/idnode.js:1847 src/webui/static/app/idnode.js:1886
 msgid "All"
 msgstr ""
 
-#: src/webui/static/app/idnode.js:1060 src/webui/static/app/idnode.js:1165
+#: src/webui/static/app/idnode.js:1101 src/webui/static/app/idnode.js:1405
 msgid "Apply"
 msgstr ""
 
@@ -190,7 +190,7 @@ msgstr ""
 msgid "Apply configuration (run-time only)"
 msgstr ""
 
-#: src/webui/static/app/idnode.js:1164
+#: src/webui/static/app/idnode.js:1404
 msgid "Apply settings"
 msgstr ""
 
@@ -230,7 +230,7 @@ msgstr ""
 msgid "Auto Recorder"
 msgstr ""
 
-#: src/webui/static/app/tvheadend.js:141
+#: src/webui/static/app/tvheadend.js:159
 msgid "Auto-refresh"
 msgstr ""
 
@@ -243,7 +243,7 @@ msgstr ""
 msgid "Autorecs"
 msgstr ""
 
-#: src/webui/static/app/idnode.js:441 src/webui/static/app/idnode.js:654
+#: src/webui/static/app/idnode.js:442 src/webui/static/app/idnode.js:681
 msgid "Available"
 msgstr ""
 
@@ -255,19 +255,19 @@ msgstr ""
 msgid "Bandwidth (kb/s)"
 msgstr ""
 
-#: src/webui/static/app/status.js:676 src/webui/static/app/status.js:769
+#: src/webui/static/app/status.js:677 src/webui/static/app/status.js:770
 msgid "Bandwidth monitor"
 msgstr ""
 
-#: src/webui/static/app/config.js:9
+#: src/webui/static/app/config.js:28
 msgid "Base"
 msgstr ""
 
-#: src/webui/static/app/idnode.js:581 src/webui/static/app/idnode.js:593
+#: src/webui/static/app/idnode.js:582 src/webui/static/app/idnode.js:594
 msgid "Basic"
 msgstr ""
 
-#: src/webui/static/app/idnode.js:974
+#: src/webui/static/app/idnode.js:1011
 msgid "Basic Settings"
 msgstr ""
 
@@ -275,10 +275,6 @@ msgstr ""
 msgid "Before"
 msgstr ""
 
-#: src/webui/static/app/servicemapper.js:127
-msgid "Begin mapping"
-msgstr ""
-
 #: src/webui/static/app/cteditor.js:44
 msgid "Bouquet"
 msgstr ""
@@ -311,7 +307,7 @@ msgstr ""
 msgid "CA Stream Filters"
 msgstr ""
 
-#: src/webui/static/app/mpegts.js:190
+#: src/webui/static/app/mpegts.js:191
 msgid "CAIDS: "
 msgstr ""
 
@@ -320,38 +316,37 @@ 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:1026 src/webui/static/app/idnode.js:1188
-#: src/webui/static/app/servicemapper.js:119
+#: src/webui/static/app/idnode.js:1063 src/webui/static/app/idnode.js:1430
 msgid "Cancel"
 msgstr ""
 
-#: src/webui/static/app/status.js:516
+#: src/webui/static/app/status.js:517
 msgid "Cancel Connection"
 msgstr ""
 
-#: src/webui/static/app/idnode.js:1187
+#: src/webui/static/app/idnode.js:1429
 msgid "Cancel operation"
 msgstr ""
 
-#: src/webui/static/app/status.js:517
+#: src/webui/static/app/status.js:518
 msgid "Cancel the selected connection?"
 msgstr ""
 
-#: src/webui/static/app/status.js:513
+#: src/webui/static/app/status.js:514
 msgid "Cancel this connection"
 msgstr ""
 
-#: src/webui/static/app/idnode.js:611
+#: src/webui/static/app/idnode.js:612
 msgid "Change the user interface level (basic, advanced, expert)"
 msgstr ""
 
-#: src/webui/static/app/chconf.js:199 src/webui/static/app/epg.js:546
+#: src/webui/static/app/chconf.js:200 src/webui/static/app/epg.js:546
 #: src/webui/static/app/epg.js:547 src/webui/static/app/epg.js:1028
 #: src/webui/static/app/status.js:106
 msgid "Channel"
 msgstr ""
 
-#: src/webui/static/app/tvheadend.js:517
+#: src/webui/static/app/tvheadend.js:537
 msgid "Channel / EPG"
 msgstr ""
 
@@ -367,23 +362,19 @@ msgstr ""
 msgid "Channel number operations"
 msgstr ""
 
-#: src/webui/static/app/chconf.js:200 src/webui/static/app/chconf.js:204
+#: src/webui/static/app/chconf.js:201 src/webui/static/app/chconf.js:205
 msgid "Channels"
 msgstr ""
 
-#: src/webui/static/app/servicemapper.js:89
-msgid "Check availability"
-msgstr ""
-
 #: src/webui/static/app/i18n-post.js:134
 msgid "Choose a month (Control+Up/Down to move years)"
 msgstr ""
 
-#: src/webui/static/app/config.js:50
+#: src/webui/static/app/config.js:70
 msgid "Clean image (icon) cache"
 msgstr ""
 
-#: src/webui/static/app/config.js:48
+#: src/webui/static/app/config.js:68
 msgid "Clean image cache on storage"
 msgstr ""
 
@@ -399,6 +390,14 @@ msgstr ""
 msgid "Client Name"
 msgstr ""
 
+#: src/webui/static/app/idnode.js:1352 src/webui/static/app/idnode.js:2201
+msgid "Clone"
+msgstr ""
+
+#: src/webui/static/app/idnode.js:2199
+msgid "Clone a new entry"
+msgstr ""
+
 #: src/webui/static/app/epg.js:232
 msgid "Close"
 msgstr ""
@@ -415,7 +414,7 @@ msgstr ""
 msgid "Comment"
 msgstr ""
 
-#: src/webui/static/app/status.js:725
+#: src/webui/static/app/status.js:726
 msgid "Compression ratio"
 msgstr ""
 
@@ -423,11 +422,11 @@ msgstr ""
 msgid "Conditional Access Client"
 msgstr ""
 
-#: src/webui/static/app/tvheadend.js:456
+#: src/webui/static/app/tvheadend.js:476
 msgid "Configuration"
 msgstr ""
 
-#: src/webui/static/app/status.js:617
+#: src/webui/static/app/status.js:618
 msgid "Connections"
 msgstr ""
 
@@ -440,7 +439,7 @@ msgstr ""
 msgid "Continuity Errors"
 msgstr ""
 
-#: src/webui/static/app/idnode.js:1140
+#: src/webui/static/app/idnode.js:1378
 msgid "Create"
 msgstr ""
 
@@ -454,18 +453,10 @@ msgid ""
 "the current query."
 msgstr ""
 
-#: src/webui/static/app/servicemapper.js:110
-msgid "Create network tags"
-msgstr ""
-
-#: src/webui/static/app/idnode.js:1139
+#: src/webui/static/app/idnode.js:1377
 msgid "Create new entry"
 msgstr ""
 
-#: src/webui/static/app/servicemapper.js:105
-msgid "Create provider tags"
-msgstr ""
-
 #: src/webui/static/app/epg.js:1046
 msgid "Created from EPG query"
 msgstr ""
@@ -475,7 +466,7 @@ msgstr ""
 msgid "Currently this will match (and record) %d events."
 msgstr ""
 
-#: src/webui/static/app/tvheadend.js:498
+#: src/webui/static/app/tvheadend.js:518
 msgid "DVB Inputs"
 msgstr ""
 
@@ -519,7 +510,7 @@ msgstr ""
 msgid "December"
 msgstr ""
 
-#: src/webui/static/app/idnode.js:1536 src/webui/static/app/idnode.js:2068
+#: src/webui/static/app/idnode.js:1715 src/webui/static/app/idnode.js:2214
 msgid "Delete"
 msgstr ""
 
@@ -531,7 +522,7 @@ msgstr ""
 msgid "Delete scheduled recording of this program"
 msgstr ""
 
-#: src/webui/static/app/idnode.js:1534 src/webui/static/app/idnode.js:2066
+#: src/webui/static/app/idnode.js:1713 src/webui/static/app/idnode.js:2212
 msgid "Delete selected entries"
 msgstr ""
 
@@ -539,11 +530,11 @@ msgstr ""
 msgid "Descramble"
 msgstr ""
 
-#: src/webui/static/app/mpegts.js:264
+#: src/webui/static/app/mpegts.js:265
 msgid "Detailed stream info"
 msgstr ""
 
-#: src/webui/static/app/mpegts.js:260 src/webui/static/app/epg.js:329
+#: src/webui/static/app/mpegts.js:261 src/webui/static/app/epg.js:329
 #: src/webui/static/app/epg.js:330 src/webui/static/app/dvr.js:123
 #: src/webui/static/app/dvr.js:124
 msgid "Details"
@@ -565,7 +556,7 @@ msgstr ""
 msgid "Disabled"
 msgstr ""
 
-#: src/webui/static/app/config.js:109
+#: src/webui/static/app/config.js:129
 msgid "Discover SAT>IP servers"
 msgstr ""
 
@@ -581,7 +572,7 @@ msgstr ""
 msgid "Do you really want to delete the selected recordings?"
 msgstr ""
 
-#: src/webui/static/app/tvheadend.js:113
+#: src/webui/static/app/tvheadend.js:131
 msgid "Do you really want to delete the selection?"
 msgstr ""
 
@@ -649,19 +640,19 @@ msgstr ""
 msgid "EPG Update"
 msgstr ""
 
-#: src/webui/static/app/idnode.js:1623
+#: src/webui/static/app/idnode.js:1206 src/webui/static/app/idnode.js:1802
 msgid "Edit"
 msgstr ""
 
-#: src/webui/static/app/idnode.js:1621
+#: src/webui/static/app/idnode.js:1800
 msgid "Edit selected entry"
 msgstr ""
 
-#: src/webui/static/app/idnode.js:1637 src/webui/static/app/idnode.js:1676
+#: src/webui/static/app/idnode.js:1243 src/webui/static/app/idnode.js:1816
 msgid "Edit {0}"
 msgstr ""
 
-#: src/webui/static/app/idnode.js:1672
+#: src/webui/static/app/idnode.js:1240
 msgid "Edit {0} ({1} entries)"
 msgstr ""
 
@@ -675,7 +666,7 @@ msgstr ""
 msgid "Elementary Stream Filter"
 msgstr ""
 
-#: src/webui/static/app/tvheadend.js:791
+#: src/webui/static/app/tvheadend.js:814
 msgid "Enable debug output"
 msgstr ""
 
@@ -704,15 +695,15 @@ msgstr ""
 msgid "Every day"
 msgstr ""
 
-#: src/webui/static/app/idnode.js:584 src/webui/static/app/idnode.js:605
+#: src/webui/static/app/idnode.js:585 src/webui/static/app/idnode.js:606
 msgid "Expert"
 msgstr ""
 
-#: src/webui/static/app/idnode.js:978
+#: src/webui/static/app/idnode.js:1015
 msgid "Expert Settings"
 msgstr ""
 
-#: src/webui/static/app/servicemapper.js:15
+#: src/webui/static/app/servicemapper.js:13
 msgid "Failed"
 msgstr ""
 
@@ -756,6 +747,10 @@ msgstr ""
 msgid "Filters"
 msgstr ""
 
+#: src/webui/static/app/wizard.js:114
+msgid "Finish"
+msgstr ""
+
 #: src/webui/static/app/dvr.js:382
 msgid "Finished Recording"
 msgstr ""
@@ -776,7 +771,7 @@ msgstr ""
 msgid "Force new scan (all muxes) for selected networks"
 msgstr ""
 
-#: src/webui/static/app/tvheadend.js:730
+#: src/webui/static/app/tvheadend.js:753
 msgid "Free"
 msgstr ""
 
@@ -788,7 +783,7 @@ msgstr ""
 msgid "Friday"
 msgstr ""
 
-#: src/webui/static/app/tvheadend.js:366
+#: src/webui/static/app/tvheadend.js:384
 msgid "Fullscreen"
 msgstr ""
 
@@ -796,11 +791,11 @@ msgstr ""
 msgid "Fulltext"
 msgstr ""
 
-#: src/webui/static/app/tvheadend.js:466
+#: src/webui/static/app/tvheadend.js:486
 msgid "General"
 msgstr ""
 
-#: src/webui/static/app/config.js:29 src/webui/static/app/config.js:88
+#: src/webui/static/app/config.js:49 src/webui/static/app/config.js:108
 msgid "General Configuration"
 msgstr ""
 
@@ -808,11 +803,11 @@ msgstr ""
 msgid "Genre"
 msgstr ""
 
-#: src/webui/static/app/tvheadend.js:720
+#: src/webui/static/app/tvheadend.js:743
 msgid "GiB"
 msgstr ""
 
-#: src/webui/static/app/idnode.js:1364
+#: src/webui/static/app/idnode.js:1541
 msgid "Grid Update"
 msgstr ""
 
@@ -820,21 +815,21 @@ msgstr ""
 msgid "Group By This Field"
 msgstr ""
 
-#: src/webui/static/app/idnode.js:1096 src/webui/static/app/idnode.js:1819
-#: src/webui/static/app/idnode.js:2190 src/webui/static/app/idnode.js:2622
+#: src/webui/static/app/idnode.js:1140 src/webui/static/app/idnode.js:1953
+#: src/webui/static/app/idnode.js:2336 src/webui/static/app/idnode.js:2770
 #: src/webui/static/app/epg.js:875
 msgid "Help"
 msgstr ""
 
-#: src/webui/static/app/tvheadend.js:63
+#: src/webui/static/app/tvheadend.js:81
 msgid "Help for"
 msgstr ""
 
-#: src/webui/static/app/idnode.js:1729
+#: src/webui/static/app/idnode.js:1863
 msgid "Hide"
 msgstr ""
 
-#: src/webui/static/app/idnode.js:2143
+#: src/webui/static/app/idnode.js:2289
 msgid "Hide passwords"
 msgstr ""
 
@@ -846,7 +841,7 @@ msgstr ""
 msgid "ID"
 msgstr ""
 
-#: src/webui/static/app/status.js:570
+#: src/webui/static/app/status.js:571
 msgid "IP Address"
 msgstr ""
 
@@ -862,23 +857,19 @@ msgstr ""
 msgid "IP Blocking Records"
 msgstr ""
 
-#: src/webui/static/app/servicemapper.js:19
+#: src/webui/static/app/servicemapper.js:17
 msgid "Ignored"
 msgstr ""
 
-#: src/webui/static/app/config.js:80
+#: src/webui/static/app/config.js:100
 msgid "Image cache"
 msgstr ""
 
-#: src/webui/static/app/status.js:723
+#: src/webui/static/app/status.js:724
 msgid "In"
 msgstr ""
 
-#: src/webui/static/app/servicemapper.js:94
-msgid "Include encrypted services"
-msgstr ""
-
-#: src/webui/static/app/status.js:347 src/webui/static/app/status.js:813
+#: src/webui/static/app/status.js:347 src/webui/static/app/status.js:814
 msgid "Input"
 msgstr ""
 
@@ -910,7 +901,7 @@ msgstr ""
 msgid "June"
 msgstr ""
 
-#: src/webui/static/app/tvheadend.js:724
+#: src/webui/static/app/tvheadend.js:747
 msgid "KiB"
 msgstr ""
 
@@ -918,39 +909,35 @@ msgstr ""
 msgid "Last Page"
 msgstr ""
 
-#: src/webui/static/app/tvheadend.js:322
+#: src/webui/static/app/tvheadend.js:340
 msgid "Live TV Player"
 msgstr ""
 
-#: src/webui/static/app/tvheadend.js:123
+#: src/webui/static/app/tvheadend.js:141
 msgid "Loading, please wait..."
 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:627
 #: src/webui/static/app/epg.js:650 src/webui/static/app/epg.js:674
-#: src/webui/static/app/epg.js:695 src/webui/static/app/tvheadend.js:260
-#: src/webui/static/app/tvheadend.js:298
+#: src/webui/static/app/epg.js:695 src/webui/static/app/tvheadend.js:278
+#: src/webui/static/app/tvheadend.js:316
 msgid "Loading..."
 msgstr ""
 
-#: src/webui/static/app/tvheadend.js:701
+#: src/webui/static/app/tvheadend.js:724
 msgid "Logged in as"
 msgstr ""
 
-#: src/webui/static/app/config.js:107
+#: src/webui/static/app/config.js:127
 msgid "Look for new SAT>IP servers"
 msgstr ""
 
-#: src/webui/static/app/servicemapper.js:126
-msgid "Map"
-msgstr ""
-
-#: src/webui/static/app/mpegts.js:244 src/webui/static/app/mpegts.js:256
+#: src/webui/static/app/mpegts.js:245 src/webui/static/app/mpegts.js:257
 msgid "Map All"
 msgstr ""
 
-#: src/webui/static/app/mpegts.js:254
+#: src/webui/static/app/mpegts.js:255
 msgid "Map Selected"
 msgstr ""
 
@@ -958,22 +945,19 @@ msgstr ""
 msgid "Map Services"
 msgstr ""
 
-#: src/webui/static/app/servicemapper.js:181
+#: src/webui/static/app/servicemapper.js:103
+#: src/webui/static/app/servicemapper.js:111
 msgid "Map services"
 msgstr ""
 
-#: src/webui/static/app/mpegts.js:242 src/webui/static/app/chconf.js:129
+#: src/webui/static/app/mpegts.js:243 src/webui/static/app/chconf.js:129
 msgid "Map services to channels"
 msgstr ""
 
-#: src/webui/static/app/servicemapper.js:11
+#: src/webui/static/app/servicemapper.js:9
 msgid "Mapped"
 msgstr ""
 
-#: src/webui/static/app/servicemapper.js:143
-msgid "Mapping services..."
-msgstr ""
-
 #: src/webui/static/app/i18n-post.js:37
 msgid "Mar"
 msgstr ""
@@ -990,15 +974,11 @@ msgstr ""
 msgid "May#ShortNameForMay"
 msgstr ""
 
-#: src/webui/static/app/servicemapper.js:100
-msgid "Merge same name"
-msgstr ""
-
-#: src/webui/static/app/tvheadend.js:112
+#: src/webui/static/app/tvheadend.js:130
 msgid "Message"
 msgstr ""
 
-#: src/webui/static/app/tvheadend.js:722
+#: src/webui/static/app/tvheadend.js:745
 msgid "MiB"
 msgstr ""
 
@@ -1010,11 +990,11 @@ msgstr ""
 msgid "Monday"
 msgstr ""
 
-#: src/webui/static/app/idnode.js:1592 src/webui/static/app/idnode.js:2115
+#: src/webui/static/app/idnode.js:1771 src/webui/static/app/idnode.js:2261
 msgid "Move Down"
 msgstr ""
 
-#: src/webui/static/app/idnode.js:1567 src/webui/static/app/idnode.js:2094
+#: src/webui/static/app/idnode.js:1746 src/webui/static/app/idnode.js:2240
 msgid "Move Up"
 msgstr ""
 
@@ -1026,44 +1006,44 @@ msgstr ""
 msgid "Move channel one number up"
 msgstr ""
 
-#: src/webui/static/app/idnode.js:1590
+#: src/webui/static/app/idnode.js:1769
 msgid "Move selected entries down"
 msgstr ""
 
-#: src/webui/static/app/idnode.js:1565
+#: src/webui/static/app/idnode.js:1744
 msgid "Move selected entries up"
 msgstr ""
 
-#: src/webui/static/app/idnode.js:2113
+#: src/webui/static/app/idnode.js:2259
 msgid "Move selected entry down"
 msgstr ""
 
-#: src/webui/static/app/idnode.js:2092
+#: src/webui/static/app/idnode.js:2238
 msgid "Move selected entry up"
 msgstr ""
 
-#: src/webui/static/app/mpegts.js:99 src/webui/static/app/mpegts.js:108
+#: src/webui/static/app/mpegts.js:100 src/webui/static/app/mpegts.js:109
 msgid "Mux"
 msgstr ""
 
-#: src/webui/static/app/mpegts.js:332 src/webui/static/app/mpegts.js:342
+#: src/webui/static/app/mpegts.js:333 src/webui/static/app/mpegts.js:343
 msgid "Mux Scheduler"
 msgstr ""
 
-#: src/webui/static/app/mpegts.js:333 src/webui/static/app/mpegts.js:337
+#: src/webui/static/app/mpegts.js:334 src/webui/static/app/mpegts.js:338
 msgid "Mux Schedulers"
 msgstr ""
 
-#: src/webui/static/app/mpegts.js:100 src/webui/static/app/mpegts.js:105
+#: src/webui/static/app/mpegts.js:101 src/webui/static/app/mpegts.js:106
 msgid "Muxes"
 msgstr ""
 
-#: src/webui/static/app/mpegts.js:65 src/webui/static/app/mpegts.js:74
-#: src/webui/static/app/mpegts.js:110
+#: src/webui/static/app/mpegts.js:66 src/webui/static/app/mpegts.js:75
+#: src/webui/static/app/mpegts.js:111
 msgid "Network"
 msgstr ""
 
-#: src/webui/static/app/mpegts.js:66 src/webui/static/app/mpegts.js:70
+#: src/webui/static/app/mpegts.js:67 src/webui/static/app/mpegts.js:71
 msgid "Networks"
 msgstr ""
 
@@ -1087,21 +1067,21 @@ msgstr ""
 msgid "No days"
 msgstr ""
 
-#: src/webui/static/app/tvheadend.js:704
+#: src/webui/static/app/tvheadend.js:727
 msgid "No verified access"
 msgstr ""
 
 #. / {0} title (lowercase), {1} title
-#: src/webui/static/app/tvheadend.js:136
+#: src/webui/static/app/tvheadend.js:154
 msgid "No {0} to display"
 msgstr ""
 
-#: src/webui/static/app/idnode.js:1714 src/webui/static/app/mpegts.js:208
-#: src/webui/static/app/mpegts.js:218
+#: src/webui/static/app/idnode.js:1848 src/webui/static/app/mpegts.js:209
+#: src/webui/static/app/mpegts.js:219
 msgid "None"
 msgstr ""
 
-#: src/webui/static/app/idnode.js:350
+#: src/webui/static/app/idnode.js:351
 msgid "Not set"
 msgstr ""
 
@@ -1153,7 +1133,7 @@ msgstr ""
 msgid "Other Stream Filters"
 msgstr ""
 
-#: src/webui/static/app/status.js:724
+#: src/webui/static/app/status.js:725
 msgid "Out"
 msgstr ""
 
@@ -1169,15 +1149,15 @@ msgstr ""
 msgid "Page"
 msgstr ""
 
-#: src/webui/static/app/idnode.js:2217 src/webui/static/app/idnode.js:2403
+#: src/webui/static/app/idnode.js:2367 src/webui/static/app/idnode.js:2550
 msgid "Parameters"
 msgstr ""
 
-#: src/webui/static/app/idnode.js:1712
+#: src/webui/static/app/idnode.js:1846
 msgid "Parent disabled"
 msgstr ""
 
-#: src/webui/static/app/acleditor.js:79
+#: src/webui/static/app/acleditor.js:80
 msgid "Password"
 msgstr ""
 
@@ -1185,26 +1165,26 @@ msgstr ""
 msgid "Password Control Entries"
 msgstr ""
 
-#: src/webui/static/app/acleditor.js:80
+#: src/webui/static/app/acleditor.js:81
 msgid "Passwords"
 msgstr ""
 
-#: src/webui/static/app/tvheadend.js:351
+#: src/webui/static/app/tvheadend.js:369
 msgid "Pause"
 msgstr ""
 
-#: src/webui/static/app/tvheadend.js:147
+#: src/webui/static/app/tvheadend.js:165
 msgid "Per page"
 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:215 src/webui/static/app/chconf.js:216
-#: src/webui/static/app/chconf.js:223 src/webui/static/app/dvr.js:407
+#: src/webui/static/app/mpegts.js:127 src/webui/static/app/mpegts.js:128
+#: src/webui/static/app/mpegts.js:132 src/webui/static/app/mpegts.js:308
+#: src/webui/static/app/mpegts.js:309 src/webui/static/app/mpegts.js:313
+#: src/webui/static/app/chconf.js:216 src/webui/static/app/chconf.js:217
+#: src/webui/static/app/chconf.js:224 src/webui/static/app/dvr.js:407
 #: src/webui/static/app/dvr.js:408 src/webui/static/app/dvr.js:414
 #: src/webui/static/app/dvr.js:518 src/webui/static/app/dvr.js:519
-#: src/webui/static/app/dvr.js:525 src/webui/static/app/tvheadend.js:334
+#: src/webui/static/app/dvr.js:525 src/webui/static/app/tvheadend.js:352
 msgid "Play"
 msgstr ""
 
@@ -1224,6 +1204,10 @@ msgstr ""
 msgid "Please Wait..."
 msgstr ""
 
+#: src/webui/static/app/wizard.js:63
+msgid "Previous"
+msgstr ""
+
 #: src/webui/static/app/i18n-post.js:133
 msgid "Previous Month (Control+Left)"
 msgstr ""
@@ -1244,7 +1228,7 @@ msgstr ""
 msgid "Progress"
 msgstr ""
 
-#: src/webui/static/app/config.js:65 src/webui/static/app/config.js:67
+#: src/webui/static/app/config.js:85 src/webui/static/app/config.js:87
 msgid "Re-fetch images"
 msgstr ""
 
@@ -1252,7 +1236,7 @@ msgstr ""
 msgid "Re-record"
 msgstr ""
 
-#: src/webui/static/app/idnode.js:980
+#: src/webui/static/app/idnode.js:1017
 msgid "Read-only Info"
 msgstr ""
 
@@ -1272,7 +1256,7 @@ msgstr ""
 msgid "Record this program now"
 msgstr ""
 
-#: src/webui/static/app/tvheadend.js:548
+#: src/webui/static/app/tvheadend.js:568
 msgid "Recording"
 msgstr ""
 
@@ -1300,16 +1284,16 @@ msgstr ""
 msgid "Reset all filters (show all)"
 msgstr ""
 
-#: src/webui/static/app/idnode.js:1506 src/webui/static/app/idnode.js:2041
-#: src/webui/static/app/idnode.js:2560
+#: src/webui/static/app/idnode.js:1685 src/webui/static/app/idnode.js:2176
+#: src/webui/static/app/idnode.js:2708
 msgid "Revert pending changes (marked with red border)"
 msgstr ""
 
-#: src/webui/static/app/config.js:122
+#: src/webui/static/app/config.js:142
 msgid "SAT>IP Server"
 msgstr ""
 
-#: src/webui/static/app/config.js:130
+#: src/webui/static/app/config.js:150
 msgid "SAT>IP Server Configuration"
 msgstr ""
 
@@ -1325,13 +1309,17 @@ msgstr ""
 msgid "Saturday"
 msgstr ""
 
-#: src/webui/static/app/idnode.js:1034 src/webui/static/app/idnode.js:1481
-#: src/webui/static/app/idnode.js:2021 src/webui/static/app/idnode.js:2541
+#: src/webui/static/app/idnode.js:1073 src/webui/static/app/idnode.js:1660
+#: src/webui/static/app/idnode.js:2156 src/webui/static/app/idnode.js:2689
 msgid "Save"
 msgstr ""
 
-#: src/webui/static/app/idnode.js:1479 src/webui/static/app/idnode.js:2019
-#: src/webui/static/app/idnode.js:2539
+#: src/webui/static/app/wizard.js:114
+msgid "Save & Next"
+msgstr ""
+
+#: src/webui/static/app/idnode.js:1658 src/webui/static/app/idnode.js:2154
+#: src/webui/static/app/idnode.js:2687
 msgid "Save pending changes (marked with red border)"
 msgstr ""
 
@@ -1355,19 +1343,19 @@ msgstr ""
 msgid "Search title..."
 msgstr ""
 
-#: src/webui/static/app/tvheadend.js:267
+#: src/webui/static/app/tvheadend.js:285
 msgid "Select channel..."
 msgstr ""
 
-#: src/webui/static/app/tvheadend.js:304
+#: src/webui/static/app/tvheadend.js:322
 msgid "Select stream profile..."
 msgstr ""
 
-#: src/webui/static/app/idnode.js:456 src/webui/static/app/idnode.js:677
+#: src/webui/static/app/idnode.js:457 src/webui/static/app/idnode.js:704
 msgid "Select {0} ..."
 msgstr ""
 
-#: src/webui/static/app/idnode.js:440 src/webui/static/app/idnode.js:653
+#: src/webui/static/app/idnode.js:441 src/webui/static/app/idnode.js:680
 msgid "Selected"
 msgstr ""
 
@@ -1379,27 +1367,23 @@ msgstr ""
 msgid "September"
 msgstr ""
 
-#: src/webui/static/app/mpegts.js:294 src/webui/static/app/status.js:112
+#: src/webui/static/app/mpegts.js:295 src/webui/static/app/status.js:112
 msgid "Service"
 msgstr ""
 
-#: src/webui/static/app/servicemapper.js:34
+#: src/webui/static/app/servicemapper.js:33
 msgid "Service Mapper"
 msgstr ""
 
-#: src/webui/static/app/servicemapper.js:151
-msgid "Service Mapper Status"
-msgstr ""
-
-#: src/webui/static/app/mpegts.js:221
+#: src/webui/static/app/mpegts.js:222
 msgid "Service details for"
 msgstr ""
 
-#: src/webui/static/app/mpegts.js:295 src/webui/static/app/mpegts.js:302
+#: src/webui/static/app/mpegts.js:296 src/webui/static/app/mpegts.js:303
 msgid "Services"
 msgstr ""
 
-#: src/webui/static/app/idnode.js:924
+#: src/webui/static/app/idnode.js:961
 msgid "Settings"
 msgstr ""
 
@@ -1407,11 +1391,11 @@ msgstr ""
 msgid "Show in Groups"
 msgstr ""
 
-#: src/webui/static/app/idnode.js:2137
+#: src/webui/static/app/idnode.js:2283
 msgid "Show or hide passwords"
 msgstr ""
 
-#: src/webui/static/app/idnode.js:2139 src/webui/static/app/idnode.js:2143
+#: src/webui/static/app/idnode.js:2285 src/webui/static/app/idnode.js:2289
 msgid "Show passwords"
 msgstr ""
 
@@ -1444,7 +1428,15 @@ msgstr ""
 msgid "Start Time"
 msgstr ""
 
-#: src/webui/static/app/status.js:580
+#: src/webui/static/app/config.js:11
+msgid "Start initial configuration wizard"
+msgstr ""
+
+#: src/webui/static/app/config.js:13
+msgid "Start wizard"
+msgstr ""
+
+#: src/webui/static/app/status.js:581
 msgid "Started"
 msgstr ""
 
@@ -1452,11 +1444,11 @@ msgstr ""
 msgid "State"
 msgstr ""
 
-#: src/webui/static/app/dvr.js:51 src/webui/static/app/status.js:627
+#: src/webui/static/app/dvr.js:51 src/webui/static/app/status.js:628
 msgid "Status"
 msgstr ""
 
-#: src/webui/static/app/dvr.js:202 src/webui/static/app/tvheadend.js:358
+#: src/webui/static/app/dvr.js:202 src/webui/static/app/tvheadend.js:376
 msgid "Stop"
 msgstr ""
 
@@ -1472,12 +1464,12 @@ msgstr ""
 msgid "Stop the selected recording"
 msgstr ""
 
-#: src/webui/static/app/tvheadend.js:727
+#: src/webui/static/app/tvheadend.js:750
 msgid "Storage space"
 msgstr ""
 
-#: src/webui/static/app/status.js:352 src/webui/static/app/status.js:482
-#: src/webui/static/app/tvheadend.js:535
+#: src/webui/static/app/status.js:352 src/webui/static/app/status.js:483
+#: src/webui/static/app/tvheadend.js:555
 msgid "Stream"
 msgstr ""
 
@@ -1530,11 +1522,11 @@ msgstr ""
 msgid "Swap the numbers for the two selected channels"
 msgstr ""
 
-#: src/webui/static/app/tvheadend.js:787
+#: src/webui/static/app/tvheadend.js:810
 msgid "System log"
 msgstr ""
 
-#: src/webui/static/app/tvadapters.js:5 src/webui/static/app/tvadapters.js:10
+#: src/webui/static/app/tvadapters.js:6 src/webui/static/app/tvadapters.js:11
 msgid "TV adapters"
 msgstr ""
 
@@ -1574,6 +1566,10 @@ msgstr ""
 msgid "The minimum length for this field is {0}"
 msgstr ""
 
+#: src/webui/static/app/idnode.js:1352
+msgid "The selected entry is the original!"
+msgstr ""
+
 #: src/webui/static/app/i18n-post.js:234
 msgid "The time in this field must be equal to or after {0}"
 msgstr ""
@@ -1651,7 +1647,7 @@ msgstr ""
 msgid "Today"
 msgstr ""
 
-#: src/webui/static/app/tvheadend.js:376
+#: src/webui/static/app/tvheadend.js:394
 msgid "Toggle mute"
 msgstr ""
 
@@ -1659,7 +1655,7 @@ msgstr ""
 msgid "Toggle re-record functionality"
 msgstr ""
 
-#: src/webui/static/app/tvheadend.js:730
+#: src/webui/static/app/tvheadend.js:753
 msgid "Total"
 msgstr ""
 
@@ -1683,21 +1679,25 @@ msgstr ""
 msgid "Tune to the over-the-air EPG muxes to grab new events now"
 msgstr ""
 
-#: src/webui/static/app/tvheadend.js:766
+#: src/webui/static/app/tvheadend.js:789
 msgid "Tvheadend Web-Panel"
 msgstr ""
 
 #: src/webui/static/app/caclient.js:47 src/webui/static/app/esfilter.js:32
-#: src/webui/static/app/mpegts.js:76 src/webui/static/app/status.js:565
+#: src/webui/static/app/mpegts.js:77 src/webui/static/app/status.js:566
 msgid "Type"
 msgstr ""
 
+#: src/webui/static/app/wizard.js:145
+msgid "Unable to obtain wizard page!"
+msgstr ""
+
 #: src/webui/static/app/status.js:386
 msgid "Uncorrected Blocks"
 msgstr ""
 
-#: src/webui/static/app/idnode.js:1508 src/webui/static/app/idnode.js:2043
-#: src/webui/static/app/idnode.js:2562
+#: src/webui/static/app/idnode.js:1687 src/webui/static/app/idnode.js:2178
+#: src/webui/static/app/idnode.js:2710
 msgid "Undo"
 msgstr ""
 
@@ -1713,11 +1713,15 @@ msgstr ""
 msgid "Upcoming Recording"
 msgstr ""
 
-#: src/webui/static/app/status.js:94 src/webui/static/app/status.js:575
+#: src/webui/static/app/tvheadend.js:753
+msgid "Used by tvheadend"
+msgstr ""
+
+#: src/webui/static/app/status.js:94 src/webui/static/app/status.js:576
 msgid "Username"
 msgstr ""
 
-#: src/webui/static/app/tvheadend.js:482
+#: src/webui/static/app/tvheadend.js:502
 msgid "Users"
 msgstr ""
 
@@ -1729,15 +1733,15 @@ msgstr ""
 msgid "Video Stream Filters"
 msgstr ""
 
-#: src/webui/static/app/idnode.js:613
+#: src/webui/static/app/idnode.js:614
 msgid "View level"
 msgstr ""
 
-#: src/webui/static/app/idnode.js:616
+#: src/webui/static/app/idnode.js:617
 msgid "View level: "
 msgstr ""
 
-#: src/webui/static/app/tvheadend.js:385
+#: src/webui/static/app/tvheadend.js:403
 msgid "Volume"
 msgstr ""
 
@@ -1765,11 +1769,19 @@ msgstr ""
 msgid "Will be skipped"
 msgstr ""
 
+#: src/webui/static/app/wizard.js:119
+msgid "Wizard - initial configuration and tutorial"
+msgstr ""
+
+#: src/webui/static/app/wizard.js:56
+msgid "Wizard - page \"{0}\" not found"
+msgstr ""
+
 #: src/webui/static/app/i18n-post.js:112 src/webui/static/app/i18n-post.js:258
 msgid "Yes"
 msgstr ""
 
-#: src/webui/static/app/idnode.js:468 src/webui/static/app/idnode.js:799
+#: src/webui/static/app/idnode.js:469 src/webui/static/app/idnode.js:834
 msgid "You must provide a value - use octal chmod notation, e.g. 0664"
 msgstr ""
 
@@ -1799,16 +1811,16 @@ msgid ""
 "H#TimeField"
 msgstr ""
 
-#: src/webui/static/app/idnode.js:358 src/webui/static/app/idnode.js:359
+#: src/webui/static/app/idnode.js:359 src/webui/static/app/idnode.js:360
 #: src/webui/static/app/epg.js:427 src/webui/static/app/epg.js:429
 msgid "hrs"
 msgstr ""
 
-#: src/webui/static/app/tvheadend.js:705
+#: src/webui/static/app/tvheadend.js:728
 msgid "login"
 msgstr ""
 
-#: src/webui/static/app/tvheadend.js:702
+#: src/webui/static/app/tvheadend.js:725
 msgid "logout"
 msgstr ""
 
@@ -1836,7 +1848,7 @@ msgstr ""
 msgid "m/d/y#DatePicker"
 msgstr ""
 
-#: src/webui/static/app/idnode.js:359 src/webui/static/app/idnode.js:361
+#: src/webui/static/app/idnode.js:360 src/webui/static/app/idnode.js:362
 #: src/webui/static/app/epg.js:429 src/webui/static/app/epg.js:432
 #: src/webui/static/app/dvr.js:46
 msgid "min"
@@ -1871,6 +1883,6 @@ msgid "{0} selected row{1}"
 msgstr ""
 
 #. / {0} start, {1} end, {2} total, {3} title
-#: src/webui/static/app/tvheadend.js:134
+#: src/webui/static/app/tvheadend.js:152
 msgid "{3} {0} - {1} of {2}"
 msgstr ""
diff --git a/intl/tvheadend.pot b/intl/tvheadend.pot
index 818b48a9d..0c537b5dd 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-12-03 14:21+0100\n"
+"POT-Creation-Date: 2015-12-15 21:23+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -24,7 +24,7 @@ msgid ""
 "https://tvheadend.org\n"
 msgstr ""
 
-#: src/input/mpegts/mpegts_mux.c:595
+#: src/input/mpegts/mpegts_mux.c:613
 msgid "# Channels"
 msgstr ""
 
@@ -36,12 +36,12 @@ msgstr ""
 msgid "# Muxes"
 msgstr ""
 
-#: src/bouquet.c:1006 src/input/mpegts/mpegts_network.c:236
-#: src/input/mpegts/mpegts_mux.c:588
+#: src/bouquet.c:1010 src/input/mpegts/mpegts_network.c:236
+#: src/input/mpegts/mpegts_mux.c:605
 msgid "# Services"
 msgstr ""
 
-#: src/bouquet.c:999
+#: src/bouquet.c:1003
 msgid "# Services seen"
 msgstr ""
 
@@ -49,7 +49,7 @@ msgstr ""
 msgid "# tune repeats"
 msgstr ""
 
-#: src/dvr/dvr_config.c:673
+#: src/dvr/dvr_config.c:678
 msgid "(Default profile)"
 msgstr ""
 
@@ -61,23 +61,23 @@ msgstr ""
 msgid "1"
 msgstr ""
 
-#: src/dvr/dvr_db.c:2189 src/dvr/dvr_db.c:2211 src/dvr/dvr_config.c:709
-#: src/dvr/dvr_config.c:730
+#: src/dvr/dvr_db.c:2248 src/dvr/dvr_db.c:2272 src/dvr/dvr_config.c:714
+#: src/dvr/dvr_config.c:737
 msgid "1 day"
 msgstr ""
 
-#: src/dvr/dvr_db.c:2195 src/dvr/dvr_db.c:2217 src/dvr/dvr_config.c:715
-#: src/dvr/dvr_config.c:736
+#: src/dvr/dvr_db.c:2254 src/dvr/dvr_db.c:2278 src/dvr/dvr_config.c:720
+#: src/dvr/dvr_config.c:743
 msgid "1 month"
 msgstr ""
 
-#: src/dvr/dvr_db.c:2192 src/dvr/dvr_db.c:2214 src/dvr/dvr_config.c:712
-#: src/dvr/dvr_config.c:733
+#: src/dvr/dvr_db.c:2251 src/dvr/dvr_db.c:2275 src/dvr/dvr_config.c:717
+#: src/dvr/dvr_config.c:740
 msgid "1 week"
 msgstr ""
 
-#: src/dvr/dvr_db.c:2199 src/dvr/dvr_db.c:2221 src/dvr/dvr_config.c:719
-#: src/dvr/dvr_config.c:740
+#: src/dvr/dvr_db.c:2258 src/dvr/dvr_db.c:2282 src/dvr/dvr_config.c:724
+#: src/dvr/dvr_config.c:747
 msgid "1 year"
 msgstr ""
 
@@ -109,17 +109,18 @@ msgstr ""
 msgid "2"
 msgstr ""
 
-#: src/dvr/dvr_db.c:2196 src/dvr/dvr_db.c:2218 src/dvr/dvr_config.c:716
-#: src/dvr/dvr_config.c:737
+#: src/dvr/dvr_db.c:2255 src/dvr/dvr_db.c:2279 src/dvr/dvr_config.c:721
+#: src/dvr/dvr_config.c:744
 msgid "2 months"
 msgstr ""
 
-#: src/dvr/dvr_db.c:2193 src/dvr/dvr_db.c:2215 src/dvr/dvr_config.c:713
-#: src/dvr/dvr_config.c:734
+#: src/dvr/dvr_db.c:2252 src/dvr/dvr_db.c:2276 src/dvr/dvr_config.c:718
+#: src/dvr/dvr_config.c:741
 msgid "2 weeks"
 msgstr ""
 
-#: src/dvr/dvr_config.c:741
+#: src/dvr/dvr_db.c:2259 src/dvr/dvr_db.c:2283 src/dvr/dvr_config.c:725
+#: src/dvr/dvr_config.c:748
 msgid "2 years"
 msgstr ""
 
@@ -131,22 +132,23 @@ msgstr ""
 msgid "3"
 msgstr ""
 
-#: src/dvr/dvr_db.c:2190 src/dvr/dvr_db.c:2212 src/dvr/dvr_config.c:710
-#: src/dvr/dvr_config.c:731
+#: src/dvr/dvr_db.c:2249 src/dvr/dvr_db.c:2273 src/dvr/dvr_config.c:715
+#: src/dvr/dvr_config.c:738
 msgid "3 days"
 msgstr ""
 
-#: src/dvr/dvr_db.c:2197 src/dvr/dvr_db.c:2219 src/dvr/dvr_config.c:717
-#: src/dvr/dvr_config.c:738
+#: src/dvr/dvr_db.c:2256 src/dvr/dvr_db.c:2280 src/dvr/dvr_config.c:722
+#: src/dvr/dvr_config.c:745
 msgid "3 months"
 msgstr ""
 
-#: src/dvr/dvr_db.c:2194 src/dvr/dvr_db.c:2216 src/dvr/dvr_config.c:714
-#: src/dvr/dvr_config.c:735
+#: src/dvr/dvr_db.c:2253 src/dvr/dvr_db.c:2277 src/dvr/dvr_config.c:719
+#: src/dvr/dvr_config.c:742
 msgid "3 weeks"
 msgstr ""
 
-#: src/dvr/dvr_config.c:742
+#: src/dvr/dvr_db.c:2260 src/dvr/dvr_db.c:2284 src/dvr/dvr_config.c:726
+#: src/dvr/dvr_config.c:749
 msgid "3 years"
 msgstr ""
 
@@ -162,16 +164,16 @@ msgstr ""
 msgid "5"
 msgstr ""
 
-#: src/dvr/dvr_db.c:2191 src/dvr/dvr_db.c:2213 src/dvr/dvr_config.c:711
-#: src/dvr/dvr_config.c:732
+#: src/dvr/dvr_db.c:2250 src/dvr/dvr_db.c:2274 src/dvr/dvr_config.c:716
+#: src/dvr/dvr_config.c:739
 msgid "5 days"
 msgstr ""
 
-#: src/profile.c:1441
+#: src/profile.c:1445
 msgid "5.0"
 msgstr ""
 
-#: src/profile.c:1442
+#: src/profile.c:1446
 msgid "5.1"
 msgstr ""
 
@@ -179,12 +181,12 @@ msgstr ""
 msgid "6"
 msgstr ""
 
-#: src/dvr/dvr_db.c:2198 src/dvr/dvr_db.c:2220 src/dvr/dvr_config.c:718
-#: src/dvr/dvr_config.c:739
+#: src/dvr/dvr_db.c:2257 src/dvr/dvr_db.c:2281 src/dvr/dvr_config.c:723
+#: src/dvr/dvr_config.c:746
 msgid "6 months"
 msgstr ""
 
-#: src/profile.c:1443
+#: src/profile.c:1447
 msgid "6.1"
 msgstr ""
 
@@ -192,7 +194,7 @@ msgstr ""
 msgid "7"
 msgstr ""
 
-#: src/profile.c:1444
+#: src/profile.c:1448
 msgid "7.1"
 msgstr ""
 
@@ -219,15 +221,15 @@ msgstr ""
 msgid "AB"
 msgstr ""
 
-#: src/input/mpegts/mpegts_mux.c:479
+#: src/input/mpegts/mpegts_mux.c:478
 msgid "AC-3 = descriptor 6"
 msgstr ""
 
-#: src/input/mpegts/mpegts_mux.c:602
+#: src/input/mpegts/mpegts_mux.c:622
 msgid "AC-3 detection"
 msgstr ""
 
-#: src/input/mpegts/mpegts_mux.c:383
+#: src/input/mpegts/mpegts_mux.c:382
 msgid "ACTIVE"
 msgstr ""
 
@@ -235,76 +237,88 @@ msgstr ""
 msgid "AES constant code word client"
 msgstr ""
 
-#: src/config.c:1877
+#: src/config.c:1880
 msgid "AF11"
 msgstr ""
 
-#: src/config.c:1878
+#: src/config.c:1881
 msgid "AF12"
 msgstr ""
 
-#: src/config.c:1879
+#: src/config.c:1882
 msgid "AF13"
 msgstr ""
 
-#: src/config.c:1881
+#: src/config.c:1884
 msgid "AF21"
 msgstr ""
 
-#: src/config.c:1882
+#: src/config.c:1885
 msgid "AF22"
 msgstr ""
 
-#: src/config.c:1883
+#: src/config.c:1886
 msgid "AF23"
 msgstr ""
 
-#: src/config.c:1885
+#: src/config.c:1888
 msgid "AF31"
 msgstr ""
 
-#: src/config.c:1886
+#: src/config.c:1889
 msgid "AF32"
 msgstr ""
 
-#: src/config.c:1887
+#: src/config.c:1890
 msgid "AF33"
 msgstr ""
 
-#: src/config.c:1889
+#: src/config.c:1892
 msgid "AF41"
 msgstr ""
 
-#: src/config.c:1890
+#: src/config.c:1893
 msgid "AF42"
 msgstr ""
 
-#: src/config.c:1891
+#: src/config.c:1894
 msgid "AF43"
 msgstr ""
 
-#: src/esfilter.c:313 src/esfilter.c:370
+#: src/esfilter.c:316 src/esfilter.c:373
 msgid "ANY"
 msgstr ""
 
-#: src/satip/server.c:695 src/input/mpegts/mpegts_mux_dvb.c:645
 #: src/input/mpegts/iptv/iptv_mux.c:162
 msgid "ATSC"
 msgstr ""
 
-#: src/input/mpegts/mpegts_network_dvb.c:266
-msgid "ATSC network"
+#: src/input/mpegts/mpegts_service.c:149
+msgid "ATSC source ID"
 msgstr ""
 
-#: src/input/mpegts/mpegts_service.c:143
-msgid "ATSC source ID"
+#: src/satip/server.c:729
+msgid "ATSC-C"
+msgstr ""
+
+#: src/input/mpegts/mpegts_network_dvb.c:306
+msgid "ATSC-C network"
 msgstr ""
 
-#: src/input/mpegts/mpegts_mux_dvb.c:220 src/input/mpegts/mpegts_mux_dvb.c:223
-#: src/input/mpegts/mpegts_mux_dvb.c:226 src/input/mpegts/mpegts_mux_dvb.c:229
-#: src/input/mpegts/mpegts_mux_dvb.c:232 src/input/mpegts/mpegts_mux_dvb.c:235
-#: src/input/mpegts/mpegts_mux_dvb.c:238 src/input/mpegts/mpegts_mux_dvb.c:298
-#: src/input/mpegts/mpegts_mux_dvb.c:301 src/input/mpegts/mpegts_mux_dvb.c:655
+#: src/satip/server.c:721
+msgid "ATSC-T"
+msgstr ""
+
+#: src/input/mpegts/mpegts_network_dvb.c:284
+msgid "ATSC-T network"
+msgstr ""
+
+#: src/input/mpegts/mpegts_mux_dvb.c:225 src/input/mpegts/mpegts_mux_dvb.c:228
+#: src/input/mpegts/mpegts_mux_dvb.c:231 src/input/mpegts/mpegts_mux_dvb.c:234
+#: src/input/mpegts/mpegts_mux_dvb.c:237 src/input/mpegts/mpegts_mux_dvb.c:240
+#: src/input/mpegts/mpegts_mux_dvb.c:243 src/input/mpegts/mpegts_mux_dvb.c:305
+#: src/input/mpegts/mpegts_mux_dvb.c:308 src/input/mpegts/mpegts_mux_dvb.c:674
+#: src/input/mpegts/mpegts_mux_dvb.c:716 src/input/mpegts/mpegts_mux_dvb.c:719
 msgid "AUTO"
 msgstr ""
 
@@ -312,12 +326,20 @@ msgstr ""
 msgid "Aborted by user"
 msgstr ""
 
-#: src/access.c:1398
+#: src/satip/server.c:618
+msgid "Accept remote subscription weight"
+msgstr ""
+
+#: src/satip/server.c:619
+msgid "Accept the remote subscription weight (from the SAT>IP client)."
+msgstr ""
+
+#: src/access.c:1402
 msgid "Access"
 msgstr ""
 
-#: src/esfilter.c:674 src/esfilter.c:741 src/esfilter.c:808 src/esfilter.c:875
-#: src/esfilter.c:950 src/esfilter.c:1011
+#: src/esfilter.c:694 src/esfilter.c:786 src/esfilter.c:878 src/esfilter.c:970
+#: src/esfilter.c:1073 src/esfilter.c:1152
 msgid "Action"
 msgstr ""
 
@@ -333,16 +355,28 @@ msgstr ""
 msgid "Add the thread ID to debug"
 msgstr ""
 
-#: src/access.c:1546
+#: src/access.c:1550
 msgid "Admin"
 msgstr ""
 
-#: src/epg.c:2023 src/epg.c:2024 src/epg.c:2025 src/epg.c:2026 src/epg.c:2027
-#: src/epg.c:2028
+#: src/wizard.c:263
+msgid "Admin password"
+msgstr ""
+
+#: src/wizard.c:255
+msgid "Admin username"
+msgstr ""
+
+#: src/wizard.c:234
+msgid "Administrator login"
+msgstr ""
+
+#: src/epg.c:2024 src/epg.c:2025 src/epg.c:2026 src/epg.c:2027 src/epg.c:2028
+#: src/epg.c:2029
 msgid "Adult movie"
 msgstr ""
 
-#: src/access.c:1379 src/config.c:1905
+#: src/access.c:1383 src/config.c:1908
 msgid "Advanced"
 msgstr ""
 
@@ -350,27 +384,27 @@ msgstr ""
 msgid "Advanced (non-universal LNBs, rotors, etc.)"
 msgstr ""
 
-#: src/access.c:1475
+#: src/access.c:1479
 msgid "Advanced streaming"
 msgstr ""
 
-#: src/epg.c:2017
+#: src/epg.c:2018
 msgid "Adventure"
 msgstr ""
 
-#: src/epg.c:2154
+#: src/epg.c:2155
 msgid "Advertisement / Shopping"
 msgstr ""
 
-#: src/access.c:1347
+#: src/access.c:1351
 msgid "All (Streaming plus DVR)"
 msgstr ""
 
-#: src/access.c:1510
+#: src/access.c:1514
 msgid "All DVR"
 msgstr ""
 
-#: src/access.c:1516
+#: src/access.c:1520
 msgid "All DVR (rw)"
 msgstr ""
 
@@ -380,8 +414,12 @@ msgid ""
 "equipment."
 msgstr ""
 
-#: src/satip/server.c:612
-msgid "Allow remote subscription weight"
+#: src/config.c:2000
+msgid "Allow to show the quick tips for the form fields."
+msgstr ""
+
+#: src/wizard.c:247
+msgid "Allowed network"
 msgstr ""
 
 #: src/main.c:673
@@ -396,33 +434,37 @@ msgstr ""
 msgid "Altitude (meters)"
 msgstr ""
 
-#: src/epg.c:2133
+#: src/epg.c:2134
 msgid "Animals"
 msgstr ""
 
-#: src/dvr/dvr_autorec.c:610 src/dvr/dvr_autorec.c:646
-#: src/dvr/dvr_autorec.c:660 src/dvr/dvr_autorec.c:667
-#: src/dvr/dvr_timerec.c:411
+#: src/dvr/dvr_autorec.c:612 src/dvr/dvr_autorec.c:648
+#: src/dvr/dvr_autorec.c:662 src/dvr/dvr_autorec.c:669
+#: src/dvr/dvr_timerec.c:413
 msgid "Any"
 msgstr ""
 
-#: src/epg.c:2105
+#: src/epg.c:2106
 msgid "Arts"
 msgstr ""
 
-#: src/epg.c:2069
+#: src/wizard.c:412
+msgid "Assign inputs to networks."
+msgstr ""
+
+#: src/epg.c:2070
 msgid "Athletics"
 msgstr ""
 
-#: src/profile.c:1647
+#: src/profile.c:1651
 msgid "Audio bitrate (kb/s) (0=auto)"
 msgstr ""
 
-#: src/profile.c:1637
+#: src/profile.c:1641
 msgid "Audio codec"
 msgstr ""
 
-#: src/esfilter.c:698
+#: src/esfilter.c:726
 msgid "Audio stream filter"
 msgstr ""
 
@@ -438,24 +480,24 @@ msgstr ""
 msgid "Auto check enabled"
 msgstr ""
 
-#: src/dvr/dvr_db.c:2887
+#: src/dvr/dvr_db.c:2948
 msgid "Auto record"
 msgstr ""
 
-#: src/dvr/dvr_db.c:2895
+#: src/dvr/dvr_db.c:2956
 msgid "Auto record caption"
 msgstr ""
 
-#: src/dvr/dvr_db.c:1166
+#: src/dvr/dvr_db.c:1187
 #, c-format
 msgid "Auto recording%s%s"
 msgstr ""
 
-#: src/dvr/dvr_db.c:2902
+#: src/dvr/dvr_db.c:2963
 msgid "Auto time record"
 msgstr ""
 
-#: src/bouquet.c:903
+#: src/bouquet.c:907
 msgid "Auto-Map to channels"
 msgstr ""
 
@@ -463,19 +505,40 @@ msgstr ""
 msgid "Automatic checking"
 msgstr ""
 
-#: src/channels.c:400
+#: src/channels.c:399
 msgid "Automatically map EPG source"
 msgstr ""
 
-#: src/channels.c:359
+#: src/channels.c:358
 msgid "Automatically name from network"
 msgstr ""
 
-#: src/dvr/dvr_config.c:949
+#: src/epggrab.c:289
+msgid ""
+"Automatically update channel icons using information provided by the enabled "
+"EPG providers. Note: this may cause unwanted changes to already defined "
+"channel icons."
+msgstr ""
+
+#: src/epggrab.c:267
+msgid ""
+"Automatically update channel names using information provided by the enabled "
+"EPG providers. Note: this may cause unwanted changes to already defined "
+"channel names."
+msgstr ""
+
+#: src/epggrab.c:278
+msgid ""
+"Automatically update channel numbers using information provided by the "
+"enabled EPG providers. Note: this may cause unwanted changes to already "
+"defined channel numbers."
+msgstr ""
+
+#: src/dvr/dvr_config.c:958
 msgid "Autorec maximum count (0=unlimited)"
 msgstr ""
 
-#: src/dvr/dvr_config.c:957
+#: src/dvr/dvr_config.c:966
 msgid "Autorec maximum schedules limit (0=unlimited)"
 msgstr ""
 
@@ -494,15 +557,15 @@ msgstr ""
 msgid "BB"
 msgstr ""
 
-#: src/subscriptions.c:905
+#: src/subscriptions.c:904
 msgid "Bad"
 msgstr ""
 
-#: src/epg.c:2090
+#: src/epg.c:2091
 msgid "Ballet"
 msgstr ""
 
-#: src/input/mpegts/mpegts_mux_dvb.c:220
+#: src/input/mpegts/mpegts_mux_dvb.c:225
 msgid "Bandwidth"
 msgstr ""
 
@@ -510,31 +573,35 @@ msgstr ""
 msgid "Based on software from"
 msgstr ""
 
-#: src/access.c:1378 src/config.c:1904
+#: src/access.c:1382 src/config.c:1907
 msgid "Basic"
 msgstr ""
 
-#: src/input/mpegts/satip/satip.c:381
+#: src/input/mpegts/satip/satip.c:303
+msgid "Bind to specific local IP address."
+msgstr ""
+
+#: src/input/mpegts/satip/satip.c:416
 msgid "Boot ID"
 msgstr ""
 
-#: src/bouquet.c:878
+#: src/bouquet.c:882
 msgid "Bouquet"
 msgstr ""
 
-#: src/channels.c:460
+#: src/channels.c:459
 msgid "Bouquet (auto)"
 msgstr ""
 
-#: src/dvr/dvr_autorec.c:1137
+#: src/dvr/dvr_autorec.c:1138
 msgid "Brand"
 msgstr ""
 
-#: src/dvr/dvr_db.c:2941
+#: src/dvr/dvr_db.c:3002
 msgid "Broadcast"
 msgstr ""
 
-#: src/epg.c:2113
+#: src/epg.c:2114
 msgid "Broadcasting"
 msgstr ""
 
@@ -546,20 +613,20 @@ msgstr ""
 msgid "CA ID"
 msgstr ""
 
-#: src/descrambler/caclient.c:173
+#: src/descrambler/caclient.c:176
 #, c-format
 msgid "CA client %i"
 msgstr ""
 
-#: src/esfilter.c:914
+#: src/esfilter.c:1019
 msgid "CA identification"
 msgstr ""
 
-#: src/esfilter.c:922
+#: src/esfilter.c:1029
 msgid "CA provider"
 msgstr ""
 
-#: src/esfilter.c:899
+#: src/esfilter.c:1002
 msgid "CA stream filter"
 msgstr ""
 
@@ -579,43 +646,43 @@ msgstr ""
 msgid "CAPMT query interval (ms)"
 msgstr ""
 
-#: src/input/mpegts/mpegts_mux.c:556 src/input/mpegts/mpegts_service.c:164
+#: src/input/mpegts/mpegts_mux.c:565 src/input/mpegts/mpegts_service.c:173
 msgid "CRID authority"
 msgstr ""
 
-#: src/config.c:1875
+#: src/config.c:1878
 msgid "CS0"
 msgstr ""
 
-#: src/config.c:1876
+#: src/config.c:1879
 msgid "CS1"
 msgstr ""
 
-#: src/config.c:1880
+#: src/config.c:1883
 msgid "CS2"
 msgstr ""
 
-#: src/config.c:1884
+#: src/config.c:1887
 msgid "CS3"
 msgstr ""
 
-#: src/config.c:1888
+#: src/config.c:1891
 msgid "CS4"
 msgstr ""
 
-#: src/config.c:1892
+#: src/config.c:1895
 msgid "CS5"
 msgstr ""
 
-#: src/config.c:1894
+#: src/config.c:1897
 msgid "CS6"
 msgstr ""
 
-#: src/config.c:1895
+#: src/config.c:1898
 msgid "CS7"
 msgstr ""
 
-#: src/dvr/dvr_config.c:858
+#: src/dvr/dvr_config.c:865
 msgid "Cache scheme"
 msgstr ""
 
@@ -623,29 +690,29 @@ msgstr ""
 msgid "Camd.socket filename / IP Address (TCP mode)"
 msgstr ""
 
-#: src/epg.c:2079 src/epg.c:2080 src/epg.c:2081 src/epg.c:2082 src/epg.c:2083
-#: src/epg.c:2084 src/epg.c:2085 src/epg.c:2086 src/epg.c:2087
+#: src/epg.c:2080 src/epg.c:2081 src/epg.c:2082 src/epg.c:2083 src/epg.c:2084
+#: src/epg.c:2085 src/epg.c:2086 src/epg.c:2087 src/epg.c:2088
 msgid "Cartoons"
 msgstr ""
 
-#: src/channels.c:344 src/service.c:177 src/dvr/dvr_db.c:2708
-#: src/dvr/dvr_autorec.c:989 src/dvr/dvr_timerec.c:563
+#: src/channels.c:343 src/service.c:177 src/dvr/dvr_db.c:2769
+#: src/dvr/dvr_autorec.c:990 src/dvr/dvr_timerec.c:564
 msgid "Channel"
 msgstr ""
 
-#: src/dvr/dvr_db.c:2718
+#: src/dvr/dvr_db.c:2779
 msgid "Channel icon"
 msgstr ""
 
-#: src/config.c:2100
+#: src/config.c:2168
 msgid "Channel icon name lower-case"
 msgstr ""
 
-#: src/config.c:2092
+#: src/config.c:2156
 msgid "Channel icon path (see Help)"
 msgstr ""
 
-#: src/dvr/dvr_db.c:2725
+#: src/dvr/dvr_db.c:2786
 msgid "Channel name"
 msgstr ""
 
@@ -653,52 +720,56 @@ msgstr ""
 msgid "Channel number"
 msgstr ""
 
-#: src/bouquet.c:1019
+#: src/bouquet.c:1023
 msgid "Channel number offset"
 msgstr ""
 
-#: src/input/mpegts/iptv/iptv.c:842
+#: src/input/mpegts/iptv/iptv.c:843
 msgid "Channel numbers from"
 msgstr ""
 
-#: src/channels.c:1269 src/dvr/dvr_autorec.c:998
+#: src/channels.c:1275 src/dvr/dvr_autorec.c:999
 msgid "Channel tag"
 msgstr ""
 
-#: src/bouquet.c:942
+#: src/bouquet.c:946
 msgid "Channel tag reference"
 msgstr ""
 
-#: src/access.c:1589 src/input/mpegts/iptv/iptv_mux.c:238
+#: src/access.c:1593 src/input/mpegts/iptv/iptv_mux.c:238
 msgid "Channel tags"
 msgstr ""
 
-#: src/profile.c:1599 src/epggrab/channel.c:742
+#: src/profile.c:1603 src/epggrab/channel.c:750
 msgid "Channels"
 msgstr ""
 
-#: src/input/mpegts/mpegts_network.c:214 src/input/mpegts/mpegts_mux.c:580
-#: src/input/mpegts/mpegts_service.c:185
+#: src/input/mpegts/mpegts_network.c:214 src/input/mpegts/mpegts_mux.c:594
+#: src/input/mpegts/mpegts_service.c:200
 msgid "Character set"
 msgstr ""
 
-#: src/epg.c:2074
+#: src/service_mapper.c:498
+msgid "Check availability"
+msgstr ""
+
+#: src/epg.c:2075
 msgid "Children's / Youth programs"
 msgstr ""
 
-#: src/epg.c:2111
+#: src/epg.c:2112
 msgid "Cinema"
 msgstr ""
 
-#: src/esfilter.c:607 src/profile.c:291 src/descrambler/caclient.c:247
+#: src/esfilter.c:610 src/profile.c:293 src/descrambler/caclient.c:250
 msgid "Class"
 msgstr ""
 
-#: src/epg.c:2022
+#: src/epg.c:2023
 msgid "Classical"
 msgstr ""
 
-#: src/epg.c:2092
+#: src/epg.c:2093
 msgid "Classical music"
 msgstr ""
 
@@ -706,11 +777,11 @@ msgstr ""
 msgid "Clean effects"
 msgstr ""
 
-#: src/descrambler/caclient.c:268
+#: src/descrambler/caclient.c:271
 msgid "Client name"
 msgstr ""
 
-#: src/dvr/dvr_config.c:886
+#: src/dvr/dvr_config.c:894
 msgid "Clone scheduled entry on error"
 msgstr ""
 
@@ -718,7 +789,7 @@ msgstr ""
 msgid "Code word client (newcamd)"
 msgstr ""
 
-#: src/epg.c:2019
+#: src/epg.c:2020
 msgid "Comedy"
 msgstr ""
 
@@ -730,16 +801,16 @@ msgstr ""
 msgid "Command time (ms) (10-100)"
 msgstr ""
 
-#: src/access.c:1599 src/access.c:1833 src/access.c:1957 src/channels.c:1333
-#: 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:326 src/bouquet.c:1013
-#: src/epggrab/channel.c:760 src/dvr/dvr_db.c:2991 src/dvr/dvr_autorec.c:1175
-#: src/dvr/dvr_timerec.c:654 src/dvr/dvr_config.c:841
-#: src/descrambler/caclient.c:275
+#: src/access.c:1603 src/access.c:1848 src/access.c:1981 src/channels.c:1339
+#: src/esfilter.c:714 src/esfilter.c:806 src/esfilter.c:898 src/esfilter.c:990
+#: src/esfilter.c:1093 src/esfilter.c:1172 src/profile.c:328
+#: src/bouquet.c:1017 src/epggrab/channel.c:768 src/dvr/dvr_db.c:3052
+#: src/dvr/dvr_autorec.c:1176 src/dvr/dvr_timerec.c:655
+#: src/dvr/dvr_config.c:848 src/descrambler/caclient.c:278
 msgid "Comment"
 msgstr ""
 
-#: src/dvr/dvr_db.c:471
+#: src/dvr/dvr_db.c:484
 msgid "Commercial break"
 msgstr ""
 
@@ -747,88 +818,114 @@ msgstr ""
 msgid "Committed"
 msgstr ""
 
-#: src/dvr/dvr_db.c:498
+#: src/dvr/dvr_db.c:511
 msgid "Completed OK"
 msgstr ""
 
-#: src/descrambler/caclient.c:236
+#: src/descrambler/caclient.c:239
 msgid "Conditional access client"
 msgstr ""
 
-#: src/config.c:1914 src/profile.c:282 src/profile.c:1025 src/profile.c:1145
-#: src/profile.c:1314 src/profile.c:1569 src/epggrab/channel.c:655
+#: src/config.c:1917 src/profile.c:284 src/profile.c:1029 src/profile.c:1149
+#: src/profile.c:1318 src/profile.c:1573 src/epggrab/channel.c:663
 msgid "Configuration"
 msgstr ""
 
-#: src/input/mpegts/satip/satip.c:388
+#: src/input/mpegts/satip/satip.c:424
 msgid "Configuration ID"
 msgstr ""
 
-#: src/dvr/dvr_config.c:831
+#: src/dvr/dvr_config.c:838
 msgid "Configuration name"
 msgstr ""
 
-#: src/config.c:1949
+#: src/config.c:1952
 msgid "Configuration version"
 msgstr ""
 
-#: src/access.c:1552
+#: src/access.c:1556
 msgid "Connection limit type"
 msgstr ""
 
-#: src/input/mpegts/mpegts_mux_dvb.c:223 src/input/mpegts/mpegts_mux_dvb.c:298
+#: src/input/mpegts/mpegts_mux_dvb.c:228 src/input/mpegts/mpegts_mux_dvb.c:305
+#: src/input/mpegts/mpegts_mux_dvb.c:716
 msgid "Constellation"
 msgstr ""
 
-#: src/profile.c:1582
+#: src/profile.c:1586
 msgid "Container"
 msgstr ""
 
-#: src/input/mpegts/iptv/iptv.c:832
+#: src/input/mpegts/iptv/iptv.c:833
 msgid "Content character set"
 msgstr ""
 
-#: src/dvr/dvr_db.c:2933 src/dvr/dvr_autorec.c:1069
+#: src/input/mpegts/mpegts_service.c:174
+msgid "Content reference identifier authority."
+msgstr ""
+
+#: src/dvr/dvr_db.c:2994 src/dvr/dvr_autorec.c:1070
 msgid "Content type"
 msgstr ""
 
-#: src/epg.c:2048
+#: src/epg.c:2049
 msgid "Contest"
 msgstr ""
 
-#: src/profile.c:368
+#: src/profile.c:370
 msgid "Continue even if descrambling fails"
 msgstr ""
 
-#: src/config.c:1988
+#: src/config.c:2008
 msgid "Cookie expiration (days)"
 msgstr ""
 
-#: src/epg.c:2153
+#: src/epg.c:2154
 msgid "Cooking"
 msgstr ""
 
-#: src/profile.c:1500
+#: src/profile.c:1504
 msgid "Copy codec type"
 msgstr ""
 
-#: src/profile.c:1436
+#: src/profile.c:1440
 msgid "Copy layout"
 msgstr ""
 
-#: src/input/mpegts/iptv/iptv.c:825
+#: src/service_mapper.c:518
+msgid "Create SDTV/HDTV/Radio tags"
+msgstr ""
+
+#: src/input/mpegts/iptv/iptv.c:826
 msgid "Create bouquet"
 msgstr ""
 
-#: src/bouquet.c:934
+#: src/service_mapper.c:532
+msgid "Create network name tags"
+msgstr ""
+
+#: src/wizard.c:371
+msgid ""
+"Create networks. The T means terresterial, C is cable and S is satellite."
+msgstr ""
+
+#: src/service_mapper.c:525
+msgid "Create provider name tags"
+msgstr ""
+
+#: src/bouquet.c:938
 msgid "Create tag"
 msgstr ""
 
-#: src/input/mpegts/mpegts_service.c:215
+#: src/service_mapper.c:517
+msgid "Create type based tags"
+msgstr ""
+
+#: src/input/mpegts/mpegts_service.c:237
 msgid "Created"
 msgstr ""
 
-#: src/dvr/dvr_db.c:2824 src/dvr/dvr_autorec.c:1168 src/dvr/dvr_timerec.c:647
+#: src/dvr/dvr_db.c:2885 src/dvr/dvr_autorec.c:1169 src/dvr/dvr_timerec.c:648
 msgid "Creator"
 msgstr ""
 
@@ -836,18 +933,26 @@ msgstr ""
 msgid "Cron"
 msgstr ""
 
-#: src/epggrab.c:296
+#: src/epggrab.c:311
 msgid "Cron multi-line"
 msgstr ""
 
-#: src/epg.c:2105
+#: src/epg.c:2106
 msgid "Culture (without music)"
 msgstr ""
 
-#: src/epg.c:2031
+#: src/input/mpegts/satip/satip.c:337
+msgid "Current RTSP port."
+msgstr ""
+
+#: src/epg.c:2032
 msgid "Current affairs"
 msgstr ""
 
+#: src/input/mpegts/satip/satip.c:369
+msgid "Current tuner configuration."
+msgstr ""
+
 #: src/input/mpegts/iptv/iptv_mux.c:231
 msgid "Custom HTTP headers"
 msgstr ""
@@ -864,39 +969,35 @@ msgstr ""
 msgid "DES key"
 msgstr ""
 
-#: src/config.c:2005
+#: src/config.c:2031
 msgid "DSCP/TOS for streaming"
 msgstr ""
 
-#: src/dvr/dvr_db.c:2866
+#: src/dvr/dvr_db.c:2927
 msgid "DVB EPG ID"
 msgstr ""
 
-#: src/config.c:1932
+#: src/config.c:1935
 msgid "DVB scan files"
 msgstr ""
 
-#: src/config.c:2052
+#: src/config.c:2099
 msgid "DVB scan files path"
 msgstr ""
 
-#: src/satip/server.c:681
+#: src/satip/server.c:705
 msgid "DVB-C"
 msgstr ""
 
-#: src/input/mpegts/mpegts_network_dvb.c:220
+#: src/input/mpegts/mpegts_network_dvb.c:230
 msgid "DVB-C network"
 msgstr ""
 
-#: src/satip/server.c:688
+#: src/satip/server.c:713
 msgid "DVB-C2"
 msgstr ""
 
-#: src/satip/server.c:702
-msgid "DVB-Cable/AnnexB"
-msgstr ""
-
-#: src/satip/server.c:653
+#: src/satip/server.c:673
 msgid "DVB-S"
 msgstr ""
 
@@ -912,7 +1013,7 @@ msgstr ""
 msgid "DVB-S advanced"
 msgstr ""
 
-#: src/input/mpegts/mpegts_network_dvb.c:239
+#: src/input/mpegts/mpegts_network_dvb.c:252
 msgid "DVB-S network"
 msgstr ""
 
@@ -928,110 +1029,106 @@ msgstr ""
 msgid "DVB-S tone burst"
 msgstr ""
 
-#: src/satip/server.c:660
+#: src/satip/server.c:681
 msgid "DVB-S2"
 msgstr ""
 
-#: src/satip/server.c:667 src/input/mpegts/mpegts_mux_dvb.c:210
+#: src/satip/server.c:689
 msgid "DVB-T"
 msgstr ""
 
-#: src/input/mpegts/mpegts_network_dvb.c:201
+#: src/input/mpegts/mpegts_network_dvb.c:208
 msgid "DVB-T network"
 msgstr ""
 
-#: src/satip/server.c:674
+#: src/satip/server.c:697
 msgid "DVB-T2"
 msgstr ""
 
-#: src/input/mpegts/mpegts_mux_dvb.c:282
-msgid "DVBC_ANNEX_AC"
-msgstr ""
-
-#: src/access.c:1349
+#: src/access.c:1353
 msgid "DVR"
 msgstr ""
 
-#: src/dvr/dvr_autorec.c:948
+#: src/dvr/dvr_autorec.c:949
 msgid "DVR Auto-record entry"
 msgstr ""
 
-#: src/dvr/dvr_config.c:789
+#: src/dvr/dvr_config.c:796
 msgid "DVR behavior"
 msgstr ""
 
-#: src/dvr/dvr_db.c:2188 src/dvr/dvr_db.c:2210 src/dvr/dvr_db.c:2806
-#: src/dvr/dvr_autorec.c:1127 src/dvr/dvr_timerec.c:630
+#: src/dvr/dvr_db.c:2247 src/dvr/dvr_db.c:2271 src/dvr/dvr_db.c:2867
+#: src/dvr/dvr_autorec.c:1128 src/dvr/dvr_timerec.c:631
 msgid "DVR configuration"
 msgstr ""
 
-#: src/dvr/dvr_config.c:781
+#: src/dvr/dvr_config.c:788
 msgid "DVR configuration profile"
 msgstr ""
 
-#: src/access.c:1530
+#: src/access.c:1534
 msgid "DVR configuration profiles"
 msgstr ""
 
-#: src/dvr/dvr_db.c:2637
+#: src/dvr/dvr_db.c:2699
 msgid "DVR entry"
 msgstr ""
 
-#: src/dvr/dvr_db.c:2797 src/dvr/dvr_autorec.c:1104 src/dvr/dvr_timerec.c:621
-#: src/dvr/dvr_config.c:877
+#: src/dvr/dvr_db.c:2858 src/dvr/dvr_autorec.c:1105 src/dvr/dvr_timerec.c:622
+#: src/dvr/dvr_config.c:885
 msgid "DVR file retention period"
 msgstr ""
 
-#: src/dvr/dvr_db.c:2788 src/dvr/dvr_autorec.c:1095 src/dvr/dvr_timerec.c:612
+#: src/dvr/dvr_db.c:2849 src/dvr/dvr_autorec.c:1096 src/dvr/dvr_timerec.c:613
 msgid "DVR log retention"
 msgstr ""
 
-#: src/dvr/dvr_config.c:868
+#: src/dvr/dvr_config.c:875
 msgid "DVR log retention period"
 msgstr ""
 
-#: src/profile.c:252
+#: src/profile.c:254
 msgid "DVR override: high"
 msgstr ""
 
-#: src/profile.c:251
+#: src/profile.c:253
 msgid "DVR override: important"
 msgstr ""
 
-#: src/profile.c:254
+#: src/profile.c:256
 msgid "DVR override: low"
 msgstr ""
 
-#: src/profile.c:253
+#: src/profile.c:255
 msgid "DVR override: normal"
 msgstr ""
 
-#: src/profile.c:255
+#: src/profile.c:257
 msgid "DVR override: unimportant"
 msgstr ""
 
-#: src/dvr/dvr_timerec.c:527
+#: src/dvr/dvr_timerec.c:528
 msgid "DVR time record entry"
 msgstr ""
 
-#: src/epg.c:2090
+#: src/epg.c:2091
 msgid "Dance"
 msgstr ""
 
-#: src/dvr/dvr_db.c:2859
+#: src/dvr/dvr_db.c:2920
 msgid "Data errors"
 msgstr ""
 
-#: src/dvr/dvr_timerec.c:593
+#: src/dvr/dvr_timerec.c:594
 msgid "Days of Week"
 msgstr ""
 
-#: src/dvr/dvr_autorec.c:1043
+#: src/dvr/dvr_autorec.c:1044
 msgid "Days of week"
 msgstr ""
 
-#: src/epg.c:2035 src/epg.c:2036 src/epg.c:2037 src/epg.c:2038 src/epg.c:2039
-#: src/epg.c:2040 src/epg.c:2041 src/epg.c:2042 src/epg.c:2043 src/epg.c:2044
+#: src/epg.c:2036 src/epg.c:2037 src/epg.c:2038 src/epg.c:2039 src/epg.c:2040
+#: src/epg.c:2041 src/epg.c:2042 src/epg.c:2043 src/epg.c:2044 src/epg.c:2045
 msgid "Debate"
 msgstr ""
 
@@ -1063,20 +1160,21 @@ msgstr ""
 msgid "Debugging"
 msgstr ""
 
-#: src/access.c:1377 src/access.c:1389 src/config.c:1874 src/profile.c:308
+#: src/access.c:1381 src/access.c:1393 src/config.c:1877 src/profile.c:310
 msgid "Default"
 msgstr ""
 
-#: src/config.c:2023
+#: src/config.c:2062
 msgid "Default language(s)"
 msgstr ""
 
-#: src/profile.c:333
+#: src/profile.c:335
 msgid "Default priority"
 msgstr ""
 
-#: src/input/mpegts/mpegts_mux_dvb.c:210 src/input/mpegts/mpegts_mux_dvb.c:282
-#: src/input/mpegts/mpegts_mux_dvb.c:536 src/input/mpegts/mpegts_mux_dvb.c:645
+#: src/input/mpegts/mpegts_mux_dvb.c:214 src/input/mpegts/mpegts_mux_dvb.c:287
+#: src/input/mpegts/mpegts_mux_dvb.c:543 src/input/mpegts/mpegts_mux_dvb.c:663
+#: src/input/mpegts/mpegts_mux_dvb.c:698
 msgid "Delivery system"
 msgstr ""
 
@@ -1084,27 +1182,27 @@ msgstr ""
 msgid "Demux path"
 msgstr ""
 
-#: src/satip/server.c:620
+#: src/satip/server.c:628
 msgid "Descramble services (limit per mux)"
 msgstr ""
 
-#: src/config.c:2014
+#: src/config.c:2048
 msgid "Descrambler buffer (TS packets)"
 msgstr ""
 
-#: src/dvr/dvr_db.c:2764 src/dvr/dvr_db.c:2771
+#: src/dvr/dvr_db.c:2825 src/dvr/dvr_db.c:2832
 msgid "Description"
 msgstr ""
 
-#: src/epg.c:2016
+#: src/epg.c:2017
 msgid "Detective"
 msgstr ""
 
-#: src/input/mpegts/satip/satip.c:395
+#: src/input/mpegts/satip/satip.c:432
 msgid "Device ID"
 msgstr ""
 
-#: src/input/mpegts/tvhdhomerun/tvhdhomerun.c:170
+#: src/input/mpegts/tvhdhomerun/tvhdhomerun.c:171
 msgid "Device model"
 msgstr ""
 
@@ -1113,15 +1211,24 @@ msgstr ""
 msgid "Device path"
 msgstr ""
 
-#: src/dvr/dvr_db.c:2838 src/dvr/dvr_autorec.c:970 src/dvr/dvr_timerec.c:556
+#: src/config.c:2032
+msgid ""
+"Differentiated Services Code Point / Type of Service: Set the service class "
+"Tvheadend sends with each packet. Depending on the option selected this "
+"tells your router the prority in which to give packets sent from Tvheadend, "
+"this option does not usually need changing. See https://en.wikipedia.org/"
+"wiki/Differentiated_services for more information. "
+msgstr ""
+
+#: src/dvr/dvr_db.c:2899 src/dvr/dvr_autorec.c:971 src/dvr/dvr_timerec.c:557
 msgid "Directory"
 msgstr ""
 
-#: src/dvr/dvr_config.c:1051
+#: src/dvr/dvr_config.c:1062
 msgid "Directory permissions (octal, e.g. 0775)"
 msgstr ""
 
-#: src/input/mpegts/mpegts_mux.c:458
+#: src/input/mpegts/mpegts_mux.c:457
 msgid "Disable"
 msgstr ""
 
@@ -1141,7 +1248,7 @@ msgstr ""
 msgid "Disable debug on stderr"
 msgstr ""
 
-#: src/input/mpegts/satip/satip.c:297
+#: src/input/mpegts/satip/satip.c:318
 msgid "Disable device/firmware-specific workarounds"
 msgstr ""
 
@@ -1149,16 +1256,16 @@ msgstr ""
 msgid "Disable syslog (all messages)"
 msgstr ""
 
-#: src/channels.c:336
+#: src/channels.c:335
 msgid "Disabled"
 msgstr ""
 
-#: src/epg.c:2035 src/epg.c:2036 src/epg.c:2037 src/epg.c:2038 src/epg.c:2039
-#: src/epg.c:2040 src/epg.c:2041 src/epg.c:2042 src/epg.c:2043 src/epg.c:2044
+#: src/epg.c:2036 src/epg.c:2037 src/epg.c:2038 src/epg.c:2039 src/epg.c:2040
+#: src/epg.c:2041 src/epg.c:2042 src/epg.c:2043 src/epg.c:2044 src/epg.c:2045
 msgid "Discussion"
 msgstr ""
 
-#: src/input/mpegts/linuxdvb/linuxdvb_satconf.c:1438
+#: src/input/mpegts/linuxdvb/linuxdvb_satconf.c:1441
 msgid "DiseqC"
 msgstr ""
 
@@ -1174,11 +1281,15 @@ msgstr ""
 msgid "DiseqC switch"
 msgstr ""
 
-#: src/profile.c:1496
+#: src/profile.c:1500
 msgid "Do not use"
 msgstr ""
 
-#: src/epg.c:2034 src/epg.c:2117
+#: src/wizard.c:495
+msgid "Do the service mapping to channels."
+msgstr ""
+
+#: src/epg.c:2035 src/epg.c:2118
 msgid "Documentary"
 msgstr ""
 
@@ -1186,40 +1297,40 @@ msgstr ""
 msgid "Don't backup configuration tree at upgrade"
 msgstr ""
 
-#: src/dvr/dvr_config.c:1124
+#: src/dvr/dvr_config.c:1135
 msgid "Don't include title in filename"
 msgstr ""
 
-#: src/dvr/dvr_config.c:698
+#: src/dvr/dvr_config.c:703
 msgid "Don't keep"
 msgstr ""
 
-#: src/dvr/dvr_db.c:2880
+#: src/dvr/dvr_db.c:2941
 msgid "Don't re-record"
 msgstr ""
 
-#: src/dvr/dvr_db.c:2873
+#: src/dvr/dvr_db.c:2934
 msgid "Don't reschedule"
 msgstr ""
 
-#: src/epg.c:2015 src/epg.c:2022 src/epg.c:2023 src/epg.c:2024 src/epg.c:2025
-#: src/epg.c:2026 src/epg.c:2027 src/epg.c:2028
+#: src/epg.c:2016 src/epg.c:2023 src/epg.c:2024 src/epg.c:2025 src/epg.c:2026
+#: src/epg.c:2027 src/epg.c:2028 src/epg.c:2029
 msgid "Drama"
 msgstr ""
 
-#: src/dvr/dvr_autorec.c:1086
+#: src/dvr/dvr_autorec.c:1087
 msgid "Duplicate handling"
 msgstr ""
 
-#: src/dvr/dvr_db.c:2701
+#: src/dvr/dvr_db.c:2762
 msgid "Duration"
 msgstr ""
 
-#: src/config.c:1893
+#: src/config.c:1896
 msgid "EF"
 msgstr ""
 
-#: src/input/mpegts/mpegts_mux.c:611
+#: src/input/mpegts/mpegts_mux.c:632
 msgid "EIT - skip TSID check"
 msgstr ""
 
@@ -1231,11 +1342,11 @@ msgstr ""
 msgid "EPG grabber"
 msgstr ""
 
-#: src/epggrab/channel.c:647
+#: src/epggrab/channel.c:655
 msgid "EPG grabber channel"
 msgstr ""
 
-#: src/epggrab.c:245
+#: src/epggrab.c:243
 msgid "EPG grabber configuration"
 msgstr ""
 
@@ -1247,35 +1358,35 @@ msgstr ""
 msgid "EPG scan"
 msgstr ""
 
-#: src/epggrab.c:322
+#: src/epggrab.c:346
 msgid "EPG scan timeout in seconds (30-7200)"
 msgstr ""
 
-#: src/channels.c:408
+#: src/channels.c:407
 msgid "EPG source"
 msgstr ""
 
-#: src/dvr/dvr_config.c:930
+#: src/dvr/dvr_config.c:938
 msgid "EPG update window"
 msgstr ""
 
-#: src/epg.c:2116 src/epg.c:2118
+#: src/epg.c:2117 src/epg.c:2119
 msgid "Economics"
 msgstr ""
 
-#: src/epg.c:2132
+#: src/epg.c:2133
 msgid "Education"
 msgstr ""
 
-#: src/epg.c:2078
+#: src/epg.c:2079
 msgid "Educational"
 msgstr ""
 
-#: src/esfilter.c:595
+#: src/esfilter.c:598
 msgid "Elementary stream filter"
 msgstr ""
 
-#: src/input/mpegts/mpegts_mux.c:459
+#: src/input/mpegts/mpegts_mux.c:458
 msgid "Enable (auto)"
 msgstr ""
 
@@ -1283,7 +1394,7 @@ msgstr ""
 msgid "Enable DBus"
 msgstr ""
 
-#: src/config.c:2068
+#: src/config.c:2122
 msgid "Enable NTP driver"
 msgstr ""
 
@@ -1307,10 +1418,61 @@ msgstr ""
 msgid "Enable debug to syslog"
 msgstr ""
 
+#: src/input/mpegts/satip/satip.c:284
+msgid ""
+"Enable if the SAT>IP box requests plts=on parameter in the SETUP RTSP "
+"command for DVB-S2 muxes."
+msgstr ""
+
+#: src/input/mpegts/satip/satip.c:275
+msgid ""
+"Enable if the SAT>IP box requires pids=0 parameter in the SETUP RTSP command."
+msgstr ""
+
+#: src/input/mpegts/satip/satip.c:294
+msgid ""
+"Enable if the SAT>IP box requires pids=21 parameter in the SETUP RTSP command"
+msgstr ""
+
+#: src/input/mpegts/satip/satip.c:266
+msgid "Enable if the SAT>IP box supports the addpids/delpids commands."
+msgstr ""
+
+#: src/input/mpegts/satip/satip.c:214
+msgid "Enable or disable RTSP/TCP (embedded data) support."
+msgstr ""
+
+#: src/input/mpegts/satip/satip.c:222
+msgid "Enable or disable fast input switching."
+msgstr ""
+
+#: src/input/mpegts/satip/satip.c:230
+msgid "Enable or disable full mux mode."
+msgstr ""
+
+#: src/input/mpegts/mpegts_service.c:192
+msgid ""
+"Enable or disable ignoring of Event Information Table (EIT) data on this mux."
+msgstr ""
+
+#: src/input/mpegts/satip/satip_satconf.c:190
+msgid "Enable or disable this configuration."
+msgstr ""
+
+#: src/input/mpegts/mpegts_mux.c:498
+msgid "Enable or disable this mux."
+msgstr ""
+
 #: src/tvhlog.c:649
 msgid "Enable syslog"
 msgstr ""
 
+#: src/config.c:2112
+msgid ""
+"Enable system time updates. This will only work if the user running "
+"Tvheadend has rights to update the system clock (normally only root)."
+msgstr ""
+
 #: src/main.c:725
 msgid "Enable trace subsystems"
 msgstr ""
@@ -1319,16 +1481,16 @@ msgstr ""
 msgid "Enable web UI debug (non-minified JS)"
 msgstr ""
 
-#: src/access.c:1417 src/access.c:1805 src/access.c:1944 src/channels.c:337
-#: src/channels.c:353 src/channels.c:1278 src/service.c:161
-#: src/imagecache.c:84 src/esfilter.c:621 src/profile.c:300 src/bouquet.c:888
-#: src/epggrab/module.c:141 src/epggrab/channel.c:664 src/dvr/dvr_db.c:2647
-#: src/dvr/dvr_autorec.c:958 src/dvr/dvr_timerec.c:537
-#: src/dvr/dvr_config.c:821 src/descrambler/caclient.c:262
-#: src/input/mpegts/mpegts_input.c:229 src/input/mpegts/mpegts_mux.c:498
+#: src/access.c:1421 src/access.c:1820 src/access.c:1968 src/channels.c:336
+#: src/channels.c:352 src/channels.c:1284 src/service.c:161
+#: src/imagecache.c:84 src/esfilter.c:624 src/profile.c:302 src/bouquet.c:892
+#: src/epggrab/module.c:141 src/epggrab/channel.c:672 src/dvr/dvr_db.c:2709
+#: src/dvr/dvr_autorec.c:959 src/dvr/dvr_timerec.c:538
+#: src/dvr/dvr_config.c:828 src/descrambler/caclient.c:265
+#: src/input/mpegts/mpegts_input.c:231 src/input/mpegts/mpegts_mux.c:497
 #: src/input/mpegts/mpegts_mux_sched.c:126
-#: src/input/mpegts/linuxdvb/linuxdvb_satconf.c:1272
-#: src/input/mpegts/satip/satip_satconf.c:188 src/timeshift.c:150
+#: src/input/mpegts/linuxdvb/linuxdvb_satconf.c:1274
+#: src/input/mpegts/satip/satip_satconf.c:189 src/timeshift.c:150
 #: src/input/mpegts/linuxdvb/linuxdvb_ca.c:188
 msgid "Enabled"
 msgstr ""
@@ -1337,19 +1499,41 @@ msgstr ""
 msgid "Encrypted"
 msgstr ""
 
-#: src/htsp_server.c:803
+#: src/htsp_server.c:804
 msgid "Encrypted service"
 msgstr ""
 
-#: src/epg.c:2077
+#: src/satip/server.c:664
+msgid "Enter external IP if behind Network address translation (NAT)."
+msgstr ""
+
+#: src/input/mpegts/mpegts_mux_dvb.c:622
+msgid "Enter the Physical Layer Scrambling (PLS) code used on this mux."
+msgstr ""
+
+#: src/wizard.c:211
+msgid ""
+"Enter the access control details to secure your system. The first part of "
+"this covers the IPv4 network details for address-based access to the system; "
+"for example, 192.168.1.0/24 to allow local access only to 192.168.1.x "
+"clients, or 0.0.0.0/0 or empty value for access from any system.\n"
+"This works alongside the second part, which is a familiar username/password "
+"combination, so provide these for both an administrator and regular (day-to-"
+"day) user. You can leave the username and password blank if you don't want "
+"this part, and would prefer anonymous access to anyone.\n"
+"This wizard should be run only on the initial setup. Please, cancel it, if "
+"you are not willing to touch the current configuration."
+msgstr ""
+
+#: src/epg.c:2078
 msgid "Entertainment programs for 10 to 16"
 msgstr ""
 
-#: src/epg.c:2076
+#: src/epg.c:2077
 msgid "Entertainment programs for 6 to 14"
 msgstr ""
 
-#: src/epg.c:2133
+#: src/epg.c:2134
 msgid "Environment"
 msgstr ""
 
@@ -1357,20 +1541,20 @@ msgstr ""
 msgid "Environment (pipe)"
 msgstr ""
 
-#: src/dvr/dvr_db.c:2949
+#: src/dvr/dvr_db.c:3010
 msgid "Episode"
 msgstr ""
 
-#: src/dvr/dvr_db.c:634
+#: src/dvr/dvr_db.c:649
 #, c-format
 msgid "Episode %d"
 msgstr ""
 
-#: src/dvr/dvr_db.c:2845
+#: src/dvr/dvr_db.c:2906
 msgid "Error code"
 msgstr ""
 
-#: src/dvr/dvr_db.c:2852
+#: src/dvr/dvr_db.c:2913
 msgid "Errors"
 msgstr ""
 
@@ -1378,23 +1562,23 @@ msgstr ""
 msgid "Even key"
 msgstr ""
 
-#: src/dvr/dvr_autorec.c:777
+#: src/dvr/dvr_autorec.c:778
 msgid "Every day"
 msgstr ""
 
-#: src/access.c:1581
+#: src/access.c:1585
 msgid "Exclude channel tags"
 msgstr ""
 
-#: src/epg.c:2136
+#: src/epg.c:2137
 msgid "Expeditions"
 msgstr ""
 
-#: src/epg.c:2112
+#: src/epg.c:2113
 msgid "Experimental film"
 msgstr ""
 
-#: src/access.c:1380 src/config.c:1906
+#: src/access.c:1384 src/config.c:1909
 msgid "Expert"
 msgstr ""
 
@@ -1410,11 +1594,11 @@ msgstr ""
 msgid "External EPG grabber"
 msgstr ""
 
-#: src/satip/server.c:645
+#: src/satip/server.c:663
 msgid "External IP (NAT)"
 msgstr ""
 
-#: src/bouquet.c:957
+#: src/bouquet.c:961
 msgid "External URL"
 msgstr ""
 
@@ -1422,123 +1606,141 @@ msgstr ""
 msgid "Extra arguments"
 msgstr ""
 
-#: src/dvr/dvr_config.c:921
+#: src/dvr/dvr_config.c:929
 msgid "Extra padding after recordings (minutes)"
 msgstr ""
 
-#: src/dvr/dvr_config.c:912
+#: src/dvr/dvr_config.c:920
 msgid "Extra padding before recordings (minutes)"
 msgstr ""
 
-#: src/dvr/dvr_autorec.c:1026
+#: src/dvr/dvr_autorec.c:1027
 msgid "Extra start time"
 msgstr ""
 
-#: src/dvr/dvr_autorec.c:1034
+#: src/dvr/dvr_autorec.c:1035
 msgid "Extra stop time"
 msgstr ""
 
-#: src/dvr/dvr_config.c:903
+#: src/dvr/dvr_config.c:911
 msgid "Extra warming up time (seconds)"
 msgstr ""
 
-#: src/input/mpegts/mpegts_mux.c:390
+#: src/input/mpegts/mpegts_mux.c:389
 msgid "FAIL"
 msgstr ""
 
-#: src/input/mpegts/mpegts_mux_dvb.c:301 src/input/mpegts/mpegts_mux_dvb.c:565
+#: src/input/mpegts/mpegts_mux_dvb.c:308 src/input/mpegts/mpegts_mux_dvb.c:575
+#: src/input/mpegts/mpegts_mux_dvb.c:719
 msgid "FEC"
 msgstr ""
 
-#: src/input/mpegts/mpegts_mux_dvb.c:235
+#: src/input/mpegts/mpegts_mux_dvb.c:240
 msgid "FEC high"
 msgstr ""
 
-#: src/input/mpegts/mpegts_mux_dvb.c:238
+#: src/input/mpegts/mpegts_mux_dvb.c:243
 msgid "FEC low"
 msgstr ""
 
-#: src/epg.c:2132
+#: src/epg.c:2133
 msgid "Factual topics"
 msgstr ""
 
-#: src/access.c:1522
+#: src/subscriptions.c:930
+#, c-format
+msgid "Failed"
+msgstr ""
+
+#: src/access.c:1526
 msgid "Failed DVR"
 msgstr ""
 
-#: src/epg.c:2018
+#: src/epg.c:2019
 msgid "Fantasy"
 msgstr ""
 
-#: src/input/mpegts/satip/satip.c:220
+#: src/input/mpegts/satip/satip.c:221
 msgid "Fast input switch"
 msgstr ""
 
-#: src/dvr/dvr_db.c:494
+#: src/dvr/dvr_db.c:507
 msgid "File missing"
 msgstr ""
 
-#: src/dvr/dvr_db.c:485
+#: src/dvr/dvr_db.c:498
 msgid "File not created"
 msgstr ""
 
-#: src/dvr/dvr_config.c:1004
+#: src/dvr/dvr_config.c:1015
 msgid "File permissions (octal, e.g. 0664)"
 msgstr ""
 
-#: src/dvr/dvr_db.c:2963
+#: src/dvr/dvr_db.c:3024
 msgid "File size"
 msgstr ""
 
-#: src/dvr/dvr_db.c:2831
+#: src/dvr/dvr_db.c:2892
 msgid "Filename"
 msgstr ""
 
-#: src/dvr/dvr_config.c:1013
+#: src/dvr/dvr_config.c:1024
 msgid "Filename character set"
 msgstr ""
 
-#: src/dvr/dvr_config.c:805
+#: src/dvr/dvr_config.c:812
 msgid "Filename options"
 msgstr ""
 
-#: src/epg.c:2111
+#: src/epg.c:2112
 msgid "Film"
 msgstr ""
 
-#: src/epg.c:2107
+#: src/epg.c:2108
 msgid "Fine arts"
 msgstr ""
 
-#: src/dvr/dvr_db.c:477
+#: src/dvr/dvr_db.c:490
 msgid "Finished"
 msgstr ""
 
-#: src/epg.c:2152
+#: src/epg.c:2153
 msgid "Fitness and health"
 msgstr ""
 
-#: src/epg.c:2093
+#: src/epg.c:2094
 msgid "Folk"
 msgstr ""
 
-#: src/epg.c:2020
+#: src/epg.c:2021
 msgid "Folkloric"
 msgstr ""
 
-#: src/epg.c:2066
+#: src/epg.c:2067
 msgid "Football"
 msgstr ""
 
-#: src/input/mpegts/mpegts_mux.c:460
+#: src/input/mpegts/mpegts_mux.c:459
 msgid "Force (auto)"
 msgstr ""
 
-#: src/input/mpegts/mpegts_service.c:208
+#: src/input/mpegts/mpegts_service.c:229
 msgid "Force CA ID (e.g. 0x2600)"
 msgstr ""
 
-#: src/epggrab.c:305
+#: src/input/mpegts/satip/satip.c:326
+#: src/input/mpegts/satip/satip_frontend.c:206
+msgid ""
+"Force all network connections to this tuner to be made over the specified IP "
+"address, similar to the setting for the SAT>IP device itself. Setting this "
+"overrides the device-specific setting."
+msgstr ""
+
+#: src/epggrab.c:325
+msgid "Force an initial EPG scan at start-up."
+msgstr ""
+
+#: src/epggrab.c:324
 msgid "Force initial EPG scan at start-up"
 msgstr ""
 
@@ -1546,45 +1748,75 @@ msgstr ""
 msgid "Force old status"
 msgstr ""
 
-#: src/input/mpegts/satip/satip.c:269
+#: src/input/mpegts/satip/satip.c:283
 msgid "Force pilot for DVB-S2"
 msgstr ""
 
-#: src/profile.c:343
+#: src/profile.c:345
 msgid "Force priority"
 msgstr ""
 
-#: src/input/mpegts/satip/satip_frontend.c:174
+#: src/input/mpegts/satip/satip_frontend.c:185
 msgid "Force teardown delay"
 msgstr ""
 
-#: src/epg.c:2136
-msgid "Foreign countries"
+#: src/input/mpegts/satip/satip_frontend.c:186
+msgid ""
+"Force the delay between RTSP TEARDOWN and RTSP SETUP command (value from "
+"'Next tune delay in ms' is used). Some devices are not able to handle quick "
+"continuous tuning."
 msgstr ""
 
-#: src/dvr/dvr_db.c:2201 src/dvr/dvr_db.c:2223 src/dvr/dvr_config.c:721
-#: src/dvr/dvr_config.c:744
-msgid "Forever"
+#: src/input/mpegts/satip/satip_frontend.c:155
+msgid ""
+"Force the local UDP Port number here. The number should be even (RTP port). "
+"The next odd number (+1) will be used as the RTCP port."
 msgstr ""
 
-#: src/main.c:670
-msgid "Fork and run as daemon"
+#: src/input/mpegts/mpegts_service.c:230
+msgid "Force usage of entered CA ID on this service."
 msgstr ""
 
-#: src/dvr/dvr_config.c:1042
-msgid "Format string"
+#: src/epg.c:2137
+msgid "Foreign countries"
+msgstr ""
+
+#: src/dvr/dvr_db.c:2262 src/dvr/dvr_db.c:2286 src/dvr/dvr_config.c:728
+#: src/dvr/dvr_config.c:751
+msgid "Forever"
+msgstr ""
+
+#: src/main.c:670
+msgid "Fork and run as daemon"
+msgstr ""
+
+#: src/dvr/dvr_config.c:1053
+msgid "Format string"
+msgstr ""
+
+#: src/wizard.c:468
+msgid "Found muxes"
+msgstr ""
+
+#: src/wizard.c:475
+msgid "Found services"
 msgstr ""
 
-#: src/input/mpegts/mpegts_input.c:283
-msgid "Free weight"
+#: src/input/mpegts/mpegts_input.c:285
+msgid "Free subscription weight"
+msgstr ""
+
+#: src/esfilter.c:715 src/esfilter.c:807 src/esfilter.c:899 src/esfilter.c:991
+#: src/esfilter.c:1094 src/esfilter.c:1173
+msgid "Free-format text field. Enter whatever you like here."
 msgstr ""
 
 #: src/input/mpegts/linuxdvb/linuxdvb_en50494.c:133
 msgid "Frequency"
 msgstr ""
 
-#: src/input/mpegts/mpegts_mux_dvb.c:215 src/input/mpegts/mpegts_mux_dvb.c:287
-#: src/input/mpegts/mpegts_mux_dvb.c:650
+#: src/input/mpegts/mpegts_mux_dvb.c:219 src/input/mpegts/mpegts_mux_dvb.c:292
+#: src/input/mpegts/mpegts_mux_dvb.c:668 src/input/mpegts/mpegts_mux_dvb.c:703
 msgid "Frequency (Hz)"
 msgstr ""
 
@@ -1592,16 +1824,16 @@ msgstr ""
 msgid "Frequency (MHz)"
 msgstr ""
 
-#: src/input/mpegts/mpegts_mux_dvb.c:541
+#: src/input/mpegts/mpegts_mux_dvb.c:548
 msgid "Frequency (kHz)"
 msgstr ""
 
-#: src/dvr/dvr_autorec.c:759
+#: src/dvr/dvr_autorec.c:760
 msgid "Fri"
 msgstr ""
 
-#: src/input/mpegts/satip/satip.c:325
-#: src/input/mpegts/tvhdhomerun/tvhdhomerun.c:163
+#: src/input/mpegts/satip/satip.c:352
+#: src/input/mpegts/tvhdhomerun/tvhdhomerun.c:164
 msgid "Friendly name"
 msgstr ""
 
@@ -1619,19 +1851,19 @@ msgstr ""
 msgid "Full DiseqC"
 msgstr ""
 
-#: src/input/mpegts/satip/satip.c:227
+#: src/input/mpegts/satip/satip.c:229
 msgid "Full mux RX mode supported"
 msgstr ""
 
-#: src/dvr/dvr_config.c:797
+#: src/dvr/dvr_config.c:804
 msgid "Full pathname specification"
 msgstr ""
 
-#: src/dvr/dvr_autorec.c:983
+#: src/dvr/dvr_autorec.c:984
 msgid "Full-text"
 msgstr ""
 
-#: src/epg.c:2138
+#: src/epg.c:2139
 msgid "Further education"
 msgstr ""
 
@@ -1647,12 +1879,12 @@ msgstr ""
 msgid "GOTOX rotor"
 msgstr ""
 
-#: src/epg.c:2047 src/epg.c:2048
+#: src/epg.c:2048 src/epg.c:2049
 msgid "Game show"
 msgstr ""
 
-#: src/epg.c:2155 src/epg.c:2156 src/epg.c:2157 src/epg.c:2158 src/epg.c:2159
-#: src/epg.c:2160 src/epg.c:2161
+#: src/epg.c:2156 src/epg.c:2157 src/epg.c:2158 src/epg.c:2159 src/epg.c:2160
+#: src/epg.c:2161 src/epg.c:2162
 msgid "Gardening"
 msgstr ""
 
@@ -1660,7 +1892,7 @@ msgstr ""
 msgid "General"
 msgstr ""
 
-#: src/epggrab.c:251
+#: src/epggrab.c:249
 msgid "General configuration"
 msgstr ""
 
@@ -1673,16 +1905,20 @@ msgstr ""
 msgid "Generic options"
 msgstr ""
 
-#: src/input/mpegts/mpegts_mux_dvb.c:229
+#: src/input/mpegts/mpegts_mux_dvb.c:234
 msgid "Guard interval"
 msgstr ""
 
-#: src/profile.c:266
+#: src/profile.c:268
 msgid "HD: high definition"
 msgstr ""
 
+#: src/input/mpegts/tvhdhomerun/tvhdhomerun_frontend.c:590
+msgid "HDHomeRun ATSC-C frontend"
+msgstr ""
+
 #: src/input/mpegts/tvhdhomerun/tvhdhomerun_frontend.c:580
-msgid "HDHomeRun ATSC frontend"
+msgid "HDHomeRun ATSC-T frontend"
 msgstr ""
 
 #: src/input/mpegts/tvhdhomerun/tvhdhomerun_frontend.c:542
@@ -1697,27 +1933,34 @@ msgstr ""
 msgid "HDHomeRun DVB-T frontend"
 msgstr ""
 
-#: src/access.c:1504
+#: src/access.c:1508
 msgid "HTSP DVR"
 msgstr ""
 
-#: src/profile.c:1935
+#: src/profile.c:1939
 msgid "HTSP Default Stream Settings"
 msgstr ""
 
-#: src/profile.c:949
+#: src/profile.c:953
 msgid "HTSP stream profile"
 msgstr ""
 
-#: src/access.c:1481
+#: src/access.c:1485
 msgid "HTSP streaming"
 msgstr ""
 
-#: src/config.c:1996
+#: src/config.c:2018
 msgid "HTTP CORS origin"
 msgstr ""
 
-#: src/epg.c:2150
+#: src/config.c:2019
+msgid ""
+"HTTP Cross-origin resource sharing origin. This option is usually set when "
+"Tvheadend is behind a proxy. Enter a domain (or IP) to allow cross-domain "
+"requests."
+msgstr ""
+
+#: src/epg.c:2151
 msgid "Handicraft"
 msgstr ""
 
@@ -1725,11 +1968,11 @@ msgstr ""
 msgid "Hearing impaired"
 msgstr ""
 
-#: src/input/mpegts/mpegts_mux_dvb.c:232
+#: src/input/mpegts/mpegts_mux_dvb.c:237
 msgid "Hierarchy"
 msgstr ""
 
-#: src/profile.c:247 src/dvr/dvr_db.c:2176
+#: src/profile.c:249 src/dvr/dvr_db.c:2235
 msgid "High"
 msgstr ""
 
@@ -1737,11 +1980,11 @@ msgstr ""
 msgid "High bitrate mode (CI+ CAMs only)"
 msgstr ""
 
-#: src/epg.c:2022
+#: src/epg.c:2023
 msgid "Historical movie"
 msgstr ""
 
-#: src/epg.c:2018
+#: src/epg.c:2019
 msgid "Horror"
 msgstr ""
 
@@ -1749,20 +1992,30 @@ msgstr ""
 msgid "Hostname/IP"
 msgstr ""
 
-#: src/epggrab/channel.c:704
+#: src/imagecache.c:111
+msgid ""
+"How frequently it will re-try fetching an image that has failed to be "
+"fetched."
+msgstr ""
+
+#: src/imagecache.c:103
+msgid "How frequently the upstream provider is checked for changes."
+msgstr ""
+
+#: src/epggrab/channel.c:712
 msgid "ID"
 msgstr ""
 
-#: src/input/mpegts/mpegts_mux.c:381
+#: src/input/mpegts/mpegts_mux.c:380
 msgid "IDLE"
 msgstr ""
 
-#: src/input/mpegts/satip/satip.c:304
-#: src/input/mpegts/tvhdhomerun/tvhdhomerun.c:149
+#: src/input/mpegts/satip/satip.c:325
+#: src/input/mpegts/tvhdhomerun/tvhdhomerun.c:150
 msgid "IP address"
 msgstr ""
 
-#: src/access.c:1905 src/access.c:1934
+#: src/access.c:1928 src/access.c:1958
 msgid "IP blocking"
 msgstr ""
 
@@ -1774,7 +2027,7 @@ msgstr ""
 msgid "IPTV Multiplex"
 msgstr ""
 
-#: src/input/mpegts/iptv/iptv.c:811
+#: src/input/mpegts/iptv/iptv.c:812
 msgid "IPTV automatic network"
 msgstr ""
 
@@ -1782,31 +2035,31 @@ msgstr ""
 msgid "IPTV input"
 msgstr ""
 
-#: src/input/mpegts/iptv/iptv.c:697
+#: src/input/mpegts/iptv/iptv.c:698
 msgid "IPTV network"
 msgstr ""
 
-#: src/input/mpegts/mpegts_mux_dvb.c:588
+#: src/input/mpegts/mpegts_mux_dvb.c:602
 msgid "ISI (Stream ID)"
 msgstr ""
 
-#: src/epggrab/channel.c:734
+#: src/epggrab/channel.c:742
 msgid "Icon"
 msgstr ""
 
-#: src/channels.c:1311
+#: src/channels.c:1317
 msgid "Icon (full URL)"
 msgstr ""
 
-#: src/channels.c:393 src/channels.c:1319 src/input/mpegts/iptv/iptv_mux.c:194
+#: src/channels.c:392 src/channels.c:1325 src/input/mpegts/iptv/iptv_mux.c:194
 msgid "Icon URL"
 msgstr ""
 
-#: src/input/mpegts/iptv/iptv.c:757
+#: src/input/mpegts/iptv/iptv.c:758
 msgid "Icon base URL"
 msgstr ""
 
-#: src/channels.c:1326
+#: src/channels.c:1332
 msgid "Icon has title"
 msgstr ""
 
@@ -1814,11 +2067,11 @@ msgstr ""
 msgid "Icons from"
 msgstr ""
 
-#: src/subscriptions.c:893
+#: src/subscriptions.c:892
 msgid "Idle"
 msgstr ""
 
-#: src/input/mpegts/mpegts_input.c:275
+#: src/input/mpegts/mpegts_input.c:277
 msgid "Idle scan"
 msgstr ""
 
@@ -1826,6 +2079,12 @@ msgstr ""
 msgid "Idle scan muxes"
 msgstr ""
 
+#: src/config.c:2147
+msgid ""
+"If both a picon and a channel-specific (e.g. channelname.jpg) icon are "
+"defined, use the picon."
+msgstr ""
+
 #: src/main.c:674
 msgid ""
 "If no user account exists then create one with\n"
@@ -1835,22 +2094,35 @@ msgid ""
 "the access control from within the Tvheadend web interface."
 msgstr ""
 
+#: src/input/mpegts/mpegts_input.c:286
+msgid ""
+"If the subscription weight for this input is bellow the specified threshold, "
+"the tuner is handled as free (according the priority settings). Otherwise, a "
+"next tuner (without any subscriptions) is used. Set this value to 10, if you "
+"are willing to override scan and epggrab subscriptions."
+msgstr ""
+
 #: src/webui/extjs.c:233
 msgid "If you'd like to support the project, please consider a donation."
 msgstr ""
 
-#: src/input/mpegts/mpegts_service.c:178
+#: src/input/mpegts/mpegts_service.c:191
 msgid "Ignore EPG (EIT)"
 msgstr ""
 
-#: src/input/mpegts/mpegts_mux.c:480
+#: src/input/mpegts/mpegts_mux.c:479
 msgid "Ignore descriptor 5"
 msgstr ""
 
-#: src/imagecache.c:90
+#: src/imagecache.c:94
 msgid "Ignore invalid SSL certificate"
 msgstr ""
 
+#: src/imagecache.c:95
+msgid ""
+"Ignore invalid/unverifiable (expired, self-certified, etc.) certificates"
+msgstr ""
+
 #: src/input/mpegts/mpegts_network.c:197
 msgid "Ignore provider's channel numbers"
 msgstr ""
@@ -1863,46 +2135,62 @@ msgstr ""
 msgid "Immediately abort"
 msgstr ""
 
-#: src/profile.c:246 src/dvr/dvr_db.c:2175
+#: src/profile.c:248 src/dvr/dvr_db.c:2234
 msgid "Important"
 msgstr ""
 
-#: src/dvr/dvr_config.c:1084
+#: src/dvr/dvr_config.c:1095
 msgid "Include channel name in filename"
 msgstr ""
 
-#: src/dvr/dvr_config.c:1092
+#: src/dvr/dvr_config.c:1103
 msgid "Include date in filename"
 msgstr ""
 
-#: src/dvr/dvr_config.c:1108
+#: src/dvr/dvr_config.c:1119
 msgid "Include episode in filename"
 msgstr ""
 
-#: src/dvr/dvr_config.c:1116
+#: src/dvr/dvr_config.c:1127
 msgid "Include subtitle in filename"
 msgstr ""
 
-#: src/dvr/dvr_config.c:1100
+#: src/dvr/dvr_config.c:1111
 msgid "Include time in filename"
 msgstr ""
 
-#: src/access.c:1410 src/esfilter.c:614 src/descrambler/caclient.c:255
+#: src/access.c:1414 src/esfilter.c:617 src/descrambler/caclient.c:258
 msgid "Index"
 msgstr ""
 
-#: src/config.c:2034
+#: src/config.c:2077
 msgid "Information area"
 msgstr ""
 
-#: src/epg.c:2078
+#: src/epg.c:2079
 msgid "Informational"
 msgstr ""
 
-#: src/input/mpegts/mpegts_input.c:267
+#: src/input/mpegts/mpegts_input.c:269
 msgid "Initial scan"
 msgstr ""
 
+#: src/wizard.c:447
+msgid "Input / tuner settings"
+msgstr ""
+
+#: src/wizard.c:423
+msgid "Input 1 network"
+msgstr ""
+
+#: src/wizard.c:430
+msgid "Input 2 network"
+msgstr ""
+
+#: src/wizard.c:437
+msgid "Input 3 network"
+msgstr ""
+
 #: src/input.c:29
 msgid "Input base"
 msgstr ""
@@ -1923,7 +2211,7 @@ msgstr ""
 msgid "Interface"
 msgstr ""
 
-#: src/channels.c:1297 src/epggrab/module.c:58
+#: src/channels.c:1303 src/epggrab/module.c:58
 msgid "Internal"
 msgstr ""
 
@@ -1931,16 +2219,16 @@ msgstr ""
 msgid "Internal EPG grabber"
 msgstr ""
 
-#: src/epggrab.c:255
+#: src/epggrab.c:253
 msgid "Internal grabber"
 msgstr ""
 
-#: src/epg.c:2035 src/epg.c:2036 src/epg.c:2037 src/epg.c:2038 src/epg.c:2039
-#: src/epg.c:2040 src/epg.c:2041 src/epg.c:2042 src/epg.c:2043 src/epg.c:2044
+#: src/epg.c:2036 src/epg.c:2037 src/epg.c:2038 src/epg.c:2039 src/epg.c:2040
+#: src/epg.c:2041 src/epg.c:2042 src/epg.c:2043 src/epg.c:2044 src/epg.c:2045
 msgid "Interview"
 msgstr ""
 
-#: src/dvr/dvr_db.c:479 src/dvr/dvr_db.c:506 src/dvr/dvr_timerec.c:433
+#: src/dvr/dvr_db.c:492 src/dvr/dvr_db.c:519 src/dvr/dvr_timerec.c:435
 msgid "Invalid"
 msgstr ""
 
@@ -1953,7 +2241,7 @@ msgstr ""
 msgid "Invalid target"
 msgstr ""
 
-#: src/epg.c:2094
+#: src/epg.c:2095
 msgid "Jazz"
 msgstr ""
 
@@ -1977,50 +2265,58 @@ msgstr ""
 msgid "LNB"
 msgstr ""
 
-#: src/input/mpegts/linuxdvb/linuxdvb_satconf.c:1303
+#: src/input/mpegts/linuxdvb/linuxdvb_satconf.c:1305
 msgid "LNB type"
 msgstr ""
 
-#: src/access.c:1453 src/esfilter.c:646 src/esfilter.c:713 src/esfilter.c:780
-#: src/esfilter.c:847 src/esfilter.c:989 src/profile.c:1609
+#: src/access.c:1457 src/esfilter.c:651 src/esfilter.c:743 src/esfilter.c:835
+#: src/esfilter.c:927 src/esfilter.c:1122 src/profile.c:1613
 msgid "Language"
 msgstr ""
 
-#: src/config.c:1924
+#: src/config.c:1927
 msgid "Language settings"
 msgstr ""
 
-#: src/epg.c:2139 src/epg.c:2140 src/epg.c:2141 src/epg.c:2142 src/epg.c:2143
-#: src/epg.c:2144 src/epg.c:2145
+#: src/epg.c:2140 src/epg.c:2141 src/epg.c:2142 src/epg.c:2143 src/epg.c:2144
+#: src/epg.c:2145 src/epg.c:2146
 msgid "Languages"
 msgstr ""
 
-#: src/input/mpegts/mpegts_service.c:222
+#: src/input/mpegts/mpegts_service.c:245
 msgid "Last seen"
 msgstr ""
 
-#: src/config.c:1957
+#: src/config.c:1961
 msgid "Last updated from"
 msgstr ""
 
-#: src/epg.c:2148
+#: src/epg.c:2149
 msgid "Leisure hobbies"
 msgstr ""
 
-#: src/access.c:1560
+#: src/access.c:1564
 msgid "Limit connections"
 msgstr ""
 
-#: src/input/mpegts/mpegts_input.c:301
+#: src/input/mpegts/mpegts_input.c:309
 msgid "Linked input"
 msgstr ""
 
-#: src/input/mpegts/linuxdvb/linuxdvb_frontend.c:285
-msgid "Linux ATSC frontend"
+#: src/input/mpegts/linuxdvb/linuxdvb_frontend.c:296
+msgid "Linux ATSC-C frontend"
+msgstr ""
+
+#: src/input/mpegts/mpegts_mux_dvb.c:695
+msgid "Linux ATSC-C multiplex"
+msgstr ""
+
+#: src/input/mpegts/linuxdvb/linuxdvb_frontend.c:286
+msgid "Linux ATSC-T frontend"
 msgstr ""
 
-#: src/input/mpegts/mpegts_mux_dvb.c:642
-msgid "Linux ATSC multiplex"
+#: src/input/mpegts/mpegts_mux_dvb.c:660
+msgid "Linux ATSC-T multiplex"
 msgstr ""
 
 #: src/input/mpegts/linuxdvb/linuxdvb_ca.c:181
@@ -2031,27 +2327,27 @@ msgstr ""
 msgid "Linux DVB frontend"
 msgstr ""
 
-#: src/input/mpegts/mpegts_mux_dvb.c:135
+#: src/input/mpegts/mpegts_mux_dvb.c:139
 msgid "Linux DVB multiplex"
 msgstr ""
 
-#: src/input/mpegts/linuxdvb/linuxdvb_frontend.c:275
+#: src/input/mpegts/linuxdvb/linuxdvb_frontend.c:276
 msgid "Linux DVB-C frontend"
 msgstr ""
 
-#: src/input/mpegts/mpegts_mux_dvb.c:279
+#: src/input/mpegts/mpegts_mux_dvb.c:284
 msgid "Linux DVB-C multiplex"
 msgstr ""
 
-#: src/input/mpegts/linuxdvb/linuxdvb_frontend.c:222
+#: src/input/mpegts/linuxdvb/linuxdvb_frontend.c:223
 msgid "Linux DVB-S frontend"
 msgstr ""
 
-#: src/input/mpegts/mpegts_mux_dvb.c:533
+#: src/input/mpegts/mpegts_mux_dvb.c:540
 msgid "Linux DVB-S multiplex"
 msgstr ""
 
-#: src/input/mpegts/linuxdvb/linuxdvb_frontend.c:254
+#: src/input/mpegts/linuxdvb/linuxdvb_frontend.c:255
 msgid "Linux DVB-S slave frontend"
 msgstr ""
 
@@ -2059,7 +2355,7 @@ msgstr ""
 msgid "Linux DVB-T frontend"
 msgstr ""
 
-#: src/input/mpegts/mpegts_mux_dvb.c:207
+#: src/input/mpegts/mpegts_mux_dvb.c:211
 msgid "Linux DVB-T multiplex"
 msgstr ""
 
@@ -2067,7 +2363,7 @@ msgstr ""
 msgid "LinuxDVB adapter"
 msgstr ""
 
-#: src/input/mpegts/mpegts_network_dvb.c:190
+#: src/input/mpegts/mpegts_network_dvb.c:197
 msgid "LinuxDVB network"
 msgstr ""
 
@@ -2079,64 +2375,68 @@ msgstr ""
 msgid "Listen on IPv6"
 msgstr ""
 
-#: src/epg.c:2110
+#: src/epg.c:2111
 msgid "Literature"
 msgstr ""
 
-#: src/input/mpegts/satip/satip.c:283
+#: src/input/mpegts/satip/satip.c:302
 msgid "Local bind IP address"
 msgstr ""
 
-#: src/input/mpegts/mpegts_service.c:129
+#: src/input/mpegts/mpegts_service.c:133
 msgid "Local channel minor"
 msgstr ""
 
-#: src/input/mpegts/mpegts_service.c:122
+#: src/input/mpegts/mpegts_service.c:125
 msgid "Local channel number"
 msgstr ""
 
-#: src/input/mpegts/satip/satip.c:423
+#: src/input/mpegts/satip/satip.c:464
 msgid "Local discovery IP address"
 msgstr ""
 
-#: src/input/mpegts/satip/satip.c:409
+#: src/input/mpegts/satip/satip.c:448
 msgid "Location"
 msgstr ""
 
-#: src/input/mpegts/mpegts_service.c:200
+#: src/input/mpegts/satip/satip.c:449
+msgid "Location details of the SAT>IP Server."
+msgstr ""
+
+#: src/input/mpegts/mpegts_service.c:218
 msgid "Lock preferred CA PID"
 msgstr ""
 
-#: src/esfilter.c:682 src/esfilter.c:749 src/esfilter.c:816 src/esfilter.c:883
-#: src/esfilter.c:958 src/esfilter.c:1019
+#: src/esfilter.c:705 src/esfilter.c:797 src/esfilter.c:889 src/esfilter.c:981
+#: src/esfilter.c:1084 src/esfilter.c:1163
 msgid "Log"
 msgstr ""
 
-#: src/config.c:1864
+#: src/config.c:1867
 msgid "Login/Logout"
 msgstr ""
 
-#: src/profile.c:249 src/dvr/dvr_db.c:2178
+#: src/profile.c:251 src/dvr/dvr_db.c:2237
 msgid "Low"
 msgstr ""
 
-#: src/profile.c:1425
+#: src/profile.c:1429
 msgid "MPEG-PS (DVD)/av-lib"
 msgstr ""
 
-#: src/profile.c:1899
+#: src/profile.c:1903
 msgid "MPEG-TS Pass-thru"
 msgstr ""
 
-#: src/profile.c:1022
+#: src/profile.c:1026
 msgid "MPEG-TS Pass-thru/built-in"
 msgstr ""
 
-#: src/input/mpegts/mpegts_input.c:221
+#: src/input/mpegts/mpegts_input.c:223
 msgid "MPEG-TS input"
 msgstr ""
 
-#: src/input/mpegts/mpegts_mux.c:488
+#: src/input/mpegts/mpegts_mux.c:487
 msgid "MPEG-TS multiplex"
 msgstr ""
 
@@ -2148,103 +2448,123 @@ msgstr ""
 msgid "MPEG-TS network"
 msgstr ""
 
-#: src/input/mpegts/mpegts_service.c:812
+#: src/input/mpegts/mpegts_service.c:849
 msgid "MPEG-TS raw service"
 msgstr ""
 
-#: src/input/mpegts/mpegts_service.c:88
+#: src/input/mpegts/mpegts_service.c:87
 msgid "MPEG-TS service"
 msgstr ""
 
-#: src/profile.c:1240 src/profile.c:1424
+#: src/profile.c:1244 src/profile.c:1428
 msgid "MPEG-TS/av-lib"
 msgstr ""
 
-#: src/epg.c:2117
+#: src/epg.c:2118
 msgid "Magazines"
 msgstr ""
 
-#: src/dvr/dvr_config.c:988
-msgid "Maintain free storage space (MiB)"
+#: src/dvr/dvr_config.c:997
+msgid "Maintain free storage space in MiB"
 msgstr ""
 
-#: src/dvr/dvr_config.c:996
-msgid "Maintain used storage space (MiB)"
+#: src/dvr/dvr_config.c:1006
+msgid "Maintain used storage space in MiB (0=disabled)"
 msgstr ""
 
-#: src/dvr/dvr_db.c:2222 src/dvr/dvr_config.c:720
+#: src/dvr/dvr_db.c:2285 src/dvr/dvr_config.c:727
 msgid "Maintained space"
 msgstr ""
 
-#: src/dvr/dvr_config.c:1068
+#: src/dvr/dvr_config.c:1079
 msgid "Make subdirectories per channel"
 msgstr ""
 
-#: src/dvr/dvr_config.c:1060
+#: src/dvr/dvr_config.c:1071
 msgid "Make subdirectories per day"
 msgstr ""
 
-#: src/dvr/dvr_config.c:1076
+#: src/dvr/dvr_config.c:1087
 msgid "Make subdirectories per title"
 msgstr ""
 
-#: src/input/mpegts/satip/satip.c:346
+#: src/input/mpegts/satip/satip.c:376
 msgid "Manufacturer"
 msgstr ""
 
-#: src/input/mpegts/satip/satip.c:353
+#: src/input/mpegts/satip/satip.c:384
 msgid "Manufacturer URL"
 msgstr ""
 
-#: src/bouquet.c:926
+#: src/input/mpegts/satip/satip.c:409
+msgid "Manufacturer's model number."
+msgstr ""
+
+#: src/input/mpegts/satip/satip.c:393
+msgid "Manufacturer's product description."
+msgstr ""
+
+#: src/input/mpegts/satip/satip.c:385
+msgid "Manufacturer's product information page for the device."
+msgstr ""
+
+#: src/input/mpegts/satip/satip.c:401
+msgid "Manufacturer's product name."
+msgstr ""
+
+#: src/service_mapper.c:505
+msgid "Map encrypted services"
+msgstr ""
+
+#: src/bouquet.c:930
 msgid "Map radio channels"
 msgstr ""
 
-#: src/bouquet.c:918
+#: src/bouquet.c:922
 msgid "Map unnamed channels"
 msgstr ""
 
-#: src/bouquet.c:910
+#: src/bouquet.c:914
 msgid "Map zero-numbered channels"
 msgstr ""
 
-#: src/input/mpegts/linuxdvb/linuxdvb_frontend.c:238
-#: src/input/mpegts/linuxdvb/linuxdvb_frontend.c:259
-#: src/input/mpegts/satip/satip_frontend.c:300
-#: src/input/mpegts/satip/satip_frontend.c:322
+#: src/input/mpegts/linuxdvb/linuxdvb_frontend.c:239
+#: src/input/mpegts/linuxdvb/linuxdvb_frontend.c:260
+#: src/input/mpegts/satip/satip_frontend.c:325
+#: src/input/mpegts/satip/satip_frontend.c:357
 msgid "Master tuner"
 msgstr ""
 
-#: src/profile.c:1919
+#: src/profile.c:1923
 msgid "Matroska"
 msgstr ""
 
-#: src/profile.c:1426
+#: src/profile.c:1430
 msgid "Matroska (mkv)/av-lib"
 msgstr ""
 
-#: src/profile.c:1142 src/profile.c:1422
+#: src/profile.c:1146 src/profile.c:1426
 msgid "Matroska (mkv)/built-in"
 msgstr ""
 
-#: src/profile.c:1149 src/profile.c:1318
+#: src/profile.c:1153 src/profile.c:1322
 msgid "Matroska specific"
 msgstr ""
 
-#: src/profile.c:1311
+#: src/profile.c:1315
 msgid "Matroska/av-lib"
 msgstr ""
 
-#: src/access.c:1575
+#: src/access.c:1579
 msgid "Maximal channel number"
 msgstr ""
 
-#: src/input/mpegts/iptv/iptv.c:735
+#: src/input/mpegts/iptv/iptv.c:736
 msgid "Maximum # input streams"
 msgstr ""
 
 #: src/input/mpegts/linuxdvb/linuxdvb_frontend.c:92
-#: src/input/mpegts/satip/satip.c:241
+#: src/input/mpegts/satip/satip.c:247
 msgid "Maximum PIDs"
 msgstr ""
 
@@ -2252,19 +2572,24 @@ msgstr ""
 msgid "Maximum RAM size (MB)"
 msgstr ""
 
-#: src/input/mpegts/iptv/iptv.c:742
+#: src/input/mpegts/iptv/iptv.c:743
 msgid "Maximum bandwidth (Kbps)"
 msgstr ""
 
-#: src/dvr/dvr_autorec.c:1113
+#: src/dvr/dvr_autorec.c:1114
 msgid "Maximum count (0=default)"
 msgstr ""
 
-#: src/dvr/dvr_autorec.c:1061
+#: src/dvr/dvr_autorec.c:1062
 msgid "Maximum duration"
 msgstr ""
 
-#: src/input/mpegts/satip/satip.c:248
+#: src/input/mpegts/satip/satip.c:257
+msgid ""
+"Maximum length in characters for the command setting PIDs to the SAT>IP box."
+msgstr ""
+
+#: src/input/mpegts/satip/satip.c:256
 msgid "Maximum length of PIDs"
 msgstr ""
 
@@ -2272,7 +2597,7 @@ msgstr ""
 msgid "Maximum period (mins)"
 msgstr ""
 
-#: src/dvr/dvr_autorec.c:1120
+#: src/dvr/dvr_autorec.c:1121
 msgid "Maximum schedules limit (0=default)"
 msgstr ""
 
@@ -2280,23 +2605,27 @@ msgstr ""
 msgid "Maximum size (MB)"
 msgstr ""
 
-#: src/input/mpegts/iptv/iptv.c:749
+#: src/input/mpegts/iptv/iptv.c:750
 msgid "Maximum timeout (seconds)"
 msgstr ""
 
-#: src/epg.c:2135
+#: src/epg.c:2136
 msgid "Medicine"
 msgstr ""
 
-#: src/epg.c:2020
+#: src/epg.c:2021
 msgid "Melodrama"
 msgstr ""
 
-#: src/access.c:1568
+#: src/service_mapper.c:511
+msgid "Merge same name"
+msgstr ""
+
+#: src/access.c:1572
 msgid "Minimal channel number"
 msgstr ""
 
-#: src/dvr/dvr_autorec.c:1053
+#: src/dvr/dvr_autorec.c:1054
 msgid "Minimum duration"
 msgstr ""
 
@@ -2312,35 +2641,35 @@ msgstr ""
 msgid "Mode"
 msgstr ""
 
-#: src/input/mpegts/satip/satip.c:360
+#: src/input/mpegts/satip/satip.c:392
 msgid "Model description"
 msgstr ""
 
-#: src/input/mpegts/satip/satip.c:367
+#: src/input/mpegts/satip/satip.c:400
 msgid "Model name"
 msgstr ""
 
-#: src/input/mpegts/satip/satip.c:374
+#: src/input/mpegts/satip/satip.c:408
 msgid "Model number"
 msgstr ""
 
-#: src/input/mpegts/mpegts_mux_dvb.c:558 src/input/mpegts/mpegts_mux_dvb.c:655
+#: src/input/mpegts/mpegts_mux_dvb.c:567 src/input/mpegts/mpegts_mux_dvb.c:674
 msgid "Modulation"
 msgstr ""
 
-#: src/epggrab/channel.c:680
+#: src/epggrab/channel.c:688
 msgid "Module"
 msgstr ""
 
-#: src/epggrab/channel.c:671
+#: src/epggrab/channel.c:679
 msgid "Module ID"
 msgstr ""
 
-#: src/dvr/dvr_autorec.c:755
+#: src/dvr/dvr_autorec.c:756
 msgid "Mon"
 msgstr ""
 
-#: src/profile.c:1437
+#: src/profile.c:1441
 msgid "Mono"
 msgstr ""
 
@@ -2352,24 +2681,38 @@ msgstr ""
 msgid "Motor rate (milliseconds/deg)"
 msgstr ""
 
-#: src/epg.c:2070
+#: src/epg.c:2071
 msgid "Motor sport"
 msgstr ""
 
-#: src/epg.c:2151
+#: src/epg.c:2152
 msgid "Motoring"
 msgstr ""
 
-#: src/epg.c:2015
+#: src/epg.c:2016
 msgid "Movie"
 msgstr ""
 
-#: src/epg.c:2090
+#: src/epggrab.c:334
+msgid ""
+"Multiple lines of the cron time specification. The default cron triggers the "
+"Over-the-air grabber daily at 02:04 and 14:04. See Help on how to define "
+"your own."
+msgstr ""
+
+#: src/epggrab.c:312
+msgid ""
+"Multiple lines of the cron time specification. The default cron triggers the "
+"internal grabbers daily at 12:04 and 00:04. See Help on how to define your "
+"own."
+msgstr ""
+
+#: src/epg.c:2091
 msgid "Music"
 msgstr ""
 
-#: src/epg.c:2095 src/epg.c:2096 src/epg.c:2097 src/epg.c:2098 src/epg.c:2099
-#: src/epg.c:2100 src/epg.c:2101 src/epg.c:2102
+#: src/epg.c:2096 src/epg.c:2097 src/epg.c:2098 src/epg.c:2099 src/epg.c:2100
+#: src/epg.c:2101 src/epg.c:2102 src/epg.c:2103
 msgid "Musical"
 msgstr ""
 
@@ -2378,11 +2721,11 @@ msgstr ""
 msgid "Mux"
 msgstr ""
 
-#: src/input/mpegts/mpegts_service.c:108
+#: src/input/mpegts/mpegts_service.c:109
 msgid "Mux UUID"
 msgstr ""
 
-#: src/satip/server.c:636
+#: src/satip/server.c:649
 msgid "Mux handling"
 msgstr ""
 
@@ -2398,39 +2741,55 @@ msgstr ""
 msgid "Mux schedule entry"
 msgstr ""
 
-#: src/input/mpegts/mpegts_mux.c:388
+#: src/input/mpegts/mpegts_mux.c:387
 #: 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:368 src/channels.c:1291 src/bouquet.c:951
-#: src/epggrab/module.c:124 src/epggrab/channel.c:711
-#: src/dvr/dvr_autorec.c:964 src/dvr/dvr_timerec.c:543
-#: src/input/mpegts/mpegts_input.c:253 src/input/mpegts/mpegts_mux.c:528
-#: src/input/mpegts/linuxdvb/linuxdvb_satconf.c:1278
-#: src/input/mpegts/satip/satip_satconf.c:194
+#: src/channels.c:367 src/channels.c:1297 src/bouquet.c:955
+#: src/epggrab/module.c:124 src/epggrab/channel.c:719
+#: src/dvr/dvr_autorec.c:965 src/dvr/dvr_timerec.c:544
+#: src/input/mpegts/mpegts_input.c:255 src/input/mpegts/mpegts_mux.c:532
+#: src/input/mpegts/linuxdvb/linuxdvb_satconf.c:1280
+#: src/input/mpegts/satip/satip_satconf.c:196
 msgid "Name"
 msgstr ""
 
-#: src/epggrab/channel.c:718
+#: src/epggrab/channel.c:726
 msgid "Names"
 msgstr ""
 
-#: src/epg.c:2134
+#: src/epg.c:2135
 msgid "Natural sciences"
 msgstr ""
 
-#: src/epg.c:2133
+#: src/epg.c:2134
 msgid "Nature"
 msgstr ""
 
-#: src/input/mpegts/mpegts_mux.c:514 src/input/mpegts/mpegts_service.c:94
-#: src/input/mpegts/tvhdhomerun/tvhdhomerun.c:142
+#: src/input/mpegts/mpegts_mux.c:516 src/input/mpegts/mpegts_service.c:93
+#: src/input/mpegts/tvhdhomerun/tvhdhomerun.c:143
 msgid "Network"
 msgstr ""
 
+#: src/wizard.c:391
+msgid "Network 1"
+msgstr ""
+
+#: src/wizard.c:392
+msgid "Network 2"
+msgstr ""
+
+#: src/wizard.c:393
+msgid "Network 3"
+msgstr ""
+
+#: src/wizard.c:394
+msgid "Network 4"
+msgstr ""
+
 #: src/input/mpegts/linuxdvb/linuxdvb_satconf.c:532
 msgid "Network A"
 msgstr ""
@@ -2443,10 +2802,14 @@ msgstr ""
 msgid "Network ID (limit scanning)"
 msgstr ""
 
-#: src/input/mpegts/mpegts_mux.c:521
+#: src/input/mpegts/mpegts_mux.c:524
 msgid "Network UUID"
 msgstr ""
 
+#: src/wizard.c:230
+msgid "Network access"
+msgstr ""
+
 #: src/input/mpegts/mpegts_network.c:164
 msgid "Network discovery"
 msgstr ""
@@ -2455,36 +2818,40 @@ msgstr ""
 msgid "Network name"
 msgstr ""
 
-#: src/access.c:1429 src/access.c:1950
+#: src/access.c:1433 src/access.c:1974
 msgid "Network prefix"
 msgstr ""
 
-#: src/input/mpegts/satip/satip_frontend.c:205
-#: src/input/mpegts/satip/satip_frontend.c:344
-#: src/input/mpegts/tvhdhomerun/tvhdhomerun.c:177
+#: src/wizard.c:401
+msgid "Network settings"
+msgstr ""
+
+#: src/input/mpegts/satip/satip_frontend.c:227
+#: src/input/mpegts/satip/satip_frontend.c:389
+#: src/input/mpegts/tvhdhomerun/tvhdhomerun.c:178
 msgid "Network type"
 msgstr ""
 
-#: src/input/mpegts/mpegts_input.c:291
+#: src/input/mpegts/mpegts_input.c:299
 #: src/input/mpegts/linuxdvb/linuxdvb_satconf.c:333
-#: src/input/mpegts/linuxdvb/linuxdvb_satconf.c:1293
-#: src/input/mpegts/satip/satip_satconf.c:224
+#: src/input/mpegts/linuxdvb/linuxdvb_satconf.c:1295
+#: src/input/mpegts/satip/satip_satconf.c:230
 msgid "Networks"
 msgstr ""
 
-#: src/epg.c:2031 src/epg.c:2032
+#: src/epg.c:2032 src/epg.c:2033
 msgid "News"
 msgstr ""
 
-#: src/epg.c:2033
+#: src/epg.c:2034
 msgid "News magazine"
 msgstr ""
 
-#: src/input/mpegts/satip/satip_frontend.c:160
+#: src/input/mpegts/satip/satip_frontend.c:164
 msgid "Next tune delay in ms (0-2000)"
 msgstr ""
 
-#: src/access.c:1390
+#: src/access.c:1394
 msgid "No"
 msgstr ""
 
@@ -2504,7 +2871,7 @@ msgstr ""
 msgid "No assigned adapters"
 msgstr ""
 
-#: src/dvr/dvr_autorec.c:779
+#: src/dvr/dvr_autorec.c:780
 msgid "No days"
 msgstr ""
 
@@ -2532,45 +2899,55 @@ msgstr ""
 msgid "No source available"
 msgstr ""
 
-#: src/profile.c:264 src/input/mpegts/linuxdvb/linuxdvb_switch.c:259
+#: src/profile.c:266 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:248 src/dvr/dvr_db.c:2177
+#: src/profile.c:250 src/dvr/dvr_db.c:2236
 msgid "Normal"
 msgstr ""
 
-#: src/input/mpegts/mpegts_input.c:206
+#: src/input/mpegts/satip/satip.c:238
+msgid ""
+"Not all SAT>IP servers use the same signal scaling. Change this setting if "
+"the signal level displayed within Tvheadend looks too low."
+msgstr ""
+
+#: src/input/mpegts/mpegts_input.c:208
 msgid "Not linked"
 msgstr ""
 
-#: src/channels.c:335 src/profile.c:1421 src/dvr/dvr_db.c:2174
+#: src/channels.c:334 src/profile.c:1425 src/dvr/dvr_db.c:2233
 msgid "Not set"
 msgstr ""
 
-#: src/dvr/dvr_config.c:753
+#: src/dvr/dvr_config.c:760
 msgid "Not set (none or channel configuration)"
 msgstr ""
 
-#: src/dvr/dvr_db.c:2622 src/dvr/dvr_autorec.c:653
+#: src/dvr/dvr_db.c:2684 src/dvr/dvr_autorec.c:655
 msgid "Not set (use channel or DVR configuration)"
 msgstr ""
 
-#: src/channels.c:378 src/epggrab/channel.c:727
+#: src/channels.c:377 src/epggrab/channel.c:735
 msgid "Number"
 msgstr ""
 
+#: src/input/mpegts/satip/satip_satconf.c:213
+msgid "Number of seconds to wait before timing out."
+msgstr ""
+
 #: src/main.c:745
 msgid "Number of tsfile tuners"
 msgstr ""
 
-#: src/streaming.c:409 src/input/mpegts/mpegts_mux.c:389
+#: src/streaming.c:409 src/input/mpegts/mpegts_mux.c:388
 msgid "OK"
 msgstr ""
 
-#: src/input/mpegts/mpegts_mux.c:391
+#: src/input/mpegts/mpegts_mux.c:390
 msgid "OK (partial)"
 msgstr ""
 
@@ -2598,7 +2975,7 @@ msgstr ""
 msgid "Odd key"
 msgstr ""
 
-#: src/input/mpegts/mpegts_service.c:77
+#: src/input/mpegts/mpegts_service.c:76
 msgid "Off"
 msgstr ""
 
@@ -2606,11 +2983,11 @@ msgstr ""
 msgid "Older OSCam"
 msgstr ""
 
-#: src/input/mpegts/mpegts_service.c:78
+#: src/input/mpegts/mpegts_service.c:77
 msgid "On"
 msgstr ""
 
-#: src/dvr/dvr_db.c:2200 src/dvr/dvr_config.c:743
+#: src/dvr/dvr_db.c:2261 src/dvr/dvr_config.c:750
 msgid "On file removal"
 msgstr ""
 
@@ -2622,65 +2999,72 @@ msgstr ""
 msgid "One mux (EMM)"
 msgstr ""
 
-#: src/input/mpegts/mpegts_mux.c:466
+#: src/input/mpegts/mpegts_mux.c:465
 msgid "Only Bulsatcom 39E"
 msgstr ""
 
-#: src/input/mpegts/mpegts_mux.c:461
+#: src/input/mpegts/mpegts_mux.c:460
 msgid "Only EIT"
 msgstr ""
 
-#: src/input/mpegts/mpegts_mux.c:469
+#: src/input/mpegts/mpegts_mux.c:468
 msgid "Only OpenTV Sky Ausat"
 msgstr ""
 
-#: src/input/mpegts/mpegts_mux.c:468
+#: src/input/mpegts/mpegts_mux.c:467
 msgid "Only OpenTV Sky Italia"
 msgstr ""
 
-#: src/input/mpegts/mpegts_mux.c:467
+#: src/input/mpegts/mpegts_mux.c:466
 msgid "Only OpenTV Sky UK"
 msgstr ""
 
-#: src/input/mpegts/mpegts_mux.c:462
+#: src/input/mpegts/mpegts_mux.c:461
 msgid "Only PSIP (ATSC)"
 msgstr ""
 
-#: src/input/mpegts/mpegts_mux.c:463
+#: src/input/mpegts/mpegts_mux.c:462
 msgid "Only UK Freesat"
 msgstr ""
 
-#: src/input/mpegts/mpegts_mux.c:464
+#: src/input/mpegts/mpegts_mux.c:463
 msgid "Only UK Freeview"
 msgstr ""
 
-#: src/input/mpegts/mpegts_mux.c:465
+#: src/input/mpegts/mpegts_mux.c:464
 msgid "Only Viasat Baltic"
 msgstr ""
 
-#: src/epggrab/channel.c:752
+#: src/epggrab/channel.c:760
 msgid "Only one auto channel"
 msgstr ""
 
-#: src/input/mpegts/mpegts_service.c:79
+#: src/input/mpegts/mpegts_service.c:78
 msgid "Only preferred CA PID"
 msgstr ""
 
+#: src/config.c:2135
+msgid ""
+"Only update the system clock (doesn't affect NTP driver) if the delta "
+"between the system clock and DVB time is greater than this. This can help "
+"stop excessive oscillations on the system clock."
+msgstr ""
+
 #: src/main.c:687
 msgid "Only use specified DVB adapters (comma separated, -1 = none)"
 msgstr ""
 
-#: src/input/mpegts/mpegts_service.c:136
+#: src/input/mpegts/mpegts_service.c:141
 msgid "OpenTV channel number"
 msgstr ""
 
-#: src/epg.c:2095 src/epg.c:2096 src/epg.c:2097 src/epg.c:2098 src/epg.c:2099
-#: src/epg.c:2100 src/epg.c:2101 src/epg.c:2102
+#: src/epg.c:2096 src/epg.c:2097 src/epg.c:2098 src/epg.c:2099 src/epg.c:2100
+#: src/epg.c:2101 src/epg.c:2102 src/epg.c:2103
 msgid "Opera"
 msgstr ""
 
-#: src/input/mpegts/mpegts_network_dvb.c:253
-#: src/input/mpegts/mpegts_mux_dvb.c:614
+#: src/input/mpegts/mpegts_network_dvb.c:269
+#: src/input/mpegts/mpegts_mux_dvb.c:631
 msgid "Orbital position"
 msgstr ""
 
@@ -2688,11 +3072,11 @@ msgstr ""
 msgid "Orbital positions"
 msgstr ""
 
-#: src/input/mpegts/mpegts_mux.c:542
+#: src/input/mpegts/mpegts_mux.c:548
 msgid "Original network ID"
 msgstr ""
 
-#: src/esfilter.c:974
+#: src/esfilter.c:1105
 msgid "Other stream filter"
 msgstr ""
 
@@ -2704,11 +3088,11 @@ msgstr ""
 msgid "Over-the-air"
 msgstr ""
 
-#: src/epggrab.c:313
+#: src/epggrab.c:333
 msgid "Over-the-air Cron multi-line"
 msgstr ""
 
-#: src/input/mpegts/mpegts_input.c:260
+#: src/input/mpegts/mpegts_input.c:262
 msgid "Over-the-air EPG"
 msgstr ""
 
@@ -2716,28 +3100,32 @@ msgstr ""
 msgid "Over-the-air EPG grabber"
 msgstr ""
 
-#: src/epggrab.c:259
+#: src/epggrab.c:257
 msgid "Over-the-air grabbers"
 msgstr ""
 
-#: src/dvr/dvr_db.c:2816 src/dvr/dvr_autorec.c:1161 src/dvr/dvr_timerec.c:640
+#: src/input/mpegts/satip/satip_frontend.c:390
+msgid "Override the frontend type."
+msgstr ""
+
+#: src/dvr/dvr_db.c:2877 src/dvr/dvr_autorec.c:1162 src/dvr/dvr_timerec.c:641
 msgid "Owner"
 msgstr ""
 
-#: src/input/mpegts/mpegts_mux.c:382
+#: src/input/mpegts/mpegts_mux.c:381
 msgid "PEND"
 msgstr ""
 
-#: src/esfilter.c:668 src/esfilter.c:735 src/esfilter.c:802 src/esfilter.c:869
-#: src/esfilter.c:944 src/esfilter.c:1005
+#: src/esfilter.c:684 src/esfilter.c:776 src/esfilter.c:868 src/esfilter.c:960
+#: src/esfilter.c:1063 src/esfilter.c:1142
 msgid "PID"
 msgstr ""
 
-#: src/input/mpegts/satip/satip.c:276
+#: src/input/mpegts/satip/satip.c:293
 msgid "PIDs 21 in setup"
 msgstr ""
 
-#: src/input/mpegts/satip/satip.c:262
+#: src/input/mpegts/satip/satip.c:274
 msgid "PIDs in setup"
 msgstr ""
 
@@ -2751,83 +3139,101 @@ msgstr ""
 msgid "PIN inquiry match string"
 msgstr ""
 
-#: src/input/mpegts/mpegts_mux_dvb.c:243
+#: src/input/mpegts/mpegts_mux_dvb.c:248
 msgid "PLP ID"
 msgstr ""
 
-#: src/input/mpegts/mpegts_mux_dvb.c:606
+#: src/input/mpegts/mpegts_mux_dvb.c:621
 msgid "PLS code"
 msgstr ""
 
-#: src/input/mpegts/mpegts_mux_dvb.c:596
+#: src/input/mpegts/mpegts_mux_dvb.c:611
 msgid "PLS mode"
 msgstr ""
 
-#: src/dvr/dvr_db.c:2917
+#: src/dvr/dvr_db.c:2978
 msgid "Parent entry"
 msgstr ""
 
-#: src/input/mpegts/satip/satip_frontend.c:181
-msgid "Pass weight"
+#: src/input/mpegts/satip/satip_frontend.c:196
+msgid "Pass subscription weight"
+msgstr ""
+
+#: src/input/mpegts/satip/satip_frontend.c:197
+msgid ""
+"Pass subscription weight to the SAT>IP server (Tvheadend specific extension)."
 msgstr ""
 
-#: src/access.c:1817 src/descrambler/cwc.c:1742
+#: src/access.c:1832 src/wizard.c:279 src/descrambler/cwc.c:1742
 msgid "Password"
 msgstr ""
 
-#: src/access.c:1825
+#: src/access.c:1840
 msgid "Password2"
 msgstr ""
 
-#: src/access.c:1795
+#: src/access.c:1810
 msgid "Passwords"
 msgstr ""
 
-#: src/epggrab/module.c:165 src/epggrab/module.c:190 src/epggrab/channel.c:688
+#: src/epggrab/module.c:165 src/epggrab/module.c:190 src/epggrab/channel.c:696
 msgid "Path"
 msgstr ""
 
-#: src/epg.c:2106
+#: src/config.c:2178
+msgid ""
+"Path to a directory (folder) containing your picon collection. See Help for "
+"more detailed information."
+msgstr ""
+
+#: src/config.c:2157
+msgid ""
+"Path to an icon for this channel. This can be named however you wish, as "
+"either a local (file://) or remote (http://) image. See Help for more "
+"infomation."
+msgstr ""
+
+#: src/epg.c:2107
 msgid "Performing arts"
 msgstr ""
 
-#: src/epggrab.c:289
+#: src/epggrab.c:299
 msgid "Periodically save EPG to disk (hours)"
 msgstr ""
 
-#: src/access.c:1445 src/config.c:1980
+#: src/access.c:1449 src/config.c:1988
 msgid "Persistent user interface level"
 msgstr ""
 
-#: src/epg.c:2135
+#: src/epg.c:2136
 msgid "Physiology"
 msgstr ""
 
-#: src/config.c:1940
+#: src/config.c:1943
 msgid "Picon"
 msgstr ""
 
-#: src/config.c:2108
+#: src/config.c:2177
 msgid "Picon path (see Help)"
 msgstr ""
 
-#: src/input/mpegts/mpegts_mux_dvb.c:579
+#: src/input/mpegts/mpegts_mux_dvb.c:591
 msgid "Pilot"
 msgstr ""
 
-#: src/input/mpegts/mpegts_mux_dvb.c:553
+#: src/input/mpegts/mpegts_mux_dvb.c:562
 msgid "Polarization"
 msgstr ""
 
-#: src/epg.c:2116
+#: src/epg.c:2117
 msgid "Political issues"
 msgstr ""
 
-#: src/epg.c:2091
+#: src/epg.c:2092
 msgid "Pop"
 msgstr ""
 
-#: src/epg.c:2109
+#: src/epg.c:2110
 msgid "Popular culture"
 msgstr ""
 
@@ -2836,19 +3242,23 @@ msgid "Port"
 msgstr ""
 
 #: src/input/mpegts/linuxdvb/linuxdvb_en50494.c:126
-#: src/input/mpegts/satip/satip_satconf.c:216
+#: src/input/mpegts/satip/satip_satconf.c:221
 msgid "Position"
 msgstr ""
 
-#: src/dvr/dvr_config.c:965
+#: src/input/mpegts/satip/satip_satconf.c:222
+msgid "Position of the input."
+msgstr ""
+
+#: src/dvr/dvr_config.c:974
 msgid "Post-processor command"
 msgstr ""
 
-#: src/channels.c:424 src/dvr/dvr_db.c:2686
+#: src/channels.c:423 src/dvr/dvr_db.c:2747
 msgid "Post-recording padding"
 msgstr ""
 
-#: src/dvr/dvr_config.c:973
+#: src/dvr/dvr_config.c:982
 msgid "Post-remove command"
 msgstr ""
 
@@ -2861,45 +3271,56 @@ msgstr ""
 msgid "Power-up time (ms) (15-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
-#: src/input/mpegts/mpegts_network_dvb.c:271
+#: src/input/mpegts/mpegts_network_dvb.c:213
+#: src/input/mpegts/mpegts_network_dvb.c:235
+#: src/input/mpegts/mpegts_network_dvb.c:257
+#: src/input/mpegts/mpegts_network_dvb.c:289
+#: src/input/mpegts/mpegts_network_dvb.c:311
 msgid "Pre-defined muxes"
 msgstr ""
 
-#: src/channels.c:417 src/dvr/dvr_db.c:2662
+#: src/channels.c:416 src/dvr/dvr_db.c:2724
 msgid "Pre-recording padding"
 msgstr ""
 
-#: src/epg.c:2075
+#: src/epg.c:2076
 msgid "Pre-school children's programs"
 msgstr ""
 
-#: src/config.c:2084
+#: src/config.c:2146
 msgid "Prefer picons over channel name"
 msgstr ""
 
-#: src/input/mpegts/mpegts_service.c:193
+#: src/input/mpegts/mpegts_service.c:209
 msgid "Preferred CA PID"
 msgstr ""
 
-#: src/profile.c:377
+#: src/profile.c:379
 msgid "Preferred service video type"
 msgstr ""
 
-#: src/input/mpegts/satip/satip.c:402
+#: src/input/mpegts/satip/satip.c:440
 msgid "Presentation"
 msgstr ""
 
-#: src/epg.c:2113
+#: src/input/mpegts/satip/satip.c:441
+msgid "Presentation details."
+msgstr ""
+
+#: src/epg.c:2114
 msgid "Press"
 msgstr ""
 
-#: src/epggrab/module.c:148 src/dvr/dvr_db.c:2778 src/dvr/dvr_autorec.c:1077
-#: src/dvr/dvr_timerec.c:603 src/input/mpegts/mpegts_input.c:237
-#: src/input/mpegts/linuxdvb/linuxdvb_satconf.c:1285
-#: src/input/mpegts/satip/satip_satconf.c:201 src/input/mpegts/iptv/iptv.c:719
+#: src/config.c:1989
+msgid ""
+"Prevents users from overriding the above user interface level setting and "
+"removes the view level drop-dowm from the interface."
+msgstr ""
+
+#: src/epggrab/module.c:148 src/dvr/dvr_db.c:2839 src/dvr/dvr_autorec.c:1078
+#: src/dvr/dvr_timerec.c:604 src/input/mpegts/mpegts_input.c:239
+#: src/input/mpegts/linuxdvb/linuxdvb_satconf.c:1287
+#: src/input/mpegts/satip/satip_satconf.c:204 src/input/mpegts/iptv/iptv.c:720
 #: src/input/mpegts/iptv/iptv_mux.c:123
 msgid "Priority"
 msgstr ""
@@ -2908,15 +3329,23 @@ msgstr ""
 msgid "Priority (-10..10)"
 msgstr ""
 
-#: src/channels.c:1304
+#: src/channels.c:1310
 msgid "Private"
 msgstr ""
 
-#: src/profile.c:317
+#: src/profile.c:319
 msgid "Profile name"
 msgstr ""
 
-#: src/input/mpegts/mpegts_service.c:157
+#: src/esfilter.c:685 src/esfilter.c:777 src/esfilter.c:869 src/esfilter.c:961
+#: src/esfilter.c:1064 src/esfilter.c:1143
+msgid ""
+"Program identification (PID) number to compare. Zero means any. This "
+"comparison is processed only when service comparison is active and for the "
+"Conditional Access filter."
+msgstr ""
+
+#: src/input/mpegts/mpegts_service.c:165
 msgid "Provider"
 msgstr ""
 
@@ -2924,24 +3353,24 @@ msgstr ""
 msgid "Provider ID"
 msgstr ""
 
-#: src/input/mpegts/mpegts_network.c:150 src/input/mpegts/mpegts_mux.c:535
+#: src/input/mpegts/mpegts_network.c:150 src/input/mpegts/mpegts_mux.c:540
 msgid "Provider network name"
 msgstr ""
 
-#: src/epg.c:2135
+#: src/epg.c:2136
 msgid "Psychology"
 msgstr ""
 
-#: src/epg.c:2079 src/epg.c:2080 src/epg.c:2081 src/epg.c:2082 src/epg.c:2083
-#: src/epg.c:2084 src/epg.c:2085 src/epg.c:2086 src/epg.c:2087
+#: src/epg.c:2080 src/epg.c:2081 src/epg.c:2082 src/epg.c:2083 src/epg.c:2084
+#: src/epg.c:2085 src/epg.c:2086 src/epg.c:2087 src/epg.c:2088
 msgid "Puppets"
 msgstr ""
 
-#: src/profile.c:1440
+#: src/profile.c:1444
 msgid "Quad (4.0)"
 msgstr ""
 
-#: src/epg.c:2048
+#: src/epg.c:2049
 msgid "Quiz"
 msgstr ""
 
@@ -2949,11 +3378,11 @@ msgstr ""
 msgid "RAM only"
 msgstr ""
 
-#: src/input/mpegts/satip/satip.c:311
+#: src/input/mpegts/satip/satip.c:336
 msgid "RTSP port"
 msgstr ""
 
-#: src/satip/server.c:597
+#: src/satip/server.c:598
 msgid "RTSP port (554 or 9983, 0 = disable)"
 msgstr ""
 
@@ -2961,52 +3390,58 @@ msgstr ""
 msgid "RTSP/TCP (embedded data)"
 msgstr ""
 
-#: src/imagecache.c:96
+#: src/imagecache.c:102
 msgid "Re-fetch period (hours)"
 msgstr ""
 
-#: src/bouquet.c:973 src/input/mpegts/iptv/iptv.c:848
+#: src/bouquet.c:977 src/input/mpegts/iptv/iptv.c:849
 msgid "Re-fetch period (mins)"
 msgstr ""
 
-#: src/dvr/dvr_db.c:1028
+#: src/dvr/dvr_db.c:1044
 #, c-format
 msgid "Re-record%s%s"
 msgstr ""
 
-#: src/imagecache.c:102
+#: src/imagecache.c:110
 msgid "Re-try period (hours)"
 msgstr ""
 
-#: src/dvr/dvr_autorec.c:920
+#: src/satip/server.c:599
+msgid ""
+"Real Time Streaming Protocol (RTSP) port the server should listen on (554 or "
+"9983, 0 = disable)."
+msgstr ""
+
+#: src/dvr/dvr_autorec.c:921
 msgid "Record all"
 msgstr ""
 
-#: src/dvr/dvr_autorec.c:926
+#: src/dvr/dvr_autorec.c:927
 msgid "Record if different description"
 msgstr ""
 
-#: src/dvr/dvr_autorec.c:922
+#: src/dvr/dvr_autorec.c:923
 msgid "Record if different episode number"
 msgstr ""
 
-#: src/dvr/dvr_autorec.c:924
+#: src/dvr/dvr_autorec.c:925
 msgid "Record if different subtitle"
 msgstr ""
 
-#: src/dvr/dvr_autorec.c:930
+#: src/dvr/dvr_autorec.c:931
 msgid "Record once per day"
 msgstr ""
 
-#: src/dvr/dvr_autorec.c:928
+#: src/dvr/dvr_autorec.c:929
 msgid "Record once per week"
 msgstr ""
 
-#: src/dvr/dvr_config.c:793
+#: src/dvr/dvr_config.c:800
 msgid "Recording file options"
 msgstr ""
 
-#: src/dvr/dvr_config.c:981
+#: src/dvr/dvr_config.c:990
 msgid "Recording system path"
 msgstr ""
 
@@ -3014,29 +3449,29 @@ msgstr ""
 msgid "Reject"
 msgstr ""
 
-#: src/epg.c:2108
+#: src/epg.c:2109
 msgid "Religion"
 msgstr ""
 
-#: src/epg.c:2022
+#: src/epg.c:2023
 msgid "Religious"
 msgstr ""
 
-#: src/epg.c:2119 src/epg.c:2120 src/epg.c:2121 src/epg.c:2122 src/epg.c:2123
-#: src/epg.c:2124 src/epg.c:2125 src/epg.c:2126 src/epg.c:2127 src/epg.c:2128
-#: src/epg.c:2129
+#: src/epg.c:2120 src/epg.c:2121 src/epg.c:2122 src/epg.c:2123 src/epg.c:2124
+#: src/epg.c:2125 src/epg.c:2126 src/epg.c:2127 src/epg.c:2128 src/epg.c:2129
+#: src/epg.c:2130
 msgid "Remarkable people"
 msgstr ""
 
-#: src/input/mpegts/iptv/iptv.c:863
+#: src/input/mpegts/iptv/iptv.c:864
 msgid "Remove HTTP arguments"
 msgstr ""
 
-#: src/dvr/dvr_config.c:1132
+#: src/dvr/dvr_config.c:1143
 msgid "Remove all unsafe characters from filename"
 msgstr ""
 
-#: src/dvr/dvr_config.c:1140
+#: src/dvr/dvr_config.c:1151
 msgid "Replace whitespace in title with '-'"
 msgstr ""
 
@@ -3044,15 +3479,15 @@ msgstr ""
 msgid "Reply to CAM PIN inquiries"
 msgstr ""
 
-#: src/epg.c:2117
+#: src/epg.c:2118
 msgid "Reports"
 msgstr ""
 
-#: src/dvr/dvr_db.c:2984
+#: src/dvr/dvr_db.c:3045
 msgid "Rerun of"
 msgstr ""
 
-#: src/bouquet.c:895
+#: src/bouquet.c:899
 msgid "Rescan"
 msgstr ""
 
@@ -3060,7 +3495,7 @@ msgstr ""
 msgid "Reserved"
 msgstr ""
 
-#: src/profile.c:1591
+#: src/profile.c:1595
 msgid "Resolution (height)"
 msgstr ""
 
@@ -3068,43 +3503,49 @@ msgstr ""
 msgid "Respawn (pipe)"
 msgstr ""
 
-#: src/profile.c:359
+#: src/profile.c:361
 msgid "Restart on error"
 msgstr ""
 
-#: src/channels.c:469
+#: src/channels.c:468
 msgid "Reuse EPG from"
 msgstr ""
 
-#: src/profile.c:1065
+#: src/profile.c:1069
 msgid "Rewrite EIT"
 msgstr ""
 
-#: src/profile.c:1029
+#: src/profile.c:1033
 msgid "Rewrite MPEG-TS SI tables"
 msgstr ""
 
-#: src/profile.c:1047
+#: src/profile.c:1051
 msgid "Rewrite PAT"
 msgstr ""
 
-#: src/profile.c:1038 src/satip/server.c:628
+#: src/profile.c:1042 src/satip/server.c:638
 msgid "Rewrite PMT"
 msgstr ""
 
-#: src/profile.c:1056
+#: src/satip/server.c:639
+msgid ""
+"Rewrite Program Association Table (PMT) packets to only include information "
+"about the currently streamed service."
+msgstr ""
+
+#: src/profile.c:1060
 msgid "Rewrite SDT"
 msgstr ""
 
-#: src/epg.c:2091
+#: src/epg.c:2092
 msgid "Rock"
 msgstr ""
 
-#: src/input/mpegts/mpegts_mux_dvb.c:570
+#: src/input/mpegts/mpegts_mux_dvb.c:580
 msgid "Rolloff"
 msgstr ""
 
-#: src/epg.c:2021
+#: src/epg.c:2022
 msgid "Romance"
 msgstr ""
 
@@ -3112,7 +3553,7 @@ msgstr ""
 msgid "Rotor initialization time (seconds)"
 msgstr ""
 
-#: src/input/mpegts/linuxdvb/linuxdvb_satconf.c:1321
+#: src/input/mpegts/linuxdvb/linuxdvb_satconf.c:1323
 msgid "Rotor type"
 msgstr ""
 
@@ -3124,27 +3565,35 @@ msgstr ""
 msgid "Run as user"
 msgstr ""
 
-#: src/subscriptions.c:901 src/dvr/dvr_db.c:469
+#: src/subscriptions.c:900 src/dvr/dvr_db.c:482
 msgid "Running"
 msgstr ""
 
-#: src/input/mpegts/satip/satip_frontend.c:357
-msgid "SAT>IP ATSC frontend"
+#: src/input/mpegts/satip/satip_frontend.c:147
+msgid "SAT->IP frontend number."
+msgstr ""
+
+#: src/input/mpegts/satip/satip_frontend.c:413
+msgid "SAT>IP ATSC-C frontend"
+msgstr ""
+
+#: src/input/mpegts/satip/satip_frontend.c:403
+msgid "SAT>IP ATSC-T frontend"
 msgstr ""
 
 #: src/input/mpegts/satip/satip_frontend.c:140
 msgid "SAT>IP DVB frontend"
 msgstr ""
 
-#: src/input/mpegts/satip/satip_frontend.c:339
+#: src/input/mpegts/satip/satip_frontend.c:384
 msgid "SAT>IP DVB-C frontend"
 msgstr ""
 
-#: src/input/mpegts/satip/satip_frontend.c:285
+#: src/input/mpegts/satip/satip_frontend.c:307
 msgid "SAT>IP DVB-S frontend"
 msgstr ""
 
-#: src/input/mpegts/satip/satip_frontend.c:317
+#: src/input/mpegts/satip/satip_frontend.c:352
 msgid "SAT>IP DVB-S slave frontend"
 msgstr ""
 
@@ -3152,7 +3601,7 @@ msgstr ""
 msgid "SAT>IP DVB-T frequency (Hz)"
 msgstr ""
 
-#: src/input/mpegts/satip/satip_frontend.c:200
+#: src/input/mpegts/satip/satip_frontend.c:222
 msgid "SAT>IP DVB-T frontend"
 msgstr ""
 
@@ -3179,7 +3628,7 @@ msgstr ""
 msgid "SCR (ID)"
 msgstr ""
 
-#: src/profile.c:265
+#: src/profile.c:267
 msgid "SD: standard definition"
 msgstr ""
 
@@ -3207,20 +3656,20 @@ msgstr ""
 msgid "SIGUSR2"
 msgstr ""
 
-#: src/bouquet.c:965 src/input/mpegts/iptv/iptv.c:856
+#: src/bouquet.c:969 src/input/mpegts/iptv/iptv.c:857
 msgid "SSL verify peer"
 msgstr ""
 
-#: src/dvr/dvr_autorec.c:760
+#: src/dvr/dvr_autorec.c:761
 msgid "Sat"
 msgstr ""
 
-#: src/input/mpegts/linuxdvb/linuxdvb_frontend.c:228
+#: src/input/mpegts/linuxdvb/linuxdvb_frontend.c:229
 msgid "SatConfig"
 msgstr ""
 
-#: src/input/mpegts/linuxdvb/linuxdvb_satconf.c:1263
-#: src/input/mpegts/satip/satip_satconf.c:180
+#: src/input/mpegts/linuxdvb/linuxdvb_satconf.c:1265
+#: src/input/mpegts/satip/satip_satconf.c:181
 msgid "Satconf"
 msgstr ""
 
@@ -3229,11 +3678,11 @@ msgstr ""
 msgid "Satellite longitude"
 msgstr ""
 
-#: src/input/mpegts/satip/satip_frontend.c:291
+#: src/input/mpegts/satip/satip_frontend.c:313
 msgid "Satellite positions"
 msgstr ""
 
-#: src/input/mpegts/iptv/iptv.c:703
+#: src/input/mpegts/iptv/iptv.c:704
 msgid "Scan after creation"
 msgstr ""
 
@@ -3241,97 +3690,165 @@ msgstr ""
 msgid "Scan queue length"
 msgstr ""
 
-#: src/input/mpegts/mpegts_mux.c:572
+#: src/input/mpegts/mpegts_mux.c:585
 msgid "Scan result"
 msgstr ""
 
-#: src/input/mpegts/mpegts_mux.c:563
+#: src/wizard.c:485 src/input/mpegts/mpegts_mux.c:573
 msgid "Scan status"
 msgstr ""
 
-#: src/dvr/dvr_config.c:895
+#: src/dvr/dvr_config.c:903
 msgid "Schedule a re-recording if more errors than (0=off)"
 msgstr ""
 
-#: src/dvr/dvr_db.c:2977
+#: src/dvr/dvr_db.c:3038
 msgid "Schedule status"
 msgstr ""
 
-#: src/dvr/dvr_db.c:459
+#: src/dvr/dvr_db.c:472
 msgid "Scheduled for recording"
 msgstr ""
 
-#: src/dvr/dvr_db.c:2672
+#: src/dvr/dvr_db.c:2733
 msgid "Scheduled start time"
 msgstr ""
 
-#: src/dvr/dvr_db.c:2694
+#: src/dvr/dvr_db.c:2755
 msgid "Scheduled stop time"
 msgstr ""
 
-#: src/epg.c:2078
+#: src/epg.c:2079
 msgid "School programs"
 msgstr ""
 
-#: src/epg.c:2132
+#: src/epg.c:2133
 msgid "Science"
 msgstr ""
 
-#: src/epg.c:2018
+#: src/epg.c:2019
 msgid "Science fiction"
 msgstr ""
 
-#: src/dvr/dvr_autorec.c:1145
+#: src/dvr/dvr_autorec.c:1146
 msgid "Season"
 msgstr ""
 
-#: src/dvr/dvr_db.c:634
+#: src/dvr/dvr_db.c:649
 #, c-format
 msgid "Season %d"
 msgstr ""
 
-#: src/input/mpegts/linuxdvb/linuxdvb_ca.c:241
-msgid "Send CAPMT query"
+#: src/satip/server.c:650
+msgid ""
+"Select how Tvheadend should handle muxes. Auto = accept the mux if it "
+"doesn't already exist. Keep = Always keep the muxregardless of whether it "
+"exists or not. Reject = Always reject."
 msgstr ""
 
-#: src/input/mpegts/satip/satip_frontend.c:167
-msgid "Send full PLAY cmd"
+#: src/wizard.c:506
+msgid "Select network"
 msgstr ""
 
-#: src/input/mpegts/satip/satip.c:332
-msgid "Serial number"
+#: src/input/mpegts/mpegts_mux.c:507
+msgid ""
+"Select the EPG grabber to use on this mux. Enable (auto) is the recommended "
+"value."
 msgstr ""
 
-#: src/dvr/dvr_autorec.c:1153
-msgid "Series link"
+#: src/config.c:2063
+msgid ""
+"Select the list of languages (in order of priority) to be used for supplying "
+"EPG information to clients that don't provide their own configuration."
 msgstr ""
 
-#: src/epg.c:2022
-msgid "Serious"
+#: src/input/mpegts/satip/satip_frontend.c:326
+#: src/input/mpegts/satip/satip_frontend.c:358
+msgid ""
+"Select the master tuner.The signal from the standard universal LNB can be "
+"split using a simple coaxial splitter (no multiswitch) to several outputs. "
+"In this case, the position, the polarization and low-high band settings must "
+"be equal.if you set other tuner as master, then this tuner will act like a "
+"slave one and tvheadend will assure that this tuner will not use "
+"incompatible parameters (position, polarization, lo-hi)."
 msgstr ""
 
-#: src/epg.c:2092
-msgid "Serious music"
+#: src/input/mpegts/satip/satip_frontend.c:314
+msgid ""
+"Select the number of satellite positions supported by the SAT>IP hardware "
+"and your coaxial cable wiring."
 msgstr ""
 
-#: src/config.c:1920 src/input/mpegts/satip/satip.c:416
-msgid "Server"
+#: src/input/mpegts/mpegts_network_dvb.c:270
+msgid "Select the orbital position of the satellite your dish is pointing at."
 msgstr ""
 
-#: src/satip/server.c:589
-msgid "Server UUID"
+#: src/config.c:2100
+msgid ""
+"Select the path to use for DVB scan configuration files. Typically dvb-apps "
+"stores these in /usr/share/dvb/. Leave blank to use Tvheadend's internal "
+"file set."
 msgstr ""
 
-#: src/main.c:701
-msgid "Server connectivity"
+#: src/imagecache.c:85
+msgid ""
+"Select whether or not to enable caching. Note: even with this disabled you "
+"can still specify local (file://) icons and these will be served by the "
+"built-in webserver."
 msgstr ""
 
-#: 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"
+#: src/input/mpegts/linuxdvb/linuxdvb_ca.c:241
+msgid "Send CAPMT query"
+msgstr ""
+
+#: src/input/mpegts/satip/satip_frontend.c:175
+msgid "Send full PLAY cmd"
 msgstr ""
 
-#: src/input/mpegts/mpegts_service.c:115 src/input/mpegts/iptv/iptv.c:711
+#: src/input/mpegts/satip/satip_frontend.c:176
+msgid ""
+"Send the full RTSP PLAY command after full RTSP SETUP command. Some devices "
+"firmware require this to get an MPEG-TS stream."
+msgstr ""
+
+#: src/input/mpegts/satip/satip.c:360
+msgid "Serial number"
+msgstr ""
+
+#: src/dvr/dvr_autorec.c:1154
+msgid "Series link"
+msgstr ""
+
+#: src/epg.c:2023
+msgid "Serious"
+msgstr ""
+
+#: src/epg.c:2093
+msgid "Serious music"
+msgstr ""
+
+#: src/config.c:1923 src/input/mpegts/satip/satip.c:456
+msgid "Server"
+msgstr ""
+
+#: src/satip/server.c:589
+msgid "Server UUID"
+msgstr ""
+
+#: src/main.c:701
+msgid "Server connectivity"
+msgstr ""
+
+#: src/input/mpegts/satip/satip.c:457
+msgid "Server details."
+msgstr ""
+
+#: src/service.c:151 src/esfilter.c:660 src/esfilter.c:752 src/esfilter.c:844
+#: src/esfilter.c:936 src/esfilter.c:1039 src/esfilter.c:1131
+msgid "Service"
+msgstr ""
+
+#: src/input/mpegts/mpegts_service.c:117 src/input/mpegts/iptv/iptv.c:712
 #: src/descrambler/constcw.c:314 src/descrambler/constcw.c:374
 msgid "Service ID"
 msgstr ""
@@ -3340,12 +3857,20 @@ msgstr ""
 msgid "Service configuration"
 msgstr ""
 
-#: src/bouquet.c:841
+#: src/bouquet.c:845
 #, c-format
 msgid "Service count %zi"
 msgstr ""
 
-#: src/input/mpegts/mpegts_service.c:150 src/input/mpegts/iptv/iptv_mux.c:181
+#: src/service_mapper.c:480
+msgid "Service mapper"
+msgstr ""
+
+#: src/wizard.c:516
+msgid "Service mapping"
+msgstr ""
+
+#: src/input/mpegts/mpegts_service.c:157 src/input/mpegts/iptv/iptv_mux.c:181
 msgid "Service name"
 msgstr ""
 
@@ -3353,22 +3878,48 @@ msgstr ""
 msgid "Service raw"
 msgstr ""
 
-#: src/input/mpegts/mpegts_service.c:171
+#: src/input/mpegts/mpegts_service.c:181
 msgid "Service type"
 msgstr ""
 
-#: src/channels.c:440 src/bouquet.c:990
+#: src/channels.c:439 src/service_mapper.c:489 src/bouquet.c:994
 msgid "Services"
 msgstr ""
 
+#: src/input/mpegts/satip/satip_satconf.c:197
+msgid "Set the display name."
+msgstr ""
+
+#: src/input/mpegts/satip/satip.c:248
+msgid "Set the maxiumum packet identifiers your SAT>IP server supports."
+msgstr ""
+
+#: src/config.c:1970
+msgid ""
+"Set the name of the server so you can distinguish multiple instances apart "
+"on your LAN."
+msgstr ""
+
+#: src/input/mpegts/satip/satip_satconf.c:205
+msgid "Set the priority of this configuration."
+msgstr ""
+
+#: src/config.c:1979
+msgid "Sets the default interface view level (next to the help button)."
+msgstr ""
+
 #: src/tvhlog.c:632 src/epggrab/module.c:115
 msgid "Settings"
 msgstr ""
 
-#: src/epg.c:2047
+#: src/epg.c:2048
 msgid "Show"
 msgstr ""
 
+#: src/wizard.c:457
+msgid "Show the scan status."
+msgstr ""
+
 #: src/main.c:664
 msgid "Show this page"
 msgstr ""
@@ -3377,11 +3928,17 @@ msgstr ""
 msgid "Show version information"
 msgstr ""
 
+#: src/config.c:2078
+msgid ""
+"Show, hide and sort the various details that appear on the interface next to "
+"the About tab."
+msgstr ""
+
 #: src/streaming.c:439
 msgid "Signal quality too poor"
 msgstr ""
 
-#: src/input/mpegts/satip/satip.c:234
+#: src/input/mpegts/satip/satip.c:237
 msgid "Signal scale (240 or 100)"
 msgstr ""
 
@@ -3393,11 +3950,16 @@ msgstr ""
 msgid "Site longitude"
 msgstr ""
 
-#: src/input/mpegts/satip/satip.c:290
+#: src/input/mpegts/satip/satip.c:310
 msgid "Skip TS packets (0-200)"
 msgstr ""
 
-#: src/dvr/dvr_config.c:1033
+#: src/input/mpegts/mpegts_mux.c:633
+msgid ""
+"Skip TSID checking. For when providers use invalid Transport Stream IDs."
+msgstr ""
+
+#: src/dvr/dvr_config.c:1044
 msgid "Skip commercials"
 msgstr ""
 
@@ -3409,7 +3971,11 @@ msgstr ""
 msgid "Skip initial scan"
 msgstr ""
 
-#: src/dvr/dvr_db.c:2925
+#: src/input/mpegts/satip/satip.c:311
+msgid "Skip x number of transport packets."
+msgstr ""
+
+#: src/dvr/dvr_db.c:2986
 msgid "Slave entry"
 msgstr ""
 
@@ -3417,27 +3983,27 @@ msgstr ""
 msgid "Slot state"
 msgstr ""
 
-#: src/epg.c:2020
+#: src/epg.c:2021
 msgid "Soap"
 msgstr ""
 
-#: src/epg.c:2066
+#: src/epg.c:2067
 msgid "Soccer"
 msgstr ""
 
-#: src/epg.c:2116 src/epg.c:2137
+#: src/epg.c:2117 src/epg.c:2138
 msgid "Social"
 msgstr ""
 
-#: src/epg.c:2118
+#: src/epg.c:2119
 msgid "Social advisory"
 msgstr ""
 
-#: src/channels.c:1284
+#: src/channels.c:1290
 msgid "Sort index"
 msgstr ""
 
-#: src/bouquet.c:982
+#: src/bouquet.c:986
 msgid "Source"
 msgstr ""
 
@@ -3457,7 +4023,7 @@ msgstr ""
 msgid "Southern hemisphere (latitude direction)"
 msgstr ""
 
-#: src/epg.c:2064
+#: src/epg.c:2065
 msgid "Special events (Olympic Games, World Cup, etc.)"
 msgstr ""
 
@@ -3485,43 +4051,43 @@ msgstr ""
 msgid "Specify extra htsp port"
 msgstr ""
 
-#: src/epg.c:2137
+#: src/epg.c:2138
 msgid "Spiritual sciences"
 msgstr ""
 
-#: src/epg.c:2063
+#: src/epg.c:2064
 msgid "Sports"
 msgstr ""
 
-#: src/epg.c:2065
+#: src/epg.c:2066
 msgid "Sports magazines"
 msgstr ""
 
-#: src/epg.c:2067
+#: src/epg.c:2068
 msgid "Squash"
 msgstr ""
 
-#: src/input/mpegts/mpegts_mux.c:478
+#: src/input/mpegts/mpegts_mux.c:477
 msgid "Standard"
 msgstr ""
 
-#: src/dvr/dvr_timerec.c:572
+#: src/dvr/dvr_timerec.c:573
 msgid "Start"
 msgstr ""
 
-#: src/dvr/dvr_autorec.c:1008
+#: src/dvr/dvr_autorec.c:1009
 msgid "Start after"
 msgstr ""
 
-#: src/dvr/dvr_autorec.c:1017
+#: src/dvr/dvr_autorec.c:1018
 msgid "Start before"
 msgstr ""
 
-#: src/dvr/dvr_db.c:2654
+#: src/dvr/dvr_db.c:2716
 msgid "Start time"
 msgstr ""
 
-#: src/dvr/dvr_db.c:2970 src/descrambler/caclient.c:281
+#: src/dvr/dvr_db.c:3031 src/descrambler/caclient.c:284
 msgid "Status"
 msgstr ""
 
@@ -3529,15 +4095,15 @@ msgstr ""
 msgid "Status period (ms)"
 msgstr ""
 
-#: src/profile.c:1438
+#: src/profile.c:1442
 msgid "Stereo"
 msgstr ""
 
-#: src/dvr/dvr_timerec.c:582
+#: src/dvr/dvr_timerec.c:583
 msgid "Stop"
 msgstr ""
 
-#: src/dvr/dvr_db.c:2679
+#: src/dvr/dvr_db.c:2740
 msgid "Stop time"
 msgstr ""
 
@@ -3545,38 +4111,38 @@ msgstr ""
 msgid "Storage path"
 msgstr ""
 
-#: src/config.c:1865
+#: src/config.c:1868
 msgid "Storage space"
 msgstr ""
 
-#: src/esfilter.c:662 src/esfilter.c:729 src/esfilter.c:796 src/esfilter.c:863
-#: src/esfilter.c:938
+#: src/esfilter.c:671 src/esfilter.c:763 src/esfilter.c:855 src/esfilter.c:947
+#: src/esfilter.c:1050
 msgid "Stream index"
 msgstr ""
 
-#: src/profile.c:274 src/dvr/dvr_config.c:848
+#: src/profile.c:276 src/dvr/dvr_config.c:855
 msgid "Stream profile"
 msgstr ""
 
-#: src/esfilter.c:637 src/esfilter.c:704 src/esfilter.c:771 src/esfilter.c:838
-#: src/esfilter.c:905 src/esfilter.c:980
+#: src/esfilter.c:640 src/esfilter.c:732 src/esfilter.c:824 src/esfilter.c:916
+#: src/esfilter.c:1008 src/esfilter.c:1111
 msgid "Stream type"
 msgstr ""
 
-#: src/access.c:1348 src/access.c:1469
+#: src/access.c:1352 src/access.c:1473
 msgid "Streaming"
 msgstr ""
 
-#: src/input/mpegts/mpegts_input.c:245 src/input/mpegts/iptv/iptv.c:727
+#: src/input/mpegts/mpegts_input.c:247 src/input/mpegts/iptv/iptv.c:728
 #: src/input/mpegts/iptv/iptv_mux.c:131
 msgid "Streaming priority"
 msgstr ""
 
-#: src/access.c:1488
+#: src/access.c:1492
 msgid "Streaming profiles"
 msgstr ""
 
-#: src/dvr/dvr_config.c:801
+#: src/dvr/dvr_config.c:808
 msgid "Subdirectory options"
 msgstr ""
 
@@ -3588,7 +4154,7 @@ msgstr ""
 msgid "Subscription overridden"
 msgstr ""
 
-#: src/satip/server.c:604
+#: src/satip/server.c:608
 msgid "Subscription weight"
 msgstr ""
 
@@ -3596,23 +4162,23 @@ msgstr ""
 msgid "Substitute formatters"
 msgstr ""
 
-#: src/dvr/dvr_db.c:2749 src/dvr/dvr_db.c:2756
+#: src/dvr/dvr_db.c:2810 src/dvr/dvr_db.c:2817
 msgid "Subtitle"
 msgstr ""
 
-#: src/profile.c:1656
+#: src/profile.c:1660
 msgid "Subtitle codec"
 msgstr ""
 
-#: src/esfilter.c:832
+#: src/esfilter.c:910
 msgid "Subtitle stream filter"
 msgstr ""
 
-#: src/dvr/dvr_autorec.c:761
+#: src/dvr/dvr_autorec.c:762
 msgid "Sun"
 msgstr ""
 
-#: src/profile.c:1439
+#: src/profile.c:1443
 msgid "Surround (2 front, rear mono)"
 msgstr ""
 
@@ -3620,7 +4186,7 @@ msgstr ""
 msgid "Switch before rotor"
 msgstr ""
 
-#: src/input/mpegts/linuxdvb/linuxdvb_satconf.c:1312
+#: src/input/mpegts/linuxdvb/linuxdvb_satconf.c:1314
 msgid "Switch type"
 msgstr ""
 
@@ -3629,53 +4195,58 @@ msgstr ""
 msgid "Switch: %s"
 msgstr ""
 
-#: src/input/mpegts/mpegts_mux_dvb.c:294 src/input/mpegts/mpegts_mux_dvb.c:548
+#: src/input/mpegts/mpegts_mux_dvb.c:300 src/input/mpegts/mpegts_mux_dvb.c:556
+#: src/input/mpegts/mpegts_mux_dvb.c:711
 msgid "Symbol rate (Sym/s)"
 msgstr ""
 
-#: src/dvr/dvr_config.c:699
+#: src/dvr/dvr_config.c:704
 msgid "Sync"
 msgstr ""
 
-#: src/dvr/dvr_config.c:700
+#: src/dvr/dvr_config.c:705
 msgid "Sync + Don't keep"
 msgstr ""
 
-#: src/dvr/dvr_config.c:697
+#: src/dvr/dvr_config.c:702
 msgid "System"
 msgstr ""
 
-#: src/dvr/dvr_config.c:1024
+#: src/dvr/dvr_config.c:1035
 msgid "Tag files with metadata"
 msgstr ""
 
-#: src/channels.c:451
+#: src/channels.c:450
 msgid "Tags"
 msgstr ""
 
-#: src/epg.c:2050 src/epg.c:2051 src/epg.c:2052 src/epg.c:2053 src/epg.c:2054
-#: src/epg.c:2055 src/epg.c:2056 src/epg.c:2057 src/epg.c:2058 src/epg.c:2059
-#: src/epg.c:2060
+#: src/epg.c:2051 src/epg.c:2052 src/epg.c:2053 src/epg.c:2054 src/epg.c:2055
+#: src/epg.c:2056 src/epg.c:2057 src/epg.c:2058 src/epg.c:2059 src/epg.c:2060
+#: src/epg.c:2061
 msgid "Talk show"
 msgstr ""
 
-#: src/epg.c:2068
+#: src/epg.c:2069
 msgid "Team sports (excluding football)"
 msgstr ""
 
-#: src/epg.c:2134
+#: src/epg.c:2135
 msgid "Technology"
 msgstr ""
 
-#: src/esfilter.c:765
+#: src/esfilter.c:818
 msgid "Teletext stream filter"
 msgstr ""
 
-#: src/epg.c:2067
+#: src/esfilter.c:825
+msgid "Teletext stream type is only available for this filter."
+msgstr ""
+
+#: src/epg.c:2068
 msgid "Tennis"
 msgstr ""
 
-#: src/subscriptions.c:897
+#: src/subscriptions.c:896
 msgid "Testing"
 msgstr ""
 
@@ -3683,28 +4254,343 @@ msgstr ""
 msgid "Testing options"
 msgstr ""
 
-#: src/input/mpegts/linuxdvb/linuxdvb_frontend.c:201
-#: src/input/mpegts/satip/satip_frontend.c:274
+#: src/input/mpegts/mpegts_service.c:150
+msgid "The ATSC source ID as set by the provider."
+msgstr ""
+
+#: src/esfilter.c:1030
+msgid "The CA provider to compare. Leave blank to apply to all providers."
+msgstr ""
+
+#: src/esfilter.c:1009
+msgid "The CA stream type is only available for this filter."
+msgstr ""
+
+#: src/esfilter.c:1020
+msgid "The CAID to compare. Leave blank to apply to all IDs."
+msgstr ""
+
+#: src/input/mpegts/mpegts_mux.c:566
+msgid "The Content reference identifier (CRID) authority."
+msgstr ""
+
+#: src/esfilter.c:1112
+msgid "The MPEGTS stream type is only available for this filter."
+msgstr ""
+
+#: src/input/mpegts/mpegts_service.c:142
+msgid "The OpenTV channel number as set by the provider."
+msgstr ""
+
+#: src/input/mpegts/mpegts_service.c:210
+msgid ""
+"The Preferred Conditional Access Packet Identifier. Used for decrypting "
+"scrambled streams."
+msgstr ""
+
+#: src/input/mpegts/satip/satip.c:353
+msgid "The SAT>IP server's name."
+msgstr ""
+
+#: src/input/mpegts/satip/satip.c:345
+msgid "The SAT>IP server's universally unique identifier."
+msgstr ""
+
+#: src/input/mpegts/satip/satip.c:465
+msgid "The SAT>IP's discovered IP address."
+msgstr ""
+
+#: src/esfilter.c:733
+msgid "The audio stream types the filter should apply to."
+msgstr ""
+
+#: src/input/mpegts/mpegts_service.c:201
+msgid "The character encoding for this service (e.g. UTF-8)."
+msgstr ""
+
+#: src/input/mpegts/mpegts_mux.c:595
+msgid ""
+"The character set used on this mux. You should not have to change this "
+"unless channel names, etc  appear garbled."
+msgstr ""
+
+#: src/input/mpegts/satip/satip.c:417
+msgid "The current boot ID."
+msgstr ""
+
+#: src/input/mpegts/satip/satip.c:425
+msgid "The current configuration ID."
+msgstr ""
+
+#: src/config.c:1953
+msgid "The current configuration version."
+msgstr ""
+
+#: src/config.c:2090
+msgid ""
+"The default language to use if the user  language isn't set in the Access "
+"Entries tab."
+msgstr ""
+
+#: src/satip/server.c:609
+msgid "The default subscription weight for each subscription."
+msgstr ""
+
+#: src/input/mpegts/satip/satip.c:433
+msgid "The device ID."
+msgstr ""
+
+#: src/input/mpegts/satip/satip.c:361
+msgid "The device's serial number."
+msgstr ""
+
+#: src/input/mpegts/mpegts_mux_dvb.c:220 src/input/mpegts/mpegts_mux_dvb.c:293
+#: src/input/mpegts/mpegts_mux_dvb.c:549 src/input/mpegts/mpegts_mux_dvb.c:669
+#: src/input/mpegts/mpegts_mux_dvb.c:704
+msgid "The frequency of the mux (in Hertz)."
+msgstr ""
+
+#: src/esfilter.c:652 src/esfilter.c:744 src/esfilter.c:836 src/esfilter.c:928
+#: src/esfilter.c:1123
+msgid "The language the filter should apply to."
+msgstr ""
+
+#: src/input/mpegts/mpegts_service.c:219
+msgid ""
+"The locking mechanism selection for The Preferred Conditional Access Packet "
+"Identifier. See Help for more information."
+msgstr ""
+
+#: src/esfilter.c:672 src/esfilter.c:764 src/esfilter.c:856 src/esfilter.c:948
+#: src/esfilter.c:1051
+msgid ""
+"The logical stream index to compare. Note that this index is computed using "
+"all filters.Example: If filter is set to AC3 audio type and the language to "
+"'eng' and there are two AC3 'eng' streams in the service, the first stream "
+"could be identified using number 1 and the second using number 2."
+msgstr ""
+
+#: src/input/mpegts/satip/satip.c:377
+msgid "The manufacturer of the SAT>IP server."
+msgstr ""
+
+#: src/satip/server.c:629
+msgid "The maximum number of services to decrypt per mux."
+msgstr ""
+
+#: src/input/mpegts/satip/satip_frontend.c:165
+msgid ""
+"The minimum delay before tuning in milliseconds after tuner stop. If the "
+"time between the previous and next start is greater than this value then the "
+"delay is not applied."
+msgstr ""
+
+#: src/input/mpegts/mpegts_mux_dvb.c:568
+msgid "The modulation used on the mux."
+msgstr ""
+
+#: src/epggrab.c:347
+msgid ""
+"The multiplex (mux) is tuned for this amount of time at most. If the EPG "
+"data is complete before this limit, the mux is released sooner."
+msgstr ""
+
+#: src/input/mpegts/mpegts_mux_dvb.c:581
+msgid ""
+"The mux rolloff. Leave as AUTO unless you know the exact rolloff for this "
+"mux."
+msgstr ""
+
+#: src/input/mpegts/mpegts_service.c:102
+msgid "The mux the service is on."
+msgstr ""
+
+#: src/input/mpegts/mpegts_service.c:110
+msgid "The mux's universally unique identifier."
+msgstr ""
+
+#: src/input/mpegts/mpegts_mux.c:533
+msgid "The name (or freq) this mux is on."
+msgstr ""
+
+#: src/input/mpegts/mpegts_service.c:94
+msgid "The network the service is on."
+msgstr ""
+
+#: src/input/mpegts/mpegts_mux.c:517
+msgid "The network this mux is on."
+msgstr ""
+
+#: src/input/mpegts/mpegts_mux.c:525
+msgid "The networks universally unique identifier (UUID)."
+msgstr ""
+
+#: src/input/mpegts/satip/satip_satconf.c:231
+msgid "The networks using this configuration."
+msgstr ""
+
+#: src/satip/server.c:730
+msgid "The number of ATSC-C (Cable/AnnexB) tuners to export."
+msgstr ""
+
+#: src/satip/server.c:722
+msgid "The number of ATSC-T (Terresterial) tuners to export."
+msgstr ""
+
+#: src/satip/server.c:706
+msgid "The number of DVB-C (Cable) tuners to export."
+msgstr ""
+
+#: src/satip/server.c:714
+msgid "The number of DVB-C2 (Cable) tuners to export."
+msgstr ""
+
+#: src/satip/server.c:674
+msgid "The number of DVB-S (Satellite) tuners to export."
+msgstr ""
+
+#: src/satip/server.c:682
+msgid "The number of DVB-S2 (Satellite) tuners to export."
+msgstr ""
+
+#: src/satip/server.c:690
+msgid "The number of DVB-T (Terresterial) tuners to export."
+msgstr ""
+
+#: src/satip/server.c:698
+msgid "The number of DVB-T2 (Terresterial) tuners to export."
+msgstr ""
+
+#: src/config.c:2009
+msgid "The number of days cookies set by Tvheadend should expire."
+msgstr ""
+
+#: src/config.c:2049
+msgid ""
+"The number of packets Tvheadend buffers in case there is a delay receiving "
+"CA keys. "
+msgstr ""
+
+#: src/input/mpegts/mpegts_mux.c:614
+msgid "The number of services on this mux that are mapped to channels."
+msgstr ""
+
+#: src/input/mpegts/mpegts_mux_dvb.c:632
+msgid "The orbital position of the satellite this mux is on."
+msgstr ""
+
+#: src/input/mpegts/mpegts_mux.c:586
+msgid "The outcome of the last scan performed on this mux."
+msgstr ""
+
+#: src/input/mpegts/mpegts_service.c:166
+msgid "The provider's name."
+msgstr ""
+
+#: src/input/mpegts/mpegts_mux.c:549
+msgid "The provider's network ID."
+msgstr ""
+
+#: src/input/mpegts/mpegts_mux.c:541
+msgid "The provider's network name."
+msgstr ""
+
+#: src/esfilter.c:695 src/esfilter.c:787 src/esfilter.c:879 src/esfilter.c:971
+#: src/esfilter.c:1074 src/esfilter.c:1153
+msgid ""
+"The rule action defines the operation when all comparisons succeed. See Help "
+"for more information on what the various rules do."
+msgstr ""
+
+#: src/input/mpegts/mpegts_mux.c:574
+msgid ""
+"The scan state. New muxes will automatically be changed to the PEND state. "
+"You can change this to ACTIVE to queue a scan of this mux."
+msgstr ""
+
+#: src/input/mpegts/mpegts_service.c:118
+msgid "The service ID as set by the provider."
+msgstr ""
+
+#: src/input/mpegts/mpegts_service.c:158
+msgid "The service name as set by the provider."
+msgstr ""
+
+#: src/esfilter.c:661 src/esfilter.c:753 src/esfilter.c:845 src/esfilter.c:937
+#: src/esfilter.c:1040 src/esfilter.c:1132
+msgid ""
+"The service the filter should apply to. Leave blank to apply the filter to "
+"all services."
+msgstr ""
+
+#: src/input/mpegts/mpegts_service.c:182
+msgid ""
+"The service type flag as defined by the DVB specifications (e.g. 0x02 = "
+"radio, 0x11 = MPEG2 HD TV, 0x19 = H.264 HD TV)"
+msgstr ""
+
+#: src/input/mpegts/mpegts_service.c:134
+msgid "The service's channel minor as set by the provider."
+msgstr ""
+
+#: src/input/mpegts/mpegts_service.c:126
+msgid "The service's channel number as set by the provider."
+msgstr ""
+
+#: src/input/mpegts/mpegts_mux_dvb.c:603
+msgid "The stream ID used for this mux."
+msgstr ""
+
+#: src/esfilter.c:917
+msgid "The subtitle stream types the filter should apply to."
+msgstr ""
+
+#: src/input/mpegts/mpegts_mux_dvb.c:301 src/input/mpegts/mpegts_mux_dvb.c:557
+#: src/input/mpegts/mpegts_mux_dvb.c:712
+msgid "The symbol rate."
+msgstr ""
+
+#: src/input/mpegts/mpegts_mux.c:606
+msgid "The total number of services found on this mux."
+msgstr ""
+
+#: src/input/mpegts/mpegts_mux.c:557
+msgid "The transport stream ID of the mux within the network."
+msgstr ""
+
+#: src/esfilter.c:641
+msgid "The video stream types the filter should apply to."
+msgstr ""
+
+#: src/input/mpegts/linuxdvb/linuxdvb_frontend.c:202
+#: src/input/mpegts/satip/satip_frontend.c:296
 msgid "This tuner"
 msgstr ""
 
-#: src/epg.c:2016
+#: src/config.c:2123
+msgid ""
+"This will create an NTP driver (using shmem interface) that you can feed "
+"into ntpd. This can be run without root privileges, but generally the "
+"performance is not that great."
+msgstr ""
+
+#: src/epg.c:2017
 msgid "Thriller"
 msgstr ""
 
-#: src/dvr/dvr_autorec.c:758
+#: src/dvr/dvr_autorec.c:759
 msgid "Thu"
 msgstr ""
 
-#: src/config.c:1866
+#: src/config.c:1869
 msgid "Time"
 msgstr ""
 
-#: src/dvr/dvr_db.c:503
+#: src/dvr/dvr_db.c:516
 msgid "Time missed"
 msgstr ""
 
-#: src/dvr/dvr_db.c:2910
+#: src/dvr/dvr_db.c:2971
 msgid "Time record caption"
 msgstr ""
 
@@ -3713,15 +4599,15 @@ msgstr ""
 msgid "Time recording%s%s"
 msgstr ""
 
-#: src/config.c:1936
+#: src/config.c:1939
 msgid "Time update"
 msgstr ""
 
-#: src/profile.c:351
+#: src/profile.c:353
 msgid "Timeout (sec) (0=infinite)"
 msgstr ""
 
-#: src/input/mpegts/satip/satip_satconf.c:208
+#: src/input/mpegts/satip/satip_satconf.c:212
 msgid "Timeout (seconds)"
 msgstr ""
 
@@ -3733,11 +4619,11 @@ msgstr ""
 msgid "Timout (secs)"
 msgstr ""
 
-#: src/dvr/dvr_db.c:2734 src/dvr/dvr_db.c:2741 src/dvr/dvr_timerec.c:549
+#: src/dvr/dvr_db.c:2795 src/dvr/dvr_db.c:2802 src/dvr/dvr_timerec.c:550
 msgid "Title"
 msgstr ""
 
-#: src/dvr/dvr_autorec.c:976
+#: src/dvr/dvr_autorec.c:977
 msgid "Title (regexp)"
 msgstr ""
 
@@ -3749,7 +4635,7 @@ msgstr ""
 msgid "Tone burst"
 msgstr ""
 
-#: src/epg.c:2149
+#: src/epg.c:2150
 msgid "Tourism / Travel"
 msgstr ""
 
@@ -3757,23 +4643,23 @@ msgstr ""
 msgid "Trace subsystems"
 msgstr ""
 
-#: src/epg.c:2109
+#: src/epg.c:2110
 msgid "Traditional arts"
 msgstr ""
 
-#: src/epg.c:2093
+#: src/epg.c:2094
 msgid "Traditional music"
 msgstr ""
 
-#: src/profile.c:1566
+#: src/profile.c:1570
 msgid "Transcode/av-lib"
 msgstr ""
 
-#: src/profile.c:1573
+#: src/profile.c:1577
 msgid "Transcoding"
 msgstr ""
 
-#: src/input/mpegts/mpegts_mux_dvb.c:226
+#: src/input/mpegts/mpegts_mux_dvb.c:231
 msgid "Transmission mode"
 msgstr ""
 
@@ -3781,11 +4667,11 @@ msgstr ""
 msgid "Transponder ID"
 msgstr ""
 
-#: src/input/mpegts/mpegts_mux.c:549
+#: src/input/mpegts/mpegts_mux.c:556
 msgid "Transport stream ID"
 msgstr ""
 
-#: src/dvr/dvr_autorec.c:756
+#: src/dvr/dvr_autorec.c:757
 msgid "Tue"
 msgstr ""
 
@@ -3793,11 +4679,11 @@ msgstr ""
 msgid "Tune before DiseqC"
 msgstr ""
 
-#: src/input/mpegts/satip/satip_frontend.c:188
+#: src/input/mpegts/satip/satip_frontend.c:205
 msgid "Tuner bind IP address"
 msgstr ""
 
-#: src/input/mpegts/satip/satip.c:203 src/input/mpegts/satip/satip.c:339
+#: src/input/mpegts/satip/satip.c:203 src/input/mpegts/satip/satip.c:368
 msgid "Tuner configuration"
 msgstr ""
 
@@ -3809,7 +4695,7 @@ msgstr ""
 msgid "Turn off LNB when idle"
 msgstr ""
 
-#: src/config.c:1965
+#: src/config.c:1969
 msgid "Tvheadend server name"
 msgstr ""
 
@@ -3817,11 +4703,11 @@ msgstr ""
 msgid "Type"
 msgstr ""
 
-#: src/input/mpegts/satip/satip_frontend.c:153
+#: src/input/mpegts/satip/satip_frontend.c:154
 msgid "UDP RTP port number (2 ports)"
 msgstr ""
 
-#: src/dvr/dvr_db.c:2956 src/input/mpegts/iptv/iptv.c:816
+#: src/dvr/dvr_db.c:3017 src/input/mpegts/iptv/iptv.c:817
 #: src/input/mpegts/iptv/iptv_mux.c:139
 msgid "URL"
 msgstr ""
@@ -3838,8 +4724,8 @@ msgstr ""
 msgid "USALS rotor"
 msgstr ""
 
-#: src/input/mpegts/satip/satip.c:318
-#: src/input/mpegts/tvhdhomerun/tvhdhomerun.c:156
+#: src/input/mpegts/satip/satip.c:344
+#: src/input/mpegts/tvhdhomerun/tvhdhomerun.c:157
 msgid "UUID"
 msgstr ""
 
@@ -3859,11 +4745,11 @@ msgstr ""
 msgid "Unicable switch (universal LNB, experimental)"
 msgstr ""
 
-#: src/input/mpegts/linuxdvb/linuxdvb_satconf.c:1330
+#: src/input/mpegts/linuxdvb/linuxdvb_satconf.c:1332
 msgid "Unicable type"
 msgstr ""
 
-#: src/profile.c:250 src/dvr/dvr_db.c:2179
+#: src/profile.c:252 src/dvr/dvr_db.c:2238
 msgid "Unimportant"
 msgstr ""
 
@@ -3871,7 +4757,11 @@ msgstr ""
 msgid "Universal LNB only"
 msgstr ""
 
-#: src/epggrab/module.c:60 src/dvr/dvr_timerec.c:95 src/dvr/dvr_config.c:696
+#: src/satip/server.c:590
+msgid "Universally unique identifier. Read only."
+msgstr ""
+
+#: src/epggrab/module.c:60 src/dvr/dvr_timerec.c:95 src/dvr/dvr_config.c:701
 msgid "Unknown"
 msgstr ""
 
@@ -3888,7 +4778,7 @@ msgstr ""
 msgid "Unlimited time"
 msgstr ""
 
-#: src/profile.c:245
+#: src/profile.c:247
 msgid "Unset (default)"
 msgstr ""
 
@@ -3896,31 +4786,31 @@ msgstr ""
 msgid "Update card (EMM)"
 msgstr ""
 
-#: src/epggrab.c:282
+#: src/epggrab.c:288
 msgid "Update channel icon"
 msgstr ""
 
-#: src/epggrab.c:268
+#: src/epggrab.c:266
 msgid "Update channel name"
 msgstr ""
 
-#: src/epggrab.c:275
+#: src/epggrab.c:277
 msgid "Update channel number"
 msgstr ""
 
-#: src/dvr/dvr_config.c:761
+#: src/dvr/dvr_config.c:768
 msgid "Update disabled"
 msgstr ""
 
-#: src/config.c:2060
+#: src/config.c:2111
 msgid "Update time"
 msgstr ""
 
-#: src/config.c:2076
+#: src/config.c:2134
 msgid "Update tolerance (ms)"
 msgstr ""
 
-#: src/epggrab/channel.c:696
+#: src/epggrab/channel.c:704
 msgid "Updated"
 msgstr ""
 
@@ -3929,11 +4819,19 @@ msgstr ""
 msgid "Usage: %s [OPTIONS]\n"
 msgstr ""
 
-#: src/channels.c:431 src/dvr/dvr_config.c:940
+#: src/input/mpegts/mpegts_mux.c:623
+msgid "Use AC-3 detection on this mux."
+msgstr ""
+
+#: src/dvr/dvr_config.c:949
+msgid "Use EITp/f to decide event start / stop"
+msgstr ""
+
+#: src/channels.c:430 src/dvr/dvr_config.c:948
 msgid "Use EPG running state"
 msgstr ""
 
-#: src/dvr/dvr_config.c:1148
+#: src/dvr/dvr_config.c:1159
 msgid "Use Windows-compatible filenames"
 msgstr ""
 
@@ -3941,59 +4839,106 @@ msgstr ""
 msgid "Use XSPF playlist instead of M3U"
 msgstr ""
 
-#: src/profile.c:1460
+#: src/input/mpegts/mpegts_network_dvb.c:312
+msgid ""
+"Use a pre-defined list of ATSC-C muxes. Note: these lists can sometimes be "
+"outdated and may cause scanning to take longer than usual."
+msgstr ""
+
+#: src/input/mpegts/mpegts_network_dvb.c:290
+msgid ""
+"Use a pre-defined list of ATSC-T muxes. Note: these lists can sometimes be "
+"outdated and may cause scanning to take longer than usual."
+msgstr ""
+
+#: src/input/mpegts/mpegts_network_dvb.c:236
+msgid ""
+"Use a pre-defined list of DVB-C muxes. Note: these lists can sometimes be "
+"outdated and may cause scanning to take longer than usual."
+msgstr ""
+
+#: src/input/mpegts/mpegts_network_dvb.c:258
+msgid ""
+"Use a pre-defined list of DVB-S/S2 muxes. Note: these lists can sometimes be "
+"outdated and may cause scanning to take longer than usual."
+msgstr ""
+
+#: src/input/mpegts/mpegts_network_dvb.c:214
+msgid ""
+"Use a pre-defined list of DVB-T muxes. Note: these lists can sometimes be "
+"outdated and may cause scanning to take longer than usual."
+msgstr ""
+
+#: src/config.c:2169
+msgid "Use icons with lower-case filenames only."
+msgstr ""
+
+#: src/profile.c:1464
 msgid "Use original"
 msgstr ""
 
+#: src/input/mpegts/mpegts_mux_dvb.c:592
+msgid "Use pilot on this mux. AUTO is the recommended value."
+msgstr ""
+
 #: src/input/mpegts/mpegts_network.c:189
 msgid "Use service IDs as channel numbers"
 msgstr ""
 
-#: src/streaming.c:422 src/dvr/dvr_db.c:487
+#: src/streaming.c:422 src/dvr/dvr_db.c:500
 msgid "User access error"
 msgstr ""
 
-#: src/channels.c:385
+#: src/channels.c:384
 msgid "User icon"
 msgstr ""
 
-#: src/access.c:1437 src/config.c:1972
+#: src/access.c:1441 src/config.c:1978
 msgid "User interface level"
 msgstr ""
 
-#: src/config.c:2044
+#: src/config.c:1999
+msgid "User interface quick tips"
+msgstr ""
+
+#: src/config.c:2089
 msgid "User language"
 msgstr ""
 
-#: src/streaming.c:424 src/dvr/dvr_db.c:489
+#: src/streaming.c:424 src/dvr/dvr_db.c:502
 msgid "User limit reached"
 msgstr ""
 
-#: src/access.c:1423 src/access.c:1811 src/descrambler/cwc.c:1736
+#: src/wizard.c:238
+msgid "User login"
+msgstr ""
+
+#: src/access.c:1427 src/access.c:1826 src/wizard.c:271
+#: src/descrambler/cwc.c:1736
 msgid "Username"
 msgstr ""
 
-#: src/epg.c:2049
+#: src/epg.c:2050
 msgid "Variety show"
 msgstr ""
 
-#: src/epg.c:2112
+#: src/epg.c:2113
 msgid "Video"
 msgstr ""
 
-#: src/profile.c:1628
+#: src/profile.c:1632
 msgid "Video bitrate (kb/s) (0=auto)"
 msgstr ""
 
-#: src/profile.c:1618
+#: src/profile.c:1622
 msgid "Video codec"
 msgstr ""
 
-#: src/access.c:1498
+#: src/access.c:1502
 msgid "Video recorder"
 msgstr ""
 
-#: src/esfilter.c:631
+#: src/esfilter.c:634
 msgid "Video stream filter"
 msgstr ""
 
@@ -4001,47 +4946,47 @@ msgstr ""
 msgid "Visually impaired commentary/audio description"
 msgstr ""
 
-#: src/profile.c:1158 src/profile.c:1327
+#: src/profile.c:1162 src/profile.c:1331
 msgid "WEBM"
 msgstr ""
 
-#: src/profile.c:1427
+#: src/profile.c:1431
 msgid "WEBM/av-lib"
 msgstr ""
 
-#: src/profile.c:1423
+#: src/profile.c:1427
 msgid "WEBM/built-in"
 msgstr ""
 
-#: src/profile.c:1973
+#: src/profile.c:1977
 msgid "WEBTV profile H264/AAC/MPEG-TS"
 msgstr ""
 
-#: src/profile.c:1993
+#: src/profile.c:1997
 msgid "WEBTV profile H264/AAC/Matroska"
 msgstr ""
 
-#: src/profile.c:1953
+#: src/profile.c:1957
 msgid "WEBTV profile VP8/Vorbis/WEBM"
 msgstr ""
 
-#: src/dvr/dvr_db.c:475
+#: src/dvr/dvr_db.c:488
 msgid "Waiting for EPG running flag"
 msgstr ""
 
-#: src/dvr/dvr_db.c:467
+#: src/dvr/dvr_db.c:480
 msgid "Waiting for program start"
 msgstr ""
 
-#: src/dvr/dvr_db.c:465
+#: src/dvr/dvr_db.c:478
 msgid "Waiting for stream"
 msgstr ""
 
-#: src/epg.c:2017
+#: src/epg.c:2018
 msgid "War"
 msgstr ""
 
-#: src/epg.c:2071
+#: src/epg.c:2072
 msgid "Water sport"
 msgstr ""
 
@@ -4049,27 +4994,31 @@ msgstr ""
 msgid "Weak stream"
 msgstr ""
 
-#: src/epg.c:2032
+#: src/epg.c:2033
 msgid "Weather report"
 msgstr ""
 
-#: src/access.c:1540
+#: src/access.c:1544
 msgid "Web interface"
 msgstr ""
 
-#: src/access.c:1461
+#: src/access.c:1465
 msgid "Web interface language"
 msgstr ""
 
-#: src/config.c:1928
+#: src/config.c:1931
 msgid "Web user interface"
 msgstr ""
 
-#: src/dvr/dvr_autorec.c:757
+#: src/dvr/dvr_autorec.c:758
 msgid "Wed"
 msgstr ""
 
-#: src/epg.c:2017
+#: src/wizard.c:291
+msgid "Welcome - Tvheadend - your TV streaming server and video recorder"
+msgstr ""
+
+#: src/epg.c:2018
 msgid "Western"
 msgstr ""
 
@@ -4077,15 +5026,41 @@ msgstr ""
 msgid "Western hemisphere (latitude direction)"
 msgstr ""
 
+#: src/input/mpegts/mpegts_service.c:238
+msgid "When the service was first identified and recorded."
+msgstr ""
+
+#: src/input/mpegts/mpegts_service.c:246
+msgid "When the service was last seen during a mux scan."
+msgstr ""
+
+#: src/access.c:1609 src/access.c:1854
+msgid "Wizard"
+msgstr ""
+
 #: src/descrambler/capmt.c:2272
 msgid "Wrapper (capmt_ca.so)"
 msgstr ""
 
-#: src/access.c:1391
+#: src/esfilter.c:706 src/esfilter.c:798 src/esfilter.c:890 src/esfilter.c:982
+#: src/esfilter.c:1085 src/esfilter.c:1164
+msgid ""
+"Write a short message to log identifying the matched parameters. It is "
+"useful for debugging your setup or structure of incoming streams."
+msgstr ""
+
+#: src/epggrab.c:300
+msgid ""
+"Writes the current in-memory EPG database to disk every x hours, so should a "
+"crash/unexpected shutdown occur EPG data is saved periodically to the "
+"database (re-read on next startup). Set to 0 to disable."
+msgstr ""
+
+#: src/access.c:1395
 msgid "Yes"
 msgstr ""
 
-#: src/input/mpegts/satip/satip.c:255
+#: src/input/mpegts/satip/satip.c:265
 msgid "addpids/delpids supported"
 msgstr ""
 
@@ -4093,7 +5068,7 @@ msgstr ""
 msgid "en50494"
 msgstr ""
 
-#: src/dvr/dvr_db.c:2591
+#: src/dvr/dvr_db.c:2653
 msgid "hrs"
 msgstr ""
 
@@ -4102,11 +5077,11 @@ msgstr ""
 msgid "invalid option specified [%s]"
 msgstr ""
 
-#: src/dvr/dvr_db.c:2592
+#: src/dvr/dvr_db.c:2654
 msgid "min"
 msgstr ""
 
-#: src/dvr/dvr_db.c:2593
+#: src/dvr/dvr_db.c:2655
 msgid "mins"
 msgstr ""
 
@@ -4119,6 +5094,6 @@ msgstr ""
 msgid "tsfile input (mux file)"
 msgstr ""
 
-#: src/input/mpegts/tvhdhomerun/tvhdhomerun.c:134
+#: src/input/mpegts/tvhdhomerun/tvhdhomerun.c:135
 msgid "tvhdhomerun client"
 msgstr ""
diff --git a/src/config.c b/src/config.c
index 8b90d8b09..a768d944f 100644
--- a/src/config.c
+++ b/src/config.c
@@ -2062,7 +2062,7 @@ const idclass_t config_class = {
       .name   = N_("Default language(s)"),
       .desc   = N_("Select the list of languages (in order of "
                    "priority) to be used for supplying EPG information "
-                   "to clients that don’t provide their own "
+                   "to clients that don't provide their own "
                    "configuration."),
       .set    = config_class_language_set,
       .get    = config_class_language_get,
@@ -2132,7 +2132,7 @@ const idclass_t config_class = {
       .type   = PT_U32,
       .id     = "tvhtime_tolerance",
       .name   = N_("Update tolerance (ms)"),
-      .desc   = N_("Only update the system clock (doesn’t affect NTP "
+      .desc   = N_("Only update the system clock (doesn't affect NTP "
                    "driver) if the delta between the system clock and "
                    "DVB time is greater than this. This can help stop "
                    "excessive oscillations on the system clock."),
diff --git a/src/esfilter.c b/src/esfilter.c
index ec906cf2b..fc70446c7 100644
--- a/src/esfilter.c
+++ b/src/esfilter.c
@@ -672,8 +672,8 @@ const idclass_t esfilter_class_video = {
       .desc     = N_("The logical stream index to compare. Note that "
                      "this index is computed using all filters."
                      "Example: If filter is set to AC3 audio type and "
-                     "the language to ‘eng’ and there are two AC3 "
-                     "‘eng’ streams in the service, the first stream "
+                     "the language to 'eng' and there are two AC3 "
+                     "'eng' streams in the service, the first stream "
                      "could be identified using number 1 and the "
                      "second using number 2."),
       .off      = offsetof(esfilter_t, esf_sindex),
@@ -764,8 +764,8 @@ const idclass_t esfilter_class_audio = {
       .desc     = N_("The logical stream index to compare. Note that "
                      "this index is computed using all filters."
                      "Example: If filter is set to AC3 audio type and "
-                     "the language to ‘eng’ and there are two AC3 "
-                     "‘eng’ streams in the service, the first stream "
+                     "the language to 'eng' and there are two AC3 "
+                     "'eng' streams in the service, the first stream "
                      "could be identified using number 1 and the "
                      "second using number 2."),
       .off      = offsetof(esfilter_t, esf_sindex),
@@ -856,8 +856,8 @@ const idclass_t esfilter_class_teletext = {
       .desc     = N_("The logical stream index to compare. Note that "
                      "this index is computed using all filters."
                      "Example: If filter is set to AC3 audio type and "
-                     "the language to ‘eng’ and there are two AC3 "
-                     "‘eng’ streams in the service, the first stream "
+                     "the language to 'eng' and there are two AC3 "
+                     "'eng' streams in the service, the first stream "
                      "could be identified using number 1 and the "
                      "second using number 2."),
       .off      = offsetof(esfilter_t, esf_sindex),
@@ -948,8 +948,8 @@ const idclass_t esfilter_class_subtit = {
       .desc     = N_("The logical stream index to compare. Note that "
                      "this index is computed using all filters."
                      "Example: If filter is set to AC3 audio type and "
-                     "the language to ‘eng’ and there are two AC3 "
-                     "‘eng’ streams in the service, the first stream "
+                     "the language to 'eng' and there are two AC3 "
+                     "'eng' streams in the service, the first stream "
                      "could be identified using number 1 and the "
                      "second using number 2."),
       .off      = offsetof(esfilter_t, esf_sindex),
@@ -1051,8 +1051,8 @@ const idclass_t esfilter_class_ca = {
       .desc     = N_("The logical stream index to compare. Note that "
                      "this index is computed using all filters."
                      "Example: If filter is set to AC3 audio type and "
-                     "the language to ‘eng’ and there are two AC3 "
-                     "‘eng’ streams in the service, the first stream "
+                     "the language to 'eng' and there are two AC3 "
+                     "'eng' streams in the service, the first stream "
                      "could be identified using number 1 and the "
                      "second using number 2."),
       .off      = offsetof(esfilter_t, esf_sindex),
diff --git a/src/input/mpegts/satip/satip_frontend.c b/src/input/mpegts/satip/satip_frontend.c
index 3f5896b4b..62229ffe3 100644
--- a/src/input/mpegts/satip/satip_frontend.c
+++ b/src/input/mpegts/satip/satip_frontend.c
@@ -184,7 +184,7 @@ const idclass_t satip_frontend_class =
       .id       = "teardown_delay",
       .name     = N_("Force teardown delay"),
       .desc     = N_("Force the delay between RTSP TEARDOWN and RTSP "
-                     "SETUP command (value from ‘Next tune delay in ms’ "
+                     "SETUP command (value from 'Next tune delay in ms' "
                      "is used). Some devices are not able to handle "
                      "quick continuous tuning."),
       .opts     = PO_ADVANCED,