diff --new-file --recursive --suppress-common-lines --exclude changes.txt --exclude diff.txt releases/unplug-2.035/source/chrome/content/common.js releases/unplug-2.036/source/chrome/content/common.js
135c135
< 	version  : 2.035,
---
> 	version  : 2.036,
139c139
< 	revision : 201010180152,
---
> 	revision : 201011142341,
diff --new-file --recursive --suppress-common-lines --exclude changes.txt --exclude diff.txt releases/unplug-2.035/source/chrome/content/config/config.js releases/unplug-2.036/source/chrome/content/config/config.js
33d32
< 	populate_configs();
38,47d36
< function populate_configs() {
< 	var elemlist = document.getElementsByTagName("configwrapper");
< 	for (var i = 0; i < elemlist.length; i++) {
< 		var el = elemlist[i];
< 		var value = UnPlug2.get_pref(el.getAttribute("name"), el.getAttribute("default"));
< 		el.setValue(value);
< 	}
< 	document.getElementById("version").setAttribute("value", "Version: " + UnPlug2.version.toFixed(3) + " (" + UnPlug2.codename + ") " + UnPlug2.revision);
< }
< 
108,116d96
< 
< function save_configs() {
< 	var elemlist = document.getElementsByTagName("configwrapper");
< 	for (var i = 0; i < elemlist.length; i++) {
< 		var el = elemlist[i];
< 		var value = UnPlug2.set_pref(el.getAttribute("name"), el.getValue());
< 	}
< }
< 
123c103,104
< 	var tb = document.getElementById("tabbox");
---
> 	var pwin = document.getElementById("cn_unplug2_config");
> 	var p = null;
127c108
< 			tb.selectedIndex = 3;
---
> 			p = document.getElementById("tababout");
130c111
< 			tb.selectedIndex = 0;
---
> 			p = document.getElementById("tabgeneral");
133c114
< 			tb.selectedIndex = 1;
---
> 			p = document.getElementById("tabdownload");
135a117
> 	pwin.showPane(p);
diff --new-file --recursive --suppress-common-lines --exclude changes.txt --exclude diff.txt releases/unplug-2.035/source/chrome/content/config/config.xul releases/unplug-2.036/source/chrome/content/config/config.xul
3,4c3
< <?xml-stylesheet href="chrome://unplug/content/config/configwrapper.css" type="text/css"?>
< <!DOCTYPE dialog [
---
> <!DOCTYPE prefwindow [
39,40c38,39
< <dialog id="cn_unplug2_config"
<   title="&dialog.title; - &configheader.subtitle;"
---
> <prefwindow id="cn_unplug2_config"
>   title="&dialog.title; – &configheader.subtitle;"
46c45
<   height="500"
---
>   height="400"
49,50d47
<   ondialogaccept="save_configs()"
<   ondialogcancel=""
55,123c52,60
< 	<dialogheader title="&header.title;" description="&configheader.subtitle;"/>
< 	<tabbox id="tabbox">
< 		<tabs>
< 			<tab label="&tab.title.general;" />
< 			<tab label="&tab.title.downloader;" />
< 			<tab label="&tab.title.advanced;" />
< 			<tab label="&tab.title.about;" />
< 		</tabs>
< 		<tabpanels>
< 			<tabpanel id="tabgeneral" orient="vertical">
< 				<groupbox>
< 					<caption label="&interface.title;" />
< 					<configwrapper name="add_to_toolsmenu">
< 						<checkbox label="&interface.toolsmenu;" accesskey="&interface.toolsmenu.a;" />
< 					</configwrapper>
< 					<configwrapper name="add_to_contextmenu">
< 						<checkbox label="&interface.contextmenu;" accesskey="&interface.contextmenu.a;" />
< 					</configwrapper>
< 					<checkbox id="add_toolbar_button" label="&interface.toolbarbtn;" accesskey="&interface.toolbarbtn.a;" disabled="true" oncommand="toggle_toolbarbutton();" />
< 				</groupbox>
< 				<groupbox>
< 					<caption label="&privacy.title;" />
< 					<configwrapper name="popularity_contest">
< 						<checkbox label="&privacy.popcontest;" accesskey="&privacy.popcontest.a;" />
< 					</configwrapper>
< 					<label onclick="window.open(&quot;http://unplug.dbatley.com/popularity_contest/&quot;);" class="text-link" value="&privacy.infolink;" accesskey="&privacy.infolink.a;" />
< 				</groupbox>
< 				<groupbox>
< 					<caption label="&rulesxml.title;" />
< 					<description> &rulesxml.description; </description>
< 					<textbox value="chrome://unplug/content/rules.xml" disabled="true" />
< 					<hbox>
< 						<spacer flex="1" />
< 						<button label="&rulesxml.default;" accesskey="&rulesxml.default.a;" disabled="true" />
< 					</hbox>
< 				</groupbox>
< 				<spacer flex="1" />
< 			</tabpanel>
< 			<tabpanel id="tabdownload" orient="vertical">
< 				<configwrapper name="downloader" id="downloader_config">
< 					<menulist>
< 						<menupopup>
< 							<menuitem label="&downloader.auto;" value="auto"/>
< 							<menuitem label="&dl.saveas.label;" value="saveas"/>
< 							<menuitem label="&open.over.label;" value="openover"/>
< 						</menupopup>
< 					</menulist>
< 				</configwrapper>
< 				<groupbox>
< 					<caption label="&downloader.addons;" />
< 					<label onclick="window.open(&quot;https://addons.mozilla.org/en-US/firefox/addon/201&quot;);" class="text-link" value="&downloader.dta;" />
< 					<label onclick="window.open(&quot;https://addons.mozilla.org/en-US/firefox/addon/220&quot;);" class="text-link" value="&downloader.flashgot;" />
< 				</groupbox>
< 				<spacer flex="1" />
< 			</tabpanel>
< 			<tabpanel id="tabadvanced" orient="vertical">
< 				<groupbox>
< 					<caption label="&showall.title;" />
< 					<configwrapper name="show_all">
< 						<checkbox label="&showall.label;" accesskey="&showall.label.a;" />
< 					</configwrapper>
< 				</groupbox>
< 				<spacer flex="1" />
< 			</tabpanel>
< 			<tabpanel id="tababout" orient="vertical">
< 				<groupbox>
< 					<caption label="&about.title;" />
< 					<description> &about.description; </description>
< 					<label class="text-link" onclick="window.open(&quot;http://www.gnu.org/licenses/agpl-3.0.html&quot;);" value="&about.agpl;" tabindex="2"/>
---
> 	
> 	<prefpane id="tababout" label="&tab.title.about;" image="chrome://unplug/skin/tango-32/dialog-information.png">
> 		<preferences>
> 			<preference id="popularity_contest" name="extensions.unplug2.popularity_contest" type="bool"/>
> 		</preferences>
> 		<groupbox>
> 			<caption label="&about.title;" />
> 			<description> &about.description; </description>
> 			<label class="text-link" onclick="window.open(&quot;http://www.gnu.org/licenses/agpl-3.0.html&quot;);" value="&about.agpl;" tabindex="2"/>
125,131c62,95
< 				</groupbox>
< 				<groupbox>
< 					<vbox id="setup_complete" style="display: none;">
< 						<description>&about.updated;</description>
< 					</vbox>
< 					<button label="&configure;" accesskey="&configure.a;" oncommand="goto_tab('main');" style="height: 3em;" tabindex="1" />
< 				</groupbox>
---
> 			<vbox id="setup_complete" style="display: none;">
> 				<description>&about.updated;</description>
> 			</vbox>
> 		</groupbox>
> 		<groupbox>
> 			<caption label="&privacy.title;" />
> 			<checkbox label="&privacy.popcontest;" accesskey="&privacy.popcontest.a;" preference="popularity_contest" />
> 			<label onclick="window.open(&quot;http://unplug.dbatley.com/popularity_contest/&quot;);" class="text-link" value="&privacy.infolink;" accesskey="&privacy.infolink.a;" />
> 		</groupbox>
> 		<spacer flex="1" />
> 		<label id="version" />
> 	</prefpane>
> 	<prefpane id="tabgeneral" label="&tab.title.integration;" image="chrome://unplug/skin/tango-32/mail-attachment.png" >
> 		<preferences>
> 			<preference id="add_to_toolsmenu" name="extensions.unplug2.add_to_toolsmenu" type="bool"/>
> 			<preference id="add_to_contextmenu" name="extensions.unplug2.add_to_contextmenu" type="bool"/>
> 		</preferences>
> 		<groupbox>
> 			<caption label="&interface.title;" />
> 			<checkbox label="&interface.toolsmenu;" accesskey="&interface.toolsmenu.a;" preference="add_to_toolsmenu" />
> 			<checkbox label="&interface.contextmenu;" accesskey="&interface.contextmenu.a;" preference="add_to_contextmenu" />
> 			<checkbox id="add_toolbar_button" label="&interface.toolbarbtn;" accesskey="&interface.toolbarbtn.a;" disabled="true" oncommand="toggle_toolbarbutton();" />
> 		</groupbox>
> 		<spacer flex="1" />
> 	</prefpane>
> 	<prefpane id="tabdiscovery" label="&tab.title.discovery;" image="chrome://unplug/skin/tango-32/system-search.png">
> 		<preferences>
> 			<preference id="show_all" name="extensions.unplug2.show_all" type="bool" />
> 		</preferences>
> 		<groupbox>
> 			<caption label="&rulesxml.title;" />
> 			<description> &rulesxml.description; </description>
> 			<textbox value="chrome://unplug/content/rules.xml" disabled="true" />
> 			<hbox>
133,137c97,127
< 				<label id="version" />
< 			</tabpanel>
< 		</tabpanels>
< 	</tabbox>
< </dialog>
---
> 				<button label="&rulesxml.default;" accesskey="&rulesxml.default.a;" disabled="true" />
> 			</hbox>
> 		</groupbox>
> 		<groupbox>
> 			<caption label="&showall.title;" />
> 			<checkbox label="&showall.label;" accesskey="&showall.label.a;" preference="show_all" />
> 		</groupbox>
> 		<spacer flex="1" />
> 	</prefpane>
> 	<prefpane id="tabdownload" label="&tab.title.downloads;" image="chrome://unplug/skin/tango-32/document-save-as.png">
> 		<preferences>
> 			<preference id="downloader" name="extensions.unplug2.downloader" type="string"/>
> 		</preferences>
> 		<groupbox>
> 			<caption label="&downloader.title;" />
> 			<menulist preference="downloader">
> 				<menupopup>
> 					<menuitem label="&downloader.auto;" value="auto"/>
> 					<menuitem label="&dl.saveas.label;" value="saveas"/>
> 					<menuitem label="&open.over.label;" value="openover"/>
> 				</menupopup>
> 			</menulist>
> 		</groupbox>
> 		<groupbox>
> 			<caption label="&downloader.addons;" />
> 			<label onclick="window.open(&quot;https://addons.mozilla.org/en-US/firefox/addon/201&quot;);" class="text-link" value="&downloader.dta;" />
> 			<label onclick="window.open(&quot;https://addons.mozilla.org/en-US/firefox/addon/220&quot;);" class="text-link" value="&downloader.flashgot;" />
> 		</groupbox>
> 		<spacer flex="1" />
> 	</prefpane>
> </prefwindow>
diff --new-file --recursive --suppress-common-lines --exclude changes.txt --exclude diff.txt releases/unplug-2.035/source/chrome/content/config/configwrapper.css releases/unplug-2.036/source/chrome/content/config/configwrapper.css
1,32d0
< /*
<  *         _        ___
<  *    /\ / /___    / _ \ /\ /\  _ ___
<  *   / // // _ \  / // // // // // _ \
<  *  / // // // / / ___// // // // // /
<  *  \___//_//_/ /_/   /_/ \___/ \_  /
<  *                             \___/
<  * 
<  *  Compunach UnPlug
<  *  Copyright (C) 2010 David Batley <unplug@dbatley.com>
<  *
<  *  This program is free software: you can redistribute it and/or modify
<  *  it under the terms of the GNU Affero General Public License as
<  *  published by the Free Software Foundation, either version 3 of the
<  *  License, or (at your option) any later version.
<  * 
<  *  This program is distributed in the hope that it will be useful,
<  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
<  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
<  *  GNU General Public License for more details.
<  * 
<  *  You should have received a copy of the GNU Affero General Public License
<  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
<  *
<  */
< /*
<  * assign <configwrapper> as an configwrapper.xbl widget
<  */
< configwrapper {
< 	-moz-binding: url(chrome://unplug/content/config/configwrapper.xbl#configwrapper);
< }
< 
diff --new-file --recursive --suppress-common-lines --exclude changes.txt --exclude diff.txt releases/unplug-2.035/source/chrome/content/config/configwrapper.xbl releases/unplug-2.036/source/chrome/content/config/configwrapper.xbl
1,88d0
< <?xml version="1.0"?>
< <?xml-stylesheet href="chrome://global/skin/global.css" type="text/css"?>
< <!DOCTYPE bindings SYSTEM "chrome://unplug/locale/unplug_result.dtd" >
< <!--
< /*
<  *         _        ___
<  *    /\ / /___    / _ \ /\ /\  _ ___
<  *   / // // _ \  / // // // // // _ \
<  *  / // // // / / ___// // // // // /
<  *  \___//_//_/ /_/   /_/ \___/ \_  /
<  *                             \___/
<  * 
<  *  Compunach UnPlug
<  *  Copyright (C) 2010 David Batley <unplug@dbatley.com>
<  *
<  *  This program is free software: you can redistribute it and/or modify
<  *  it under the terms of the GNU Affero General Public License as
<  *  published by the Free Software Foundation, either version 3 of the
<  *  License, or (at your option) any later version.
<  * 
<  *  This program is distributed in the hope that it will be useful,
<  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
<  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
<  *  GNU General Public License for more details.
<  * 
<  *  You should have received a copy of the GNU Affero General Public License
<  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
<  *
<  */
< 
< This binding accepts a single child element and provides two methods .setValue and .getValue which can set its value in the same way (regardless of what the child element actually is)
< 
< -->
< <bindings xmlns="http://www.mozilla.org/xbl" xmlns:xbl="http://www.mozilla.org/xbl" xmlns:xul="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
< 	<binding id="configwrapper">
< 		<implementation>
< 			<!-- name of config option -->
< 			<field name="name" readonly="false" />
< 			<!-- default value of option -->
< 			<field name="default" readonly="false" />
< 			<!-- set this config item's value -->
< 			<method name="setValue">
< 				<parameter name="value"/>
< 				<body>
< 					// search child nodes and set value
< 					var target = this.firstChild;
< 					switch (target.tagName) {
< 						case "checkbox":
< 							target.setAttribute("checked", value ? "true" : "false");
< 							break;
< 						case "menulist":
< 							// Firefox 3.0+
< 							// TODO - broke this too :)
< 							for (var i=0; i &lt; target.itemCount; i++) {
< 								if (target.getItemAtIndex(i).value == value)
< 									target.selectedIndex = i;
< 							}
< 							break;
< 						default:
< 							alert(target.tagName + " is not an XUL element which can be configwrappered");
< 							break;
< 					}
< 				</body>
< 			</method>
< 			<!-- get this config item's value -->
< 			<method name="getValue">
< 				<body>
< 					// search child nodes and get value
< 					var target = this.firstChild;
< 					switch (target.tagName) {
< 						case "checkbox":
< 							return target.getAttribute("checked") == "true";
< 						case "menulist":
< 							return String(target.selectedItem.value);
< 						default:
< 							alert(target.tagName + " is not an XUL element which can be configwrappered");
< 							return null;
< 					}
< 				</body>
< 			</method>
< 		</implementation>
< 		<content>
< 			<children />
< 		</content>
< 	</binding>
< 
< </bindings>
< 
diff --new-file --recursive --suppress-common-lines --exclude changes.txt --exclude diff.txt releases/unplug-2.035/source/chrome/content/display/pop/pop.js releases/unplug-2.036/source/chrome/content/display/pop/pop.js
86d85
< 			this.poll()
93c92,93
< 	 * See if we've finished looking for suff yet
---
> 	 * Callback for UnPlug2Rules.search
> 	 * Called for each result found. This may be asynchromous (ie, after additional files are downloaded).
95c95,108
< 	poll : function () {
---
> 	_search_callback : (function (obj) {
> 		UnPlug2.log("callback: " + obj.toSource());
> 		switch (obj.type) {
> 			case "result":
> 				return UnPlug2SearchPage._search_callback_result(obj);
> 			case "progress":
> 				return UnPlug2SearchPage._search_callback_progress(obj);
> 			default:
> 				UnPlug2.log("Callback function got a " + result.type + " (not a result)!");
> 				return;
> 		}
> 	}),
> 	
> 	_search_callback_progress : (function (info) {
97,98d109
< 			var statusinfo = UnPlug2Search.statusinfo();
< 			document.getElementById("dynamic_download").value = statusinfo.text;
100c111,112
< 			if (statusinfo.finished) {
---
> 			var status_label = document.getElementById("dynamic_download");
> 			if (info.finished) {
102a115
> 				status_label.value = UnPlug2.str("search_done");
115c128,135
< 				if (statusinfo.percent == 0 || statusinfo.percent == 100) {
---
> 				if (info.downloads == 1){
> 					status_label.value.value = UnPlug2.str("search_1_active_download");
> 				} else {
> 					// note: info.downloads can be zero if we've downloaded the last page,
> 					// but there are items which have been marked "defer" scheduled to be run.
> 					status_label.value.value = UnPlug2.str("search_n_active_downloads").replace("#", info.downloads);
> 				}
> 				if (info.percent == 0 || info.percent == 100) {
119c139
< 					searchbar.value = statusinfo.percent;
---
> 					searchbar.value = info.percent;
121d140
< 				window.setTimeout(UnPlug2SearchPage.poll, 500);
128c147
< 	},
---
> 	}),
130,139c149
< 	/**
< 	 * Callback for UnPlug2Rules.search
< 	 * Called for each result found. This may be asynchromous (ie, after additional files are downloaded).
< 	 */
< 	_search_callback : function (result) {
< 		if (result.type != "result") {
< 			UnPlug2.log("Callback function got a " + result.type + " (not a result)!");
< 			return;
< 		}
< 		
---
> 	_search_callback_result : (function (result) {
148,149d157
< 		UnPlug2.log("FOUND: " + result.toSource() + " as " + (uid || "new result"));
< 		
192c200
< 	},
---
> 	}),
542,543d549
< 				
< try {
545,547d550
< } catch (e) {
< 	alert("hello" + e);
< }
diff --new-file --recursive --suppress-common-lines --exclude changes.txt --exclude diff.txt releases/unplug-2.035/source/chrome/content/rules.xml releases/unplug-2.036/source/chrome/content/rules.xml
285,295d284
< 	<rule id="keezmovies.com">
< 		<if_url ref="url" host="keezmovies.com"/>
< 		<rule>
< 			<if_re ref="vidid" string="${url.path}" re="\-(\d+)$" />
< 			<download url="http://www.keezmovies.com/watch_player.php?id=${vidid.1}">
< 				<each_element ref="flvurl" tagname="flv_url" require_attrs="innerHTML">
< 					<media url="${flvurl.innerHTML}" type="flv" title="${origtitle.innerHTML}" thumbnail="http://km-pics.phncdn.com/thumbs/${substring:-9:-6:leftpad:0:10:vidid.1}/${substring:-6:-3:leftpad:0:10:vidid.1}/${substring:-3:end:leftpad:0:10:vidid.1}/small.jpg" />
< 				</each_element>
< 			</download>
< 		</rule>
< 	</rule>
383c372
< 								<if_re ref="filetype" string="${urldecode:queryparam.2}" re="\.(flv|mp4)(?:\?|#|;|$)" />
---
> 								<if_re ref="filetype" string="${urldecode:queryparam.2}" re="\.(flv|mp4|avi|wmv)(?:\?|#|;|$)" />
875a865,873
> 		<rule id="keezmovies.com-2010">
> 			<if_url host="keezmovies.com" />
> 			<if_re ref="flvloc" re="flashvars\.video_url\s*=\s*'(http%3A%2F%2F[^']+keezmovies\.com%2F[^']+\.flv%3F[^']+)';" />
> 			<rule>
> 				<optional_re ref="numeric" re="/videos/(\d+/\d+/\d+)/(\d+)\.flv" string="${urldecode:flvloc.1}" />
> 				<optional_re ref="title" re="&lt;h1[^&gt;]+&gt;([^&lt;&gt;]+)&lt;/h1&gt;" />
> 				<media url="${urldecode:flvloc.1}" thumbnail="http://km-pics.phncdn.com/thumbs/${numeric.1}/small.jpg" title="${either:title.1:origtitle.innerHTML}" type="flv" />
> 			</rule>
> 		</rule>
diff --new-file --recursive --suppress-common-lines --exclude changes.txt --exclude diff.txt releases/unplug-2.035/source/chrome/content/search/search.js releases/unplug-2.036/source/chrome/content/search/search.js
101c101
< 		this._timeout = window.setTimeout(function () { realthis._timeout_callback(); }, this._timeout_delay);
---
> 		this._timeout = window.setTimeout((function () { realthis._timeout_callback(); }), this._timeout_delay);
712a713,721
> 		var statusinfo = UnPlug2Search.statusinfo();
> 		UnPlug2Search.callback(statusinfo);
> 		
> 		// noting to do, so lets stop
> 		if (statusinfo.finished) {
> 			UnPlug2.log("Finished search");
> 			UnPlug2Search._stopped = true;
> 		}
> 		
713a723,727
> 			// a message with type=progress finished=true will have
> 			// been sent, so we can stop the poller.
> 			UnPlug2.log("Stopping: search finished.");
> 			window.clearInterval(UnPlug2Search._poll_timer);
> 			UnPlug2Search._poll_timer = null;
866c880
< 		if (!this.has_finished()) {
---
> 		if (!this.statusinfo().finished) {
870c884,885
< 		// assign callback func
---
> 		// start search poller
> 		this._reset();
871a887,892
> 		// don't let UnPlug2Search.poll suggest we've finished before we really start
> 		// (ie: fix race condition). This gets decremented later.
> 		UnPlug2Search._defered_rules_count += 1;
> 		if (!UnPlug2Search._poll_timer) {
> 			UnPlug2Search._poll_timer = window.setInterval(UnPlug2Search.poll, 100);
> 		}
877a899,900
> 		UnPlug2Search._defered_rules_count -= 1; // see above
> 		
1177c1200,1201
< 	 * Download method must be a javascrit object. It's used by download components (eg "copy url", "save with firefox", "save with dta", etc) to decide how and if they work. Examples below:
---
> 	 * Download method must be a JSON object (it's sent to the callback function). It must have a type of "result".
> 	 * It's used by download components (eg "copy url", "save with firefox", "save with dta", etc) to decide how and if they work. Examples below:
1276c1300
< 		UnPlug2Search.callback = function ( res ) { UnPlug2.log("Cannot use callback for result " + res); };
---
> 		UnPlug2Search.callback = function ( res ) { UnPlug2.log("Cannot use callback for result " + res.toSource()); };
1280,1298d1303
< 		if (!UnPlug2Search._poll_timer) {
< 			UnPlug2Search._poll_timer = window.setInterval(UnPlug2Search.poll, 100);
< 		}
< 	},
< 	
< 	/**
< 	 * Returns false if still doing stuff
< 	 * TODO - depricate this in favor of statusinfo()
< 	 */
< 	has_finished : function () {
< 		if (UnPlug2Search._defered_rules_count) {
< 			return false;
< 		}
< 		for (var i = 0; i < UnPlug2Search._downloads.length; i++) {
< 			if (UnPlug2Search._downloads[i] && UnPlug2Search._downloads[i].download)
< 				return false;
< 		}
< 		// TODO - more checks about doing stuff while not downloading stuff
< 		return true;
1302a1308
> 	 * The object returned should be JSONable and have a type of "progress"
1305c1311
< 		var info = { downloads : 0, finished : false, percent : 0 };
---
> 		// count remaining objects / data
1324,1341c1330,1336
< 		info.downloads = active_downloads;
< 		// info.percent = 100 * (attempted_downloads - active_downloads) / (attempted_downloads || 1);
< 		info.percent = completed_pct / (attempted_downloads || 1);
< 		switch (info.downloads) {
< 			case 0:
< 				info.finished = true;
< 				info.text = UnPlug2.str("search_done");
< 				break;
< 			case 1:
< 				info.text = UnPlug2.str("search_1_active_download");
< 				break;
< 			default:
< 				info.text = UnPlug2.str("search_n_active_downloads").replace("#", info.downloads);
< 				break;
< 		}
< 		if (UnPlug2Search._defered_rules_count) {
< 			info.finished = false;
< 		}
---
> 		var finished_ok = (active_downloads == 0 && UnPlug2Search._defered_rules_count == 0) ? true : false;
> 		var info = {
> 			type : "progress",
> 			downloads : active_downloads,
> 			finished : (finished_ok || UnPlug2Search._stopped) ? true : false,
> 			percent : completed_pct / (attempted_downloads || 1)
> 		};
diff --new-file --recursive --suppress-common-lines --exclude changes.txt --exclude diff.txt releases/unplug-2.035/source/chrome/locale/de-DE/config.dtd releases/unplug-2.036/source/chrome/locale/de-DE/config.dtd
32,35d31
< <!ENTITY tab.title.general "Allgemein">
< <!ENTITY tab.title.opener "	&#214;ffner">
< <!ENTITY tab.title.downloader "Downloader">
< <!ENTITY tab.title.advanced "Erweitert">
36a33,35
> <!ENTITY tab.title.integration "Integration">
> <!ENTITY tab.title.discovery "Medien Entdeckung">
> <!ENTITY tab.title.downloads "Download">
56,57d54
< <!-- opener tab -->
< 
58a56
> <!ENTITY downloader.title "Bevorzugten Download Methode">
64c62
< <!-- advanced tab -->
---
> <!-- discovery tab -->
diff --new-file --recursive --suppress-common-lines --exclude changes.txt --exclude diff.txt releases/unplug-2.035/source/chrome/locale/en-US/config.dtd releases/unplug-2.036/source/chrome/locale/en-US/config.dtd
32,35d31
< <!ENTITY tab.title.general "General options">
< <!ENTITY tab.title.opener "Opener">
< <!ENTITY tab.title.downloader "Downloader">
< <!ENTITY tab.title.advanced "Advanced">
36a33,35
> <!ENTITY tab.title.integration "Integration">
> <!ENTITY tab.title.discovery "Media discovery">
> <!ENTITY tab.title.downloads "Downloads">
56,57d54
< <!-- opener tab -->
< 
58a56
> <!ENTITY downloader.title "Preferred download method">
64c62
< <!-- advanced tab -->
---
> <!-- discovery tab -->
diff --new-file --recursive --suppress-common-lines --exclude changes.txt --exclude diff.txt releases/unplug-2.035/source/chrome/locale/pl-PL/common.dtd releases/unplug-2.036/source/chrome/locale/pl-PL/common.dtd
34c34
< <!ENTITY configure.a          "C">
---
> <!ENTITY configure.a          "K">
diff --new-file --recursive --suppress-common-lines --exclude changes.txt --exclude diff.txt releases/unplug-2.035/source/chrome/locale/pl-PL/config.dtd releases/unplug-2.036/source/chrome/locale/pl-PL/config.dtd
32,35d31
< <!ENTITY tab.title.general "Opcje ogólne">
< <!ENTITY tab.title.opener "Otwieracz">
< <!ENTITY tab.title.downloader "Pobieracz">
< <!ENTITY tab.title.advanced "Zaawansowane">
36a33,35
> <!ENTITY tab.title.integration "Integration">
> <!ENTITY tab.title.discovery "Media discovery">
> <!ENTITY tab.title.downloads "Pobieracz">
41c40
< <!ENTITY interface.toolsmenu.a "t">
---
> <!ENTITY interface.toolsmenu.a "N">
43c42
< <!ENTITY interface.contextmenu.a "x">
---
> <!ENTITY interface.contextmenu.a "k">
45c44
< <!ENTITY interface.toolbarbtn.a "b">
---
> <!ENTITY interface.toolbarbtn.a "p">
48c47
< <!ENTITY privacy.popcontest.a "S">
---
> <!ENTITY privacy.popcontest.a "W">
50c49
< <!ENTITY privacy.infolink.a "A">
---
> <!ENTITY privacy.infolink.a "F">
56,57d54
< <!-- opener tab -->
< 
58a56
> <!ENTITY downloader.title "Preferred download method">
64c62
< <!-- advanced tab -->
---
> <!-- discovery tab -->
67c65
< <!ENTITY showall.label.a "S">
---
> <!ENTITY showall.label.a "D">
diff --new-file --recursive --suppress-common-lines --exclude changes.txt --exclude diff.txt releases/unplug-2.035/source/chrome/skin/searchpage.css releases/unplug-2.036/source/chrome/skin/searchpage.css
95c95
< 	padding; 0;
---
> 	padding: 0;
Binary files releases/unplug-2.035/source/chrome/skin/tango-32/dialog-information.png and releases/unplug-2.036/source/chrome/skin/tango-32/dialog-information.png differ
Binary files releases/unplug-2.035/source/chrome/skin/tango-32/document-save-as.png and releases/unplug-2.036/source/chrome/skin/tango-32/document-save-as.png differ
Binary files releases/unplug-2.035/source/chrome/skin/tango-32/mail-attachment.png and releases/unplug-2.036/source/chrome/skin/tango-32/mail-attachment.png differ
Binary files releases/unplug-2.035/source/chrome/skin/tango-32/system-search.png and releases/unplug-2.036/source/chrome/skin/tango-32/system-search.png differ
diff --new-file --recursive --suppress-common-lines --exclude changes.txt --exclude diff.txt releases/unplug-2.035/source/install.rdf releases/unplug-2.036/source/install.rdf
11c11
<                    em:version="2.035"
---
>                    em:version="2.036"
Binary files releases/unplug-2.035/unplug.xpi and releases/unplug-2.036/unplug.xpi differ