[Pkg-mozext-commits] [scrapbook] 02/08: Imported Upstream version 1.5.10

David Prévot taffit at moszumanska.debian.org
Fri Sep 19 19:16:25 UTC 2014


This is an automated email from the git hooks/post-receive script.

taffit pushed a commit to branch master
in repository scrapbook.

commit ec5ba2266be4e455f9380b9950d4fcb457e49e14
Author: David Prévot <taffit at debian.org>
Date:   Fri Sep 19 14:41:20 2014 -0400

    Imported Upstream version 1.5.10
---
 LICENSE.txt                                        |   2 +-
 chrome.manifest                                    |  57 +--
 chrome/content/scrapbook/editor.js                 |  17 -
 chrome/content/scrapbook/overlay.js                |  21 +-
 chrome/content/scrapbook/overlay.xul               | 357 +++++++++---------
 chrome/content/scrapbook/prefs.xul                 | 406 ++++++++++-----------
 chrome/locale/cs-CZ/scrapbook/note.dtd             |   2 +-
 chrome/locale/cs-CZ/scrapbook/prefs.dtd            |   1 -
 chrome/locale/de/scrapbook/note.dtd                |   2 +-
 chrome/locale/de/scrapbook/prefs.dtd               |   1 -
 chrome/locale/en-US/scrapbook/note.dtd             |   2 +-
 chrome/locale/en-US/scrapbook/prefs.dtd            |   1 -
 chrome/locale/es-ES/scrapbook/note.dtd             |   2 +-
 chrome/locale/es-ES/scrapbook/prefs.dtd            |   1 -
 chrome/locale/fi/scrapbook/prefs.dtd               |   1 -
 chrome/locale/fr/scrapbook/note.dtd                |   2 +-
 chrome/locale/fr/scrapbook/prefs.dtd               |   1 -
 chrome/locale/gl-ES/scrapbook/note.dtd             |   2 +-
 chrome/locale/gl-ES/scrapbook/prefs.dtd            |   1 -
 chrome/locale/it/scrapbook/note.dtd                |   2 +-
 chrome/locale/it/scrapbook/prefs.dtd               |   1 -
 chrome/locale/ja/scrapbook/note.dtd                |   2 +-
 chrome/locale/ja/scrapbook/prefs.dtd               |   1 -
 chrome/locale/ko-KR/scrapbook/note.dtd             |   2 +-
 chrome/locale/ko-KR/scrapbook/prefs.dtd            |   1 -
 chrome/locale/pl/scrapbook/editor.dtd              |   4 +-
 chrome/locale/pl/scrapbook/note.dtd                |   2 +-
 chrome/locale/pl/scrapbook/prefs.dtd               |   1 -
 chrome/locale/pt-BR/scrapbook/calculate.dtd        |   2 +
 chrome/locale/pt-BR/scrapbook/capture.dtd          |  13 +
 chrome/locale/pt-BR/scrapbook/capture.properties   |  13 +
 chrome/locale/pt-BR/scrapbook/combine.dtd          |   4 +
 chrome/locale/pt-BR/scrapbook/combine.properties   |   3 +
 chrome/locale/pt-BR/scrapbook/detail.dtd           |  17 +
 chrome/locale/pt-BR/scrapbook/editor.dtd           |  23 ++
 chrome/locale/pt-BR/scrapbook/fulltext.properties  |   9 +
 chrome/locale/pt-BR/scrapbook/hlCustom.dtd         |  20 +
 chrome/locale/pt-BR/scrapbook/mbManage.dtd         |   6 +
 chrome/locale/pt-BR/scrapbook/multiple.dtd         |   8 +
 chrome/locale/pt-BR/scrapbook/note.dtd             |  19 +
 chrome/locale/pt-BR/scrapbook/output.dtd           |   3 +
 chrome/locale/pt-BR/scrapbook/overlay.dtd          |  13 +
 chrome/locale/pt-BR/scrapbook/overlay.properties   |   8 +
 chrome/locale/pt-BR/scrapbook/prefs.dtd            |  34 ++
 chrome/locale/pt-BR/scrapbook/property.dtd         |  13 +
 chrome/locale/pt-BR/scrapbook/property.properties  |  14 +
 chrome/locale/pt-BR/scrapbook/repair.dtd           |   9 +
 chrome/locale/pt-BR/scrapbook/scrapbook.dtd        |  18 +
 chrome/locale/pt-BR/scrapbook/scrapbook.properties |  13 +
 chrome/locale/pt-BR/scrapbook/sort.dtd             |   8 +
 chrome/locale/pt-BR/scrapbook/templateHelp.html    | 109 ++++++
 chrome/locale/pt-BR/scrapbook/trade.dtd            |   5 +
 chrome/locale/pt-BR/scrapbook/trade.properties     |   6 +
 chrome/locale/pt-BR/scrapbook/tree.dtd             |  33 ++
 chrome/locale/ro/scrapbook/note.dtd                |   2 +-
 chrome/locale/ro/scrapbook/prefs.dtd               |   1 -
 chrome/locale/ru-RU/scrapbook/note.dtd             |   2 +-
 chrome/locale/ru-RU/scrapbook/prefs.dtd            |   1 -
 chrome/locale/sk-SK/scrapbook/note.dtd             |   2 +-
 chrome/locale/sk-SK/scrapbook/prefs.dtd            |   1 -
 chrome/locale/sv-SE/scrapbook/note.dtd             |   2 +-
 chrome/locale/sv-SE/scrapbook/prefs.dtd            |   1 -
 chrome/locale/tr/scrapbook/prefs.dtd               |   1 -
 chrome/locale/zh-CN/scrapbook/note.dtd             |   2 +-
 chrome/locale/zh-CN/scrapbook/prefs.dtd            |   1 -
 chrome/locale/zh-TW/scrapbook/note.dtd             |   2 +-
 chrome/locale/zh-TW/scrapbook/prefs.dtd            |   1 -
 defaults/preferences/scrapbook-prefs.js            |   1 -
 install.rdf                                        |  14 +-
 69 files changed, 874 insertions(+), 478 deletions(-)

diff --git a/LICENSE.txt b/LICENSE.txt
index 8a6f20a..82aa128 100644
--- a/LICENSE.txt
+++ b/LICENSE.txt
@@ -14,7 +14,7 @@
  * The Original Code is ScrapBook.
  *
  * The Initial Developer of the Original Code is Gomita.
- * Portions created by the Initial Developer are Copyright (C) 2013
+ * Portions created by the Initial Developer are Copyright (C) 2014
  * the Initial Developer. All Rights Reserved.
  *
  * Contributor(s):
