[Pkg-mozext-commits] [scrapbook] 01/05: Imported Upstream version 1.5.8

David Prévot taffit at alioth.debian.org
Sun Sep 29 15:08:37 UTC 2013


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

taffit pushed a commit to branch master
in repository scrapbook.

commit e513857d173e5850a550919f826cbc053bdeda73
Author: David Prévot <taffit at debian.org>
Date:   Sun Sep 29 10:45:37 2013 -0400

    Imported Upstream version 1.5.8
---
 LICENSE.txt                                       |    2 +-
 chrome/content/scrapbook/capture.js               |    5 +-
 chrome/locale/cs-CZ/scrapbook/capture.dtd         |   26 +--
 chrome/locale/cs-CZ/scrapbook/note.dtd            |   38 ++--
 chrome/locale/cs-CZ/scrapbook/prefs.dtd           |   70 +++----
 chrome/locale/cs-CZ/scrapbook/property.properties |   28 +--
 chrome/locale/de/scrapbook/overlay.dtd            |    2 +-
 chrome/locale/de/scrapbook/prefs.dtd              |    2 +-
 chrome/locale/en-US/scrapbook/templateHelp.html   |  218 ++++++++++-----------
 chrome/locale/es-ES/scrapbook/note.dtd            |   38 ++--
 chrome/locale/fi/scrapbook/templateHelp.html      |  110 ++++++++++-
 chrome/locale/sk-SK/scrapbook/overlay.dtd         |    2 +-
 chrome/locale/sk-SK/scrapbook/prefs.dtd           |    2 +-
 chrome/locale/zh-CN/scrapbook/note.dtd            |   38 ++--
 install.rdf                                       |    4 +-
 modules/utils.jsm                                 |    4 +-
 16 files changed, 351 insertions(+), 238 deletions(-)

diff --git a/LICENSE.txt b/LICENSE.txt
index b923338..8a6f20a 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) 2012
+ * Portions created by the Initial Developer are Copyright (C) 2013
  * the Initial Developer. All Rights Reserved.
  *
  * Contributor(s):
diff --git a/chrome/content/scrapbook/calculate.js b/chrome/content/scrapbook/calculate.js
old mode 100644
new mode 100755
diff --git a/chrome/content/scrapbook/capture.js b/chrome/content/scrapbook/capture.js
old mode 100644
new mode 100755
index 4e22c44..12d2616
--- a/chrome/content/scrapbook/capture.js
+++ b/chrome/content/scrapbook/capture.js
@@ -359,7 +359,10 @@ var sbInvisibleBrowser = {
 		this.ELEMENT.docShell.allowJavascript = gOption["script"];
 		this.ELEMENT.docShell.allowImages     = gOption["images"];
 		this.ELEMENT.docShell.allowMetaRedirects = false;
-		this.ELEMENT.docShell.QueryInterface(Ci.nsIDocShellHistory).useGlobalHistory = false;
+		if (Ci.nsIDocShellHistory)
+			this.ELEMENT.docShell.QueryInterface(Ci.nsIDocShellHistory).useGlobalHistory = false;
+		else
+			this.ELEMENT.docShell.useGlobalHistory = false;
 		this.ELEMENT.loadURI(aURL, null, null);
 	},
 
