diff --new-file --recursive --suppress-common-lines --exclude changes.txt --exclude diff.txt releases/unplug-2.047/source/chrome/content/common.js releases/unplug-2.048/source/chrome/content/common.js
142c142
< 	version  : 2.047,
---
> 	version  : 2.048,
146c146
< 	revision : 201104101812,
---
> 	revision : 201105222117,
diff --new-file --recursive --suppress-common-lines --exclude changes.txt --exclude diff.txt releases/unplug-2.047/source/chrome/content/display/pop/pop.js releases/unplug-2.048/source/chrome/content/display/pop/pop.js
746a747
> 		var need_sort = false;
752a754
> 			result.details.mediaid = result.details.mediaid || this.result.details.mediaid;
760,766c762,770
< 			// keychain changed?
< 			if (this.check_keychain_changed()) {
< 				var root = this.root();
< 				this.parent.remove_child(this);
< 				root.place_mediaresult(this);
< 				return;
< 			}
---
> 			need_sort = true;
> 		} else if (!this.result.name || !this.result.description || !this.result.thumbnail) {
> 			// can copy some fields (eg: default title) if they are unset, even if less certain
> 			// NOTE: this is destructive to history!
> 			this.result.name = this.result.name || result.name;
> 			this.result.description = this.result.description || result.description;
> 			this.result.thumbnail = this.result.thumbnail || result.thumbnail;
> 			this.result.details.mediaid = this.result.details.mediaid || result.details.mediaid;
> 		}
767a772,780
> 		// keychain changed (eg: if mediaid changed)
> 		if (this.check_keychain_changed()) {
> 			var root = this.root();
> 			this.parent.remove_child(this);
> 			root.place_mediaresult(this);
> 			return;
> 		}
> 
> 		if (need_sort) {
776,781d788
< 		} else if (!this.result.name || !this.result.description || !this.result.thumbnail) {
< 			// can copy some fields (eg: default title) if they are unset, even if less certain
< 			// NOTE: this is destructive to history!
< 			this.result.name = this.result.name || result.name;
< 			this.result.description = this.result.description || result.description;
< 			this.result.thumbnail = this.result.thumbnail || result.thumbnail;
diff --new-file --recursive --suppress-common-lines --exclude changes.txt --exclude diff.txt releases/unplug-2.047/source/chrome/content/rules.xml releases/unplug-2.048/source/chrome/content/rules.xml
205c205
< 		<each_element ref="vid" tagname="video" require_attrs="src" attrs="poster">
---
> 		<each_element ref="vid" tagname="video" require_attrs="src" attrs="poster,data-youtube-id">
206a207,210
> 			<rule id="html5-youtube">
> 				<if_re re=".+" string="${vid.data-youtube-id}" />
> 				<media url="${vid.src}" thumbnail="${vid.poster}" certainty="high" quality="mid" title="${origtitle.innerHTML}" description="HTML5 Video" mediaid="${vid.data-youtube-id}" type="webm" />
> 			</rule>
425a430,433
> 					<rule ref="amp_fv">
> 						<if_re ref="file" string="${embedelem.flashvars}" re="=([^=]+\.(flv|mp4|avi|wmv))(?:&amp;|$)" />
> 						<media url="${urldecode:file.1}" type="${file.2}" certainty="mid" title="${origtitle.innerHTML}" />
> 					</rule>
1095a1104,1120
> 		<rule id="wmctv-2011">
> 			<if_url host="wmctv.com" />
> 			<if_re ref="clipid" re="widgetVideoCanvas[A-Za-z0-9]*\.SetVariable\(&quot;clipId&quot;, &quot;(\d+)&quot;\);" />
> 			<download url="http://www.wmctv.com/build.asp?buildtype=buildfeaturexmlrequest&amp;featureType=Clip&amp;featureid=${clipid.1}&amp;affiliateno=59&amp;clientgroupid=1">
> 				<optional_re ref="title" re="&lt;HEADLINE&gt;&lt;![CDATA[(.*?)]]&gt;&lt;/HEADLINE&gt;" />
> 				<optional_re ref="thumb" re="&lt;!\[CDATA\[(http://[^&lt;&gt;]+_vt\.jpg)\]\]&gt;" />
> 				<each_element ref="media" tagname="media:content" require_attrs="url" attrs="filesize,bitrate,width,height,type,platform">
> 					<optional_switch ref="qual" input="${media.bitrate}" default="mid"
> 						k1="224" v1="very-low"
> 						k2="944" v2="low" />
> 					<media url="${urldecode:media.url}" mediaid="${clipid.1}"
> 						thumbnail="${thumb.1}" title="${either:title.1:origtitle.innerHTML}"
> 						description="${optional:media.platform} ${optional:media.width}x${optional:media.height} ${optional:media.type} ${optional:media.filesize}bytes"
> 						quality="${qual.1}" />
> 				</each_element>
> 			</download>
> 		</rule>
diff --new-file --recursive --suppress-common-lines --exclude changes.txt --exclude diff.txt releases/unplug-2.047/source/chrome/content/search/search.js releases/unplug-2.048/source/chrome/content/search/search.js
330,332c330,347
< 						switch (m) {
< 							case "amp": return "&";
< 							case "quot": return "\"";
---
> 						try {
> 							switch (m) {
> 								case "amp": return "&";
> 								case "quot": return "\"";
> 								case "rlm": return ""; // right-to-left mark
> 								case "lrm": return ""; // left-to-right mark
> 							}
> 							if (m[0] == "#") {
> 								if (m[1] == "x") {
> 									return String.fromCharCode(parseInt(m.substr(2), 16));
> 								} else {
> 									return String.fromCharCode(m.substr(1));
> 								}
> 							}
> 							throw "Unknown htmldecode: entity " + m;
> 						} catch (e) {
> 							UnPlug2.log("Undefined htmldecode entity:" + m);
> 							return m
334,336d348
< 						if (m[0] == "#")
< 							return String.fromCharCode(m.substr(1));
< 						throw "Unknown htmldecode: entity " + m;
diff --new-file --recursive --suppress-common-lines --exclude changes.txt --exclude diff.txt releases/unplug-2.047/source/chrome/locale/fr-FR/searchpage.dtd releases/unplug-2.048/source/chrome/locale/fr-FR/searchpage.dtd
1c1
< <!--
---
> <!--
38,46c38,46
< <!ENTITY dlselected.label     "Download selected">
< <!ENTITY dlselected.accesskey "D">
< <!ENTITY dlselected.heading   "Download selected results">
< <!ENTITY close.label          "Close">
< <!ENTITY close.accesskey      "C">
< <!ENTITY view.single          "Single view">
< <!ENTITY view.single.a        "v">
< <!ENTITY view.multiple        "Multiple view">
< <!ENTITY view.multiple.a      "v">
---
> <!ENTITY dlselected.label     "Télécharger la sélection">
> <!ENTITY dlselected.accesskey "s">
> <!ENTITY dlselected.heading   "Téléchargement des résultats sélectionnés">
> <!ENTITY close.label          "Fermer">
> <!ENTITY close.accesskey      "F">
> <!ENTITY view.single          "Affichage unique">
> <!ENTITY view.single.a        "h">
> <!ENTITY view.multiple        "Affichage multiple">
> <!ENTITY view.multiple.a      "h">
diff --new-file --recursive --suppress-common-lines --exclude changes.txt --exclude diff.txt releases/unplug-2.047/source/chrome/locale/fr-FR/strings.txt releases/unplug-2.048/source/chrome/locale/fr-FR/strings.txt
1c1
< extensions.{unplug@compunach}.description=Télécharger le média intégré
---
> extensions.{unplug@compunach}.description=Télécharger le média intégré
27c27
< embedplayer=Objet intégré (pas une vidéo, possiblement un lecteur)
---
> embedplayer=Objet intégré (pas une vidéo, probablement un lecteur)
30,31c30,31
< save_to_file=Save As
< save_to_directory=Save to Folder
---
> save_to_file=Enregistrer sous
> save_to_directory=Enregistrer dans le dossier :
58c58
< dmethod.vlc.tip=Obtenir ou exécuter VLC
---
> dmethod.vlc.tip=Obtenir ou exécuter VLC.
61,62c61,62
< plus_n_extra_results=Plus %s results which will not be downloaded
< n_files=%s files
---
> plus_n_extra_results=%s résultat(s) ne sera (seront) pas téléchargé(s).
> n_files=%s fichier(s)
64c64
< trace=Debug
---
> trace=Débogage
66c66
< trace.tip=Show information which can be used for debugging
---
> trace.tip=Afficher les informations utiles au débogage.
78c78
< extern.cancel.manyfile=Voulez-vous interrompre %s tééchargements en cours ?
---
> extern.cancel.manyfile=Voulez-vous interrompre %s téléchargements en cours ?
diff --new-file --recursive --suppress-common-lines --exclude changes.txt --exclude diff.txt releases/unplug-2.047/source/install.rdf releases/unplug-2.048/source/install.rdf
9c9
< 		em:version="2.047"
---
> 		em:version="2.048"
Binary files releases/unplug-2.047/unplug.xpi and releases/unplug-2.048/unplug.xpi differ