diff --git a/chrome.manifest b/chrome.manifest
index fbb54a9..2b65b9f 100644
--- a/chrome.manifest
+++ b/chrome.manifest
@@ -1,28 +1,29 @@
-overlay	chrome://browser/content/browser.xul	chrome://scrapbook/content/overlay.xul
-content	scrapbook	chrome/content/scrapbook/	contentaccessible=yes
-
-skin	scrapbook	classic/1.0	chrome/skin/classic/scrapbook/
-style	chrome://browser/content/browser.xul	chrome://scrapbook/skin/overlay.css
-style	chrome://global/content/customizeToolbar.xul	chrome://scrapbook/skin/overlay.css
-
-locale	scrapbook	en-US	chrome/locale/en-US/scrapbook/
-locale	scrapbook	ja	chrome/locale/ja/scrapbook/
-locale	scrapbook	cs-CZ	chrome/locale/cs-CZ/scrapbook/
-locale	scrapbook	de	chrome/locale/de/scrapbook/
-locale	scrapbook	es-ES	chrome/locale/es-ES/scrapbook/
-locale	scrapbook	fi	chrome/locale/fi/scrapbook/
-locale	scrapbook	fr	chrome/locale/fr/scrapbook/
-locale	scrapbook	gl-ES	chrome/locale/gl-ES/scrapbook/
-locale	scrapbook	it	chrome/locale/it/scrapbook/
-locale	scrapbook	ko-KR	chrome/locale/ko-KR/scrapbook/
-locale	scrapbook	pl	chrome/locale/pl/scrapbook/
-locale	scrapbook	ro	chrome/locale/ro/scrapbook/
-locale	scrapbook	ru-RU	chrome/locale/ru-RU/scrapbook/
-locale	scrapbook	sk-SK	chrome/locale/sk-SK/scrapbook/
-locale	scrapbook	sv-SE	chrome/locale/sv-SE/scrapbook/
-locale	scrapbook	tr	chrome/locale/tr/scrapbook/
-locale	scrapbook	zh-CN	chrome/locale/zh-CN/scrapbook/
-locale	scrapbook	zh-TW	chrome/locale/zh-TW/scrapbook/
-
-resource	scrapbook-modules	modules/
-
+overlay	chrome://browser/content/browser.xul	chrome://scrapbook/content/overlay.xul
+content	scrapbook	chrome/content/scrapbook/	contentaccessible=yes
+
+skin	scrapbook	classic/1.0	chrome/skin/classic/scrapbook/
+style	chrome://browser/content/browser.xul	chrome://scrapbook/skin/overlay.css
+style	chrome://global/content/customizeToolbar.xul	chrome://scrapbook/skin/overlay.css
+
+locale	scrapbook	en-US	chrome/locale/en-US/scrapbook/
+locale	scrapbook	ja	chrome/locale/ja/scrapbook/
+locale	scrapbook	cs-CZ	chrome/locale/cs-CZ/scrapbook/
+locale	scrapbook	de	chrome/locale/de/scrapbook/
+locale	scrapbook	es-ES	chrome/locale/es-ES/scrapbook/
+locale	scrapbook	fi	chrome/locale/fi/scrapbook/
+locale	scrapbook	fr	chrome/locale/fr/scrapbook/
+locale	scrapbook	gl-ES	chrome/locale/gl-ES/scrapbook/
+locale	scrapbook	it	chrome/locale/it/scrapbook/
+locale	scrapbook	ko-KR	chrome/locale/ko-KR/scrapbook/
+locale	scrapbook	pl	chrome/locale/pl/scrapbook/
+locale	scrapbook	pt-BR	chrome/locale/pt-BR/scrapbook/
+locale	scrapbook	ro	chrome/locale/ro/scrapbook/
+locale	scrapbook	ru-RU	chrome/locale/ru-RU/scrapbook/
+locale	scrapbook	sk-SK	chrome/locale/sk-SK/scrapbook/
+locale	scrapbook	sv-SE	chrome/locale/sv-SE/scrapbook/
+locale	scrapbook	tr	chrome/locale/tr/scrapbook/
+locale	scrapbook	zh-CN	chrome/locale/zh-CN/scrapbook/
+locale	scrapbook	zh-TW	chrome/locale/zh-TW/scrapbook/
+
+resource	scrapbook-modules	modules/
+
diff --git a/chrome/content/scrapbook/editor.js b/chrome/content/scrapbook/editor.js
index 0127d26..4f7e8d2 100755
--- a/chrome/content/scrapbook/editor.js
+++ b/chrome/content/scrapbook/editor.js
@@ -768,21 +768,6 @@ var sbInfoViewer = {
 
 	get TOOLBAR() { return document.getElementById("ScrapBookInfobar"); },
 
-	onPopupShowing : function(aEvent)
-	{
-		var id = ScrapBookBrowserOverlay.getID();
-		var elems = aEvent.originalTarget.childNodes;
-		for ( var i = 0; i < elems.length - 2; i++ ) elems[i].setAttribute("disabled", id ? "false" : "true");
-		for ( i; i < elems.length; i++ ) elems[i].hidden = id;
-		if ( id ) {
-			if ( !ScrapBookData.exists(ScrapBookBrowserOverlay.resource) ) { aEvent.preventDefault(); return; }
-			document.getElementById("ScrapBookStatusPopupE").setAttribute("checked",  ScrapBookBrowserOverlay.editMode);
-			document.getElementById("ScrapBookStatusPopupI").setAttribute("checked",  ScrapBookBrowserOverlay.infoMode);
-		} else {
-			aEvent.originalTarget.lastChild.setAttribute("checked", !(sbPageEditor.TOOLBAR.hidden || document.getElementById("ScrapBookToolbox").hidden));
-		}
-	},
-
 	init : function(aID)
 	{
 		if ( aID != ScrapBookBrowserOverlay.getID() ) return;
@@ -790,9 +775,7 @@ var sbInfoViewer = {
 		this.TOOLBAR.hidden = false;
 		var isTypeSite = (ScrapBookData.getProperty(ScrapBookBrowserOverlay.resource, "type") == "site");
 		document.getElementById("ScrapBookInfoHome").disabled = !isTypeSite;
-		document.getElementById("ScrapBookInfoSite").disabled = !isTypeSite;
 		document.getElementById("ScrapBookInfoHome").setAttribute("image", "chrome://scrapbook/skin/info_home" + (isTypeSite ? "1" : "0") +  ".png");
-		document.getElementById("ScrapBookInfoSite").setAttribute("image", "chrome://scrapbook/skin/info_link" + (isTypeSite ? "1" : "0") +  ".png");
 		var srcLabel = document.getElementById("ScrapBookInfoSource");
 		srcLabel.value = ScrapBookData.getProperty(ScrapBookBrowserOverlay.resource, "source");
 		srcLabel.onclick = function(aEvent){ ScrapBookUtils.loadURL(srcLabel.value, aEvent.button == 1); };
diff --git a/chrome/content/scrapbook/overlay.js b/chrome/content/scrapbook/overlay.js
index 0988321..0a0d249 100755
--- a/chrome/content/scrapbook/overlay.js
+++ b/chrome/content/scrapbook/overlay.js
@@ -104,7 +104,6 @@ var ScrapBookBrowserOverlay = {
 		this.editMode = sbPageEditor.TOOLBAR.getAttribute("autoshow") == "true";
 		this.infoMode = sbInfoViewer.TOOLBAR.getAttribute("autoshow") == "true";
 		document.getElementById("ScrapBookMenu").hidden        = !ScrapBookUtils.getPref("ui.menuBar");
-		document.getElementById("ScrapBookStatusPanel").hidden = !ScrapBookUtils.getPref("ui.statusBar");
 		document.getElementById("ScrapBookToolsMenu").hidden   = !ScrapBookUtils.getPref("ui.toolsMenu");
 		var file = ScrapBookUtils.getScrapBookDir().clone();
 		file.append("folders.txt");
@@ -424,8 +423,24 @@ var ScrapBookMenuHandler = {
 			this._init();
 		var selected = ScrapBookBrowserOverlay.isSelected();
 		if (event.target == aMenuPopup) {
-			var label1 = document.getElementById("ScrapBookContextMenu" + (selected ? 1 : 3)).getAttribute("label");
-			var label2 = document.getElementById("ScrapBookContextMenu" + (selected ? 2 : 4)).getAttribute("label");
+			var isSaved = ScrapBookBrowserOverlay.getID() && ScrapBookData.exists(ScrapBookBrowserOverlay.resource);
+			getElement("ScrapBookMenubarItem1").hidden = isSaved;
+			getElement("ScrapBookMenubarItem2").hidden = isSaved;
+			getElement("ScrapBookMenubarItem3").hidden = isSaved;
+			getElement("ScrapBookMenubarItem4").hidden = isSaved;
+			getElement("ScrapBookEditBefore").hidden   = isSaved;
+			getElement("ScrapBookStatusPopupI").hidden = !isSaved;
+			getElement("ScrapBookStatusPopupE").hidden = !isSaved;
+			getElement("ScrapBookStatusPopupD").hidden = !isSaved;
+			if (isSaved) {
+				getElement("ScrapBookStatusPopupE").setAttribute("checked",  ScrapBookBrowserOverlay.editMode);
+				getElement("ScrapBookStatusPopupI").setAttribute("checked",  ScrapBookBrowserOverlay.infoMode);
+			}
+			else {
+				getElement("ScrapBookEditBefore").setAttribute("checked", !(sbPageEditor.TOOLBAR.hidden || getElement("ScrapBookToolbox").hidden));
+			}
+			var label1 = getElement("ScrapBookContextMenu" + (selected ? 1 : 3)).getAttribute("label");
+			var label2 = getElement("ScrapBookContextMenu" + (selected ? 2 : 4)).getAttribute("label");
 			getElement("ScrapBookMenubarItem1").setAttribute("label", label1);
 			getElement("ScrapBookMenubarItem2").setAttribute("label", label2);
 			getElement("ScrapBookMenubarItem1").className = "menuitem-iconic " + (selected ? "sb-capture-partial" : "sb-capture-entire");
diff --git a/chrome/content/scrapbook/overlay.xul b/chrome/content/scrapbook/overlay.xul
index 507eaee..117174b 100644
--- a/chrome/content/scrapbook/overlay.xul
+++ b/chrome/content/scrapbook/overlay.xul
@@ -1,186 +1,171 @@
-<?xml version="1.0"?>
-
-<?xml-stylesheet href="chrome://scrapbook/skin/overlay.css" type="text/css"?>
-
-<!DOCTYPE overlay [
-	<!ENTITY % overlayDTD SYSTEM "chrome://scrapbook/locale/overlay.dtd">
-	%overlayDTD;
-	<!ENTITY % editorDTD  SYSTEM "chrome://scrapbook/locale/editor.dtd">
-	%editorDTD;
-]>
-
-<overlay id="scrapbooktasksOverlay"
-         xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-         xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
-
-	<script type="application/x-javascript" src="chrome://scrapbook/content/common.js" />
-	<script type="application/x-javascript" src="chrome://scrapbook/content/saver.js" />
-	<script type="application/x-javascript" src="chrome://scrapbook/content/editor.js" />
-	<script type="application/x-javascript" src="chrome://scrapbook/content/highlighter.js" />
-	<script type="application/x-javascript" src="chrome://scrapbook/content/overlay.js" />
-
-	<stringbundleset id="stringbundleset">
-		<stringbundle id="ScrapBookOverlayString" src="chrome://scrapbook/locale/overlay.properties" />
-	</stringbundleset>
-
-	<broadcasterset id="mainBroadcasterSet">
-		<broadcaster id="viewScrapBookSidebar"
-		             type="checkbox" autoCheck="false"
-		             label="ScrapBook"
-		             group="sidebar" sidebartitle="ScrapBook"
-		             sidebarurl="chrome://scrapbook/content/scrapbook.xul"
-		             onclick="if (event.button == 1) ScrapBookUtils.openManageWindow();"
-		             oncommand="toggleSidebar('viewScrapBookSidebar');" />
-	</broadcasterset>
-
-	<keyset id="mainKeyset">
-		<key id="key_openScrapBookSidebar"  modifiers="alt" command="viewScrapBookSidebar" />
-		<key id="key_ScrapBookCapture"      modifiers="accel shift" oncommand="ScrapBookBrowserOverlay.execCapture(0, null, false, 'urn:scrapbook:root');" />
-		<key id="key_ScrapBookCaptureAs"    modifiers="accel shift" oncommand="ScrapBookBrowserOverlay.execCapture(0, null, true , 'urn:scrapbook:root');" />
-		<key id="key_ScrapBookSaveAllTabs"  modifiers="accel shift" oncommand="ScrapBookMenuHandler.execCaptureAllTabs();" />
-		<key id="key_BookmarkWithScrapBook" modifiers="accel shift" oncommand="ScrapBookBrowserOverlay.execBookmark('ScrapBookContextMenu3', 'urn:scrapbook:root', 0, null, true);" />
-	</keyset>
-
-	<menupopup id="viewSidebarMenu">
-		<menuitem observes="viewScrapBookSidebar" key="key_openScrapBookSidebar" />
-	</menupopup>
-
-	<menubar id="main-menubar">
-		<menu id="ScrapBookMenu" label="ScrapBook"
-		      datasources="rdf:null" ref="urn:scrapbook:root" flags="dont-test-empty"
-		      insertafter="bookmarks-menu bookmarksMenu"
-		      oncommand="ScrapBookMenuHandler.onClick(event);"
-		      onclick="if (event.button == 1) ScrapBookMenuHandler.onClick(event);">
-			<menupopup onpopupshowing="ScrapBookMenuHandler.onPopupShowing(event, this);">
-				<menuitem id="ScrapBookMenubarItem1" key="key_ScrapBookCapture" />
-				<menuitem id="ScrapBookMenubarItem2" key="key_ScrapBookCaptureAs" />
-				<menuitem id="ScrapBookMenubarItem3" key="key_BookmarkWithScrapBook" label="&sb.save.bookmark;..." oncommand="ScrapBookBrowserOverlay.execBookmark('ScrapBookContextPicking'); event.stopPropagation();" />
-				<menuitem id="ScrapBookMenubarItem4" key="key_ScrapBookSaveAllTabs" label="&sb.save.alltabs;..." oncommand="ScrapBookMenuHandler.execCaptureAllTabs(); event.stopPropagation();" />
-				<menuitem id="ScrapBookMenubarItem5" sblabel="&sb.sidebar;" observes="viewScrapBookSidebar" key="key_openScrapBookSidebar" />
-				<menuseparator />
-			</menupopup>
-			<template>
-				<rule iscontainer="true">
-					<menupopup>
-						<menu uri="rdf:*" class="menu-iconic bookmark-item" label="rdf:http://amb.vis.ne.jp/mozilla/scrapbook-rdf#title">
-							<menupopup />
-						</menu>
-					</menupopup>
-				</rule>
-				<rule rdf:type="http://home.netscape.com/NC-rdf#BookmarkSeparator">
-					<menupopup>
-						<menuseparator uri="rdf:*" />
-					</menupopup>
-				</rule>
-				<rule>
-					<menupopup>
-						<menuitem uri="rdf:*" class="menuitem-iconic bookmark-item sb-item"
-						          label="rdf:http://amb.vis.ne.jp/mozilla/scrapbook-rdf#title" 
-						          image="rdf:http://amb.vis.ne.jp/mozilla/scrapbook-rdf#icon"
-						          sbtype="rdf:http://amb.vis.ne.jp/mozilla/scrapbook-rdf#type" />
-					</menupopup>
-				</rule>
-			</template>
-		</menu>
-	</menubar>
-
-	<menupopup id="menu_ToolsPopup">
-		<menuitem id="ScrapBookToolsMenu" key="key_openScrapBookSidebar" observes="viewScrapBookSidebar" insertafter="devToolsSeparator" />
-	</menupopup>
-
-	<popup id="contentAreaContextMenu">
-		<menuseparator id="ScrapBookContextMenu0" />
-		<menu     id="ScrapBookContextMenu1" class="menu-iconic     sb-capture-partial" label="&sb.save.partial;"       oncommand="ScrapBookBrowserOverlay.execCapture(1, true , false, event.originalTarget.id);" onclick="ScrapBookBrowserOverlay.onMiddleClick(event,1);"><menupopup onpopupshowing="ScrapBookBrowserOverlay.buildPopup(this);" onpopuphiding="ScrapBookBrowserOverlay.destroyPopup(this);" /></menu>
-		<menuitem id="ScrapBookContextMenu2" class="menuitem-iconic sb-capture-partial" label="&sb.save.partial.as;..." oncommand="ScrapBookBrowserOverlay.execCapture(1, true , true , event.originalTarget.id);" />
-		<menu     id="ScrapBookContextMenu3" class="menu-iconic     sb-capture-entire"  label="&sb.save.entire;"        oncommand="ScrapBookBrowserOverlay.execCapture(2, false, false, event.originalTarget.id);" onclick="ScrapBookBrowserOverlay.onMiddleClick(event,3);"><menupopup onpopupshowing="ScrapBookBrowserOverlay.buildPopup(this);" onpopuphiding="ScrapBookBrowserOverlay.destroyPopup(this);" /></menu>
-		<menuitem id="ScrapBookContextMenu4" class="menuitem-iconic sb-capture-entire"  label="&sb.save.entire.as;..."  oncommand="ScrapBookBrowserOverlay.execCapture(2, false, true , event.originalTarget.id);" />
-		<menu     id="ScrapBookContextMenu5" class="menu-iconic     sb-capture-frame"   label="&sb.save.frame;"         oncommand="ScrapBookBrowserOverlay.execCapture(2, true , false, event.originalTarget.id);" onclick="ScrapBookBrowserOverlay.onMiddleClick(event,5);"><menupopup onpopupshowing="ScrapBookBrowserOverlay.buildPopup(this);" onpopuphiding="ScrapBookBrowserOverlay.destroyPopup(this);" /></menu>
-		<menuitem id="ScrapBookContextMenu6" class="menuitem-iconic sb-capture-frame"   label="&sb.save.frame.as;..."   oncommand="ScrapBookBrowserOverlay.execCapture(2, true , true , event.originalTarget.id);" />
-		<menu     id="ScrapBookContextMenu7" class="menu-iconic     sb-capture-target"  label="&sb.save.target;"        oncommand="ScrapBookBrowserOverlay.execCaptureTarget(false, event.originalTarget.id);"     onclick="ScrapBookBrowserOverlay.onMiddleClick(event,7);"><menupopup onpopupshowing="ScrapBookBrowserOverlay.buildPopup(this);" onpopuphiding="ScrapBookBrowserOverlay.destroyPopup(this);" /></menu>
-		<menuitem id="ScrapBookContextMenu8" class="menuitem-iconic sb-capture-target"  label="&sb.save.target.as;..."  oncommand="ScrapBookBrowserOverlay.execCaptureTarget(true,  event.originalTarget.id);"     />
-		<menu     id="ScrapBookContextSubmenu" label="ScrapBook" hidden="true"><menupopup /></menu>
-		<menu id="ScrapBookContextMenu9" label="&sb.save.bookmark;" oncommand="ScrapBookBrowserOverlay.execBookmark(event.originalTarget.id);">
-			<menupopup onpopupshowing="ScrapBookBrowserOverlay.buildPopup(this);" onpopuphiding="ScrapBookBrowserOverlay.destroyPopup(this);" />
-		</menu>
-	</popup>
-
-	<toolbarpalette id="BrowserToolbarPalette">
-		<toolbarbutton id="scrapbook-button"
-		               tooltiptext="ScrapBook"
-		               observes="viewScrapBookSidebar"
-		               class="toolbarbutton-1 chromeclass-toolbar-additional"
-		               ondragenter="ScrapBookBrowserOverlay.handleDragEvents(event);"
-		               ondragover="ScrapBookBrowserOverlay.handleDragEvents(event);" />
-	</toolbarpalette>
-
-	<vbox id="appcontent">
-		<toolbox id="ScrapBookToolbox" hidden="true">
-			<toolbar id="ScrapBookInfobar" align="center" hidden="true" autoshow="false" persist="autoshow">
-				<image src="chrome://scrapbook/skin/info.png" />
-				<label id="ScrapBookInfoSource" crop="end" flex="1" />
-				<toolbarbutton id="ScrapBookInfoHome" image="chrome://scrapbook/skin/info_home0.png" label="&sb.info.home;"    oncommand="sbInfoViewer.loadFile('index.html');" />
-				<toolbarbutton id="ScrapBookInfoSite" image="chrome://scrapbook/skin/info_link0.png" label="&sb.info.sitemap;" oncommand="sbInfoViewer.loadFile('sitemap.xml');" />
-				<toolbarbutton image="chrome://scrapbook/skin/expander_left.png" tooltiptext="&sb.locate;" oncommand="ScrapBookBrowserOverlay.execLocate(ScrapBookBrowserOverlay.resource);" />
-			</toolbar>
-			<toolbar id="ScrapBookEditor" align="center" hidden="true" autoshow="true" persist="autoshow" style="background-attachment: scroll !important;">
-			    <image id="ScrapBookEditIcon" style="width:16px;height:16px;" />
-				<textbox id="ScrapBookEditTitle"   oninput="sbPageEditor.changed2 = true;" onkeypress="if (event.keyCode == 13) sbPageEditor.saveResource();" onclick="if (event.button == 1) sbPageEditor.selection2Title(this);" flex="1" style="padding:2px;max-width:220px;" />
-				<toolbarbutton image="chrome://scrapbook/skin/edit_comment.png" tooltiptext="&sb.edit.comment;" oncommand="sbPageEditor.toggleComment();" />
-				<textbox id="ScrapBookEditComment" spellcheck="true" oninput="sbPageEditor.onInputComment(this.value);" onkeypress="if (event.keyCode == 13) if (!sbPageEditor.multiline) sbPageEditor.saveResource();" flex="3" style="padding:2px;" />
-				<spacer id="ScrapBookEditSpacer" flex="0" />
-				<toolbarbutton id="ScrapBookHighlighter" type="menu-button" persist="color" image="chrome://scrapbook/skin/edit_highlighter.png" tooltiptext="&sb.highlighter;" oncommand="if (event.originalTarget.localName == 'toolbarbutton') sbPageEditor.highlight();" accesskey="Q">
-					<menupopup onpopupshowing="sbHighlighter.updatePopup();">
-						<menuitem id="ScrapBookHighlighter1" type="radio" label="&sb.highlighter;1" oncommand="sbPageEditor.highlight(1);" />
-						<menuitem id="ScrapBookHighlighter2" type="radio" label="&sb.highlighter;2" oncommand="sbPageEditor.highlight(2);" />
-						<menuitem id="ScrapBookHighlighter3" type="radio" label="&sb.highlighter;3" oncommand="sbPageEditor.highlight(3);" />
-						<menuitem id="ScrapBookHighlighter4" type="radio" label="&sb.highlighter;4" oncommand="sbPageEditor.highlight(4);" />
-					</menupopup>
-				</toolbarbutton>
-				<toolbarbutton id="ScrapBookEditAnnotation" type="menu-button" tooltiptext="&sb.edit.sticky.create;" image="chrome://scrapbook/skin/edit_annotation.png" accesskey="A" oncommand="if (event.originalTarget.localName == 'toolbarbutton') sbAnnotationService.createSticky();">
-					<menupopup onpopupshowing="this.firstChild.nextSibling.setAttribute('disabled', !sbPageEditor.item);">
-						<menuitem label="&sb.edit.attach.link;" oncommand="sbAnnotationService.attach('L',this.label);" />
-						<menuitem label="&sb.edit.attach.file;" oncommand="sbAnnotationService.attach('F',this.label);" />
-						<menuitem label="&sb.edit.inline.add;"  oncommand="sbAnnotationService.addInline();" />
-						<menuseparator />
-						<menuitem label="&sb.edit.sticky.create;"  oncommand="sbAnnotationService.createSticky();" />
-					</menupopup>
-				</toolbarbutton>
-				<toolbarbutton id="ScrapBookEditCutter" type="menu-button" image="chrome://scrapbook/skin/edit_cutter.png" tooltiptext="&sb.edit.cutter;" oncommand="if (event.originalTarget.localName == 'toolbarbutton') sbPageEditor.cutter();">
-					<menupopup>
-						<menuitem label="&sb.edit.remove.script;" oncommand="sbPageEditor.removeElementsByTagName('script');" />
-						<menuitem label="&sb.edit.remove.iframe;" oncommand="sbPageEditor.removeElementsByTagName('iframe');" />
-						<menuseparator />
-						<menuitem label="&sb.highlighter.remove.all;" oncommand="sbPageEditor.removeAllSpan('linemarker-marked-line');" />
-						<menuitem label="&sb.highlighter.remove;"     oncommand="sbPageEditor.removeHighlights();" />
-						<menuseparator />
-						<menuitem label="&sb.edit.cutter;" oncommand="sbPageEditor.cutter();" />
-					</menupopup>
-				</toolbarbutton>
-				<toolbarbutton id="ScrapBookEditEraser" tooltiptext="&sb.edit.eraser;" image="chrome://scrapbook/skin/edit_eraser.png" oncommand="sbDOMEraser.init(this.checked ? 2 : 1);" type="checkbox" autoCheck="false" />
-				<toolbarbutton id="ScrapBookEditUndo"   tooltiptext="&sb.edit.undo;"   image="chrome://scrapbook/skin/edit_undo.png"   oncommand="sbPageEditor.undo();" accesskey="Z" />
-				<toolbarbutton id="ScrapBookEditSave"   tooltiptext="&sb.edit.save;"   image="chrome://scrapbook/skin/edit_save.png"   oncommand="sbPageEditor.saveOrCapture();" onclick="if (event.button == 1) sbPageEditor.saveOrCapture(true);" accesskey="S" />
-				<toolbarbutton image="chrome://scrapbook/skin/expander_left.png" tooltiptext="&sb.locate;" oncommand="ScrapBookBrowserOverlay.execLocate(ScrapBookBrowserOverlay.resource);" />
-			</toolbar>
-		</toolbox>
-	</vbox>
-
-	<statusbar id="status-bar">
-		<statusbarpanel id="ScrapBookStatusPanel"
-		                class="statusbarpanel-menu-iconic"
-		                src="chrome://scrapbook/skin/main.png"
-		                style="padding: 0px 2px;"
-		                onclick="if (event.button == 2) document.getElementById('ScrapBookStatusPopup').showPopup(); else if (event.button == 1) toggleSidebar('viewScrapBookSidebar'); event.stopPropagation();">
-			<menupopup id="ScrapBookStatusPopup" onpopupshowing="sbInfoViewer.onPopupShowing(event);" onclick="event.stopPropagation();">
-				<menuitem id="ScrapBookStatusPopupR" label="&sb.renew;..."     oncommand="sbInfoViewer.renew(true);" onclick="if (event.button == 1) sbInfoViewer.renew(false);" class="menuitem-iconic sb-capture-target" />
-				<menuitem id="ScrapBookStatusPopupS" label="&sb.source;"       oncommand="sbInfoViewer.openSourceURL(false);" onclick="if (event.button == 1) sbInfoViewer.openSourceURL(true);document.getElementById('ScrapBookStatusPopup').hidePopup();" />
-				<menuseparator />
-				<menuitem id="ScrapBookStatusPopupD" label="&sb.indicators;"   type="checkbox" oncommand="sbInfoViewer.toggleIndicator(this.getAttribute('checked'));" persist="checked" />
-				<menuitem id="ScrapBookStatusPopupI" label="&sb.toolbar.info;" type="checkbox" oncommand="sbInfoViewer.toggle();" />
-				<menuitem id="ScrapBookStatusPopupE" label="&sb.toolbar.edit;" type="checkbox" oncommand="sbPageEditor.toggle();" />
-				<menuseparator />
-				<menuitem id="ScrapBookEditBefore" label="&sb.editbefore;" type="checkbox" autocheck="false" oncommand="this.getAttribute('checked') == 'false' ? sbPageEditor.init() : sbPageEditor.exit(true);" />
-			</menupopup>
-		</statusbarpanel>
-	</statusbar>
-
-</overlay>
+<?xml version="1.0"?>
+
+<?xml-stylesheet href="chrome://scrapbook/skin/overlay.css" type="text/css"?>
+
+<!DOCTYPE overlay [
+	<!ENTITY % overlayDTD SYSTEM "chrome://scrapbook/locale/overlay.dtd">
+	%overlayDTD;
+	<!ENTITY % editorDTD  SYSTEM "chrome://scrapbook/locale/editor.dtd">
+	%editorDTD;
+]>
+
+<overlay id="scrapbooktasksOverlay"
+         xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+         xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
+
+	<script type="application/x-javascript" src="chrome://scrapbook/content/common.js" />
+	<script type="application/x-javascript" src="chrome://scrapbook/content/saver.js" />
+	<script type="application/x-javascript" src="chrome://scrapbook/content/editor.js" />
+	<script type="application/x-javascript" src="chrome://scrapbook/content/highlighter.js" />
+	<script type="application/x-javascript" src="chrome://scrapbook/content/overlay.js" />
+
+	<stringbundleset id="stringbundleset">
+		<stringbundle id="ScrapBookOverlayString" src="chrome://scrapbook/locale/overlay.properties" />
+	</stringbundleset>
+
+	<broadcasterset id="mainBroadcasterSet">
+		<broadcaster id="viewScrapBookSidebar"
+		             type="checkbox" autoCheck="false"
+		             label="ScrapBook"
+		             group="sidebar" sidebartitle="ScrapBook"
+		             sidebarurl="chrome://scrapbook/content/scrapbook.xul"
+		             onclick="if (event.button == 1) ScrapBookUtils.openManageWindow();"
+		             oncommand="toggleSidebar('viewScrapBookSidebar');" />
+	</broadcasterset>
+
+	<keyset id="mainKeyset">
+		<key id="key_openScrapBookSidebar"  modifiers="alt" command="viewScrapBookSidebar" />
+		<key id="key_ScrapBookCapture"      modifiers="accel shift" oncommand="ScrapBookBrowserOverlay.execCapture(0, null, false, 'urn:scrapbook:root');" />
+		<key id="key_ScrapBookCaptureAs"    modifiers="accel shift" oncommand="ScrapBookBrowserOverlay.execCapture(0, null, true , 'urn:scrapbook:root');" />
+		<key id="key_ScrapBookSaveAllTabs"  modifiers="accel shift" oncommand="ScrapBookMenuHandler.execCaptureAllTabs();" />
+		<key id="key_BookmarkWithScrapBook" modifiers="accel shift" oncommand="ScrapBookBrowserOverlay.execBookmark('ScrapBookContextMenu3', 'urn:scrapbook:root', 0, null, true);" />
+	</keyset>
+
+	<menupopup id="viewSidebarMenu">
+		<menuitem observes="viewScrapBookSidebar" key="key_openScrapBookSidebar" />
+	</menupopup>
+
+	<menubar id="main-menubar">
+		<menu id="ScrapBookMenu" label="ScrapBook"
+		      datasources="rdf:null" ref="urn:scrapbook:root" flags="dont-test-empty"
+		      insertafter="bookmarks-menu bookmarksMenu"
+		      oncommand="ScrapBookMenuHandler.onClick(event);"
+		      onclick="if (event.button == 1) ScrapBookMenuHandler.onClick(event);">
+			<menupopup onpopupshowing="ScrapBookMenuHandler.onPopupShowing(event, this);">
+				<menuitem id="ScrapBookMenubarItem1" key="key_ScrapBookCapture" />
+				<menuitem id="ScrapBookMenubarItem2" key="key_ScrapBookCaptureAs" />
+				<menuitem id="ScrapBookMenubarItem3" key="key_BookmarkWithScrapBook" label="&sb.save.bookmark;..." oncommand="ScrapBookBrowserOverlay.execBookmark('ScrapBookContextPicking'); event.stopPropagation();" />
+				<menuitem id="ScrapBookMenubarItem4" key="key_ScrapBookSaveAllTabs" label="&sb.save.alltabs;..." oncommand="ScrapBookMenuHandler.execCaptureAllTabs(); event.stopPropagation();" />
+				<menuitem id="ScrapBookEditBefore" label="&sb.editbefore;" type="checkbox" autocheck="false" oncommand="this.getAttribute('checked') == 'false' ? sbPageEditor.init() : sbPageEditor.exit(true);" />
+				<menuitem id="ScrapBookStatusPopupI" label="&sb.toolbar.info;" type="checkbox" oncommand="sbInfoViewer.toggle();" />
+				<menuitem id="ScrapBookStatusPopupE" label="&sb.toolbar.edit;" type="checkbox" oncommand="sbPageEditor.toggle();" />
+				<menuitem id="ScrapBookStatusPopupD" label="&sb.indicators;"   type="checkbox" oncommand="sbInfoViewer.toggleIndicator(this.getAttribute('checked'));" persist="checked" />
+				<menuseparator />
+				<menuitem id="ScrapBookMenubarItem5" sblabel="&sb.sidebar;" observes="viewScrapBookSidebar" key="key_openScrapBookSidebar" />
+				<menuseparator />
+			</menupopup>
+			<template>
+				<rule iscontainer="true">
+					<menupopup>
+						<menu uri="rdf:*" class="menu-iconic bookmark-item" label="rdf:http://amb.vis.ne.jp/mozilla/scrapbook-rdf#title">
+							<menupopup />
+						</menu>
+					</menupopup>
+				</rule>
+				<rule rdf:type="http://home.netscape.com/NC-rdf#BookmarkSeparator">
+					<menupopup>
+						<menuseparator uri="rdf:*" />
+					</menupopup>
+				</rule>
+				<rule>
+					<menupopup>
+						<menuitem uri="rdf:*" class="menuitem-iconic bookmark-item sb-item"
+						          label="rdf:http://amb.vis.ne.jp/mozilla/scrapbook-rdf#title" 
+						          image="rdf:http://amb.vis.ne.jp/mozilla/scrapbook-rdf#icon"
+						          sbtype="rdf:http://amb.vis.ne.jp/mozilla/scrapbook-rdf#type" />
+					</menupopup>
+				</rule>
+			</template>
+		</menu>
+	</menubar>
+
+	<menupopup id="menu_ToolsPopup">
+		<menuitem id="ScrapBookToolsMenu" key="key_openScrapBookSidebar" observes="viewScrapBookSidebar" insertafter="devToolsSeparator" />
+	</menupopup>
+
+	<popup id="contentAreaContextMenu">
+		<menuseparator id="ScrapBookContextMenu0" />
+		<menu     id="ScrapBookContextMenu1" class="menu-iconic     sb-capture-partial" label="&sb.save.partial;"       oncommand="ScrapBookBrowserOverlay.execCapture(1, true , false, event.originalTarget.id);" onclick="ScrapBookBrowserOverlay.onMiddleClick(event,1);"><menupopup onpopupshowing="ScrapBookBrowserOverlay.buildPopup(this);" onpopuphiding="ScrapBookBrowserOverlay.destroyPopup(this);" /></menu>
+		<menuitem id="ScrapBookContextMenu2" class="menuitem-iconic sb-capture-partial" label="&sb.save.partial.as;..." oncommand="ScrapBookBrowserOverlay.execCapture(1, true , true , event.originalTarget.id);" />
+		<menu     id="ScrapBookContextMenu3" class="menu-iconic     sb-capture-entire"  label="&sb.save.entire;"        oncommand="ScrapBookBrowserOverlay.execCapture(2, false, false, event.originalTarget.id);" onclick="ScrapBookBrowserOverlay.onMiddleClick(event,3);"><menupopup onpopupshowing="ScrapBookBrowserOverlay.buildPopup(this);" onpopuphiding="ScrapBookBrowserOverlay.destroyPopup(this);" /></menu>
+		<menuitem id="ScrapBookContextMenu4" class="menuitem-iconic sb-capture-entire"  label="&sb.save.entire.as;..."  oncommand="ScrapBookBrowserOverlay.execCapture(2, false, true , event.originalTarget.id);" />
+		<menu     id="ScrapBookContextMenu5" class="menu-iconic     sb-capture-frame"   label="&sb.save.frame;"         oncommand="ScrapBookBrowserOverlay.execCapture(2, true , false, event.originalTarget.id);" onclick="ScrapBookBrowserOverlay.onMiddleClick(event,5);"><menupopup onpopupshowing="ScrapBookBrowserOverlay.buildPopup(this);" onpopuphiding="ScrapBookBrowserOverlay.destroyPopup(this);" /></menu>
+		<menuitem id="ScrapBookContextMenu6" class="menuitem-iconic sb-capture-frame"   label="&sb.save.frame.as;..."   oncommand="ScrapBookBrowserOverlay.execCapture(2, true , true , event.originalTarget.id);" />
+		<menu     id="ScrapBookContextMenu7" class="menu-iconic     sb-capture-target"  label="&sb.save.target;"        oncommand="ScrapBookBrowserOverlay.execCaptureTarget(false, event.originalTarget.id);"     onclick="ScrapBookBrowserOverlay.onMiddleClick(event,7);"><menupopup onpopupshowing="ScrapBookBrowserOverlay.buildPopup(this);" onpopuphiding="ScrapBookBrowserOverlay.destroyPopup(this);" /></menu>
+		<menuitem id="ScrapBookContextMenu8" class="menuitem-iconic sb-capture-target"  label="&sb.save.target.as;..."  oncommand="ScrapBookBrowserOverlay.execCaptureTarget(true,  event.originalTarget.id);"     />
+		<menu     id="ScrapBookContextSubmenu" label="ScrapBook" hidden="true"><menupopup /></menu>
+		<menu id="ScrapBookContextMenu9" label="&sb.save.bookmark;" oncommand="ScrapBookBrowserOverlay.execBookmark(event.originalTarget.id);">
+			<menupopup onpopupshowing="ScrapBookBrowserOverlay.buildPopup(this);" onpopuphiding="ScrapBookBrowserOverlay.destroyPopup(this);" />
+		</menu>
+	</popup>
+
+	<toolbarpalette id="BrowserToolbarPalette">
+		<toolbarbutton id="scrapbook-button"
+		               tooltiptext="ScrapBook"
+		               observes="viewScrapBookSidebar"
+		               class="toolbarbutton-1 chromeclass-toolbar-additional"
+		               ondragenter="ScrapBookBrowserOverlay.handleDragEvents(event);"
+		               ondragover="ScrapBookBrowserOverlay.handleDragEvents(event);" />
+	</toolbarpalette>
+
+	<vbox id="appcontent">
+		<toolbox id="ScrapBookToolbox" hidden="true">
+			<toolbar id="ScrapBookInfobar" align="center" hidden="true" autoshow="false" persist="autoshow">
+				<image src="chrome://scrapbook/skin/info.png" />
+				<label id="ScrapBookInfoSource" crop="end" flex="1" />
+				<toolbarbutton id="ScrapBookInfoHome" image="chrome://scrapbook/skin/info_home0.png" label="&sb.info.home;"    oncommand="sbInfoViewer.loadFile('index.html');" />
+				<toolbarbutton image="chrome://scrapbook/skin/expander_left.png" tooltiptext="&sb.locate;" oncommand="ScrapBookBrowserOverlay.execLocate(ScrapBookBrowserOverlay.resource);" />
+			</toolbar>
+			<toolbar id="ScrapBookEditor" align="center" hidden="true" autoshow="true" persist="autoshow" style="background-attachment: scroll !important;">
+			    <image id="ScrapBookEditIcon" style="width:16px;height:16px;" />
+				<textbox id="ScrapBookEditTitle"   oninput="sbPageEditor.changed2 = true;" onkeypress="if (event.keyCode == 13) sbPageEditor.saveResource();" onclick="if (event.button == 1) sbPageEditor.selection2Title(this);" flex="1" style="padding:2px;max-width:220px;" />
+				<toolbarbutton image="chrome://scrapbook/skin/edit_comment.png" tooltiptext="&sb.edit.comment;" oncommand="sbPageEditor.toggleComment();" />
+				<textbox id="ScrapBookEditComment" spellcheck="true" oninput="sbPageEditor.onInputComment(this.value);" onkeypress="if (event.keyCode == 13) if (!sbPageEditor.multiline) sbPageEditor.saveResource();" flex="3" style="padding:2px;" />
+				<spacer id="ScrapBookEditSpacer" flex="0" />
+				<toolbarbutton id="ScrapBookHighlighter" type="menu-button" persist="color" image="chrome://scrapbook/skin/edit_highlighter.png" tooltiptext="&sb.highlighter;" oncommand="if (event.originalTarget.localName == 'toolbarbutton') sbPageEditor.highlight();" accesskey="Q">
+					<menupopup onpopupshowing="sbHighlighter.updatePopup();">
+						<menuitem id="ScrapBookHighlighter1" type="radio" label="&sb.highlighter;1" oncommand="sbPageEditor.highlight(1);" />
+						<menuitem id="ScrapBookHighlighter2" type="radio" label="&sb.highlighter;2" oncommand="sbPageEditor.highlight(2);" />
+						<menuitem id="ScrapBookHighlighter3" type="radio" label="&sb.highlighter;3" oncommand="sbPageEditor.highlight(3);" />
+						<menuitem id="ScrapBookHighlighter4" type="radio" label="&sb.highlighter;4" oncommand="sbPageEditor.highlight(4);" />
+					</menupopup>
+				</toolbarbutton>
+				<toolbarbutton id="ScrapBookEditAnnotation" type="menu-button" tooltiptext="&sb.edit.sticky.create;" image="chrome://scrapbook/skin/edit_annotation.png" accesskey="A" oncommand="if (event.originalTarget.localName == 'toolbarbutton') sbAnnotationService.createSticky();">
+					<menupopup onpopupshowing="this.firstChild.nextSibling.setAttribute('disabled', !sbPageEditor.item);">
+						<menuitem label="&sb.edit.attach.link;" oncommand="sbAnnotationService.attach('L',this.label);" />
+						<menuitem label="&sb.edit.attach.file;" oncommand="sbAnnotationService.attach('F',this.label);" />
+						<menuitem label="&sb.edit.inline.add;"  oncommand="sbAnnotationService.addInline();" />
+						<menuseparator />
+						<menuitem label="&sb.edit.sticky.create;"  oncommand="sbAnnotationService.createSticky();" />
+					</menupopup>
+				</toolbarbutton>
+				<toolbarbutton id="ScrapBookEditCutter" type="menu-button" image="chrome://scrapbook/skin/edit_cutter.png" tooltiptext="&sb.edit.cutter;" oncommand="if (event.originalTarget.localName == 'toolbarbutton') sbPageEditor.cutter();">
+					<menupopup>
+						<menuitem label="&sb.edit.remove.script;" oncommand="sbPageEditor.removeElementsByTagName('script');" />
+						<menuitem label="&sb.edit.remove.iframe;" oncommand="sbPageEditor.removeElementsByTagName('iframe');" />
+						<menuseparator />
+						<menuitem label="&sb.highlighter.remove.all;" oncommand="sbPageEditor.removeAllSpan('linemarker-marked-line');" />
+						<menuitem label="&sb.highlighter.remove;"     oncommand="sbPageEditor.removeHighlights();" />
+						<menuseparator />
+						<menuitem label="&sb.edit.cutter;" oncommand="sbPageEditor.cutter();" />
+					</menupopup>
+				</toolbarbutton>
+				<toolbarbutton id="ScrapBookEditEraser" tooltiptext="&sb.edit.eraser;" image="chrome://scrapbook/skin/edit_eraser.png" oncommand="sbDOMEraser.init(this.checked ? 2 : 1);" type="checkbox" autoCheck="false" />
+				<toolbarbutton id="ScrapBookEditUndo"   tooltiptext="&sb.edit.undo;"   image="chrome://scrapbook/skin/edit_undo.png"   oncommand="sbPageEditor.undo();" accesskey="Z" />
+				<toolbarbutton id="ScrapBookEditSave"   tooltiptext="&sb.edit.save;"   image="chrome://scrapbook/skin/edit_save.png"   oncommand="sbPageEditor.saveOrCapture();" onclick="if (event.button == 1) sbPageEditor.saveOrCapture(true);" accesskey="S" />
+				<toolbarbutton image="chrome://scrapbook/skin/expander_left.png" tooltiptext="&sb.locate;" oncommand="ScrapBookBrowserOverlay.execLocate(ScrapBookBrowserOverlay.resource);" />
+			</toolbar>
+		</toolbox>
+	</vbox>
+
+</overlay>
diff --git a/chrome/content/scrapbook/prefs.xul b/chrome/content/scrapbook/prefs.xul
index 1890499..703aef5 100644
--- a/chrome/content/scrapbook/prefs.xul
+++ b/chrome/content/scrapbook/prefs.xul
@@ -1,204 +1,202 @@
-<?xml version="1.0"?>
-
-<?xml-stylesheet href="chrome://global/skin/" type="text/css"?>
-<?xml-stylesheet href="chrome://scrapbook/skin/prefs.css" type="text/css"?>
-<?xml-stylesheet href="chrome://mozapps/content/preferences/preferences.css"?>
-<?xml-stylesheet href="chrome://browser/skin/preferences/preferences.css"?>
-
-<!DOCTYPE prefwindow [
-	<!ENTITY % mainDTD SYSTEM "chrome://scrapbook/locale/scrapbook.dtd">
-	%mainDTD;
-	<!ENTITY % treeDTD SYSTEM "chrome://scrapbook/locale/tree.dtd">
-	%treeDTD;
-	<!ENTITY % prefDTD SYSTEM "chrome://scrapbook/locale/prefs.dtd">
-	%prefDTD;
-	<!ENTITY % editDTD SYSTEM "chrome://scrapbook/locale/editor.dtd">
-	%editDTD;
-	<!ENTITY % overlayDTD SYSTEM "chrome://scrapbook/locale/overlay.dtd">
-	%overlayDTD;
-]>
-
-<prefwindow id="sbPrefWindow"
-            xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
-            title="ScrapBook &sb.tools.options;"
-            style="width: 40em;"
-            onload="sbPrefWindow.init();">
-
-	<prefpane id="mainPane" label="&sb.prefs.main;" flex="1">
-		<preferences>
-			<preference id="scrapbook.ui.contextMenu"    name="scrapbook.ui.contextMenu"    type="bool" />
-			<preference id="scrapbook.ui.contextSubMenu" name="scrapbook.ui.contextSubMenu" type="bool" />
-			<preference id="scrapbook.ui.folderList.maxEntries" name="scrapbook.ui.folderList.maxEntries" type="int" />
-			<preference id="scrapbook.ui.bookmarkMenu"   name="scrapbook.ui.bookmarkMenu"   type="bool" />
-			<preference id="scrapbook.ui.menuBar"        name="scrapbook.ui.menuBar"        type="bool" />
-			<preference id="scrapbook.ui.menuBar.icon"   name="scrapbook.ui.menuBar.icon"   type="bool" />
-			<preference id="scrapbook.ui.toolsMenu"      name="scrapbook.ui.toolsMenu"      type="bool" />
-			<preference id="scrapbook.ui.statusBar"      name="scrapbook.ui.statusBar"      type="bool" />
-		</preferences>
-		<checkbox preference="scrapbook.ui.contextMenu"    label="&sb.prefs.ui.contextMenu;"
-		          onsyncfrompreference="sbPrefWindow.updateGroupedUI('scrapbook.ui.contextMenu', 'contextmenu');" />
-		<checkbox preference="scrapbook.ui.contextSubMenu" label="&sb.prefs.ui.contextSubMenu; *" class="indent" group="contextmenu" />
-		<checkbox preference="scrapbook.ui.bookmarkMenu"   label="&sb.prefs.ui.bookmark;" class="indent" group="contextmenu" />
-		<hbox align="center">
-			<label value="&sb.prefs.ui.folderList.maxEntries.1;" class="indent" />
-			<textbox preference="scrapbook.ui.folderList.maxEntries" type="number" size="2" max="99" />
-			<label value="&sb.prefs.ui.folderList.maxEntries.2;" />
-		</hbox>
-		<checkbox preference="scrapbook.ui.menuBar"        label="&sb.prefs.ui.menuBar;"
-		          onsyncfrompreference="sbPrefWindow.updateGroupedUI('scrapbook.ui.menuBar', 'menubar');" />
-		<checkbox preference="scrapbook.ui.menuBar.icon"   label="&sb.prefs.ui.menuBar.icon; *"   class="indent" group="menubar" />
-		<checkbox preference="scrapbook.ui.toolsMenu" label="&sb.prefs.ui.toolsMenu;" />
-		<checkbox preference="scrapbook.ui.statusBar" label="&sb.prefs.ui.statusBar;" />
-		<description>* &sb.prefs.restart;</description>
-	</prefpane>
-
-	<prefpane id="keysPane" label="&sb.prefs.keys;" flex="1">
-		<preferences>
-			<preference id="scrapbook.key.menubar"     name="scrapbook.key.menubar"     type="string" />
-			<preference id="scrapbook.key.sidebar"     name="scrapbook.key.sidebar"     type="string" />
-			<preference id="scrapbook.key.save"        name="scrapbook.key.save"        type="string" />
-			<preference id="scrapbook.key.saveAs"      name="scrapbook.key.saveAs"      type="string" />
-			<preference id="scrapbook.key.saveAllTabs" name="scrapbook.key.saveAllTabs" type="string" />
-			<preference id="scrapbook.key.bookmark"    name="scrapbook.key.bookmark"    type="string" />
-		</preferences>
-		<grid>
-			<columns>
-				<column />
-				<column flex="1" />
-			</columns>
-			<rows oninput="sbPrefWindow.onInputKey(event);">
-				<row id="sbKeysMenubar" align="center">
-					<label value="&sb.menubar;:" group="menubar" />
-					<hbox align="center">
-						<label value="Alt+" group="menubar" />
-						<textbox size="1" maxlength="1" preference="scrapbook.key.menubar" group="menubar" />
-					</hbox>
-				</row>
-				<row align="center">
-					<label value="&sb.sidebar;:" />
-					<hbox align="center">
-						<label value="Alt+" />
-						<textbox size="1" maxlength="1" preference="scrapbook.key.sidebar" />
-					</hbox>
-				</row>
-				<row align="center">
-					<label value="&sb.save.entire;:" />
-					<hbox align="center">
-						<label value="Ctrl+Shift+" />
-						<textbox size="1" maxlength="1" preference="scrapbook.key.save" />
-					</hbox>
-				</row>
-				<row align="center">
-					<label value="&sb.save.entire.as;:" />
-					<hbox align="center">
-						<label value="Ctrl+Shift+" />
-						<textbox size="1" maxlength="1" preference="scrapbook.key.saveAs" />
-					</hbox>
-				</row>
-				<row align="center">
-					<label value="&sb.save.alltabs;:" />
-					<hbox align="center">
-						<label value="Ctrl+Shift+" />
-						<textbox size="1" maxlength="1" preference="scrapbook.key.saveAllTabs" />
-					</hbox>
-				</row>
-				<row align="center">
-					<label value="&sb.save.bookmark;:" />
-					<hbox align="center">
-						<label value="Ctrl+Shift+" />
-						<textbox size="1" maxlength="1" preference="scrapbook.key.bookmark" />
-					</hbox>
-				</row>
-			</rows>
-		</grid>
-		<description style="margin-top: 1em;">&sb.prefs.restart;</description>
-	</prefpane>
-
-	<prefpane id="tabsPane" label="&sb.prefs.tabs;" flex="1">
-		<preferences>
-			<preference id="scrapbook.tabs.open"         name="scrapbook.tabs.open"         type="bool" />
-			<preference id="scrapbook.tabs.openSource"   name="scrapbook.tabs.openSource"   type="bool" />
-			<preference id="scrapbook.tabs.combinedView" name="scrapbook.tabs.combinedView" type="bool" />
-			<preference id="scrapbook.tabs.searchResult" name="scrapbook.tabs.searchResult" type="bool" />
-			<preference id="scrapbook.tabs.note"         name="scrapbook.tabs.note"         type="bool" />
-		</preferences>
-		<description value="&sb.prefs.tabs.tips;:" />
-		<checkbox preference="scrapbook.tabs.open"         label="&sb.open;" />
-		<checkbox preference="scrapbook.tabs.openSource"   label="&sb.open.source;" />
-		<checkbox preference="scrapbook.tabs.combinedView" label="&sb.folder.combine;" />
-		<checkbox preference="scrapbook.tabs.searchResult" label="&sb.search.fulltext;" />
-		<checkbox preference="scrapbook.tabs.note"         label="&sb.prefs.tabs.note;" />
-	</prefpane>
-
-	<prefpane id="editPane" label="&sb.prefs.edit;" flex="1">
-		<groupbox>
-			<caption label="&sb.highlighter;" />
-			<hbox id="hlTemplate" align="center">
-				<label />
-				<label value="Firefox, rediscover the web" />
-				<spacer flex="1" />
-				<button label="&sb.button.customize;..." hlumber="0"
-				        oncommand="sbPrefWindow.hlCustomize(this.getAttribute('hlnumber'));" />
-			</hbox>
-		</groupbox>
-	</prefpane>
-
-	<prefpane id="organizePane" label="&sb.prefs.organize;" flex="1">
-		<preferences>
-			<preference id="scrapbook.data.default"      name="scrapbook.data.default"      type="bool" />
-			<preference id="scrapbook.data.path"         name="scrapbook.data.path"         type="file" />
-			<preference id="scrapbook.multibook.enabled" name="scrapbook.multibook.enabled" type="bool" />
-			<preference id="scrapbook.confirmDelete"     name="scrapbook.confirmDelete"     type="bool" />
-			<preference id="scrapbook.tree.autoCollapse" name="scrapbook.tree.autoCollapse" type="bool" />
-			<preference id="scrapbook.tree.unshift"      name="scrapbook.tree.unshift"      type="bool" />
-		</preferences>
-		<groupbox>
-			<caption id="sbDataCaption" label="&sb.prefs.data;" />
-			<radiogroup id="sbDataDefault"
-			            preference="scrapbook.data.default"
-			            onsyncfrompreference="sbPrefWindow.updateDataUI();">
-				<radio label="&sb.prefs.data.default;" value="true" />
-				<hbox>
-					<radio label="&sb.prefs.data.custom;" value="false" />
-					<filefield id="sbDataPath" flex="1" />
-					<button id="sbDataButton"
-					        label="&sb.button.browse;..." label2="&sb.prefs.data.tips;"
-					        oncommand="sbPrefWindow.selectFolder(this.getAttribute('label2'));" />
-				</hbox>
-			</radiogroup>
-			<separator />
-			<checkbox id="sbMultiBookEnabled"
-			          preference="scrapbook.multibook.enabled"
-			          label="&sb.prefs.multibook.enabled;"
-			          onsyncfrompreference="sbPrefWindow.updateDataUI();" />
-			<description class="indent">&sb.prefs.multibook.tips;</description>
-		</groupbox>
-		<checkbox preference="scrapbook.confirmDelete"     label="&sb.prefs.confirmDelete;" />
-		<checkbox preference="scrapbook.tree.autoCollapse" label="&sb.prefs.tree.autoCollapse;" />
-		<hbox align="center">
-			<label value="&sb.prefs.tree.unshift;" />
-			<menulist preference="scrapbook.tree.unshift">
-				<menupopup>
-					<menuitem value="true"  label="&sb.prefs.tree.unshift.top;" />
-					<menuitem value="false" label="&sb.prefs.tree.unshift.bottom;" />
-				</menupopup>
-			</menulist>
-		</hbox>
-		<spacer flex="1" height="50" />
-	</prefpane>
-
-	<prefpane id="advancedPane" label="&sb.prefs.advanced;" flex="1">
-		<preferences>
-			<preference id="scrapbook.showDetailOnDrop"   name="scrapbook.showDetailOnDrop"   type="bool" />
-			<preference id="scrapbook.notifyOnComplete"   name="scrapbook.notifyOnComplete"   type="bool" />
-		</preferences>
-		<checkbox preference="scrapbook.showDetailOnDrop" label="&sb.prefs.showDetailOnDrop;" />
-		<checkbox preference="scrapbook.notifyOnComplete" label="&sb.prefs.notifyOnComplete;" />
-	</prefpane>
-
-	<script type="application/x-javascript" src="chrome://scrapbook/content/common.js" />
-	<script type="application/x-javascript" src="chrome://scrapbook/content/prefs.js" />
-	<script type="application/x-javascript" src="chrome://scrapbook/content/highlighter.js" />
-	<script type="application/x-javascript" src="chrome://scrapbook/content/mbService.js" />
-
-</prefwindow>
+<?xml version="1.0"?>
+
+<?xml-stylesheet href="chrome://global/skin/" type="text/css"?>
+<?xml-stylesheet href="chrome://scrapbook/skin/prefs.css" type="text/css"?>
+<?xml-stylesheet href="chrome://mozapps/content/preferences/preferences.css"?>
+<?xml-stylesheet href="chrome://browser/skin/preferences/preferences.css"?>
+
+<!DOCTYPE prefwindow [
+	<!ENTITY % mainDTD SYSTEM "chrome://scrapbook/locale/scrapbook.dtd">
+	%mainDTD;
+	<!ENTITY % treeDTD SYSTEM "chrome://scrapbook/locale/tree.dtd">
+	%treeDTD;
+	<!ENTITY % prefDTD SYSTEM "chrome://scrapbook/locale/prefs.dtd">
+	%prefDTD;
+	<!ENTITY % editDTD SYSTEM "chrome://scrapbook/locale/editor.dtd">
+	%editDTD;
+	<!ENTITY % overlayDTD SYSTEM "chrome://scrapbook/locale/overlay.dtd">
+	%overlayDTD;
+]>
+
+<prefwindow id="sbPrefWindow"
+            xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
+            title="ScrapBook &sb.tools.options;"
+            style="width: 40em;"
+            onload="sbPrefWindow.init();">
+
+	<prefpane id="mainPane" label="&sb.prefs.main;" flex="1">
+		<preferences>
+			<preference id="scrapbook.ui.contextMenu"    name="scrapbook.ui.contextMenu"    type="bool" />
+			<preference id="scrapbook.ui.contextSubMenu" name="scrapbook.ui.contextSubMenu" type="bool" />
+			<preference id="scrapbook.ui.folderList.maxEntries" name="scrapbook.ui.folderList.maxEntries" type="int" />
+			<preference id="scrapbook.ui.bookmarkMenu"   name="scrapbook.ui.bookmarkMenu"   type="bool" />
+			<preference id="scrapbook.ui.menuBar"        name="scrapbook.ui.menuBar"        type="bool" />
+			<preference id="scrapbook.ui.menuBar.icon"   name="scrapbook.ui.menuBar.icon"   type="bool" />
+			<preference id="scrapbook.ui.toolsMenu"      name="scrapbook.ui.toolsMenu"      type="bool" />
+		</preferences>
+		<checkbox preference="scrapbook.ui.contextMenu"    label="&sb.prefs.ui.contextMenu;"
+		          onsyncfrompreference="sbPrefWindow.updateGroupedUI('scrapbook.ui.contextMenu', 'contextmenu');" />
+		<checkbox preference="scrapbook.ui.contextSubMenu" label="&sb.prefs.ui.contextSubMenu; *" class="indent" group="contextmenu" />
+		<checkbox preference="scrapbook.ui.bookmarkMenu"   label="&sb.prefs.ui.bookmark;" class="indent" group="contextmenu" />
+		<hbox align="center">
+			<label value="&sb.prefs.ui.folderList.maxEntries.1;" class="indent" />
+			<textbox preference="scrapbook.ui.folderList.maxEntries" type="number" size="2" max="99" />
+			<label value="&sb.prefs.ui.folderList.maxEntries.2;" />
+		</hbox>
+		<checkbox preference="scrapbook.ui.menuBar"        label="&sb.prefs.ui.menuBar;"
+		          onsyncfrompreference="sbPrefWindow.updateGroupedUI('scrapbook.ui.menuBar', 'menubar');" />
+		<checkbox preference="scrapbook.ui.menuBar.icon"   label="&sb.prefs.ui.menuBar.icon; *"   class="indent" group="menubar" />
+		<checkbox preference="scrapbook.ui.toolsMenu" label="&sb.prefs.ui.toolsMenu;" />
+		<description>* &sb.prefs.restart;</description>
+	</prefpane>
+
+	<prefpane id="keysPane" label="&sb.prefs.keys;" flex="1">
+		<preferences>
+			<preference id="scrapbook.key.menubar"     name="scrapbook.key.menubar"     type="string" />
+			<preference id="scrapbook.key.sidebar"     name="scrapbook.key.sidebar"     type="string" />
+			<preference id="scrapbook.key.save"        name="scrapbook.key.save"        type="string" />
+			<preference id="scrapbook.key.saveAs"      name="scrapbook.key.saveAs"      type="string" />
+			<preference id="scrapbook.key.saveAllTabs" name="scrapbook.key.saveAllTabs" type="string" />
+			<preference id="scrapbook.key.bookmark"    name="scrapbook.key.bookmark"    type="string" />
+		</preferences>
+		<grid>
+			<columns>
+				<column />
+				<column flex="1" />
+			</columns>
+			<rows oninput="sbPrefWindow.onInputKey(event);">
+				<row id="sbKeysMenubar" align="center">
+					<label value="&sb.menubar;:" group="menubar" />
+					<hbox align="center">
+						<label value="Alt+" group="menubar" />
+						<textbox size="1" maxlength="1" preference="scrapbook.key.menubar" group="menubar" />
+					</hbox>
+				</row>
+				<row align="center">
+					<label value="&sb.sidebar;:" />
+					<hbox align="center">
+						<label value="Alt+" />
+						<textbox size="1" maxlength="1" preference="scrapbook.key.sidebar" />
+					</hbox>
+				</row>
+				<row align="center">
+					<label value="&sb.save.entire;:" />
+					<hbox align="center">
+						<label value="Ctrl+Shift+" />
+						<textbox size="1" maxlength="1" preference="scrapbook.key.save" />
+					</hbox>
+				</row>
+				<row align="center">
+					<label value="&sb.save.entire.as;:" />
+					<hbox align="center">
+						<label value="Ctrl+Shift+" />
+						<textbox size="1" maxlength="1" preference="scrapbook.key.saveAs" />
+					</hbox>
+				</row>
+				<row align="center">
+					<label value="&sb.save.alltabs;:" />
+					<hbox align="center">
+						<label value="Ctrl+Shift+" />
+						<textbox size="1" maxlength="1" preference="scrapbook.key.saveAllTabs" />
+					</hbox>
+				</row>
+				<row align="center">
+					<label value="&sb.save.bookmark;:" />
+					<hbox align="center">
+						<label value="Ctrl+Shift+" />
+						<textbox size="1" maxlength="1" preference="scrapbook.key.bookmark" />
+					</hbox>
+				</row>
+			</rows>
+		</grid>
+		<description style="margin-top: 1em;">&sb.prefs.restart;</description>
+	</prefpane>
+
+	<prefpane id="tabsPane" label="&sb.prefs.tabs;" flex="1">
+		<preferences>
+			<preference id="scrapbook.tabs.open"         name="scrapbook.tabs.open"         type="bool" />
+			<preference id="scrapbook.tabs.openSource"   name="scrapbook.tabs.openSource"   type="bool" />
+			<preference id="scrapbook.tabs.combinedView" name="scrapbook.tabs.combinedView" type="bool" />
+			<preference id="scrapbook.tabs.searchResult" name="scrapbook.tabs.searchResult" type="bool" />
+			<preference id="scrapbook.tabs.note"         name="scrapbook.tabs.note"         type="bool" />
+		</preferences>
+		<description value="&sb.prefs.tabs.tips;:" />
+		<checkbox preference="scrapbook.tabs.open"         label="&sb.open;" />
+		<checkbox preference="scrapbook.tabs.openSource"   label="&sb.open.source;" />
+		<checkbox preference="scrapbook.tabs.combinedView" label="&sb.folder.combine;" />
+		<checkbox preference="scrapbook.tabs.searchResult" label="&sb.search.fulltext;" />
+		<checkbox preference="scrapbook.tabs.note"         label="&sb.prefs.tabs.note;" />
+	</prefpane>
+
+	<prefpane id="editPane" label="&sb.prefs.edit;" flex="1">
+		<groupbox>
+			<caption label="&sb.highlighter;" />
+			<hbox id="hlTemplate" align="center">
+				<label />
+				<label value="Firefox, rediscover the web" />
+				<spacer flex="1" />
+				<button label="&sb.button.customize;..." hlumber="0"
+				        oncommand="sbPrefWindow.hlCustomize(this.getAttribute('hlnumber'));" />
+			</hbox>
+		</groupbox>
+	</prefpane>
+
+	<prefpane id="organizePane" label="&sb.prefs.organize;" flex="1">
+		<preferences>
+			<preference id="scrapbook.data.default"      name="scrapbook.data.default"      type="bool" />
+			<preference id="scrapbook.data.path"         name="scrapbook.data.path"         type="file" />
+			<preference id="scrapbook.multibook.enabled" name="scrapbook.multibook.enabled" type="bool" />
+			<preference id="scrapbook.confirmDelete"     name="scrapbook.confirmDelete"     type="bool" />
+			<preference id="scrapbook.tree.autoCollapse" name="scrapbook.tree.autoCollapse" type="bool" />
+			<preference id="scrapbook.tree.unshift"      name="scrapbook.tree.unshift"      type="bool" />
+		</preferences>
+		<groupbox>
+			<caption id="sbDataCaption" label="&sb.prefs.data;" />
+			<radiogroup id="sbDataDefault"
+			            preference="scrapbook.data.default"
+			            onsyncfrompreference="sbPrefWindow.updateDataUI();">
+				<radio label="&sb.prefs.data.default;" value="true" />
+				<hbox>
+					<radio label="&sb.prefs.data.custom;" value="false" />
+					<filefield id="sbDataPath" flex="1" />
+					<button id="sbDataButton"
+					        label="&sb.button.browse;..." label2="&sb.prefs.data.tips;"
+					        oncommand="sbPrefWindow.selectFolder(this.getAttribute('label2'));" />
+				</hbox>
+			</radiogroup>
+			<separator />
+			<checkbox id="sbMultiBookEnabled"
+			          preference="scrapbook.multibook.enabled"
+			          label="&sb.prefs.multibook.enabled;"
+			          onsyncfrompreference="sbPrefWindow.updateDataUI();" />
+			<description class="indent">&sb.prefs.multibook.tips;</description>
+		</groupbox>
+		<checkbox preference="scrapbook.confirmDelete"     label="&sb.prefs.confirmDelete;" />
+		<checkbox preference="scrapbook.tree.autoCollapse" label="&sb.prefs.tree.autoCollapse;" />
+		<hbox align="center">
+			<label value="&sb.prefs.tree.unshift;" />
+			<menulist preference="scrapbook.tree.unshift">
+				<menupopup>
+					<menuitem value="true"  label="&sb.prefs.tree.unshift.top;" />
+					<menuitem value="false" label="&sb.prefs.tree.unshift.bottom;" />
+				</menupopup>
+			</menulist>
+		</hbox>
+		<spacer flex="1" height="50" />
+	</prefpane>
+
+	<prefpane id="advancedPane" label="&sb.prefs.advanced;" flex="1">
+		<preferences>
+			<preference id="scrapbook.showDetailOnDrop"   name="scrapbook.showDetailOnDrop"   type="bool" />
+			<preference id="scrapbook.notifyOnComplete"   name="scrapbook.notifyOnComplete"   type="bool" />
+		</preferences>
+		<checkbox preference="scrapbook.showDetailOnDrop" label="&sb.prefs.showDetailOnDrop;" />
+		<checkbox preference="scrapbook.notifyOnComplete" label="&sb.prefs.notifyOnComplete;" />
+	</prefpane>
+
+	<script type="application/x-javascript" src="chrome://scrapbook/content/common.js" />
+	<script type="application/x-javascript" src="chrome://scrapbook/content/prefs.js" />
+	<script type="application/x-javascript" src="chrome://scrapbook/content/highlighter.js" />
+	<script type="application/x-javascript" src="chrome://scrapbook/content/mbService.js" />
+
+</prefwindow>
diff --git a/chrome/locale/cs-CZ/scrapbook/note.dtd b/chrome/locale/cs-CZ/scrapbook/note.dtd
index a31e3fa..e4da876 100644
--- a/chrome/locale/cs-CZ/scrapbook/note.dtd
+++ b/chrome/locale/cs-CZ/scrapbook/note.dtd
@@ -5,7 +5,7 @@
 <!ENTITY sb.note.normalview "Běžný náhled">
 <!ENTITY sb.note.template "Upravit šablonu HTML">
 <!ENTITY sb.note.autolinefeed "Automatické řádkování">
-<!ENTITY sb.note.autolinefeed.t "Přidat tag <br> na konec řádku v &sb.note.htmlview;">
+<!ENTITY sb.note.autolinefeed.t "Přidat tag <br> na konec řádku v &sb.note.htmlview;">
 <!ENTITY sb.note.fontsize "Velikost písma">
 <!ENTITY sb.note.help "Nápověda">
 <!ENTITY sb.note.print "Tisk">
diff --git a/chrome/locale/cs-CZ/scrapbook/prefs.dtd b/chrome/locale/cs-CZ/scrapbook/prefs.dtd
index a9ee144..efc6668 100644
--- a/chrome/locale/cs-CZ/scrapbook/prefs.dtd
+++ b/chrome/locale/cs-CZ/scrapbook/prefs.dtd
@@ -13,7 +13,6 @@
 <!ENTITY sb.prefs.ui.menuBar "Zobrazit v liště nabídek">
 <!ENTITY sb.prefs.ui.menuBar.icon "Ikona">
 <!ENTITY sb.prefs.ui.toolsMenu "Zobrazit v nabídce položku 'Nástroje'">
-<!ENTITY sb.prefs.ui.statusBar "Zobrazit ve stavové liště">
 <!ENTITY sb.prefs.restart "Změna vyžaduje restart Firefoxu.">
 <!ENTITY sb.prefs.tabs.tips "Otevřít v panelu pro následující operace">
 <!ENTITY sb.prefs.tabs.note "Upravit poznámku">
diff --git a/chrome/locale/de/scrapbook/note.dtd b/chrome/locale/de/scrapbook/note.dtd
index 1a56999..b9274ea 100644
--- a/chrome/locale/de/scrapbook/note.dtd
+++ b/chrome/locale/de/scrapbook/note.dtd
@@ -5,7 +5,7 @@
 <!ENTITY sb.note.normalview "Normale Ansicht">
 <!ENTITY sb.note.template "HTML-Vorlage bearbeiten">
 <!ENTITY sb.note.autolinefeed "Automatischer Zeilenvorschub">
-<!ENTITY sb.note.autolinefeed.t "<br>-Tag am Zeilenende der HTML-Vorschau einfügen">
+<!ENTITY sb.note.autolinefeed.t "<br>-Tag am Zeilenende der HTML-Vorschau einfügen">
 <!ENTITY sb.note.fontsize "Schriftgröße">
 <!ENTITY sb.note.help "Hilfe">
 <!ENTITY sb.note.print "Drucken">
diff --git a/chrome/locale/de/scrapbook/prefs.dtd b/chrome/locale/de/scrapbook/prefs.dtd
index 5ed360d..0f12a8b 100644
--- a/chrome/locale/de/scrapbook/prefs.dtd
+++ b/chrome/locale/de/scrapbook/prefs.dtd
@@ -13,7 +13,6 @@
 <!ENTITY sb.prefs.ui.menuBar "ScrapBook-Eintrag in der Menüleiste anzeigen">
 <!ENTITY sb.prefs.ui.menuBar.icon "Symbol">
 <!ENTITY sb.prefs.ui.toolsMenu "ScrapBook-Eintrag im Menü "Extras" anzeigen">
-<!ENTITY sb.prefs.ui.statusBar "Symbol in der Statusleiste anzeigen">
 <!ENTITY sb.prefs.restart "Änderung erfordert einen Firefox-Neustart.">
 <!ENTITY sb.prefs.tabs.tips "Folgende Aktionen öffnen neue Tabs">
 <!ENTITY sb.prefs.tabs.note "Notiz bearbeiten">
diff --git a/chrome/locale/en-US/scrapbook/note.dtd b/chrome/locale/en-US/scrapbook/note.dtd
index 4374379..aeed5dd 100644
--- a/chrome/locale/en-US/scrapbook/note.dtd
+++ b/chrome/locale/en-US/scrapbook/note.dtd
@@ -5,7 +5,7 @@
 <!ENTITY sb.note.normalview "Normal View">
 <!ENTITY sb.note.template "Edit Template HTML">
 <!ENTITY sb.note.autolinefeed "Auto-Linefeed">
-<!ENTITY sb.note.autolinefeed.t "Add <br> tag to the end-of-line at &sb.note.htmlview;">
+<!ENTITY sb.note.autolinefeed.t "Add <br> tag to the end-of-line at &sb.note.htmlview;">
 <!ENTITY sb.note.fontsize "Font Size">
 <!ENTITY sb.note.help "Help">
 <!ENTITY sb.note.print "Print">
diff --git a/chrome/locale/en-US/scrapbook/prefs.dtd b/chrome/locale/en-US/scrapbook/prefs.dtd
index 8eceaba..4530d33 100644
--- a/chrome/locale/en-US/scrapbook/prefs.dtd
+++ b/chrome/locale/en-US/scrapbook/prefs.dtd
@@ -13,7 +13,6 @@
 <!ENTITY sb.prefs.ui.menuBar "Show in menu bar">
 <!ENTITY sb.prefs.ui.menuBar.icon "Icon">
 <!ENTITY sb.prefs.ui.toolsMenu "Show in 'Tools' menu">
-<!ENTITY sb.prefs.ui.statusBar "Show in status bar">
 <!ENTITY sb.prefs.restart "Change requires Firefox restart.">
 <!ENTITY sb.prefs.tabs.tips "Open in tab for the following operations">
 <!ENTITY sb.prefs.tabs.note "Edit Note">
diff --git a/chrome/locale/es-ES/scrapbook/note.dtd b/chrome/locale/es-ES/scrapbook/note.dtd
index bc703d0..bfc9459 100644
--- a/chrome/locale/es-ES/scrapbook/note.dtd
+++ b/chrome/locale/es-ES/scrapbook/note.dtd
@@ -5,7 +5,7 @@
 <!ENTITY sb.note.normalview "Vista Normal">
 <!ENTITY sb.note.template "Editar Plantilla HTML">
 <!ENTITY sb.note.autolinefeed "Salto de línea automático">
-<!ENTITY sb.note.autolinefeed.t "Añadir etiqueta <br> al final de la línea para &sb.note.htmlview;">
+<!ENTITY sb.note.autolinefeed.t "Añadir etiqueta <br> al final de la línea para &sb.note.htmlview;">
 <!ENTITY sb.note.fontsize "Tamaño de fuente">
 <!ENTITY sb.note.help "Ayuda">
 <!ENTITY sb.note.print "Imprimir">
diff --git a/chrome/locale/es-ES/scrapbook/prefs.dtd b/chrome/locale/es-ES/scrapbook/prefs.dtd
index 79dd6e2..b05e341 100644
--- a/chrome/locale/es-ES/scrapbook/prefs.dtd
+++ b/chrome/locale/es-ES/scrapbook/prefs.dtd
@@ -13,7 +13,6 @@
 <!ENTITY sb.prefs.ui.menuBar "Mostrar en la barra de Menú">
 <!ENTITY sb.prefs.ui.menuBar.icon "Icono">
 <!ENTITY sb.prefs.ui.toolsMenu "Mostrar en el menú 'Herramientas'">
-<!ENTITY sb.prefs.ui.statusBar "Mostrar en la barra de estado">
 <!ENTITY sb.prefs.restart "El cambio requiere reiniciar Firefox">
 <!ENTITY sb.prefs.tabs.tips "Abrir en pestañas al realizar las siguientes operaciones">
 <!ENTITY sb.prefs.tabs.note "Editar Nota">
diff --git a/chrome/locale/fi/scrapbook/prefs.dtd b/chrome/locale/fi/scrapbook/prefs.dtd
index c0d7a86..7f59dc6 100644
--- a/chrome/locale/fi/scrapbook/prefs.dtd
+++ b/chrome/locale/fi/scrapbook/prefs.dtd
@@ -13,7 +13,6 @@
 <!ENTITY sb.prefs.ui.menuBar "Näytä valikkopalkissa">
 <!ENTITY sb.prefs.ui.menuBar.icon "Kuvake">
 <!ENTITY sb.prefs.ui.toolsMenu "Näytä Työkalut-valikossa">
-<!ENTITY sb.prefs.ui.statusBar "Näytä tilarivillä">
 <!ENTITY sb.prefs.restart "Muutokset saatetaan voimaan, kun Firefox käynnistetään uudelleen.">
 <!ENTITY sb.prefs.tabs.tips "Avaa välilehtiin seuraavilla toiminnoilla">
 <!ENTITY sb.prefs.tabs.note "Muokkaa muistilappua">
diff --git a/chrome/locale/fr/scrapbook/note.dtd b/chrome/locale/fr/scrapbook/note.dtd
index c17471a..f24e294 100644
--- a/chrome/locale/fr/scrapbook/note.dtd
+++ b/chrome/locale/fr/scrapbook/note.dtd
@@ -5,7 +5,7 @@
 <!ENTITY sb.note.normalview "Vue normale">
 <!ENTITY sb.note.template "Éditer le modèle HTML">
 <!ENTITY sb.note.autolinefeed "Retour à la ligne automatique">
-<!ENTITY sb.note.autolinefeed.t "Ajouter une balise <br> en fin de ligne en mode &sb.note.htmlview;">
+<!ENTITY sb.note.autolinefeed.t "Ajouter une balise <br> en fin de ligne en mode &sb.note.htmlview;">
 <!ENTITY sb.note.fontsize "Taille de police">
 <!ENTITY sb.note.help "Aide">
 <!ENTITY sb.note.print "Imprimer">
diff --git a/chrome/locale/fr/scrapbook/prefs.dtd b/chrome/locale/fr/scrapbook/prefs.dtd
index 3d767f8..6b61419 100644
--- a/chrome/locale/fr/scrapbook/prefs.dtd
+++ b/chrome/locale/fr/scrapbook/prefs.dtd
@@ -13,7 +13,6 @@
 <!ENTITY sb.prefs.ui.menuBar "Afficher dans la barre des menus">
 <!ENTITY sb.prefs.ui.menuBar.icon "Icône">
 <!ENTITY sb.prefs.ui.toolsMenu "Afficher dans le menu 'Outils'">
-<!ENTITY sb.prefs.ui.statusBar "Afficher dans la barre d'état">
 <!ENTITY sb.prefs.restart "La modification nécessite un redémarrage de Firefox.">
 <!ENTITY sb.prefs.tabs.tips "Ouvrir dans un nouvel onglet pour les opérations suivantes">
 <!ENTITY sb.prefs.tabs.note "Éditer une note">
diff --git a/chrome/locale/gl-ES/scrapbook/note.dtd b/chrome/locale/gl-ES/scrapbook/note.dtd
index 65278ae..bbd4775 100644
--- a/chrome/locale/gl-ES/scrapbook/note.dtd
+++ b/chrome/locale/gl-ES/scrapbook/note.dtd
@@ -5,7 +5,7 @@
 <!ENTITY sb.note.normalview "Vista normal">
 <!ENTITY sb.note.template "Editar sobreplanta HTML">
 <!ENTITY sb.note.autolinefeed "Quebras de liña automáticas">
-<!ENTITY sb.note.autolinefeed.t "Engadir etiquetas <br> ao remate de cada liña en &sb.note.htmlview;">
+<!ENTITY sb.note.autolinefeed.t "Engadir etiquetas <br> ao remate de cada liña en &sb.note.htmlview;">
 <!ENTITY sb.note.fontsize "Tamaño da fonte">
 <!ENTITY sb.note.help "Axuda">
 <!ENTITY sb.note.print "Imprimir">
diff --git a/chrome/locale/gl-ES/scrapbook/prefs.dtd b/chrome/locale/gl-ES/scrapbook/prefs.dtd
index 83ee4cd..d0cb32e 100644
--- a/chrome/locale/gl-ES/scrapbook/prefs.dtd
+++ b/chrome/locale/gl-ES/scrapbook/prefs.dtd
@@ -13,7 +13,6 @@
 <!ENTITY sb.prefs.ui.menuBar "Amosar na barra do menú">
 <!ENTITY sb.prefs.ui.menuBar.icon "Icona">
 <!ENTITY sb.prefs.ui.toolsMenu "Amosar no menú 'Ferramentas'">
-<!ENTITY sb.prefs.ui.statusBar "Amosar na barra de estado">
 <!ENTITY sb.prefs.restart "É necesario reiniciar o Firefox despois dos cambios.">
 <!ENTITY sb.prefs.tabs.tips "Para as seguintes operacións abrirase unha pestana">
 <!ENTITY sb.prefs.tabs.note "Editar aviso">
diff --git a/chrome/locale/it/scrapbook/note.dtd b/chrome/locale/it/scrapbook/note.dtd
index a3516e8..a7437af 100644
--- a/chrome/locale/it/scrapbook/note.dtd
+++ b/chrome/locale/it/scrapbook/note.dtd
@@ -5,7 +5,7 @@
 <!ENTITY sb.note.normalview "Visualizzazione normale">
 <!ENTITY sb.note.template "Modifica modello HTML">
 <!ENTITY sb.note.autolinefeed "Tag automatico a fine riga">
-<!ENTITY sb.note.autolinefeed.t "Aggiungi il tag <br> a fine riga nell'anteprima HTML">
+<!ENTITY sb.note.autolinefeed.t "Aggiungi il tag <br> a fine riga nell'anteprima HTML">
 <!ENTITY sb.note.fontsize "Grandezza carattere">
 <!ENTITY sb.note.help "Contenuti guida">
 <!ENTITY sb.note.print "Stampa">
diff --git a/chrome/locale/it/scrapbook/prefs.dtd b/chrome/locale/it/scrapbook/prefs.dtd
index 650a871..16fd3bd 100644
--- a/chrome/locale/it/scrapbook/prefs.dtd
+++ b/chrome/locale/it/scrapbook/prefs.dtd
@@ -13,7 +13,6 @@
 <!ENTITY sb.prefs.ui.menuBar "Mostra la voce 'ScrapBook' nella barra dei menu">
 <!ENTITY sb.prefs.ui.menuBar.icon "Mostra come icona">
 <!ENTITY sb.prefs.ui.toolsMenu "Mostra la voce 'ScrapBook' nel menu "Strumenti"">
-<!ENTITY sb.prefs.ui.statusBar "Mostra l'icona di ScrapBook nella barra di stato">
 <!ENTITY sb.prefs.restart "Riavviare il browser per rendere effettive le modifiche">
 <!ENTITY sb.prefs.tabs.tips "Azioni che verranno eseguite in nuove schede">
 <!ENTITY sb.prefs.tabs.note "Apri/modifica le note">
diff --git a/chrome/locale/ja/scrapbook/note.dtd b/chrome/locale/ja/scrapbook/note.dtd
index 9b5d68e..ca8e15d 100644
--- a/chrome/locale/ja/scrapbook/note.dtd
+++ b/chrome/locale/ja/scrapbook/note.dtd
@@ -5,7 +5,7 @@
 <!ENTITY sb.note.normalview "通常ビュー">
 <!ENTITY sb.note.template "テンプレートHTMLの編集">
 <!ENTITY sb.note.autolinefeed "自動改行">
-<!ENTITY sb.note.autolinefeed.t "&sb.note.htmlview;時に行末に<br>タグを自動で付加します">
+<!ENTITY sb.note.autolinefeed.t "&sb.note.htmlview;時に行末に<br>タグを自動で付加します">
 <!ENTITY sb.note.fontsize "文字サイズ">
 <!ENTITY sb.note.help "ヘルプ">
 <!ENTITY sb.note.print "印刷">
diff --git a/chrome/locale/ja/scrapbook/prefs.dtd b/chrome/locale/ja/scrapbook/prefs.dtd
index e335f60..a1dc100 100644
--- a/chrome/locale/ja/scrapbook/prefs.dtd
+++ b/chrome/locale/ja/scrapbook/prefs.dtd
@@ -13,7 +13,6 @@
 <!ENTITY sb.prefs.ui.menuBar "メニューバーに表示">
 <!ENTITY sb.prefs.ui.menuBar.icon "アイコン">
 <!ENTITY sb.prefs.ui.toolsMenu "'ツール' メニューに表示">
-<!ENTITY sb.prefs.ui.statusBar "ステータスバーに表示">
 <!ENTITY sb.prefs.restart "変更は Firefox 再起動後に反映されます。">
 <!ENTITY sb.prefs.tabs.tips "次の操作を新しいタブで開く">
 <!ENTITY sb.prefs.tabs.note "ノートの編集">
diff --git a/chrome/locale/ko-KR/scrapbook/note.dtd b/chrome/locale/ko-KR/scrapbook/note.dtd
index b0edc58..032dcd7 100644
--- a/chrome/locale/ko-KR/scrapbook/note.dtd
+++ b/chrome/locale/ko-KR/scrapbook/note.dtd
@@ -5,7 +5,7 @@
 <!ENTITY sb.note.normalview "기본 모양 보기">
 <!ENTITY sb.note.template "탬플릿 HTML 편집">
 <!ENTITY sb.note.autolinefeed "자동 줄바꿈">
-<!ENTITY sb.note.autolinefeed.t "HTML 보기 시 행 끝에 <br> 태그 자동으로 붙이기">
+<!ENTITY sb.note.autolinefeed.t "HTML 보기 시 행 끝에 <br> 태그 자동으로 붙이기">
 <!ENTITY sb.note.fontsize "글꼴 크기">
 <!ENTITY sb.note.help "도움말">
 <!ENTITY sb.note.print "인쇄">
diff --git a/chrome/locale/ko-KR/scrapbook/prefs.dtd b/chrome/locale/ko-KR/scrapbook/prefs.dtd
index e3bd2b0..09e0c13 100644
--- a/chrome/locale/ko-KR/scrapbook/prefs.dtd
+++ b/chrome/locale/ko-KR/scrapbook/prefs.dtd
@@ -13,7 +13,6 @@
 <!ENTITY sb.prefs.ui.menuBar "메뉴 도구 모음에 보이기">
 <!ENTITY sb.prefs.ui.menuBar.icon "아이콘">
 <!ENTITY sb.prefs.ui.toolsMenu "'도구' 메뉴에 보이기">
-<!ENTITY sb.prefs.ui.statusBar "상태 표시줄에 보이기">
 <!ENTITY sb.prefs.restart "표시 항목의 변경된 내용을 적용하려면 Firefox를 재시작해야 합니다.">
 <!ENTITY sb.prefs.tabs.tips "다음 동작은 탭으로 열기">
 <!ENTITY sb.prefs.tabs.note "노트 편집">
diff --git a/chrome/locale/pl/scrapbook/editor.dtd b/chrome/locale/pl/scrapbook/editor.dtd
index f6b67b0..fd92f8a 100644
--- a/chrome/locale/pl/scrapbook/editor.dtd
+++ b/chrome/locale/pl/scrapbook/editor.dtd
@@ -10,8 +10,8 @@
 <!ENTITY sb.edit.attach.file "Dołącz plik do zaznaczenia">
 <!ENTITY sb.edit.attach.link "Dołącz odnośnik do zaznaczenia">
 <!ENTITY sb.edit.cutter "Usuń zaznaczenie">
-<!ENTITY sb.edit.remove.iframe "Usuń wszystkie znaczniki <iframe>">
-<!ENTITY sb.edit.remove.script "Usuń wszystkie znaczniki <script>">
+<!ENTITY sb.edit.remove.iframe "Usuń wszystkie znaczniki <iframe>">
+<!ENTITY sb.edit.remove.script "Usuń wszystkie znaczniki <script>">
 <!ENTITY sb.highlighter "Podświetlanie">
 <!ENTITY sb.highlighter.remove "Usuń podświetlenie w zaznaczeniu">
 <!ENTITY sb.highlighter.remove.all "Usuń wszystkie podświetlone komentarze">
diff --git a/chrome/locale/pl/scrapbook/note.dtd b/chrome/locale/pl/scrapbook/note.dtd
index e1ca39f..42415ad 100644
--- a/chrome/locale/pl/scrapbook/note.dtd
+++ b/chrome/locale/pl/scrapbook/note.dtd
@@ -5,7 +5,7 @@
 <!ENTITY sb.note.normalview "Widok normalny">
 <!ENTITY sb.note.template "Edycja szablonu dokumentu HTML">
 <!ENTITY sb.note.autolinefeed "Autouzupełnianie">
-<!ENTITY sb.note.autolinefeed.t "Dodaj znacznik <br> na końcu linii w podglądzie dokumentu HTML">
+<!ENTITY sb.note.autolinefeed.t "Dodaj znacznik <br> na końcu linii w podglądzie dokumentu HTML">
 <!ENTITY sb.note.fontsize "Wielkość czcionki">
 <!ENTITY sb.note.help "Pomoc">
 <!ENTITY sb.note.print "Drukuj">
diff --git a/chrome/locale/pl/scrapbook/prefs.dtd b/chrome/locale/pl/scrapbook/prefs.dtd
index 5a580de..c32943b 100644
--- a/chrome/locale/pl/scrapbook/prefs.dtd
+++ b/chrome/locale/pl/scrapbook/prefs.dtd
@@ -13,7 +13,6 @@
 <!ENTITY sb.prefs.ui.menuBar "Wyświetlaj na pasku menu">
 <!ENTITY sb.prefs.ui.menuBar.icon "Ikona">
 <!ENTITY sb.prefs.ui.toolsMenu "Wyświetlaj w menu Narzędzia element ScrapBook">
-<!ENTITY sb.prefs.ui.statusBar "Wyświetlaj ikonę rozszerzenia na pasku stanu">
 <!ENTITY sb.prefs.restart "Zmiana wymaga ponownego uruchomienia Firefoksa">
 <!ENTITY sb.prefs.tabs.tips "Otwieraj w karcie wynik następujących poleceń">
 <!ENTITY sb.prefs.tabs.note "Edytuj notatkę">
diff --git a/chrome/locale/pt-BR/scrapbook/calculate.dtd b/chrome/locale/pt-BR/scrapbook/calculate.dtd
new file mode 100644
index 0000000..4223b5d
--- /dev/null
+++ b/chrome/locale/pt-BR/scrapbook/calculate.dtd
@@ -0,0 +1,2 @@
+<!ENTITY sb.calc.total.size "Tamanho total">
+<!ENTITY sb.calc.diagnosis "Diagnóstico">
diff --git a/chrome/locale/pt-BR/scrapbook/capture.dtd b/chrome/locale/pt-BR/scrapbook/capture.dtd
new file mode 100644
index 0000000..b9488e1
--- /dev/null
+++ b/chrome/locale/pt-BR/scrapbook/capture.dtd
@@ -0,0 +1,13 @@
+<!ENTITY sb.save "Salvar">
+<!ENTITY sb.save.abort "Interromper">
+<!ENTITY sb.save.start "Iniciar">
+<!ENTITY sb.save.retry "Tentar novamente">
+<!ENTITY sb.save.skip "Pular">
+<!ENTITY sb.save.pause "Pausar">
+<!ENTITY sb.save.filter "Filtrar">
+<!ENTITY sb.save.filter.domain "Restringir ao domínio">
+<!ENTITY sb.save.filter.level "Restringir ao diretório">
+<!ENTITY sb.save.filter.string "Filtrar por texto…">
+<!ENTITY sb.save.filter.checkon "Marcar todos">
+<!ENTITY sb.save.filter.checkoff "Desmarcar todos">
+<!ENTITY sb.save.filter.invert "Inverter marcação">
diff --git a/chrome/locale/pt-BR/scrapbook/capture.properties b/chrome/locale/pt-BR/scrapbook/capture.properties
new file mode 100644
index 0000000..6358b31
--- /dev/null
+++ b/chrome/locale/pt-BR/scrapbook/capture.properties
@@ -0,0 +1,13 @@
+CONNECT=Conectando
+CONNECT_SUCCESS=Conectado
+CONNECT_FAILURE=Falha ao Conectar
+HTTP_STATUS_403=Acesso negado.
+HTTP_STATUS_404=Arquivo não encontrado.
+CONTENT_TYPE_FAILURE=Falha ao pegar Content-Type.
+LOADING=Carregando
+SAVE_START=Iniciar salvamento
+SAVE_ABORT=Salvamento abortado.
+REBUILD_LINKS=Reconstruindo Links (%S/%S)
+REBUILD_LINKS_COMPLETE=Completo.
+WAITING=Esperando (%S segs.)
+FILTER_BY_STRING=URLs que não contiverem a string indicada serão excluídas.
diff --git a/chrome/locale/pt-BR/scrapbook/combine.dtd b/chrome/locale/pt-BR/scrapbook/combine.dtd
new file mode 100644
index 0000000..9a805a9
--- /dev/null
+++ b/chrome/locale/pt-BR/scrapbook/combine.dtd
@@ -0,0 +1,4 @@
+<!ENTITY sb.combine.dragdrop "Adicione itens da árvore arrastando e soltando na ordem em que deseja combiná-los. Você pode fazer isso com vários itens de uma vez.">
+<!ENTITY sb.combine.preview "Pré-visualização">
+<!ENTITY sb.combine.preview.d "Pressione o botão 'Combinar' após verificar a pré-visualização.">
+<!ENTITY sb.combine.option.remove "Após terminar de combinar, remover as páginas originais">
diff --git a/chrome/locale/pt-BR/scrapbook/combine.properties b/chrome/locale/pt-BR/scrapbook/combine.properties
new file mode 100644
index 0000000..7a9d178
--- /dev/null
+++ b/chrome/locale/pt-BR/scrapbook/combine.properties
@@ -0,0 +1,3 @@
+FINISH_BUTTON_LABEL=Combinar
+CANNOT_COMBINE_FRAMES=Falha ao combinar, pois esta página contém frames.
+WARN_ABOUT_INDEPTH2=NOTA: Páginas ligadas salvas com salvamento em profundidade não serão combinadas.
diff --git a/chrome/locale/pt-BR/scrapbook/detail.dtd b/chrome/locale/pt-BR/scrapbook/detail.dtd
new file mode 100644
index 0000000..f61f1b5
--- /dev/null
+++ b/chrome/locale/pt-BR/scrapbook/detail.dtd
@@ -0,0 +1,17 @@
+<!ENTITY sb.detail.title "Salvar detalhe">
+<!ENTITY sb.detail.new.folder "Nova pasta">
+<!ENTITY sb.detail.select.folder "Selecionar pasta">
+<!ENTITY sb.detail.option "Opções">
+<!ENTITY sb.detail.option.images "Imagens">
+<!ENTITY sb.detail.option.styles "Estilos">
+<!ENTITY sb.detail.linked.file "Baixar arquivos linkados">
+<!ENTITY sb.detail.linked.image "Imagem">
+<!ENTITY sb.detail.linked.sound "Som">
+<!ENTITY sb.detail.linked.movie "Filme">
+<!ENTITY sb.detail.linked.archive "Arquivo">
+<!ENTITY sb.detail.linked.custom "Personalizado">
+<!ENTITY sb.detail.linked.page2 "Salvamento em profundidade">
+<!ENTITY sb.detail.linked.page.depth "Profundidade para seguir os links">
+<!ENTITY sb.detail.linked.page.text "Após completar as capturas, todas as páginas serão linkadas umas às outras.">
+<!ENTITY sb.detail.warnAboutRenew "AVISO: 'Capturar Novamente' substitui a página salva anteriormente.">
+<!ENTITY sb.detail.warnAboutScript "AVISO: JavaScript pode causar alguns problemas.">
diff --git a/chrome/locale/pt-BR/scrapbook/editor.dtd b/chrome/locale/pt-BR/scrapbook/editor.dtd
new file mode 100644
index 0000000..9aa0f0b
--- /dev/null
+++ b/chrome/locale/pt-BR/scrapbook/editor.dtd
@@ -0,0 +1,23 @@
+<!ENTITY sb.toolbar.edit "Barra de Ferramentas de Edição">
+<!ENTITY sb.toolbar.info "Barra de Informações">
+<!ENTITY sb.edit.eraser "Apagador DOM: Remove elementos da Página Web através do clique.">
+<!ENTITY sb.edit.undo "Desfazer">
+<!ENTITY sb.edit.save "Salvar Mudanças">
+<!ENTITY sb.edit.comment "Expandir Área do Comentário">
+<!ENTITY sb.edit.sticky "Anotação">
+<!ENTITY sb.edit.sticky.create "Criar &sb.edit.sticky;">
+<!ENTITY sb.edit.inline.add "Adicionar Comentário à Seleção">
+<!ENTITY sb.edit.attach.file "Anexar um Arquivo à Seleção">
+<!ENTITY sb.edit.attach.link "Anexar um Link à Seleção">
+<!ENTITY sb.edit.cutter "Remover a Seleção">
+<!ENTITY sb.edit.remove.iframe "Remover todas as tags IFRAME">
+<!ENTITY sb.edit.remove.script "Remover todas as tags SCRIPT">
+<!ENTITY sb.highlighter "Realce">
+<!ENTITY sb.highlighter.remove "Remover Realces na Seleção">
+<!ENTITY sb.highlighter.remove.all "Remover Todos os Realces na Página">
+<!ENTITY sb.source "Abrir URL Fonte">
+<!ENTITY sb.renew "Capturar Novamente">
+<!ENTITY sb.locate "Sincronizar Com a Árvore do Painel">
+<!ENTITY sb.indicators "Mostrar Indicadores de Link">
+<!ENTITY sb.info.home "Página Inicial">
+<!ENTITY sb.info.sitemap "Mapa do Site">
diff --git a/chrome/locale/pt-BR/scrapbook/fulltext.properties b/chrome/locale/pt-BR/scrapbook/fulltext.properties
new file mode 100644
index 0000000..aa798cd
--- /dev/null
+++ b/chrome/locale/pt-BR/scrapbook/fulltext.properties
@@ -0,0 +1,9 @@
+BUILD_CACHE=Atualizar Cache
+BUILD_CACHE_INIT=Iniciando... 
+BUILD_CACHE_UPDATE=Construindo... 
+BUILD_CACHE_REMOVE=Removendo... 
+RESULTS_FOUND=%S Resultado(s) Encontrado(s)
+MATCHING=Encontrar RegExp %S
+INCLUDING=Incluindo %S
+EXCLUDING=Excluindo %S
+QUOTATION='%S'
diff --git a/chrome/locale/pt-BR/scrapbook/hlCustom.dtd b/chrome/locale/pt-BR/scrapbook/hlCustom.dtd
new file mode 100644
index 0000000..aa6ef10
--- /dev/null
+++ b/chrome/locale/pt-BR/scrapbook/hlCustom.dtd
@@ -0,0 +1,20 @@
+<!ENTITY sb.hlCustom.preset "Estilos pré-definidos">
+<!ENTITY sb.hlCustom.background "Fundo">
+<!ENTITY sb.hlCustom.color "Cor">
+<!ENTITY sb.hlCustom.text "Texto">
+<!ENTITY sb.hlCustom.bold "Negrito">
+<!ENTITY sb.hlCustom.italic "Itálico">
+<!ENTITY sb.hlCustom.line "Riscado">
+<!ENTITY sb.hlCustom.border "Borda">
+<!ENTITY sb.hlCustom.type "Tipo">
+<!ENTITY sb.hlCustom.box "Caixa">
+<!ENTITY sb.hlCustom.underline "Sublinhado">
+<!ENTITY sb.hlCustom.style "Estilo">
+<!ENTITY sb.hlCustom.solid "Sólido">
+<!ENTITY sb.hlCustom.dotted "Pontilhado">
+<!ENTITY sb.hlCustom.dashed "Tracejado">
+<!ENTITY sb.hlCustom.double "Duplo">
+<!ENTITY sb.hlCustom.width "Largura">
+<!ENTITY sb.hlCustom.thin "Estreita">
+<!ENTITY sb.hlCustom.medium "Média">
+<!ENTITY sb.hlCustom.thick "Larga">
diff --git a/chrome/locale/pt-BR/scrapbook/mbManage.dtd b/chrome/locale/pt-BR/scrapbook/mbManage.dtd
new file mode 100644
index 0000000..591c8c0
--- /dev/null
+++ b/chrome/locale/pt-BR/scrapbook/mbManage.dtd
@@ -0,0 +1,6 @@
+<!ENTITY mb.manager "Gerenciador">
+<!ENTITY mb.prop.name "Nome">
+<!ENTITY mb.prop.path "Caminho">
+<!ENTITY mb.button.add "Adicionar">
+<!ENTITY mb.button.edit "Editar">
+<!ENTITY mb.button.remove "Remover">
diff --git a/chrome/locale/pt-BR/scrapbook/multiple.dtd b/chrome/locale/pt-BR/scrapbook/multiple.dtd
new file mode 100644
index 0000000..2e78806
--- /dev/null
+++ b/chrome/locale/pt-BR/scrapbook/multiple.dtd
@@ -0,0 +1,8 @@
+<!ENTITY sb.multiple.url "URL (Insira uma URL por linha)">
+<!ENTITY sb.multiple.detector "Detector de URL">
+<!ENTITY sb.multiple.detector.plink "Todos os Links na Página">
+<!ENTITY sb.multiple.detector.slink "Todos os Links na Seleção">
+<!ENTITY sb.multiple.detector.tabs "Todas as Abas Abertas na Janela">
+<!ENTITY sb.multiple.detector.local "Todos os HTMLs em um Diretório Local">
+<!ENTITY sb.multiple.detector.bookmarks "Favoritos">
+<!ENTITY sb.multiple.detector.clear "Limpar">
diff --git a/chrome/locale/pt-BR/scrapbook/note.dtd b/chrome/locale/pt-BR/scrapbook/note.dtd
new file mode 100644
index 0000000..30f43b3
--- /dev/null
+++ b/chrome/locale/pt-BR/scrapbook/note.dtd
@@ -0,0 +1,19 @@
+<!ENTITY sb.note.save "Salvar">
+<!ENTITY sb.note.close "Fechar">
+<!ENTITY sb.note.tools "Ferramentas">
+<!ENTITY sb.note.htmlview "Visualização do HTML">
+<!ENTITY sb.note.normalview "Visão Normal">
+<!ENTITY sb.note.template "Editar Template HTML">
+<!ENTITY sb.note.autolinefeed "Quebra Automática">
+<!ENTITY sb.note.autolinefeed.t "Adicionar a tag <br> no final da linha na pré-visualização do HTML">
+<!ENTITY sb.note.fontsize "Tamanho da Fonte">
+<!ENTITY sb.note.help "Ajuda">
+<!ENTITY sb.note.print "Imprimir">
+<!ENTITY sb.note.exit "Sair">
+<!ENTITY sb.note.save.accesskey "S">
+<!ENTITY sb.note.htmlview.accesskey "H">
+<!ENTITY sb.note.normalview.accesskey "N">
+<!ENTITY sb.note.tools.accesskey "F">
+<!ENTITY sb.note.fontsize.accesskey "T">
+<!ENTITY sb.note.print.accesskey "I">
+<!ENTITY sb.note.exit.accesskey "r">
diff --git a/chrome/locale/pt-BR/scrapbook/output.dtd b/chrome/locale/pt-BR/scrapbook/output.dtd
new file mode 100644
index 0000000..23b3b8e
--- /dev/null
+++ b/chrome/locale/pt-BR/scrapbook/output.dtd
@@ -0,0 +1,3 @@
+<!ENTITY sb.output.option.all "Output whole tree">
+<!ENTITY sb.output.option.frame "Output with frame">
+<!ENTITY sb.output.option.open "After outputting, open it in browser">
diff --git a/chrome/locale/pt-BR/scrapbook/overlay.dtd b/chrome/locale/pt-BR/scrapbook/overlay.dtd
new file mode 100644
index 0000000..4e453c6
--- /dev/null
+++ b/chrome/locale/pt-BR/scrapbook/overlay.dtd
@@ -0,0 +1,13 @@
+<!ENTITY sb.save.partial "Salvar seleção">
+<!ENTITY sb.save.partial.as "Salvar seleção como">
+<!ENTITY sb.save.entire "Salvar página">
+<!ENTITY sb.save.entire.as "Salvar página como">
+<!ENTITY sb.save.frame "Salvar quadro">
+<!ENTITY sb.save.frame.as "Salvar quadro como">
+<!ENTITY sb.save.target "Salvar link">
+<!ENTITY sb.save.target.as "Salvar link">
+<!ENTITY sb.save.alltabs "Salvar todas as abas">
+<!ENTITY sb.save.bookmark "Salvar como favorito">
+<!ENTITY sb.sidebar "Exibir no painel lateral">
+<!ENTITY sb.menubar "Barra de menu">
+<!ENTITY sb.editbefore "Editar antes de salvar">
diff --git a/chrome/locale/pt-BR/scrapbook/overlay.properties b/chrome/locale/pt-BR/scrapbook/overlay.properties
new file mode 100644
index 0000000..d2f38e7
--- /dev/null
+++ b/chrome/locale/pt-BR/scrapbook/overlay.properties
@@ -0,0 +1,8 @@
+EDIT_SAVE_CHANGES='%S' foi alterado. Salvar as mudanças?
+EDIT_REMOVE_HIGHLIGHT=Remover este destaque.
+EDIT_INLINE=Editar anotação embutida de '%S'
+SAVE=Salvamento em progresso
+SAVE_COMPLETE=Salvamento completado
+TRANSFER_DATA=Transferindo dados
+ROOT_FOLDER=Pasta raiz
+SELECT_FOLDER=Selecionar pasta
diff --git a/chrome/locale/pt-BR/scrapbook/prefs.dtd b/chrome/locale/pt-BR/scrapbook/prefs.dtd
new file mode 100644
index 0000000..8841de7
--- /dev/null
+++ b/chrome/locale/pt-BR/scrapbook/prefs.dtd
@@ -0,0 +1,34 @@
+<!ENTITY sb.prefs.main "Principal">
+<!ENTITY sb.prefs.keys "Chaves">
+<!ENTITY sb.prefs.tabs "Abas">
+<!ENTITY sb.prefs.save "Salvar">
+<!ENTITY sb.prefs.edit "Editar">
+<!ENTITY sb.prefs.organize "Organizar">
+<!ENTITY sb.prefs.advanced "Avançado">
+<!ENTITY sb.prefs.ui.contextMenu "Mostrar no menu de contexto do navegador">
+<!ENTITY sb.prefs.ui.contextSubMenu "Submenu">
+<!ENTITY sb.prefs.ui.bookmark "Mostrar menu 'Salvar como favorito'">
+<!ENTITY sb.prefs.ui.folderList.maxEntries.1 "Mostrar até">
+<!ENTITY sb.prefs.ui.folderList.maxEntries.2 "pastas usadas recentemente">
+<!ENTITY sb.prefs.ui.menuBar "Mostrar na barra de menu">
+<!ENTITY sb.prefs.ui.menuBar.icon "Ícone">
+<!ENTITY sb.prefs.ui.toolsMenu "Mostrar no menu 'Ferramentas'">
+<!ENTITY sb.prefs.restart "Mudança requer reiniciar o Firefox.">
+<!ENTITY sb.prefs.tabs.tips "Abrir em aba para as seguintes operações">
+<!ENTITY sb.prefs.tabs.note "Editar nota">
+<!ENTITY sb.prefs.data "Local onde armazenar informações">
+<!ENTITY sb.prefs.data.default "Padrão (pasta do perfil)">
+<!ENTITY sb.prefs.data.custom "Salvar informações em">
+<!ENTITY sb.prefs.data.tips "Escolha uma pasta onde guardar as informações do ScrapBook.">
+<!ENTITY sb.prefs.multibook.enabled "Habilitar Multi-ScrapBook">
+<!ENTITY sb.prefs.multibook.tips "Multi-ScrapBook permite definir vários locais onde armazenar informações e alternar entre eles rapidamente com um botão na barra de ferramentas.">
+<!ENTITY sb.prefs.confirmDelete "Avise-me quando for apagar itens da árvore">
+<!ENTITY sb.prefs.tree.autoCollapse "Ao abrir uma pasta da árvore, fechar automaticamente outras pastas">
+<!ENTITY sb.prefs.tree.unshift "Colocar um item">
+<!ENTITY sb.prefs.tree.unshift.top "no início de uma pasta">
+<!ENTITY sb.prefs.tree.unshift.bottom "no final de uma pasta">
+<!ENTITY sb.prefs.showDetailOnDrop "Quando arrastar e soltar no painel lateral, mostrar o diálogo 'Salvar detalhe'">
+<!ENTITY sb.prefs.notifyOnComplete "Mostrar notificação 'Salvamento completo'">
+<!ENTITY sb.button.customize "Personalizar">
+<!ENTITY sb.button.browse "Navegar">
+<!ENTITY sb.button.show "Mostrar arquivos">
diff --git a/chrome/locale/pt-BR/scrapbook/property.dtd b/chrome/locale/pt-BR/scrapbook/property.dtd
new file mode 100644
index 0000000..db373bc
--- /dev/null
+++ b/chrome/locale/pt-BR/scrapbook/property.dtd
@@ -0,0 +1,13 @@
+<!ENTITY sb.prop.general "Informação Geral">
+<!ENTITY sb.prop.type "Tipo">
+<!ENTITY sb.prop.date "Data">
+<!ENTITY sb.prop.encode "Codificação">
+<!ENTITY sb.prop.size "Tamanho">
+<!ENTITY sb.prop.content "Conteúdo">
+<!ENTITY sb.prop.folder "Pasta">
+<!ENTITY sb.prop.icon "Ícone">
+<!ENTITY sb.prop.icon.change "Alterar">
+<!ENTITY sb.prop.icon.default "Padrão">
+<!ENTITY sb.prop.icon.favicon "Selecionar favicon">
+<!ENTITY sb.prop.icon.custom "Selecionar ícone personalizado">
+<!ENTITY sb.prop.mark "Marcar">
diff --git a/chrome/locale/pt-BR/scrapbook/property.properties b/chrome/locale/pt-BR/scrapbook/property.properties
new file mode 100644
index 0000000..05bf071
--- /dev/null
+++ b/chrome/locale/pt-BR/scrapbook/property.properties
@@ -0,0 +1,14 @@
+TYPE_FOLDER=Pasta
+TYPE_PAGE=Página
+TYPE_NOTE=Nota
+TYPE_FILE=Arquivo
+TYPE_COMBINE=Página Combinada
+TYPE_INDEPTH2=Páginas salvas por salvamento em profundidade
+TYPE_BOOKMARK=Favorito
+TYPE_SEPARATOR=Separador
+FILES_COUNT=(%S Arquivos)
+ITEMS_COUNT=(%S Itens)
+CALCULATING=Calculando
+DIAGNOSIS_OK=Bons
+DIAGNOSIS_NG=%S itens inválidos foram detectados.
+INVALID=INVÁLIDO
diff --git a/chrome/locale/pt-BR/scrapbook/repair.dtd b/chrome/locale/pt-BR/scrapbook/repair.dtd
new file mode 100644
index 0000000..96677b6
--- /dev/null
+++ b/chrome/locale/pt-BR/scrapbook/repair.dtd
@@ -0,0 +1,9 @@
+<!ENTITY sb.repair.rdfFile "Restaurar scrapbook.rdf">
+<!ENTITY sb.repair.rdfFile.descript "Tente isto se a árvore de arquivos do ScrapBook desaparecer.">
+<!ENTITY sb.repair.rdfFile.select "Selecione um arquivo de backup para a restauração.">
+<!ENTITY sb.repair.rdfFile.file "Arquivo">
+<!ENTITY sb.repair.rdfFile.time "Hora">
+<!ENTITY sb.repair.rdfFile.size "Tamanho">
+<!ENTITY sb.repair.favicons "Restaurar favicons na árvore">
+<!ENTITY sb.repair.favicons.descript "Tente isto se muitos favicons na árvore do ScrapBook desaparecerem.">
+<!ENTITY sb.repair.complete "Finalizado.">
diff --git a/chrome/locale/pt-BR/scrapbook/scrapbook.dtd b/chrome/locale/pt-BR/scrapbook/scrapbook.dtd
new file mode 100644
index 0000000..bf2f675
--- /dev/null
+++ b/chrome/locale/pt-BR/scrapbook/scrapbook.dtd
@@ -0,0 +1,18 @@
+<!ENTITY sb.new.folder "Nova Pasta">
+<!ENTITY sb.new.separator "Novo separador">
+<!ENTITY sb.new.note "Nova Nota">
+<!ENTITY sb.toggle.all "Abrir/Fechar todas as pastas">
+<!ENTITY sb.tools "Ferramentas">
+<!ENTITY sb.tools.options "Preferências">
+<!ENTITY sb.tools.manage "Organizar">
+<!ENTITY sb.tools.combine "Combinar Páginas">
+<!ENTITY sb.tools.trade "Importar / Exportar">
+<!ENTITY sb.tools.multiple "Capturar Múltiplas URLs">
+<!ENTITY sb.tools.directory "Diretório do ScrapBook">
+<!ENTITY sb.tools.calculate "Calcular Tamanho">
+<!ENTITY sb.tools.sorttree "Ordenar Toda a Árvore">
+<!ENTITY sb.tools.output "Exportar Árvore como HTML">
+<!ENTITY sb.tools.repair "Reparo de Emergência">
+<!ENTITY sb.tools.addons "Recursos Extras">
+<!ENTITY sb.note.opentab "Abrir na Aba">
+<!ENTITY sb.note.close "Fechar">
diff --git a/chrome/locale/pt-BR/scrapbook/scrapbook.properties b/chrome/locale/pt-BR/scrapbook/scrapbook.properties
new file mode 100644
index 0000000..2ec4ca3
--- /dev/null
+++ b/chrome/locale/pt-BR/scrapbook/scrapbook.properties
@@ -0,0 +1,13 @@
+ROOT_FOLDER=Pasta Raiz
+DEFAULT_FOLDER=Nova Pasta
+ITEMS_REMOVED=%S itens apagados
+COMPLETED=Completa
+CONFIRM_DELETE=Deseja apagar este item?
+FILTER_BY_DAYS=Indique o número de dias para filtrar.
+ERROR_INVALID_URL=ERRO: URL Inválida.
+ERROR_MULTIPLE_SELECTION=ERRO: Não é possível mover/apagar múltiplos itens incluindo pastas.
+MB_CLOSE_WINDOW=Antes de trocar o diretório destino, você deve fechar esta janela:
+SAVE_OK_BUTTON=Salvar
+START_BUTTON=Iniciar
+SCANNING=Pesquisando
+URL=URL
diff --git a/chrome/locale/pt-BR/scrapbook/sort.dtd b/chrome/locale/pt-BR/scrapbook/sort.dtd
new file mode 100644
index 0000000..0baed4b
--- /dev/null
+++ b/chrome/locale/pt-BR/scrapbook/sort.dtd
@@ -0,0 +1,8 @@
+<!ENTITY sb.sort "Ordenar">
+<!ENTITY sb.sort.reverse "Inverter">
+<!ENTITY sb.sort.title.asc "Ordenar por Título (A > Z)">
+<!ENTITY sb.sort.title.desc "Ordenar por Título (Z > A)">
+<!ENTITY sb.sort.date.asc "Por Data">
+<!ENTITY sb.sort.date.desc "Por Data Descendente">
+<!ENTITY sb.sort.recursive "Ordenar Sub-Pastas Recursivamente">
+<!ENTITY sb.sort.warning "Aviso: você não pode desfazer esta operação.">
diff --git a/chrome/locale/pt-BR/scrapbook/templateHelp.html b/chrome/locale/pt-BR/scrapbook/templateHelp.html
new file mode 100644
index 0000000..50b2f5a
--- /dev/null
+++ b/chrome/locale/pt-BR/scrapbook/templateHelp.html
@@ -0,0 +1,109 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
+
+<html>
+
+<head>
+	<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" >
+	<meta http-equiv="Content-Style-Type" content="text/css">
+	<title>Ajuda para o HTML do Template ScrapBook</title>
+	<style type="text/css"><!--
+	body {
+		margin: 10px 50px;
+	}
+	div.container {
+		background-color: #F9F9F0;
+		border:1px dotted #E0E0E0;
+		padding: 20px;
+	}
+	h1 {
+		color: #FF9900;
+		font: bold 1.5em Arial, Verdana, Helvetica, Sans-serif;
+		margin : 0;
+	}
+	h2 {
+		font: bold 1.2em Arial, Verdana, Helvetica, Sans-serif;
+		margin-top: 30px;
+		border-bottom: 1px dotted #909090;
+	}
+	td {
+		font-family: Arial;
+		font-size  : 1.0em;
+		line-height: 1.5em;
+		padding-right: 10px;
+	}
+	pre {
+		font-family: monospace;
+		font-size  : 0.8em;
+	}
+	table, pre {
+		margin-left: 10px;
+	}
+	--></style>
+</head>
+
+<body>
+
+<div class="container">
+
+	<h1>Ajuda para o HTML do Template ScrapBook</h1>
+
+	<h2>Duas Tags Especiais</h2>
+	<table>
+		<tr>
+			<td><strong><%NOTE_TITLE%></strong></td>
+			<td>O título (a primeira linha) da nota</td>
+		</tr>
+		<tr>
+			<td><strong><%NOTE_CONTENT%></strong></td>
+			<td>O conteúdo (a segunda linha e seguintes) da nota</td>
+		</tr>
+	</table>
+
+	<h2>Template Pré-definido</h2>
+	<pre style="overflow:auto;">
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
+
+<html>
+
+<head>
+	<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+	<meta http-equiv="Content-Style-Type" content="text/css">
+	<title><%NOTE_TITLE%></title>
+	<style type="text/css"><!--
+	body {
+		margin: 10px 50px;
+	}
+	div.container {
+		background-color: #F9F9F0;
+		border:1px dotted #E0E0E0;
+		padding: 20px;
+	}
+	h1 {
+		color: #FF9900;
+		font: bold 1.2em Arial, Verdana, Helvetica, Sans-serif;
+		margin : 0;
+		padding: 0;
+	}
+	p, li, td, blockquote, pre {
+		font-size  : 0.8em;
+		line-height: 1.5em;
+	}
+	--></style>
+</head>
+
+<body>
+
+<div class="container">
+	<h1><%NOTE_TITLE%></h1>
+	<p><%NOTE_CONTENT%></p>
+</div>
+
+</body>
+
+</html>
+</pre>
+</div>
+
+</body>
+
+</html>
diff --git a/chrome/locale/pt-BR/scrapbook/trade.dtd b/chrome/locale/pt-BR/scrapbook/trade.dtd
new file mode 100644
index 0000000..fe8ce64
--- /dev/null
+++ b/chrome/locale/pt-BR/scrapbook/trade.dtd
@@ -0,0 +1,5 @@
+<!ENTITY sb.trade.import "Importar">
+<!ENTITY sb.trade.export "Exportar">
+<!ENTITY sb.trade.time "Data">
+<!ENTITY sb.trade.restore "Importar mantendo a estrutura das pastas">
+<!ENTITY sb.trade.remove "Remover arquivos após importar">
diff --git a/chrome/locale/pt-BR/scrapbook/trade.properties b/chrome/locale/pt-BR/scrapbook/trade.properties
new file mode 100644
index 0000000..c007a00
--- /dev/null
+++ b/chrome/locale/pt-BR/scrapbook/trade.properties
@@ -0,0 +1,6 @@
+DETECT=%S itens foram detectados em %S
+FAILED=Falha
+CREATE_FOLDER=Criar Pasta [%S]
+SELECT_PATH=Selecione a pasta para onde exportar / de onde importar.
+ERROR_SAME_ID_EXISTS=o mesmo ID já existe.
+ERROR_INVALID_FILEPATH=ERRO: Caminho inválido para o arquivo.
diff --git a/chrome/locale/pt-BR/scrapbook/tree.dtd b/chrome/locale/pt-BR/scrapbook/tree.dtd
new file mode 100644
index 0000000..17d6a02
--- /dev/null
+++ b/chrome/locale/pt-BR/scrapbook/tree.dtd
@@ -0,0 +1,33 @@
+<!ENTITY sb.open "Abrir">
+<!ENTITY sb.open.tab "Abrir na Aba">
+<!ENTITY sb.open.newtab "Abrir em Nova Aba">
+<!ENTITY sb.open.source "Abrir URL Fonte">
+<!ENTITY sb.tools "Ferramentas">
+<!ENTITY sb.show.files "Mostrar Arquivos">
+<!ENTITY sb.move "Mover">
+<!ENTITY sb.move.into "Mover para a Pasta">
+<!ENTITY sb.renew "Capturar Novamente">
+<!ENTITY sb.export "Exportar">
+<!ENTITY sb.remove "Apagar">
+<!ENTITY sb.property "Propriedades">
+<!ENTITY sb.prop.title "Título">
+<!ENTITY sb.prop.url "URL">
+<!ENTITY sb.prop.comment "Comentário">
+<!ENTITY sb.prop.id.date "ID (Data)">
+<!ENTITY sb.folder.combine "Visualização Combinada">
+<!ENTITY sb.folder.openall "Abrir Tudo em Abas">
+<!ENTITY sb.folder.manage "Gerenciar Pasta">
+<!ENTITY sb.new.folder "Nova Pasta">
+<!ENTITY sb.new.separator "Novo separador">
+<!ENTITY sb.new.note "Nova Nota">
+<!ENTITY sb.sort.folder "Ordenar Pasta">
+<!ENTITY sb.search "Pesquisa">
+<!ENTITY sb.search.fulltext "Pesquisa Completa de Texto">
+<!ENTITY sb.search.all "Tudo">
+<!ENTITY sb.search.re "Usar RegExp">
+<!ENTITY sb.search.cs "Diferenciar Maíusc./Minúsc.">
+<!ENTITY sb.search.cache "Atualizar Cache para a Pesquisa Completa de Texto">
+<!ENTITY sb.search.clear "Limpar Histórico de Pesquisas">
+<!ENTITY sb.search.days "Filtrar por Dias">
+<!ENTITY mb.manage "Gerenciar">
+<!ENTITY mb.profileFolder "Pasta do Perfil">
diff --git a/chrome/locale/ro/scrapbook/note.dtd b/chrome/locale/ro/scrapbook/note.dtd
index 464047c..e231924 100644
--- a/chrome/locale/ro/scrapbook/note.dtd
+++ b/chrome/locale/ro/scrapbook/note.dtd
@@ -5,7 +5,7 @@
 <!ENTITY sb.note.normalview "Vizualizează normal">
 <!ENTITY sb.note.template "Editează șablonul HTML">
 <!ENTITY sb.note.autolinefeed "Avans automat de linie">
-<!ENTITY sb.note.autolinefeed.t "Adaugă eticheta <br> la sfârșitul liniei în modul &sb.note.htmlview;">
+<!ENTITY sb.note.autolinefeed.t "Adaugă eticheta <br> la sfârșitul liniei în modul &sb.note.htmlview;">
 <!ENTITY sb.note.fontsize "Dimensiune font">
 <!ENTITY sb.note.help "Ajutor">
 <!ENTITY sb.note.print "Imprimă">
diff --git a/chrome/locale/ro/scrapbook/prefs.dtd b/chrome/locale/ro/scrapbook/prefs.dtd
index 65c5503..eee6869 100644
--- a/chrome/locale/ro/scrapbook/prefs.dtd
+++ b/chrome/locale/ro/scrapbook/prefs.dtd
@@ -13,7 +13,6 @@
 <!ENTITY sb.prefs.ui.menuBar "Afișează în meniul principal">
 <!ENTITY sb.prefs.ui.menuBar.icon "Afișează doar pictograma">
 <!ENTITY sb.prefs.ui.toolsMenu "Afișează în meniul „Unelte”">
-<!ENTITY sb.prefs.ui.statusBar "Afișează în bara de stare">
 <!ENTITY sb.prefs.restart "Modificările devin efective după repornirea navigatorului.">
 <!ENTITY sb.prefs.tabs.tips "Deschide în file pentru următoarele operații">
 <!ENTITY sb.prefs.tabs.note "Editează note">
diff --git a/chrome/locale/ru-RU/scrapbook/note.dtd b/chrome/locale/ru-RU/scrapbook/note.dtd
index e8d1750..cb5a3ca 100644
--- a/chrome/locale/ru-RU/scrapbook/note.dtd
+++ b/chrome/locale/ru-RU/scrapbook/note.dtd
@@ -5,7 +5,7 @@
 <!ENTITY sb.note.normalview "Обычный вид">
 <!ENTITY sb.note.template "Изменить шаблон HTML">
 <!ENTITY sb.note.autolinefeed "Автоперенос строк">
-<!ENTITY sb.note.autolinefeed.t "Добавлять тег <br> в конец каждой строки при просмотре «В виде веб-документа»">
+<!ENTITY sb.note.autolinefeed.t "Добавлять тег <br> в конец каждой строки при просмотре «В виде веб-документа»">
 <!ENTITY sb.note.fontsize "Размер шрифта">
 <!ENTITY sb.note.help "Помощь">
 <!ENTITY sb.note.print "Печать">
diff --git a/chrome/locale/ru-RU/scrapbook/prefs.dtd b/chrome/locale/ru-RU/scrapbook/prefs.dtd
index eeeac41..51b36b9 100644
--- a/chrome/locale/ru-RU/scrapbook/prefs.dtd
+++ b/chrome/locale/ru-RU/scrapbook/prefs.dtd
@@ -13,7 +13,6 @@
 <!ENTITY sb.prefs.ui.menuBar "Показывать в панели меню">
 <!ENTITY sb.prefs.ui.menuBar.icon "Значок">
 <!ENTITY sb.prefs.ui.toolsMenu "Показывать в меню «Инструменты»">
-<!ENTITY sb.prefs.ui.statusBar "Показывать в строке состояния">
 <!ENTITY sb.prefs.restart "Изменения требуют перезапуска Firefox'а">
 <!ENTITY sb.prefs.tabs.tips "Открывать в новых вкладках следующие операции">
 <!ENTITY sb.prefs.tabs.note "Изменить заметку">
diff --git a/chrome/locale/sk-SK/scrapbook/note.dtd b/chrome/locale/sk-SK/scrapbook/note.dtd
index 6388649..e36e05c 100644
--- a/chrome/locale/sk-SK/scrapbook/note.dtd
+++ b/chrome/locale/sk-SK/scrapbook/note.dtd
@@ -5,7 +5,7 @@
 <!ENTITY sb.note.normalview "Bežný náhľad">
 <!ENTITY sb.note.template "Upraviť HTML šablónu">
 <!ENTITY sb.note.autolinefeed "Automatické riadkovanie">
-<!ENTITY sb.note.autolinefeed.t "Pridať <br> tag na koniec riadka v HTML náhľade">
+<!ENTITY sb.note.autolinefeed.t "Pridať <br> tag na koniec riadka v HTML náhľade">
 <!ENTITY sb.note.fontsize "Veľkosť písma">
 <!ENTITY sb.note.help "Pomocník">
 <!ENTITY sb.note.print "Tlač">
diff --git a/chrome/locale/sk-SK/scrapbook/prefs.dtd b/chrome/locale/sk-SK/scrapbook/prefs.dtd
index 4759efc..08adba9 100644
--- a/chrome/locale/sk-SK/scrapbook/prefs.dtd
+++ b/chrome/locale/sk-SK/scrapbook/prefs.dtd
@@ -13,7 +13,6 @@
 <!ENTITY sb.prefs.ui.menuBar "Zobraziť v ponukovej lište">
 <!ENTITY sb.prefs.ui.menuBar.icon "Ikona">
 <!ENTITY sb.prefs.ui.toolsMenu "Zobraziť v ponuke 'Nástroje'">
-<!ENTITY sb.prefs.ui.statusBar "Zobraziť v stavovej lište">
 <!ENTITY sb.prefs.restart "Zmeny sa prejavia po reštarte Firefoxu.">
 <!ENTITY sb.prefs.tabs.tips "Nasledovné akcie otvoria nové karty">
 <!ENTITY sb.prefs.tabs.note "Upraviť poznámku">
diff --git a/chrome/locale/sv-SE/scrapbook/note.dtd b/chrome/locale/sv-SE/scrapbook/note.dtd
index ba34982..1ec9b29 100644
--- a/chrome/locale/sv-SE/scrapbook/note.dtd
+++ b/chrome/locale/sv-SE/scrapbook/note.dtd
@@ -5,7 +5,7 @@
 <!ENTITY sb.note.normalview "Normalvy">
 <!ENTITY sb.note.template "Redigera HTML-mall">
 <!ENTITY sb.note.autolinefeed "Automatisk vagnretur">
-<!ENTITY sb.note.autolinefeed.t "Lägger till <br>-taggar i radsluten i HTML-vyn">
+<!ENTITY sb.note.autolinefeed.t "Lägger till <br>-taggar i radsluten i HTML-vyn">
 <!ENTITY sb.note.fontsize "Fontstorlek">
 <!ENTITY sb.note.help "Hjälp">
 <!ENTITY sb.note.print "Skriv ut">
diff --git a/chrome/locale/sv-SE/scrapbook/prefs.dtd b/chrome/locale/sv-SE/scrapbook/prefs.dtd
index 8a5dbe3..fd1360d 100644
--- a/chrome/locale/sv-SE/scrapbook/prefs.dtd
+++ b/chrome/locale/sv-SE/scrapbook/prefs.dtd
@@ -13,7 +13,6 @@
 <!ENTITY sb.prefs.ui.menuBar "Visa i menyraden">
 <!ENTITY sb.prefs.ui.menuBar.icon "Ikon">
 <!ENTITY sb.prefs.ui.toolsMenu "Visa i "Verktyg"-menyn">
-<!ENTITY sb.prefs.ui.statusBar "Visa i statusfältet">
 <!ENTITY sb.prefs.restart "Ändring kräver att Firefox startas om.">
 <!ENTITY sb.prefs.tabs.tips "Öppna följande åtgärder i ny flik">
 <!ENTITY sb.prefs.tabs.note "Redigera anteckning">
diff --git a/chrome/locale/tr/scrapbook/prefs.dtd b/chrome/locale/tr/scrapbook/prefs.dtd
index 54674c0..3ded8a0 100644
--- a/chrome/locale/tr/scrapbook/prefs.dtd
+++ b/chrome/locale/tr/scrapbook/prefs.dtd
@@ -13,7 +13,6 @@
 <!ENTITY sb.prefs.ui.menuBar "Menü çubuğunda göster">
 <!ENTITY sb.prefs.ui.menuBar.icon "Simge">
 <!ENTITY sb.prefs.ui.toolsMenu "'Araçlar' menüsünde göster">
-<!ENTITY sb.prefs.ui.statusBar "Durumu çubuğunda göster">
 <!ENTITY sb.prefs.restart "Değişiklikler Firefox'u yeniden başlatmanızı gerektirir.">
 <!ENTITY sb.prefs.tabs.tips "Aşağıdaki eylemleri sekmede aç">
 <!ENTITY sb.prefs.tabs.note "Notu Düzenle">
diff --git a/chrome/locale/zh-CN/scrapbook/note.dtd b/chrome/locale/zh-CN/scrapbook/note.dtd
index eea8214..69d5959 100644
--- a/chrome/locale/zh-CN/scrapbook/note.dtd
+++ b/chrome/locale/zh-CN/scrapbook/note.dtd
@@ -5,7 +5,7 @@
 <!ENTITY sb.note.normalview "常规视图">
 <!ENTITY sb.note.template "编辑 HTML 模板">
 <!ENTITY sb.note.autolinefeed "自动换行">
-<!ENTITY sb.note.autolinefeed.t "预览时在每行结尾自动添加 <br> 标记。">
+<!ENTITY sb.note.autolinefeed.t "预览时在每行结尾自动添加 <br> 标记。">
 <!ENTITY sb.note.fontsize "字体大小">
 <!ENTITY sb.note.help "帮助">
 <!ENTITY sb.note.print "打印">
diff --git a/chrome/locale/zh-CN/scrapbook/prefs.dtd b/chrome/locale/zh-CN/scrapbook/prefs.dtd
index 936509c..aea0ea1 100644
--- a/chrome/locale/zh-CN/scrapbook/prefs.dtd
+++ b/chrome/locale/zh-CN/scrapbook/prefs.dtd
@@ -13,7 +13,6 @@
 <!ENTITY sb.prefs.ui.menuBar "在菜单栏中显示">
 <!ENTITY sb.prefs.ui.menuBar.icon "图标">
 <!ENTITY sb.prefs.ui.toolsMenu "在“工具”菜单显示">
-<!ENTITY sb.prefs.ui.statusBar "在状态栏显示">
 <!ENTITY sb.prefs.restart "更改需要重启 Firefox。">
 <!ENTITY sb.prefs.tabs.tips "随后的操作在标签页中打开">
 <!ENTITY sb.prefs.tabs.note "编辑笔记">
diff --git a/chrome/locale/zh-TW/scrapbook/note.dtd b/chrome/locale/zh-TW/scrapbook/note.dtd
index d69205e..e8ca022 100644
--- a/chrome/locale/zh-TW/scrapbook/note.dtd
+++ b/chrome/locale/zh-TW/scrapbook/note.dtd
@@ -5,7 +5,7 @@
 <!ENTITY sb.note.normalview "一般模式">
 <!ENTITY sb.note.template "編輯 HTML 樣版">
 <!ENTITY sb.note.autolinefeed "自動斷行">
-<!ENTITY sb.note.autolinefeed.t "在 HTML 預覽時,於每行最後自動添加 <br> 標籤。">
+<!ENTITY sb.note.autolinefeed.t "在 HTML 預覽時,於每行最後自動添加 <br> 標籤。">
 <!ENTITY sb.note.fontsize "文字尺寸">
 <!ENTITY sb.note.help "說明">
 <!ENTITY sb.note.print "列印">
diff --git a/chrome/locale/zh-TW/scrapbook/prefs.dtd b/chrome/locale/zh-TW/scrapbook/prefs.dtd
index 7a5eb3f..c5662a8 100644
--- a/chrome/locale/zh-TW/scrapbook/prefs.dtd
+++ b/chrome/locale/zh-TW/scrapbook/prefs.dtd
@@ -13,7 +13,6 @@
 <!ENTITY sb.prefs.ui.menuBar "在選單列上顯示「ScrapBook」選單">
 <!ENTITY sb.prefs.ui.menuBar.icon "顯示為圖示">
 <!ENTITY sb.prefs.ui.toolsMenu "在「工具」功能表中顯示選項">
-<!ENTITY sb.prefs.ui.statusBar "在狀態列中顯示圖示">
 <!ENTITY sb.prefs.restart "需重新啟動 Firefox 方能生效。">
 <!ENTITY sb.prefs.tabs.tips "操作下列項目時,以分頁開啟">
 <!ENTITY sb.prefs.tabs.note "編輯筆記">
diff --git a/defaults/preferences/scrapbook-prefs.js b/defaults/preferences/scrapbook-prefs.js
index 68ae25e..de71cd2 100755
--- a/defaults/preferences/scrapbook-prefs.js
+++ b/defaults/preferences/scrapbook-prefs.js
@@ -4,7 +4,6 @@ pref("scrapbook.ui.bookmarkMenu", true);
 pref("scrapbook.ui.menuBar", true);
 pref("scrapbook.ui.menuBar.icon", false);
 pref("scrapbook.ui.toolsMenu", false);
-pref("scrapbook.ui.statusBar", true);
 pref("scrapbook.ui.folderList", "");
 pref("scrapbook.ui.folderList.maxEntries", 5);
 pref("scrapbook.tabs.open", false);
diff --git a/install.rdf b/install.rdf
index dc0d634..bc3b372 100644
--- a/install.rdf
+++ b/install.rdf
@@ -7,7 +7,7 @@
 		<em:id>{53A03D43-5363-4669-8190-99061B2DEBA5}</em:id>
 		<em:type>2</em:type>
 		<em:name>ScrapBook</em:name>
-		<em:version>1.5.9</em:version>
+		<em:version>1.5.10</em:version>
 		<em:description>Helps you to save Web pages and organize the collection.</em:description>
 		<em:creator>Gomita</em:creator>
 		<em:localized>
@@ -111,6 +111,16 @@
 		</em:localized>
 		<em:localized>
 			<Description>
+				<em:locale>pt-BR</em:locale>
+				<em:name>ScrapBook</em:name>
+				<em:description>Helps you to save Web pages and organize the collection.</em:description>
+				<em:creator>Gomita</em:creator>
+				<em:translator>Ghelman,Goofy</em:translator>
+				<em:homepageURL>http://www.xuldev.org/scrapbook/</em:homepageURL>
+			</Description>
+		</em:localized>
+		<em:localized>
+			<Description>
 				<em:locale>ro</em:locale>
 				<em:name>ScrapBook</em:name>
 				<em:description>Ajută la salvarea paginilor web și la organizarea colecției de pagini web.</em:description>
@@ -188,7 +198,7 @@
 			<Description>
 				<em:id>{ec8030f7-c20a-464f-9b0e-13a3a9e97384}</em:id>
 				<em:minVersion>24.0</em:minVersion>
-				<em:maxVersion>31.0a1</em:maxVersion>
+				<em:maxVersion>35.0a1</em:maxVersion>
 			</Description>
 		</em:targetApplication>
 	</Description>

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-mozext/scrapbook.git



More information about the Pkg-mozext-commits mailing list