- Adapted Rolf Ahrenbergs patch for VLC streaming to current LIVE

  development status. See Bug #343. This will need some additional tweaking.

35 files changed, 1086 insertions, 94 deletions

diff --git a/doc/ChangeLog b/doc/ChangeLog
index 68cb085..48b5566 100644
--- a/doc/ChangeLog
+++ b/doc/ChangeLog
@@ -1,8 +1,17 @@
+2007-12-17  Dieter Hametner  <dh+vdr at gekrumbel dot de>
+
+	- Adapted Rolf Ahrenbergs patch for VLC plugin streaming to the
+	  browser window using streamdev-server plugin on VDR.  See
+	  Bug-Entry #343.  You can stream current running program from the
+	  "whats_on now" schedules page into an extra browser window if
+	  javascript is active.  Otherwise you get redirected onto a
+	  dedicated new live streaming page.
+
 2007-10-21  Dieter Hametner  <dh+vdr at gekrumbel dot de>
 
 	- Renamed recordings.h/cpp files to recman.h/cpp. Adapted
 	  files that included them.
-	- recman.h have extended functionality for recordings. It is not used
+	- recman.h has extended functionality for recordings. It is not used
 	  yet.
 
 2007-10-17  Dieter Hametner  <dh+vdr at gekrumbel dot de>
