[Pkg-mozext-commits] [searchload-options] 01/05: Imported Upstream version 0.8.0
David Prévot
taffit at moszumanska.debian.org
Thu May 8 02:07:55 UTC 2014
This is an automated email from the git hooks/post-receive script.
taffit pushed a commit to branch master
in repository searchload-options.
commit cb3bfeb2cb2472dac5e3b9728a87eb2282f3e91e
Author: David Prévot <taffit at debian.org>
Date: Wed May 7 20:25:10 2014 -0400
Imported Upstream version 0.8.0
---
bootstrap.js | 482 ++++++++++++---------
chrome.manifest | 12 +-
content/preferences.js | 135 ------
content/preferences.xul | 97 -----
content/search-options.js | 113 +++++
content/search-options.xul | 99 +++++
install.rdf | 111 +----
locale/ca-AD/amo.properties | 4 -
locale/ca-AD/pref.dtd | 16 -
locale/ca-AD/searchbar.properties | 1 -
locale/de/amo.properties | 4 -
locale/de/pref.dtd | 16 -
locale/de/search-options.dtd | 17 +
locale/de/searchbar.properties | 2 +-
locale/el/amo.properties | 4 -
locale/el/pref.dtd | 16 -
locale/el/search-options.dtd | 17 +
locale/el/searchbar.properties | 2 +-
locale/en-US/amo.properties | 4 -
locale/en-US/pref.dtd | 16 -
locale/en-US/search-options.dtd | 17 +
locale/en-US/searchbar.properties | 2 +-
locale/es-ES/amo.properties | 4 -
locale/es-ES/pref.dtd | 16 -
locale/es-ES/searchbar.properties | 1 -
locale/fr/amo.properties | 4 -
locale/fr/pref.dtd | 16 -
locale/fr/searchbar.properties | 1 -
locale/he-IL/amo.properties | 4 -
locale/he-IL/pref.dtd | 16 -
locale/he-IL/searchbar.properties | 1 -
locale/he/amo.properties | 4 -
locale/he/pref.dtd | 16 -
locale/he/searchbar.properties | 1 -
locale/hu-HU/amo.properties | 4 -
locale/hu-HU/pref.dtd | 16 -
locale/hu-HU/searchbar.properties | 1 -
locale/it/amo.properties | 4 -
locale/it/pref.dtd | 16 -
locale/it/searchbar.properties | 1 -
locale/ja-JP/amo.properties | 4 -
locale/ja-JP/pref.dtd | 16 -
locale/ja-JP/search-options.dtd | 17 +
locale/ja-JP/searchbar.properties | 2 +-
locale/lt-LT/amo.properties | 4 -
locale/lt-LT/pref.dtd | 16 -
locale/lt-LT/search-options.dtd | 17 +
locale/lt-LT/searchbar.properties | 2 +-
locale/lt/amo.properties | 4 -
locale/lt/pref.dtd | 16 -
locale/lt/searchbar.properties | 1 -
locale/nl/amo.properties | 4 -
locale/nl/pref.dtd | 16 -
locale/nl/search-options.dtd | 17 +
locale/nl/searchbar.properties | 2 +-
locale/pl/amo.properties | 4 -
locale/pl/pref.dtd | 16 -
locale/pl/searchbar.properties | 1 -
locale/pt-BR/amo.properties | 4 -
locale/pt-BR/pref.dtd | 16 -
locale/pt-BR/search-options.dtd | 17 +
locale/pt-BR/searchbar.properties | 2 +-
locale/ru-RU/amo.properties | 4 -
locale/ru-RU/pref.dtd | 16 -
locale/ru-RU/searchbar.properties | 1 -
locale/sv-SE/amo.properties | 4 -
locale/sv-SE/pref.dtd | 16 -
locale/sv-SE/searchbar.properties | 1 -
locale/tr/amo.properties | 4 -
locale/tr/pref.dtd | 16 -
locale/tr/search-options.dtd | 17 +
locale/tr/searchbar.properties | 2 +-
locale/uk-UA/amo.properties | 4 -
locale/uk-UA/pref.dtd | 16 -
locale/uk-UA/search-options.dtd | 17 +
locale/uk-UA/searchbar.properties | 2 +-
locale/zh-CN/amo.properties | 4 -
locale/zh-CN/pref.dtd | 16 -
locale/zh-CN/search-options.dtd | 17 +
locale/zh-CN/searchbar.properties | 2 +-
locale/zh-TW/amo.properties | 4 -
locale/zh-TW/pref.dtd | 16 -
locale/zh-TW/search-options.dtd | 17 +
locale/zh-TW/searchbar.properties | 2 +-
skin/classic/icon.png | Bin
skin/classic/menuitem-icon.png | Bin 0 -> 757 bytes
.../classic/{searchpane.css => search-options.css} | 12 -
87 files changed, 716 insertions(+), 1005 deletions(-)
diff --git a/bootstrap.js b/bootstrap.js
old mode 100644
new mode 100755
index 3f97824..9160a55
--- a/bootstrap.js
+++ b/bootstrap.js
@@ -14,7 +14,21 @@
// You should have received a copy of the GNU General Public License
// along with this program. If not, see <http://www.gnu.org/licenses/>.
+const Cc = Components.classes, Ci = Components.interfaces;
+
searchLoad_Preferences = {
+ updateListeners: function(){
+ let wm = Cc["@mozilla.org/appshell/window-mediator;1"].getService(Ci.nsIWindowMediator);
+ let enumerator = wm.getEnumerator("navigator:browser");
+
+ while (enumerator.hasMoreElements())
+ {
+ let win = enumerator.getNext().QueryInterface(Ci.nsIDOMWindow);
+ if( win.searchLoad_Options )
+ win.searchLoad_Options.setSearchbarListeners();
+ }
+ },
+
pref: {},
prefObserver: {
@@ -22,43 +36,51 @@ searchLoad_Preferences = {
branch : null,
register : function(){
- let prefService = Components.classes["@mozilla.org/preferences-service;1"]
- .getService(Components.interfaces.nsIPrefService);
-
+ let prefService = Cc["@mozilla.org/preferences-service;1"]
+ .getService(Ci.nsIPrefService);
this.branch = prefService.getBranch("extensions.searchload.");
-
this.branch.addObserver("", this, false);
},
- unregister : function() {
+ unregister : function(){
this.branch.removeObserver("", this);
},
- observe : function(aSubject, aTopic, aData) {
+ observe : function(aSubject, aTopic, aData){
switch(aData){
- case "clearonsearch" : searchLoad_Preferences.pref.clearonsearch = this.branch.getBoolPref("clearonsearch" ); break;
- case "cleardelay" : searchLoad_Preferences.pref.cleardelay = this.branch.getIntPref ("cleardelay" );
- searchLoad_Preferences.pref.cleardelay *= 1000;
- break;
- case "resetonsearch" : searchLoad_Preferences.pref.resetonsearch = this.branch.getBoolPref("resetonsearch" ); break;
- case "resetdelay" : searchLoad_Preferences.pref.resetdelay = this.branch.getIntPref ("resetdelay" );
- searchLoad_Preferences.pref.resetdelay *= 1000;
- break;
- case "cancelclear" : searchLoad_Preferences.pref.cancelclear = this.branch.getBoolPref("cancelclear" ); break;
- case "cancelreset" : searchLoad_Preferences.pref.cancelreset = this.branch.getBoolPref("cancelreset" ); break;
- case "defaultengine" : searchLoad_Preferences.pref.defaultengine = this.branch.getCharPref("defaultengine" );
- searchLoad_Preferences.pref.defaultengine = decodeURIComponent( escape(searchLoad_Preferences.pref.defaultengine) );
- break;
- case "newtab" : searchLoad_Preferences.pref.newtab = this.branch.getIntPref ("newtab" ); break;
- case "detectblanktab": searchLoad_Preferences.pref.detectblanktab = this.branch.getBoolPref("detectblanktab"); break;
- case "detecthometab" : searchLoad_Preferences.pref.detecthometab = this.branch.getBoolPref("detecthometab" ); break;
- case "detectnewtab" : searchLoad_Preferences.pref.detectnewtab = this.branch.getBoolPref("detectnewtab" ); break;
+ case "clear_on_submission" : searchLoad_Preferences.pref.clear_on_submission = this.branch.getBoolPref( "clear_on_submission" );
+ searchLoad_Preferences.updateListeners();
+ break;
+ case "clear_on_blur" : searchLoad_Preferences.pref.clear_on_blur = this.branch.getBoolPref( "clear_on_blur" );
+ searchLoad_Preferences.updateListeners();
+ break;
+ case "clear_delay" : searchLoad_Preferences.pref.clear_delay = this.branch.getIntPref ( "clear_delay" );
+ searchLoad_Preferences.pref.clear_delay *= 1000;
+ searchLoad_Preferences.updateListeners();
+ break;
+ case "defaultengine" : searchLoad_Preferences.pref.defaultengine = this.branch.getCharPref( "defaultengine" );
+ searchLoad_Preferences.pref.defaultengine = decodeURIComponent( escape(searchLoad_Preferences.pref.defaultengine) );
+ break;
+ case "reset_on_submission" : searchLoad_Preferences.pref.reset_on_submission = this.branch.getBoolPref( "reset_on_submission" );
+ searchLoad_Preferences.updateListeners();
+ break;
+ case "reset_on_blur" : searchLoad_Preferences.pref.reset_on_blur = this.branch.getBoolPref( "reset_on_blur" );
+ searchLoad_Preferences.updateListeners();
+ break;
+ case "reset_delay" : searchLoad_Preferences.pref.reset_delay = this.branch.getIntPref ( "reset_delay" );
+ searchLoad_Preferences.pref.reset_delay *= 1000;
+ searchLoad_Preferences.updateListeners();
+ break;
+ case "default_tab" : searchLoad_Preferences.pref.default_tab = this.branch.getIntPref ( "default_tab" ); break;
+ case "detect_blank_tab" : searchLoad_Preferences.pref.detect_blank_tab = this.branch.getBoolPref( "detect_blank_tab" ); break;
+ case "detect_home_tab" : searchLoad_Preferences.pref.detect_home_tab = this.branch.getBoolPref( "detect_home_tab" ); break;
+ case "detect_new_tab_page" : searchLoad_Preferences.pref.detect_new_tab_page = this.branch.getBoolPref( "detect_new_tab_page" ); break;
}
}
}
};
-function searchLoad_Options(win)
+function searchLoad_Options (win)
{
var self = this;
var window = win;
@@ -66,56 +88,185 @@ function searchLoad_Options(win)
this.MOZhandleSearch = null;
this.MOZdoSearch = null;
- this.MOZToolboxCustomizeDone = null;
+
this.eventModifier = false;
this.eventShift = false;
- this.clearTID = null;//Timeout ID
- this.resetTID = null;//Timeout ID
+ this.clearTID = null; //Timeout ID
+ this.resetTID = null; //Timeout ID
+ this.paused = false;
+ this.submitted = false;
+
+ this.searchbarFocusListening = false;
+ this.searchbarBlurListening = false;
+
+ this.tbListener = function(event){
+ switch( event.type ){
+ case "customizationstarting": self.restoreSearchbar(); break;
+ case "customizationending": self.init(); break;
+ }
+ };
+
+ window.gNavToolbox.addEventListener('customizationstarting', self.tbListener, false );
+ window.gNavToolbox.addEventListener('customizationending' , self.tbListener, false );
+
+ this.searchbarFocusListener = function(event){
+ if( self.paused || ( self.clearTID==null && self.resetTID==null ) )
+ return;
+
+ window.clearTimeout(self.clearTID);
+ window.clearTimeout(self.resetTID);
+ self.paused = true;
+ };
+
+ this.searchbarBlurListener = function(event){
+ if( searchbar.textbox.hasAttribute("focused") )
+ return;
+
+ if( searchLoad_Preferences.pref.clear_on_blur )
+ self.clearSearchbar( searchLoad_Preferences.pref.clear_delay );
+
+ if( searchLoad_Preferences.pref.reset_on_blur )
+ self.resetSearchEngine( searchLoad_Preferences.pref.reset_delay );
+
+ if( !self.paused )
+ return;
+
+ if( self.submitted && searchLoad_Preferences.pref.clear_on_submission )
+ self.clearSearchbar( searchLoad_Preferences.pref.clear_delay );
+
+ if( self.submitted && searchLoad_Preferences.pref.reset_on_submission )
+ self.resetSearchEngine( searchLoad_Preferences.pref.reset_delay );
+
+ self.paused = false;
+ };
+
+ this.removeSearchbarListeners = function(){
+ searchbar.removeEventListener('focus', self.searchbarFocusListener, false);
+ searchbar.removeEventListener('blur', self.searchbarBlurListener , false);
+ searchbar.removeEventListener('popupshowing', self.searchbarFocusListener, false);
+ searchbar.removeEventListener('popuphiding', self.searchbarBlurListener , false);
+ self.searchbarFocusListening = false;
+ self.searchbarBlurListening = false;
+ };
+
+ this.setSearchbarListeners = function(){
+ if( !searchbar )
+ return;
+
+ if( ((searchLoad_Preferences.pref.clear_delay > 0 ) && (searchLoad_Preferences.pref.clear_on_blur || searchLoad_Preferences.pref.clear_on_submission)) ||
+ ((searchLoad_Preferences.pref.reset_delay > 0 ) && (searchLoad_Preferences.pref.reset_on_blur || searchLoad_Preferences.pref.reset_on_submission)) )
+ {
+ if( !self.searchbarFocusListening )
+ {
+ if( searchLoad_Preferences.pref.clear_delay > 0 ||
+ searchLoad_Preferences.pref.reset_delay > 0 )
+ {
+ searchbar.addEventListener('focus', self.searchbarFocusListener, false);
+ searchbar.addEventListener('popupshowing', self.searchbarFocusListener, false);
+ self.searchbarFocusListening = true;
+ }
+ }
+ if( !self.searchbarBlurListening )
+ {
+ searchbar.addEventListener('blur', self.searchbarBlurListener, false);
+ searchbar.addEventListener('popuphiding', self.searchbarBlurListener, false);
+ self.searchbarBlurListening = true;
+ }
+ }
+ else if( searchLoad_Preferences.pref.clear_on_blur || searchLoad_Preferences.pref.reset_on_blur )
+ {
+ if( !self.searchbarBlurListening )
+ {
+ searchbar.addEventListener('blur', self.searchbarBlurListener, false);
+ searchbar.addEventListener('popuphiding', self.searchbarBlurListener, false);
+ self.searchbarBlurListening = true;
+ }
+ if( self.searchbarFocusListening )
+ {
+ searchbar.removeEventListener('focus', self.searchbarFocusListener, false);
+ searchbar.removeEventListener('popupshowing', self.searchbarFocusListener, false);
+ self.searchbarFocusListening = false;
+ }
+ }
+ else
+ self.removeSearchbarListeners();
+ };
- this.MOZToolboxCustomizeDone = window.BrowserToolboxCustomizeDone;
- window.BrowserToolboxCustomizeDone = function(aToolboxChanged){
- self.MOZToolboxCustomizeDone.apply(this,arguments);
- self.init();
+ this.clearSearchbar = function(delay){
+ window.clearTimeout(self.clearTID);
+ self.clearTID = window.setTimeout(
+ function(){
+ searchbar.value = '';
+ let changeEvent = window.document.createEvent('Event');
+ changeEvent.initEvent('input', true, true);
+ window.setTimeout( function(){searchbar.dispatchEvent(changeEvent);}, 0 );
+
+ self.clearTID = null;
+ self.submitted = false;
+ }, delay
+ );
};
- let toolbox = window.document.getElementById("navigator-toolbox");
- toolbox.customizeDone = window.BrowserToolboxCustomizeDone;
+ this.resetSearchEngine = function(delay){
+ let selectedEngine = searchbar.currentEngine.name;
+
+ if(selectedEngine != searchLoad_Preferences.pref.defaultengine)
+ {
+ window.clearTimeout(self.resetTID);
+ self.resetTID = window.setTimeout(
+ function(){
+ if( searchbar.searchService.getEngineByName(searchLoad_Preferences.pref.defaultengine) )
+ searchbar.currentEngine = searchbar.searchService.getEngineByName(searchLoad_Preferences.pref.defaultengine);
+
+ let changeEvent = window.document.createEvent('Event');
+ changeEvent.initEvent('input', true, true);
+ window.setTimeout( function(){searchbar.dispatchEvent(changeEvent);}, 0 );
+
+ self.resetTID = null;
+ self.submitted = false;
+ }, delay
+ );
+ }
+ };
this.configure = function(){
- var winManager = Components.classes["@mozilla.org/appshell/window-mediator;1"]
- .getService(Components.interfaces.nsIWindowMediator);
- var recentWin = winManager.getMostRecentWindow("SearchLoadOptions:Preferences");
+ let winManager = Cc["@mozilla.org/appshell/window-mediator;1"]
+ .getService(Ci.nsIWindowMediator);
+ let recentWin = winManager.getMostRecentWindow("SearchLoadOptions:Preferences");
if( recentWin )
recentWin.focus();
else
- window.openDialog("chrome://searchload/content/preferences.xul", "", "dialog,centerscreen");
+ window.openDialog("chrome://searchload/content/search-options.xul", "", "dialog,centerscreen");
};
- this.init = function(){
+ this.init = function (){
if(!searchbar)
return;
- let stringBundle = window.document.getElementById("searchloadoptions-stringbundle");
+ this.setSearchbarListeners();
+
+ let stringBundle = window.document.getElementById("stringbundle-searchloadoptions");
if( !stringBundle )
{
let bundleset = window.document.getElementById("stringbundleset");
stringBundle = window.document.createElement("stringbundle");
- stringBundle.setAttribute("id","searchloadoptions-stringbundle");
+ stringBundle.setAttribute("id","stringbundle-searchloadoptions");
stringBundle.setAttribute("src","chrome://searchload/locale/searchbar.properties");
bundleset.appendChild( stringBundle );
}
- if( searchbar._popup && !window.document.getElementById("searchloadoptions-menuitem") )
+ if( searchbar._popup && !window.document.getElementById("menuitem-searchloadoptions") )
{
let element = window.document.createElement("menuitem");
- element.setAttribute("class","open-engine-manager");
- element.setAttribute("id","searchloadoptions-menuitem");
- element.setAttribute("label",stringBundle.getString("searchoptions.label"));
+ element.setAttribute("class","open-engine-manager menuitem-iconic engine-icon");
+ element.setAttribute("id","menuitem-searchloadoptions");
+ element.setAttribute("label",stringBundle.getString("label.searchoptions"));
+ element.setAttribute("image","chrome://searchload/skin/menuitem-icon.png");
element.addEventListener('command', this.configure, true );
searchbar._popup.appendChild(element);
}
- if( !this.MOZhandleSearch )
+ if(!this.MOZhandleSearch)
{
this.MOZhandleSearch = searchbar.handleSearchCommand;
@@ -128,13 +279,13 @@ function searchLoad_Options(win)
};
}
- if( !this.MOZdoSearch )
+ if(!this.MOZdoSearch)
{
this.MOZdoSearch = searchbar.doSearch;
searchbar.doSearch = function(aData,aWhere){
if( self.eventModifier )
- switch( searchLoad_Preferences.pref.newtab )
+ switch( searchLoad_Preferences.pref.default_tab )
{
case 0: aWhere=(self.eventShift)?"tabshifted":"tab"; break;
case 1: aWhere=(self.eventShift)?"tabshifted":"current"; break;
@@ -145,9 +296,9 @@ function searchLoad_Options(win)
{
let currentURL = window.getWebNavigation().currentURI.spec;
let homeTabDetected = false;
- if(searchLoad_Preferences.pref.detecthometab)
+ if(searchLoad_Preferences.pref.detect_home_tab)
{
- let homepages = window.gPrefService.getComplexValue("browser.startup.homepage",Components.interfaces.nsIPrefLocalizedString).data;
+ let homepages = window.gPrefService.getComplexValue("browser.startup.homepage",Ci.nsIPrefLocalizedString).data;
homepages = homepages.split("|");
currentURL = currentURL.replace(/(^\s+)|(\s+$)|(^https?:\/\/)|(\/$)/g,"").replace(/^www\./,"");
for(let i=0; i<homepages.length; i++)
@@ -157,15 +308,15 @@ function searchLoad_Options(win)
break;
}
}
- if( searchLoad_Preferences.pref.newtab==0 ||
- ( searchLoad_Preferences.pref.detectnewtab && currentURL==window.gPrefService.getCharPref("browser.newtab.url") ||
- searchLoad_Preferences.pref.detectblanktab && currentURL=="about:blank" ||
- searchLoad_Preferences.pref.detecthometab && homeTabDetected
- ) &&
- !window.getWebNavigation().nsIWebProgress.isLoadingDocument
+ if( searchLoad_Preferences.pref.default_tab==0
+ || (
+ searchLoad_Preferences.pref.detect_new_tab_page && currentURL==window.gPrefService.getCharPref("browser.newtab.url")
+ || searchLoad_Preferences.pref.detect_blank_tab && currentURL=="about:blank"
+ || searchLoad_Preferences.pref.detect_home_tab && homeTabDetected
+ ) && !window.getWebNavigation().nsIWebProgress.isLoadingDocument
)
aWhere="current";
- else switch( searchLoad_Preferences.pref.newtab )
+ else switch( searchLoad_Preferences.pref.default_tab )
{
case 1: aWhere="tab"; break;
case 2: aWhere="tabshifted"; break;
@@ -173,105 +324,68 @@ function searchLoad_Options(win)
}
}
- //clear searchbar
- //
- if(searchLoad_Preferences.pref.clearonsearch)
- {
- if(searchLoad_Preferences.pref.cleardelay==0)
- this.value = '';
- else if(searchLoad_Preferences.pref.cleardelay>0)
- {
- window.clearTimeout(self.clearTID);
- self.clearTID = window.setTimeout(
- function(){
- if( !searchLoad_Preferences.pref.cancelclear || (!searchbar.textbox.hasAttribute("focused") && !(searchbar._popup.state=="open")) )
- {
- searchbar.value = '';
-
- let changeEvent = window.document.createEvent('Event');
- changeEvent.initEvent('input', true, true);
- window.setTimeout( function(){searchbar.dispatchEvent(changeEvent);}, 0 );
- }
- self.clearTID = null;
- },searchLoad_Preferences.pref.cleardelay);
- }
- }//clear
+ self.paused = false;
+ self.submitted = true;
- self.MOZdoSearch.apply(this, arguments);
+ if( searchLoad_Preferences.pref.clear_on_submission )
+ self.clearSearchbar( searchLoad_Preferences.pref.clear_delay );
- //reset searchbar
- //
- if(searchLoad_Preferences.pref.resetonsearch)
- {
- let selectedEngine = this.currentEngine.name;
+ self.MOZdoSearch.apply(this,arguments);
- if(selectedEngine != searchLoad_Preferences.pref.defaultengine)
- {
- if(searchLoad_Preferences.pref.resetdelay==0)
- {
- if( this.searchService.getEngineByName(searchLoad_Preferences.pref.defaultengine) )
- this.currentEngine = this.searchService.getEngineByName(searchLoad_Preferences.pref.defaultengine);
- }
- else if(searchLoad_Preferences.pref.resetdelay>0)
- {
- window.clearTimeout(self.resetTID);
- self.resetTID = window.setTimeout(
- function(){
- if( !searchLoad_Preferences.pref.cancelreset || (!searchbar.textbox.hasAttribute("focused") && !(searchbar._popup.state=="open")) )
- {
- if( searchbar.searchService.getEngineByName(searchLoad_Preferences.pref.defaultengine) )
- searchbar.currentEngine = searchbar.searchService.getEngineByName(searchLoad_Preferences.pref.defaultengine);
-
- let changeEvent = window.document.createEvent('Event');
- changeEvent.initEvent('input', true, true);
- window.setTimeout( function(){searchbar.dispatchEvent(changeEvent);}, 0 );
- }
- self.resetTID = null;
- },searchLoad_Preferences.pref.resetdelay);
- }
- }
- }//reset
- };//doSearch
+ if( searchLoad_Preferences.pref.reset_on_submission )
+ self.resetSearchEngine( searchLoad_Preferences.pref.reset_delay );
+ }//doSearch
}
};//init
- this.shutdown = function(){
-
- if( this.MOZToolboxCustomizeDone )
- window.BrowserToolboxCustomizeDone = this.MOZToolboxCustomizeDone;
-
- let toolbox = window.document.getElementById("navigator-toolbox");
-
- if( this.MOZToolboxCustomizeDone )
- toolbox.customizeDone = this.MOZToolboxCustomizeDone;
-
+ this.restoreSearchbar = function(){
if( !searchbar )
return;
- let menuitem = window.document.getElementById("searchloadoptions-menuitem");
+ self.removeSearchbarListeners();
+
+ let menuitem = window.document.getElementById("menuitem-searchloadoptions");
if( menuitem )
{
- menuitem.removeEventListener('command', this.configure, true );
+ menuitem.removeEventListener('command', self.configure, true );
menuitem.parentNode.removeChild( menuitem );
}
- searchbar.doSearch = this.MOZdoSearch;
- searchbar.handleSearchCommand = this.MOZhandleSearch;
+ searchbar.doSearch = self.MOZdoSearch;
+ searchbar.handleSearchCommand = self.MOZhandleSearch;
+ self.MOZdoSearch = null;
+ self.MOZhandleSearch = null;
- let stringBundle = window.document.getElementById("searchloadoptions-stringbundle");
+ let stringBundle = window.document.getElementById("stringbundle-searchloadoptions");
if( stringBundle )
stringBundle.parentNode.removeChild(stringBundle);
};
+
+ this.shutdown = function(){
+ window.gNavToolbox.removeEventListener('customizationstarting', self.tbListener, false );
+ window.gNavToolbox.removeEventListener('customizationending' , self.tbListener, false );
+ self.restoreSearchbar();
+ };
}
function loadIntoWindow(window)
{
+ //Check for navigator:browser
+ //
+ if( !window.gNavToolbox )
+ return;
+
window.searchLoad_Options = new searchLoad_Options(window);
window.searchLoad_Options.init();
}
function unloadFromWindow(window)
{
+ //Check for navigator:browser
+ //
+ if( !window.gNavToolbox )
+ return;
+
window.searchLoad_Options.shutdown();
window.searchLoad_Options = null;
}
@@ -279,25 +393,16 @@ function unloadFromWindow(window)
var windowListener = {
onOpenWindow: function(aWindow)
{
- let domWindow = aWindow.QueryInterface(Components.interfaces.nsIInterfaceRequestor)
- .getInterface(Components.interfaces.nsIDOMWindow);
+ let domWindow = aWindow.QueryInterface(Ci.nsIInterfaceRequestor)
+ .getInterface(Ci.nsIDOMWindow);
domWindow.addEventListener("load", function(){
domWindow.removeEventListener("load", arguments.callee, false);
-
- if( !domWindow.BrowserToolboxCustomizeDone )
- return;
-
domWindow.setTimeout( loadIntoWindow, 0, domWindow );
-
}, false);
},
onCloseWindow: function(aWindow)
{
- let domWindow = aWindow.QueryInterface(Components.interfaces.nsIInterfaceRequestor).getInterface(Components.interfaces.nsIDOMWindow);
-
- if( !domWindow.BrowserToolboxCustomizeDone )
- return;
-
+ let domWindow = aWindow.QueryInterface(Ci.nsIInterfaceRequestor).getInterface(Ci.nsIDOMWindow);
unloadFromWindow(domWindow);
},
onWindowTitleChange: function(aWindow, aTitle) {}
@@ -306,44 +411,40 @@ var windowListener = {
function startup(data, reason) {
searchLoad_Preferences.prefObserver.register();
- try{searchLoad_Preferences.prefObserver.branch.getBoolPref("clearonsearch" );}catch(e){searchLoad_Preferences.prefObserver.branch.setBoolPref("clearonsearch" , true );}
- try{searchLoad_Preferences.prefObserver.branch.getIntPref ("cleardelay" );}catch(e){searchLoad_Preferences.prefObserver.branch.setIntPref ("cleardelay" , 5 );}
- try{searchLoad_Preferences.prefObserver.branch.getBoolPref("resetonsearch" );}catch(e){searchLoad_Preferences.prefObserver.branch.setBoolPref("resetonsearch" , true );}
- try{searchLoad_Preferences.prefObserver.branch.getIntPref ("resetdelay" );}catch(e){searchLoad_Preferences.prefObserver.branch.setIntPref ("resetdelay" , 5 );}
- try{searchLoad_Preferences.prefObserver.branch.getBoolPref("cancelclear" );}catch(e){searchLoad_Preferences.prefObserver.branch.setBoolPref("cancelclear" , true );}
- try{searchLoad_Preferences.prefObserver.branch.getBoolPref("cancelreset" );}catch(e){searchLoad_Preferences.prefObserver.branch.setBoolPref("cancelreset" , true );}
- try{searchLoad_Preferences.prefObserver.branch.getCharPref("defaultengine" );}catch(e){searchLoad_Preferences.prefObserver.branch.setCharPref("defaultengine" , "" );}
- try{searchLoad_Preferences.prefObserver.branch.getIntPref ("newtab" );}catch(e){searchLoad_Preferences.prefObserver.branch.setIntPref ("newtab" , 1 );}
- try{searchLoad_Preferences.prefObserver.branch.getBoolPref("detectblanktab");}catch(e){searchLoad_Preferences.prefObserver.branch.setBoolPref("detectblanktab", true );}
- try{searchLoad_Preferences.prefObserver.branch.getBoolPref("detecthometab" );}catch(e){searchLoad_Preferences.prefObserver.branch.setBoolPref("detecthometab" , false);}
- try{searchLoad_Preferences.prefObserver.branch.getBoolPref("detectnewtab" );}catch(e){searchLoad_Preferences.prefObserver.branch.setBoolPref("detectnewtab" , true );}
-
- searchLoad_Preferences.pref.clearonsearch =searchLoad_Preferences.prefObserver.branch.getBoolPref("clearonsearch" );
- searchLoad_Preferences.pref.cleardelay =searchLoad_Preferences.prefObserver.branch.getIntPref ("cleardelay" );
- searchLoad_Preferences.pref.resetonsearch =searchLoad_Preferences.prefObserver.branch.getBoolPref("resetonsearch" );
- searchLoad_Preferences.pref.resetdelay =searchLoad_Preferences.prefObserver.branch.getIntPref ("resetdelay" );
- searchLoad_Preferences.pref.cancelclear =searchLoad_Preferences.prefObserver.branch.getBoolPref("cancelclear" );
- searchLoad_Preferences.pref.cancelreset =searchLoad_Preferences.prefObserver.branch.getBoolPref("cancelreset" );
- searchLoad_Preferences.pref.defaultengine =searchLoad_Preferences.prefObserver.branch.getCharPref("defaultengine" );
- searchLoad_Preferences.pref.newtab =searchLoad_Preferences.prefObserver.branch.getIntPref ("newtab" );
- searchLoad_Preferences.pref.detectblanktab=searchLoad_Preferences.prefObserver.branch.getBoolPref("detectblanktab");
- searchLoad_Preferences.pref.detecthometab =searchLoad_Preferences.prefObserver.branch.getBoolPref("detecthometab" );
- searchLoad_Preferences.pref.detectnewtab =searchLoad_Preferences.prefObserver.branch.getBoolPref("detectnewtab" );
-
- searchLoad_Preferences.pref.cleardelay *= 1000;
- searchLoad_Preferences.pref.resetdelay *= 1000;
+ try{searchLoad_Preferences.prefObserver.branch.getBoolPref("clear_on_submission");}catch(e){searchLoad_Preferences.prefObserver.branch.setBoolPref( "extensions.searchload.clear_on_submission", true );}
+ try{searchLoad_Preferences.prefObserver.branch.getBoolPref("clear_on_blur" );}catch(e){searchLoad_Preferences.prefObserver.branch.setBoolPref( "extensions.searchload.clear_on_blur" , false);}
+ try{searchLoad_Preferences.prefObserver.branch.getIntPref ("clear_delay" );}catch(e){searchLoad_Preferences.prefObserver.branch.setIntPref ( "extensions.searchload.clear_delay" , 5 );}
+ try{searchLoad_Preferences.prefObserver.branch.getCharPref("defaultengine" );}catch(e){searchLoad_Preferences.prefObserver.branch.setCharPref( "extensions.searchload.defaultengine" , "" );}
+ try{searchLoad_Preferences.prefObserver.branch.getBoolPref("reset_on_submission");}catch(e){searchLoad_Preferences.prefObserver.branch.setBoolPref( "extensions.searchload.reset_on_submission", true );}
+ try{searchLoad_Preferences.prefObserver.branch.getBoolPref("reset_on_blur" );}catch(e){searchLoad_Preferences.prefObserver.branch.setBoolPref( "extensions.searchload.reset_on_blur" , false);}
+ try{searchLoad_Preferences.prefObserver.branch.getIntPref ("reset_delay" );}catch(e){searchLoad_Preferences.prefObserver.branch.setIntPref ( "extensions.searchload.reset_delay" , 5 );}
+ try{searchLoad_Preferences.prefObserver.branch.getIntPref ("default_tab" );}catch(e){searchLoad_Preferences.prefObserver.branch.setIntPref ( "extensions.searchload.default_tab" , 1 );}
+ try{searchLoad_Preferences.prefObserver.branch.getBoolPref("detect_blank_tab" );}catch(e){searchLoad_Preferences.prefObserver.branch.setBoolPref( "extensions.searchload.detect_blank_tab" , true );}
+ try{searchLoad_Preferences.prefObserver.branch.getBoolPref("detect_home_tab" );}catch(e){searchLoad_Preferences.prefObserver.branch.setBoolPref( "extensions.searchload.detect_home_tab" , false);}
+ try{searchLoad_Preferences.prefObserver.branch.getBoolPref("detect_new_tab_page");}catch(e){searchLoad_Preferences.prefObserver.branch.setBoolPref( "extensions.searchload.detect_new_tab_page", true );}
+
+ searchLoad_Preferences.pref.clear_on_submission = searchLoad_Preferences.prefObserver.branch.getBoolPref( "clear_on_submission" );
+ searchLoad_Preferences.pref.clear_on_blur = searchLoad_Preferences.prefObserver.branch.getBoolPref( "clear_on_blur" );
+ searchLoad_Preferences.pref.clear_delay = searchLoad_Preferences.prefObserver.branch.getIntPref ( "clear_delay" );
+ searchLoad_Preferences.pref.defaultengine = searchLoad_Preferences.prefObserver.branch.getCharPref( "defaultengine" );
+ searchLoad_Preferences.pref.reset_on_submission = searchLoad_Preferences.prefObserver.branch.getBoolPref( "reset_on_submission" );
+ searchLoad_Preferences.pref.reset_on_blur = searchLoad_Preferences.prefObserver.branch.getBoolPref( "reset_on_blur" );
+ searchLoad_Preferences.pref.reset_delay = searchLoad_Preferences.prefObserver.branch.getIntPref ( "reset_delay" );
+ searchLoad_Preferences.pref.default_tab = searchLoad_Preferences.prefObserver.branch.getIntPref ( "default_tab" );
+ searchLoad_Preferences.pref.detect_blank_tab = searchLoad_Preferences.prefObserver.branch.getBoolPref( "detect_blank_tab" );
+ searchLoad_Preferences.pref.detect_home_tab = searchLoad_Preferences.prefObserver.branch.getBoolPref( "detect_home_tab" );
+ searchLoad_Preferences.pref.detect_new_tab_page = searchLoad_Preferences.prefObserver.branch.getBoolPref( "detect_new_tab_page" );
+
+ searchLoad_Preferences.pref.clear_delay *= 1000;
+ searchLoad_Preferences.pref.reset_delay *= 1000;
searchLoad_Preferences.pref.defaultengine = decodeURIComponent( escape(searchLoad_Preferences.pref.defaultengine) );
- let wm = Components.classes["@mozilla.org/appshell/window-mediator;1"].getService(Components.interfaces.nsIWindowMediator);
+ let wm = Cc["@mozilla.org/appshell/window-mediator;1"].getService(Ci.nsIWindowMediator);
let enumerator = wm.getEnumerator("navigator:browser");
while (enumerator.hasMoreElements())
{
- let win = enumerator.getNext().QueryInterface(Components.interfaces.nsIDOMWindow);
-
- if( !win.BrowserToolboxCustomizeDone )
- return;
-
+ let win = enumerator.getNext().QueryInterface(Ci.nsIDOMWindow);
win.setTimeout( loadIntoWindow, 0, win );
}
@@ -356,19 +457,13 @@ function shutdown(data, reason) {
searchLoad_Preferences.prefObserver.unregister();
- let wm = Components.classes["@mozilla.org/appshell/window-mediator;1"].getService(Components.interfaces.nsIWindowMediator);
-
+ let wm = Cc["@mozilla.org/appshell/window-mediator;1"].getService(Ci.nsIWindowMediator);
wm.removeListener(windowListener);
-
let enumerator = wm.getEnumerator("navigator:browser");
while (enumerator.hasMoreElements())
{
- let win = enumerator.getNext().QueryInterface(Components.interfaces.nsIDOMWindow);
-
- if( !win.BrowserToolboxCustomizeDone )
- return;
-
+ let win = enumerator.getNext().QueryInterface(Ci.nsIDOMWindow);
unloadFromWindow(win);
}
@@ -376,26 +471,25 @@ function shutdown(data, reason) {
}
function install(data, reason) {
- let prefs = Components.classes["@mozilla.org/preferences-service;1"].getService(Components.interfaces.nsIPrefBranch);
-
- try{prefs.getBoolPref("extensions.searchload.clearonsearch" );}catch(e){prefs.setBoolPref("extensions.searchload.clearonsearch" , true );}
- try{prefs.getIntPref ("extensions.searchload.cleardelay" );}catch(e){prefs.setIntPref ("extensions.searchload.cleardelay" , 5 );}
- try{prefs.getBoolPref("extensions.searchload.resetonsearch" );}catch(e){prefs.setBoolPref("extensions.searchload.resetonsearch" , true );}
- try{prefs.getIntPref ("extensions.searchload.resetdelay" );}catch(e){prefs.setIntPref ("extensions.searchload.resetdelay" , 5 );}
- try{prefs.getBoolPref("extensions.searchload.cancelclear" );}catch(e){prefs.setBoolPref("extensions.searchload.cancelclear" , true );}
- try{prefs.getBoolPref("extensions.searchload.cancelreset" );}catch(e){prefs.setBoolPref("extensions.searchload.cancelreset" , true );}
- try{prefs.getCharPref("extensions.searchload.defaultengine" );}catch(e){prefs.setCharPref("extensions.searchload.defaultengine" , "" );}
- try{prefs.getIntPref ("extensions.searchload.newtab" );}catch(e){prefs.setIntPref ("extensions.searchload.newtab" , 1 );}
- try{prefs.getBoolPref("extensions.searchload.detectblanktab");}catch(e){prefs.setBoolPref("extensions.searchload.detectblanktab", true );}
- try{prefs.getBoolPref("extensions.searchload.detecthometab" );}catch(e){prefs.setBoolPref("extensions.searchload.detecthometab" , false );}
- try{prefs.getBoolPref("extensions.searchload.detectnewtab" );}catch(e){prefs.setBoolPref("extensions.searchload.detectnewtab" , true );}
+ let prefs = Cc["@mozilla.org/preferences-service;1"].getService(Ci.nsIPrefBranch);
+
+ try{prefs.getBoolPref( "extensions.searchload.clear_on_submission");}catch(e){prefs.setBoolPref( "extensions.searchload.clear_on_submission", true );}
+ try{prefs.getBoolPref( "extensions.searchload.clear_on_blur" );}catch(e){prefs.setBoolPref( "extensions.searchload.clear_on_blur" , false);}
+ try{prefs.getIntPref ( "extensions.searchload.clear_delay" );}catch(e){prefs.setIntPref ( "extensions.searchload.clear_delay" , 5 );}
+ try{prefs.getCharPref( "extensions.searchload.defaultengine" );}catch(e){prefs.setCharPref( "extensions.searchload.defaultengine" , "" );}
+ try{prefs.getBoolPref( "extensions.searchload.reset_on_submission");}catch(e){prefs.setBoolPref( "extensions.searchload.reset_on_submission", true );}
+ try{prefs.getBoolPref( "extensions.searchload.reset_on_blur" );}catch(e){prefs.setBoolPref( "extensions.searchload.reset_on_blur" , false);}
+ try{prefs.getIntPref ( "extensions.searchload.reset_delay" );}catch(e){prefs.setIntPref ( "extensions.searchload.reset_delay" , 5 );}
+ try{prefs.getIntPref ( "extensions.searchload.default_tab" );}catch(e){prefs.setIntPref ( "extensions.searchload.default_tab" , 1 );}
+ try{prefs.getBoolPref( "extensions.searchload.detect_blank_tab" );}catch(e){prefs.setBoolPref( "extensions.searchload.detect_blank_tab" , true );}
+ try{prefs.getBoolPref( "extensions.searchload.detect_home_tab" );}catch(e){prefs.setBoolPref( "extensions.searchload.detect_home_tab" , false);}
+ try{prefs.getBoolPref( "extensions.searchload.detect_new_tab_page");}catch(e){prefs.setBoolPref( "extensions.searchload.detect_new_tab_page", true );}
}
function uninstall(data, reason) {
if( reason == ADDON_UNINSTALL )
{
- let prefs = Components.classes["@mozilla.org/preferences-service;1"].getService(Components.interfaces.nsIPrefBranch);
-
+ let prefs = Cc["@mozilla.org/preferences-service;1"].getService(Ci.nsIPrefBranch);
prefs.deleteBranch("extensions.searchload.");
}
}
diff --git a/chrome.manifest b/chrome.manifest
old mode 100644
new mode 100755
index 5996409..b94e619
--- a/chrome.manifest
+++ b/chrome.manifest
@@ -2,25 +2,15 @@ content searchload content/
skin searchload classic/1.0 skin/classic/
-locale searchload ca-AD locale/ca-AD/
locale searchload de locale/de/
locale searchload el locale/el/
locale searchload en-US locale/en-US/
-locale searchload es-ES locale/es-ES/
-locale searchload fr locale/fr/
-locale searchload he locale/he/
-locale searchload he-IL locale/he-IL/
-locale searchload hu-HU locale/hu-HU/
-locale searchload it locale/it/
locale searchload ja-JP locale/ja-JP/
-locale searchload lt locale/lt/
locale searchload lt-LT locale/lt-LT/
locale searchload nl locale/nl/
-locale searchload pl locale/pl/
locale searchload pt-BR locale/pt-BR/
-locale searchload ru-RU locale/ru-RU/
-locale searchload sv-SE locale/sv-SE/
locale searchload tr locale/tr/
locale searchload uk-UA locale/uk-UA/
locale searchload zh-CN locale/zh-CN/
locale searchload zh-TW locale/zh-TW/
+
diff --git a/content/preferences.js b/content/preferences.js
deleted file mode 100644
index 6d93cd7..0000000
--- a/content/preferences.js
+++ /dev/null
@@ -1,135 +0,0 @@
-searchPane = {
- //clear
- delayedClearLabel: null,
- delayedClearInput: null,
- delayedClearUnits: null,
- cancelClearCbox: null,
- //reset
- engineMenu: null,
- enginePopup: null,
- delayedResetLabel: null,
- delayedResetInput: null,
- delayedResetUnits: null,
- cancelResetCbox: null,
- //tabs
- detectionLabel: null,
- blankTabCbox: null,
- homeTabCbox: null,
- newTabCbox: null,
-
- buildEngineList: function()
- {
- const kXULNS = "http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul";
- let defaultEnginePref = document.getElementById("extensions.searchload.defaultengine");
- let enginesExist = false;
- let engineWasFound = false;
-
- let searchService = Components.classes["@mozilla.org/browser/search-service;1"]
- .getService(Components.interfaces.nsIBrowserSearchService);
- let engines = searchService.getVisibleEngines({ });
-
- if(engines.length > 0)
- {
- enginesExist = true;
- for(let i=0; i < engines.length; i++)
- {
- let menuitem = document.createElementNS(kXULNS, "menuitem");
- menuitem.setAttribute("label", engines[i].name);
- menuitem.setAttribute("value", engines[i].name);
- menuitem.setAttribute("class", "menuitem-iconic engine-icon");
- if( engines[i].iconURI )
- menuitem.setAttribute("image", engines[i].iconURI.spec);
- this.enginePopup.appendChild(menuitem);
- if(engines[i].name == defaultEnginePref.value)
- {
- this.engineMenu.selectedIndex = i;
- engineWasFound = true;
- }
- }
- }
-
- if(enginesExist && !engineWasFound)
- defaultEnginePref.valueFromPreferences = engines[0].name;
- },//buildEngineList
-
- init: function()
- {
- this.delayedClearLabel = document.getElementById("delayedclear-label");
- this.delayedClearInput = document.getElementById("delayedclear-input");
- this.delayedClearUnits = document.getElementById("delayedclear-units");
- this.cancelClearCbox = document.getElementById("cancelclear-checkbox");
-
- this.engineMenu = document.getElementById("engine-menu");
- this.enginePopup = document.getElementById("engine-popup");
- this.delayedResetLabel = document.getElementById("delayedreset-label");
- this.delayedResetInput = document.getElementById("delayedreset-input");
- this.delayedResetUnits = document.getElementById("delayedreset-units");
- this.cancelResetCbox = document.getElementById("cancelreset-checkbox");
-
- this.detectionLabel = document.getElementById("detection-label");
- this.blankTabCbox = document.getElementById("detectblank-checkbox");
- this.homeTabCbox = document.getElementById("detecthome-checkbox");
- this.newTabCbox = document.getElementById("detectnewtab-checkbox");
-
- this.buildEngineList();
-
- let clearSearchBarPref = document.getElementById("extensions.searchload.clearonsearch");
- let resetSearchBarPref = document.getElementById("extensions.searchload.resetonsearch");
- let tabcontrolPref = document.getElementById("extensions.searchload.newtab");
-
- this.updateDetect(tabcontrolPref.value);
- this.updateClearStatus(clearSearchBarPref.value);
- this.updateResetStatus(resetSearchBarPref.value);
- },//init
-
- updateClearStatus: function(boolVal)
- {
- let clearDelayPref = document.getElementById("extensions.searchload.cleardelay");
- this.delayedClearLabel.disabled = !boolVal;
- this.delayedClearInput.disabled = !boolVal;
- this.delayedClearUnits.disabled = !boolVal;
- this.updateCancelClear( clearDelayPref.value===0 || !boolVal);
- },
-
- updateCancelClear: function(disable)
- {
- if(disable)
- this.cancelClearCbox.disabled = true;
- else
- this.cancelClearCbox.disabled = false;
- },
-
- updateResetStatus: function(boolVal)
- {
- let resetDelayPref = document.getElementById("extensions.searchload.resetdelay");
- this.engineMenu.disabled = !boolVal;
- this.delayedResetLabel.disabled = !boolVal;
- this.delayedResetInput.disabled = !boolVal;
- this.delayedResetUnits.disabled = !boolVal;
- this.updateCancelReset( resetDelayPref.value===0 || !boolVal);
- },
-
- updateCancelReset: function(disable)
- {
- if(disable)
- this.cancelResetCbox.disabled = true;
- else
- this.cancelResetCbox.disabled = false;
- },
-
- updateDetect: function(index)
- {
- if(index===0)
- { this.detectionLabel.disabled = true;
- this.blankTabCbox.disabled = true;
- this.homeTabCbox.disabled = true;
- this.newTabCbox.disabled = true;
- }
- else
- { this.detectionLabel.disabled = false;
- this.blankTabCbox.disabled = false;
- this.homeTabCbox.disabled = false;
- this.newTabCbox.disabled = false;
- }
- }
-};
diff --git a/content/preferences.xul b/content/preferences.xul
deleted file mode 100644
index 00f5e9a..0000000
--- a/content/preferences.xul
+++ /dev/null
@@ -1,97 +0,0 @@
-<?xml version="1.0"?>
-<?xml-stylesheet href="chrome://global/skin/global.css"?>
-<?xml-stylesheet href="chrome://browser/skin/preferences/preferences.css"?>
-<?xml-stylesheet href="chrome://searchload/skin/searchpane.css" type="text/css"?>
-<!DOCTYPE overlay SYSTEM "chrome://searchload/locale/pref.dtd">
-
-<prefwindow id="SearchLoadOptions_Preferences"
- windowtype="SearchLoadOptions:Preferences"
- title="&prefwindow.title;"
- xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
- <prefpane id="paneSearchLoadOptions" onpaneload="searchPane.init();">
- <preferences id="searchLoadPreferences">
- <preference id="extensions.searchload.clearonsearch" name="extensions.searchload.clearonsearch" type="bool" />
- <preference id="extensions.searchload.cleardelay" name="extensions.searchload.cleardelay" type="int" />
- <preference id="extensions.searchload.resetonsearch" name="extensions.searchload.resetonsearch" type="bool" />
- <preference id="extensions.searchload.resetdelay" name="extensions.searchload.resetdelay" type="int" />
- <preference id="extensions.searchload.defaultengine" name="extensions.searchload.defaultengine" type="string" />
- <preference id="extensions.searchload.cancelclear" name="extensions.searchload.cancelclear" type="bool" />
- <preference id="extensions.searchload.cancelreset" name="extensions.searchload.cancelreset" type="bool" />
- <preference id="extensions.searchload.newtab" name="extensions.searchload.newtab" type="int" />
- <preference id="extensions.searchload.detectblanktab" name="extensions.searchload.detectblanktab" type="bool" />
- <preference id="extensions.searchload.detecthometab" name="extensions.searchload.detecthometab" type="bool" />
- <preference id="extensions.searchload.detectnewtab" name="extensions.searchload.detectnewtab" type="bool" />
- </preferences>
- <script type="application/x-javascript" src="chrome://searchload/content/preferences.js" />
- <hbox pack="center">
- <groupbox>
- <caption label="&bargroup.label;" />
- <checkbox id="clearsearch-checkbox"
- label="&clearsearch.cbox;"
- oncommand="searchPane.updateClearStatus(this.checked)"
- preference="extensions.searchload.clearonsearch" />
- <vbox class="indent">
- <hbox align="center">
- <label id="delayedclear-label" value="&delay.label;" />
- <textbox id="delayedclear-input"
- size="2"
- oninput="searchPane.updateCancelClear(this.value==0)"
- preference="extensions.searchload.cleardelay" />
- <label id="delayedclear-units" value="&delayunits.label;" />
- </hbox>
- <checkbox id="cancelclear-checkbox"
- label="&cancel.cbox;"
- preference="extensions.searchload.cancelclear" />
- </vbox>
- <separator />
- <checkbox id="reset-checkbox"
- label="&resetsearch.cbox;"
- oncommand="searchPane.updateResetStatus(this.checked)"
- preference="extensions.searchload.resetonsearch" />
- <vbox class="indent">
- <menulist id="engine-menu"
- preference="extensions.searchload.defaultengine" >
- <menupopup id="engine-popup" position="after_start">
- </menupopup>
- </menulist>
- <hbox align="center">
- <label id="delayedreset-label" value="&delay.label;" />
- <textbox id="delayedreset-input"
- size="2"
- oninput="searchPane.updateCancelReset(this.value==0)"
- preference="extensions.searchload.resetdelay" />
- <label id="delayedreset-units" value="&delayunits.label;" />
- </hbox>
- <checkbox id="cancelreset-checkbox"
- label="&cancel.cbox;"
- preference="extensions.searchload.cancelreset" />
- </vbox>
- </groupbox>
- <groupbox>
- <caption label="&tabgroup.label;" />
- <label value="&tabcontrol.descr;" />
- <radiogroup id="tabcontrol-group"
- class="indent"
- oncommand="searchPane.updateDetect(this.selectedIndex)"
- preference="extensions.searchload.newtab" >
- <radio label="&activetab.radio;" value="0" />
- <radio label="&newtab.radio;" value="1" />
- <radio label="&newbgtab.radio;" value="2" />
- </radiogroup>
- <separator />
- <label id="detection-label" value="&detect.descr;" />
- <vbox class="indent">
- <checkbox id="detectblank-checkbox"
- label="&detectblank.cbox;"
- preference="extensions.searchload.detectblanktab" />
- <checkbox id="detecthome-checkbox"
- label="&detecthome.cbox;"
- preference="extensions.searchload.detecthometab" />
- <checkbox id="detectnewtab-checkbox"
- label="&detectnewtab.cbox;"
- preference="extensions.searchload.detectnewtab" />
- </vbox>
- </groupbox>
- </hbox>
- </prefpane>
-</prefwindow>
diff --git a/content/search-options.js b/content/search-options.js
new file mode 100755
index 0000000..319c34c
--- /dev/null
+++ b/content/search-options.js
@@ -0,0 +1,113 @@
+
+var prefPane = {
+ pref: {},
+
+ buildEngineList: function(){
+ const kXULNS = "http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul";
+ let enginesExist = false;
+ let engineWasFound = false;
+
+ let searchService = Components.classes["@mozilla.org/browser/search-service;1"]
+ .getService(Components.interfaces.nsIBrowserSearchService);
+ let engines = searchService.getVisibleEngines({ });
+
+ if(engines.length > 0)
+ {
+ enginesExist = true;
+ for(let i=0; i < engines.length; i++)
+ {
+ let menuitem = document.createElementNS(kXULNS, "menuitem");
+ menuitem.setAttribute("label", engines[i].name);
+ menuitem.setAttribute("value", engines[i].name);
+ menuitem.setAttribute("class", "menuitem-iconic engine-icon");
+ if( engines[i].iconURI )
+ menuitem.setAttribute("image", engines[i].iconURI.spec);
+ this.popup_searchengines.appendChild(menuitem);
+ if(engines[i].name == this.pref.defaultengine.value)
+ {
+ this.menulist_searchengines.selectedIndex = i;
+ engineWasFound = true;
+ }
+ }
+ }
+
+ if(enginesExist && !engineWasFound)
+ this.pref.defaultengine.valueFromPreferences = engines[0].name;
+ },//buildEngineList
+
+ init: function(){
+ this.pref.defaultengine = document.getElementById( "extensions.searchload.defaultengine");
+
+ this.checkbox_clear_on_search_submission = document.getElementById("checkbox-clear-on-search-submission");
+ this.checkbox_clear_on_searchbar_blur = document.getElementById("checkbox-clear-on-searchbar-blur" );
+ this.label_clear_delay = document.getElementById( "label-clear-delay" );
+ this.textbox_clear_delay = document.getElementById( "textbox-clear-delay" );
+ this.label_clear_delay_units = document.getElementById( "label-clear-delay-units");
+
+ this.checkbox_reset_on_search_submission = document.getElementById("checkbox-reset-on-search-submission");
+ this.checkbox_reset_on_searchbar_blur = document.getElementById("checkbox-reset-on-searchbar-blur" );
+ this.label_reset_searchengine = document.getElementById( "label-reset-searchengine");
+ this.menulist_searchengines = document.getElementById( "menulist-searchengines" );
+ this.popup_searchengines = document.getElementById( "popup-searchengines" );
+
+ this.label_reset_delay = document.getElementById( "label-reset-delay" );
+ this.textbox_reset_delay = document.getElementById( "textbox-reset-delay" );
+ this.label_reset_delay_units = document.getElementById( "label-reset-delay-units");
+
+ this.label_tab_exceptions = document.getElementById( "label-tab-exceptions" );
+ this.checkbox_detect_blank_tab = document.getElementById( "checkbox-detect-blank-tab" );
+ this.checkbox_detect_home_tab = document.getElementById( "checkbox-detect-home-tab" );
+ this.checkbox_detect_new_tab_page = document.getElementById( "checkbox-detect-new-tab-page");
+
+ this.buildEngineList();
+
+ this.updateClearStatus();
+ this.updateResetStatus();
+ },//init
+
+ updateClearStatus: function(){
+ if( !this.checkbox_clear_on_search_submission.checked && !this.checkbox_clear_on_searchbar_blur.checked )
+ {
+ this.label_clear_delay.disabled = true;
+ this.textbox_clear_delay.disabled = true;
+ this.label_clear_delay_units.disabled = true;
+ }
+ else
+ {
+ this.label_clear_delay.disabled = false;
+ this.textbox_clear_delay.disabled = false;
+ this.label_clear_delay_units.disabled = false;
+ }
+ },
+
+ updateResetStatus: function(){
+ if( !this.checkbox_reset_on_search_submission.checked && !this.checkbox_reset_on_searchbar_blur.checked )
+ {
+ this.label_reset_delay.disabled = true;
+ this.textbox_reset_delay.disabled = true;
+ this.label_reset_delay_units.disabled = true;
+ }
+ else
+ {
+ this.label_reset_delay.disabled = false;
+ this.textbox_reset_delay.disabled = false;
+ this.label_reset_delay_units.disabled = false;
+ }
+ },
+
+ updateExceptions: function( index ){
+ if(index===0)
+ { this.label_tab_exceptions.disabled = true;
+ this.checkbox_detect_blank_tab.disabled = true;
+ this.checkbox_detect_home_tab.disabled = true;
+ this.checkbox_detect_new_tab_page.disabled = true;
+
+ }
+ else
+ { this.label_tab_exceptions.disabled = false;
+ this.checkbox_detect_blank_tab.disabled = false;
+ this.checkbox_detect_home_tab.disabled = false;
+ this.checkbox_detect_new_tab_page.disabled = false;
+ }
+ }
+};
diff --git a/content/search-options.xul b/content/search-options.xul
new file mode 100755
index 0000000..a991e77
--- /dev/null
+++ b/content/search-options.xul
@@ -0,0 +1,99 @@
+<?xml version="1.0"?>
+<?xml-stylesheet href="chrome://global/skin/global.css"?>
+<?xml-stylesheet href="chrome://browser/skin/preferences/preferences.css"?>
+<?xml-stylesheet href="chrome://searchload/skin/search-options.css" type="text/css"?>
+<!DOCTYPE overlay SYSTEM "chrome://searchload/locale/search-options.dtd">
+
+<prefwindow id="prefwindow-searchloadoptions"
+ windowtype="SearchLoadOptions:Preferences"
+ title="&title.prefwindow;"
+ xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
+ <prefpane id="prefpane-searchloadoptions" onpaneload="prefPane.init();">
+ <preferences id="preferences-searchloadoptions">
+ <preference id="extensions.searchload.clear_on_submission" name="extensions.searchload.clear_on_submission" type="bool" />
+ <preference id="extensions.searchload.clear_on_blur" name="extensions.searchload.clear_on_blur" type="bool" />
+ <preference id="extensions.searchload.clear_delay" name="extensions.searchload.clear_delay" type="int" />
+ <preference id="extensions.searchload.defaultengine" name="extensions.searchload.defaultengine" type="string" />
+ <preference id="extensions.searchload.reset_on_submission" name="extensions.searchload.reset_on_submission" type="bool" />
+ <preference id="extensions.searchload.reset_on_blur" name="extensions.searchload.reset_on_blur" type="bool" />
+ <preference id="extensions.searchload.reset_delay" name="extensions.searchload.reset_delay" type="int" />
+ <preference id="extensions.searchload.default_tab" name="extensions.searchload.default_tab" type="int" />
+ <preference id="extensions.searchload.detect_blank_tab" name="extensions.searchload.detect_blank_tab" type="bool" />
+ <preference id="extensions.searchload.detect_home_tab" name="extensions.searchload.detect_home_tab" type="bool" />
+ <preference id="extensions.searchload.detect_new_tab_page" name="extensions.searchload.detect_new_tab_page" type="bool" />
+ </preferences>
+ <script type="application/x-javascript" src="chrome://searchload/content/search-options.js" />
+ <hbox pack="center">
+ <groupbox>
+ <caption label="&label.searchbar_group;" />
+ <label id="label-clear-searchbar" value="&label.clear_searchbar;" />
+ <vbox class="indent">
+ <checkbox id="checkbox-clear-on-search-submission"
+ label="&checkbox.on_submission;"
+ oncommand="prefPane.updateClearStatus()"
+ preference="extensions.searchload.clear_on_submission" />
+ <checkbox id="checkbox-clear-on-searchbar-blur"
+ label="&checkbox.on_searchbar_blur;"
+ oncommand="prefPane.updateClearStatus()"
+ preference="extensions.searchload.clear_on_blur" />
+ <hbox align="center">
+ <label id="label-clear-delay" value="&label.delay;" />
+ <textbox id="textbox-clear-delay"
+ size="2"
+ preference="extensions.searchload.clear_delay" />
+ <label id="label-clear-delay-units" value="&label.delay_units;" />
+ </hbox>
+ </vbox>
+ <separator />
+ <label id="label-reset-searchengine" value="&label.reset_searchengine;" />
+ <vbox class="indent">
+ <menulist id="menulist-searchengines"
+ preference="extensions.searchload.defaultengine" >
+ <menupopup id="popup-searchengines" position="after_start">
+ </menupopup>
+ </menulist>
+ <checkbox id="checkbox-reset-on-search-submission"
+ label="&checkbox.on_submission;"
+ oncommand="prefPane.updateResetStatus()"
+ preference="extensions.searchload.reset_on_submission" />
+ <checkbox id="checkbox-reset-on-searchbar-blur"
+ label="&checkbox.on_searchbar_blur;"
+ oncommand="prefPane.updateResetStatus()"
+ preference="extensions.searchload.reset_on_blur" />
+ <hbox align="center">
+ <label id="label-reset-delay" value="&label.delay;" />
+ <textbox id="textbox-reset-delay"
+ size="2"
+ preference="extensions.searchload.reset_delay" />
+ <label id="label-reset-delay-units" value="&label.delay_units;" />
+ </hbox>
+ </vbox>
+ </groupbox>
+ <groupbox>
+ <caption label="&label.tabs_group;" />
+ <label value="&label.load_search_in;" />
+ <radiogroup id="radiogroup-default-tab"
+ class="indent"
+ oncommand="prefPane.updateExceptions(this.selectedIndex)"
+ preference="extensions.searchload.default_tab" >
+ <radio label="&label.active_tab;" value="0" />
+ <radio label="&label.new_foreground_tab;" value="1" />
+ <radio label="&label.new_background_tab;" value="2" />
+ </radiogroup>
+ <separator />
+ <label id="label-tab-exceptions" value="&label.tab_exceptions;" />
+ <vbox class="indent">
+ <checkbox id="checkbox-detect-blank-tab"
+ label="&checkbox.detect_blank_tab;"
+ preference="extensions.searchload.detect_blank_tab" />
+ <checkbox id="checkbox-detect-home-tab"
+ label="&checkbox.detect_home_tab;"
+ preference="extensions.searchload.detect_home_tab" />
+ <checkbox id="checkbox-detect-new-tab-page"
+ label="&checkbox.detect_new_tab_page;"
+ preference="extensions.searchload.detect_new_tab_page" />
+ </vbox>
+ </groupbox>
+ </hbox>
+ </prefpane>
+</prefwindow>
diff --git a/install.rdf b/install.rdf
old mode 100644
new mode 100755
index 6508e65..d892e27
--- a/install.rdf
+++ b/install.rdf
@@ -5,33 +5,26 @@
<Description about="urn:mozilla:install-manifest">
<em:id>searchloadoptions at esteban.torres</em:id>
<em:name>SearchLoad Options</em:name>
- <em:version>0.7.4</em:version>
+ <em:version>0.8.0</em:version>
<em:type>2</em:type>
<em:targetApplication>
<Description>
<em:id>{ec8030f7-c20a-464f-9b0e-13a3a9e97384}</em:id>
- <em:minVersion>8.0</em:minVersion>
- <em:maxVersion>16.*</em:maxVersion>
+ <em:minVersion>29.0</em:minVersion>
+ <em:maxVersion>31.*</em:maxVersion>
</Description>
</em:targetApplication>
<em:bootstrap>true</em:bootstrap>
<em:creator>Esteban Torres</em:creator>
- <em:optionsURL>chrome://searchload/content/preferences.xul</em:optionsURL>
+ <em:optionsURL>chrome://searchload/content/search-options.xul</em:optionsURL>
<em:iconURL>chrome://searchload/skin/icon.png</em:iconURL>
<em:localized>
<Description>
- <em:locale>ca-AD</em:locale>
- <em:name>SearchLoad Options</em:name>
- <em:translator>ellibre</em:translator>
- <em:description>Millora la funcionalitat de la barra de cerca.</em:description>
- </Description>
- </em:localized>
- <em:localized>
- <Description>
<em:locale>de</em:locale>
<em:name>SearchLoad - Einstellungen</em:name>
<em:translator>Team erweiterungen.de, Archaeopteryx</em:translator>
<em:description>Anpassen der Funktionen der Suchleiste</em:description>
+ <em:summary>SearchLoad Options erweitert die Möglichkeiten der Suchleiste.
Es kann die Suchleiste automatisch leeren und die gewählte Suchmaschine nach jeder Suche zurücksetzen.
Es kann die Suchergebnisse im aktuellen Tab, einem neuen Tab oder einem neuen Hintergrundtab öffnen.</em:summary>
</Description>
</em:localized>
<em:localized>
@@ -40,6 +33,7 @@
<em:name>Επιλογές φόρτωσης αναζήτησης</em:name>
<em:translator>Γιώργος Μαλαμάς</em:translator>
<em:description>"Πειράξτε" τη λειτουργικότητα της εργαλειοθήκης αναζήτησης.</em:description>
+ <em:summary>Η επέκταση "Επιλογές φόρτωσης αναζήτησης" επεκτείνει τις δυνατότητες της εργαλειοθήκης αναζήτησης. Μπορεί να κάνει εκκαθάριση της εργαλειοθήκης αναζήτησης αυτόματα και να αλλάζει τη μηχανή αναζήτησης μετά από κάθε αναζήτηση. Μπορεί επίσης να ανοίγει τα αποτελέσματα αναζήτησης στην τρέχουσα καρτέλα, σε νέα καρτέλα ή σε νέα καρτέλα στο παρασκήνιο.</em:summary>
</Description>
</em:localized>
<em:localized>
@@ -48,53 +42,7 @@
<em:name>SearchLoad Options</em:name>
<em:translator>Esteban Torres</em:translator>
<em:description>Tweak the searchbar's functionality.</em:description>
- </Description>
- </em:localized>
- <em:localized>
- <Description>
- <em:locale>es-ES</em:locale>
- <em:name>SearchLoad Options</em:name>
- <em:translator>RigoNet</em:translator>
- <em:description>Prueba la funcionalidad de la barra de búsqueda</em:description>
- </Description>
- </em:localized>
- <em:localized>
- <Description>
- <em:locale>fr</em:locale>
- <em:name>SearchLoad Options</em:name>
- <em:translator>myahoo</em:translator>
- </Description>
- </em:localized>
- <em:localized>
- <Description>
- <em:locale>he</em:locale>
- <em:name>SearchLoad אפשרויות</em:name>
- <em:translator>אסטבן טורס</em:translator>
- <em:description>הוספת שיפורים לתיפקודיות של סרגל החיפוש.</em:description>
- </Description>
- </em:localized>
- <em:localized>
- <Description>
- <em:locale>he-IL</em:locale>
- <em:name>SearchLoad Options</em:name>
- <em:translator>אסטבן טורס</em:translator>
- <em:description>התאמת שימוש של סרגל החיפוש.</em:description>
- </Description>
- </em:localized>
- <em:localized>
- <Description>
- <em:locale>hu-HU</em:locale>
- <em:name>SearchLoad beállítások</em:name>
- <em:translator>Mikes Kazmán István</em:translator>
- <em:description>Keresés bővítése új funkciókkal.</em:description>
- </Description>
- </em:localized>
- <em:localized>
- <Description>
- <em:locale>it</em:locale>
- <em:name>SearchLoad Options</em:name>
- <em:translator>shaitan</em:translator>
- <em:description>Migliora le funzionalità della barra di ricerca.</em:description>
+ <em:summary>SearchLoad Options extends the capabilities of the searchbar.
It can automatically clear the searchbar and change the search engine after each search.
It can also open the search results in the current tab, a new tab, or a new background tab.</em:summary>
</Description>
</em:localized>
<em:localized>
@@ -103,37 +51,25 @@
<em:name>SearchLoad Options</em:name>
<em:translator>drry, k2jp</em:translator>
<em:description>検索バーの機能を調整。</em:description>
- </Description>
- </em:localized>
- <em:localized>
- <Description>
- <em:locale>lt</em:locale>
- <em:name>SearchLoad nuostatos</em:name>
- <em:translator>Algimantas Margevičius</em:translator>
- <em:description>Patobulinkite paieškos lauko funkcionalumą.</em:description>
+ <em:summary>SearchLoad Options は検索バー機能を強化します。検索実行後に 検索バーをクリア／検索エンジンを元に戻す 手間を省き、検索結果を 現在タブ／新たなタブ／新たな背面タブ のいずれで開くか選択できるようになります。</em:summary>
</Description>
</em:localized>
<em:localized>
<Description>
<em:locale>lt-LT</em:locale>
<em:name>SearchLoad nuostatos</em:name>
- <em:translator>Algimantas Margevičius</em:translator>
+ <em:translator>Algimantas Margevičius, Tomas D. Davainis</em:translator>
<em:description>Patobulinkite paieškos lauko funkcionalumą.</em:description>
+ <em:summary>SearchLoad pasirinktys išplečia paieškos langelio galimybes. Jis automatiškai gali išvalyti paieškos lauką ir pakeisti paieškos variklį po kiekvienos paieškos. Taipogi gali atverti paieškos rezultatus dabartinėje kortelėje, naujoje kortelėje ar foninėj kortelėj.</em:summary>
</Description>
</em:localized>
<em:localized>
<Description>
<em:locale>nl</em:locale>
- <em:name>SearchLoad Options</em:name>
+ <em:name>SearchLoad-opties</em:name>
<em:translator>markh van BabelZilla.org</em:translator>
<em:description>Pas de functionaliteit van de zoekbalk aan.</em:description>
- </Description>
- </em:localized>
- <em:localized>
- <Description>
- <em:locale>pl</em:locale>
- <em:name>SearchLoad Options</em:name>
- <em:translator>ferros</em:translator>
+ <em:summary>Searchload Options verruimt de mogelijkheden van de zoekbalk. Het kan de zoekbalk automatisch wissen en de zoekmachine na elke zoekopdracht wijzigen. Het kan ook de zoekresultaten openen in het huidige tabblad, een nieuw tabblad of een nieuw tabblad op de achtergrond.</em:summary>
</Description>
</em:localized>
<em:localized>
@@ -141,29 +77,13 @@
<em:locale>pt-BR</em:locale>
<em:name>SearchLoad Options</em:name>
<em:translator>Marcelo Ghelman</em:translator>
- <em:description>Ajusta a funcionalidade da barra de pesquisa.</em:description>
- </Description>
- </em:localized>
- <em:localized>
- <Description>
- <em:locale>ru-RU</em:locale>
- <em:name>SearchLoad Options</em:name>
- <em:translator>TLemur</em:translator>
- <em:description>Настраивает работу панели поиска.</em:description>
- </Description>
- </em:localized>
- <em:localized>
- <Description>
- <em:locale>sv-SE</em:locale>
- <em:name>SearchLoad Options</em:name>
- <em:translator>Mikael Hiort af Ornäs</em:translator>
- <em:description>Manipulera sökfältets funktioner.</em:description>
+ <em:description>Ajusta as funcionalidades da barra de pesquisa.</em:description>
+ <em:summary>O SearchLoad Options amplia os recursos da barra de pesquisa. Ele pode limpar automaticamente a barra e alterar o mecanismo de busca após cada pesquisa. Também pode abrir os resultados da pesquisa na aba atual, em nova aba, ou em nova aba em segundo plano.</em:summary>
</Description>
</em:localized>
<em:localized>
<Description>
<em:locale>tr</em:locale>
- <em:name>SearchLoad Options</em:name>
<em:translator>mrtcvk</em:translator>
<em:description>Arama çubuğunun pratikliğini artırır.</em:description>
</Description>
@@ -174,6 +94,7 @@
<em:name>SearchLoad Options</em:name>
<em:translator>Sappa</em:translator>
<em:description>Налаштування роботи панелі пошуку.</em:description>
+ <em:summary>SearchLoad Options розширює можливості панелі пошуку.</em:summary>
</Description>
</em:localized>
<em:localized>
@@ -182,6 +103,7 @@
<em:name>SearchLoad选项</em:name>
<em:translator>Cye3s</em:translator>
<em:description>调整搜索工具栏功能</em:description>
+ <em:summary>SearchLoad选项扩展了搜索栏的功能。它可以在每次搜索后自动清除搜索栏和更改搜索引擎。它也可以在当前标签，新标签，或一个新的后台标签中打开搜索结果。</em:summary>
</Description>
</em:localized>
<em:localized>
@@ -190,6 +112,7 @@
<em:name>SearchLoad Options</em:name>
<em:translator>Chris Hsu</em:translator>
<em:description>調整搜尋列功能</em:description>
+ <em:summary>SearchLoad Options 擴充了搜尋列的功能，
它可以在每次搜尋完成後自動清除搜尋列、變更搜尋引擎，
也可以將搜尋結果顯示在目前分頁、新的前景或背景分頁。</em:summary>
</Description>
</em:localized>
</Description>
diff --git a/locale/ca-AD/amo.properties b/locale/ca-AD/amo.properties
deleted file mode 100644
index 9923fca..0000000
--- a/locale/ca-AD/amo.properties
+++ /dev/null
@@ -1,4 +0,0 @@
-addon.name=
-translator=ellibre
-description=Millora la funcionalitat de la barra de cerca.
-summary=
diff --git a/locale/ca-AD/pref.dtd b/locale/ca-AD/pref.dtd
deleted file mode 100644
index 92cf06a..0000000
--- a/locale/ca-AD/pref.dtd
+++ /dev/null
@@ -1,16 +0,0 @@
-<!ENTITY prefwindow.title "Opcions de Cerca">
-<!ENTITY bargroup.label "Barra de Cerca">
-<!ENTITY clearsearch.cbox "Neteja la barra de cerca">
-<!ENTITY resetsearch.cbox "Reinicia el motor de cerca a:">
-<!ENTITY cancel.cbox "Cancel.la si la barra de cerca és activa.">
-<!ENTITY tabgroup.label "Pestanyes">
-<!ENTITY tabcontrol.descr "Carrega la cerca a:">
-<!ENTITY activetab.radio "Pestanya activa">
-<!ENTITY newtab.radio "Nova pestanya activa">
-<!ENTITY newbgtab.radio "Nova pestanya al fons">
-<!ENTITY detect.descr "Excepcions per a noves pestanyes:">
-<!ENTITY detectblank.cbox "Pestanya en blanc">
-<!ENTITY detecthome.cbox "Pestanya d'inici">
-<!ENTITY detectnewtab.cbox "Pàgina de pestanya nova">
-<!ENTITY delay.label "després de">
-<!ENTITY delayunits.label "segons.">
diff --git a/locale/ca-AD/searchbar.properties b/locale/ca-AD/searchbar.properties
deleted file mode 100644
index 7f590e5..0000000
--- a/locale/ca-AD/searchbar.properties
+++ /dev/null
@@ -1 +0,0 @@
-searchoptions.label=Opcions de Cerca...
diff --git a/locale/de/amo.properties b/locale/de/amo.properties
deleted file mode 100644
index b002f2d..0000000
--- a/locale/de/amo.properties
+++ /dev/null
@@ -1,4 +0,0 @@
-addon.name=SearchLoad - Einstellungen
-translator=Team erweiterungen.de, Archaeopteryx
-description=Anpassen der Funktionen der Suchleiste
-summary=SearchLoad Options erweitert die Möglichkeiten der Suchleiste.
Es kann die Suchleiste automatisch leeren und die gewählte Suchmaschine nach jeder Suche zurücksetzen.
Es kann die Suchergebnisse im aktuellen Tab, einem neuen Tab oder einem neuen Hintergrundtab öffnen.
diff --git a/locale/de/pref.dtd b/locale/de/pref.dtd
deleted file mode 100644
index 399f21e..0000000
--- a/locale/de/pref.dtd
+++ /dev/null
@@ -1,16 +0,0 @@
-<!ENTITY prefwindow.title "Sucheinstellungen">
-<!ENTITY bargroup.label "Suchleiste">
-<!ENTITY clearsearch.cbox "Suchleiste leeren">
-<!ENTITY resetsearch.cbox "Suchmaschine zurücksetzen">
-<!ENTITY cancel.cbox "Abbrechen, falls Suchleiste aktiv ist">
-<!ENTITY tabgroup.label "Tabs">
-<!ENTITY tabcontrol.descr "Suche öffnen:">
-<!ENTITY activetab.radio "im aktuellen Tab">
-<!ENTITY newtab.radio "in neuem Tab">
-<!ENTITY newbgtab.radio "in neuem Hintergrund-Tab">
-<!ENTITY detect.descr "Ausnahmen für neue Tabs:">
-<!ENTITY detectblank.cbox "Leere Tabs erkennen und verwenden">
-<!ENTITY detecthome.cbox "Startseiten-Tab">
-<!ENTITY detectnewtab.cbox "Neue-Tab-Seite">
-<!ENTITY delay.label "nach">
-<!ENTITY delayunits.label "Sekunden">
diff --git a/locale/de/search-options.dtd b/locale/de/search-options.dtd
new file mode 100644
index 0000000..a2a8ae1
--- /dev/null
+++ b/locale/de/search-options.dtd
@@ -0,0 +1,17 @@
+<!ENTITY title.prefwindow "Sucheinstellungen">
+<!ENTITY label.searchbar_group "Suchleiste">
+<!ENTITY label.clear_searchbar "Suchleiste leeren:">
+<!ENTITY checkbox.on_submission "Beim Absenden der Suche">
+<!ENTITY checkbox.on_searchbar_blur "Wenn Suchleiste Fokus verliert">
+<!ENTITY label.delay "Verzögerung:">
+<!ENTITY label.delay_units "Sekunden">
+<!ENTITY label.reset_searchengine "Suchmaschine zurücksetzen">
+<!ENTITY label.tabs_group "Tabs">
+<!ENTITY label.load_search_in "Suche öffnen:">
+<!ENTITY label.active_tab "Im aktuellen Tab">
+<!ENTITY label.new_foreground_tab "In neuem Tab">
+<!ENTITY label.new_background_tab "In neuem Hintergrund-Tab">
+<!ENTITY label.tab_exceptions "Ausnahmen für neue Tabs:">
+<!ENTITY checkbox.detect_blank_tab "Leere Tabs erkennen und verwenden">
+<!ENTITY checkbox.detect_home_tab "Startseiten-Tab erkennen und verwenden">
+<!ENTITY checkbox.detect_new_tab_page "Neue-Tab-Seite erkennen und verwenden">
diff --git a/locale/de/searchbar.properties b/locale/de/searchbar.properties
index e02ae33..5dcbf07 100644
--- a/locale/de/searchbar.properties
+++ b/locale/de/searchbar.properties
@@ -1 +1 @@
-searchoptions.label=Sucheinstellungen...
+label.searchoptions=Sucheinstellungen...
diff --git a/locale/el/amo.properties b/locale/el/amo.properties
deleted file mode 100644
index dd4ea2b..0000000
--- a/locale/el/amo.properties
+++ /dev/null
@@ -1,4 +0,0 @@
-addon.name=Επιλογές φόρτωσης αναζήτησης
-translator=Γιώργος Μαλαμάς
-description="Πειράξτε" τη λειτουργικότητα της εργαλειοθήκης αναζήτησης.
-summary=Η επέκταση "Επιλογές φόρτωσης αναζήτησης" επεκτείνει τις δυνατότητες της εργαλειοθήκης αναζήτησης. Μπορεί να κάνει εκκαθάριση της εργαλειοθήκης αναζήτησης αυτόματα και να αλλάζει τη μηχανή αναζήτησης μετά από κάθε αναζήτηση. Μπορεί επίσης να ανοίγει τα αποτελέσματα αναζήτησης στην τρέχουσα καρτέλα, σε νέα καρτέλα ή σε νέα καρτέλα στο παρασκήνιο.
diff --git a/locale/el/pref.dtd b/locale/el/pref.dtd
deleted file mode 100644
index 4a841bc..0000000
--- a/locale/el/pref.dtd
+++ /dev/null
@@ -1,16 +0,0 @@
-<!ENTITY prefwindow.title "Επιλογές αναζήτησης">
-<!ENTITY bargroup.label "Εργαλειοθήκη αναζήτησης">
-<!ENTITY clearsearch.cbox "Εκκαθάριση της εργαλειοθήκης αναζήτησης">
-<!ENTITY resetsearch.cbox "Επανεπιλογή μηχανής αναζήτησης:">
-<!ENTITY cancel.cbox "Άκυρο εάν η εργαλειοθήκη αναζήτησης είναι ενεργή.">
-<!ENTITY tabgroup.label "Καρτέλες">
-<!ENTITY tabcontrol.descr "Φόρτωση αναζήτησης:">
-<!ENTITY activetab.radio "Στην ενεργή καρτέλα">
-<!ENTITY newtab.radio "Σε νέα καρτέλα στο προσκήνιο">
-<!ENTITY newbgtab.radio "Σε νέα καρτέλα στο παρασκήνιο">
-<!ENTITY detect.descr "Εξαιρέσεις για νέες καρτέλες:">
-<!ENTITY detectblank.cbox "Κενή καρτέλα">
-<!ENTITY detecthome.cbox "Καρτέλα με την αρχική σελίδα">
-<!ENTITY detectnewtab.cbox "Νέα καρτέλα">
-<!ENTITY delay.label "μετά από">
-<!ENTITY delayunits.label "δευτερόλεπτο/α.">
diff --git a/locale/el/search-options.dtd b/locale/el/search-options.dtd
new file mode 100644
index 0000000..0272dbf
--- /dev/null
+++ b/locale/el/search-options.dtd
@@ -0,0 +1,17 @@
+<!ENTITY title.prefwindow "Επιλογές αναζήτησης">
+<!ENTITY label.searchbar_group "Εργαλειοθήκη αναζήτησης">
+<!ENTITY label.clear_searchbar "Εκκαθάριση της εργαλειοθήκης αναζήτησης:">
+<!ENTITY checkbox.on_submission "Κατά την υποβολή της αναζήτησης">
+<!ENTITY checkbox.on_searchbar_blur "Κατά την απενεργοποίηση της εργαλειοθήκης">
+<!ENTITY label.delay "Καθυστέρηση:">
+<!ENTITY label.delay_units "δευτερόλεπτο/α.">
+<!ENTITY label.reset_searchengine "Επανεπιλογή μηχανής αναζήτησης:">
+<!ENTITY label.tabs_group "Καρτέλες">
+<!ENTITY label.load_search_in "Φόρτωση αναζήτησης:">
+<!ENTITY label.active_tab "Στην ενεργή καρτέλα">
+<!ENTITY label.new_foreground_tab "Σε νέα καρτέλα στο προσκήνιο">
+<!ENTITY label.new_background_tab "Σε νέα καρτέλα στο παρασκήνιο">
+<!ENTITY label.tab_exceptions "Εξαιρέσεις για νέες καρτέλες:">
+<!ENTITY checkbox.detect_blank_tab "Κενή καρτέλα">
+<!ENTITY checkbox.detect_home_tab "Καρτέλα με την αρχική σελίδα">
+<!ENTITY checkbox.detect_new_tab_page "Νέα καρτέλα">
diff --git a/locale/el/searchbar.properties b/locale/el/searchbar.properties
index dfbc012..ed42760 100644
--- a/locale/el/searchbar.properties
+++ b/locale/el/searchbar.properties
@@ -1 +1 @@
-searchoptions.label=Επιλογές αναζήτησης...
+label.searchoptions=Επιλογές αναζήτησης...
diff --git a/locale/en-US/amo.properties b/locale/en-US/amo.properties
deleted file mode 100644
index af92454..0000000
--- a/locale/en-US/amo.properties
+++ /dev/null
@@ -1,4 +0,0 @@
-addon.name=SearchLoad Options
-translator=Esteban Torres
-description=Tweak the searchbar's functionality.
-summary=SearchLoad Options extends the capabilities of the searchbar.
It can automatically clear the searchbar and change the search engine after each search.
It can also open the search results in the current tab, a new tab, or a new background tab.
diff --git a/locale/en-US/pref.dtd b/locale/en-US/pref.dtd
deleted file mode 100644
index 9a947f6..0000000
--- a/locale/en-US/pref.dtd
+++ /dev/null
@@ -1,16 +0,0 @@
-<!ENTITY prefwindow.title "Search Options">
-<!ENTITY bargroup.label "Searchbar">
-<!ENTITY clearsearch.cbox "Clear the searchbar">
-<!ENTITY resetsearch.cbox "Reset the search engine to:">
-<!ENTITY cancel.cbox "Cancel if searchbar is active.">
-<!ENTITY tabgroup.label "Tabs">
-<!ENTITY tabcontrol.descr "Load search in:">
-<!ENTITY activetab.radio "Active tab">
-<!ENTITY newtab.radio "New foreground tab">
-<!ENTITY newbgtab.radio "New background tab">
-<!ENTITY detect.descr "Exceptions for new tabs:">
-<!ENTITY detectblank.cbox "Blank tab">
-<!ENTITY detecthome.cbox "Home page tab">
-<!ENTITY detectnewtab.cbox "New Tab page">
-<!ENTITY delay.label "after">
-<!ENTITY delayunits.label "seconds.">
diff --git a/locale/en-US/search-options.dtd b/locale/en-US/search-options.dtd
new file mode 100644
index 0000000..362175f
--- /dev/null
+++ b/locale/en-US/search-options.dtd
@@ -0,0 +1,17 @@
+<!ENTITY title.prefwindow "Search Options">
+<!ENTITY label.searchbar_group "Searchbar">
+<!ENTITY label.clear_searchbar "Clear the searchbar:">
+<!ENTITY checkbox.on_submission "On search submission">
+<!ENTITY checkbox.on_searchbar_blur "On searchbar blur">
+<!ENTITY label.delay "Delay:">
+<!ENTITY label.delay_units "seconds">
+<!ENTITY label.reset_searchengine "Reset the search engine to:">
+<!ENTITY label.tabs_group "Tabs">
+<!ENTITY label.load_search_in "Load search in:">
+<!ENTITY label.active_tab "Active tab">
+<!ENTITY label.new_foreground_tab "New foreground tab">
+<!ENTITY label.new_background_tab "New background tab">
+<!ENTITY label.tab_exceptions "Exceptions for new tabs:">
+<!ENTITY checkbox.detect_blank_tab "Blank tab">
+<!ENTITY checkbox.detect_home_tab "Home page tab">
+<!ENTITY checkbox.detect_new_tab_page "New Tab page">
diff --git a/locale/en-US/searchbar.properties b/locale/en-US/searchbar.properties
index b2d3477..97022bf 100644
--- a/locale/en-US/searchbar.properties
+++ b/locale/en-US/searchbar.properties
@@ -1 +1 @@
-searchoptions.label=Search Options...
+label.searchoptions=Search Options...
diff --git a/locale/es-ES/amo.properties b/locale/es-ES/amo.properties
deleted file mode 100644
index e37e2a7..0000000
--- a/locale/es-ES/amo.properties
+++ /dev/null
@@ -1,4 +0,0 @@
-addon.name=
-translator=RigoNet
-description=Prueba la funcionalidad de la barra de búsqueda
-summary=
diff --git a/locale/es-ES/pref.dtd b/locale/es-ES/pref.dtd
deleted file mode 100644
index de85aa0..0000000
--- a/locale/es-ES/pref.dtd
+++ /dev/null
@@ -1,16 +0,0 @@
-<!ENTITY prefwindow.title "Opciones de Búsqueda">
-<!ENTITY bargroup.label "Barra de búsqueda">
-<!ENTITY clearsearch.cbox "Limpiar la barra de búsqueda">
-<!ENTITY resetsearch.cbox "Resetear el motor de búsqueda a:">
-<!ENTITY cancel.cbox "Cancelar si la barra de búsqueda está activa.">
-<!ENTITY tabgroup.label "Pestañas">
-<!ENTITY tabcontrol.descr "Cargar búsqueda en:">
-<!ENTITY activetab.radio "Pestaña activa">
-<!ENTITY newtab.radio "Nueva pestaña activa">
-<!ENTITY newbgtab.radio "Nueva pestaña inactiva">
-<!ENTITY detect.descr "Excepciones para nuevas pestañas:">
-<!ENTITY detectblank.cbox "Pestaña en blanco">
-<!ENTITY detecthome.cbox "Pestaña de página de inicio">
-<!ENTITY detectnewtab.cbox "Nueva pestaña">
-<!ENTITY delay.label "después de">
-<!ENTITY delayunits.label "segundos.">
diff --git a/locale/es-ES/searchbar.properties b/locale/es-ES/searchbar.properties
deleted file mode 100644
index c8a73a2..0000000
--- a/locale/es-ES/searchbar.properties
+++ /dev/null
@@ -1 +0,0 @@
-searchoptions.label=Opciones de Búsqueda...
diff --git a/locale/fr/amo.properties b/locale/fr/amo.properties
deleted file mode 100644
index 7d15388..0000000
--- a/locale/fr/amo.properties
+++ /dev/null
@@ -1,4 +0,0 @@
-addon.name=
-translator=myahoo
-description=
-summary=
diff --git a/locale/fr/pref.dtd b/locale/fr/pref.dtd
deleted file mode 100644
index 20facff..0000000
--- a/locale/fr/pref.dtd
+++ /dev/null
@@ -1,16 +0,0 @@
-<!ENTITY prefwindow.title "Options de recherche">
-<!ENTITY bargroup.label "Barre de recherche">
-<!ENTITY clearsearch.cbox "Vider la barre de recherche">
-<!ENTITY resetsearch.cbox "Réinitialiser le moteur de recherche à :">
-<!ENTITY cancel.cbox "Annuler si la barre de recherche est active.">
-<!ENTITY tabgroup.label "Onglets">
-<!ENTITY tabcontrol.descr "Voir le résultat de la recherche dans :">
-<!ENTITY activetab.radio "L'onglet en cours">
-<!ENTITY newtab.radio "Un nouvel onglet, au premier plan">
-<!ENTITY newbgtab.radio "Un nouvel onglet, en arrière-plan">
-<!ENTITY detect.descr "Pas de nouvel onglet si l'actuel est :">
-<!ENTITY detectblank.cbox "Un onglet vide">
-<!ENTITY detecthome.cbox "L'onglet de la page d'accueil">
-<!ENTITY detectnewtab.cbox "la page nouvel onglet">
-<!ENTITY delay.label "après">
-<!ENTITY delayunits.label "secondes.">
diff --git a/locale/fr/searchbar.properties b/locale/fr/searchbar.properties
deleted file mode 100644
index 693807b..0000000
--- a/locale/fr/searchbar.properties
+++ /dev/null
@@ -1 +0,0 @@
-searchoptions.label=Options de recherche…
diff --git a/locale/he-IL/amo.properties b/locale/he-IL/amo.properties
deleted file mode 100644
index 7a0baa6..0000000
--- a/locale/he-IL/amo.properties
+++ /dev/null
@@ -1,4 +0,0 @@
-addon.name=SearchLoad Options
-translator=אסטבן טורס
-description=התאמת שימוש של סרגל החיפוש.
-summary=SearchLoad Options מרחיב את היכולות של סרגל החיפוש. ניתן דרכו לנקות את תיבת החיפוש באופן אוטומטי ולשנות את מנוע החיפוש אחרי כל חיפוש. באמצעותו ניתן גם לפתוח את תוצאות החיפוש בלשונית הנוכחית, לשונית חדשה, או בלשונית רקע חדשה.
diff --git a/locale/he-IL/pref.dtd b/locale/he-IL/pref.dtd
deleted file mode 100644
index 6c3e96f..0000000
--- a/locale/he-IL/pref.dtd
+++ /dev/null
@@ -1,16 +0,0 @@
-<!ENTITY prefwindow.title "אפשרויות חיפוש">
-<!ENTITY bargroup.label "סרגל חיפוש">
-<!ENTITY clearsearch.cbox "נקה את תיבת החיפוש">
-<!ENTITY resetsearch.cbox "אפס את מנוע החיפוש ל:">
-<!ENTITY cancel.cbox "בטל אם תיבת החיפוש בשימוש.">
-<!ENTITY tabgroup.label "כרטיסיות">
-<!ENTITY tabcontrol.descr "טען חיפוש ב:">
-<!ENTITY activetab.radio "לשונית פעילה">
-<!ENTITY newtab.radio "לשונית חדשה בחזית">
-<!ENTITY newbgtab.radio "לשונית חדשה ברקע">
-<!ENTITY detect.descr "חריגים עבור לשוניות חדשות:">
-<!ENTITY detectblank.cbox "לשונית ריקה">
-<!ENTITY detecthome.cbox "לשונית דף הבית">
-<!ENTITY detectnewtab.cbox "דף לשונית חדש">
-<!ENTITY delay.label "לאחר">
-<!ENTITY delayunits.label "שניות.">
diff --git a/locale/he-IL/searchbar.properties b/locale/he-IL/searchbar.properties
deleted file mode 100644
index ef8eb8a..0000000
--- a/locale/he-IL/searchbar.properties
+++ /dev/null
@@ -1 +0,0 @@
-searchoptions.label=אפשרויות חיפוש
diff --git a/locale/he/amo.properties b/locale/he/amo.properties
deleted file mode 100644
index a34b260..0000000
--- a/locale/he/amo.properties
+++ /dev/null
@@ -1,4 +0,0 @@
-addon.name=SearchLoad אפשרויות
-translator=אסטבן טורס
-description=הוספת שיפורים לתיפקודיות של סרגל החיפוש.
-summary=אפשרויות של התוסף searchLoad מרחיב את היכולות של סרגל החיפוש. התוסף יכול לנקות את סרגל החיפוש באופן עצמי ולשנות את מנוע החיפוש לאחר כל חיפוש. הוא יכול גם לפתוח את תוצאות החיפוש בלשונית הנוכחית, לשונית חדשה או בלשונית רקע חדשה.
diff --git a/locale/he/pref.dtd b/locale/he/pref.dtd
deleted file mode 100644
index 424e474..0000000
--- a/locale/he/pref.dtd
+++ /dev/null
@@ -1,16 +0,0 @@
-<!ENTITY prefwindow.title "אפשרויות חיפוש">
-<!ENTITY bargroup.label "סרגל חיפוש">
-<!ENTITY clearsearch.cbox "נקה את סרגל החיפוש">
-<!ENTITY resetsearch.cbox "שחזר את סרגל החיפוש ל:">
-<!ENTITY cancel.cbox "בטל אם סרגל החיפוש פעיל:">
-<!ENTITY tabgroup.label "לשוניות">
-<!ENTITY tabcontrol.descr "טען חיפוש ב:">
-<!ENTITY activetab.radio "לשונית פעילה">
-<!ENTITY newtab.radio "לשונית חדשה בחזית">
-<!ENTITY newbgtab.radio "לשונית חדשה ברקע">
-<!ENTITY detect.descr "חריגים ללשוניות חדשות">
-<!ENTITY detectblank.cbox "לשונית ריקה">
-<!ENTITY detecthome.cbox "לשונית דף הבית">
-<!ENTITY detectnewtab.cbox "דף לשונית חדש">
-<!ENTITY delay.label "אחרי">
-<!ENTITY delayunits.label "שניות.">
diff --git a/locale/he/searchbar.properties b/locale/he/searchbar.properties
deleted file mode 100644
index 825a032..0000000
--- a/locale/he/searchbar.properties
+++ /dev/null
@@ -1 +0,0 @@
-searchoptions.label=אפשרויות חיפוש...
diff --git a/locale/hu-HU/amo.properties b/locale/hu-HU/amo.properties
deleted file mode 100644
index 215d64a..0000000
--- a/locale/hu-HU/amo.properties
+++ /dev/null
@@ -1,4 +0,0 @@
-addon.name=SearchLoad beállítások
-translator=Mikes Kazmán István
-description=Keresés bővítése új funkciókkal.
-summary=Keresés új funkciókkal. Automatikus törlés, keresőmotor módosítása keresés után, keresés eredményének megjelenítésének testreszabása..
diff --git a/locale/hu-HU/pref.dtd b/locale/hu-HU/pref.dtd
deleted file mode 100644
index c39f1f4..0000000
--- a/locale/hu-HU/pref.dtd
+++ /dev/null
@@ -1,16 +0,0 @@
-<!ENTITY prefwindow.title "A keresés beállításai">
-<!ENTITY bargroup.label "Keresőmező">
-<!ENTITY clearsearch.cbox "Keresőmező törlése keresés után">
-<!ENTITY resetsearch.cbox "Keresőszolgáltatás beállítása erre:">
-<!ENTITY cancel.cbox "Megszakítás, ha a keresőmező aktív">
-<!ENTITY tabgroup.label "Lapok">
-<!ENTITY tabcontrol.descr "Keresés eredményének megnyitása:">
-<!ENTITY activetab.radio "Jelenlegi lapon">
-<!ENTITY newtab.radio "Új lapon (előtérben)">
-<!ENTITY newbgtab.radio "Új lapon (háttérben)">
-<!ENTITY detect.descr "Ne nyisson új lapot, ha a jelenlegi:">
-<!ENTITY detectblank.cbox "Üres lap">
-<!ENTITY detecthome.cbox "Kezdőlap">
-<!ENTITY detectnewtab.cbox "Új lap oldal">
-<!ENTITY delay.label "Késleltetés:">
-<!ENTITY delayunits.label "másodperc">
diff --git a/locale/hu-HU/searchbar.properties b/locale/hu-HU/searchbar.properties
deleted file mode 100644
index 3d0d25e..0000000
--- a/locale/hu-HU/searchbar.properties
+++ /dev/null
@@ -1 +0,0 @@
-searchoptions.label=Keresés beállítások..
diff --git a/locale/it/amo.properties b/locale/it/amo.properties
deleted file mode 100644
index 1af80f0..0000000
--- a/locale/it/amo.properties
+++ /dev/null
@@ -1,4 +0,0 @@
-addon.name=
-translator=shaitan
-description=Migliora le funzionalità della barra di ricerca.
-summary=
diff --git a/locale/it/pref.dtd b/locale/it/pref.dtd
deleted file mode 100644
index 56193d0..0000000
--- a/locale/it/pref.dtd
+++ /dev/null
@@ -1,16 +0,0 @@
-<!ENTITY prefwindow.title "Opzioni di ricerca">
-<!ENTITY bargroup.label "Barra di ricerca">
-<!ENTITY clearsearch.cbox "Pulisci la barra di ricerca">
-<!ENTITY resetsearch.cbox "Ripristina il motore di ricerca">
-<!ENTITY cancel.cbox "Pulisci se si attiva la barra di ricerca">
-<!ENTITY tabgroup.label "Schede">
-<!ENTITY tabcontrol.descr "Carica i risultati:">
-<!ENTITY activetab.radio "nella scheda attuale.">
-<!ENTITY newtab.radio "in una nuova scheda.">
-<!ENTITY newbgtab.radio "in una scheda in secondo piano.">
-<!ENTITY detect.descr "Eccezioni alla creazione di una nuova scheda:">
-<!ENTITY detectblank.cbox "schede vuote.">
-<!ENTITY detecthome.cbox "schede con la pagina iniziale.">
-<!ENTITY detectnewtab.cbox "la pagina nuova scheda">
-<!ENTITY delay.label "Dopo">
-<!ENTITY delayunits.label "secondi.">
diff --git a/locale/it/searchbar.properties b/locale/it/searchbar.properties
deleted file mode 100644
index 245abdc..0000000
--- a/locale/it/searchbar.properties
+++ /dev/null
@@ -1 +0,0 @@
-searchoptions.label=Opzioni di ricerca...
diff --git a/locale/ja-JP/amo.properties b/locale/ja-JP/amo.properties
deleted file mode 100644
index 8a778c1..0000000
--- a/locale/ja-JP/amo.properties
+++ /dev/null
@@ -1,4 +0,0 @@
-addon.name=SearchLoad Options
-translator=drry, k2jp
-description=検索バーの機能を調整。
-summary=SearchLoad Options は検索バー機能を強化します。検索実行後に検索バーをクリア／検索エンジンを元に戻す手間を省き、検索結果を現在タブ、新たなタブ、新たな背面タブのいずれで開くか選択できるようになります。
diff --git a/locale/ja-JP/pref.dtd b/locale/ja-JP/pref.dtd
deleted file mode 100644
index 17bf8a8..0000000
--- a/locale/ja-JP/pref.dtd
+++ /dev/null
@@ -1,16 +0,0 @@
-<!ENTITY prefwindow.title "検索オプション">
-<!ENTITY bargroup.label "検索バー">
-<!ENTITY clearsearch.cbox "検索バーをクリア">
-<!ENTITY resetsearch.cbox "検索実行後、この検索エンジンに戻す:">
-<!ENTITY cancel.cbox "検索バーを使用中なら取り消す。">
-<!ENTITY tabgroup.label "タブ">
-<!ENTITY tabcontrol.descr "検索結果の読み込み先:">
-<!ENTITY activetab.radio "現在のタブ">
-<!ENTITY newtab.radio "新たな前面タブ">
-<!ENTITY newbgtab.radio "新たな背面タブ">
-<!ENTITY detect.descr "新たにタブを開かない場合:">
-<!ENTITY detectblank.cbox "空白のタブ">
-<!ENTITY detecthome.cbox "ホームページタブ">
-<!ENTITY detectnewtab.cbox "新しいタブページ">
-<!ENTITY delay.label "待機時間">
-<!ENTITY delayunits.label "秒">
diff --git a/locale/ja-JP/search-options.dtd b/locale/ja-JP/search-options.dtd
new file mode 100644
index 0000000..e298859
--- /dev/null
+++ b/locale/ja-JP/search-options.dtd
@@ -0,0 +1,17 @@
+<!ENTITY title.prefwindow "検索オプション">
+<!ENTITY label.searchbar_group "検索バー">
+<!ENTITY label.clear_searchbar "検索バーをクリアするタイミング:">
+<!ENTITY checkbox.on_submission "検索実行時">
+<!ENTITY checkbox.on_searchbar_blur "検索バーがフォーカスを失った時">
+<!ENTITY label.delay "待機時間:">
+<!ENTITY label.delay_units "秒">
+<!ENTITY label.reset_searchengine "検索実行後、この検索エンジンに戻す:">
+<!ENTITY label.tabs_group "タブ">
+<!ENTITY label.load_search_in "検索結果の読み込み先:">
+<!ENTITY label.active_tab "現在のタブ">
+<!ENTITY label.new_foreground_tab "新たな前面タブ">
+<!ENTITY label.new_background_tab "新たな背面タブ">
+<!ENTITY label.tab_exceptions "新たなタブを開かない場合:">
+<!ENTITY checkbox.detect_blank_tab "空白のタブ">
+<!ENTITY checkbox.detect_home_tab "ホームページタブ">
+<!ENTITY checkbox.detect_new_tab_page "新しいタブページ">
diff --git a/locale/ja-JP/searchbar.properties b/locale/ja-JP/searchbar.properties
index b7275d0..d853764 100644
--- a/locale/ja-JP/searchbar.properties
+++ b/locale/ja-JP/searchbar.properties
@@ -1 +1 @@
-searchoptions.label=検索オプション...
+label.searchoptions=検索オプション...
diff --git a/locale/lt-LT/amo.properties b/locale/lt-LT/amo.properties
deleted file mode 100644
index 915caeb..0000000
--- a/locale/lt-LT/amo.properties
+++ /dev/null
@@ -1,4 +0,0 @@
-addon.name=SearchLoad nuostatos
-translator=Algimantas Margevičius
-description=Patobulinkite paieškos lauko funkcionalumą.
-summary=SearchLoad pasirinktys išplečia paieškos langelio galimybes.
Jis automatiškai gali išvalyti paieškos lauką ir pakeisti paieškos variklį po kiekvienos paieškos.
Taipogi gali atverti paieškos rezultatus dabartinėje kortelėje, naujoje kortelėje ar foninėj kortelėj.
diff --git a/locale/lt-LT/pref.dtd b/locale/lt-LT/pref.dtd
deleted file mode 100644
index 06b1ec6..0000000
--- a/locale/lt-LT/pref.dtd
+++ /dev/null
@@ -1,16 +0,0 @@
-<!ENTITY prefwindow.title "Paieškos pasirinktys">
-<!ENTITY bargroup.label "Paieškos langelis">
-<!ENTITY clearsearch.cbox "Išvalyti paieškos langelį">
-<!ENTITY resetsearch.cbox "Atstatyti paieškos variklį į:">
-<!ENTITY cancel.cbox "Atšaukti, jei paieškos langelis aktyvus.">
-<!ENTITY tabgroup.label "Kortelės">
-<!ENTITY tabcontrol.descr "Įkrauti paiešką į:">
-<!ENTITY activetab.radio "Aktyvią kortelę">
-<!ENTITY newtab.radio "Naują priešakinę kortelę">
-<!ENTITY newbgtab.radio "Naują kortelę pabaigoje">
-<!ENTITY detect.descr "Išimtys naujoms kortelėms:">
-<!ENTITY detectblank.cbox "Tuščia kortelė">
-<!ENTITY detecthome.cbox "Namų puslapio kortelė">
-<!ENTITY detectnewtab.cbox "naujos kortelės tinklalapio">
-<!ENTITY delay.label "po">
-<!ENTITY delayunits.label "sekundžių.">
diff --git a/locale/lt-LT/search-options.dtd b/locale/lt-LT/search-options.dtd
new file mode 100644
index 0000000..d125fa3
--- /dev/null
+++ b/locale/lt-LT/search-options.dtd
@@ -0,0 +1,17 @@
+<!ENTITY title.prefwindow "Paieškos pasirinktys">
+<!ENTITY label.searchbar_group "Paieškos langelis">
+<!ENTITY label.clear_searchbar "Išvalyti paieškos langelį:">
+<!ENTITY checkbox.on_submission "Pateikiant paiešką">
+<!ENTITY checkbox.on_searchbar_blur "Paieškos juostoje">
+<!ENTITY label.delay "Uždelsti:">
+<!ENTITY label.delay_units "sekundžių.">
+<!ENTITY label.reset_searchengine "Atstatyti paieškos variklį į:">
+<!ENTITY label.tabs_group "Kortelės">
+<!ENTITY label.load_search_in "Įkrauti paiešką į:">
+<!ENTITY label.active_tab "Aktyvią kortelę">
+<!ENTITY label.new_foreground_tab "Naują priešakinę kortelę">
+<!ENTITY label.new_background_tab "Naują kortelę pabaigoje">
+<!ENTITY label.tab_exceptions "Išimtys naujoms kortelėms:">
+<!ENTITY checkbox.detect_blank_tab "Tuščia kortelė">
+<!ENTITY checkbox.detect_home_tab "Namų puslapio kortelė">
+<!ENTITY checkbox.detect_new_tab_page "naujos kortelės tinklalapio">
diff --git a/locale/lt-LT/searchbar.properties b/locale/lt-LT/searchbar.properties
index b91f780..480847a 100644
--- a/locale/lt-LT/searchbar.properties
+++ b/locale/lt-LT/searchbar.properties
@@ -1 +1 @@
-searchoptions.label=Paieškos pasirinktys...
+label.searchoptions=Paieškos pasirinktys...
diff --git a/locale/lt/amo.properties b/locale/lt/amo.properties
deleted file mode 100644
index 915caeb..0000000
--- a/locale/lt/amo.properties
+++ /dev/null
@@ -1,4 +0,0 @@
-addon.name=SearchLoad nuostatos
-translator=Algimantas Margevičius
-description=Patobulinkite paieškos lauko funkcionalumą.
-summary=SearchLoad pasirinktys išplečia paieškos langelio galimybes.
Jis automatiškai gali išvalyti paieškos lauką ir pakeisti paieškos variklį po kiekvienos paieškos.
Taipogi gali atverti paieškos rezultatus dabartinėje kortelėje, naujoje kortelėje ar foninėj kortelėj.
diff --git a/locale/lt/pref.dtd b/locale/lt/pref.dtd
deleted file mode 100644
index 18d4125..0000000
--- a/locale/lt/pref.dtd
+++ /dev/null
@@ -1,16 +0,0 @@
-<!ENTITY prefwindow.title "Paieškos pasirinktys">
-<!ENTITY bargroup.label "Paieškos langelis">
-<!ENTITY clearsearch.cbox "Išvalyti paieškos langelį">
-<!ENTITY resetsearch.cbox "Atstatyti paieškos variklį į:">
-<!ENTITY cancel.cbox "Atšaukti, jei paieškos langelis aktyvus.">
-<!ENTITY tabgroup.label "Kortelės">
-<!ENTITY tabcontrol.descr "Įkrauti paiešką į:">
-<!ENTITY activetab.radio "Aktyvią kortelę">
-<!ENTITY newtab.radio "Naują priešakinę kortelę">
-<!ENTITY newbgtab.radio "Naują kortelę pabaigoje">
-<!ENTITY detect.descr "Išimtys naujoms kortelėms:">
-<!ENTITY detectblank.cbox "Tuščia kortelė">
-<!ENTITY detecthome.cbox "Namų puslapio kortelė">
-<!ENTITY detectnewtab.cbox "Naujos kortelės puslapis">
-<!ENTITY delay.label "po">
-<!ENTITY delayunits.label "sekundžių.">
diff --git a/locale/lt/searchbar.properties b/locale/lt/searchbar.properties
deleted file mode 100644
index b91f780..0000000
--- a/locale/lt/searchbar.properties
+++ /dev/null
@@ -1 +0,0 @@
-searchoptions.label=Paieškos pasirinktys...
diff --git a/locale/nl/amo.properties b/locale/nl/amo.properties
deleted file mode 100644
index 00c8f24..0000000
--- a/locale/nl/amo.properties
+++ /dev/null
@@ -1,4 +0,0 @@
-addon.name=SearchLoad Options
-translator=markh van BabelZilla.org
-description=Pas de functionaliteit van de zoekbalk aan.
-summary=Searchload Options verruimt de mogelijkheden van de zoekbalk. Het kan de zoekbalk automatisch wissen en de zoekmachine na elke zoekopdracht wijzigen. Het kan ook de zoekresultaten openen in het huidige tabblad, een nieuw tabblad of een nieuw tabblad op de achtergrond.
diff --git a/locale/nl/pref.dtd b/locale/nl/pref.dtd
deleted file mode 100644
index ae381c8..0000000
--- a/locale/nl/pref.dtd
+++ /dev/null
@@ -1,16 +0,0 @@
-<!ENTITY prefwindow.title "Zoekopties">
-<!ENTITY bargroup.label "Zoekbalk">
-<!ENTITY clearsearch.cbox "Zoekbalk wissen">
-<!ENTITY resetsearch.cbox "Zoekmachine instellen op:">
-<!ENTITY cancel.cbox "Annuleren indien zoekbalk actief is.">
-<!ENTITY tabgroup.label "Tabbladen">
-<!ENTITY tabcontrol.descr "Zoekresultaat laden in:">
-<!ENTITY activetab.radio "Actief tabblad">
-<!ENTITY newtab.radio "Nieuw tabblad op de voorgrond">
-<!ENTITY newbgtab.radio "Nieuw tabblad op de achtergrond">
-<!ENTITY detect.descr "Uitzonderingen voor nieuwe tabbladen:">
-<!ENTITY detectblank.cbox "Leeg tabblad">
-<!ENTITY detecthome.cbox "Startpaginatabblad">
-<!ENTITY detectnewtab.cbox "Nieuwe tabbladpagina">
-<!ENTITY delay.label "na">
-<!ENTITY delayunits.label "seconden.">
diff --git a/locale/nl/search-options.dtd b/locale/nl/search-options.dtd
new file mode 100644
index 0000000..cc56ccb
--- /dev/null
+++ b/locale/nl/search-options.dtd
@@ -0,0 +1,17 @@
+<!ENTITY title.prefwindow "Zoekopties">
+<!ENTITY label.searchbar_group "Zoekbalk">
+<!ENTITY label.clear_searchbar "Zoekbalk wissen:">
+<!ENTITY checkbox.on_submission "Bij indienen zoekopdracht">
+<!ENTITY checkbox.on_searchbar_blur "Bij wissen zoekbalk">
+<!ENTITY label.delay "Vertraging:">
+<!ENTITY label.delay_units "seconden.">
+<!ENTITY label.reset_searchengine "Zoekmachine instellen op:">
+<!ENTITY label.tabs_group "Tabbladen">
+<!ENTITY label.load_search_in "Zoekresultaat laden in:">
+<!ENTITY label.active_tab "Actief tabblad">
+<!ENTITY label.new_foreground_tab "Nieuw tabblad op de voorgrond">
+<!ENTITY label.new_background_tab "Nieuw tabblad op de achtergrond">
+<!ENTITY label.tab_exceptions "Uitzonderingen voor nieuwe tabbladen:">
+<!ENTITY checkbox.detect_blank_tab "Leeg tabblad">
+<!ENTITY checkbox.detect_home_tab "Startpaginatabblad">
+<!ENTITY checkbox.detect_new_tab_page "Nieuwe tabbladpagina">
diff --git a/locale/nl/searchbar.properties b/locale/nl/searchbar.properties
index efcbadc..206950e 100644
--- a/locale/nl/searchbar.properties
+++ b/locale/nl/searchbar.properties
@@ -1 +1 @@
-searchoptions.label=Zoekopties…
+label.searchoptions=Zoekopties…
diff --git a/locale/pl/amo.properties b/locale/pl/amo.properties
deleted file mode 100644
index 8a99688..0000000
--- a/locale/pl/amo.properties
+++ /dev/null
@@ -1,4 +0,0 @@
-addon.name=
-translator=ferros
-description=
-summary=
diff --git a/locale/pl/pref.dtd b/locale/pl/pref.dtd
deleted file mode 100644
index 65afc2a..0000000
--- a/locale/pl/pref.dtd
+++ /dev/null
@@ -1,16 +0,0 @@
-<!ENTITY prefwindow.title "Opcje szukania">
-<!ENTITY bargroup.label "Pasek szukania">
-<!ENTITY clearsearch.cbox "Wyczyść pasek szukania">
-<!ENTITY resetsearch.cbox "Ustaw silnik wyszukiwania na:">
-<!ENTITY cancel.cbox "Anuluj, jeśli pasek szukania jest aktywny.">
-<!ENTITY tabgroup.label "Karty">
-<!ENTITY tabcontrol.descr "Załaduj poszukiwanie do:">
-<!ENTITY activetab.radio "Aktywna karta">
-<!ENTITY newtab.radio "Nowa karta na pierwszym planie">
-<!ENTITY newbgtab.radio "Nowa karta w tle">
-<!ENTITY detect.descr "Wyjątki dla nowych kart:">
-<!ENTITY detectblank.cbox "Pusta karta">
-<!ENTITY detecthome.cbox "Karta strony domowej">
-<!ENTITY detectnewtab.cbox "stronę nowej karty">
-<!ENTITY delay.label "po">
-<!ENTITY delayunits.label "sekundach.">
diff --git a/locale/pl/searchbar.properties b/locale/pl/searchbar.properties
deleted file mode 100644
index 7853b4c..0000000
--- a/locale/pl/searchbar.properties
+++ /dev/null
@@ -1 +0,0 @@
-searchoptions.label=Opcje szukania...
diff --git a/locale/pt-BR/amo.properties b/locale/pt-BR/amo.properties
deleted file mode 100644
index 376c3ab..0000000
--- a/locale/pt-BR/amo.properties
+++ /dev/null
@@ -1,4 +0,0 @@
-addon.name=SearchLoad Options
-translator=Marcelo Ghelman
-description=Ajusta a funcionalidade da barra de pesquisa.
-summary=O SearchLoad Options amplia os recursos da barra de pesquisa. Ele pode limpar automaticamente a barra e alterar o mecanismo de busca após cada pesquisa. Também pode abrir os resultados da pesquisa na aba atual, em nova aba, ou em nova aba ao fundo.
diff --git a/locale/pt-BR/pref.dtd b/locale/pt-BR/pref.dtd
deleted file mode 100644
index 7d47bb9..0000000
--- a/locale/pt-BR/pref.dtd
+++ /dev/null
@@ -1,16 +0,0 @@
-<!ENTITY prefwindow.title "Opções de pesquisa">
-<!ENTITY bargroup.label "Barra de pesquisa">
-<!ENTITY clearsearch.cbox "Limpar a barra de pesquisa">
-<!ENTITY resetsearch.cbox "Restaurar o mecanismo de pesquisa para:">
-<!ENTITY cancel.cbox "Cancelar se a barra de pesquisa estiver ativa.">
-<!ENTITY tabgroup.label "Abas">
-<!ENTITY tabcontrol.descr "Onde abrir resultado de pesquisa:">
-<!ENTITY activetab.radio "Aba ativa">
-<!ENTITY newtab.radio "Nova aba com foco">
-<!ENTITY newbgtab.radio "Nova aba sem foco">
-<!ENTITY detect.descr "Exceções para novas abas:">
-<!ENTITY detectblank.cbox "Aba vazia">
-<!ENTITY detecthome.cbox "Aba da página inicial">
-<!ENTITY detectnewtab.cbox "Nova aba">
-<!ENTITY delay.label "após">
-<!ENTITY delayunits.label "segundos.">
diff --git a/locale/pt-BR/search-options.dtd b/locale/pt-BR/search-options.dtd
new file mode 100644
index 0000000..4f86803
--- /dev/null
+++ b/locale/pt-BR/search-options.dtd
@@ -0,0 +1,17 @@
+<!ENTITY title.prefwindow "Opções de pesquisa">
+<!ENTITY label.searchbar_group "Barra de pesquisa">
+<!ENTITY label.clear_searchbar "Limpar a barra de pesquisa:">
+<!ENTITY checkbox.on_submission "Ao enviar uma persquisa">
+<!ENTITY checkbox.on_searchbar_blur "Ao ofuscar a barra de pesquisa">
+<!ENTITY label.delay "Atraso:">
+<!ENTITY label.delay_units "segundos">
+<!ENTITY label.reset_searchengine "Restaurar o mecanismo de pesquisa para:">
+<!ENTITY label.tabs_group "Abas">
+<!ENTITY label.load_search_in "Abrir resultado de pesquisa em:">
+<!ENTITY label.active_tab "Aba ativa">
+<!ENTITY label.new_foreground_tab "Nova aba com foco">
+<!ENTITY label.new_background_tab "Nova aba sem foco">
+<!ENTITY label.tab_exceptions "Exceções para novas abas:">
+<!ENTITY checkbox.detect_blank_tab "Aba vazia">
+<!ENTITY checkbox.detect_home_tab "Aba da página inicial">
+<!ENTITY checkbox.detect_new_tab_page "Nova aba">
diff --git a/locale/pt-BR/searchbar.properties b/locale/pt-BR/searchbar.properties
index 0f0f439..20a603f 100644
--- a/locale/pt-BR/searchbar.properties
+++ b/locale/pt-BR/searchbar.properties
@@ -1 +1 @@
-searchoptions.label=Opções de pesquisa…
+label.searchoptions=Opções de pesquisa…
diff --git a/locale/ru-RU/amo.properties b/locale/ru-RU/amo.properties
deleted file mode 100644
index 18e3ec6..0000000
--- a/locale/ru-RU/amo.properties
+++ /dev/null
@@ -1,4 +0,0 @@
-addon.name=
-translator=TLemur
-description=Настраивает работу панели поиска.
-summary=
diff --git a/locale/ru-RU/pref.dtd b/locale/ru-RU/pref.dtd
deleted file mode 100644
index e4fbf2f..0000000
--- a/locale/ru-RU/pref.dtd
+++ /dev/null
@@ -1,16 +0,0 @@
-<!ENTITY prefwindow.title "Настройки поиска">
-<!ENTITY bargroup.label "Панель поиска">
-<!ENTITY clearsearch.cbox "Очищать панель поиска">
-<!ENTITY resetsearch.cbox "Устанавливать поисковую машину в:">
-<!ENTITY cancel.cbox "Отменять, если панель поиска активна.">
-<!ENTITY tabgroup.label "Вкладки">
-<!ENTITY tabcontrol.descr "Загружать результаты в:">
-<!ENTITY activetab.radio "Текущую вкладку">
-<!ENTITY newtab.radio "Новую вкладку и переходить туда">
-<!ENTITY newbgtab.radio "Новую вкладку и НЕ переходить туда">
-<!ENTITY detect.descr "Не создавать вкладку, если текущая вкладка:">
-<!ENTITY detectblank.cbox "пуста">
-<!ENTITY detecthome.cbox "содержит домашнюю страницу">
-<!ENTITY detectnewtab.cbox "страницу Новая вкладка">
-<!ENTITY delay.label "после">
-<!ENTITY delayunits.label "секунд.">
diff --git a/locale/ru-RU/searchbar.properties b/locale/ru-RU/searchbar.properties
deleted file mode 100644
index eba7a87..0000000
--- a/locale/ru-RU/searchbar.properties
+++ /dev/null
@@ -1 +0,0 @@
-searchoptions.label=Настройки поиска...
diff --git a/locale/sv-SE/amo.properties b/locale/sv-SE/amo.properties
deleted file mode 100644
index fa5aaad..0000000
--- a/locale/sv-SE/amo.properties
+++ /dev/null
@@ -1,4 +0,0 @@
-addon.name=SearchLoad Options
-translator=Mikael Hiort af Ornäs
-description=Manipulera sökfältets funktioner.
-summary=SearchLoad Options utökar funktionen för sökfältet.
Det kan rensa sökfältet automatiskt och byta sökmotorn efter varje sökning.
Det kan också öppna sökresultaten i den aktuella fliken, i en ny flik eller i en ny bakgrundsflik.
diff --git a/locale/sv-SE/pref.dtd b/locale/sv-SE/pref.dtd
deleted file mode 100644
index 1d6b4e3..0000000
--- a/locale/sv-SE/pref.dtd
+++ /dev/null
@@ -1,16 +0,0 @@
-<!ENTITY prefwindow.title "Sökinställningar">
-<!ENTITY bargroup.label "Sökfältet">
-<!ENTITY clearsearch.cbox "Rensa sökfältet">
-<!ENTITY resetsearch.cbox "Återställ sökmotorn till:">
-<!ENTITY cancel.cbox "Avbryt om sökfältet är aktivt.">
-<!ENTITY tabgroup.label "Flikar">
-<!ENTITY tabcontrol.descr "Läs in sökning i:">
-<!ENTITY activetab.radio "Aktiv flik">
-<!ENTITY newtab.radio "Ny förgrundsflik">
-<!ENTITY newbgtab.radio "Ny bakgrundsflik">
-<!ENTITY detect.descr "Undantag för nya flikar:">
-<!ENTITY detectblank.cbox "Tom flik">
-<!ENTITY detecthome.cbox "Startsideflik">
-<!ENTITY detectnewtab.cbox "fliken Ny sida">
-<!ENTITY delay.label "efter">
-<!ENTITY delayunits.label "sekunder.">
diff --git a/locale/sv-SE/searchbar.properties b/locale/sv-SE/searchbar.properties
deleted file mode 100644
index f2a900f..0000000
--- a/locale/sv-SE/searchbar.properties
+++ /dev/null
@@ -1 +0,0 @@
-searchoptions.label=Sökalternativ...
diff --git a/locale/tr/amo.properties b/locale/tr/amo.properties
deleted file mode 100644
index 8ab434f..0000000
--- a/locale/tr/amo.properties
+++ /dev/null
@@ -1,4 +0,0 @@
-addon.name=
-translator=mrtcvk
-description=Arama çubuğunun pratikliğini artırır.
-summary=
diff --git a/locale/tr/pref.dtd b/locale/tr/pref.dtd
deleted file mode 100644
index f359659..0000000
--- a/locale/tr/pref.dtd
+++ /dev/null
@@ -1,16 +0,0 @@
-<!ENTITY prefwindow.title "Arama Ayarları">
-<!ENTITY bargroup.label "Arama Çubuğu">
-<!ENTITY clearsearch.cbox "Arama Çubuğunu Temizle">
-<!ENTITY resetsearch.cbox "Arama motorunu">
-<!ENTITY cancel.cbox "Arama Çubuğu aktifse pasifleştir">
-<!ENTITY tabgroup.label "Sekmeler">
-<!ENTITY tabcontrol.descr "Yüklenende ara:">
-<!ENTITY activetab.radio "Aktif Sekmede">
-<!ENTITY newtab.radio "Önplandaki Sekmede">
-<!ENTITY newbgtab.radio "Yeni">
-<!ENTITY detect.descr "Yeni sekmeler için istisnalar">
-<!ENTITY detectblank.cbox "Boş Sayfa">
-<!ENTITY detecthome.cbox "Anasayfa">
-<!ENTITY detectnewtab.cbox "Yeni sekme sayfası">
-<!ENTITY delay.label "sonra">
-<!ENTITY delayunits.label "Saniyeler">
diff --git a/locale/tr/search-options.dtd b/locale/tr/search-options.dtd
new file mode 100644
index 0000000..46c5def
--- /dev/null
+++ b/locale/tr/search-options.dtd
@@ -0,0 +1,17 @@
+<!ENTITY title.prefwindow "Arama Ayarları">
+<!ENTITY label.searchbar_group "Arama Çubuğu">
+<!ENTITY label.clear_searchbar "Arama Çubuğunu Temizle:">
+<!ENTITY checkbox.on_submission "Aramayı gönder">
+<!ENTITY checkbox.on_searchbar_blur "Arama Çubuğu bulanıklığı">
+<!ENTITY label.delay "Gecikme:">
+<!ENTITY label.delay_units "Saniyeler">
+<!ENTITY label.reset_searchengine "Arama motorunu">
+<!ENTITY label.tabs_group "Sekmeler">
+<!ENTITY label.load_search_in "Yüklenende ara:">
+<!ENTITY label.active_tab "Aktif Sekmede">
+<!ENTITY label.new_foreground_tab "Önplandaki Sekmede">
+<!ENTITY label.new_background_tab "Yeni">
+<!ENTITY label.tab_exceptions "Yeni sekmeler için istisnalar">
+<!ENTITY checkbox.detect_blank_tab "Boş Sayfa">
+<!ENTITY checkbox.detect_home_tab "Anasayfa">
+<!ENTITY checkbox.detect_new_tab_page "Yeni sekme sayfası">
diff --git a/locale/tr/searchbar.properties b/locale/tr/searchbar.properties
index 539f8d1..a5e9cda 100644
--- a/locale/tr/searchbar.properties
+++ b/locale/tr/searchbar.properties
@@ -1 +1 @@
-searchoptions.label=Arama Ayarları...
+label.searchoptions=Arama Ayarları...
diff --git a/locale/uk-UA/amo.properties b/locale/uk-UA/amo.properties
deleted file mode 100644
index a2987ef..0000000
--- a/locale/uk-UA/amo.properties
+++ /dev/null
@@ -1,4 +0,0 @@
-addon.name=
-translator=Sappa
-description=Налаштування роботи панелі пошуку.
-summary=
diff --git a/locale/uk-UA/pref.dtd b/locale/uk-UA/pref.dtd
deleted file mode 100644
index 3a4b03d..0000000
--- a/locale/uk-UA/pref.dtd
+++ /dev/null
@@ -1,16 +0,0 @@
-<!ENTITY prefwindow.title "Параметри пошуку">
-<!ENTITY bargroup.label "Панель пошуку">
-<!ENTITY clearsearch.cbox "Очищувати панель пошуку">
-<!ENTITY resetsearch.cbox "Змінювати пошукову машину на:">
-<!ENTITY cancel.cbox "Не застосовувати, якщо панель пошуку активна.">
-<!ENTITY tabgroup.label "Вкладки">
-<!ENTITY tabcontrol.descr "Завантажувати пошук в:">
-<!ENTITY activetab.radio "Поточній вкладці">
-<!ENTITY newtab.radio "Новій вкладці">
-<!ENTITY newbgtab.radio "Новій фоновій вкладці">
-<!ENTITY detect.descr "Не створювати нову вкладку, якщо поточна:">
-<!ENTITY detectblank.cbox "Порожня сторінка">
-<!ENTITY detecthome.cbox "Домашня сторінка">
-<!ENTITY detectnewtab.cbox "нова вкладка">
-<!ENTITY delay.label "після">
-<!ENTITY delayunits.label "секунд(и).">
diff --git a/locale/uk-UA/search-options.dtd b/locale/uk-UA/search-options.dtd
new file mode 100644
index 0000000..d307707
--- /dev/null
+++ b/locale/uk-UA/search-options.dtd
@@ -0,0 +1,17 @@
+<!ENTITY title.prefwindow "Параметри пошуку">
+<!ENTITY label.searchbar_group "Панель пошуку">
+<!ENTITY label.clear_searchbar "Очищувати панель пошуку:">
+<!ENTITY checkbox.on_submission "On search submission">
+<!ENTITY checkbox.on_searchbar_blur "On searchbar blur">
+<!ENTITY label.delay "Затримка:">
+<!ENTITY label.delay_units "секунд(и).">
+<!ENTITY label.reset_searchengine "Змінювати пошукову машину на:">
+<!ENTITY label.tabs_group "Вкладки">
+<!ENTITY label.load_search_in "Завантажувати пошук в:">
+<!ENTITY label.active_tab "Поточній вкладці">
+<!ENTITY label.new_foreground_tab "Новій вкладці">
+<!ENTITY label.new_background_tab "Новій фоновій вкладці">
+<!ENTITY label.tab_exceptions "Не створювати нову вкладку, якщо поточна:">
+<!ENTITY checkbox.detect_blank_tab "Порожня сторінка">
+<!ENTITY checkbox.detect_home_tab "Домашня сторінка">
+<!ENTITY checkbox.detect_new_tab_page "нова вкладка">
diff --git a/locale/uk-UA/searchbar.properties b/locale/uk-UA/searchbar.properties
index 9cbd117..3ce9a92 100644
--- a/locale/uk-UA/searchbar.properties
+++ b/locale/uk-UA/searchbar.properties
@@ -1 +1 @@
-searchoptions.label=Параметри пошуку...
+label.searchoptions=Параметри пошуку...
diff --git a/locale/zh-CN/amo.properties b/locale/zh-CN/amo.properties
deleted file mode 100644
index 58499e6..0000000
--- a/locale/zh-CN/amo.properties
+++ /dev/null
@@ -1,4 +0,0 @@
-addon.name=SearchLoad选项
-translator=Cye3s
-description=调整搜索工具栏功能
-summary=SearchLoad选项扩展了搜索栏的功能。它可以在每次搜索后自动清除搜索栏和更改搜索引擎。它也可以在当前标签，新标签，或一个新的后台标签中打开搜索结果。
diff --git a/locale/zh-CN/pref.dtd b/locale/zh-CN/pref.dtd
deleted file mode 100644
index b112942..0000000
--- a/locale/zh-CN/pref.dtd
+++ /dev/null
@@ -1,16 +0,0 @@
-<!ENTITY prefwindow.title "搜索选项">
-<!ENTITY bargroup.label "搜索工具栏">
-<!ENTITY clearsearch.cbox "清除搜索工具栏">
-<!ENTITY resetsearch.cbox "重置搜索引擎为：">
-<!ENTITY cancel.cbox "搜索工具栏激活时取消。">
-<!ENTITY tabgroup.label "标签页">
-<!ENTITY tabcontrol.descr "载入搜索结果在：">
-<!ENTITY activetab.radio "目前标签页">
-<!ENTITY newtab.radio "新前台标签页">
-<!ENTITY newbgtab.radio "新后台标签页">
-<!ENTITY detect.descr "不新建标签页当检测到：">
-<!ENTITY detectblank.cbox "空白标签页">
-<!ENTITY detecthome.cbox "主页标签页">
-<!ENTITY detectnewtab.cbox "新建标签页面">
-<!ENTITY delay.label "延迟">
-<!ENTITY delayunits.label "秒。">
diff --git a/locale/zh-CN/search-options.dtd b/locale/zh-CN/search-options.dtd
new file mode 100644
index 0000000..1d3ac86
--- /dev/null
+++ b/locale/zh-CN/search-options.dtd
@@ -0,0 +1,17 @@
+<!ENTITY title.prefwindow "搜索选项">
+<!ENTITY label.searchbar_group "搜索工具栏">
+<!ENTITY label.clear_searchbar "清除搜索工具栏:">
+<!ENTITY checkbox.on_submission "搜索提交时">
+<!ENTITY checkbox.on_searchbar_blur "搜索栏失去焦点时">
+<!ENTITY label.delay "延迟：">
+<!ENTITY label.delay_units "秒。">
+<!ENTITY label.reset_searchengine "重置搜索引擎为：">
+<!ENTITY label.tabs_group "标签页">
+<!ENTITY label.load_search_in "载入搜索结果在：">
+<!ENTITY label.active_tab "目前标签页">
+<!ENTITY label.new_foreground_tab "新前台标签页">
+<!ENTITY label.new_background_tab "新后台标签页">
+<!ENTITY label.tab_exceptions "不新建标签页当检测到：">
+<!ENTITY checkbox.detect_blank_tab "空白标签页">
+<!ENTITY checkbox.detect_home_tab "主页标签页">
+<!ENTITY checkbox.detect_new_tab_page "新建标签页面">
diff --git a/locale/zh-CN/searchbar.properties b/locale/zh-CN/searchbar.properties
index 2e01a61..7646cc7 100644
--- a/locale/zh-CN/searchbar.properties
+++ b/locale/zh-CN/searchbar.properties
@@ -1 +1 @@
-searchoptions.label=搜索选项...
+label.searchoptions=搜索选项...
diff --git a/locale/zh-TW/amo.properties b/locale/zh-TW/amo.properties
deleted file mode 100644
index 26526db..0000000
--- a/locale/zh-TW/amo.properties
+++ /dev/null
@@ -1,4 +0,0 @@
-addon.name=SearchLoad Options
-translator=Chris Hsu
-description=調整搜尋列功能
-summary=SearchLoad Options 擴充了搜尋列的功能，
它可以在每次搜尋完成後自動清除搜尋列、變更搜尋引擎，
也可以將搜尋結果顯示在目前分頁、新的前景或背景分頁。
diff --git a/locale/zh-TW/pref.dtd b/locale/zh-TW/pref.dtd
deleted file mode 100644
index 69206f8..0000000
--- a/locale/zh-TW/pref.dtd
+++ /dev/null
@@ -1,16 +0,0 @@
-<!ENTITY prefwindow.title "搜尋列選項">
-<!ENTITY bargroup.label "搜尋列">
-<!ENTITY clearsearch.cbox "清除搜尋列">
-<!ENTITY resetsearch.cbox "搜尋完成時，將搜尋引擎設為：">
-<!ENTITY cancel.cbox "倒數終了，若搜尋列上仍有動作，則取消本次作業">
-<!ENTITY tabgroup.label "分頁">
-<!ENTITY tabcontrol.descr "載入搜尋結果到：">
-<!ENTITY activetab.radio "目前分頁">
-<!ENTITY newtab.radio "新的前景分頁">
-<!ENTITY newbgtab.radio "新的背景分頁">
-<!ENTITY detect.descr "發生以下的例外狀況時就開啟新分頁：">
-<!ENTITY detectblank.cbox "空白分頁">
-<!ENTITY detecthome.cbox "首頁分頁">
-<!ENTITY detectnewtab.cbox "新分頁頁面">
-<!ENTITY delay.label "當">
-<!ENTITY delayunits.label "秒之後">
diff --git a/locale/zh-TW/search-options.dtd b/locale/zh-TW/search-options.dtd
new file mode 100644
index 0000000..402329f
--- /dev/null
+++ b/locale/zh-TW/search-options.dtd
@@ -0,0 +1,17 @@
+<!ENTITY title.prefwindow "搜尋列選項">
+<!ENTITY label.searchbar_group "搜尋列">
+<!ENTITY label.clear_searchbar "清除搜尋列：">
+<!ENTITY checkbox.on_submission "當進行搜尋時">
+<!ENTITY checkbox.on_searchbar_blur "當搜尋列失焦時">
+<!ENTITY label.delay "延遲：">
+<!ENTITY label.delay_units "秒">
+<!ENTITY label.reset_searchengine "重設搜尋引擎為：">
+<!ENTITY label.tabs_group "分頁">
+<!ENTITY label.load_search_in "載入搜尋結果到：">
+<!ENTITY label.active_tab "目前分頁">
+<!ENTITY label.new_foreground_tab "新的前景分頁">
+<!ENTITY label.new_background_tab "新的背景分頁">
+<!ENTITY label.tab_exceptions "發生以下的例外狀況時就開啟新分頁：">
+<!ENTITY checkbox.detect_blank_tab "空白分頁">
+<!ENTITY checkbox.detect_home_tab "首頁分頁">
+<!ENTITY checkbox.detect_new_tab_page "新分頁頁面">
diff --git a/locale/zh-TW/searchbar.properties b/locale/zh-TW/searchbar.properties
index 353bc45..034348f 100644
--- a/locale/zh-TW/searchbar.properties
+++ b/locale/zh-TW/searchbar.properties
@@ -1 +1 @@
-searchoptions.label=搜尋列選項…
+label.searchoptions=搜尋列選項…
diff --git a/skin/classic/icon.png b/skin/classic/icon.png
old mode 100644
new mode 100755
diff --git a/skin/classic/menuitem-icon.png b/skin/classic/menuitem-icon.png
new file mode 100755
index 0000000..1cacf6c
Binary files /dev/null and b/skin/classic/menuitem-icon.png differ
diff --git a/skin/classic/searchpane.css b/skin/classic/search-options.css
old mode 100644
new mode 100755
similarity index 65%
rename from skin/classic/searchpane.css
rename to skin/classic/search-options.css
index 5c24dc6..b332e3e
--- a/skin/classic/searchpane.css
+++ b/skin/classic/search-options.css
@@ -11,15 +11,3 @@
display: -moz-box;
min-height: 16px;
}
-
-#engine-popup
-{
- max-width: 190px;
-}
-
-#delayedclear-input,
-#delayedreset-input
-{
- text-align: center;
- padding: 0px;
-}
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-mozext/searchload-options.git
More information about the Pkg-mozext-commits
mailing list