[Pkg-mozext-commits] [tabmixplus] 01/05: Imported Upstream version 0.4.1.3~140204a1
David Prévot
taffit at moszumanska.debian.org
Wed Feb 5 18:47:30 UTC 2014
This is an automated email from the git hooks/post-receive script.
taffit pushed a commit to branch master
in repository tabmixplus.
commit 9ba3afce8fe2d950a4c7185b79ec7521af3c7c0b
Author: David Prévot <taffit at debian.org>
Date: Wed Feb 5 13:50:51 2014 -0400
Imported Upstream version 0.4.1.3~140204a1
---
chrome/content/about.xul | 1 +
chrome/content/click/click.js | 13 ++++
chrome/content/links/contentLinks.js | 23 +++++--
chrome/content/links/userInterface.js | 1 +
chrome/content/minit/autoReload.xul | 4 +-
chrome/content/minit/tablib.js | 6 +-
chrome/content/preferences/links.xul | 3 +-
chrome/content/preferences/menu.xul | 5 +-
chrome/content/preferences/mouse.js | 4 +-
.../preferences/subdialogs/pref-appearance.xml | 4 --
chrome/content/session/session.js | 3 +-
chrome/content/tab/tab.js | 22 +++---
chrome/content/tab/tabbrowser_4.xml | 1 -
chrome/content/tabmix.js | 4 ++
chrome/locale/bg-BG/pref-appearance.dtd | 10 +--
chrome/locale/cs-CZ/pref-appearance.dtd | 10 +--
chrome/locale/cs-CZ/pref-tabmix.dtd | 6 +-
chrome/locale/de/pref-appearance.dtd | 10 +--
chrome/locale/el/pref-appearance.dtd | 10 +--
chrome/locale/en-US/pref-tabmix.dtd | 5 +-
chrome/locale/es-ES/pref-appearance.dtd | 10 +--
chrome/locale/et-EE/pref-appearance.dtd | 10 +--
chrome/locale/fr/pref-appearance.dtd | 14 ++--
chrome/locale/it/pref-appearance.dtd | 12 ++--
chrome/locale/ja/pref-appearance.dtd | 10 +--
chrome/locale/lv-LV/pref-appearance.dtd | 10 +--
chrome/locale/lv-LV/pref-tabmix.dtd | 2 +-
chrome/locale/lv-LV/tabmix.properties | 80 +++++++++++-----------
chrome/locale/nl/pref-appearance.dtd | 2 +-
chrome/locale/pl/pref-appearance.dtd | 10 +--
chrome/locale/pl/tabmix.dtd | 2 +-
chrome/locale/pt-BR/pref-appearance.dtd | 10 +--
chrome/locale/ro/pref-appearance.dtd | 12 ++--
chrome/locale/ru-RU/pref-appearance.dtd | 10 +--
chrome/locale/sk-SK/pref-appearance.dtd | 10 +--
chrome/locale/sr/pref-appearance.dtd | 10 +--
chrome/locale/zh-CN/pref-appearance.dtd | 10 +--
chrome/locale/zh-TW/pref-appearance.dtd | 10 +--
chrome/skin/app_version/4.0/general.css | 12 ++--
chrome/skin/preferences.css | 4 ++
defaults/preferences/tabmix.js | 2 +
install.rdf | 4 +-
modules/AutoReload.jsm | 4 +-
modules/Services.jsm | 12 +++-
44 files changed, 233 insertions(+), 184 deletions(-)
diff --git a/chrome/content/about.xul b/chrome/content/about.xul
index 25fbb75..0ce0296 100644
--- a/chrome/content/about.xul
+++ b/chrome/content/about.xul
@@ -85,6 +85,7 @@
<label id="extensionContributors" class="sectionTitle">&contributors.label;</label>
<vbox flex="1" id="contributorsBox" class="boxIndent">
+ <label value="Makondo (Forum moderator, troubleshooting and more...)" flex="1" crop="end" class="contributor"/>
<label value="Bruce Wittmeier (Help page)" flex="1" crop="end" class="contributor"/>
<label value="SUN Chun-Yen" class="contributor" />
<label value="Piotr Sielski [graphics]" class="contributor" />
diff --git a/chrome/content/click/click.js b/chrome/content/click/click.js
index 98d4093..3fa6397 100644
--- a/chrome/content/click/click.js
+++ b/chrome/content/click/click.js
@@ -299,6 +299,19 @@ var TabmixContext = {
undoCloseTabMenu.setAttribute("singletablabel", undoCloseTabMenu.label);
undoCloseTabMenu.setAttribute("multipletablabel", multipletablabel);
}
+
+ if (Tabmix.prefs.getBoolPref("showTabContextMenuOnTabbar"))
+ this.updateTabbarContextMenu(true);
+ },
+
+ updateTabbarContextMenu: function(show) {
+ let tabBar = gBrowser.tabContainer;
+ if (show) {
+ this._originalTabbarContextMenu = tabBar.getAttribute("context");
+ tabBar.setAttribute("context", gBrowser.tabContextMenu.id);
+ }
+ else
+ Tabmix.setItem(tabBar, "context", this._originalTabbarContextMenu || null);
},
toggleEventListener: function(enable) {
diff --git a/chrome/content/links/contentLinks.js b/chrome/content/links/contentLinks.js
index 6ce9e4a..94d9a1e 100644
--- a/chrome/content/links/contentLinks.js
+++ b/chrome/content/links/contentLinks.js
@@ -78,7 +78,7 @@ Tabmix.contentAreaClick = {
' event.__where = where == "current" && href.indexOf("custombutton://") != 0 ? " " + where : where;' +
' event.__suppressTabsOnFileDownload = suppressTabsOnFileDownload;' +
' var result = $&' +
- ' if (targetAttr == "_new" && !result) Tabmix.contentAreaClick.selectExistingTab(href);'
+ ' if (targetAttr && !result) setTimeout(function(){Tabmix.contentAreaClick.selectExistingTab(href, targetAttr);},300);'
).toCode();
/* don't change where if it is save, window, or we passed
@@ -672,13 +672,25 @@ Tabmix.contentAreaClick = {
/**
* @brief Checks to see if handleLinkClick reload an existing tab without
- * focusing it for linke with target "_new".
- *
+ * focusing it for link with target. Search in the browser content
+ * and its frames for content with matching name and href
*/
- selectExistingTab: function TMP_selectExistingTab(href) {
+ selectExistingTab: function TMP_selectExistingTab(href, targetFrame) {
if (Tabmix.prefs.getIntPref("opentabforLinks") != 0 ||
Services.prefs.getBoolPref("browser.tabs.loadInBackground"))
return;
+
+ function isCurrent(content) {
+ if (content.location.href == href && content.name == targetFrame)
+ return true;
+ for (let i = 0; i < content.frames.length; i++) {
+ let frame = content.frames[i];
+ if (frame.location.href == href && frame.name == targetFrame)
+ return true;
+ }
+ return false;
+ }
+
function switchIfURIInWindow(aWindow) {
// Only switch to the tab if both source and desination are
// private or non-private.
@@ -692,8 +704,7 @@ Tabmix.contentAreaClick = {
let browsers = aWindow.gBrowser.browsers;
for (let i = 0; i < browsers.length; i++) {
let browser = browsers[i];
- if (browser.currentURI.spec == href &&
- browser.contentWindow.name == "_new") {
+ if (isCurrent(browser.contentWindow)) {
gURLBar.handleRevert();
// Focus the matching window & tab
aWindow.focus();
diff --git a/chrome/content/links/userInterface.js b/chrome/content/links/userInterface.js
index 7992e21..2194245 100644
--- a/chrome/content/links/userInterface.js
+++ b/chrome/content/links/userInterface.js
@@ -363,6 +363,7 @@ Tabmix.restoreTabState = function TMP_restoreTabState(aTab) {
aTab.removeAttribute("maxwidth");
}
+Tabmix.tabStyles = {}
Tabmix.setTabStyle = function(aTab, boldChanged) {
if (!aTab)
return;
diff --git a/chrome/content/minit/autoReload.xul b/chrome/content/minit/autoReload.xul
index fdad9ca..06b8c10 100644
--- a/chrome/content/minit/autoReload.xul
+++ b/chrome/content/minit/autoReload.xul
@@ -31,8 +31,8 @@ function accept() {
gPref.setIntPref("extensions.tabmix.reload_time", customReloadTime);
var list = gPref.getCharPref("extensions.tabmix.custom_reload_list");
list = list ? list.split(",") : [];
- let defaulList = [30,60,120,300,900,1800];
- if (list.concat(defaulList).indexOf(customReloadTime) == -1) {
+ let defaultList = [30,60,120,300,900,1800];
+ if (list.concat(defaultList).indexOf(customReloadTime) == -1) {
list.push(customReloadTime);
if (list.length > 6 )
list.shift();
diff --git a/chrome/content/minit/tablib.js b/chrome/content/minit/tablib.js
index f96cb34..b91c980 100644
--- a/chrome/content/minit/tablib.js
+++ b/chrome/content/minit/tablib.js
@@ -1438,7 +1438,11 @@ var tablib = {
var message, chkBoxLabel;
if (shouldPrompt == 1 || numProtected == 0) {
- message = bundle.getFormattedString("tabs.closeWarningMultipleTabs", [tabsToClose]);
+ if (Tabmix.isVersion(290))
+ message = PluralForm.get(tabsToClose, bundle.getString("tabs.closeWarningMultiple"))
+ .replace("#1", tabsToClose);
+ else
+ message = bundle.getFormattedString("tabs.closeWarningMultipleTabs", [tabsToClose]);
chkBoxLabel = shouldPrompt == 1 ? bundle.getString("tabs.closeWarningPromptMe") :
TabmixSvc.getString("window.closeWarning.1");
}
diff --git a/chrome/content/preferences/links.xul b/chrome/content/preferences/links.xul
index b2ccdab..9681b2b 100644
--- a/chrome/content/preferences/links.xul
+++ b/chrome/content/preferences/links.xul
@@ -65,7 +65,7 @@
</hbox>
<hbox align="center">
<!-- Open only these JavaScript popups in new tabs: All Popups, Popups That Create resized Windows, No Popups. -->
- <label flex="1" value="&divertedWindowOpen.label;" control="divertedWindowOpen" tooltiptext="&divertedWindows.comment;"/>
+ <label flex="1" value="&divertedWindowOpen.label;" control="divertedWindowOpen"/>
<menulist id="divertedWindowOpen" preference="pref_divertedWindowOpen">
<menupopup>
<menuitem value="0" label="&divertedWindowOpen.all;"/>
@@ -74,7 +74,6 @@
</menupopup>
</menulist>
</hbox>
- <description>&divertedWindows.comment;</description>
<separator/>
<!-- Force link with target attribute to open in current tab -->
<checkbox_tmp id="linkTarget" label="&linkTarget.label;" preference="pref_linkTarget"/>
diff --git a/chrome/content/preferences/menu.xul b/chrome/content/preferences/menu.xul
index 70275b1..f95695a 100644
--- a/chrome/content/preferences/menu.xul
+++ b/chrome/content/preferences/menu.xul
@@ -26,6 +26,8 @@
<preferences>
<preference id="pref_menu" name="extensions.tabmix.menu.selectedTabIndex"
type="int"/>
+ <preference id="pref_showOnTabbar" name="extensions.tabmix.showTabContextMenuOnTabbar"
+ type="bool"/>
<preference id="pref_showMoveToGroup" name="extensions.tabmix.moveToGroup" type="bool"/>
<preference id="pref_showNewTab" name="extensions.tabmix.newTabMenu" type="bool"/>
<preference id="pref_showDuplicate" name="extensions.tabmix.duplicateMenu" type="bool"/>
@@ -99,8 +101,9 @@
<tab label="&context.tools;" class="subtabs" helpTopic="Menu_-_Tools_Menu"/>
<tab label="&shortcuts.label;" class="subtabs" helpTopic="Menu_-_Shortcuts"/>
</tabs>
- <tabpanels>
+ <tabpanels class="menu">
<tabpanel>
+ <checkbox_tmp id="showOnTabbar" label="Show Tab Context Menu on tabbar" preference="pref_showOnTabbar"/>
<groupbox flex="1">
<caption label="&showtabBarContext.label;"/>
<grid flex="1" style="overflow: auto; height:18em;">
diff --git a/chrome/content/preferences/mouse.js b/chrome/content/preferences/mouse.js
index 1815dc2..eb7afe6 100644
--- a/chrome/content/preferences/mouse.js
+++ b/chrome/content/preferences/mouse.js
@@ -14,13 +14,11 @@ var gMousePane = {
$("ClickTabPinTab").label = gPrefWindow.pinTabLabel;
- var browserWindow = Tabmix.getTopWin();
-
// Init tabclicking options
this.clickTab = $("ClickTab");
var menuPopup = this.clickTab.firstChild;
// block item in tabclicking options that are not in use
- var blocked = browserWindow.gTMPprefObserver.blockedValues;
+ var blocked = TabmixSvc.blockedClickingOptions;
for (let i = 0; i < blocked.length; i++) {
let item = menuPopup.getElementsByAttribute("value", blocked[i])[0];
item.hidden = true;
diff --git a/chrome/content/preferences/subdialogs/pref-appearance.xml b/chrome/content/preferences/subdialogs/pref-appearance.xml
index 40771eb..810c9e4 100644
--- a/chrome/content/preferences/subdialogs/pref-appearance.xml
+++ b/chrome/content/preferences/subdialogs/pref-appearance.xml
@@ -294,10 +294,6 @@
</implementation>
<handlers>
- <handler event="command"><![CDATA[
- event.stopPropagation();
- ]]></handler>
-
<handler event="change"><![CDATA[
let item = event.originalTarget;
if (item.localName == "colorpicker") {
diff --git a/chrome/content/session/session.js b/chrome/content/session/session.js
index 662584e..5f2ade3 100644
--- a/chrome/content/session/session.js
+++ b/chrome/content/session/session.js
@@ -399,9 +399,10 @@ var TabmixSessionManager = {
// If sessionStore restore the session after restart we do not need to do anything
// when all tabs are pinned, session resore add the home page on restart
// prepare history sessions
+ var crashed;
if (Tabmix.firstWindowInSession && !this.globalPrivateBrowsing &&
!sanitized && !Tabmix.isWindowAfterSessionRestore) {
- let status, crashed;
+ let status;
if (this.enableBackup) {
let path = this._rdfRoot + "/closedSession/thisSession";
status = TabmixSvc.sm.status = this.getLiteralValue(path, "status");
diff --git a/chrome/content/tab/tab.js b/chrome/content/tab/tab.js
index 315186e..c0233cd 100644
--- a/chrome/content/tab/tab.js
+++ b/chrome/content/tab/tab.js
@@ -905,6 +905,9 @@ var gTMPprefObserver = {
case "layout.css.devPixelsPerPx":
setTimeout(function(self) {self.setBgMiddleMargin();},0, this);
break;
+ case "extensions.tabmix.showTabContextMenuOnTabbar":
+ TabmixContext.updateTabbarContextMenu(Services.prefs.getBoolPref(prefName));
+ break;
default:
break;
}
@@ -1052,20 +1055,20 @@ var gTMPprefObserver = {
miscellaneousRules: function TMP_PO_miscellaneousRules() {
// height shrink to actual size when the tabbar is in display: block (multi-row)
- let newHeight = gBrowser.tabContainer.visibleTabsFirstChild.getBoundingClientRect().height;
let newRule = '#TabsToolbar[tabmix-show-newtabbutton*="aftertabs"] >' +
'#tabbrowser-tabs:not([overflow="true"]) > .tabbrowser-arrowscrollbox[flowing="multibar"]' +
- ' > .tabs-newtab-button[command="cmd_newNavigatorTab"] {height: #px;}'.replace("#", newHeight);
+ ' > .tabs-newtab-button[command="cmd_newNavigatorTab"] {height: #px;}'.replace("#", Tabmix._buttonsHeight);
this.insertRule(newRule);
if (TabmixSvc.isMac && !TabmixSvc.australis)
- newHeight = 24;
+ Tabmix._buttonsHeight = 24;
let newRule = '#TabsToolbar[multibar] > .toolbarbutton-1,' +
'#tabmixScrollBox[flowing=multibar] > toolbarbutton,' +
'#TabsToolbar[multibar] > #tabs-closebutton {' +
- ' height: #px;}'.replace("#", newHeight);
+ ' height: #px;}'.replace("#", Tabmix._buttonsHeight);
this.insertRule(newRule);
+ delete Tabmix._buttonsHeight;
// we don't show icons on menu on Mac OS X
if (TabmixSvc.isMac)
@@ -1776,16 +1779,17 @@ try {
})
// block item in tabclicking options that are not in use
- this.blockedValues = [];
+ var blockedValues = [];
if (!("SessionSaver" in window && window.SessionSaver.snapBackTab))
- this.blockedValues.push(12);
+ blockedValues.push(12);
var isIE = ("IeView" in window && window.IeView.ieViewLaunch) ||
(Tabmix.extensions.gIeTab && window[Tabmix.extensions.gIeTab.obj].switchTabEngine) ||
("ieview" in window && window.ieview.launch);
if (!isIE)
- this.blockedValues.push(21);
+ blockedValues.push(21);
if (!document.getElementById("Browser:BookmarkAllTabs"))
- this.blockedValues.push(26);
+ blockedValues.push(26);
+ TabmixSvc.blockedClickingOptions = blockedValues;
this.updateTabClickingOptions();
// capture gfx.direct2d.disabled value on first window
@@ -1804,7 +1808,7 @@ try {
},
blockTabClickingOptions: function(prefName) {
- if (this.blockedValues.indexOf(Services.prefs.getIntPref(prefName)) > -1) {
+ if (TabmixSvc.blockedClickingOptions.indexOf(Services.prefs.getIntPref(prefName)) > -1) {
if (Services.prefs.prefHasUserValue(prefName))
Services.prefs.clearUserPref(prefName);
else
diff --git a/chrome/content/tab/tabbrowser_4.xml b/chrome/content/tab/tabbrowser_4.xml
index 7d45cd1..4c4d7c9 100644
--- a/chrome/content/tab/tabbrowser_4.xml
+++ b/chrome/content/tab/tabbrowser_4.xml
@@ -433,7 +433,6 @@
let tab = this.firstChild;
tab.setAttribute("tabmix_selectedID", Tabmix._nextSelectedID++);
tab.setAttribute("visited", true);
- Tabmix.tabStyles = {};
Tabmix.setTabStyle(tab);
TabmixTabbar.lockallTabs = Tabmix.prefs.getBoolPref("lockallTabs");
if (TabmixTabbar.lockallTabs) {
diff --git a/chrome/content/tabmix.js b/chrome/content/tabmix.js
index 6833678..3b45a58 100644
--- a/chrome/content/tabmix.js
+++ b/chrome/content/tabmix.js
@@ -139,6 +139,10 @@ Tabmix.getAfterTabsButtonsWidth = function TMP_getAfterTabsButtonsWidth() {
if (openNewPrivateTabRect.right > openNewTabRect.right)
this.tabsNewtabButton = openNewPrivateTab;
}
+ // we call gTMPprefObserver.miscellaneousRules to add some dynamic rules
+ // from Tabmix.delayedStartup
+ Tabmix._buttonsHeight =
+ tabBar.visibleTabsFirstChild.getBoundingClientRect().height;
this.setItem(tabsToolbar, "tabmix-show-newtabbutton", showButton);
if (stripIsHidden)
diff --git a/chrome/locale/bg-BG/pref-appearance.dtd b/chrome/locale/bg-BG/pref-appearance.dtd
index 091a1e3..65f0512 100644
--- a/chrome/locale/bg-BG/pref-appearance.dtd
+++ b/chrome/locale/bg-BG/pref-appearance.dtd
@@ -2,17 +2,17 @@
<!ENTITY currentTab.label "Текущ подпрозорец">
<!ENTITY unloadedTabs.label "Незаредени подпрозорци">
<!ENTITY unreadTab.label "Непрочетени подпрозорци">
-<!ENTITY hideRGB.label "Hide RGB">
-<!ENTITY showRGB.label "Show RGB">
+<!ENTITY hideRGB.label "Скриване на RGB">
+<!ENTITY showRGB.label "Показване на RGB">
<!ENTITY unreadAfterReload.label "след презареждане, подпрозорецът да се маркира като непрочетен">
-<!ENTITY squaredTabs.label "Apply background color for squared tabs">
+<!ENTITY squaredTabs.label "Стилът на фона да се приложи върху квадратни подпрозорци">
<!ENTITY otherTabs.label "Други подпрозорци">
<!ENTITY italic.label "Курсив">
<!ENTITY bold.label "Удебелен">
<!ENTITY underline.label "Подчертан">
<!ENTITY textcolor.label "Цвят на текста">
<!ENTITY bgColor.label "Цвят на фона">
-<!ENTITY bgTopColor.label "top">
-<!ENTITY bgBottomColor.label "bottom">
+<!ENTITY bgTopColor.label "отгоре">
+<!ENTITY bgBottomColor.label "отдолу">
<!ENTITY useThis.label "Използване на стил за">
<!ENTITY opacity.label "непрозрачност">
diff --git a/chrome/locale/cs-CZ/pref-appearance.dtd b/chrome/locale/cs-CZ/pref-appearance.dtd
index d7de7a6..8b61e2d 100644
--- a/chrome/locale/cs-CZ/pref-appearance.dtd
+++ b/chrome/locale/cs-CZ/pref-appearance.dtd
@@ -2,17 +2,17 @@
<!ENTITY currentTab.label "Současný panel">
<!ENTITY unloadedTabs.label "Nenačtené panely">
<!ENTITY unreadTab.label "Nepřečtené panely">
-<!ENTITY hideRGB.label "Hide RGB">
-<!ENTITY showRGB.label "Show RGB">
+<!ENTITY hideRGB.label "Skrýt RGB">
+<!ENTITY showRGB.label "Zobrazit RGB">
<!ENTITY unreadAfterReload.label "Po opětovném načtení stránky nastavit panel jako nepřečtený">
-<!ENTITY squaredTabs.label "Apply background color for squared tabs">
+<!ENTITY squaredTabs.label "Použít barvu pozadí na čtvercové panely">
<!ENTITY otherTabs.label "Ostatní panely">
<!ENTITY italic.label "Kurzíva">
<!ENTITY bold.label "Tučně">
<!ENTITY underline.label "Podtrhnout">
<!ENTITY textcolor.label "Barva textu">
<!ENTITY bgColor.label "Barva pozadí">
-<!ENTITY bgTopColor.label "top">
-<!ENTITY bgBottomColor.label "bottom">
+<!ENTITY bgTopColor.label "nahoru">
+<!ENTITY bgBottomColor.label "dolů">
<!ENTITY useThis.label "použít tento styl pro">
<!ENTITY opacity.label "neprůhlednost">
diff --git a/chrome/locale/cs-CZ/pref-tabmix.dtd b/chrome/locale/cs-CZ/pref-tabmix.dtd
index 8da57ed..39c0550 100644
--- a/chrome/locale/cs-CZ/pref-tabmix.dtd
+++ b/chrome/locale/cs-CZ/pref-tabmix.dtd
@@ -43,7 +43,7 @@
<!ENTITY newtab.current "Současná stránka">
<!ENTITY newtab.duplicate "Duplikovaná stránka">
<!ENTITY newtab.location.1 "Stránka nového panelu">
-<!ENTITY newtab.placeholder.label "Default New Tab Page">
+<!ENTITY newtab.placeholder.label "Výchozí stránka nového panelu">
<!ENTITY location.label.1 "Adresa">
<!ENTITY focusContent.label "Přepnout na obsah při načítání neprázdné stránky">
<!ENTITY openTabNext.label "Otevřít nové panely vedle současného panelu">
@@ -210,8 +210,8 @@
<!ENTITY ontabbar.label "na lištu panelů:">
<!ENTITY clicktab.label "Vyberte příkaz, který se má provést při poklepání na panel nebo lištu panelů">
<!ENTITY ontabbar.dblClick.label "Při dvojím poklikání na lištu s panely nezměnit velikost okna.">
-<!ENTITY ontabbar.click.label "Prevent clicking on Tab-bar from draging the window.">
-<!ENTITY clicktab.default "Firefox default or other extension">
+<!ENTITY ontabbar.click.label "Při kliknutí na lištu s panely okno nepřesunout.">
+<!ENTITY clicktab.default "Výchozí nastavení Firefoxu nebo jiné rozšíření">
<!ENTITY clicktab.nothing "Bez akce">
<!ENTITY clicktab.addtab "Otevřít nový panel">
<!ENTITY clicktab.duplicatetab "Duplikovat panel">
diff --git a/chrome/locale/de/pref-appearance.dtd b/chrome/locale/de/pref-appearance.dtd
index 4f9f4ee..bba2733 100644
--- a/chrome/locale/de/pref-appearance.dtd
+++ b/chrome/locale/de/pref-appearance.dtd
@@ -2,17 +2,17 @@
<!ENTITY currentTab.label "Aktiver Tab">
<!ENTITY unloadedTabs.label "Nichtgeladene Tabs">
<!ENTITY unreadTab.label "Ungelesene Tabs">
-<!ENTITY hideRGB.label "Hide RGB">
-<!ENTITY showRGB.label "Show RGB">
+<!ENTITY hideRGB.label "RGB ausblenden">
+<!ENTITY showRGB.label "RGB anzeigen">
<!ENTITY unreadAfterReload.label "Tab nach dem Neu-laden, als ungelesen markieren">
-<!ENTITY squaredTabs.label "Apply background color for squared tabs">
+<!ENTITY squaredTabs.label "Hintergrundfarbe für rechteckige Tabs anwenden">
<!ENTITY otherTabs.label "Andere Tabs">
<!ENTITY italic.label "Kursiv">
<!ENTITY bold.label "Fett">
<!ENTITY underline.label "Unterstrichen">
<!ENTITY textcolor.label "Textfarbe">
<!ENTITY bgColor.label "Hintergrundfarbe">
-<!ENTITY bgTopColor.label "top">
-<!ENTITY bgBottomColor.label "bottom">
+<!ENTITY bgTopColor.label "oben">
+<!ENTITY bgBottomColor.label "unten">
<!ENTITY useThis.label "Diesen Stil verwenden für">
<!ENTITY opacity.label "Deckkraft">
diff --git a/chrome/locale/el/pref-appearance.dtd b/chrome/locale/el/pref-appearance.dtd
index 245ad51..4ea6760 100644
--- a/chrome/locale/el/pref-appearance.dtd
+++ b/chrome/locale/el/pref-appearance.dtd
@@ -2,17 +2,17 @@
<!ENTITY currentTab.label "Τρέχουσα καρτέλα">
<!ENTITY unloadedTabs.label "Μη φορτωμένες καρτέλες">
<!ENTITY unreadTab.label "Μη αναγνωσμένες καρτέλες">
-<!ENTITY hideRGB.label "Hide RGB">
-<!ENTITY showRGB.label "Show RGB">
+<!ENTITY hideRGB.label "Απόκρυψη RGB">
+<!ENTITY showRGB.label "Προβολή RGB">
<!ENTITY unreadAfterReload.label "Ορισμός καρτέλας ως μη αναγνωσμένης μετά την ανανέωση">
-<!ENTITY squaredTabs.label "Apply background color for squared tabs">
+<!ENTITY squaredTabs.label "Εφαρμογή χρώματος παρασκηνίου σε τετραγωνισμένες καρτέλες">
<!ENTITY otherTabs.label "Άλλες καρτέλες">
<!ENTITY italic.label "Πλάγια">
<!ENTITY bold.label "Έντονα">
<!ENTITY underline.label "Υπογεγραμμένα">
<!ENTITY textcolor.label "Χρώμα κειμένου">
<!ENTITY bgColor.label "Χρώμα φόντου">
-<!ENTITY bgTopColor.label "top">
-<!ENTITY bgBottomColor.label "bottom">
+<!ENTITY bgTopColor.label "Κορυφή">
+<!ENTITY bgBottomColor.label "Βάση">
<!ENTITY useThis.label "Χρήση αυτού του στυλ για">
<!ENTITY opacity.label "διαφάνεια">
diff --git a/chrome/locale/en-US/pref-tabmix.dtd b/chrome/locale/en-US/pref-tabmix.dtd
index f899e05..694d11b 100644
--- a/chrome/locale/en-US/pref-tabmix.dtd
+++ b/chrome/locale/en-US/pref-tabmix.dtd
@@ -18,10 +18,9 @@
<!ENTITY linkTarget.current "Current Tab">
<!ENTITY linkTarget.accesskey "C">
<!ENTITY divertedWindowOpen.label "JavaScript & Popup restriction:">
-<!ENTITY divertedWindows.comment "More Javascript & Popup preferences are controlled from main Options">
<!ENTITY divertedWindowOpen.all "Open all popups in tabs">
-<!ENTITY divertedWindowOpen.some "Allow resized popups">
-<!ENTITY divertedWindowOpen.none "Allow all popups">
+<!ENTITY divertedWindowOpen.some "Allows resized popups">
+<!ENTITY divertedWindowOpen.none "Allows all popups">
<!ENTITY linkTarget.label "Open links with a target attribute in current tab">
<!ENTITY download.label "Prevent blank tabs when downloading files">
<!ENTITY edit.label "Edit">
diff --git a/chrome/locale/es-ES/pref-appearance.dtd b/chrome/locale/es-ES/pref-appearance.dtd
index 39b40bd..063435b 100644
--- a/chrome/locale/es-ES/pref-appearance.dtd
+++ b/chrome/locale/es-ES/pref-appearance.dtd
@@ -2,17 +2,17 @@
<!ENTITY currentTab.label "Pestaña seleccionada">
<!ENTITY unloadedTabs.label "Pestañas no cargadas">
<!ENTITY unreadTab.label "Pestañas no leídas">
-<!ENTITY hideRGB.label "Hide RGB">
-<!ENTITY showRGB.label "Show RGB">
+<!ENTITY hideRGB.label "Ocultar RGB">
+<!ENTITY showRGB.label "Mostrar RGB">
<!ENTITY unreadAfterReload.label "establecer como no leída tras recargar">
-<!ENTITY squaredTabs.label "Apply background color for squared tabs">
+<!ENTITY squaredTabs.label "Aplicar color de fondo a pestañas cuadradas">
<!ENTITY otherTabs.label "Otras pestañas">
<!ENTITY italic.label "Cursiva">
<!ENTITY bold.label "Negrita">
<!ENTITY underline.label "Subrayado">
<!ENTITY textcolor.label "Color texto">
<!ENTITY bgColor.label "Color fondo">
-<!ENTITY bgTopColor.label "top">
-<!ENTITY bgBottomColor.label "bottom">
+<!ENTITY bgTopColor.label "arriba">
+<!ENTITY bgBottomColor.label "abajo">
<!ENTITY useThis.label "usar este estilo para">
<!ENTITY opacity.label "opacidad">
diff --git a/chrome/locale/et-EE/pref-appearance.dtd b/chrome/locale/et-EE/pref-appearance.dtd
index c3c63c9..09725ee 100644
--- a/chrome/locale/et-EE/pref-appearance.dtd
+++ b/chrome/locale/et-EE/pref-appearance.dtd
@@ -2,17 +2,17 @@
<!ENTITY currentTab.label "Praegune kaart">
<!ENTITY unloadedTabs.label "Laadimata kaardid">
<!ENTITY unreadTab.label "Lugemata kaardid">
-<!ENTITY hideRGB.label "Hide RGB">
-<!ENTITY showRGB.label "Show RGB">
+<!ENTITY hideRGB.label "Peida RGB-mudeli osavärvid">
+<!ENTITY showRGB.label "Näita RGB-mudeli osavärve">
<!ENTITY unreadAfterReload.label "pärast uuestilaadimist muuda kaart lugemata kaardiks">
-<!ENTITY squaredTabs.label "Apply background color for squared tabs">
+<!ENTITY squaredTabs.label "Rakenda taustavärvi kandilistele kaartidele">
<!ENTITY otherTabs.label "Teised kaardid">
<!ENTITY italic.label "Kaldkiri">
<!ENTITY bold.label "Paks">
<!ENTITY underline.label "Allajoonitud">
<!ENTITY textcolor.label "Teksti värv">
<!ENTITY bgColor.label "Taustavärv">
-<!ENTITY bgTopColor.label "top">
-<!ENTITY bgBottomColor.label "bottom">
+<!ENTITY bgTopColor.label "üleval">
+<!ENTITY bgBottomColor.label "all">
<!ENTITY useThis.label "kasuta seda stiili nende puhul">
<!ENTITY opacity.label "läbipaistmatus">
diff --git a/chrome/locale/fr/pref-appearance.dtd b/chrome/locale/fr/pref-appearance.dtd
index 13dc000..b0f7e21 100644
--- a/chrome/locale/fr/pref-appearance.dtd
+++ b/chrome/locale/fr/pref-appearance.dtd
@@ -2,17 +2,17 @@
<!ENTITY currentTab.label "Onglet courant">
<!ENTITY unloadedTabs.label "Onglets non chargés">
<!ENTITY unreadTab.label "Onglets non lus">
-<!ENTITY hideRGB.label "Hide RGB">
-<!ENTITY showRGB.label "Show RGB">
+<!ENTITY hideRGB.label "Masquer codes RVB">
+<!ENTITY showRGB.label "Afficher codes RVB">
<!ENTITY unreadAfterReload.label "Marquer l'onglet comme non lu après rechargement">
-<!ENTITY squaredTabs.label "Apply background color for squared tabs">
+<!ENTITY squaredTabs.label "Appliquer la couleur d'arrière-plan sur les onglets rectangulaires">
<!ENTITY otherTabs.label "Autres onglets">
<!ENTITY italic.label "Italique">
<!ENTITY bold.label "Gras">
<!ENTITY underline.label "Souligné">
<!ENTITY textcolor.label "Couleur du texte">
-<!ENTITY bgColor.label "Couleur d'arrière-plan">
-<!ENTITY bgTopColor.label "top">
-<!ENTITY bgBottomColor.label "bottom">
+<!ENTITY bgColor.label "Couleur d'arrière-plan">
+<!ENTITY bgTopColor.label "en haut">
+<!ENTITY bgBottomColor.label "en bas">
<!ENTITY useThis.label "utiliser ce style pour">
-<!ENTITY opacity.label "l'opacité">
+<!ENTITY opacity.label "l'opacité">
diff --git a/chrome/locale/it/pref-appearance.dtd b/chrome/locale/it/pref-appearance.dtd
index 728dc53..9624112 100644
--- a/chrome/locale/it/pref-appearance.dtd
+++ b/chrome/locale/it/pref-appearance.dtd
@@ -2,17 +2,17 @@
<!ENTITY currentTab.label "Scheda attuale">
<!ENTITY unloadedTabs.label "Schede non caricate">
<!ENTITY unreadTab.label "Schede non lette">
-<!ENTITY hideRGB.label "Hide RGB">
-<!ENTITY showRGB.label "Show RGB">
+<!ENTITY hideRGB.label "Nascondi i valori RGB">
+<!ENTITY showRGB.label "Mostra i valori RGB">
<!ENTITY unreadAfterReload.label "Imposta le schede come non lette dopo averle ricaricate">
-<!ENTITY squaredTabs.label "Apply background color for squared tabs">
+<!ENTITY squaredTabs.label "Applica il colore di sfondo alle schede squadrate">
<!ENTITY otherTabs.label "Altre schede">
<!ENTITY italic.label "Corsivo">
<!ENTITY bold.label "Grassetto">
<!ENTITY underline.label "Sottolineato">
<!ENTITY textcolor.label "Colore del testo">
<!ENTITY bgColor.label "Colore di sfondo">
-<!ENTITY bgTopColor.label "top">
-<!ENTITY bgBottomColor.label "bottom">
+<!ENTITY bgTopColor.label "In cima">
+<!ENTITY bgBottomColor.label "In fondo">
<!ENTITY useThis.label "Utilizza questo stile per">
-<!ENTITY opacity.label "Opacità ">
+<!ENTITY opacity.label "Opacità">
diff --git a/chrome/locale/ja/pref-appearance.dtd b/chrome/locale/ja/pref-appearance.dtd
index f224153..975ec11 100644
--- a/chrome/locale/ja/pref-appearance.dtd
+++ b/chrome/locale/ja/pref-appearance.dtd
@@ -2,17 +2,17 @@
<!ENTITY currentTab.label "現在のタブ">
<!ENTITY unloadedTabs.label "未読込のタブ">
<!ENTITY unreadTab.label "未読のタブ">
-<!ENTITY hideRGB.label "Hide RGB">
-<!ENTITY showRGB.label "Show RGB">
+<!ENTITY hideRGB.label "RGB を表示しない">
+<!ENTITY showRGB.label "RGB を表示する">
<!ENTITY unreadAfterReload.label "再読み込み後はタブを未読にする">
-<!ENTITY squaredTabs.label "Apply background color for squared tabs">
+<!ENTITY squaredTabs.label "タブの背景色を設定する">
<!ENTITY otherTabs.label "他のタブ">
<!ENTITY italic.label "イタリック">
<!ENTITY bold.label "太字">
<!ENTITY underline.label "下線">
<!ENTITY textcolor.label "文字色">
<!ENTITY bgColor.label "背景色">
-<!ENTITY bgTopColor.label "top">
-<!ENTITY bgBottomColor.label "bottom">
+<!ENTITY bgTopColor.label "上">
+<!ENTITY bgBottomColor.label "下">
<!ENTITY useThis.label "以下のスタイルを使用 設定対象">
<!ENTITY opacity.label "不透明度">
diff --git a/chrome/locale/lv-LV/pref-appearance.dtd b/chrome/locale/lv-LV/pref-appearance.dtd
index f5b2060..ac69b16 100644
--- a/chrome/locale/lv-LV/pref-appearance.dtd
+++ b/chrome/locale/lv-LV/pref-appearance.dtd
@@ -2,17 +2,17 @@
<!ENTITY currentTab.label "Pašreizējā cilne">
<!ENTITY unloadedTabs.label "Neielādētās cilnes">
<!ENTITY unreadTab.label "Nelasītās cilnes">
-<!ENTITY hideRGB.label "Hide RGB">
-<!ENTITY showRGB.label "Show RGB">
+<!ENTITY hideRGB.label "Paslēpt RGB">
+<!ENTITY showRGB.label "Rādīt RGB">
<!ENTITY unreadAfterReload.label "pēc pārlādēšanas iestatīt cilni kā nelasītu">
-<!ENTITY squaredTabs.label "Apply background color for squared tabs">
+<!ENTITY squaredTabs.label "Pielietot fona krāsu kvadrātveida cilnēm">
<!ENTITY otherTabs.label "Citas cilnes">
<!ENTITY italic.label "Slīpraksts">
<!ENTITY bold.label "Treknraksts">
<!ENTITY underline.label "Pasvītrots">
<!ENTITY textcolor.label "Teksta krāsa">
<!ENTITY bgColor.label "Fona krāsa">
-<!ENTITY bgTopColor.label "top">
-<!ENTITY bgBottomColor.label "bottom">
+<!ENTITY bgTopColor.label "augša">
+<!ENTITY bgBottomColor.label "apakša">
<!ENTITY useThis.label "izmantot šo stilu priekš">
<!ENTITY opacity.label "caurspīdība">
diff --git a/chrome/locale/lv-LV/pref-tabmix.dtd b/chrome/locale/lv-LV/pref-tabmix.dtd
index d40ec79..226dfcb 100644
--- a/chrome/locale/lv-LV/pref-tabmix.dtd
+++ b/chrome/locale/lv-LV/pref-tabmix.dtd
@@ -240,7 +240,7 @@
<!ENTITY clicktab.removetoRight "Aizvērt cilnes pa labi">
<!ENTITY clicktab.uctab "Atkārtoti atvērt pēdējo aizvērto cilni">
<!ENTITY clicktab.ucatab "Atkārtoti atvērt visas aizvērtās cilnes">
-<!ENTITY clicktab.snapback "SnapBack Tab">
+<!ENTITY clicktab.snapback "SnapBack cilne">
<!ENTITY clicktab.ietab "Atver cilni pārlūkā IE">
<!ENTITY contentLoad "Vidējais klikšķis ielādē cilni no starpliktuves">
<!ENTITY context.tab "Cilnes konteksta izvēlne">
diff --git a/chrome/locale/lv-LV/tabmix.properties b/chrome/locale/lv-LV/tabmix.properties
index a1db12b..20ecf61 100644
--- a/chrome/locale/lv-LV/tabmix.properties
+++ b/chrome/locale/lv-LV/tabmix.properties
@@ -1,40 +1,40 @@
-extensions.{dc572301-7619-498c-a57d-39143191b318}.description= Tab browsing with an added boost.
-tmp.merge.warning.title= Closing window with non-merged tabs
-tmp.merge.warning.message= The selected tabs will be merged with another window, but the other tabs will now be closed with the current window.
-tmp.merge.warning.checkboxLabel= Always warn me when closing a window with tabs that aren\'t merging.
-tmp.merge.error= At least 2 windows have to be opened before you can merge them
-tmp.merge.private= You can not merge private window with non-private window.
-tmp.importPref.error1= Can not import because it is not a valid file.
-tmp.importPref.error2= Failed to import settings.
-tmp.sessionempty= Next time you start the browser, \'Last Session\' will be empty.
-droptoclose.label= Drop a tab to close it
-droplink.label=Drop at the center to replace the tab or at the sides to create a new tab
-flstOn.label= Tabs Focus to Last Selected - Press F9 to swap preference
-flstOff.label= Tabs Focus to Right - Press F9 to swap preference
-slideshowOn.label= Tab Rotation is On - Press F8 to turn off
-slideshowOff.label= Tab Rotation Off - Press F8 to turn on
-undoclosetab.clear.label= Clear Closed Tabs List
-undoclosetab.clear.accesskey= C
-undoClosedWindows.clear.label= Clear Closed Windows List
-undoClosedWindows.clear.accesskey= C
-protectedtabs.closeWarning.1=You are about to close %S protected tab. Are you sure you want to continue?
-protectedtabs.closeWarning.2=You are about to close %S protected tabs. Are you sure you want to continue?
-protectedtabs.closeWarning.3=You are about to close %S tabs, %S of them protected. Are you sure you want to continue?
-protectedtabs.closeWarning.4=Warn me when I attempt to close window with protected tabs
-window.closeWarning.1=Warn me when I attempt to close window with multiple tabs
-closeWindow.label=Close window
-confirm_autoreloadPostData_title=Warning!
-confirm_autoreloadPostData=The page on which you tried to enable Auto Reload contains POSTDATA.\nIf you enable Auto Reload, any action the form carries out (such as an online purchase) will be repeated.\n\nAre you sure that you want to enable Auto Reload?
-incompatible.title= Tab Mix Plus
-incompatible.msg0= The following extensions are integrated or incompatible with Tab Mix Plus.
-incompatible.msg1= Would you like to disable these extensions?
-incompatible.msg2= The incompatible extensions will be disabled after you restart your browser.
-incompatible.button0.label= Disable
-incompatible.button0.accesskey= D
-incompatible.button1.label= Don\'t Disable
-incompatible.button1.accesskey= O
-incompatible.button2.label= Disable and Restart
-incompatible.button2.accesskey= E
-incompatible.chkbox.label= Show this alert when browser starts
-tabmixoption.error.title= Tab Mix Plus Error
-tabmixoption.error.msg= You must have one browser window to use Tab Mix Plus Options
+extensions.{dc572301-7619-498c-a57d-39143191b318}.description=Uzlabota pārlūkošana ar cilnēm
+tmp.merge.warning.title=Aizver logus ar neapvienotajām cilnēm
+tmp.merge.warning.message=Izvēlētās cilnes tiks apvienotas ar citu logu, bet citas cilnes tagad tiks aizvērtas līdz ar pašreizējo logu.
+tmp.merge.warning.checkboxLabel=Vienmēr brīdināt mani, kad aizver logu ar cilnēm, kas netiek apvienotas.
+tmp.merge.error=Jābūt atvērtiem vismaz diviem logiem, pirms varat tos apvienot
+tmp.merge.private=Jūs nevarat apvienot privāto ar ne-privāto logu.
+tmp.importPref.error1=Nevar importēt, jo tas nav derīgs fails.
+tmp.importPref.error2=Iestatījumus neizdevās importēt.
+tmp.sessionempty=Nākamreiz, kad palaidīsiet pārlūku, \'Iepriekšējā sesija\' būs tukša.
+droptoclose.label=Nometiet cilni, lai to aizvērtu
+droplink.label=Nometiet centrā, lai cilni aizvietotu, vai sānos, lai izveidotu jaunu cilni
+flstOn.label=Cilnes fokuss uz pēdējo izvēlēto - nospiediet F9, lai apmainītu iestatījumu
+flstOff.label=Cilnes fokuss pa labi - nospiediet F9, lai apmainītu iestatījumu
+slideshowOn.label=Ciļņu rotācija ir ieslēgta - nospiediet F8, lai izslēgtu
+slideshowOff.label=Ciļņu rotācija ir izslēgta - nospiediet F8, lai ieslēgtu
+undoclosetab.clear.label=Notīrīt aizvērto ciļņu sarakstu
+undoclosetab.clear.accesskey=C
+undoClosedWindows.clear.label=Notīrīt aizvērto logu sarakstu
+undoClosedWindows.clear.accesskey=C
+protectedtabs.closeWarning.1=Jūs gatavojaties aizvērt %S aizsargātu cilni. Vai tiešām vēlaties turpināt?
+protectedtabs.closeWarning.2=Jūs gatavojaties aizvērt %S aizsargātas cilnes. Vai tiešām vēlaties turpināt?
+protectedtabs.closeWarning.3=Jūs gatavojaties aizvērt %S cilnes, %S no tām aizsargātas. Vai tiešām vēlaties turpināt?
+protectedtabs.closeWarning.4=Brīdināt mani, kad mēģinu aizvērtu logu ar aizsargātām cilnēm
+window.closeWarning.1=Brīdināt mani, kad mēģinu aizvērtu logu ar vairākām cilnēm
+closeWindow.label=Aizvērt logu
+confirm_autoreloadPostData_title=Brīdinājums!
+confirm_autoreloadPostData=Vietne, kurā mēģinājāt ieslēgt automātisko pārlādēšanu, satur POSTDATA.\nJa ieslēgsiet automātisko pārlādēšanu, jebkāda darbība, ko ievades forma izpilda (piem., tiešsaistes pirkums), tiks atkārtota.\n\nVai tiešām vēlaties ieslēgt automātisko pārlādēšanu?
+incompatible.title=Tab Mix Plus
+incompatible.msg0=Sekojošie paplašinājumu ir iekļauti Tab Mix Plus vai nav ar to saderīgi.
+incompatible.msg1=Vai vēlaties atslēgt šos paplašinājumus?
+incompatible.msg2=Nesaderīgie paplašinājumi tiks atslēgti pēc tam, kad pārstartēsiet savu pārlūku.
+incompatible.button0.label=Atslēgt
+incompatible.button0.accesskey=A
+incompatible.button1.label=Neatslēgt
+incompatible.button1.accesskey=N
+incompatible.button2.label=Atslēgt un pārstartēt
+incompatible.button2.accesskey=T
+incompatible.chkbox.label=Parādīt šo brīdinājumu, palaižot pārlūku
+tabmixoption.error.title=Tab Mix Plus kļūda
+tabmixoption.error.msg=Lai lietotu Tab Mix Plus opcijas, jābūt vienam pārlūka logam
diff --git a/chrome/locale/nl/pref-appearance.dtd b/chrome/locale/nl/pref-appearance.dtd
index b867a64..c945458 100644
--- a/chrome/locale/nl/pref-appearance.dtd
+++ b/chrome/locale/nl/pref-appearance.dtd
@@ -15,4 +15,4 @@
<!ENTITY bgTopColor.label "top">
<!ENTITY bgBottomColor.label "bottom">
<!ENTITY useThis.label "deze stijl gebruiken voor">
-<!ENTITY opacity.label "Doorzichtigheid">
+<!ENTITY opacity.label "Opaciteit">
diff --git a/chrome/locale/pl/pref-appearance.dtd b/chrome/locale/pl/pref-appearance.dtd
index 0a43f3b..ec750ea 100644
--- a/chrome/locale/pl/pref-appearance.dtd
+++ b/chrome/locale/pl/pref-appearance.dtd
@@ -2,17 +2,17 @@
<!ENTITY currentTab.label "Aktywna karta">
<!ENTITY unloadedTabs.label "Niewczytane karty">
<!ENTITY unreadTab.label "Nieobejrzane karty">
-<!ENTITY hideRGB.label "Hide RGB">
-<!ENTITY showRGB.label "Show RGB">
+<!ENTITY hideRGB.label "Ukryj ustawienia RGB">
+<!ENTITY showRGB.label "Pokaż ustawienia RGB">
<!ENTITY unreadAfterReload.label "Po odświeżeniu ustaw karty jako nieprzeczytane">
-<!ENTITY squaredTabs.label "Apply background color for squared tabs">
+<!ENTITY squaredTabs.label "Zastosuj kolor tła dla kart starego typu">
<!ENTITY otherTabs.label "Inne karty">
<!ENTITY italic.label "Kursywa">
<!ENTITY bold.label "Pogrubienie">
<!ENTITY underline.label "Podkreślenie">
<!ENTITY textcolor.label "Kolor tekstu">
<!ENTITY bgColor.label "Kolor tła">
-<!ENTITY bgTopColor.label "top">
-<!ENTITY bgBottomColor.label "bottom">
+<!ENTITY bgTopColor.label "górny">
+<!ENTITY bgBottomColor.label "dolny">
<!ENTITY useThis.label "Zastosuj styl dla">
<!ENTITY opacity.label "Krycie">
diff --git a/chrome/locale/pl/tabmix.dtd b/chrome/locale/pl/tabmix.dtd
index e6c415a..205c4be 100644
--- a/chrome/locale/pl/tabmix.dtd
+++ b/chrome/locale/pl/tabmix.dtd
@@ -41,7 +41,7 @@
<!ENTITY closeSimilarTab.accesskey "P">
<!ENTITY closeTabsToLeft.label "Zamknij karty po lewej stronie">
<!ENTITY closeleft.accesskey "L">
-<!ENTITY closeTabstoRight.label "P">
+<!ENTITY closeTabstoRight.label "Zamknij karty po prawej stronie">
<!ENTITY closeright.accesskey "S">
<!ENTITY docShellMenu.label "Zezwolenia">
<!ENTITY docShellMenu.accesskey "E">
diff --git a/chrome/locale/pt-BR/pref-appearance.dtd b/chrome/locale/pt-BR/pref-appearance.dtd
index 05849d3..904bab1 100644
--- a/chrome/locale/pt-BR/pref-appearance.dtd
+++ b/chrome/locale/pt-BR/pref-appearance.dtd
@@ -2,17 +2,17 @@
<!ENTITY currentTab.label "Aba atual">
<!ENTITY unloadedTabs.label "Abas descarregadas">
<!ENTITY unreadTab.label "Abas não lidas">
-<!ENTITY hideRGB.label "Hide RGB">
-<!ENTITY showRGB.label "Show RGB">
+<!ENTITY hideRGB.label "Ocultar RGB">
+<!ENTITY showRGB.label "Mostra RGB">
<!ENTITY unreadAfterReload.label "definir aba como não lida após atualizar">
-<!ENTITY squaredTabs.label "Apply background color for squared tabs">
+<!ENTITY squaredTabs.label "Aplicar a cor de fundo para abas quadradas.">
<!ENTITY otherTabs.label "Outras abas">
<!ENTITY italic.label "Itálico">
<!ENTITY bold.label "Negrito">
<!ENTITY underline.label "Sublinhado">
<!ENTITY textcolor.label "Cor do texto">
<!ENTITY bgColor.label "Cor do fundo">
-<!ENTITY bgTopColor.label "top">
-<!ENTITY bgBottomColor.label "bottom">
+<!ENTITY bgTopColor.label "parte superior">
+<!ENTITY bgBottomColor.label "parte inferior">
<!ENTITY useThis.label "use esse estilo para">
<!ENTITY opacity.label "opacidade">
diff --git a/chrome/locale/ro/pref-appearance.dtd b/chrome/locale/ro/pref-appearance.dtd
index cbd9394..798029e 100644
--- a/chrome/locale/ro/pref-appearance.dtd
+++ b/chrome/locale/ro/pref-appearance.dtd
@@ -2,17 +2,17 @@
<!ENTITY currentTab.label "Filă curentă">
<!ENTITY unloadedTabs.label "File neîncărcate">
<!ENTITY unreadTab.label "File nevizualizate">
-<!ENTITY hideRGB.label "Hide RGB">
-<!ENTITY showRGB.label "Show RGB">
+<!ENTITY hideRGB.label "Ascunde modelul cromatic">
+<!ENTITY showRGB.label "Afișează modelul cromatic">
<!ENTITY unreadAfterReload.label "Se marchează fila ca necitită după reîncărcare">
-<!ENTITY squaredTabs.label "Apply background color for squared tabs">
+<!ENTITY squaredTabs.label "Aplică culoarea de fundal filelor rectangulare">
<!ENTITY otherTabs.label "Alte file">
<!ENTITY italic.label "Cursiv">
<!ENTITY bold.label "Aldin">
<!ENTITY underline.label "Subliniat">
<!ENTITY textcolor.label "Culoare text">
<!ENTITY bgColor.label "Culoare fundal">
-<!ENTITY bgTopColor.label "top">
-<!ENTITY bgBottomColor.label "bottom">
-<!ENTITY useThis.label "Folosește stilul pentru:">
+<!ENTITY bgTopColor.label "deasupra">
+<!ENTITY bgBottomColor.label "dedesubt">
+<!ENTITY useThis.label "Se folosește stilul pentru">
<!ENTITY opacity.label "opacitate">
diff --git a/chrome/locale/ru-RU/pref-appearance.dtd b/chrome/locale/ru-RU/pref-appearance.dtd
index 9e46984..86369a8 100644
--- a/chrome/locale/ru-RU/pref-appearance.dtd
+++ b/chrome/locale/ru-RU/pref-appearance.dtd
@@ -2,17 +2,17 @@
<!ENTITY currentTab.label "Текущая вкладка">
<!ENTITY unloadedTabs.label "Незагруженные вкладки">
<!ENTITY unreadTab.label "Непрочитанные вкладки">
-<!ENTITY hideRGB.label "Hide RGB">
-<!ENTITY showRGB.label "Show RGB">
+<!ENTITY hideRGB.label "Спрятать RGB">
+<!ENTITY showRGB.label "Показать RGB">
<!ENTITY unreadAfterReload.label "отметить вкладку как непрочитанную после её обновления">
-<!ENTITY squaredTabs.label "Apply background color for squared tabs">
+<!ENTITY squaredTabs.label "Применять цвет фона к квадратным вкладкам">
<!ENTITY otherTabs.label "Другие вкладки">
<!ENTITY italic.label "Курсив">
<!ENTITY bold.label "Полужирный">
<!ENTITY underline.label "Подчёркнутый">
<!ENTITY textcolor.label "Цвет текста">
<!ENTITY bgColor.label "Цвет фона">
-<!ENTITY bgTopColor.label "top">
-<!ENTITY bgBottomColor.label "bottom">
+<!ENTITY bgTopColor.label "наверху">
+<!ENTITY bgBottomColor.label "внизу">
<!ENTITY useThis.label "использовать стиль для">
<!ENTITY opacity.label "непрозрачность">
diff --git a/chrome/locale/sk-SK/pref-appearance.dtd b/chrome/locale/sk-SK/pref-appearance.dtd
index 3592902..1d97b90 100644
--- a/chrome/locale/sk-SK/pref-appearance.dtd
+++ b/chrome/locale/sk-SK/pref-appearance.dtd
@@ -2,17 +2,17 @@
<!ENTITY currentTab.label "Aktuálna karta">
<!ENTITY unloadedTabs.label "Nenačítané karty">
<!ENTITY unreadTab.label "Neprečítané karty">
-<!ENTITY hideRGB.label "Hide RGB">
-<!ENTITY showRGB.label "Show RGB">
+<!ENTITY hideRGB.label "Skryť RGB">
+<!ENTITY showRGB.label "Zobraziť RGB">
<!ENTITY unreadAfterReload.label "po znovu načítaní nastaviť kartu ako neprečítanú">
-<!ENTITY squaredTabs.label "Apply background color for squared tabs">
+<!ENTITY squaredTabs.label "Použiť farbu pozadia pre štvorcové karty">
<!ENTITY otherTabs.label "Ostatné karty">
<!ENTITY italic.label "Kurzíva">
<!ENTITY bold.label "Tučné">
<!ENTITY underline.label "Podčiarknúť">
<!ENTITY textcolor.label "Farba textu">
<!ENTITY bgColor.label "Farba pozadia">
-<!ENTITY bgTopColor.label "top">
-<!ENTITY bgBottomColor.label "bottom">
+<!ENTITY bgTopColor.label "navrchu">
+<!ENTITY bgBottomColor.label "naspodku">
<!ENTITY useThis.label "použiť tento štýl pre">
<!ENTITY opacity.label "nepriesvitnosť">
diff --git a/chrome/locale/sr/pref-appearance.dtd b/chrome/locale/sr/pref-appearance.dtd
index c272e4c..749c334 100644
--- a/chrome/locale/sr/pref-appearance.dtd
+++ b/chrome/locale/sr/pref-appearance.dtd
@@ -2,17 +2,17 @@
<!ENTITY currentTab.label "Текућа картица">
<!ENTITY unloadedTabs.label "Неучитане картице">
<!ENTITY unreadTab.label "Непрочитане картице">
-<!ENTITY hideRGB.label "Hide RGB">
-<!ENTITY showRGB.label "Show RGB">
+<!ENTITY hideRGB.label "Сакриј RGB">
+<!ENTITY showRGB.label "Прикажи RGB">
<!ENTITY unreadAfterReload.label "означи картицу као непрочитану након поновног учитавања">
-<!ENTITY squaredTabs.label "Apply background color for squared tabs">
+<!ENTITY squaredTabs.label "Примени боју позадине за квадратне картице">
<!ENTITY otherTabs.label "Остале картице">
<!ENTITY italic.label "Искошено">
<!ENTITY bold.label "Подебљано">
<!ENTITY underline.label "Подвучено">
<!ENTITY textcolor.label "Боја слова">
<!ENTITY bgColor.label "Боја позадине">
-<!ENTITY bgTopColor.label "top">
-<!ENTITY bgBottomColor.label "bottom">
+<!ENTITY bgTopColor.label "врх">
+<!ENTITY bgBottomColor.label "дно">
<!ENTITY useThis.label "користи овај стил за">
<!ENTITY opacity.label "провидност">
diff --git a/chrome/locale/zh-CN/pref-appearance.dtd b/chrome/locale/zh-CN/pref-appearance.dtd
index adac6b9..fc67c57 100644
--- a/chrome/locale/zh-CN/pref-appearance.dtd
+++ b/chrome/locale/zh-CN/pref-appearance.dtd
@@ -2,17 +2,17 @@
<!ENTITY currentTab.label "当前标签页">
<!ENTITY unloadedTabs.label "未加载的标签页">
<!ENTITY unreadTab.label "未读标签页">
-<!ENTITY hideRGB.label "Hide RGB">
-<!ENTITY showRGB.label "Show RGB">
+<!ENTITY hideRGB.label "隐藏 RGB">
+<!ENTITY showRGB.label "显示 RGB">
<!ENTITY unreadAfterReload.label "重新载入标签页后将其设为未读">
-<!ENTITY squaredTabs.label "Apply background color for squared tabs">
+<!ENTITY squaredTabs.label "背景颜色应用到方形标签页">
<!ENTITY otherTabs.label "其他标签页">
<!ENTITY italic.label "斜体">
<!ENTITY bold.label "加粗">
<!ENTITY underline.label "下划线">
<!ENTITY textcolor.label "文字颜色">
<!ENTITY bgColor.label "背景颜色">
-<!ENTITY bgTopColor.label "top">
-<!ENTITY bgBottomColor.label "bottom">
+<!ENTITY bgTopColor.label "顶部">
+<!ENTITY bgBottomColor.label "底部">
<!ENTITY useThis.label "该样式应用于">
<!ENTITY opacity.label "透明度">
diff --git a/chrome/locale/zh-TW/pref-appearance.dtd b/chrome/locale/zh-TW/pref-appearance.dtd
index 909f78a..3a178af 100644
--- a/chrome/locale/zh-TW/pref-appearance.dtd
+++ b/chrome/locale/zh-TW/pref-appearance.dtd
@@ -2,17 +2,17 @@
<!ENTITY currentTab.label "目前的分頁">
<!ENTITY unloadedTabs.label "未載入的分頁">
<!ENTITY unreadTab.label "未讀的分頁">
-<!ENTITY hideRGB.label "Hide RGB">
-<!ENTITY showRGB.label "Show RGB">
+<!ENTITY hideRGB.label "隱藏 RGB">
+<!ENTITY showRGB.label "顯示 RGB">
<!ENTITY unreadAfterReload.label "重新載入後將分頁設定為未讀取">
-<!ENTITY squaredTabs.label "Apply background color for squared tabs">
+<!ENTITY squaredTabs.label "將背景顏色套用到方形分頁標籤">
<!ENTITY otherTabs.label "其他分頁">
<!ENTITY italic.label "斜體">
<!ENTITY bold.label "粗體">
<!ENTITY underline.label "底線">
<!ENTITY textcolor.label "文字顏色">
<!ENTITY bgColor.label "背景顏色">
-<!ENTITY bgTopColor.label "top">
-<!ENTITY bgBottomColor.label "bottom">
+<!ENTITY bgTopColor.label "上">
+<!ENTITY bgBottomColor.label "下">
<!ENTITY useThis.label "套用此樣式到">
<!ENTITY opacity.label "不透明度">
diff --git a/chrome/skin/app_version/4.0/general.css b/chrome/skin/app_version/4.0/general.css
index 5b24cc7..e60d3cf 100644
--- a/chrome/skin/app_version/4.0/general.css
+++ b/chrome/skin/app_version/4.0/general.css
@@ -142,14 +142,14 @@
#tabbrowser-tabs:not([movingtab])[tabmix_australis="true"] > .tabbrowser-tab:not([selected="true"])[tabmix_tabStyle*="bg"][tabmix-beforeselected-visible]:hover > .tab-stack > .tab-background:-moz-locale-dir(rtl) {
background-position: left bottom, left bottom, right bottom;
background-size: 0% 0%, calc(100% - (1 * 30px)) 100%, 30px 100%;
- border-radius: 13.25px 0 0 20px;
+ border-radius: 16px 0 0 20px;
margin-left: 0px;
}
#tabbrowser-tabs:not([movingtab])[tabmix_australis="true"] > .tabbrowser-tab:not([selected="true"])[tabmix_tabStyle*="bg"][afterselected-visible]:hover > .tab-stack > .tab-background > .tab-background-middle:-moz-locale-dir(ltr),
#tabbrowser-tabs:not([movingtab])[tabmix_australis="true"] > .tabbrowser-tab:not([selected="true"])[tabmix_tabStyle*="bg"][tabmix-beforeselected-visible]:hover > .tab-stack > .tab-background > .tab-background-middle:-moz-locale-dir(rtl) {
- border-left: none;
- border-radius: 25px 0 0 20px;
+ border-left: 2px solid rgba(26 ,26, 26, 0.25);
+ border-radius: 16px 0 0 20px;
margin-left: 0px;
}
@@ -157,13 +157,13 @@
#tabbrowser-tabs:not([movingtab])[tabmix_australis="true"] > .tabbrowser-tab:not([selected="true"])[tabmix_tabStyle*="bg"][afterselected-visible]:hover > .tab-stack > .tab-background:-moz-locale-dir(rtl) {
background-position: left bottom, 30px bottom, right bottom;
background-size: 30px 100%, calc(100% - (1 * 30px)) 100%, 0% 0%;
- border-radius: 0 13.25px 20px 0;
+ border-radius: 0 16px 20px 0;
margin-right: 0px;
}
#tabbrowser-tabs:not([movingtab])[tabmix_australis="true"] > .tabbrowser-tab:not([selected="true"])[tabmix_tabStyle*="bg"][tabmix-beforeselected-visible]:hover > .tab-stack > .tab-background > .tab-background-middle:-moz-locale-dir(ltr),
#tabbrowser-tabs:not([movingtab])[tabmix_australis="true"] > .tabbrowser-tab:not([selected="true"])[tabmix_tabStyle*="bg"][afterselected-visible]:hover > .tab-stack > .tab-background > .tab-background-middle:-moz-locale-dir(rtl) {
- border-right: none;
- border-radius: 0 25px 20px 0;
+ border-right: 2px solid rgba(26, 26, 26, 0.25);
+ border-radius: 0 16px 20px 0;
margin-right: 0px;
}
diff --git a/chrome/skin/preferences.css b/chrome/skin/preferences.css
index 9cac2a6..f6a4ee2 100644
--- a/chrome/skin/preferences.css
+++ b/chrome/skin/preferences.css
@@ -278,3 +278,7 @@ tabbox > tabpanels {
#sesionsPanel[manager=firefox] tab.firefox {
visibility: hidden;
}
+
+.menu checkbox {
+ padding-top: 0px;
+}
diff --git a/defaults/preferences/tabmix.js b/defaults/preferences/tabmix.js
index 9ba1a31..3e57273 100644
--- a/defaults/preferences/tabmix.js
+++ b/defaults/preferences/tabmix.js
@@ -266,3 +266,5 @@ pref("browser.tabs.tabMaxWidth", 250);
pref("extensions.tabmix.shortcuts", '{}');
pref("extensions.tabmix.syncPrefs", false);
+
+pref("extensions.tabmix.showTabContextMenuOnTabbar", false);
diff --git a/install.rdf b/install.rdf
index 0fb4c49..12b62cf 100644
--- a/install.rdf
+++ b/install.rdf
@@ -5,7 +5,7 @@
<RDF:Description RDF:about="urn:mozilla:install-manifest"
NS1:id="{dc572301-7619-498c-a57d-39143191b318}"
NS1:name="Tab Mix Plus"
- NS1:version="0.4.1.3pre.131218a2"
+ NS1:version="0.4.1.3pre.140204a1"
NS1:type="2"
NS1:description="Tab browsing with an added boost."
NS1:iconURL="chrome://tabmixplus/skin/tmp.png"
@@ -19,5 +19,5 @@
<RDF:Description RDF:about="rdf:#$n83In3"
NS1:id="{ec8030f7-c20a-464f-9b0e-13a3a9e97384}"
NS1:minVersion="17.0"
- NS1:maxVersion="29.0a1" />
+ NS1:maxVersion="30.0a1" />
</RDF:RDF>
diff --git a/modules/AutoReload.jsm b/modules/AutoReload.jsm
index 00a9c10..ac879f8 100644
--- a/modules/AutoReload.jsm
+++ b/modules/AutoReload.jsm
@@ -86,8 +86,8 @@ let AutoReload = {
prefs.clearUserPref(pref);
return [];
}
- let defaulList = ["30","60","120","300","900","1800"];
- list = list.filter(function(val) defaulList.indexOf(val) == -1);
+ let defaultList = ["30","60","120","300","900","1800"];
+ list = list.filter(function(val) defaultList.indexOf(val) == -1);
let newList = [];
list.forEach(function(val){
if (parseInt(val) && newList.indexOf(val) == -1)
diff --git a/modules/Services.jsm b/modules/Services.jsm
index 178a2a7..7060432 100644
--- a/modules/Services.jsm
+++ b/modules/Services.jsm
@@ -190,9 +190,15 @@ let TabmixSvc = {
delete this.sanitized;
return this.sanitized = TabmixSvc.prefBranch.prefHasUserValue("sessions.sanitized");
},
+ set sanitized(val) {
+ delete this.sanitized;
+ return this.sanitized = val;
+ },
private: true,
settingPreference: false,
- }
+ },
+
+ blockedClickingOptions: []
}
XPCOMUtils.defineLazyGetter(TabmixSvc.JSON, "nsIJSON", function() {
@@ -277,6 +283,10 @@ let TabStateCache = {
update(browser.__SS_data.attributes);
}
+ // Bug 905049 fixed by Bug 960903 - Broadcast session history
+ if (isVersion(290))
+ return;
+
let tabHasCache = isVersion(270) ? this.TabStateCache.has(browser) :
this.TabStateCache._data.has(browser);
if (tabHasCache) {
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-mozext/tabmixplus.git
More information about the Pkg-mozext-commits
mailing list