diff --git a/chrome/content/scrapbook/combine.js b/chrome/content/scrapbook/combine.js
old mode 100644
new mode 100755
diff --git a/chrome/content/scrapbook/common.js b/chrome/content/scrapbook/common.js
old mode 100644
new mode 100755
diff --git a/chrome/content/scrapbook/customTree.js b/chrome/content/scrapbook/customTree.js
old mode 100644
new mode 100755
diff --git a/chrome/content/scrapbook/detail.js b/chrome/content/scrapbook/detail.js
old mode 100644
new mode 100755
diff --git a/chrome/content/scrapbook/editor.js b/chrome/content/scrapbook/editor.js
old mode 100644
new mode 100755
diff --git a/chrome/content/scrapbook/folderPicker.js b/chrome/content/scrapbook/folderPicker.js
old mode 100644
new mode 100755
diff --git a/chrome/content/scrapbook/fulltext.js b/chrome/content/scrapbook/fulltext.js
old mode 100644
new mode 100755
diff --git a/chrome/content/scrapbook/highlighter.js b/chrome/content/scrapbook/highlighter.js
old mode 100644
new mode 100755
diff --git a/chrome/content/scrapbook/hlCustom.js b/chrome/content/scrapbook/hlCustom.js
old mode 100644
new mode 100755
diff --git a/chrome/content/scrapbook/manage.js b/chrome/content/scrapbook/manage.js
old mode 100644
new mode 100755
diff --git a/chrome/content/scrapbook/mbEdit.js b/chrome/content/scrapbook/mbEdit.js
old mode 100644
new mode 100755
diff --git a/chrome/content/scrapbook/mbManage.js b/chrome/content/scrapbook/mbManage.js
old mode 100644
new mode 100755
diff --git a/chrome/content/scrapbook/mbService.js b/chrome/content/scrapbook/mbService.js
old mode 100644
new mode 100755
diff --git a/chrome/content/scrapbook/multiple.js b/chrome/content/scrapbook/multiple.js
old mode 100644
new mode 100755
diff --git a/chrome/content/scrapbook/note.js b/chrome/content/scrapbook/note.js
old mode 100644
new mode 100755
diff --git a/chrome/content/scrapbook/output.js b/chrome/content/scrapbook/output.js
old mode 100644
new mode 100755
diff --git a/chrome/content/scrapbook/overlay.js b/chrome/content/scrapbook/overlay.js
old mode 100644
new mode 100755
diff --git a/chrome/content/scrapbook/prefs.js b/chrome/content/scrapbook/prefs.js
old mode 100644
new mode 100755
diff --git a/chrome/content/scrapbook/property.js b/chrome/content/scrapbook/property.js
old mode 100644
new mode 100755
diff --git a/chrome/content/scrapbook/repair.js b/chrome/content/scrapbook/repair.js
old mode 100644
new mode 100755
diff --git a/chrome/content/scrapbook/saver.js b/chrome/content/scrapbook/saver.js
old mode 100644
new mode 100755
diff --git a/chrome/content/scrapbook/scrapbook.js b/chrome/content/scrapbook/scrapbook.js
old mode 100644
new mode 100755
diff --git a/chrome/content/scrapbook/scrapnote.js b/chrome/content/scrapbook/scrapnote.js
old mode 100644
new mode 100755
diff --git a/chrome/content/scrapbook/sort.js b/chrome/content/scrapbook/sort.js
old mode 100644
new mode 100755
diff --git a/chrome/content/scrapbook/trade.js b/chrome/content/scrapbook/trade.js
old mode 100644
new mode 100755
diff --git a/chrome/content/scrapbook/tree.js b/chrome/content/scrapbook/tree.js
old mode 100644
new mode 100755
diff --git a/chrome/content/scrapbook/view.js b/chrome/content/scrapbook/view.js
old mode 100644
new mode 100755
diff --git a/chrome/locale/cs-CZ/scrapbook/capture.dtd b/chrome/locale/cs-CZ/scrapbook/capture.dtd
index 3826762..384fb32 100644
--- a/chrome/locale/cs-CZ/scrapbook/capture.dtd
+++ b/chrome/locale/cs-CZ/scrapbook/capture.dtd
@@ -1,13 +1,13 @@
-<!ENTITY sb.save "Uložit">
-<!ENTITY sb.save.abort "Zrušit">
-<!ENTITY sb.save.start "Spustit">
-<!ENTITY sb.save.retry "Opakovat">
-<!ENTITY sb.save.skip "Přeskočit">
-<!ENTITY sb.save.pause "Pozastavit">
-<!ENTITY sb.save.filter "Filtrovat">
-<!ENTITY sb.save.filter.domain "Omezit na doménu">
-<!ENTITY sb.save.filter.level "Omezit na adresář">
-<!ENTITY sb.save.filter.string "Filtrovat podle...">
-<!ENTITY sb.save.filter.checkon "Vše zaškrtnout">
-<!ENTITY sb.save.filter.checkoff "Vše odškrtnout">
-<!ENTITY sb.save.filter.invert "Invertovat zaškrtnutí">
+<!ENTITY sb.save "Uložit">
+<!ENTITY sb.save.abort "Zrušit">
+<!ENTITY sb.save.start "Spustit">
+<!ENTITY sb.save.retry "Opakovat">
+<!ENTITY sb.save.skip "Přeskočit">
+<!ENTITY sb.save.pause "Pozastavit">
+<!ENTITY sb.save.filter "Filtrovat">
+<!ENTITY sb.save.filter.domain "Omezit na doménu">
+<!ENTITY sb.save.filter.level "Omezit na adresář">
+<!ENTITY sb.save.filter.string "Filtrovat podle...">
+<!ENTITY sb.save.filter.checkon "Vše zaškrtnout">
+<!ENTITY sb.save.filter.checkoff "Vše odškrtnout">
+<!ENTITY sb.save.filter.invert "Invertovat zaškrtnutí">
diff --git a/chrome/locale/cs-CZ/scrapbook/note.dtd b/chrome/locale/cs-CZ/scrapbook/note.dtd
index fb1688c..a31e3fa 100644
--- a/chrome/locale/cs-CZ/scrapbook/note.dtd
+++ b/chrome/locale/cs-CZ/scrapbook/note.dtd
@@ -1,19 +1,19 @@
-<!ENTITY sb.note.save "Uložit">
-<!ENTITY sb.note.close "Zavřít">
-<!ENTITY sb.note.tools "Nástroje">
-<!ENTITY sb.note.htmlview "Náhled v HTML">
-<!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.fontsize "Velikost písma">
-<!ENTITY sb.note.help "Nápověda">
-<!ENTITY sb.note.print "Tisk">
-<!ENTITY sb.note.exit "Ukončit">
-<!ENTITY sb.note.save.accesskey "S">
-<!ENTITY sb.note.htmlview.accesskey "H">
-<!ENTITY sb.note.normalview.accesskey "N">
-<!ENTITY sb.note.tools.accesskey "o">
-<!ENTITY sb.note.fontsize.accesskey "p">
-<!ENTITY sb.note.print.accesskey "T">
-<!ENTITY sb.note.exit.accesskey "k">
+<!ENTITY sb.note.save "Uložit">
+<!ENTITY sb.note.close "Zavřít">
+<!ENTITY sb.note.tools "Nástroje">
+<!ENTITY sb.note.htmlview "Náhled v HTML">
+<!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.fontsize "Velikost písma">
+<!ENTITY sb.note.help "Nápověda">
+<!ENTITY sb.note.print "Tisk">
+<!ENTITY sb.note.exit "Ukončit">
+<!ENTITY sb.note.save.accesskey "S">
+<!ENTITY sb.note.htmlview.accesskey "H">
+<!ENTITY sb.note.normalview.accesskey "N">
+<!ENTITY sb.note.tools.accesskey "o">
+<!ENTITY sb.note.fontsize.accesskey "p">
+<!ENTITY sb.note.print.accesskey "T">
+<!ENTITY sb.note.exit.accesskey "k">
diff --git a/chrome/locale/cs-CZ/scrapbook/prefs.dtd b/chrome/locale/cs-CZ/scrapbook/prefs.dtd
index 2c22c2e..a9ee144 100644
--- a/chrome/locale/cs-CZ/scrapbook/prefs.dtd
+++ b/chrome/locale/cs-CZ/scrapbook/prefs.dtd
@@ -1,35 +1,35 @@
-<!ENTITY sb.prefs.main "Hlavní">
-<!ENTITY sb.prefs.keys "Klávesy">
-<!ENTITY sb.prefs.tabs "Panely">
-<!ENTITY sb.prefs.save "Uložit">
-<!ENTITY sb.prefs.edit "Úpravy">
-<!ENTITY sb.prefs.organize "Organizace">
-<!ENTITY sb.prefs.advanced "Pokročilé">
-<!ENTITY sb.prefs.ui.contextMenu "Zobrazit v místní nabídce prohlížeče">
-<!ENTITY sb.prefs.ui.contextSubMenu "Podnabídka">
-<!ENTITY sb.prefs.ui.bookmark "Zobrazit nabídku 'Uložit jako záložku'">
-<!ENTITY sb.prefs.ui.folderList.maxEntries.1 "Zobrazit maximálně">
-<!ENTITY sb.prefs.ui.folderList.maxEntries.2 "posledních použitých složek">
-<!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">
-<!ENTITY sb.prefs.data "Umístění pro ukládání dat">
-<!ENTITY sb.prefs.data.default "Výchozí (Složka s profilem)">
-<!ENTITY sb.prefs.data.custom "Uložit data do">
-<!ENTITY sb.prefs.data.tips "Zvolí složku, kam se budou data ScrapBooku ukládat.">
-<!ENTITY sb.prefs.multibook.enabled "Zapnout Multi-ScrapBook">
-<!ENTITY sb.prefs.multibook.tips "Multi-ScrapBook umožňuje nastavit více umístění, kam se budou data ukládat a rychle mezi nimi přepínat pomocí tlačítka v nástrojové liště.">
-<!ENTITY sb.prefs.confirmDelete "Varovat při odstraňování uložených položek">
-<!ENTITY sb.prefs.tree.autoCollapse "Při otevírání stromové složky automaticky zavřít ostatní složky">
-<!ENTITY sb.prefs.tree.unshift "Umístit položku na">
-<!ENTITY sb.prefs.tree.unshift.top "první místo složky">
-<!ENTITY sb.prefs.tree.unshift.bottom "poslední místo složky">
-<!ENTITY sb.prefs.showDetailOnDrop "Zobrazit dialogové okno 'Zachytit detail' při zachycování metodou táhni-a-pusť do postranní lišty">
-<!ENTITY sb.prefs.notifyOnComplete "Zobrazit oznámení 'Zachycení dokončeno'">
-<!ENTITY sb.button.customize "Přizpůsobit">
-<!ENTITY sb.button.browse "Procházet">
-<!ENTITY sb.button.show "Zobrazit soubory">
+<!ENTITY sb.prefs.main "Hlavní">
+<!ENTITY sb.prefs.keys "Klávesy">
+<!ENTITY sb.prefs.tabs "Panely">
+<!ENTITY sb.prefs.save "Uložit">
+<!ENTITY sb.prefs.edit "Úpravy">
+<!ENTITY sb.prefs.organize "Organizace">
+<!ENTITY sb.prefs.advanced "Pokročilé">
+<!ENTITY sb.prefs.ui.contextMenu "Zobrazit v místní nabídce prohlížeče">
+<!ENTITY sb.prefs.ui.contextSubMenu "Podnabídka">
+<!ENTITY sb.prefs.ui.bookmark "Zobrazit nabídku 'Uložit jako záložku'">
+<!ENTITY sb.prefs.ui.folderList.maxEntries.1 "Zobrazit maximálně">
+<!ENTITY sb.prefs.ui.folderList.maxEntries.2 "posledních použitých složek">
+<!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">
+<!ENTITY sb.prefs.data "Umístění pro ukládání dat">
+<!ENTITY sb.prefs.data.default "Výchozí (Složka s profilem)">
+<!ENTITY sb.prefs.data.custom "Uložit data do">
+<!ENTITY sb.prefs.data.tips "Zvolí složku, kam se budou data ScrapBooku ukládat.">
+<!ENTITY sb.prefs.multibook.enabled "Zapnout Multi-ScrapBook">
+<!ENTITY sb.prefs.multibook.tips "Multi-ScrapBook umožňuje nastavit více umístění, kam se budou data ukládat a rychle mezi nimi přepínat pomocí tlačítka v nástrojové liště.">
+<!ENTITY sb.prefs.confirmDelete "Varovat při odstraňování uložených položek">
+<!ENTITY sb.prefs.tree.autoCollapse "Při otevírání stromové složky automaticky zavřít ostatní složky">
+<!ENTITY sb.prefs.tree.unshift "Umístit položku na">
+<!ENTITY sb.prefs.tree.unshift.top "první místo složky">
+<!ENTITY sb.prefs.tree.unshift.bottom "poslední místo složky">
+<!ENTITY sb.prefs.showDetailOnDrop "Zobrazit dialogové okno 'Zachytit detail' při zachycování metodou táhni-a-pusť do postranní lišty">
+<!ENTITY sb.prefs.notifyOnComplete "Zobrazit oznámení 'Zachycení dokončeno'">
+<!ENTITY sb.button.customize "Přizpůsobit">
+<!ENTITY sb.button.browse "Procházet">
+<!ENTITY sb.button.show "Zobrazit soubory">
diff --git a/chrome/locale/cs-CZ/scrapbook/property.properties b/chrome/locale/cs-CZ/scrapbook/property.properties
index 16b9827..f077934 100644
--- a/chrome/locale/cs-CZ/scrapbook/property.properties
+++ b/chrome/locale/cs-CZ/scrapbook/property.properties
@@ -1,14 +1,14 @@
-TYPE_FOLDER=Složka
-TYPE_PAGE=Stránka
-TYPE_NOTE=Poznámka
-TYPE_FILE=Soubor
-TYPE_COMBINE=Sloučená stránka
-TYPE_INDEPTH2=Stránky uložené hloubkově
-TYPE_BOOKMARK=Záložka
-TYPE_SEPARATOR=Oddělovač
-FILES_COUNT=(souborů: %S)
-ITEMS_COUNT=(položek: %S)
-CALCULATING=Výpočet
-DIAGNOSIS_OK=V pořádku
-DIAGNOSIS_NG=Nalezeno %S neplatných položek.
-INVALID=NEPLATNÁ
+TYPE_FOLDER=Složka
+TYPE_PAGE=Stránka
+TYPE_NOTE=Poznámka
+TYPE_FILE=Soubor
+TYPE_COMBINE=Sloučená stránka
+TYPE_INDEPTH2=Stránky uložené hloubkově
+TYPE_BOOKMARK=Záložka
+TYPE_SEPARATOR=Oddělovač
+FILES_COUNT=(souborů: %S)
+ITEMS_COUNT=(položek: %S)
+CALCULATING=Výpočet
+DIAGNOSIS_OK=V pořádku
+DIAGNOSIS_NG=Nalezeno %S neplatných položek.
+INVALID=NEPLATNÁ
diff --git a/chrome/locale/de/scrapbook/overlay.dtd b/chrome/locale/de/scrapbook/overlay.dtd
index 2024d6f..4e14acd 100644
--- a/chrome/locale/de/scrapbook/overlay.dtd
+++ b/chrome/locale/de/scrapbook/overlay.dtd
@@ -9,5 +9,5 @@
 <!ENTITY sb.save.alltabs "Alle Tabs archivieren">
 <!ENTITY sb.save.bookmark "Als Lesezeichen archivieren">
 <!ENTITY sb.sidebar "ScrapBook-Sidebar öffnen">
