[Pkg-mozext-commits] [tabmixplus] 02/03: Merge with default
David Prévot
taffit at moszumanska.debian.org
Mon Aug 4 03:32:09 UTC 2014
This is an automated email from the git hooks/post-receive script.
taffit pushed a commit to tag 0.4.1.2
in repository tabmixplus.
commit 923411d4d5a199561b6e1908c0ee805e7853bbdb
Merge: b47fabc 7a6bb57
Author: onemen <tabmix.onemen at gmail.com>
Date: Sun Oct 20 18:08:19 2013 +0300
Merge with default
.hgtags | 7 +
chrome.manifest | 23 +-
chrome/content/changecode.js | 232 +++++++-----
chrome/content/click/click.js | 9 +-
chrome/content/extensions/extensions.js | 10 +-
chrome/content/links/contentLinks.js | 95 +++--
chrome/content/links/newTab.xul | 24 +-
chrome/content/links/setup.js | 137 +++----
chrome/content/links/unknownContentType.xul | 59 ++--
chrome/content/minit/minit.js | 59 +++-
chrome/content/minit/tabView.js | 6 -
chrome/content/minit/tablib.js | 210 ++++++-----
chrome/content/overlay/browsr.css | 82 +++--
chrome/content/overlay/tabContextMenu.xul | 4 +-
chrome/content/places/places.js | 184 ++--------
chrome/content/preferences/appearance.js | 12 +-
chrome/content/preferences/appearance.xul | 8 +-
chrome/content/preferences/menu.xul | 8 +-
chrome/content/preferences/mouse.js | 7 +
chrome/content/preferences/mouse.xul | 38 +-
.../preferences/overlay/incontentPreferences.xul | 27 +-
.../preferences/overlay/overlaySanitizeUI.js | 10 +-
.../preferences/overlay/preferencesOverlay.js | 34 +-
chrome/content/preferences/preferences.js | 52 ++-
chrome/content/preferences/preferences.xul | 1 +
chrome/content/preferences/session.js | 4 +
chrome/content/preferences/shortcuts.xml | 4 -
chrome/content/preferences/shortcuts.xul | 4 +-
chrome/content/session/session.js | 143 +++++---
chrome/content/session/sessionStore.js | 73 ++--
chrome/content/tab/scrollbox.xml | 8 +-
chrome/content/tab/tab.js | 393 +++++++++++++--------
chrome/content/tab/tabbrowser_4.xml | 105 ++++--
chrome/content/tabmix.js | 251 +++++++++----
chrome/content/tabmix.xul | 5 +-
chrome/content/utils.js | 78 ++--
chrome/locale/bg-BG/pref-tabmix.dtd | 8 +-
chrome/locale/bg-BG/tabmix.dtd | 4 +-
chrome/locale/ca/pref-appearance.dtd | 2 +-
chrome/locale/ca/pref-tabmix.dtd | 26 +-
chrome/locale/ca/tabmix.dtd | 4 +-
chrome/locale/cs-CZ/pref-tabmix.dtd | 10 +-
chrome/locale/cs-CZ/tabmix.dtd | 4 +-
chrome/locale/da/pref-tabmix.dtd | 6 +-
chrome/locale/da/tabmix.dtd | 4 +-
chrome/locale/de/pref-tabmix.dtd | 8 +-
chrome/locale/de/tabmix.dtd | 4 +-
chrome/locale/el/misc.dtd | 2 +-
chrome/locale/el/pref-appearance.dtd | 2 +-
chrome/locale/el/pref-tabmix.dtd | 8 +-
chrome/locale/el/tabmix.dtd | 4 +-
chrome/locale/en-US/pref-tabmix.dtd | 10 +-
chrome/locale/en-US/tabmix.dtd | 6 +-
chrome/locale/es-ES/pref-appearance.dtd | 2 +-
chrome/locale/es-ES/pref-tabmix.dtd | 8 +-
chrome/locale/es-ES/tabmix.dtd | 4 +-
chrome/locale/et-EE/pref-tabmix.dtd | 36 +-
chrome/locale/et-EE/shortcuts.dtd | 2 +-
chrome/locale/et-EE/tabmix.dtd | 8 +-
chrome/locale/et-EE/tabmix.properties | 2 +-
chrome/locale/fa-IR/pref-tabmix.dtd | 6 +-
chrome/locale/fa-IR/tabmix.dtd | 4 +-
chrome/locale/fr/pref-appearance.dtd | 2 +-
chrome/locale/fr/pref-tabmix.dtd | 8 +-
chrome/locale/fr/tabmix.dtd | 4 +-
chrome/locale/he-IL/pref-tabmix.dtd | 6 +-
chrome/locale/he-IL/tabmix.dtd | 4 +-
chrome/locale/hr-HR/pref-tabmix.dtd | 6 +-
chrome/locale/hr-HR/tabmix.dtd | 4 +-
chrome/locale/hu-HU/pref-tabmix.dtd | 6 +-
chrome/locale/hu-HU/tabmix.dtd | 4 +-
chrome/locale/it/misc.dtd | 2 +-
chrome/locale/it/pref-tabmix.dtd | 12 +-
chrome/locale/it/tabmix.dtd | 4 +-
chrome/locale/ja/pref-tabmix.dtd | 8 +-
chrome/locale/ja/tabmix.dtd | 4 +-
chrome/locale/ko-KR/pref-tabmix.dtd | 6 +-
chrome/locale/ko-KR/tabmix.dtd | 4 +-
chrome/locale/lv-LV/shortcuts.dtd | 28 +-
chrome/locale/nl/pref-tabmix.dtd | 8 +-
chrome/locale/nl/tabmix.dtd | 4 +-
chrome/locale/pl/pref-appearance.dtd | 2 +-
chrome/locale/pl/pref-tabmix.dtd | 8 +-
chrome/locale/pl/tabmix.dtd | 6 +-
chrome/locale/pt-BR/pref-tabmix.dtd | 8 +-
chrome/locale/pt-BR/tabmix.dtd | 4 +-
chrome/locale/pt-PT/pref-appearance.dtd | 2 +-
chrome/locale/pt-PT/pref-tabmix.dtd | 26 +-
chrome/locale/pt-PT/session-manager.properties | 4 +-
chrome/locale/pt-PT/shortcuts.dtd | 28 +-
chrome/locale/pt-PT/tabmix.dtd | 4 +-
chrome/locale/pt-PT/tabmix.properties | 2 +-
chrome/locale/ro/pref-tabmix.dtd | 8 +-
chrome/locale/ro/tabmix.dtd | 4 +-
chrome/locale/ru-RU/pref-tabmix.dtd | 8 +-
chrome/locale/ru-RU/tabmix.dtd | 4 +-
chrome/locale/sk-SK/pref-appearance.dtd | 2 +-
chrome/locale/sk-SK/pref-tabmix.dtd | 8 +-
chrome/locale/sk-SK/tabmix.dtd | 4 +-
chrome/locale/sr/pref-appearance.dtd | 2 +-
chrome/locale/sr/pref-tabmix.dtd | 16 +-
chrome/locale/sr/tabmix.dtd | 4 +-
chrome/locale/sv-SE/pref-tabmix.dtd | 6 +-
chrome/locale/sv-SE/tabmix.dtd | 4 +-
chrome/locale/tr/pref-tabmix.dtd | 6 +-
chrome/locale/tr/tabmix.dtd | 4 +-
chrome/locale/uk-UA/pref-tabmix.dtd | 6 +-
chrome/locale/uk-UA/tabmix.dtd | 4 +-
chrome/locale/vi/pref-tabmix.dtd | 6 +-
chrome/locale/vi/tabmix.dtd | 4 +-
chrome/locale/zh-CN/pref-tabmix.dtd | 8 +-
chrome/locale/zh-CN/tabmix.dtd | 4 +-
chrome/locale/zh-TW/pref-tabmix.dtd | 8 +-
chrome/locale/zh-TW/tabmix.dtd | 4 +-
chrome/skin/app_version/4.0/linux/browser.css | 2 +-
chrome/skin/app_version/4.0/mac/browser.css | 26 +-
chrome/skin/app_version/4.0/win/browser.css | 7 +-
chrome/skin/preferencesOverlay.css | 20 +-
chrome/skin/tab.css | 100 +++---
defaults/preferences/tabmix.js | 10 +-
modules/AutoReload.jsm | 3 +-
modules/DownloadLastDir.jsm | 52 +++
modules/MergeWindows.jsm | 5 +-
modules/Places.jsm | 173 +++++++++
modules/RenameTab.jsm | 6 +-
modules/Services.jsm | 69 +++-
modules/Shortcuts.jsm | 35 +-
.../{SessionManagerAddon.jsm => AddonManager.jsm} | 97 +++--
modules/extensions/TabGroupsManager.jsm | 5 +-
modules/log.jsm | 146 +++++---
130 files changed, 2271 insertions(+), 1417 deletions(-)
diff --cc .hgtags
index 0ec3530,e98003e..7717a02
--- a/.hgtags
+++ b/.hgtags
@@@ -67,5 -59,10 +67,12 @@@ dda7b42d6c4a60444b9a15afaef55299df27c1b
ef7e20d58c6c0aaf7dde905f7741f98ce2947173 0.4.1.1pre.130817a
9c454afc59b242f4243aa079f129c802139dd918 0.4.1.1pre.130821a
e40779372d6a0efd00104cc18dd994da2dea006f 0.4.1.1pre.130822a
+36f4970d567a09be73d151606c4de29f14e521b4 0.4.1.1
+67da2d17cb66f437590ea55c86802193a0c4bc7e 0.4.1.1.01
+ f115835d4de62629bb14e29dad417ff5d6175b98 0.4.1.2pre.130913a
+ ccb39d0adf75712771469b112393b45ed475d827 0.4.1.2pre.130918a
+ d9290a78980d1df1b3387b8314c2ed215669f7be 0.4.1.2pre.130928a
+ afa80c359096319ca0a1485c9db1bdf319b23469 0.4.1.2pre.131006a1
+ 92d768b20d873dd7ad5cdbd6cb7a35800f69ff93 0.4.1.2pre.131006a2
+ 21844fdee0ea7a58ca18b3b5e80895a949ffadb6 0.4.1.2pre.131013a1
+ 35541fe3520a027b85ef8c83e43c18f81434e0fc 0.4.1.2pre.131019a1
diff --cc chrome.manifest
index c564e81,86d3ca8..a33fb47
--- a/chrome.manifest
+++ b/chrome.manifest
@@@ -1,23 -1,27 +1,23 @@@
content tabmixplus chrome/content/
resource tabmixplus modules/
- locale tabmixplus bg-BG chrome/locale/bg-BG/
-locale tabmixplus ar chrome/locale/ar/
+ locale tabmixplus bg chrome/locale/bg-BG/
locale tabmixplus ca chrome/locale/ca/
- locale tabmixplus cs-CZ chrome/locale/cs-CZ/
+ locale tabmixplus cs chrome/locale/cs-CZ/
locale tabmixplus da chrome/locale/da/
locale tabmixplus de chrome/locale/de/
locale tabmixplus el chrome/locale/el/
locale tabmixplus en-US chrome/locale/en-US/
locale tabmixplus es-ES chrome/locale/es-ES/
- locale tabmixplus et-EE chrome/locale/et-EE/
- locale tabmixplus fa-IR chrome/locale/fa-IR/
+ locale tabmixplus et chrome/locale/et-EE/
-locale tabmixplus eu chrome/locale/eu/
+ locale tabmixplus fa chrome/locale/fa-IR/
-locale tabmixplus fi chrome/locale/fi/
locale tabmixplus fr chrome/locale/fr/
- locale tabmixplus he-IL chrome/locale/he-IL/
- locale tabmixplus hr-HR chrome/locale/hr-HR/
- locale tabmixplus hu-HU chrome/locale/hu-HU/
+ locale tabmixplus he chrome/locale/he-IL/
+ locale tabmixplus hr chrome/locale/hr-HR/
+ locale tabmixplus hu chrome/locale/hu-HU/
locale tabmixplus it chrome/locale/it/
locale tabmixplus ja chrome/locale/ja/
- locale tabmixplus ko-KR chrome/locale/ko-KR/
+ locale tabmixplus ko chrome/locale/ko-KR/
-locale tabmixplus lv chrome/locale/lv-LV/
locale tabmixplus nl chrome/locale/nl/
locale tabmixplus pl chrome/locale/pl/
locale tabmixplus pt-BR chrome/locale/pt-BR/
--
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