[Pkg-mozext-commits] [firegestures] 01/06: Imported Upstream version 1.8.2

David Prévot taffit at moszumanska.debian.org
Sun Jan 19 16:04:34 UTC 2014


This is an automated email from the git hooks/post-receive script.

taffit pushed a commit to branch master
in repository firegestures.

commit bde26279f8180ec8532711bd72fdb31d0a5e629e
Author: David Prévot <taffit at debian.org>
Date:   Sun Jan 19 10:12:21 2014 -0400

    Imported Upstream version 1.8.2
---
 LICENSE.txt                                        |   2 +-
 chrome/content/firegestures/bindings.xml           | 119 ++++++++++++
 chrome/content/firegestures/browser.js             | 203 ++++++++-------------
 chrome/content/firegestures/browser.xul            |  16 +-
 chrome/content/firegestures/prefs.xul              |   2 +-
 chrome/locale/es-MX/firegestures/mapping.dtd       |   4 +-
 chrome/locale/fr/firegestures/prefs.dtd            |  10 +-
 .../zh-TW/firegestures/firegestures.properties     |   2 +-
 chrome/locale/zh-TW/firegestures/mapping.dtd       |   2 +-
 chrome/locale/zh-TW/firegestures/prefs.dtd         |  28 +--
 install.rdf                                        |   6 +-
 11 files changed, 233 insertions(+), 161 deletions(-)

diff --git a/LICENSE.txt b/LICENSE.txt
index d935ac9..0d11bab 100644
--- a/LICENSE.txt
+++ b/LICENSE.txt
@@ -14,7 +14,7 @@
  * The Original Code is FireGestures.
  *
  * The Initial Developer of the Original Code is Gomita <gomita at xuldev.org>.
- * Portions created by the Initial Developer are Copyright (C) 2013
+ * Portions created by the Initial Developer are Copyright (C) 2014
  * the Initial Developer. All Rights Reserved.
  *
  * Contributor(s):