-<!ENTITY sb.menubar "Menubar">
+<!ENTITY sb.menubar "Menüleiste">
 <!ENTITY sb.editbefore "Vor dem Archivieren bearbeiten">
diff --git a/chrome/locale/de/scrapbook/prefs.dtd b/chrome/locale/de/scrapbook/prefs.dtd
index 8b01f0e..5ed360d 100644
--- a/chrome/locale/de/scrapbook/prefs.dtd
+++ b/chrome/locale/de/scrapbook/prefs.dtd
@@ -1,5 +1,5 @@
 <!ENTITY sb.prefs.main "Allgemein">
-<!ENTITY sb.prefs.keys "Keys">
+<!ENTITY sb.prefs.keys "Tasten">
 <!ENTITY sb.prefs.tabs "Tabs">
 <!ENTITY sb.prefs.save "Archivieren">
 <!ENTITY sb.prefs.edit "Bearbeiten">
diff --git a/chrome/locale/en-US/scrapbook/templateHelp.html b/chrome/locale/en-US/scrapbook/templateHelp.html
index b739d2b..b0c747a 100644
--- a/chrome/locale/en-US/scrapbook/templateHelp.html
+++ b/chrome/locale/en-US/scrapbook/templateHelp.html
@@ -1,109 +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>ScrapBook Template HTML Help</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>ScrapBook Template HTML Help</h1>
-
-	<h2>Two Special Tags</h2>
-	<table>
-		<tr>
-			<td><strong><%NOTE_TITLE%></strong></td>
-			<td>The title (the first line) of the note</td>
-		</tr>
-		<tr>
-			<td><strong><%NOTE_CONTENT%></strong></td>
-			<td>The contents (the second line or later) of the note</td>
-		</tr>
-	</table>
-
-	<h2>Preset Template</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>
+<!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>ScrapBook Template HTML Help</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>ScrapBook Template HTML Help</h1>
+
+	<h2>Two Special Tags</h2>
+	<table>
+		<tr>
+			<td><strong><%NOTE_TITLE%></strong></td>
+			<td>The title (the first line) of the note</td>
+		</tr>
+		<tr>
+			<td><strong><%NOTE_CONTENT%></strong></td>
+			<td>The contents (the second line or later) of the note</td>
+		</tr>
+	</table>
+
+	<h2>Preset Template</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/es-ES/scrapbook/note.dtd b/chrome/locale/es-ES/scrapbook/note.dtd
index 3869261..bc703d0 100644
--- a/chrome/locale/es-ES/scrapbook/note.dtd
+++ b/chrome/locale/es-ES/scrapbook/note.dtd
@@ -1,19 +1,19 @@
-<!ENTITY sb.note.save "Guardar">
-<!ENTITY sb.note.close "Cerrar">
-<!ENTITY sb.note.tools "Herramientas">
-<!ENTITY sb.note.htmlview "Vista HTML">
-<!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.fontsize "Tamaño de fuente">
-<!ENTITY sb.note.help "Ayuda">
-<!ENTITY sb.note.print "Imprimir">
-<!ENTITY sb.note.exit "Salir">
-<!ENTITY sb.note.save.accesskey "S">
-<!ENTITY sb.note.htmlview.accesskey "H">
-<!ENTITY sb.note.normalview.accesskey "N">
-<!ENTITY sb.note.tools.accesskey "T">
-<!ENTITY sb.note.fontsize.accesskey "F">
-<!ENTITY sb.note.print.accesskey "P">
-<!ENTITY sb.note.exit.accesskey "X">
+<!ENTITY sb.note.save "Guardar">
+<!ENTITY sb.note.close "Cerrar">
+<!ENTITY sb.note.tools "Herramientas">
+<!ENTITY sb.note.htmlview "Vista HTML">
+<!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.fontsize "Tamaño de fuente">
+<!ENTITY sb.note.help "Ayuda">
+<!ENTITY sb.note.print "Imprimir">
+<!ENTITY sb.note.exit "Salir">
+<!ENTITY sb.note.save.accesskey "S">
+<!ENTITY sb.note.htmlview.accesskey "H">
+<!ENTITY sb.note.normalview.accesskey "N">
+<!ENTITY sb.note.tools.accesskey "T">
+<!ENTITY sb.note.fontsize.accesskey "F">
+<!ENTITY sb.note.print.accesskey "P">
+<!ENTITY sb.note.exit.accesskey "X">
diff --git a/chrome/locale/fi/scrapbook/templateHelp.html b/chrome/locale/fi/scrapbook/templateHelp.html
index 430caf1..b0c747a 100644
--- a/chrome/locale/fi/scrapbook/templateHelp.html
+++ b/chrome/locale/fi/scrapbook/templateHelp.html
@@ -1 +1,109 @@
-
�`�L��P�
���/�
0�L���T�j{"�*'j_��m�X^iٞ��m����+
\ No newline at end of file
+<!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>ScrapBook Template HTML Help</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>ScrapBook Template HTML Help</h1>
+
+	<h2>Two Special Tags</h2>
+	<table>
+		<tr>
+			<td><strong><%NOTE_TITLE%></strong></td>
+			<td>The title (the first line) of the note</td>
+		</tr>
+		<tr>
+			<td><strong><%NOTE_CONTENT%></strong></td>
+			<td>The contents (the second line or later) of the note</td>
+		</tr>
+	</table>
+
+	<h2>Preset Template</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/sk-SK/scrapbook/overlay.dtd b/chrome/locale/sk-SK/scrapbook/overlay.dtd
index 125e6e9..e64b00d 100644
--- a/chrome/locale/sk-SK/scrapbook/overlay.dtd
+++ b/chrome/locale/sk-SK/scrapbook/overlay.dtd
@@ -9,5 +9,5 @@
 <!ENTITY sb.save.alltabs "Uložiť všetky karty">
 <!ENTITY sb.save.bookmark "Uložiť ako záložku">
 <!ENTITY sb.sidebar "Zobraziť v bočnom paneli">
-<!ENTITY sb.menubar "Menubar">
+<!ENTITY sb.menubar "Ponuka">
 <!ENTITY sb.editbefore "Upraviť pred zachytením">
diff --git a/chrome/locale/sk-SK/scrapbook/prefs.dtd b/chrome/locale/sk-SK/scrapbook/prefs.dtd
index 5a3c227..4759efc 100644
--- a/chrome/locale/sk-SK/scrapbook/prefs.dtd
+++ b/chrome/locale/sk-SK/scrapbook/prefs.dtd
@@ -1,5 +1,5 @@
 <!ENTITY sb.prefs.main "Hlavné">
-<!ENTITY sb.prefs.keys "Keys">
+<!ENTITY sb.prefs.keys "Klávesy">
 <!ENTITY sb.prefs.tabs "Karty">
 <!ENTITY sb.prefs.save "Uložiť">
 <!ENTITY sb.prefs.edit "Upraviť">
diff --git a/chrome/locale/zh-CN/scrapbook/note.dtd b/chrome/locale/zh-CN/scrapbook/note.dtd
index 723b5f6..eea8214 100644
--- a/chrome/locale/zh-CN/scrapbook/note.dtd
+++ b/chrome/locale/zh-CN/scrapbook/note.dtd
@@ -1,19 +1,19 @@
-<!ENTITY sb.note.save "保存">
-<!ENTITY sb.note.close "关闭">
-<!ENTITY sb.note.tools "工具">
-<!ENTITY sb.note.htmlview "预览">
-<!ENTITY sb.note.normalview "常规视图">
-<!ENTITY sb.note.template "编辑 HTML 模板">
-<!ENTITY sb.note.autolinefeed "自动换行">
-<!ENTITY sb.note.autolinefeed.t "预览时在每行结尾自动添加 <br> 标记。">
-<!ENTITY sb.note.fontsize "字体大小">
-<!ENTITY sb.note.help "帮助">
-<!ENTITY sb.note.print "打印">
-<!ENTITY sb.note.exit "退出">
-<!ENTITY sb.note.save.accesskey "S">
-<!ENTITY sb.note.htmlview.accesskey "H">
-<!ENTITY sb.note.normalview.accesskey "N">
-<!ENTITY sb.note.tools.accesskey "T">
-<!ENTITY sb.note.fontsize.accesskey "F">
-<!ENTITY sb.note.print.accesskey "P">
-<!ENTITY sb.note.exit.accesskey "X">
+<!ENTITY sb.note.save "保存">
+<!ENTITY sb.note.close "关闭">
+<!ENTITY sb.note.tools "工具">
+<!ENTITY sb.note.htmlview "预览">
+<!ENTITY sb.note.normalview "常规视图">
+<!ENTITY sb.note.template "编辑 HTML 模板">
+<!ENTITY sb.note.autolinefeed "自动换行">
+<!ENTITY sb.note.autolinefeed.t "预览时在每行结尾自动添加 <br> 标记。">
+<!ENTITY sb.note.fontsize "字体大小">
+<!ENTITY sb.note.help "帮助">
+<!ENTITY sb.note.print "打印">
+<!ENTITY sb.note.exit "退出">
+<!ENTITY sb.note.save.accesskey "S">
+<!ENTITY sb.note.htmlview.accesskey "H">
+<!ENTITY sb.note.normalview.accesskey "N">
+<!ENTITY sb.note.tools.accesskey "T">
+<!ENTITY sb.note.fontsize.accesskey "F">
+<!ENTITY sb.note.print.accesskey "P">
+<!ENTITY sb.note.exit.accesskey "X">
diff --git a/defaults/preferences/scrapbook-prefs.js b/defaults/preferences/scrapbook-prefs.js
old mode 100644
new mode 100755
diff --git a/install.rdf b/install.rdf
index a784d2f..288ab10 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.6</em:version>
+		<em:version>1.5.8</em:version>
 		<em:description>Helps you to save Web pages and organize the collection.</em:description>
 		<em:creator>Gomita</em:creator>
 		<em:localized>
@@ -178,7 +178,7 @@
 			<Description>
 				<em:id>{ec8030f7-c20a-464f-9b0e-13a3a9e97384}</em:id>
 				<em:minVersion>17.0</em:minVersion>
-				<em:maxVersion>18.0a1</em:maxVersion>
+				<em:maxVersion>27.0a1</em:maxVersion>
 			</Description>
 		</em:targetApplication>
 	</Description>
diff --git a/modules/utils.jsm b/modules/utils.jsm
index 1962fba..7ae7d2b 100644
--- a/modules/utils.jsm
+++ b/modules/utils.jsm
@@ -229,7 +229,9 @@ const ScrapBookUtils = {
 		uri.spec = aURLSpec;
 		var persist = Cc["@mozilla.org/embedding/browser/nsWebBrowserPersist;1"].
 		              createInstance(Ci.nsIWebBrowserPersist);
-		persist.saveURI(uri, null, null, null, null, aFile);
+		var privacyContext = this.getBrowserWindow().QueryInterface(Ci.nsIInterfaceRequestor).
+		                     getInterface(Ci.nsIWebNavigation).QueryInterface(Ci.nsILoadContext);
+		persist.saveURI(uri, null, null, null, null, aFile, privacyContext); 
 	},
 
 	convertToUnicode: function SBU_convertToUnicode(aString, aCharset) {

-- 
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