diff --git a/i18n-generated.h b/i18n-generated.h
index 412974b..8267050 100644
--- a/i18n-generated.h
+++ b/i18n-generated.h
@@ -327,7 +327,7 @@ const tI18nPhrase Phrases[] = {
 #endif
   },
   { "Error in timer settings",
-    "",
+    "Fehler in den Timer Einstellungen",
     "",
     "",
     "",
@@ -362,7 +362,7 @@ const tI18nPhrase Phrases[] = {
 #endif
   },
   { "Timer already defined",
-    "",
+    "Timer ist bereits vorhanden",
     "",
     "",
     "",
@@ -397,7 +397,7 @@ const tI18nPhrase Phrases[] = {
 #endif
   },
   { "Timers are being edited - try again later",
-    "",
+    "Timer werden bearbeitet - später nochmal versuchen",
     "",
     "",
     "",
@@ -432,7 +432,7 @@ const tI18nPhrase Phrases[] = {
 #endif
   },
   { "Timer not defined",
-    "",
+    "Timer wurde nicht erstellt",
     "",
     "",
     "",
@@ -747,7 +747,7 @@ const tI18nPhrase Phrases[] = {
 #endif
   },
   { "Wrong channel id",
-    "",
+    "Fehlerhafte Kanal Id",
     "",
     "",
     "",
@@ -782,7 +782,7 @@ const tI18nPhrase Phrases[] = {
 #endif
   },
   { "Channel has no schedule",
-    "",
+    "Kanal hat keine Programminfos",
     "",
     "",
     "",
@@ -922,7 +922,7 @@ const tI18nPhrase Phrases[] = {
 #endif
   },
   { "FTA",
-    "",
+    "FTA",
     "",
     "",
     "",
@@ -1097,7 +1097,7 @@ const tI18nPhrase Phrases[] = {
 #endif
   },
   { "channels",
-    "",
+    "Kanäle",
     "",
     "",
     "",
@@ -5856,6 +5856,41 @@ const tI18nPhrase Phrases[] = {
     "",
 #endif
   },
+  { "Stream this channel into browser.",
+    "Sendung im Browser anzeigen.",
+    "",
+    "",
+    "",
+    "",
+    "",
+    "",
+    "",
+    "",
+    "",
+    "",
+    "",
+    "",
+    "",
+    "",
+#if VDRVERSNUM >= 10302
+    "",
+#endif
+#if VDRVERSNUM >= 10307
+    "",
+#endif
+#if VDRVERSNUM >= 10313
+    "",
+#endif
+#if VDRVERSNUM >= 10316
+    "",
+#endif
+#if VDRVERSNUM >= 10342
+    "",
+#endif
+#if VDRVERSNUM >= 10502
+    "",
+#endif
+  },
   { "Find more at the Internet Movie Database.",
     "Weitere Informationen in der Internet Movie Database.",
     "",
@@ -6381,6 +6416,41 @@ const tI18nPhrase Phrases[] = {
     "",
 #endif
   },
+  { "RecDate",
+    "Aufnahmedatum",
+    "",
+    "",
+    "",
+    "",
+    "",
+    "",
+    "",
+    "",
+    "",
+    "",
+    "",
+    "",
+    "",
+    "",
+#if VDRVERSNUM >= 10302
+    "",
+#endif
+#if VDRVERSNUM >= 10307
+    "",
+#endif
+#if VDRVERSNUM >= 10313
+    "",
+#endif
+#if VDRVERSNUM >= 10316
+    "",
+#endif
+#if VDRVERSNUM >= 10342
+    "",
+#endif
+#if VDRVERSNUM >= 10502
+    "",
+#endif
+  },
   { "List of recordings",
     "Liste der Aufnahmen",
     "",
@@ -6767,7 +6837,7 @@ const tI18nPhrase Phrases[] = {
 #endif
   },
   { "no",
-    "",
+    "nein",
     "",
     "",
     "",
@@ -6907,7 +6977,7 @@ const tI18nPhrase Phrases[] = {
 #endif
   },
   { "Channel",
-    "",
+    "Kanal",
     "",
     "",
     "",
@@ -7222,7 +7292,7 @@ const tI18nPhrase Phrases[] = {
 #endif
   },
   { "Setup",
-    "",
+    "Einstellungen",
     "",
     "",
     "",
@@ -7396,6 +7466,76 @@ const tI18nPhrase Phrases[] = {
     "",
 #endif
   },
+  { "Allow video streaming",
+    "Erlaube Videoanzeige im Browser",
+    "",
+    "",
+    "",
+    "",
+    "",
+    "",
+    "Näytä Live-logo",
+    "",
+    "",
+    "",
+    "",
+    "",
+    "",
+    "",
+#if VDRVERSNUM >= 10302
+    "",
+#endif
+#if VDRVERSNUM >= 10307
+    "",
+#endif
+#if VDRVERSNUM >= 10313
+    "",
+#endif
+#if VDRVERSNUM >= 10316
+    "",
+#endif
+#if VDRVERSNUM >= 10342
+    "",
+#endif
+#if VDRVERSNUM >= 10502
+    "",
+#endif
+  },
+  { "streamdev server port",
+    "Streamdev Server Port",
+    "",
+    "",
+    "",
+    "",
+    "",
+    "",
+    "",
+    "",
+    "",
+    "",
+    "",
+    "",
+    "",
+    "",
+#if VDRVERSNUM >= 10302
+    "",
+#endif
+#if VDRVERSNUM >= 10307
+    "",
+#endif
+#if VDRVERSNUM >= 10313
+    "",
+#endif
+#if VDRVERSNUM >= 10316
+    "",
+#endif
+#if VDRVERSNUM >= 10342
+    "",
+#endif
+#if VDRVERSNUM >= 10502
+    "",
+#endif
+  },
   { "additional fixed times in 'What's on?'",
     "zusätzliche Zeitpunkte in 'Was läuft?'",
     "",
@@ -7641,6 +7781,41 @@ const tI18nPhrase Phrases[] = {
     "",
 #endif
   },
+  { "VLC: live video stream",
+    "VLC: Video Stream",
+    "",
+    "",
+    "",
+    "",
+    "",
+    "",
+    "",
+    "",
+    "",
+    "",
+    "",
+    "",
+    "",
+    "",
+#if VDRVERSNUM >= 10302
+    "",
+#endif
+#if VDRVERSNUM >= 10307
+    "",
+#endif
+#if VDRVERSNUM >= 10313
+    "",
+#endif
+#if VDRVERSNUM >= 10316
+    "",
+#endif
+#if VDRVERSNUM >= 10342
+    "",
+#endif
+#if VDRVERSNUM >= 10502
+    "",
+#endif
+  },
   { "What's running at",
     "Was läuft um",
     "",
@@ -7677,7 +7852,7 @@ const tI18nPhrase Phrases[] = {
 #endif
   },
   { "What's on next?",
-    "",
+    "Was läuft als nächstes?",
     "",
     "",
     "",
diff --git a/live/js/live/browserwin.js b/live/js/live/browserwin.js
new file mode 100644
index 0000000..e69e0f3
--- /dev/null
+++ b/live/js/live/browserwin.js
@@ -0,0 +1,97 @@
+/*
+ * This is part of the live vdr plugin. See COPYING for license information.
+ *
+ * browserwin.js
+ *
+ * BrowserWin class, BrowserWin.Manager class
+ *
+ * Extension of mootools to create and manage browser windows.
+ */
+
+/*
+Class: BrowserWin
+	Create and browswer window pointing at an specific URL.
+
+Arguments:
+
+Options:
+
+Note:
+*/
+var BrowserWin = new Class({
+	  options: {
+		  size: { width: 300, height: 200 },
+		  toolbar: false,
+		  location: false,
+		  directories: false,
+		  status: false,
+		  menubar: false,
+		  scrollbar: false,
+		  resizable: true,
+		  wm: false // overide default window manager.
+	  },
+
+	  initialize: function(id, url, options){
+			this.setOptions(options);
+			this.id = id;
+			this.wm = this.options.wm || BrowserWin.$wm;
+			this.wm.register(this, url);
+		},
+
+	  create: function(url){
+			winOpts = "height=" + this.options.size.height;
+			winOpts += ",width=" + this.options.size.width;
+			winOpts += ",toolbar=" + this.options.toolbar;
+			winOpts += ",location=" + this.options.toolbar;
+			winOpts += ",directories=" + this.options.directories;
+			winOpts += ",status=" + this.options.status;
+			winOpts += ",menubar=" + this.options.menubar;
+			winOpts += ",scrollbars=" + this.options.scrollbars;
+			winOpts += ",resizable=" + this.options.resizable;
+			if ($defined(this.options.top)) {
+				winOpts += ",top=" + this.options.top;
+			}
+			if ($defined(this.options.left)) {
+				winOpts += ",left=" + this.options.left;
+			}
+			this.$winRef = window.open(url, this.id, winOpts);
+		}
+	});
+
+BrowserWin.implement(new Events, new Options);
+
+BrowserWin.Manager = new Class({
+	  options: {
+		  onRegister: Class.empty,
+		  onUnregister: Class.empty
+	  },
+
+	  initialize: function(options){
+			this.setOptions(options);
+			this.hashTab = new Hash();
+		},
+
+	  register: function(browserWin, url){
+			this.unregister(browserWin);
+
+			browserWin.create(url);
+			this.fireEvent('onRegister', [browserWin]);
+			this.hashTab.set(browserWin.id, browserWin);
+		},
+
+	  unregister: function(browserWin){
+			if (this.hashTab.hasKey(browserWin.id)) {
+				winRef = this.hashTab.get(browserWin.id);
+				winRef.$winRef.close();
+				this.fireEvent('onUnregister', [winRef]);
+			}
+			this.hashTab.remove(browserWin.id);
+		}
+	});
+
+BrowserWin.Manager.implement(new Events, new Options);
+
+BrowserWin.$wm = null;
+window.addEvent('domready', function(){
+		BrowserWin.$wm = new BrowserWin.Manager();
+	});
diff --git a/live/js/live/pageenhance.js b/live/js/live/pageenhance.js
index 0cbf2ff..90df001 100644
--- a/live/js/live/pageenhance.js
+++ b/live/js/live/pageenhance.js
@@ -12,6 +12,10 @@ var PageEnhance = new Class({
 	  options: {
 		  epgLinkSelector: 'a[href^="epginfo.html?epgid"]',
 		  actionLinkSelector: 'a[href^="vdr_request/"]',
+		  vlcLinkSelector: 'a[href^="vlc.html?channel"]',
+		  vlcWinOptions: {
+			  size: { width: 420, height: 370 }
+			},
 		  hintTipSelector: '*[title]',
 		  hintClassName: 'hint',
 		  infoWinOptions: {
@@ -40,6 +44,7 @@ var PageEnhance = new Class({
 			$$(this.options.epgLinkSelector).each(this.epgPopup.bind(this));
 			this.addHintTips($$(this.options.hintTipSelector));
 			$$(this.options.actionLinkSelector).each(this.vdrRequest.bind(this));
+			$$(this.options.vlcLinkSelector).each(this.vlcRequest.bind(this));
 			$$(this.options.datePickerSelector).each(this.datePicker.bind(this));
 		},
 
@@ -55,6 +60,7 @@ var PageEnhance = new Class({
 			elems = $$(sel);
 			this.addHintTips(elems);
 			$$('#' + id + ' ' + this.options.actionLinkSelector).each(this.vdrRequest.bind(this));
+			$$('#' + id + ' ' + this.options.vlcLinkSelector).each(this.vlcRequest.bind(this));
 		},
 
 	  // Epg Popup function. Apply to all elements that should
@@ -106,6 +112,20 @@ var PageEnhance = new Class({
 				}.bindWithEvent(this, el));
 		},
 
+	  // function that opens a window for streaming of tv data.
+	  vlcRequest: function(el){
+			el.addEvent('click', function(event, element){
+					var href = $pick(element.href, "");
+					if (href != "") {
+						href += "&async=1";
+						var bw = new BrowserWin("vlcstream", href, this.options.vlcWinOptions);
+						event.stop();
+						return false;
+					}
+					return true;
+				}.bindWithEvent(this, el));
+		},
+
 	  // change normal 'title'-Attributes into enhanced hinttips
 	  // usesd by domExtend and domReadySetup functions.
 	  addHintTips: function(elems){
diff --git a/live/js/mootools/mootools.v1.11.js b/live/js/mootools/mootools.v1.11.js
index ad6bfeb..eba43c7 100644
--- a/live/js/mootools/mootools.v1.11.js
+++ b/live/js/mootools/mootools.v1.11.js
@@ -286,7 +286,7 @@ document.head = document.getElementsByTagName('head')[0];
 /*
 Class: window
 	Some properties are attached to the window object by the browser detection.
-	
+
 Note:
 	browser detection is entirely object-based. We dont sniff.
 
@@ -1355,7 +1355,7 @@ Array.extend({
 
 });
 
-/* 
+/*
 Script: Function.js
 	Contains Function prototypes and utility functions .
 
@@ -1389,11 +1389,11 @@ Function.extend({
 				If set to a class name, the function will receive a new instance of this class (with the event passed as argument's constructor) as first argument.
 				Default is false.
 		arguments - A single argument or array of arguments that will be passed to the function when called.
-		
+
 					If both the event and arguments options are set, the event is passed as first argument and the arguments array will follow.
-					
+
 					Default is no custom arguments, the function will receive the standard arguments when called.
-					
+
 		delay - Numeric value: if set, the returned function will delay the actual execution by this amount of milliseconds and return a timer handle when called.
 				Default is no delay.
 		periodical - Numeric value: if set, the returned function will periodically perform the actual execution with this specified interval and return a timer handle when called.
@@ -3030,56 +3030,56 @@ Class: Elements
 */
 
 Elements.extend({
-	
+
 	/*
 	Property: filterByTag
 		Filters the collection by a specified tag name.
 		Returns a new Elements collection, while the original remains untouched.
 	*/
-	
+
 	filterByTag: function(tag){
 		return new Elements(this.filter(function(el){
 			return (Element.getTag(el) == tag);
 		}));
 	},
-	
+
 	/*
 	Property: filterByClass
 		Filters the collection by a specified class name.
 		Returns a new Elements collection, while the original remains untouched.
 	*/
-	
+
 	filterByClass: function(className, nocash){
 		var elements = this.filter(function(el){
 			return (el.className && el.className.contains(className, ' '));
 		});
 		return (nocash) ? elements : new Elements(elements);
 	},
-	
+
 	/*
 	Property: filterById
 		Filters the collection by a specified ID.
 		Returns a new Elements collection, while the original remains untouched.
 	*/
-	
+
 	filterById: function(id, nocash){
 		var elements = this.filter(function(el){
 			return (el.id == id);
 		});
 		return (nocash) ? elements : new Elements(elements);
 	},
-	
+
 	/*
 	Property: filterByAttribute
 		Filters the collection by a specified attribute.
 		Returns a new Elements collection, while the original remains untouched.
-		
+
 	Arguments:
 		name - the attribute name.
 		operator - optional, the attribute operator.
 		value - optional, the attribute value, only valid if the operator is specified.
 	*/
-	
+
 	filterByAttribute: function(name, operator, value, nocash){
 		var elements = this.filter(function(el){
 			var current = Element.getProperty(el, name);
@@ -3155,7 +3155,7 @@ function $ES(selector, filter){
 $$.shared = {
 
 	'regexp': /^(\w*|\*)(?:#([\w-]+)|\.([\w-]+))?(?:\[(\w+)(?:([!*^$]?=)["']?([^"'\]]*)["']?)?])?$/,
-	
+
 	'xpath': {
 
 		getParam: function(items, context, param, i){
@@ -3178,7 +3178,7 @@ $$.shared = {
 			items.push(temp.join(''));
 			return items;
 		},
-		
+
 		getItems: function(items, context, nocash){
 			var elements = [];
 			var xpath = document.evaluate('.//' + items.join('//'), context, $$.shared.resolver, XPathResult.UNORDERED_NODE_SNAPSHOT_TYPE, null);
@@ -3187,9 +3187,9 @@ $$.shared = {
 		}
 
 	},
-	
+
 	'normal': {
-		
+
 		getParam: function(items, context, param, i){
 			if (i == 0){
 				if (param[2]){
@@ -3323,11 +3323,11 @@ Element.extend({
 		}
 		return el;
 	}/*compatibility*/,
-	
-	getElementsByClassName: function(className){ 
-		return this.getElements('.' + className); 
+
+	getElementsByClassName: function(className){
+		return this.getElements('.' + className);
 	}
-	
+
 	/*end compatibility*/
 
 });
@@ -3626,8 +3626,8 @@ Element.Events.domready = {
 
 /*compatibility*/
 
-window.onDomReady = function(fn){ 
-	return this.addEvent('domready', fn); 
+window.onDomReady = function(fn){
+	return this.addEvent('domready', fn);
 };
 
 /*end compatibility*/
@@ -3635,7 +3635,7 @@ window.onDomReady = function(fn){
 /*
 Script: Window.Size.js
 	Window cross-browser dimensions methods.
-	
+
 Note:
 	The Functions in this script require an XHTML doctype.
 
@@ -3758,7 +3758,7 @@ var Drag = {};
 /*
 Class: Drag.Base
 	Modify two css properties of an element based on the position of the mouse.
-	
+
 Note:
 	Drag.Base requires an XHTML doctype.
 
@@ -3780,7 +3780,7 @@ Options:
 	limit:
 		x - array with start and end limit relative to modifiers.x
 		y - array with start and end limit relative to modifiers.y
-		
+
 Events:
 	onStart - optional, function to execute when the user starts to drag (on mousedown);
 	onComplete - optional, function to execute when the user completes the drag.
@@ -4060,7 +4060,7 @@ Options:
 	encoding - the encoding, defaults to utf-8.
 	autoCancel - cancels the already running request if another one is sent. defaults to false.
 	headers - accepts an object, that will be set to request headers.
-	
+
 Events:
 	onRequest - function to execute when the XHR request is fired.
 	onSuccess - function to execute when the XHR request completes.
@@ -4225,7 +4225,7 @@ Options:
 	update - $(element) to insert the response text of the XHR into, upon completion of the request.
 	evalScripts - boolean; default is false. Execute scripts in the response text onComplete. When the response is javascript the whole response is evaluated.
 	evalResponse - boolean; default is false. Force global evalulation of the whole response, no matter what content-type it is.
-	
+
 Events:
 	onComplete - function to execute when the ajax request completes.
 
@@ -4446,6 +4446,198 @@ var Json = {
 };
 
 /*
+Script: Hash.js
+	Contains the class Hash.
+
+License:
+	MIT-style license.
+*/
+
+/*
+Class: Hash
+	It wraps an object that it uses internally as a map. The user must use set(), get(), and remove() to add/change, retrieve and remove values, it must not access the internal object directly. null/undefined values are allowed.
+
+Note:
+	Each hash instance has the length property.
+
+Arguments:
+	obj - an object to convert into a Hash instance.
+
+Example:
+	(start code)
+	var hash = new Hash({a: 'hi', b: 'world', c: 'howdy'});
+	hash.remove('b'); // b is removed.
+	hash.set('c', 'hello');
+	hash.get('c'); // returns 'hello'
+	hash.length // returns 2 (a and c)
+	(end)
+*/
+
+var Hash = new Class({
+
+	length: 0,
+
+	initialize: function(object){
+		this.obj = object || {};
+		this.setLength();
+	},
+
+	/*
+	Property: get
+		Retrieves a value from the hash.
+
+	Arguments:
+		key - The key
+
+	Returns:
+		The value
+	*/
+
+	get: function(key){
+		return (this.hasKey(key)) ? this.obj[key] : null;
+	},
+
+	/*
+	Property: hasKey
+		Check the presence of a specified key-value pair in the hash.
+
+	Arguments:
+		key - The key
+
+	Returns:
+		True if the Hash contains a value for the specified key, otherwise false
+	*/
+
+	hasKey: function(key){
+		return (key in this.obj);
+	},
+
+	/*
+	Property: set
+		Adds a key-value pair to the hash or replaces a previous value associated with the key.
+
+	Arguments:
+		key - The key
+		value - The value
+	*/
+
+	set: function(key, value){
+		if (!this.hasKey(key)) this.length++;
+		this.obj[key] = value;
+		return this;
+	},
+
+	setLength: function(){
+		this.length = 0;
+		for (var p in this.obj) this.length++;
+		return this;
+	},
+
+	/*
+	Property: remove
+		Removes a key-value pair from the hash.
+
+	Arguments:
+		key - The key
+	*/
+
+	remove: function(key){
+		if (this.hasKey(key)){
+			delete this.obj[key];
+			this.length--;
+		}
+		return this;
+	},
+
+	/*
+	Property: each
+		Calls a function for each key-value pair. The first argument passed to the function will be the value, the second one will be the key, like $each.
+
+	Arguments:
+		fn - The function to call for each key-value pair
+		bind - Optional, the object that will be referred to as "this" in the function
+	*/
+
+	each: function(fn, bind){
+		$each(this.obj, fn, bind);
+	},
+
+	/*
+	Property: extend
+		Extends the current hash with an object containing key-value pairs. Values for duplicate keys will be replaced by the new ones.
+
+	Arguments:
+		obj - An object containing key-value pairs
+	*/
+
+	extend: function(obj){
+		$extend(this.obj, obj);
+		return this.setLength();
+	},
+
+	/*
+	Property: merge
+		Merges the current hash with multiple objects.
+	*/
+
+	merge: function(){
+		this.obj = $merge.apply(null, [this.obj].extend(arguments));
+		return this.setLength();
+	},
+
+	/*
+	Property: empty
+		Empties all hash values properties and values.
+	*/
+
+	empty: function(){
+		this.obj = {};
+		this.length = 0;
+		return this;
+	},
+
+	/*
+	Property: keys
+		Returns an array containing all the keys, in the same order as the values returned by <Hash.values>.
+
+	Returns:
+		An array containing all the keys of the hash
+	*/
+
+	keys: function(){
+		var keys = [];
+		for (var property in this.obj) keys.push(property);
+		return keys;
+	},
+
+	/*
+	Property: values
+		Returns an array containing all the values, in the same order as the keys returned by <Hash.keys>.
+
+	Returns:
+		An array containing all the values of the hash
+	*/
+
+	values: function(){
+		var values = [];
+		for (var property in this.obj) values.push(this.obj[property]);
+		return values;
+	}
+
+});
+
+/* Section: Utility Functions */
+
+/*
+Function: $H
+	Shortcut to create a Hash from an Object.
+*/
+
+function $H(obj){
+	return new Hash(obj);
+};
+
+/*
 Script: Tips.js
 	Tooltips, BubbleTips, whatever they are, they will appear on mouseover
 
@@ -4482,7 +4674,7 @@ Options:
 
 	offsets - the distance of your tooltip from the mouse. an Object with x/y properties.
 	fixed - if set to true, the toolTip will not follow the mouse.
-	
+
 Events:
 	onShow - optionally you can alter the default onShow behaviour with this option (like displaying a fade in effect);
 	onHide - optionally you can alter the default onHide behaviour with this option (like displaying a fade out effect);
diff --git a/live/js/mootools/readme.mootools.config b/live/js/mootools/readme.mootools.config
index edc3cef..f82f31b 100644
--- a/live/js/mootools/readme.mootools.config
+++ b/live/js/mootools/readme.mootools.config
@@ -19,11 +19,12 @@ live. In order to obtain the right mootools configuration follow these steps:
 - Scroll down to the bottom of the page and select the following
   options towards the top of the download page in this order:
     1. Tips
-    2. Json
-    3. Ajax
-    4. Drag.Move
-    5. Window.DomReady
-    6. Element.Selectors
+    2. Hash
+    3. Json
+    4. Ajax
+    5. Drag.Move
+    6. Window.DomReady
+    7. Element.Selectors
 
 - Then open 'Choose compression type' and select 'No Compression' to
   have fully documented mootools source. This helps when developing
diff --git a/livefeatures.h b/livefeatures.h
index 951630d..c7251d6 100644
--- a/livefeatures.h
+++ b/livefeatures.h
@@ -63,6 +63,11 @@ namespace features
 		static const char* MinVersion() { return "0.9.23.beta10"; }
 	};
 
+	struct streamdev_server
+	{
+		static const char* Plugin() { return "streamdev-server"; }
+		static const char* MinVersion() { return "none"; }
+	};
 } // namespace features
 
 } // namespace vdrlive
diff --git a/pages/Makefile b/pages/Makefile
index 9945f1f..53deb99 100644
--- a/pages/Makefile
+++ b/pages/Makefile
@@ -18,7 +18,7 @@ VDRDIR   ?= ../../../..
 OBJS	= menu.o channels.o recordings.o schedule.o		\
           screenshot.o timers.o whats_on.o switch_channel.o	\
           keypress.o remote.o channels_widget.o edit_timer.o	\
-          error.o pageelems.o tooltip.o 			\
+          error.o pageelems.o tooltip.o vlc.o			\
           searchtimers.o edit_searchtimer.o searchresults.o 	\
           searchepg.o login.o ibox.o xmlresponse.o		\
           play_recording.o pause_recording.o stop_recording.o	\
diff --git a/pages/pageelems.ecpp b/pages/pageelems.ecpp
index 3d6b866..2fcb5cb 100644
--- a/pages/pageelems.ecpp
+++ b/pages/pageelems.ecpp
@@ -149,6 +149,7 @@ int update_status(1);
 	<script type="text/javascript" src="js/live/liveajax.js"></script>
 	<script type="text/javascript" src="js/live/infowin.js"></script>
 	<script type="text/javascript" src="js/live/hinttips.js"></script>
+	<script type="text/javascript" src="js/live/browserwin.js"></script>
 	<script type="text/javascript" src="js/live/pageenhance.js"></script>
 	<script type="text/javascript"><!--
 		var liveEnhanced = new PageEnhance({
@@ -230,6 +231,11 @@ int update_status(1);
 	<a href="searchresults.html?searchplain=<$ StringEscapeAndBreak(title) $>"><img src="<$ LiveSetup().GetThemedLink("img", "search.png") $>" alt="" <& tooltip.hint text=(tr("Search for repeats.")) &>></img></a>
 <%cpp>
 		}
+		if (LiveSetup().GetUseStreamdev() && elapsed > 0 && LiveFeatures<features::streamdev_server>().Loaded()) {
+</%cpp>
+	<a href="vlc.html?channel=<$ channelId $>"><img src="<$ LiveSetup().GetThemedLink("img", "play.png") $>" alt="" <& tooltip.hint text=(tr("Stream this channel into browser.")) &>></img></a>
+<%cpp>
+		}
 </%cpp>
 	<a href="http://akas.imdb.com/Tsearch?title=<$ StringUrlEncode(title) $>"><img src="<$ LiveSetup().GetThemedLink("img", "imdb.png") $>" alt="" <& tooltip.hint text=(tr("Find more at the Internet Movie Database.")) &>></img></a>
 <%cpp>
@@ -239,6 +245,7 @@ int update_status(1);
 		<td class="action leftcol <? lastCurrentChanel ? "bottomrow"?>"><& pageelems.event_timer epgid=(epgid) &></td>
 		<td class="action <? lastCurrentChanel ? "bottomrow"?>"><%cpp>if (elapsed > 0) { </%cpp><& pageelems.ajax_action_href action="switch_channel" tip=(tr("Switch to this channel.")) param=(channelId) image="zap.png" alt="" &><%cpp> } </%cpp></td>
 		<td class="action <? lastCurrentChanel ? "bottomrow"?>"><%cpp>if (LiveFeatures<features::epgsearch>().Recent()) { </%cpp><a href="searchresults.html?searchplain=<$ StringUrlEncode(title) $>"><img src="<$ LiveSetup().GetThemedLink("img", "search.png") $>" alt="" <& tooltip.hint text=(tr("Search for repeats.")) &>></img></a><%cpp> } else { </%cpp><img src="transparent.png" width="16" height="16"><%cpp> } </%cpp></td>
+		<td class="action <? lastCurrentChanel ? "bottomrow"?>"><%cpp>if (LiveSetup().GetUseStreamdev() && elapsed > 0 && LiveFeatures<features::streamdev_server>().Loaded()) { </%cpp><a href="vlc.html?channel=<$ channelId $>"><img src="<$ LiveSetup().GetThemedLink("img", "play.png") $>" alt="" <& tooltip.hint text=(tr("Stream this channel into browser.")) &>></img></a><%cpp> } else { </%cpp><img src="transparent.png" width="16" height="16"><%cpp> } </%cpp></td>
 		<td class="action <? lastCurrentChanel ? "bottomrow"?>"><a href="http://akas.imdb.com/Tsearch?title=<$ StringUrlEncode(title) $>"><img src="<$ LiveSetup().GetThemedLink("img", "imdb.png") $>" alt="" <& tooltip.hint text=(tr("Find more at the Internet Movie Database.")) &>></img></a></td>
 <%cpp>
 	}
@@ -319,19 +326,45 @@ int update_status(1);
 				<div class="about_right"><$ LIVEVERSION $></div>
 				<div class="about_left"><$ tr("VDR version") $>:</div>
 				<div class="about_right"><$ VDRVERSION $></div>
-				<div class="about_left"><$ tr("Features") $>:</div>
+				<div class="about_head"><div><div><$ tr("Features") $></div></div></div>
+				<div class="about_left">EPGsearch:</div>
 				<div class="about_right">
-<{
+<%cpp>
 					Features< features::epgsearch >& epgsearch = LiveFeatures< features::epgsearch >();
-}>
-					<img align="center" src="<$ LiveSetup().GetThemedLink("img", epgsearch.Recent() ? "active.png" : "inactive.png") $>"/> EPGsearch
-%					if ( epgsearch.Recent() ) {
-						(<$ tr("active") $>: <$ epgsearch.Version() $>)
-%					} else {
-						(<$ tr("required") $>: <$ epgsearch.MinVersion() $>)
-%					}
+</%cpp>
+					<img align="center" src="<$ LiveSetup().GetThemedLink("img", epgsearch.Recent() ? "active.png" : "inactive.png") $>"/>
+<%cpp>
+					if ( epgsearch.Recent() ) {
+</%cpp>
+						<$ tr("active") $>: <$ epgsearch.Version() $>
+<%cpp>
+					} else {
+</%cpp>
+						<$ tr("required") $>: <$ epgsearch.MinVersion() $>
+<%cpp>
+					}
+</%cpp>
 					(<a href="http://winni.vdr-developer.org/epgsearch/index.html" target="_blank"><$ tr("Homepage") $></a>)<br/>
 				</div>
+				<div class="about_left">Streamdev server:</div>
+				<div class="about_right">
+<%cpp>
+					Features< features::streamdev_server >& streamdev = LiveFeatures< features::streamdev_server >();
+</%cpp>
+					<img align="center" src="<$ LiveSetup().GetThemedLink("img", streamdev.Loaded() ? "active.png" : "inactive.png") $>"/>
+<%cpp>
+					if ( streamdev.Loaded() ) {
+</%cpp>
+						<$ tr("active") $>: <$ streamdev.Version() $>
+<%cpp>
+					} else {
+</%cpp>
+						<$ tr("required") $>: <$ streamdev.MinVersion() $>
+<%cpp>
+					}
+</%cpp>
+					(<a href="http://streamdev.vdr-developer.org/" target="_blank"><$ tr("Homepage") $></a>)<br/>
+				</div>
 				<div class="about_head"><div><div><$ tr("Bugs and suggestions") $></div></div></div>
 				<div class="about_line"><$ tr("If you encounter any bugs or would like to suggest new features, please use our bugtracker") $>:<br/>
 					<a target="_blank" href="http://www.vdr-developer.org/mantisbt">http://www.vdr-developer.org/mantisbt</a></div>
diff --git a/pages/setup.ecpp b/pages/setup.ecpp
index d4e46f5..debd97c 100644
--- a/pages/setup.ecpp
+++ b/pages/setup.ecpp
@@ -21,6 +21,8 @@ using namespace std;
 	string showLogo;
 	string useAjax;
 	string showInfoBox;
+	string useStreamdev;
+	string streamdevport;
 	int authchanged = 0;
 </%args>
 <%session scope="global">
@@ -57,6 +59,8 @@ if (!logged_in && LiveSetup().UseAuth()) return reply.redirect("login.html");
 			if (LiveSetup().GetUseAjax()) {
 				LiveSetup().SetShowInfoBox(!showInfoBox.empty());
 			}
+			LiveSetup().SetUseStreamdev(!useStreamdev.empty());
+			LiveSetup().SetStreamdevPort(streamdevport.empty() ? 3000 : lexical_cast<int>(streamdevport));
 			LiveSetup().SaveSetup();
 			message = tr("Setup saved.");
 		}
@@ -77,6 +81,8 @@ if (!logged_in && LiveSetup().UseAuth()) return reply.redirect("login.html");
 	showLogo = LiveSetup().GetShowLogo() ? "1" : "";
 	useAjax = LiveSetup().GetUseAjax() ? "1" : "";
 	showInfoBox = LiveSetup().GetShowInfoBox() ? "1" : "";
+	useStreamdev = LiveSetup().GetUseStreamdev() ? "1" : "";
+	streamdevport = lexical_cast<std::string, int>(LiveSetup().GetStreamdevPort());
 
 </%cpp>
 <& pageelems.doc_type &>
@@ -90,6 +96,7 @@ if (!logged_in && LiveSetup().UseAuth()) return reply.redirect("login.html");
 		{
 			changeduseauth(document.getElementById("useauth"));
 			changeduseajax(document.getElementById("useAjax"));
+			changedusestreamdev(document.getElementById("useStreamdev"));
 			if (document.getElementById("message").value != "")
 				alert(document.getElementById("message").value);
 		}
@@ -105,6 +112,10 @@ if (!logged_in && LiveSetup().UseAuth()) return reply.redirect("login.html");
 		{
 			document.getElementById("ajaxsection").style.display = (selection.checked ? "block" : "none");
 		}
+		function changedusestreamdev(selection)
+		{
+			document.getElementById("streamdevsection").style.display = (selection.checked ? "block" : "none");
+		}
 		//--></script>
 	</head>
 	<body onload="initform()">
@@ -165,6 +176,20 @@ if (!logged_in && LiveSetup().UseAuth()) return reply.redirect("login.html");
 						</td>
 					</tr>
 					<tr>
+						<td class="label leftcol"><div class="withmargin"><$ tr("Allow video streaming") $>:</div></td>
+						<td class="rightcol">
+							<input type="checkbox" name="useStreamdev" id="useStreamdev" value="1" <%cpp> CHECKIF(!useStreamdev.empty()); </%cpp> onclick="changedusestreamdev(this)"/>
+							<div id="streamdevsection" style="display: none">
+							<table border="0" cellpadding="0" cellspacing="0" class="dependent">
+							<tr>
+								<td class="label"><div class="withmargin"><$ tr("streamdev server port") $>:</div></td>
+								<td><input type="text" name="streamdevport" id="streamdevport" value="<$ streamdevport $>" /></td>
+							</tr>
+							</table>
+							</div>
+						</td>
+					</tr>
+					<tr>
 						<td class="label leftcol"><div class="withmargin"><$ tr("additional fixed times in 'What's on?'") $>:</div></td>
 						<td class="rightcol"><input type="text" name="times" value="<$ times $>" id="times" />
 							<& tooltip.help text=(tr("Format is HH:MM. Separate multiple times with a semicolon")) &></td>
diff --git a/pages/vlc.ecpp b/pages/vlc.ecpp
new file mode 100644
index 0000000..865b6bd
--- /dev/null
+++ b/pages/vlc.ecpp
@@ -0,0 +1,87 @@
+<%pre>
+#include <vdr/channels.h>
+#include <vdr/i18n.h>
+#include <vdr/keys.h>
+#include "setup.h"
+#include "tools.h"
+
+using namespace std;
+using namespace vdrlive;
+
+</%pre>
+<%args>
+	tChannelID channel;
+	string async;
+</%args>
+<%session scope="global">
+	bool logged_in(false);
+</%session>
+<%request scope="page">
+	cChannel* Channel;
+</%request>
+<%include>page_init.eh</%include>
+<%cpp>
+	if (!logged_in && LiveSetup().UseAuth()) return reply.redirect("login.html");
+
+	pageTitle = tr("VLC: live video stream");
+
+	bool asyncReq = !async.empty() && (lexical_cast<int>(async) != 0);
+
+	ReadLock channelsLock(Channels);
+
+	if (!channelsLock) {
+		throw HtmlError(tr("Couldn't aquire access to channels, please try again later."));
+	}
+	Channel = Channels.GetByChannelID(channel);
+	if (Channel == 0) {
+		throw HtmlError( tr("Couldn't find channel or no channels available. Maybe you mistyped your request?") );
+	}
+</%cpp>
+<& pageelems.doc_type &>
+<html>
+	<head>
+		<title>VDR-Live - <$ pageTitle $></title>
+<%cpp>
+	if (!asyncReq) {
+</%cpp>
+		<& pageelems.stylesheets &>
+		<& pageelems.ajax_js &>
+<%cpp>
+	}
+</%cpp>
+	</head>
+	<body>
+<%cpp>
+	if (!asyncReq) {
+</%cpp>
+		<& pageelems.logo &>
+		<& menu active="vlc" &>
+<%cpp>
+	}
+</%cpp>
+		<div class="inhalt">
+<%cpp>
+		if ( Channel != 0 ) {
+			int streamdevPort = LiveSetup().GetStreamdevPort();
+			string videourl = string("http://") + request.getServerIp() + ":" + lexical_cast<string,int>(streamdevPort) + "/" + *Channel->GetChannelID().ToString();
+</%cpp>
+			<embed type="application/x-vlc-plugin" name="video1" autoplay="no" loop="yes" width="400" height="300" target="<$ videourl $>" />
+	   		<& vlc.channel_selection &>
+<%cpp>
+		}
+</%cpp>
+		</div>
+	</body>
+</html>
+<%include>page_exit.eh</%include>
+
+<%def channel_selection>
+<div>
+<input type="button" value="Play" onclick="document.video1.play();" />
+<input type="button" value="Pause" onclick="document.video1.pause();" />
+<input type="button" value="Stop" onclick="document.video1.stop();" />
+<input type="button" value="Mute" onclick="document.video1.mute();" />
+<input type="button" value="Fullscreen"  onclick="document.video1.fullscreen();" />
+</div>
+</%def>
+
diff --git a/pages/whats_on.ecpp b/pages/whats_on.ecpp
index d724c23..7331adc 100644
--- a/pages/whats_on.ecpp
+++ b/pages/whats_on.ecpp
@@ -98,7 +98,7 @@ if (type == "now") {
 %			if (mode == "list") {
 			<table class="listing" cellspacing="0" cellpadding="0">
 				<tr class="head">
-					<td colspan="7"><div class="boxheader"><div><div><$ head $></div></div></div></td>
+					<td colspan="8"><div class="boxheader"><div><div><$ head $></div></div></div></td>
 				</tr>
 %	    }
 <%cpp>
diff --git a/po/ca_ES.po b/po/ca_ES.po
index acb5216..a4a3687 100644
--- a/po/ca_ES.po
+++ b/po/ca_ES.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR-LIVE 0.2.0\n"
 "Report-Msgid-Bugs-To: <cwieninger@gmx.de>\n"
-"POT-Creation-Date: 2007-10-25 18:35+0200\n"
+"POT-Creation-Date: 2007-12-16 23:49+0100\n"
 "PO-Revision-Date: 2007-08-19 20:15+0200\n"
 "Last-Translator: Jordi Vilà <jvila@tinet.org>\n"
 "Language-Team: <vdr@linuxtv.org>\n"
@@ -519,6 +519,9 @@ msgstr ""
 msgid "Search for repeats."
 msgstr ""
 
+msgid "Stream this channel into browser."
+msgstr ""
+
 msgid "Find more at the Internet Movie Database."
 msgstr ""
 
@@ -564,6 +567,9 @@ msgstr ""
 msgid "If you encounter any bugs or would like to suggest new features, please use our bugtracker"
 msgstr ""
 
+msgid "RecDate"
+msgstr ""
+
 msgid "List of recordings"
 msgstr ""
 
@@ -651,6 +657,12 @@ msgstr ""
 msgid "Show dynamic VDR information box"
 msgstr ""
 
+msgid "Allow video streaming"
+msgstr ""
+
+msgid "streamdev server port"
+msgstr ""
+
 msgid "additional fixed times in 'What's on?'"
 msgstr ""
 
@@ -672,6 +684,9 @@ msgstr ""
 msgid "Delete timer"
 msgstr ""
 
+msgid "VLC: live video stream"
+msgstr ""
+
 msgid "What's running at"
 msgstr ""
 
diff --git a/po/cs_CZ.po b/po/cs_CZ.po
index aeb6f4b..54af0b8 100644
--- a/po/cs_CZ.po
+++ b/po/cs_CZ.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR-LIVE 0.2.0\n"
 "Report-Msgid-Bugs-To: <cwieninger@gmx.de>\n"
-"POT-Creation-Date: 2007-10-25 18:35+0200\n"
+"POT-Creation-Date: 2007-12-16 23:49+0100\n"
 "PO-Revision-Date: 2007-08-19 20:15+0200\n"
 "Last-Translator: Vladimír Bárta <vladimir.barta@k2atmitec.cz>\n"
 "Language-Team: <vdr@linuxtv.org>\n"
@@ -517,6 +517,9 @@ msgstr ""
 msgid "Search for repeats."
 msgstr ""
 
+msgid "Stream this channel into browser."
+msgstr ""
+
 msgid "Find more at the Internet Movie Database."
 msgstr ""
 
@@ -562,6 +565,9 @@ msgstr ""
 msgid "If you encounter any bugs or would like to suggest new features, please use our bugtracker"
 msgstr ""
 
+msgid "RecDate"
+msgstr ""
+
 msgid "List of recordings"
 msgstr ""
 
@@ -649,6 +655,12 @@ msgstr ""
 msgid "Show dynamic VDR information box"
 msgstr ""
 
+msgid "Allow video streaming"
+msgstr ""
+
+msgid "streamdev server port"
+msgstr ""
+
 msgid "additional fixed times in 'What's on?'"
 msgstr ""
 
@@ -670,6 +682,9 @@ msgstr ""
 msgid "Delete timer"
 msgstr ""
 
+msgid "VLC: live video stream"
+msgstr ""
+
 msgid "What's running at"
 msgstr ""
 
diff --git a/po/da_DK.po b/po/da_DK.po
index ae3deeb..e8cf289 100644
--- a/po/da_DK.po
+++ b/po/da_DK.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR-LIVE 0.2.0\n"
 "Report-Msgid-Bugs-To: <cwieninger@gmx.de>\n"
-"POT-Creation-Date: 2007-10-25 18:35+0200\n"
+"POT-Creation-Date: 2007-12-16 23:49+0100\n"
 "PO-Revision-Date: 2007-08-19 20:15+0200\n"
 "Last-Translator: Mogens Elneff <mogens@elneff.dk>\n"
 "Language-Team: <vdr@linuxtv.org>\n"
@@ -517,6 +517,9 @@ msgstr ""
 msgid "Search for repeats."
 msgstr ""
 
+msgid "Stream this channel into browser."
+msgstr ""
+
 msgid "Find more at the Internet Movie Database."
 msgstr ""
 
@@ -562,6 +565,9 @@ msgstr ""
 msgid "If you encounter any bugs or would like to suggest new features, please use our bugtracker"
 msgstr ""
 
+msgid "RecDate"
+msgstr ""
+
 msgid "List of recordings"
 msgstr ""
 
@@ -649,6 +655,12 @@ msgstr ""
 msgid "Show dynamic VDR information box"
 msgstr ""
 
+msgid "Allow video streaming"
+msgstr ""
+
+msgid "streamdev server port"
+msgstr ""
+
 msgid "additional fixed times in 'What's on?'"
 msgstr ""
 
@@ -670,6 +682,9 @@ msgstr ""
 msgid "Delete timer"
 msgstr ""
 
+msgid "VLC: live video stream"
+msgstr ""
+
 msgid "What's running at"
 msgstr ""
 
diff --git a/po/de_DE.po b/po/de_DE.po
index 1ff97d7..82ac646 100644
--- a/po/de_DE.po
+++ b/po/de_DE.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR-LIVE 0.2.0\n"
 "Report-Msgid-Bugs-To: <cwieninger@gmx.de>\n"
-"POT-Creation-Date: 2007-10-25 18:35+0200\n"
+"POT-Creation-Date: 2007-12-16 23:49+0100\n"
 "PO-Revision-Date: 2007-08-19 20:15+0200\n"
 "Last-Translator: Klaus Schmidinger <kls@cadsoft.de>\n"
 "Language-Team: <vdr@linuxtv.org>\n"
@@ -44,16 +44,16 @@ msgid "Searchtimer"
 msgstr "Suchtimer"
 
 msgid "Error in timer settings"
-msgstr ""
+msgstr "Fehler in den Timer Einstellungen"
 
 msgid "Timer already defined"
-msgstr ""
+msgstr "Timer ist bereits vorhanden"
 
 msgid "Timers are being edited - try again later"
-msgstr ""
+msgstr "Timer werden bearbeitet - später nochmal versuchen"
 
 msgid "Timer not defined"
-msgstr ""
+msgstr "Timer wurde nicht erstellt"
 
 msgid "On archive DVD No."
 msgstr "Auf Archiv-DVD Nr."
@@ -80,10 +80,10 @@ msgid "Epg error"
 msgstr "EPG Fehler"
 
 msgid "Wrong channel id"
-msgstr ""
+msgstr "Fehlerhafte Kanal Id"
 
 msgid "Channel has no schedule"
-msgstr ""
+msgstr "Kanal hat keine Programminfos"
 
 msgid "Wrong event id"
 msgstr ""
@@ -95,7 +95,7 @@ msgid "All"
 msgstr "Alle"
 
 msgid "FTA"
-msgstr ""
+msgstr "FTA"
 
 msgid "%I:%M %p"
 msgstr "%H:%M Uhr"
@@ -110,7 +110,7 @@ msgid "Couldn't grab image from primary device"
 msgstr ""
 
 msgid "channels"
-msgstr ""
+msgstr "Kanäle"
 
 msgid "Couldn't aquire access to channels, please try again later."
 msgstr ""
@@ -517,6 +517,9 @@ msgstr "Zu diesem Kanal umschalten."
 msgid "Search for repeats."
 msgstr "Nach Wiederholungen suchen."
 
+msgid "Stream this channel into browser."
+msgstr "Sendung im Browser anzeigen."
+
 msgid "Find more at the Internet Movie Database."
 msgstr "Weitere Informationen in der Internet Movie Database."
 
@@ -562,6 +565,9 @@ msgstr "Fehlerberichte und Vorschläge"
 msgid "If you encounter any bugs or would like to suggest new features, please use our bugtracker"
 msgstr "Für Fehler oder Verbesserungsvorschläge steht unser Bugtracker bereit"
 
+msgid "RecDate"
+msgstr "Aufnahmedatum"
+
 msgid "List of recordings"
 msgstr "Liste der Aufnahmen"
 
@@ -596,7 +602,7 @@ msgid "Extended search"
 msgstr "Erweiterte Suche"
 
 msgid "no"
-msgstr ""
+msgstr "nein"
 
 msgid "Search results"
 msgstr "Suchergebnisse"
@@ -608,7 +614,7 @@ msgid "Expression"
 msgstr "Suchbegriff"
 
 msgid "Channel"
-msgstr ""
+msgstr "Kanal"
 
 msgid "Starts between"
 msgstr "Beginnt zwischen"
@@ -635,7 +641,7 @@ msgid "Setup saved."
 msgstr "Einstellungen gespeichert."
 
 msgid "Setup"
-msgstr ""
+msgstr "Einstellungen"
 
 msgid "Local net (no login required)"
 msgstr "Lokales Netz (keine Anmeldung notwendig)"
@@ -649,6 +655,12 @@ msgstr "Verwende AJAX Technologie"
 msgid "Show dynamic VDR information box"
 msgstr "Zeige dynamische VDR Status Box"
 
+msgid "Allow video streaming"
+msgstr "Erlaube Videoanzeige im Browser"
+
+msgid "streamdev server port"
+msgstr "Streamdev Server Port"
+
 msgid "additional fixed times in 'What's on?'"
 msgstr "zusätzliche Zeitpunkte in 'Was läuft?'"
 
@@ -670,11 +682,14 @@ msgstr "Timer aktiv/inaktiv schalten"
 msgid "Delete timer"
 msgstr "Timer löschen"
 
+msgid "VLC: live video stream"
+msgstr "VLC: Video Stream"
+
 msgid "What's running at"
 msgstr "Was läuft um"
 
 msgid "What's on next?"
-msgstr ""
+msgstr "Was läuft als nächstes?"
 
 msgid "%a, %b %d"
 msgstr "%a, %d.%m."
@@ -702,3 +717,7 @@ msgstr "Ausführliche Ansicht"
 
 msgid "List view"
 msgstr "Listenansicht"
+
+#, fuzzy
+#~ msgid "Watch channel"
+#~ msgstr "bis Kanal"
diff --git a/po/el_GR.po b/po/el_GR.po
index 9c02c14..bd6a0f8 100644
--- a/po/el_GR.po
+++ b/po/el_GR.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR-LIVE 0.2.0\n"
 "Report-Msgid-Bugs-To: <cwieninger@gmx.de>\n"
-"POT-Creation-Date: 2007-10-25 18:35+0200\n"
+"POT-Creation-Date: 2007-12-16 23:49+0100\n"
 "PO-Revision-Date: 2007-08-19 20:15+0200\n"
 "Last-Translator: Dimitrios Dimitrakos <mail@dimitrios.de>\n"
 "Language-Team: <vdr@linuxtv.org>\n"
@@ -517,6 +517,9 @@ msgstr ""
 msgid "Search for repeats."
 msgstr ""
 
+msgid "Stream this channel into browser."
+msgstr ""
+
 msgid "Find more at the Internet Movie Database."
 msgstr ""
 
@@ -562,6 +565,9 @@ msgstr ""
 msgid "If you encounter any bugs or would like to suggest new features, please use our bugtracker"
 msgstr ""
 
+msgid "RecDate"
+msgstr ""
+
 msgid "List of recordings"
 msgstr ""
 
@@ -649,6 +655,12 @@ msgstr ""
 msgid "Show dynamic VDR information box"
 msgstr ""
 
+msgid "Allow video streaming"
+msgstr ""
+
+msgid "streamdev server port"
+msgstr ""
+
 msgid "additional fixed times in 'What's on?'"
 msgstr ""
 
@@ -670,6 +682,9 @@ msgstr ""
 msgid "Delete timer"
 msgstr ""
 
+msgid "VLC: live video stream"
+msgstr ""
+
 msgid "What's running at"
 msgstr ""
 
diff --git a/po/es_ES.po b/po/es_ES.po
index 3a13de8..265d5b3 100644
--- a/po/es_ES.po
+++ b/po/es_ES.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR-LIVE 0.2.0\n"
 "Report-Msgid-Bugs-To: <cwieninger@gmx.de>\n"
-"POT-Creation-Date: 2007-10-25 18:35+0200\n"
+"POT-Creation-Date: 2007-12-16 23:49+0100\n"
 "PO-Revision-Date: 2007-08-19 20:15+0200\n"
 "Last-Translator: Ruben Nunez Francisco <ruben.nunez@tang-it.com>\n"
 "Language-Team: <vdr@linuxtv.org>\n"
@@ -517,6 +517,9 @@ msgstr ""
 msgid "Search for repeats."
 msgstr ""
 
+msgid "Stream this channel into browser."
+msgstr ""
+
 msgid "Find more at the Internet Movie Database."
 msgstr ""
 
@@ -562,6 +565,9 @@ msgstr ""
 msgid "If you encounter any bugs or would like to suggest new features, please use our bugtracker"
 msgstr ""
 
+msgid "RecDate"
+msgstr ""
+
 msgid "List of recordings"
 msgstr ""
 
@@ -649,6 +655,12 @@ msgstr ""
 msgid "Show dynamic VDR information box"
 msgstr ""
 
+msgid "Allow video streaming"
+msgstr ""
+
+msgid "streamdev server port"
+msgstr ""
+
 msgid "additional fixed times in 'What's on?'"
 msgstr ""
 
@@ -670,6 +682,9 @@ msgstr ""
 msgid "Delete timer"
 msgstr ""
 
+msgid "VLC: live video stream"
+msgstr ""
+
 msgid "What's running at"
 msgstr ""
 
diff --git a/po/et_EE.po b/po/et_EE.po
index e79a440..16d6b68 100644
--- a/po/et_EE.po
+++ b/po/et_EE.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR-LIVE 0.2.0\n"
 "Report-Msgid-Bugs-To: <cwieninger@gmx.de>\n"
-"POT-Creation-Date: 2007-10-25 18:35+0200\n"
+"POT-Creation-Date: 2007-12-16 23:49+0100\n"
 "PO-Revision-Date: 2007-08-19 20:15+0200\n"
 "Last-Translator: Arthur Konovalov <kasjas@hot.ee>\n"
 "Language-Team: <vdr@linuxtv.org>\n"
@@ -517,6 +517,9 @@ msgstr ""
 msgid "Search for repeats."
 msgstr ""
 
+msgid "Stream this channel into browser."
+msgstr ""
+
 msgid "Find more at the Internet Movie Database."
 msgstr ""
 
@@ -562,6 +565,9 @@ msgstr ""
 msgid "If you encounter any bugs or would like to suggest new features, please use our bugtracker"
 msgstr ""
 
+msgid "RecDate"
+msgstr ""
+
 msgid "List of recordings"
 msgstr ""
 
@@ -649,6 +655,12 @@ msgstr ""
 msgid "Show dynamic VDR information box"
 msgstr ""
 
+msgid "Allow video streaming"
+msgstr ""
+
+msgid "streamdev server port"
+msgstr ""
+
 msgid "additional fixed times in 'What's on?'"
 msgstr ""
 
@@ -670,6 +682,9 @@ msgstr ""
 msgid "Delete timer"
 msgstr ""
 
+msgid "VLC: live video stream"
+msgstr ""
+
 msgid "What's running at"
 msgstr ""
 
diff --git a/po/fi_FI.po b/po/fi_FI.po
index 645af87..fac279d 100644
--- a/po/fi_FI.po
+++ b/po/fi_FI.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR-LIVE 0.2.0\n"
 "Report-Msgid-Bugs-To: <cwieninger@gmx.de>\n"
-"POT-Creation-Date: 2007-10-25 18:35+0200\n"
+"POT-Creation-Date: 2007-12-16 23:49+0100\n"
 "PO-Revision-Date: 2007-08-19 20:15+0200\n"
 "Last-Translator: Rolf Ahrenberg <rahrenbe@cc.hut.fi>\n"
 "Language-Team: <vdr@linuxtv.org>\n"
@@ -520,6 +520,9 @@ msgstr "Vaihda kanavalle"
 msgid "Search for repeats."
 msgstr "Etsi toistuvat"
 
+msgid "Stream this channel into browser."
+msgstr ""
+
 msgid "Find more at the Internet Movie Database."
 msgstr "Hae IMDB:stä"
 
@@ -565,6 +568,9 @@ msgstr "Virheraportoinnit ja parannusehdotukset"
 msgid "If you encounter any bugs or would like to suggest new features, please use our bugtracker"
 msgstr "Voit raportoida sekä virheet että parannusehdotukset suoraan havaintotietokantaan"
 
+msgid "RecDate"
+msgstr ""
+
 msgid "List of recordings"
 msgstr "Tallennelistaus"
 
@@ -652,6 +658,13 @@ msgstr "Käytä AJAX-tekniikkaa"
 msgid "Show dynamic VDR information box"
 msgstr "Näytä dynaaminen VDR:n infolaatikko"
 
+#, fuzzy
+msgid "Allow video streaming"
+msgstr "Näytä Live-logo"
+
+msgid "streamdev server port"
+msgstr ""
+
 msgid "additional fixed times in 'What's on?'"
 msgstr "Lisäajankohdat 'Menossa?'-sivulle"
 
@@ -673,6 +686,9 @@ msgstr "Aseta ajastin päälle/pois"
 msgid "Delete timer"
 msgstr "Poista ajastin"
 
+msgid "VLC: live video stream"
+msgstr ""
+
 msgid "What's running at"
 msgstr "Menossa kello"
 
@@ -705,3 +721,7 @@ msgstr "Ruudukkonäkymä"
 
 msgid "List view"
 msgstr "Listanäkymä"
+
+#, fuzzy
+#~ msgid "Watch channel"
+#~ msgstr "Kanavaan"
diff --git a/po/fr_FR.po b/po/fr_FR.po
index 89102a5..5b7db8e 100644
--- a/po/fr_FR.po
+++ b/po/fr_FR.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR-LIVE 0.2.0\n"
 "Report-Msgid-Bugs-To: <cwieninger@gmx.de>\n"
-"POT-Creation-Date: 2007-10-25 18:35+0200\n"
+"POT-Creation-Date: 2007-12-16 23:49+0100\n"
 "PO-Revision-Date: 2007-08-19 20:15+0200\n"
 "Last-Translator: Nicolas Huillard <nhuillard@e-dition.fr>\n"
 "Language-Team: <vdr@linuxtv.org>\n"
@@ -521,6 +521,9 @@ msgstr "Changer vers cette chaîne. "
 msgid "Search for repeats."
 msgstr "Recherche de répétitions."
 
+msgid "Stream this channel into browser."
+msgstr ""
+
 msgid "Find more at the Internet Movie Database."
 msgstr "Trouver plus d'information du film dans la base de données film IMDB."
 
@@ -566,6 +569,9 @@ msgstr "Bogues et suggestions"
 msgid "If you encounter any bugs or would like to suggest new features, please use our bugtracker"
 msgstr "Si vous rencontrez n'importe quels bogue ou voudriez suggérer de nouveaux dispositifs, employer notre bugtracker svp"
 
+msgid "RecDate"
+msgstr ""
+
 msgid "List of recordings"
 msgstr "Liste des enregistrements"
 
@@ -653,6 +659,12 @@ msgstr ""
 msgid "Show dynamic VDR information box"
 msgstr ""
 
+msgid "Allow video streaming"
+msgstr ""
+
+msgid "streamdev server port"
+msgstr ""
+
 msgid "additional fixed times in 'What's on?'"
 msgstr "périodes fixes additionnelles dans 'actuellement?'"
 
@@ -674,6 +686,9 @@ msgstr "Programmation basculer actif/inactif"
 msgid "Delete timer"
 msgstr "Effacer la programmation"
 
+msgid "VLC: live video stream"
+msgstr ""
+
 msgid "What's running at"
 msgstr "Qu'y a t'il au programme vers"
 
@@ -706,3 +721,7 @@ msgstr "Vue détailée"
 
 msgid "List view"
 msgstr "Vue en liste"
+
+#, fuzzy
+#~ msgid "Watch channel"
+#~ msgstr "à la chaîne"
diff --git a/po/hr_HR.po b/po/hr_HR.po
index 6263ff2..8121e9e 100644
--- a/po/hr_HR.po
+++ b/po/hr_HR.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR-LIVE 0.2.0\n"
 "Report-Msgid-Bugs-To: <cwieninger@gmx.de>\n"
-"POT-Creation-Date: 2007-10-25 18:35+0200\n"
+"POT-Creation-Date: 2007-12-16 23:49+0100\n"
 "PO-Revision-Date: 2007-08-19 20:15+0200\n"
 "Last-Translator: Drazen Dupor <drazen.dupor@dupor.com>\n"
 "Language-Team: <vdr@linuxtv.org>\n"
@@ -518,6 +518,9 @@ msgstr ""
 msgid "Search for repeats."
 msgstr ""
 
+msgid "Stream this channel into browser."
+msgstr ""
+
 msgid "Find more at the Internet Movie Database."
 msgstr ""
 
@@ -563,6 +566,9 @@ msgstr ""
 msgid "If you encounter any bugs or would like to suggest new features, please use our bugtracker"
 msgstr ""
 
+msgid "RecDate"
+msgstr ""
+
 msgid "List of recordings"
 msgstr ""
 
@@ -650,6 +656,12 @@ msgstr ""
 msgid "Show dynamic VDR information box"
 msgstr ""
 
+msgid "Allow video streaming"
+msgstr ""
+
+msgid "streamdev server port"
+msgstr ""
+
 msgid "additional fixed times in 'What's on?'"
 msgstr ""
 
@@ -671,6 +683,9 @@ msgstr ""
 msgid "Delete timer"
 msgstr ""
 
+msgid "VLC: live video stream"
+msgstr ""
+
 msgid "What's running at"
 msgstr ""
 
diff --git a/po/hu_HU.po b/po/hu_HU.po
index 714f1e8..4806fbf 100644
--- a/po/hu_HU.po
+++ b/po/hu_HU.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR-LIVE 0.2.0\n"
 "Report-Msgid-Bugs-To: <cwieninger@gmx.de>\n"
-"POT-Creation-Date: 2007-10-25 18:35+0200\n"
+"POT-Creation-Date: 2007-12-16 23:49+0100\n"
 "PO-Revision-Date: 2007-08-19 20:15+0200\n"
 "Last-Translator: Istvan Koenigsberger <istvnko@hotmail.com>, Guido Josten <guido.josten@t-online.de>\n"
 "Language-Team: <vdr@linuxtv.org>\n"
@@ -518,6 +518,9 @@ msgstr ""
 msgid "Search for repeats."
 msgstr ""
 
+msgid "Stream this channel into browser."
+msgstr ""
+
 msgid "Find more at the Internet Movie Database."
 msgstr ""
 
@@ -563,6 +566,9 @@ msgstr ""
 msgid "If you encounter any bugs or would like to suggest new features, please use our bugtracker"
 msgstr ""
 
+msgid "RecDate"
+msgstr ""
+
 msgid "List of recordings"
 msgstr ""
 
@@ -650,6 +656,12 @@ msgstr ""
 msgid "Show dynamic VDR information box"
 msgstr ""
 
+msgid "Allow video streaming"
+msgstr ""
+
+msgid "streamdev server port"
+msgstr ""
+
 msgid "additional fixed times in 'What's on?'"
 msgstr ""
 
@@ -671,6 +683,9 @@ msgstr ""
 msgid "Delete timer"
 msgstr ""
 
+msgid "VLC: live video stream"
+msgstr ""
+
 msgid "What's running at"
 msgstr ""
 
diff --git a/po/it_IT.po b/po/it_IT.po
index f38e4be..68e71cf 100644
--- a/po/it_IT.po
+++ b/po/it_IT.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR-LIVE 0.2.0\n"
 "Report-Msgid-Bugs-To: <cwieninger@gmx.de>\n"
-"POT-Creation-Date: 2007-10-25 18:35+0200\n"
+"POT-Creation-Date: 2007-12-16 23:49+0100\n"
 "PO-Revision-Date: 2007-08-19 20:15+0200\n"
 "Last-Translator: Sean Carlos <seanc@libero.it>\n"
 "Language-Team: <vdr@linuxtv.org>\n"
@@ -520,6 +520,9 @@ msgstr ""
 msgid "Search for repeats."
 msgstr ""
 
+msgid "Stream this channel into browser."
+msgstr ""
+
 msgid "Find more at the Internet Movie Database."
 msgstr ""
 
@@ -565,6 +568,9 @@ msgstr ""
 msgid "If you encounter any bugs or would like to suggest new features, please use our bugtracker"
 msgstr ""
 
+msgid "RecDate"
+msgstr ""
+
 msgid "List of recordings"
 msgstr ""
 
@@ -652,6 +658,12 @@ msgstr ""
 msgid "Show dynamic VDR information box"
 msgstr ""
 
+msgid "Allow video streaming"
+msgstr ""
+
+msgid "streamdev server port"
+msgstr ""
+
 msgid "additional fixed times in 'What's on?'"
 msgstr ""
 
@@ -673,6 +685,9 @@ msgstr ""
 msgid "Delete timer"
 msgstr ""
 
+msgid "VLC: live video stream"
+msgstr ""
+
 msgid "What's running at"
 msgstr ""
 
@@ -705,3 +720,7 @@ msgstr ""
 
 msgid "List view"
 msgstr ""
+
+#, fuzzy
+#~ msgid "Watch channel"
+#~ msgstr "a canale"
diff --git a/po/nl_NL.po b/po/nl_NL.po
index 5d3370a..bf30359 100644
--- a/po/nl_NL.po
+++ b/po/nl_NL.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR-LIVE 0.2.0\n"
 "Report-Msgid-Bugs-To: <cwieninger@gmx.de>\n"
-"POT-Creation-Date: 2007-10-25 18:35+0200\n"
+"POT-Creation-Date: 2007-12-16 23:49+0100\n"
 "PO-Revision-Date: 2007-08-19 20:15+0200\n"
 "Last-Translator: Maarten Wisse <Maarten.Wisse@urz.uni-hd.de>\n"
 "Language-Team: <vdr@linuxtv.org>\n"
@@ -520,6 +520,9 @@ msgstr ""
 msgid "Search for repeats."
 msgstr ""
 
+msgid "Stream this channel into browser."
+msgstr ""
+
 msgid "Find more at the Internet Movie Database."
 msgstr ""
 
@@ -565,6 +568,9 @@ msgstr ""
 msgid "If you encounter any bugs or would like to suggest new features, please use our bugtracker"
 msgstr ""
 
+msgid "RecDate"
+msgstr ""
+
 msgid "List of recordings"
 msgstr ""
 
@@ -652,6 +658,12 @@ msgstr ""
 msgid "Show dynamic VDR information box"
 msgstr ""
 
+msgid "Allow video streaming"
+msgstr ""
+
+msgid "streamdev server port"
+msgstr ""
+
 msgid "additional fixed times in 'What's on?'"
 msgstr ""
 
@@ -673,6 +685,9 @@ msgstr ""
 msgid "Delete timer"
 msgstr ""
 
+msgid "VLC: live video stream"
+msgstr ""
+
 msgid "What's running at"
 msgstr ""
 
@@ -705,3 +720,7 @@ msgstr ""
 
 msgid "List view"
 msgstr ""
+
+#, fuzzy
+#~ msgid "Watch channel"
+#~ msgstr "tot kanaal"
diff --git a/po/nn_NO.po b/po/nn_NO.po
index a36422b..95b8970 100644
--- a/po/nn_NO.po
+++ b/po/nn_NO.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR-LIVE 0.2.0\n"
 "Report-Msgid-Bugs-To: <cwieninger@gmx.de>\n"
-"POT-Creation-Date: 2007-10-25 18:35+0200\n"
+"POT-Creation-Date: 2007-12-16 23:49+0100\n"
 "PO-Revision-Date: 2007-08-19 20:15+0200\n"
 "Last-Translator: Truls Slevigen <truls@slevigen.no>\n"
 "Language-Team: <vdr@linuxtv.org>\n"
@@ -518,6 +518,9 @@ msgstr ""
 msgid "Search for repeats."
 msgstr ""
 
+msgid "Stream this channel into browser."
+msgstr ""
+
 msgid "Find more at the Internet Movie Database."
 msgstr ""
 
@@ -563,6 +566,9 @@ msgstr ""
 msgid "If you encounter any bugs or would like to suggest new features, please use our bugtracker"
 msgstr ""
 
+msgid "RecDate"
+msgstr ""
+
 msgid "List of recordings"
 msgstr ""
 
@@ -650,6 +656,12 @@ msgstr ""
 msgid "Show dynamic VDR information box"
 msgstr ""
 
+msgid "Allow video streaming"
+msgstr ""
+
+msgid "streamdev server port"
+msgstr ""
+
 msgid "additional fixed times in 'What's on?'"
 msgstr ""
 
@@ -671,6 +683,9 @@ msgstr ""
 msgid "Delete timer"
 msgstr ""
 
+msgid "VLC: live video stream"
+msgstr ""
+
 msgid "What's running at"
 msgstr ""
 
diff --git a/po/pl_PL.po b/po/pl_PL.po
index 7b347a3..bf5f1d2 100644
--- a/po/pl_PL.po
+++ b/po/pl_PL.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR-LIVE 0.2.0\n"
 "Report-Msgid-Bugs-To: <cwieninger@gmx.de>\n"
-"POT-Creation-Date: 2007-10-25 18:35+0200\n"
+"POT-Creation-Date: 2007-12-16 23:49+0100\n"
 "PO-Revision-Date: 2007-08-19 20:15+0200\n"
 "Last-Translator: Michael Rakowski <mrak@gmx.de>\n"
 "Language-Team: <vdr@linuxtv.org>\n"
@@ -517,6 +517,9 @@ msgstr ""
 msgid "Search for repeats."
 msgstr ""
 
+msgid "Stream this channel into browser."
+msgstr ""
+
 msgid "Find more at the Internet Movie Database."
 msgstr ""
 
@@ -562,6 +565,9 @@ msgstr ""
 msgid "If you encounter any bugs or would like to suggest new features, please use our bugtracker"
 msgstr ""
 
+msgid "RecDate"
+msgstr ""
+
 msgid "List of recordings"
 msgstr ""
 
@@ -649,6 +655,12 @@ msgstr ""
 msgid "Show dynamic VDR information box"
 msgstr ""
 
+msgid "Allow video streaming"
+msgstr ""
+
+msgid "streamdev server port"
+msgstr ""
+
 msgid "additional fixed times in 'What's on?'"
 msgstr ""
 
@@ -670,6 +682,9 @@ msgstr ""
 msgid "Delete timer"
 msgstr ""
 
+msgid "VLC: live video stream"
+msgstr ""
+
 msgid "What's running at"
 msgstr ""
 
diff --git a/po/pt_PT.po b/po/pt_PT.po
index 8bd1b77..1bb6b09 100644
--- a/po/pt_PT.po
+++ b/po/pt_PT.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR-LIVE 0.2.0\n"
 "Report-Msgid-Bugs-To: <cwieninger@gmx.de>\n"
-"POT-Creation-Date: 2007-10-25 18:35+0200\n"
+"POT-Creation-Date: 2007-12-16 23:49+0100\n"
 "PO-Revision-Date: 2007-08-19 20:15+0200\n"
 "Last-Translator: Paulo Lopes <pmml@netvita.pt>\n"
 "Language-Team: <vdr@linuxtv.org>\n"
@@ -517,6 +517,9 @@ msgstr ""
 msgid "Search for repeats."
 msgstr ""
 
+msgid "Stream this channel into browser."
+msgstr ""
+
 msgid "Find more at the Internet Movie Database."
 msgstr ""
 
@@ -562,6 +565,9 @@ msgstr ""
 msgid "If you encounter any bugs or would like to suggest new features, please use our bugtracker"
 msgstr ""
 
+msgid "RecDate"
+msgstr ""
+
 msgid "List of recordings"
 msgstr ""
 
@@ -649,6 +655,12 @@ msgstr ""
 msgid "Show dynamic VDR information box"
 msgstr ""
 
+msgid "Allow video streaming"
+msgstr ""
+
+msgid "streamdev server port"
+msgstr ""
+
 msgid "additional fixed times in 'What's on?'"
 msgstr ""
 
@@ -670,6 +682,9 @@ msgstr ""
 msgid "Delete timer"
 msgstr ""
 
+msgid "VLC: live video stream"
+msgstr ""
+
 msgid "What's running at"
 msgstr ""
 
diff --git a/po/ro_RO.po b/po/ro_RO.po
index 2f737e4..fd670b8 100644
--- a/po/ro_RO.po
+++ b/po/ro_RO.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR-LIVE 0.2.0\n"
 "Report-Msgid-Bugs-To: <cwieninger@gmx.de>\n"
-"POT-Creation-Date: 2007-10-25 18:35+0200\n"
+"POT-Creation-Date: 2007-12-16 23:49+0100\n"
 "PO-Revision-Date: 2007-08-19 20:15+0200\n"
 "Last-Translator: Lucian Muresan <lucianm@users.sourceforge.net>\n"
 "Language-Team: <vdr@linuxtv.org>\n"
@@ -518,6 +518,9 @@ msgstr ""
 msgid "Search for repeats."
 msgstr ""
 
+msgid "Stream this channel into browser."
+msgstr ""
+
 msgid "Find more at the Internet Movie Database."
 msgstr ""
 
@@ -563,6 +566,9 @@ msgstr ""
 msgid "If you encounter any bugs or would like to suggest new features, please use our bugtracker"
 msgstr ""
 
+msgid "RecDate"
+msgstr ""
+
 msgid "List of recordings"
 msgstr ""
 
@@ -650,6 +656,12 @@ msgstr ""
 msgid "Show dynamic VDR information box"
 msgstr ""
 
+msgid "Allow video streaming"
+msgstr ""
+
+msgid "streamdev server port"
+msgstr ""
+
 msgid "additional fixed times in 'What's on?'"
 msgstr ""
 
@@ -671,6 +683,9 @@ msgstr ""
 msgid "Delete timer"
 msgstr ""
 
+msgid "VLC: live video stream"
+msgstr ""
+
 msgid "What's running at"
 msgstr ""
 
diff --git a/po/ru_RU.po b/po/ru_RU.po
index 54612d9..2fc60ce 100644
--- a/po/ru_RU.po
+++ b/po/ru_RU.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR-LIVE 0.2.0\n"
 "Report-Msgid-Bugs-To: <cwieninger@gmx.de>\n"
-"POT-Creation-Date: 2007-10-25 18:35+0200\n"
+"POT-Creation-Date: 2007-12-16 23:49+0100\n"
 "PO-Revision-Date: 2007-08-19 20:15+0200\n"
 "Last-Translator: Vyacheslav Dikonov <sdiconov@mail.ru>\n"
 "Language-Team: <vdr@linuxtv.org>\n"
@@ -517,6 +517,9 @@ msgstr ""
 msgid "Search for repeats."
 msgstr ""
 
+msgid "Stream this channel into browser."
+msgstr ""
+
 msgid "Find more at the Internet Movie Database."
 msgstr ""
 
@@ -562,6 +565,9 @@ msgstr ""
 msgid "If you encounter any bugs or would like to suggest new features, please use our bugtracker"
 msgstr ""
 
+msgid "RecDate"
+msgstr ""
+
 msgid "List of recordings"
 msgstr ""
 
@@ -649,6 +655,12 @@ msgstr ""
 msgid "Show dynamic VDR information box"
 msgstr ""
 
+msgid "Allow video streaming"
+msgstr ""
+
+msgid "streamdev server port"
+msgstr ""
+
 msgid "additional fixed times in 'What's on?'"
 msgstr ""
 
@@ -670,6 +682,9 @@ msgstr ""
 msgid "Delete timer"
 msgstr ""
 
+msgid "VLC: live video stream"
+msgstr ""
+
 msgid "What's running at"
 msgstr ""
 
diff --git a/po/sl_SI.po b/po/sl_SI.po
index b02b58e..ee462e0 100644
--- a/po/sl_SI.po
+++ b/po/sl_SI.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR-LIVE 0.2.0\n"
 "Report-Msgid-Bugs-To: <cwieninger@gmx.de>\n"
-"POT-Creation-Date: 2007-10-25 18:35+0200\n"
+"POT-Creation-Date: 2007-12-16 23:49+0100\n"
 "PO-Revision-Date: 2007-08-19 20:15+0200\n"
 "Last-Translator: Matjaz Thaler <matjaz.thaler@guest.arnes.si>\n"
 "Language-Team: <vdr@linuxtv.org>\n"
@@ -518,6 +518,9 @@ msgstr ""
 msgid "Search for repeats."
 msgstr ""
 
+msgid "Stream this channel into browser."
+msgstr ""
+
 msgid "Find more at the Internet Movie Database."
 msgstr ""
 
@@ -563,6 +566,9 @@ msgstr ""
 msgid "If you encounter any bugs or would like to suggest new features, please use our bugtracker"
 msgstr ""
 
+msgid "RecDate"
+msgstr ""
+
 msgid "List of recordings"
 msgstr ""
 
@@ -650,6 +656,12 @@ msgstr ""
 msgid "Show dynamic VDR information box"
 msgstr ""
 
+msgid "Allow video streaming"
+msgstr ""
+
+msgid "streamdev server port"
+msgstr ""
+
 msgid "additional fixed times in 'What's on?'"
 msgstr ""
 
@@ -671,6 +683,9 @@ msgstr ""
 msgid "Delete timer"
 msgstr ""
 
+msgid "VLC: live video stream"
+msgstr ""
+
 msgid "What's running at"
 msgstr ""
 
diff --git a/po/sv_SE.po b/po/sv_SE.po
index ce200b8..a286ebd 100644
--- a/po/sv_SE.po
+++ b/po/sv_SE.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR-LIVE 0.2.0\n"
 "Report-Msgid-Bugs-To: <cwieninger@gmx.de>\n"
-"POT-Creation-Date: 2007-10-25 18:35+0200\n"
+"POT-Creation-Date: 2007-12-16 23:49+0100\n"
 "PO-Revision-Date: 2007-08-19 20:15+0200\n"
 "Last-Translator: Tomas Prybil <tomas@prybil.se>\n"
 "Language-Team: <vdr@linuxtv.org>\n"
@@ -518,6 +518,9 @@ msgstr ""
 msgid "Search for repeats."
 msgstr ""
 
+msgid "Stream this channel into browser."
+msgstr ""
+
 msgid "Find more at the Internet Movie Database."
 msgstr ""
 
@@ -563,6 +566,9 @@ msgstr ""
 msgid "If you encounter any bugs or would like to suggest new features, please use our bugtracker"
 msgstr ""
 
+msgid "RecDate"
+msgstr ""
+
 msgid "List of recordings"
 msgstr ""
 
@@ -650,6 +656,12 @@ msgstr ""
 msgid "Show dynamic VDR information box"
 msgstr ""
 
+msgid "Allow video streaming"
+msgstr ""
+
+msgid "streamdev server port"
+msgstr ""
+
 msgid "additional fixed times in 'What's on?'"
 msgstr ""
 
@@ -671,6 +683,9 @@ msgstr ""
 msgid "Delete timer"
 msgstr ""
 
+msgid "VLC: live video stream"
+msgstr ""
+
 msgid "What's running at"
 msgstr ""
 
diff --git a/po/tr_TR.po b/po/tr_TR.po
index 53d4dd0..863b78a 100644
--- a/po/tr_TR.po
+++ b/po/tr_TR.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR-LIVE 0.2.0\n"
 "Report-Msgid-Bugs-To: <cwieninger@gmx.de>\n"
-"POT-Creation-Date: 2007-10-25 18:35+0200\n"
+"POT-Creation-Date: 2007-12-16 23:49+0100\n"
 "PO-Revision-Date: 2007-08-19 20:15+0200\n"
 "Last-Translator: Oktay Yolgeçen <oktay_73@yahoo.de>\n"
 "Language-Team: <vdr@linuxtv.org>\n"
@@ -517,6 +517,9 @@ msgstr ""
 msgid "Search for repeats."
 msgstr ""
 
+msgid "Stream this channel into browser."
+msgstr ""
+
 msgid "Find more at the Internet Movie Database."
 msgstr ""
 
@@ -562,6 +565,9 @@ msgstr ""
 msgid "If you encounter any bugs or would like to suggest new features, please use our bugtracker"
 msgstr ""
 
+msgid "RecDate"
+msgstr ""
+
 msgid "List of recordings"
 msgstr ""
 
@@ -649,6 +655,12 @@ msgstr ""
 msgid "Show dynamic VDR information box"
 msgstr ""
 
+msgid "Allow video streaming"
+msgstr ""
+
+msgid "streamdev server port"
+msgstr ""
+
 msgid "additional fixed times in 'What's on?'"
 msgstr ""
 
@@ -670,6 +682,9 @@ msgstr ""
 msgid "Delete timer"
 msgstr ""
 
+msgid "VLC: live video stream"
+msgstr ""
+
 msgid "What's running at"
 msgstr ""
 
diff --git a/setup.cpp b/setup.cpp
index 5dea426..f160a72 100644
--- a/setup.cpp
+++ b/setup.cpp
@@ -32,7 +32,9 @@ Setup::Setup():
 		m_tntnetloglevel("INFO"),
 		m_showLogo(1),
 		m_useAjax(1),
-		m_showInfoBox(1)
+		m_showInfoBox(1),
+		m_useStreamdev(1),
+		m_streamdevPort(3000)
 {
 	m_adminPasswordMD5 = "4:" + MD5Hash("live");
 	liveplugin = cPluginManager::GetPlugin("live");
@@ -94,6 +96,8 @@ bool Setup::ParseSetupEntry( char const* name, char const* value )
 	else if ( strcmp( name, "ShowLogo" ) == 0 ) { m_showLogo = atoi(value); }
 	else if ( strcmp( name, "UseAjax" ) == 0 ) { m_useAjax = atoi(value); }
 	else if ( strcmp( name, "ShowInfoBox" ) == 0 ) { m_showInfoBox = atoi(value); }
+	else if ( strcmp( name, "UseStreamdev" ) == 0 ) { m_useStreamdev = atoi(value); }
+	else if ( strcmp( name, "StreamdevPort" ) == 0 ) { m_streamdevPort = atoi(value); }
 	else if ( strcmp( name, "ScreenShotInterval" ) == 0 ) { m_screenshotInterval = atoi(value); }
 	else return false;
 	return true;
@@ -221,6 +225,8 @@ bool Setup::SaveSetup()
 	liveplugin->SetupStore("ShowLogo", m_showLogo);
 	liveplugin->SetupStore("UseAjax", m_useAjax);
 	liveplugin->SetupStore("ShowInfoBox", m_showInfoBox);
+	liveplugin->SetupStore("UseStreamdev", m_useStreamdev);
+	liveplugin->SetupStore("StreamdevPort", m_streamdevPort);
 	liveplugin->SetupStore("ScreenShotInterval", m_screenshotInterval);
 
 	return true;
diff --git a/setup.h b/setup.h
index 11945d4..3b0767c 100644
--- a/setup.h
+++ b/setup.h
@@ -48,6 +48,8 @@ class Setup
 		bool GetShowLogo() const { return m_showLogo != 0; }
 		bool GetUseAjax() const { return m_useAjax != 0; }
 		bool GetShowInfoBox() const { return m_showInfoBox != 0; }
+		bool GetUseStreamdev() const { return m_useStreamdev != 0; }
+		int GetStreamdevPort() const { return m_streamdevPort; }
 		std::string GetEpgImageDir() { return m_epgimagedir; }
 
 		void SetLastChannel(int lastChannel) { m_lastChannel = lastChannel; }
@@ -64,6 +66,8 @@ class Setup
 		void SetShowLogo(bool show) { m_showLogo = show ? 1 : 0; }
 		void SetUseAjax(bool use) { m_useAjax = use ? 1 : 0; }
 		void SetShowInfoBox(bool show) { m_showInfoBox = show ? 1 : 0; }
+		void SetUseStreamdev(bool use) { m_useStreamdev = use ? 1 : 0; }
+		void SetStreamdevPort(int port) { m_streamdevPort = port; }
 
 		bool SaveSetup();
 
@@ -72,9 +76,9 @@ class Setup
 
 		bool ParseSetupEntry( char const* name, char const* value );
 
-		bool HaveEPGSearch(void);
 		bool CheckLocalNet(const std::string& ip);
 
+
 	private:
 		Setup();
 		Setup( Setup const& );
@@ -105,6 +109,8 @@ class Setup
 		int m_showLogo;
 		int m_useAjax;
 		int m_showInfoBox;
+		int m_useStreamdev;
+		int m_streamdevPort;
 
 		bool CheckServerPort();
 		bool CheckServerIps();