diff --git a/chrome/content/firegestures/bindings.xml b/chrome/content/firegestures/bindings.xml
new file mode 100644
index 0000000..3e1153f
--- /dev/null
+++ b/chrome/content/firegestures/bindings.xml
@@ -0,0 +1,119 @@
+<?xml version="1.0" ?>
+
+<bindings id="FireGesturesBindings"
+          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="popup" role="xul:menupopup"
+	         extends="chrome://global/content/bindings/popup.xml#popup-base">
+		<content wheelscroll="false">
+			<xul:arrowscrollbox anonid="scrollbox" class="popup-internal-box" flex="1" orient="vertical"
+			                    smoothscroll="false">
+				<children />
+			</xul:arrowscrollbox>
+		</content>
+		<implementation implements="nsIDOMEventListener">
+			<constructor><![CDATA[
+				this.style.MozAppearance = "menupopup";
+				if (this.localName == "panel")
+					this.setAttribute("noautohide", "true");
+			]]></constructor>
+			<field name="_currentItem">null</field>
+			<property name="currentItem">
+				<getter><![CDATA[
+					return this._currentItem;
+				]]></getter>
+				<setter><![CDATA[
+					if (this.currentItem) {
+						this.currentItem.removeAttribute("_moz-menuactive");
+						var evt = this.ownerDocument.createEvent("Events");
+						evt.initEvent("DOMMenuItemInactive", true, true);
+						this.currentItem.dispatchEvent(evt);
+						this._currentItem = null;
+					}
+					if (!val)
+						return;
+					this._currentItem = val;
+					val.setAttribute("_moz-menuactive", "true");
+					var evt = this.ownerDocument.createEvent("Events");
+					evt.initEvent("DOMMenuItemActive", true, true);
+					val.dispatchEvent(evt);
+					var scrollbox = document.getAnonymousElementByAttribute(this, "anonid", "scrollbox");
+					scrollbox.ensureElementIsVisible(val);
+				]]></setter>
+			</property>
+			<property name="defaultItem" readonly="true">
+				<getter><![CDATA[
+					return this.querySelector("menuitem[default='true']");
+				]]></getter>
+			</property>
+			<method name="handleEvent">
+				<parameter name="event" />
+				<body><![CDATA[
+					switch (event.type) {
+						case "mouseover": 
+							if (event.target.parentNode != this)
+								break;
+							this.currentItem = event.target;
+							break;
+						case "DOMMouseScroll": 
+							event.preventDefault();
+							event.stopPropagation();
+							var elt = this.currentItem;
+							do {
+								elt = event.detail < 0 ? elt.previousSibling || this.lastChild
+								                       : elt.nextSibling     || this.firstChild;
+								if (elt.localName == "menuitem")
+									break;
+							}
+							while (elt != this.currentItem);
+							this.currentItem = elt;
+							break;
+						case "MozMousePixelScroll": 
+							event.preventDefault();
+							event.stopPropagation();
+							break;
+						case "mouseup": 
+							if (this.currentItem && 
+							    this.currentItem.getAttribute("_moz-menuactive") == "true") {
+								var evt = this.ownerDocument.createEvent("xulcommandevent");
+								evt.initCommandEvent(
+									"command", true, true, this.ownerDocument.defaultView, 0, 
+									false, false, false, false, null
+								);
+								this.currentItem.dispatchEvent(evt);
+							}
+							this.hidePopup();
+							break;
+					}
+				]]></body>
+			</method>
+		</implementation>
+		<handlers>
+			<handler event="popupshown" phase="target"><![CDATA[
+				if (this.defaultItem)
+					this.defaultItem.style.fontWeight = "bold";
+				if (this.getAttribute("wheelscroll") == "true") {
+					this.currentItem = this.defaultItem || this.firstChild;
+					this.addEventListener("mouseover", this, false);
+					this.ownerDocument.documentElement.addEventListener("DOMMouseScroll", this, true);
+					this.ownerDocument.documentElement.addEventListener("MozMousePixelScroll", this, true);
+					this.ownerDocument.documentElement.addEventListener("mouseup", this, true);
+				}
+			]]></handler>
+			<handler event="popuphiding" phase="target"><![CDATA[
+				if (this.getAttribute("wheelscroll") == "true") {
+					this.removeEventListener("mouseover", this, false);
+					this.ownerDocument.documentElement.removeEventListener("DOMMouseScroll", this, true);
+					this.ownerDocument.documentElement.removeEventListener("MozMousePixelScroll", this, true);
+					this.ownerDocument.documentElement.removeEventListener("mouseup", this, true);
+				}
+				this._currentItem = null;
+				while (this.hasChildNodes())
+					this.removeChild(this.lastChild);
+			]]></handler>
+		</handlers>
+	</binding>
+
+</bindings>
diff --git a/chrome/content/firegestures/browser.js b/chrome/content/firegestures/browser.js
index 9d22705..9e1c7fa 100755
--- a/chrome/content/firegestures/browser.js
+++ b/chrome/content/firegestures/browser.js
@@ -738,8 +738,6 @@ var FireGestures = {
 
 
 
-	_popupActiveItem: null,
-
 	generatePopup: function(event, aAttrsList) {
 		this._buildPopup("FireGestures:CustomPopup", event && event.type == "DOMMouseScroll", aAttrsList);
 	},
@@ -747,41 +745,62 @@ var FireGestures = {
 	_buildPopup: function(aCommand, aWheelGesture, aAttrsList) {
 		const POPUP_ID = "FireGesturesPopup";
 		var popup = document.getElementById(POPUP_ID);
-		if (!this._isWin && popup) {
-			popup.parentNode.removeChild(popup);
-			popup = null;
-		}
-		if (!popup) {
-			if (!this._isWin && aWheelGesture) {
-				popup = document.createElement("panel");
-				popup.setAttribute("noautohide", "true");
-			}
-			else {
+		var first = false;
+		if (this._isWin) {
+			if (!popup) {
 				popup = document.createElement("menupopup");
+				first = true;
 			}
-			popup.id = POPUP_ID;
+		}
+		else {
+			if (popup)
+				popup.parentNode.removeChild(popup);
+			popup = document.createElement(aWheelGesture ? "panel" : "menupopup");
+			first = true;
+		}
+		if (first) {
 			document.getElementById("mainPopupSet").appendChild(popup);
+			popup.id = POPUP_ID;
+			popup.style.MozBinding = "url('chrome://firegestures/content/bindings.xml#popup')";
+			popup.style.maxWidth = "42em";
 		}
-		popup.setAttribute("_moz-gesturecommand", aCommand);
-		var activeItem = null;
 		switch (aCommand) {
 			case "FireGestures:AllTabsPopup": 
 				var tabs = gBrowser.mTabs;
 				if (tabs.length < 1)
 					return;
+				var pinned;
 				for (var i = 0; i < tabs.length; i++) {
-					var tab = tabs[i];
+					let tab = tabs[i];
 					if (tab.hidden)
 						continue;
-					var menuitem = popup.appendChild(document.createElement("menuitem"));
-					menuitem.setAttribute("class", "menuitem-iconic alltabs-item menuitem-with-favicon");
+					if (pinned && !tab.pinned)
+						popup.appendChild(document.createElement("menuseparator"));
+					pinned = tab.pinned;
+					let menuitem = popup.appendChild(document.createElement("menuitem"));
 					menuitem.setAttribute("label", tab.label);
 					menuitem.setAttribute("crop", tab.getAttribute("crop"));
 					menuitem.setAttribute("image", tab.getAttribute("image"));
+					menuitem.setAttribute("class", "menuitem-iconic alltabs-item menuitem-with-favicon");
 					menuitem.setAttribute("statustext", tab.linkedBrowser.currentURI.spec);
 					menuitem.index = i;
 					if (tab.selected)
-						activeItem = menuitem;
+						menuitem.setAttribute("default", "true");
+				}
+				var tabContainer = gBrowser.tabContainer;
+				if (tabContainer.getAttribute("overflow") != "true")
+					break;
+				var tabstrip = tabContainer.mTabstrip.scrollBoxObject;
+				for (var i = 0; i < popup.childNodes.length; i++) {
+					let menuitem = popup.childNodes[i];
+					if (menuitem.localName != "menuitem")
+						continue;
+					let tab = gBrowser.mTabs[menuitem.index].boxObject;
+					if (tab.screenX >= tabstrip.screenX && 
+					    tab.screenY >= tabstrip.screenY && 
+					    tab.screenX + tab.width  <= tabstrip.screenX + tabstrip.width && 
+					    tab.screenY + tab.height <= tabstrip.screenY + tabstrip.height)
+						menuitem.setAttribute("tabIsVisible", "true");
 				}
 				break;
 			case "FireGestures:BFHistoryPopup": 
@@ -801,8 +820,8 @@ var FireGestures = {
 					if (i == curIdx) {
 						menuitem.setAttribute("type", "radio");
 						menuitem.setAttribute("checked", "true");
+						menuitem.setAttribute("default", "true");
 						menuitem.className = "unified-nav-current";
-						activeItem = menuitem;
 					}
 					else {
 						PlacesUtils.favicons.getFaviconURLForPage(entry.URI, function(aURI) {
@@ -823,11 +842,11 @@ var FireGestures = {
 					throw "No restorable tabs in this window.";
 				var undoItems = JSON.parse(ss.getClosedTabData(window));
 				for (var i = 0; i < undoItems.length; i++) {
-					var menuitem = popup.appendChild(document.createElement("menuitem"));
+					let menuitem = popup.appendChild(document.createElement("menuitem"));
 					menuitem.setAttribute("label", undoItems[i].title);
 					menuitem.setAttribute("class", "menuitem-iconic bookmark-item menuitem-with-favicon");
 					menuitem.index = i;
-					var iconURL = undoItems[i].image;
+					let iconURL = undoItems[i].image;
 					if (iconURL)
 						menuitem.setAttribute("image", iconURL);
 					let tabData = undoItems[i].state;
@@ -853,7 +872,6 @@ var FireGestures = {
 					popup.insertBefore(menuitem, popup.firstChild);
 					menuitem.engine = engines[i];
 				}
-				popup.setAttribute("_moz-selectedtext", getBrowserSelection());
 				break;
 			case "FireGestures:CustomPopup": 
 				for (let aAttrs of aAttrsList) {
@@ -863,54 +881,30 @@ var FireGestures = {
 					}
 					else {
 						menuitem = document.createElement("menuitem");
-						for (var [name, val] in Iterator(aAttrs)) {
+						for (let [name, val] in Iterator(aAttrs)) {
 							menuitem.setAttribute(name, val);
+							if (menuitem.getAttribute("checked") == "true")
+								menuitem.setAttribute("default", "true");
 						}
 					}
 					popup.appendChild(menuitem);
 				}
 				break;
 		}
-		if (activeItem)
-			activeItem.setAttribute("default", "true");
-		else
-			activeItem = popup.firstChild;
-		if (aWheelGesture) {
-			this._popupActiveItem = activeItem;
-			popup.addEventListener("popupshown", this, true);
-		}
-		document.popupNode = null;
-		document.tooltipNode = null;
-		popup.addEventListener("popupshowing", this, true);
-		popup.addEventListener("popuphiding", this, true);
+		popup.setAttribute("wheelscroll", aWheelGesture ? "true" : "false");
+		popup.setAttribute("_gesturecommand", aCommand);
 		popup.addEventListener("DOMMenuItemActive", this, false);
 		popup.addEventListener("DOMMenuItemInactive", this, false);
+		popup.addEventListener("command", this, false);
+		popup.addEventListener("popuphiding", this, false);
+		document.popupNode = null;
+		document.tooltipNode = null;
 		this._gestureHandler.openPopupAtPointer(popup);
-		document.documentElement.addEventListener("mouseup", this, true);
-		if (aWheelGesture) {
-			document.documentElement.addEventListener("DOMMouseScroll", this, true);
-			popup.addEventListener("mouseover", this, false);
-		}
 	},
 
 	handleEvent: function(event) {
 		var popup = document.getElementById("FireGesturesPopup");
 		switch (event.type) {
-			case "DOMMouseScroll": 
-				event.preventDefault();
-				event.stopPropagation();
-				this._activateMenuItem(false);
-				var activeItem = this._popupActiveItem;
-				activeItem = event.detail > 0 ? activeItem.nextSibling : activeItem.previousSibling;
-				if (!activeItem)
-					activeItem = event.detail > 0 ? popup.firstChild : popup.lastChild;
-				this._popupActiveItem = activeItem;
-				this._activateMenuItem(true);
-				if (this._isWin) {
-					var scrollbox = document.getAnonymousNodes(popup)[0];
-					scrollbox.ensureElementIsVisible(activeItem);
-				}
-				break;
 			case "DOMMenuItemActive": 
 				var statusText = event.target.getAttribute("statustext");
 				if (statusText == "about:blank")
@@ -921,85 +915,44 @@ var FireGestures = {
 			case "DOMMenuItemInactive": 
 				XULBrowserWindow.setOverLink("", null);
 				break;
-			case "mouseover": 
-				if (event.target.parentNode != popup)
+			case "command": 
+				var item = popup.currentItem || event.target;
+				if (popup.defaultItem == item)
 					break;
-				this._activateMenuItem(false);
-				this._popupActiveItem = event.target;
-				this._activateMenuItem(true);
-				break;
-			case "mouseup": 
-				var activeItem = this._popupActiveItem || event.target;
-				if (activeItem.localName == "menuitem" && !activeItem.hasAttribute("default")) {
-					switch (popup.getAttribute("_moz-gesturecommand")) {
-						case "FireGestures:AllTabsPopup": 
-							gBrowser.selectedTab = gBrowser.mTabs[activeItem.index];
+				switch (popup.getAttribute("_gesturecommand")) {
+					case "FireGestures:AllTabsPopup": 
+						gBrowser.selectedTab = gBrowser.mTabs[item.index];
+						break;
+					case "FireGestures:BFHistoryPopup": 
+						gBrowser.webNavigation.gotoIndex(item.index);
+						break;
+					case "FireGestures:ClosedTabsPopup": 
+						undoCloseTab(item.index);
+						break;
+					case "FireGestures:WebSearchPopup": 
+						var engine = item.engine;
+						if (!engine)
 							break;
-						case "FireGestures:BFHistoryPopup": 
-							gBrowser.webNavigation.gotoIndex(activeItem.index);
+						var submission = engine.getSubmission(getBrowserSelection(), null);
+						if (!submission)
 							break;
-						case "FireGestures:ClosedTabsPopup": 
-							undoCloseTab(activeItem.index);
-							break;
-						case "FireGestures:WebSearchPopup": 
-							var selText = popup.getAttribute("_moz-selectedtext");
-							var engine = activeItem.engine;
-							if (!engine)
-								break;
-							var submission = engine.getSubmission(selText, null);
-							if (!submission)
-								break;
-							gBrowser.loadOneTab(submission.uri.spec, {
-								postData: submission.postData,
-								relatedToCurrent: true
-							});
-							break;
-						default: 
-							eval(activeItem.getAttribute("oncommand"));
-					}
-				}
-				popup.hidePopup();
-				break;
-			case "popupshowing": 
-				var boxObj = popup.popupBoxObject;
-				if ("setConsumeRollupEvent" in boxObj) {
-					boxObj.setConsumeRollupEvent(boxObj.ROLLUP_NO_CONSUME);
+						gBrowser.loadOneTab(submission.uri.spec, {
+							postData: submission.postData,
+							relatedToCurrent: true
+						});
+						break;
 				}
 				break;
-			case "popupshown": 
-				this._activateMenuItem(true);
-				break;
 			case "popuphiding": 
-				this._activateMenuItem(false);
-				this._popupActiveItem = null;
-				popup.removeEventListener("popupshowing", this, true);
-				popup.removeEventListener("popupshown", this, true);
-				popup.removeEventListener("popuphiding", this, true);
-				popup.removeEventListener("mouseover", this, false);
-				document.documentElement.removeEventListener("mouseup", this, true);
-				document.documentElement.removeEventListener("DOMMouseScroll", this, true);
-				while (popup.hasChildNodes())
-					popup.removeChild(popup.lastChild);
+				popup.removeAttribute("_gesturecommand");
+				popup.removeEventListener("DOMMenuItemActive", this, false);
+				popup.removeEventListener("DOMMenuItemInactive", this, false);
+				popup.removeEventListener("command", this, false);
+				popup.removeEventListener("popuphiding", this, false);
 				break;
 		}
 	},
 
-	_activateMenuItem: function(aActive) {
-		if (!this._popupActiveItem)
-			return;
-		if (aActive)
-			this._popupActiveItem.setAttribute("_moz-menuactive", "true");
-		else
-			this._popupActiveItem.removeAttribute("_moz-menuactive");
-		if (!this._isWin) {
-			this._popupActiveItem.style.backgroundColor = aActive ? "-moz-menuhover" : "";
-			this._popupActiveItem.style.color = aActive ? "-moz-menuhovertext" : "";
-		}
-		var evt = document.createEvent("Events");
-		evt.initEvent(aActive ? "DOMMenuItemActive" : "DOMMenuItemInactive", true, true);
-		this._popupActiveItem.dispatchEvent(evt);
-	},
-
 
 
 	QueryInterface: function(aIID) {
diff --git a/chrome/content/firegestures/browser.xul b/chrome/content/firegestures/browser.xul
index 53552a9..a602621 100644
--- a/chrome/content/firegestures/browser.xul
+++ b/chrome/content/firegestures/browser.xul
@@ -1,8 +1,8 @@
-<?xml version="1.0"?>
-
-<overlay id="FireGesturesBrowserOverlay"
-         xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
-
-	<script type="application/x-javascript" src="chrome://firegestures/content/browser.js" />
-
-</overlay>
+<?xml version="1.0"?>
+
+<overlay id="FireGesturesBrowserOverlay"
+         xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
+
+	<script type="application/x-javascript" src="chrome://firegestures/content/browser.js" />
+
+</overlay>
diff --git a/chrome/content/firegestures/prefs.xul b/chrome/content/firegestures/prefs.xul
index 6f0b611..074539e 100644
--- a/chrome/content/firegestures/prefs.xul
+++ b/chrome/content/firegestures/prefs.xul
@@ -122,7 +122,7 @@
 		      onselect="PrefsUI.updateCommands();"
 		      ondblclick="PrefsUI.handleTreeEvent(event);"
 		      onkeypress="PrefsUI.handleTreeEvent(event);"
-		      rows="18" flex="1">
+		      rows="16" flex="1">
 			<treecols>
 				<treecol label="&treecol.name;" flex="5" primary="true" />
 				<splitter class="tree-splitter" />
diff --git a/chrome/locale/es-MX/firegestures/mapping.dtd b/chrome/locale/es-MX/firegestures/mapping.dtd
index 0bdb8df..8dd1d43 100644
--- a/chrome/locale/es-MX/firegestures/mapping.dtd
+++ b/chrome/locale/es-MX/firegestures/mapping.dtd
@@ -26,8 +26,8 @@
 <!ENTITY gestureCmd.closeRightTabs "Cerrar pestañas de la derecha">
 <!ENTITY gestureCmd.scrollTop "Regresar al inicio de la página">
 <!ENTITY gestureCmd.scrollBottom "Ir al final de la página">
-<!ENTITY gestureCmd.scrollPageUp "Avanzar una página">
-<!ENTITY gestureCmd.scrollPageDown "Retroceder una página">
+<!ENTITY gestureCmd.scrollPageUp "Retroceder una página">
+<!ENTITY gestureCmd.scrollPageDown "Avanzar una página">
 <!ENTITY gestureCmd.backgroundTab "en segundo plano">
 <!ENTITY gestureCmd.foregroundTab "en primer plano">
 <!ENTITY gestureCmd.saveImageNow "Guardar imagen ya">
diff --git a/chrome/locale/fr/firegestures/prefs.dtd b/chrome/locale/fr/firegestures/prefs.dtd
index 7d3f39f..01d209a 100644
--- a/chrome/locale/fr/firegestures/prefs.dtd
+++ b/chrome/locale/fr/firegestures/prefs.dtd
@@ -21,9 +21,9 @@
 <!ENTITY mappings.title "Correspondances">
 <!ENTITY mappings.description "Choisir une correspondance à configurer">
 <!ENTITY tools.title "Outils">
-<!ENTITY tools.description "Réinitialiser et restaurer toutes les correspondances">
-<!ENTITY tools.backup.label "Réinitialiser">
-<!ENTITY tools.restore.label "Restaurer">
+<!ENTITY tools.description "Exporter puis importer les règlages">
+<!ENTITY tools.backup.label "Exporter">
+<!ENTITY tools.restore.label "Importer">
 <!ENTITY tools.restore.alerttext "Cela remplacera toutes les correspondances actuelles en les réinitialisant. Voulez-vous vraiment continuer ?">
 <!ENTITY wheelGesture "Gestes avec la molette">
 <!ENTITY wheelGesture.up.left "Défiler vers le haut en maintenant le clic gauche">
@@ -35,14 +35,14 @@
 <!ENTITY rockerGesture "Gestes à clics">
 <!ENTITY rockerGesture.left "Clic gauche en maintenant le clic droit">
 <!ENTITY rockerGesture.right "Clic droit en maintenant le clic gauche">
-<!ENTITY keypressGesture "Gestes avec l'appui sur des touches">
+<!ENTITY keypressGesture "Gestes avec l'appui sur des touches">
 <!ENTITY keypressGesture.ctrl "Geste de la souris en maintenant la touche Ctrl">
 <!ENTITY keypressGesture.shift "Geste de la souris en maintenant la touche Maj">
 <!ENTITY keypressGesture.open "Ouvrir dans des onglets les liens survolés">
 <!ENTITY keypressGesture.save "Enregistrer les liens survolés">
 <!ENTITY keypressGesture.copy "Copier les adresses des liens survolés">
 <!ENTITY tabwheelGesture "Gestes avec la molette, pour les onglets">
-<!ENTITY tabwheelGesture.description "Changer d'onglet en faisant tourner la molette sur la barre d'onglets">
+<!ENTITY tabwheelGesture.description "Changer d'onglet en faisant tourner la molette sur la barre d'onglets">
 <!ENTITY swipe "Swipe Gestures">
 <!ENTITY swipe.left "Swipe leftward">
 <!ENTITY swipe.right "Swipe rightward">
diff --git a/chrome/locale/zh-TW/firegestures/firegestures.properties b/chrome/locale/zh-TW/firegestures/firegestures.properties
index a1b13ca..421a495 100644
--- a/chrome/locale/zh-TW/firegestures/firegestures.properties
+++ b/chrome/locale/zh-TW/firegestures/firegestures.properties
@@ -8,4 +8,4 @@ ERROR_NOT_ON_LINK=手勢起始點不在鏈結上
 CONFIRM_CONFLICT=手勢「%S」已和「%S」衝突。\n要清除手勢「%S」嗎?
 NEW_SCRIPT=新腳本手勢
 INVALID_SCRIPT=此腳本手勢含有錯誤程式碼。
-CHOOSE_SCRIPT=Choose a script:
+CHOOSE_SCRIPT=選擇一個腳本:
diff --git a/chrome/locale/zh-TW/firegestures/mapping.dtd b/chrome/locale/zh-TW/firegestures/mapping.dtd
index df66276..78f453c 100644
--- a/chrome/locale/zh-TW/firegestures/mapping.dtd
+++ b/chrome/locale/zh-TW/firegestures/mapping.dtd
@@ -33,7 +33,7 @@
 <!ENTITY gestureCmd.saveImageNow "立刻儲存圖片">
 <!ENTITY gestureCmd.searchForSelection "搜尋選取的文字">
 <!ENTITY gestureCmd.searchForSelectionWith "以選取的搜尋引擎搜尋文字">
-<!ENTITY gestureCmd.allScripts "All User Scripts">
+<!ENTITY gestureCmd.allScripts "所有使用者腳本">
 <!ENTITY gestureCmd.openLinksInSelection "開啟選取範圍內的所有鏈結">
 <!ENTITY gestureCmd.openURLsInSelection "開啟選取範圍內的所有網址">
 <!ENTITY gestureCmd.bookmarksSidebar "於側邊欄顯示書籤">
diff --git a/chrome/locale/zh-TW/firegestures/prefs.dtd b/chrome/locale/zh-TW/firegestures/prefs.dtd
index aae2657..59661a2 100644
--- a/chrome/locale/zh-TW/firegestures/prefs.dtd
+++ b/chrome/locale/zh-TW/firegestures/prefs.dtd
@@ -2,7 +2,7 @@
 <!ENTITY mainPane "一般設定">
 <!ENTITY mappingPane "手勢對應">
 <!ENTITY advancedPane "進階設定">
-<!ENTITY swipePane "Swipe">
+<!ENTITY swipePane "滑動">
 <!ENTITY mouseGesture "滑鼠手勢">
 <!ENTITY triggerButton "要執行滑鼠手勢的按鍵">
 <!ENTITY triggerButton.left "左鍵">
@@ -36,21 +36,21 @@
 <!ENTITY rockerGesture.left "按住右鍵不放再按左鍵">
 <!ENTITY rockerGesture.right "按住左鍵不放再按右鍵">
 <!ENTITY keypressGesture "按鍵手勢">
-<!ENTITY keypressGesture.ctrl "按住 Ctrl 鍵並劃過連結">
-<!ENTITY keypressGesture.shift "按住 Shift 鍵並劃過連結">
-<!ENTITY keypressGesture.open "於分頁中開啟所有劃過的連結">
-<!ENTITY keypressGesture.save "儲存所有劃過的連結">
-<!ENTITY keypressGesture.copy "複製所有劃過的連結網址">
+<!ENTITY keypressGesture.ctrl "按住 Ctrl 鍵並劃過鏈結">
+<!ENTITY keypressGesture.shift "按住 Shift 鍵並劃過鏈結">
+<!ENTITY keypressGesture.open "於分頁中開啟所有劃過的鏈結">
+<!ENTITY keypressGesture.save "儲存所有劃過的鏈結">
+<!ENTITY keypressGesture.copy "複製所有劃過的鏈結網址">
 <!ENTITY tabwheelGesture "分頁滾輪手勢">
 <!ENTITY tabwheelGesture.description "於分頁列上滾動滾輪切換分頁">
-<!ENTITY swipe "Swipe Gestures">
-<!ENTITY swipe.left "Swipe leftward">
-<!ENTITY swipe.right "Swipe rightward">
-<!ENTITY swipe.up "Swipe upward">
-<!ENTITY swipe.down "Swipe downward">
-<!ENTITY swipe.continuous "Mouse gesture with continuous swipes">
-<!ENTITY swipe.continuous.1 "Time to wait for next direction">
-<!ENTITY swipe.continuous.2 "seconds">
+<!ENTITY swipe "滑動手勢">
+<!ENTITY swipe.left "向左滑動">
+<!ENTITY swipe.right "向右滑動">
+<!ENTITY swipe.up "向上滑動">
+<!ENTITY swipe.down "向下滑動">
+<!ENTITY swipe.continuous "持續滑動的滑鼠手勢">
+<!ENTITY swipe.continuous.1 "等待下一個方向的時間">
+<!ENTITY swipe.continuous.2 "秒">
 <!ENTITY treecol.name "名稱">
 <!ENTITY treecol.command "命令">
 <!ENTITY treecol.script "腳本手勢">
diff --git a/install.rdf b/install.rdf
index 3053a75..e13d4f6 100644
--- a/install.rdf
+++ b/install.rdf
@@ -7,7 +7,7 @@
 		<em:id>firegestures at xuldev.org</em:id>
 		<em:type>2</em:type>
 		<em:name>FireGestures</em:name>
-		<em:version>1.7.15</em:version>
+		<em:version>1.8.2</em:version>
 		<em:description>Executes various commands with mouse gestures.</em:description>
 		<em:creator>Gomita</em:creator>
 		<em:localized>
@@ -277,8 +277,8 @@
 		<em:targetApplication>
 			<Description>
 				<em:id>{ec8030f7-c20a-464f-9b0e-13a3a9e97384}</em:id>
-				<em:minVersion>20.0</em:minVersion>
-				<em:maxVersion>28.0a1</em:maxVersion>
+				<em:minVersion>24.0</em:minVersion>
+				<em:maxVersion>29.0a1</em:maxVersion>
 			</Description>
 		</em:targetApplication>
 	</Description>

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-mozext/firegestures.git



More information about the Pkg-mozext-commits mailing list