[Pkg-mozext-commits] [tabmixplus] 03/03: Merge with default
David Prévot
taffit at moszumanska.debian.org
Mon Aug 4 03:31:56 UTC 2014
This is an automated email from the git hooks/post-receive script.
taffit pushed a commit to tag 0.4.0.5
in repository tabmixplus.
commit 1b3131ed44915814402d9cfa78019aa207a96c69
Merge: 1669718 73eb489
Author: onemen <tabmix.onemen at gmail.com>
Date: Tue Feb 26 17:38:29 2013 +0200
Merge with default
chrome.manifest | 5 +-
chrome/content/click/click.js | 52 +-
chrome/content/extensions/extensions.js | 95 +--
chrome/content/extensions/sage.js | 10 +-
chrome/content/links/contentLinks.js | 162 +----
chrome/content/links/setup.js | 76 +-
chrome/content/links/unknownContentType.xul | 2 +-
chrome/content/links/userInterface.js | 13 +-
chrome/content/minit/minit.js | 198 +++---
chrome/content/minit/tablib.js | 210 +++---
chrome/content/overlay/browsroverlay17.css | 20 +
.../{browsroverlay40.css => browsroverlay4.css} | 5 +-
chrome/content/overlay/browsroverlay_base.css | 1 +
chrome/content/overlay/tabContextMenu.xul | 2 +-
chrome/content/places/bookmarkProperties.xul | 2 +-
chrome/content/places/places.js | 92 ++-
chrome/content/pref/pref-tabmix.js | 130 +++-
chrome/content/pref/pref-tabmix.xul | 152 +++-
chrome/content/pref/preferencesOverlay.js | 26 +-
chrome/content/pref/shortcuts/shortcuts.js | 159 +++++
chrome/content/pref/shortcuts/shortcuts.xml | 233 +++++++
chrome/content/pref/shortcuts/shortcuts.xul | 56 ++
chrome/content/session/session.js | 313 +++++----
chrome/content/session/sessionStore.js | 29 +-
chrome/content/tab/scrollbox.xml | 66 +-
chrome/content/tab/tab.js | 188 ++---
chrome/content/tab/tabbrowser_4.xml | 10 +-
chrome/content/tab/text.xml | 4 +-
chrome/content/tabmix.js | 61 +-
chrome/content/tabmix.xul | 35 +-
chrome/content/utils.js | 155 +++--
chrome/locale/ar/shortcuts.dtd | 14 +
chrome/locale/bg-BG/pref-tabmix.dtd | 6 +-
chrome/locale/bg-BG/session-manager.properties | 2 +
chrome/locale/bg-BG/shortcuts.dtd | 14 +
chrome/locale/bg-BG/tabmix.properties | 1 +
chrome/locale/ca/pref-tabmix.dtd | 54 +-
chrome/locale/ca/session-manager.properties | 2 +
chrome/locale/ca/shortcuts.dtd | 14 +
chrome/locale/ca/tabmix.properties | 1 +
chrome/locale/cs-CZ/pref-tabmix.dtd | 6 +-
chrome/locale/cs-CZ/session-manager.properties | 2 +
chrome/locale/cs-CZ/shortcuts.dtd | 14 +
chrome/locale/cs-CZ/tabmix.properties | 1 +
chrome/locale/da/pref-tabmix.dtd | 6 +-
chrome/locale/da/session-manager.properties | 2 +
chrome/locale/da/shortcuts.dtd | 14 +
chrome/locale/da/tabmix.properties | 1 +
chrome/locale/de/pref-tabmix.dtd | 6 +-
chrome/locale/de/session-manager.properties | 2 +
chrome/locale/de/shortcuts.dtd | 14 +
chrome/locale/de/tabmix.properties | 1 +
chrome/locale/el/pref-tabmix.dtd | 8 +-
chrome/locale/el/session-manager.properties | 2 +
chrome/locale/el/shortcuts.dtd | 14 +
chrome/locale/el/tabmix.properties | 1 +
chrome/locale/en-US/pref-tabmix.dtd | 6 +-
chrome/locale/en-US/session-manager.properties | 2 +
chrome/locale/en-US/shortcuts.dtd | 14 +
chrome/locale/en-US/tabmix.properties | 1 +
chrome/locale/es-ES/pref-tabmix.dtd | 6 +-
chrome/locale/es-ES/session-manager.properties | 2 +
chrome/locale/es-ES/shortcuts.dtd | 14 +
chrome/locale/es-ES/tabmix.properties | 1 +
chrome/locale/et-EE/pref-tabmix.dtd | 6 +-
chrome/locale/et-EE/session-manager.properties | 2 +
chrome/locale/et-EE/shortcuts.dtd | 14 +
chrome/locale/et-EE/tabmix.properties | 1 +
chrome/locale/eu/shortcuts.dtd | 14 +
chrome/locale/fa-IR/pref-tabmix.dtd | 6 +-
chrome/locale/fa-IR/session-manager.properties | 2 +
chrome/locale/fa-IR/shortcuts.dtd | 14 +
chrome/locale/fa-IR/tabmix.properties | 1 +
chrome/locale/fi/shortcuts.dtd | 14 +
chrome/locale/fr/pref-tabmix.dtd | 20 +-
chrome/locale/fr/session-manager.properties | 2 +
chrome/locale/fr/shortcuts.dtd | 14 +
chrome/locale/fr/tabmix.properties | 1 +
chrome/locale/he-IL/pref-tabmix.dtd | 6 +-
chrome/locale/he-IL/session-manager.properties | 2 +
chrome/locale/he-IL/shortcuts.dtd | 14 +
chrome/locale/he-IL/tabmix.properties | 1 +
chrome/locale/hr-HR/pref-tabmix.dtd | 6 +-
chrome/locale/hr-HR/session-manager.properties | 2 +
chrome/locale/hr-HR/shortcuts.dtd | 14 +
chrome/locale/hr-HR/tabmix.properties | 1 +
chrome/locale/hu-HU/pref-tabmix.dtd | 22 +-
chrome/locale/hu-HU/session-manager.properties | 6 +-
chrome/locale/hu-HU/shortcuts.dtd | 14 +
chrome/locale/hu-HU/tabmix.dtd | 4 +-
chrome/locale/hu-HU/tabmix.properties | 63 +-
chrome/locale/it/pref-tabmix.dtd | 10 +-
chrome/locale/it/session-manager.properties | 2 +
chrome/locale/it/shortcuts.dtd | 14 +
chrome/locale/it/tabmix.properties | 1 +
chrome/locale/ja/pref-tabmix.dtd | 8 +-
chrome/locale/ja/session-manager.properties | 180 ++---
chrome/locale/ja/shortcuts.dtd | 14 +
chrome/locale/ja/tabmix.properties | 5 +-
chrome/locale/ko-KR/pref-tabmix.dtd | 6 +-
chrome/locale/ko-KR/session-manager.properties | 2 +
chrome/locale/ko-KR/shortcuts.dtd | 14 +
chrome/locale/ko-KR/tabmix.properties | 1 +
chrome/locale/lv-LV/shortcuts.dtd | 14 +
chrome/locale/nl/pref-tabmix.dtd | 6 +-
chrome/locale/nl/session-manager.properties | 18 +-
chrome/locale/nl/shortcuts.dtd | 14 +
chrome/locale/nl/tabmix.properties | 11 +-
chrome/locale/pl/pref-tabmix.dtd | 64 +-
chrome/locale/pl/session-manager.properties | 2 +
chrome/locale/pl/shortcuts.dtd | 14 +
chrome/locale/pl/tabmix.properties | 9 +-
chrome/locale/pt-BR/pref-tabmix.dtd | 6 +-
chrome/locale/pt-BR/session-manager.properties | 2 +
chrome/locale/pt-BR/shortcuts.dtd | 14 +
chrome/locale/pt-BR/tabmix.properties | 1 +
chrome/locale/pt-PT/pref-tabmix.dtd | 6 +-
chrome/locale/pt-PT/session-manager.properties | 2 +
chrome/locale/pt-PT/shortcuts.dtd | 14 +
chrome/locale/pt-PT/tabmix.properties | 1 +
chrome/locale/ro/misc.dtd | 10 +-
chrome/locale/ro/pref-appearance.dtd | 6 +-
chrome/locale/ro/pref-filetype.dtd | 2 +-
chrome/locale/ro/pref-tabmix.dtd | 296 ++++----
chrome/locale/ro/session-manager.properties | 14 +-
chrome/locale/ro/shortcuts.dtd | 14 +
chrome/locale/ro/tabmix.dtd | 12 +-
chrome/locale/ro/tabmix.properties | 15 +-
chrome/locale/ru-RU/pref-tabmix.dtd | 6 +-
chrome/locale/ru-RU/session-manager.properties | 2 +
chrome/locale/ru-RU/shortcuts.dtd | 14 +
chrome/locale/ru-RU/tabmix.properties | 1 +
chrome/locale/sk-SK/pref-tabmix.dtd | 6 +-
chrome/locale/sk-SK/session-manager.properties | 2 +
chrome/locale/sk-SK/shortcuts.dtd | 14 +
chrome/locale/sk-SK/tabmix.properties | 1 +
chrome/locale/sr/pref-tabmix.dtd | 6 +-
chrome/locale/sr/session-manager.properties | 2 +
chrome/locale/sr/shortcuts.dtd | 14 +
chrome/locale/sr/tabmix.properties | 1 +
chrome/locale/sv-SE/pref-tabmix.dtd | 6 +-
chrome/locale/sv-SE/session-manager.properties | 2 +
chrome/locale/sv-SE/shortcuts.dtd | 14 +
chrome/locale/sv-SE/tabmix.properties | 1 +
chrome/locale/tr/pref-tabmix.dtd | 6 +-
chrome/locale/tr/session-manager.properties | 2 +
chrome/locale/tr/shortcuts.dtd | 14 +
chrome/locale/tr/tabmix.properties | 1 +
chrome/locale/uk-UA/pref-tabmix.dtd | 6 +-
chrome/locale/uk-UA/session-manager.properties | 2 +
chrome/locale/uk-UA/shortcuts.dtd | 14 +
chrome/locale/uk-UA/tabmix.properties | 1 +
chrome/locale/vi/pref-tabmix.dtd | 6 +-
chrome/locale/vi/session-manager.properties | 2 +
chrome/locale/vi/shortcuts.dtd | 14 +
chrome/locale/vi/tabmix.properties | 1 +
chrome/locale/zh-CN/pref-tabmix.dtd | 6 +-
chrome/locale/zh-CN/session-manager.properties | 2 +
chrome/locale/zh-CN/shortcuts.dtd | 14 +
chrome/locale/zh-CN/tabmix.properties | 1 +
chrome/locale/zh-TW/pref-tabmix.dtd | 8 +-
chrome/locale/zh-TW/session-manager.properties | 2 +
chrome/locale/zh-TW/shortcuts.dtd | 14 +
chrome/locale/zh-TW/tabmix.properties | 1 +
chrome/skin/app_version/4.0/mac/progress.css | 32 -
chrome/skin/app_version/4.0/win/browser.css | 31 +-
chrome/skin/app_version/4.0/win/browser_xp15.css | 30 +
chrome/skin/app_version/4.0/win/browser_xp16.css | 21 +
chrome/skin/app_version/4.0/win/progress.css | 21 -
chrome/skin/disabled.png | Bin 0 -> 199 bytes
chrome/skin/prefs.css | 137 +++-
chrome/skin/refresh.png | Bin 0 -> 209 bytes
chrome/skin/tab.css | 2 +-
defaults/preferences/tabmix.js | 8 +-
modules/MergeWindows.jsm | 767 +++++++--------------
modules/Services.jsm | 3 +
modules/Shortcuts.jsm | 499 ++++++++++++++
modules/SingleWindowModeUtils.jsm | 169 +++++
modules/extensions/TabGroupsManager.jsm | 34 +-
modules/log.jsm | 2 +-
180 files changed, 3836 insertions(+), 2029 deletions(-)
diff --cc chrome.manifest
index 0fbda9a,c4b458f..3b33c3b
--- a/chrome.manifest
+++ b/chrome.manifest
@@@ -66,8 -70,16 +66,11 @@@ overlay chrome://wizzrss/content/feed
style chrome://global/content/customizeToolbar.xul chrome://tabmixplus/skin/tab.css
style chrome://browser/content/preferences/preferences.xul chrome://tabmixplus/skin/preferences.css
- style chrome://browser/content/browser.xul chrome://tabmixplus/content/overlay/browsroverlay40.css
+ style chrome://browser/content/browser.xul chrome://tabmixplus/content/overlay/browsroverlay4.css appversion<17
+ style chrome://browser/content/browser.xul chrome://tabmixplus/content/overlay/browsroverlay17.css appversion>=17
+ style chrome://browser/content/browser.xul chrome://tabmixplus/skin/app_version/4.0/win/browser_xp15.css appversion<16 os=WINNT osversion<6
+ style chrome://browser/content/browser.xul chrome://tabmixplus/skin/app_version/4.0/win/browser_xp16.css appversion>=16 os=WINNT osversion<6
-#skin tabmix-app-version tabmixplus chrome://tabmixplus/skin/app_version/4.0/ appversion>=4.0b7pre
-#skin tabmix-os tabmixplus chrome://tabmix-app-version/skin/win/ os=WINNT
-#skin tabmix-os tabmixplus chrome://tabmix-app-version/skin/mac/ os=Darwin
-#skin tabmix-os tabmixplus chrome://tabmix-app-version/skin/linux/ os=Linux
-
skin tabmix-os tabmixplus chrome://tabmixplus/skin/app_version/4.0/win/ os=WINNT
skin tabmix-os tabmixplus chrome://tabmixplus/skin/app_version/4.0/mac/ os=Darwin
skin tabmix-os tabmixplus chrome://tabmixplus/skin/app_version/4.0/linux/ os=Linux
--
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