[Pkg-mozext-commits] [tabmixplus] 02/03: Merge with default
David Prévot
taffit at moszumanska.debian.org
Mon Mar 9 23:28:15 UTC 2015
This is an automated email from the git hooks/post-receive script.
taffit pushed a commit to tag 0.4.1.7
in repository tabmixplus.
commit 89374bde3eb5ec89098417326652b60a9c6540bc
Merge: 35e65ae 8d65831
Author: onemen <tabmix.onemen at gmail.com>
Date: Tue Mar 3 09:17:48 2015 +0200
Merge with default
.hgtags | 3 +
chrome/content/changecode.js | 2 +-
chrome/content/click/click.js | 11 +-
chrome/content/extensions/extensions.js | 8 +-
chrome/content/extensions/sage.js | 2 +-
chrome/content/flst/lasttab.js | 45 +-
chrome/content/links/removeBlankTab.js | 9 +-
chrome/content/links/setup.js | 8 +-
chrome/content/links/userInterface.js | 10 +-
chrome/content/minit/minit.js | 75 ++-
chrome/content/minit/tablib.js | 65 +-
chrome/content/overlay/browsr.css | 4 +
chrome/content/places/places.js | 24 +-
chrome/content/preferences/appearance.js | 4 +-
chrome/content/preferences/appearance.xul | 6 +-
chrome/content/preferences/events.js | 2 +-
chrome/content/preferences/menu.js | 4 +-
chrome/content/preferences/menu.xul | 3 +-
chrome/content/preferences/mouse.xul | 5 +-
chrome/content/preferences/shortcuts.xul | 29 -
chrome/content/preferences/shortcutsLabels.xml | 38 ++
.../preferences/subdialogs/pref-filetype.js | 2 +-
chrome/content/session/session.js | 11 +-
chrome/content/tab/scrollbox.xml | 94 +--
chrome/content/tab/tab.js | 659 +++++++++++++++++++--
chrome/content/tab/tabbrowser_4.xml | 470 +--------------
chrome/content/tabmix.js | 66 ++-
chrome/content/tabmix.xul | 5 +-
chrome/content/utils.js | 9 +-
chrome/locale/ar/shortcuts.dtd | 1 +
chrome/locale/bg-BG/pref-appearance.dtd | 1 +
chrome/locale/bg-BG/pref-tabmix.dtd | 3 +
chrome/locale/bg-BG/shortcuts.dtd | 1 +
chrome/locale/ca/pref-appearance.dtd | 11 +-
chrome/locale/ca/pref-tabmix.dtd | 11 +-
chrome/locale/ca/shortcuts.dtd | 1 +
chrome/locale/cs-CZ/misc.dtd | 10 +-
chrome/locale/cs-CZ/pref-appearance.dtd | 3 +-
chrome/locale/cs-CZ/pref-filetype.dtd | 4 +-
chrome/locale/cs-CZ/pref-tabmix.dtd | 315 +++++-----
chrome/locale/cs-CZ/session-manager.properties | 122 ++--
chrome/locale/cs-CZ/shortcuts.dtd | 1 +
chrome/locale/cs-CZ/tabmix.dtd | 58 +-
chrome/locale/cs-CZ/tabmix.properties | 48 +-
chrome/locale/da/pref-appearance.dtd | 1 +
chrome/locale/da/pref-tabmix.dtd | 3 +
chrome/locale/da/shortcuts.dtd | 1 +
chrome/locale/de/pref-appearance.dtd | 1 +
chrome/locale/de/pref-tabmix.dtd | 3 +
chrome/locale/de/shortcuts.dtd | 1 +
chrome/locale/el/pref-appearance.dtd | 1 +
chrome/locale/el/pref-tabmix.dtd | 3 +
chrome/locale/el/shortcuts.dtd | 1 +
chrome/locale/en-US/pref-appearance.dtd | 1 +
chrome/locale/en-US/pref-tabmix.dtd | 621 +++++++++----------
chrome/locale/en-US/session-manager.properties | 214 +++----
chrome/locale/en-US/shortcuts.dtd | 29 +-
chrome/locale/en-US/tabmix.properties | 80 +--
chrome/locale/es-ES/pref-appearance.dtd | 1 +
chrome/locale/es-ES/pref-tabmix.dtd | 3 +
chrome/locale/es-ES/shortcuts.dtd | 1 +
chrome/locale/et-EE/pref-appearance.dtd | 1 +
chrome/locale/et-EE/pref-tabmix.dtd | 3 +
chrome/locale/et-EE/shortcuts.dtd | 1 +
chrome/locale/eu/shortcuts.dtd | 1 +
chrome/locale/fa-IR/pref-appearance.dtd | 1 +
chrome/locale/fa-IR/pref-tabmix.dtd | 3 +
chrome/locale/fa-IR/shortcuts.dtd | 1 +
chrome/locale/fi/shortcuts.dtd | 1 +
chrome/locale/fr/pref-appearance.dtd | 1 +
chrome/locale/fr/pref-tabmix.dtd | 3 +
chrome/locale/fr/shortcuts.dtd | 1 +
chrome/locale/he-IL/pref-appearance.dtd | 1 +
chrome/locale/he-IL/pref-tabmix.dtd | 3 +
chrome/locale/he-IL/shortcuts.dtd | 1 +
chrome/locale/hr-HR/pref-appearance.dtd | 1 +
chrome/locale/hr-HR/pref-tabmix.dtd | 3 +
chrome/locale/hr-HR/shortcuts.dtd | 1 +
chrome/locale/hu-HU/pref-appearance.dtd | 1 +
chrome/locale/hu-HU/pref-tabmix.dtd | 3 +
chrome/locale/hu-HU/shortcuts.dtd | 1 +
chrome/locale/it/pref-appearance.dtd | 1 +
chrome/locale/it/pref-tabmix.dtd | 7 +-
chrome/locale/it/shortcuts.dtd | 1 +
chrome/locale/ja/pref-appearance.dtd | 1 +
chrome/locale/ja/pref-tabmix.dtd | 3 +
chrome/locale/ja/shortcuts.dtd | 5 +-
chrome/locale/ko-KR/pref-appearance.dtd | 1 +
chrome/locale/ko-KR/pref-tabmix.dtd | 3 +
chrome/locale/ko-KR/shortcuts.dtd | 1 +
chrome/locale/lv-LV/shortcuts.dtd | 1 +
chrome/locale/nl/misc.dtd | 4 +-
chrome/locale/nl/pref-appearance.dtd | 1 +
chrome/locale/nl/pref-tabmix.dtd | 5 +-
chrome/locale/nl/shortcuts.dtd | 13 +-
chrome/locale/nl/tabmix.properties | 10 +-
chrome/locale/pl/pref-appearance.dtd | 1 +
chrome/locale/pl/pref-tabmix.dtd | 3 +
chrome/locale/pl/session-manager.properties | 2 +-
chrome/locale/pl/shortcuts.dtd | 1 +
chrome/locale/pt-BR/pref-appearance.dtd | 1 +
chrome/locale/pt-BR/pref-tabmix.dtd | 3 +
chrome/locale/pt-BR/shortcuts.dtd | 1 +
chrome/locale/pt-PT/pref-appearance.dtd | 1 +
chrome/locale/pt-PT/pref-tabmix.dtd | 3 +
chrome/locale/pt-PT/shortcuts.dtd | 1 +
chrome/locale/ro/pref-appearance.dtd | 5 +-
chrome/locale/ro/pref-tabmix.dtd | 11 +-
chrome/locale/ro/shortcuts.dtd | 1 +
chrome/locale/ru-RU/pref-appearance.dtd | 1 +
chrome/locale/ru-RU/pref-tabmix.dtd | 3 +
chrome/locale/ru-RU/shortcuts.dtd | 1 +
chrome/locale/sk-SK/pref-appearance.dtd | 1 +
chrome/locale/sk-SK/pref-tabmix.dtd | 3 +
chrome/locale/sk-SK/shortcuts.dtd | 1 +
chrome/locale/sr/pref-appearance.dtd | 7 +-
chrome/locale/sr/pref-tabmix.dtd | 5 +-
chrome/locale/sr/shortcuts.dtd | 1 +
chrome/locale/sv-SE/pref-appearance.dtd | 1 +
chrome/locale/sv-SE/pref-tabmix.dtd | 3 +
chrome/locale/sv-SE/shortcuts.dtd | 1 +
chrome/locale/tr/pref-appearance.dtd | 1 +
chrome/locale/tr/pref-tabmix.dtd | 3 +
chrome/locale/tr/shortcuts.dtd | 1 +
chrome/locale/uk-UA/pref-appearance.dtd | 1 +
chrome/locale/uk-UA/pref-tabmix.dtd | 3 +
chrome/locale/uk-UA/shortcuts.dtd | 1 +
chrome/locale/vi/pref-appearance.dtd | 1 +
chrome/locale/vi/pref-tabmix.dtd | 3 +
chrome/locale/vi/shortcuts.dtd | 1 +
chrome/locale/zh-CN/pref-appearance.dtd | 1 +
chrome/locale/zh-CN/pref-tabmix.dtd | 3 +
chrome/locale/zh-CN/shortcuts.dtd | 1 +
chrome/locale/zh-TW/pref-appearance.dtd | 1 +
chrome/locale/zh-TW/pref-tabmix.dtd | 3 +
chrome/locale/zh-TW/shortcuts.dtd | 1 +
chrome/skin/app_version/4.0/linux/browser.css | 5 +
chrome/skin/preferences.css | 2 +-
modules/AutoReload.jsm | 6 +-
modules/ContentClick.jsm | 5 +-
modules/ContextMenu.jsm | 2 +-
modules/DynamicRules.jsm | 12 +-
modules/Places.jsm | 10 +-
modules/RenameTab.jsm | 2 +-
modules/Shortcuts.jsm | 26 +-
modules/extensions/TabGroupsManager.jsm | 11 +-
modules/log.jsm | 2 +-
147 files changed, 1895 insertions(+), 1592 deletions(-)
diff --cc .hgtags
index adc34d4,7b62adc..44daf00
--- a/.hgtags
+++ b/.hgtags
@@@ -114,4 -95,6 +114,7 @@@ a5801adb8c0f2570cca0a79603454db8cecc27f
b9eb2299ff26f8659d3321589650b7dccaa75fd5 0.4.1.6pre.141114a1
a8293081d10d11f6a457da739ee4eba56e930d4d 0.4.1.6pre.141222a1
6fff27d15626ca964e3fd82330211ba473ede419 0.4.1.6pre.141229a1
+29458873a7ab21b0d5e8e4c88cb49d8caaa1e7e8 0.4.1.6
+ 061b3bbf1ca62b8a8d161145948664c443089891 0.4.1.7pre.150112a1
+ 897ff86e9e2e123a6d2ffb2b0768068d7b874a5a 0.4.1.7pre.150126a1
+ a881b08218d188c6cb549a8fe8b8b3ac3f783fd3 0.4.1.7pre.150212a1
--
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