[Pkg-mozext-commits] [scrapbook] 01/04: Imported Upstream version 1.5.11
David Prévot
taffit at moszumanska.debian.org
Mon Sep 29 02:45:55 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 bf1d49a1b077e5feba0e86671ed419cbc01963f8
Author: David Prévot <taffit at debian.org>
Date: Sun Sep 28 22:24:12 2014 -0400
Imported Upstream version 1.5.11
---
chrome/content/scrapbook/editor.js | 15 +++++++++++++++
chrome/content/scrapbook/overlay.js | 30 ++++++++----------------------
chrome/content/scrapbook/overlay.xul | 27 +++++++++++++++++++++++----
chrome/content/scrapbook/prefs.xul | 5 ++---
chrome/locale/cs-CZ/scrapbook/note.dtd | 2 +-
chrome/locale/cs-CZ/scrapbook/prefs.dtd | 2 +-
chrome/locale/de/scrapbook/note.dtd | 2 +-
chrome/locale/de/scrapbook/prefs.dtd | 2 +-
chrome/locale/en-US/scrapbook/note.dtd | 2 +-
chrome/locale/en-US/scrapbook/prefs.dtd | 2 +-
chrome/locale/es-ES/scrapbook/note.dtd | 2 +-
chrome/locale/es-ES/scrapbook/prefs.dtd | 2 +-
chrome/locale/fi/scrapbook/note.dtd | 2 +-
chrome/locale/fi/scrapbook/prefs.dtd | 2 +-
chrome/locale/fr/scrapbook/note.dtd | 2 +-
chrome/locale/fr/scrapbook/prefs.dtd | 2 +-
chrome/locale/gl-ES/scrapbook/note.dtd | 2 +-
chrome/locale/gl-ES/scrapbook/prefs.dtd | 2 +-
chrome/locale/it/scrapbook/note.dtd | 2 +-
chrome/locale/it/scrapbook/prefs.dtd | 2 +-
chrome/locale/ja/scrapbook/note.dtd | 2 +-
chrome/locale/ja/scrapbook/prefs.dtd | 2 +-
chrome/locale/ko-KR/scrapbook/note.dtd | 2 +-
chrome/locale/ko-KR/scrapbook/prefs.dtd | 2 +-
chrome/locale/pl/scrapbook/editor.dtd | 4 ++--
chrome/locale/pl/scrapbook/note.dtd | 2 +-
chrome/locale/pl/scrapbook/prefs.dtd | 2 +-
chrome/locale/pt-BR/scrapbook/note.dtd | 2 +-
chrome/locale/pt-BR/scrapbook/prefs.dtd | 2 +-
chrome/locale/ro/scrapbook/note.dtd | 2 +-
chrome/locale/ro/scrapbook/prefs.dtd | 2 +-
chrome/locale/ru-RU/scrapbook/note.dtd | 2 +-
chrome/locale/ru-RU/scrapbook/prefs.dtd | 2 +-
chrome/locale/sk-SK/scrapbook/note.dtd | 2 +-
chrome/locale/sk-SK/scrapbook/prefs.dtd | 2 +-
chrome/locale/sv-SE/scrapbook/note.dtd | 2 +-
chrome/locale/sv-SE/scrapbook/prefs.dtd | 2 +-
chrome/locale/tr/scrapbook/note.dtd | 2 +-
chrome/locale/tr/scrapbook/prefs.dtd | 2 +-
chrome/locale/zh-CN/scrapbook/note.dtd | 2 +-
chrome/locale/zh-CN/scrapbook/prefs.dtd | 2 +-
chrome/locale/zh-TW/scrapbook/note.dtd | 2 +-
chrome/locale/zh-TW/scrapbook/prefs.dtd | 2 +-
defaults/preferences/scrapbook-prefs.js | 2 +-
install.rdf | 2 +-
modules/data.jsm | 2 +-
46 files changed, 91 insertions(+), 72 deletions(-)
diff --git a/chrome/content/scrapbook/editor.js b/chrome/content/scrapbook/editor.js
index 4f7e8d2..a5bfcc9 100755
--- a/chrome/content/scrapbook/editor.js
+++ b/chrome/content/scrapbook/editor.js
@@ -768,6 +768,21 @@ 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;
diff --git a/chrome/content/scrapbook/overlay.js b/chrome/content/scrapbook/overlay.js
index 0a0d249..4592d1a 100755
--- a/chrome/content/scrapbook/overlay.js
+++ b/chrome/content/scrapbook/overlay.js
@@ -51,21 +51,6 @@ var ScrapBookBrowserOverlay = {
};
window.setTimeout(callback, 1000);
}
- if (ScrapBookUtils.getPref("ui.menuBar.icon")) {
- var menu = document.getElementById("ScrapBookMenu");
- var button = document.createElement("toolbarbutton");
- var attrs = menu.attributes;
- for (var i = 0; i < attrs.length; i++)
- button.setAttribute(attrs[i].nodeName, attrs[i].nodeValue);
- while (menu.hasChildNodes())
- button.appendChild(menu.firstChild);
- button.removeAttribute("label");
- button.setAttribute("type", "menu");
- button.setAttribute("image", "chrome://scrapbook/skin/main_16.png");
- var menubar = document.getElementById("main-menubar");
- menubar.appendChild(button);
- menubar.removeChild(menu);
- }
var key = ScrapBookUtils.getPref("key.menubar");
if (key.length == 1) {
var elt = document.getElementById("ScrapBookMenu");
@@ -104,6 +89,7 @@ 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");
@@ -428,16 +414,16 @@ var ScrapBookMenuHandler = {
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;
+ getElement("ScrapBookMenubarItemB").hidden = isSaved;
+ getElement("ScrapBookMenubarItemI").hidden = !isSaved;
+ getElement("ScrapBookMenubarItemE").hidden = !isSaved;
+ getElement("ScrapBookMenubarItemD").hidden = !isSaved;
if (isSaved) {
- getElement("ScrapBookStatusPopupE").setAttribute("checked", ScrapBookBrowserOverlay.editMode);
- getElement("ScrapBookStatusPopupI").setAttribute("checked", ScrapBookBrowserOverlay.infoMode);
+ getElement("ScrapBookMenubarItemE").setAttribute("checked", ScrapBookBrowserOverlay.editMode);
+ getElement("ScrapBookMenubarItemI").setAttribute("checked", ScrapBookBrowserOverlay.infoMode);
}
else {
- getElement("ScrapBookEditBefore").setAttribute("checked", !(sbPageEditor.TOOLBAR.hidden || getElement("ScrapBookToolbox").hidden));
+ getElement("ScrapBookMenubarItemB").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");
diff --git a/chrome/content/scrapbook/overlay.xul b/chrome/content/scrapbook/overlay.xul
index 117174b..94d68c0 100644
--- a/chrome/content/scrapbook/overlay.xul
+++ b/chrome/content/scrapbook/overlay.xul
@@ -56,10 +56,10 @@
<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" />
+ <menuitem id="ScrapBookMenubarItemB" label="&sb.editbefore;" type="checkbox" autocheck="false" oncommand="this.getAttribute('checked') == 'false' ? sbPageEditor.init() : sbPageEditor.exit(true);" />
+ <menuitem id="ScrapBookMenubarItemI" label="&sb.toolbar.info;" type="checkbox" oncommand="sbInfoViewer.toggle();" />
+ <menuitem id="ScrapBookMenubarItemE" label="&sb.toolbar.edit;" type="checkbox" oncommand="sbPageEditor.toggle();" />
+ <menuitem id="ScrapBookMenubarItemD" 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 />
@@ -168,4 +168,23 @@
</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="ScrapBookStatusPopupB" label="&sb.editbefore;" type="checkbox" autocheck="false" oncommand="this.getAttribute('checked') == 'false' ? sbPageEditor.init() : sbPageEditor.exit(true);" />
+ </menupopup>
+ </statusbarpanel>
+ </statusbar>
+
</overlay>
diff --git a/chrome/content/scrapbook/prefs.xul b/chrome/content/scrapbook/prefs.xul
index 703aef5..1fc32a3 100644
--- a/chrome/content/scrapbook/prefs.xul
+++ b/chrome/content/scrapbook/prefs.xul
@@ -31,8 +31,8 @@
<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');" />
@@ -45,9 +45,8 @@
</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>
+ <checkbox preference="scrapbook.ui.statusBar" label="&sb.prefs.ui.statusBar;" />
</prefpane>
<prefpane id="keysPane" label="&sb.prefs.keys;" flex="1">
diff --git a/chrome/locale/cs-CZ/scrapbook/note.dtd b/chrome/locale/cs-CZ/scrapbook/note.dtd
index e4da876..32d2aca 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 efc6668..ac43d28 100644
--- a/chrome/locale/cs-CZ/scrapbook/prefs.dtd
+++ b/chrome/locale/cs-CZ/scrapbook/prefs.dtd
@@ -11,8 +11,8 @@
<!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">
diff --git a/chrome/locale/de/scrapbook/note.dtd b/chrome/locale/de/scrapbook/note.dtd
index b9274ea..2ff09bb 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 0f12a8b..3fcf560 100644
--- a/chrome/locale/de/scrapbook/prefs.dtd
+++ b/chrome/locale/de/scrapbook/prefs.dtd
@@ -11,8 +11,8 @@
<!ENTITY sb.prefs.ui.folderList.maxEntries.1 "Bis zu">
<!ENTITY sb.prefs.ui.folderList.maxEntries.2 "zuletzt verwendete Ordner anzeigen">
<!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 aeed5dd..4885746 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 4530d33..9aa5b3d 100644
--- a/chrome/locale/en-US/scrapbook/prefs.dtd
+++ b/chrome/locale/en-US/scrapbook/prefs.dtd
@@ -11,8 +11,8 @@
<!ENTITY sb.prefs.ui.folderList.maxEntries.1 "Show up to">
<!ENTITY sb.prefs.ui.folderList.maxEntries.2 "recently used folders">
<!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 bfc9459..5ac1b5b 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 b05e341..446e362 100644
--- a/chrome/locale/es-ES/scrapbook/prefs.dtd
+++ b/chrome/locale/es-ES/scrapbook/prefs.dtd
@@ -11,8 +11,8 @@
<!ENTITY sb.prefs.ui.folderList.maxEntries.1 "Mostrar hasta">
<!ENTITY sb.prefs.ui.folderList.maxEntries.2 "carpetas usadas recientemente">
<!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/note.dtd b/chrome/locale/fi/scrapbook/note.dtd
index c23f273..e0bb3a9 100644
--- a/chrome/locale/fi/scrapbook/note.dtd
+++ b/chrome/locale/fi/scrapbook/note.dtd
@@ -5,7 +5,7 @@
<!ENTITY sb.note.normalview "Normaali näkymä">
<!ENTITY sb.note.template "Muokkaa HTML-pohjaa">
<!ENTITY sb.note.autolinefeed "Automaattinen rivinvaihto">
-<!ENTITY sb.note.autolinefeed.t "Lisää <br> -koodin &sb.note.htmlview; rivin loppuun.">
+<!ENTITY sb.note.autolinefeed.t "Lisää br -koodin &sb.note.htmlview; rivin loppuun.">
<!ENTITY sb.note.fontsize "Kirjasinkoko">
<!ENTITY sb.note.help "Ohje">
<!ENTITY sb.note.print "Tulosta">
diff --git a/chrome/locale/fi/scrapbook/prefs.dtd b/chrome/locale/fi/scrapbook/prefs.dtd
index 7f59dc6..7587402 100644
--- a/chrome/locale/fi/scrapbook/prefs.dtd
+++ b/chrome/locale/fi/scrapbook/prefs.dtd
@@ -11,8 +11,8 @@
<!ENTITY sb.prefs.ui.folderList.maxEntries.1 "Näytä">
<!ENTITY sb.prefs.ui.folderList.maxEntries.2 "viimeksi käytettyä kansiota">
<!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 f24e294..155a00c 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 6b61419..fc6dbdd 100644
--- a/chrome/locale/fr/scrapbook/prefs.dtd
+++ b/chrome/locale/fr/scrapbook/prefs.dtd
@@ -11,8 +11,8 @@
<!ENTITY sb.prefs.ui.folderList.maxEntries.1 "Afficher jusqu'à">
<!ENTITY sb.prefs.ui.folderList.maxEntries.2 "dossiers récents">
<!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 bbd4775..20ce606 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 d0cb32e..ab4f466 100644
--- a/chrome/locale/gl-ES/scrapbook/prefs.dtd
+++ b/chrome/locale/gl-ES/scrapbook/prefs.dtd
@@ -11,8 +11,8 @@
<!ENTITY sb.prefs.ui.folderList.maxEntries.1 "Amosar até">
<!ENTITY sb.prefs.ui.folderList.maxEntries.2 "cartafoles usados recentemente">
<!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 a7437af..f1d1ed9 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 16fd3bd..7970959 100644
--- a/chrome/locale/it/scrapbook/prefs.dtd
+++ b/chrome/locale/it/scrapbook/prefs.dtd
@@ -11,8 +11,8 @@
<!ENTITY sb.prefs.ui.folderList.maxEntries.1 "Cartelle recentemente utilizzate da mostrare:">
<!ENTITY sb.prefs.ui.folderList.maxEntries.2 " ">
<!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 ca8e15d..ecc2d8b 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 a1dc100..258708b 100644
--- a/chrome/locale/ja/scrapbook/prefs.dtd
+++ b/chrome/locale/ja/scrapbook/prefs.dtd
@@ -11,8 +11,8 @@
<!ENTITY sb.prefs.ui.folderList.maxEntries.1 "最近使用したフォルダを">
<!ENTITY sb.prefs.ui.folderList.maxEntries.2 "個まで表示する">
<!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 032dcd7..37431b9 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 09e0c13..376a06c 100644
--- a/chrome/locale/ko-KR/scrapbook/prefs.dtd
+++ b/chrome/locale/ko-KR/scrapbook/prefs.dtd
@@ -11,8 +11,8 @@
<!ENTITY sb.prefs.ui.folderList.maxEntries.1 "위로 보이기">
<!ENTITY sb.prefs.ui.folderList.maxEntries.2 "최근에 사용한 폴더">
<!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 fd92f8a..e27bece 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 42415ad..881f86e 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 c32943b..6fb0130 100644
--- a/chrome/locale/pl/scrapbook/prefs.dtd
+++ b/chrome/locale/pl/scrapbook/prefs.dtd
@@ -11,8 +11,8 @@
<!ENTITY sb.prefs.ui.folderList.maxEntries.1 "Wyświetlaj do">
<!ENTITY sb.prefs.ui.folderList.maxEntries.2 "ostatnio używanych folderów">
<!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/note.dtd b/chrome/locale/pt-BR/scrapbook/note.dtd
index 30f43b3..f3e3fda 100644
--- a/chrome/locale/pt-BR/scrapbook/note.dtd
+++ b/chrome/locale/pt-BR/scrapbook/note.dtd
@@ -5,7 +5,7 @@
<!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.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">
diff --git a/chrome/locale/pt-BR/scrapbook/prefs.dtd b/chrome/locale/pt-BR/scrapbook/prefs.dtd
index 8841de7..09a2af5 100644
--- a/chrome/locale/pt-BR/scrapbook/prefs.dtd
+++ b/chrome/locale/pt-BR/scrapbook/prefs.dtd
@@ -11,8 +11,8 @@
<!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.ui.statusBar "Mostrar na barra de status">
<!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">
diff --git a/chrome/locale/ro/scrapbook/note.dtd b/chrome/locale/ro/scrapbook/note.dtd
index e231924..554df9d 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 eee6869..e49bdde 100644
--- a/chrome/locale/ro/scrapbook/prefs.dtd
+++ b/chrome/locale/ro/scrapbook/prefs.dtd
@@ -11,8 +11,8 @@
<!ENTITY sb.prefs.ui.folderList.maxEntries.1 "Afișează ultimele">
<!ENTITY sb.prefs.ui.folderList.maxEntries.2 "dosare deschise">
<!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 cb5a3ca..4c5f323 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 51b36b9..54538f8 100644
--- a/chrome/locale/ru-RU/scrapbook/prefs.dtd
+++ b/chrome/locale/ru-RU/scrapbook/prefs.dtd
@@ -11,8 +11,8 @@
<!ENTITY sb.prefs.ui.folderList.maxEntries.1 "Показывать">
<!ENTITY sb.prefs.ui.folderList.maxEntries.2 "недавно использованных папок">
<!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 e36e05c..739cf3b 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 08adba9..ee4f0fb 100644
--- a/chrome/locale/sk-SK/scrapbook/prefs.dtd
+++ b/chrome/locale/sk-SK/scrapbook/prefs.dtd
@@ -11,8 +11,8 @@
<!ENTITY sb.prefs.ui.folderList.maxEntries.1 "Zobraziť">
<!ENTITY sb.prefs.ui.folderList.maxEntries.2 "posledných použitých priečinkov">
<!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 1ec9b29..6669070 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 fd1360d..a481267 100644
--- a/chrome/locale/sv-SE/scrapbook/prefs.dtd
+++ b/chrome/locale/sv-SE/scrapbook/prefs.dtd
@@ -11,8 +11,8 @@
<!ENTITY sb.prefs.ui.folderList.maxEntries.1 "Visa upp till">
<!ENTITY sb.prefs.ui.folderList.maxEntries.2 "nyligen använda mappar">
<!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/note.dtd b/chrome/locale/tr/scrapbook/note.dtd
index e3245fe..e9968e5 100644
--- a/chrome/locale/tr/scrapbook/note.dtd
+++ b/chrome/locale/tr/scrapbook/note.dtd
@@ -5,7 +5,7 @@
<!ENTITY sb.note.normalview "Normal Görünüm">
<!ENTITY sb.note.template "Şablon HTML'i Düzenle">
<!ENTITY sb.note.autolinefeed "Otomatik Satırlama">
-<!ENTITY sb.note.autolinefeed.t "&sb.note.htmlview;'nde satırların sonuna <br> etiketi ekle">
+<!ENTITY sb.note.autolinefeed.t "&sb.note.htmlview;'nde satırların sonuna br etiketi ekle">
<!ENTITY sb.note.fontsize "Yazı Tipi Boyutu">
<!ENTITY sb.note.help "Yardım">
<!ENTITY sb.note.print "Yazdır">
diff --git a/chrome/locale/tr/scrapbook/prefs.dtd b/chrome/locale/tr/scrapbook/prefs.dtd
index 3ded8a0..5daaf39 100644
--- a/chrome/locale/tr/scrapbook/prefs.dtd
+++ b/chrome/locale/tr/scrapbook/prefs.dtd
@@ -11,8 +11,8 @@
<!ENTITY sb.prefs.ui.folderList.maxEntries.1 "Son kullanılan">
<!ENTITY sb.prefs.ui.folderList.maxEntries.2 "klasörü göster">
<!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 69d5959..84f121e 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 aea0ea1..c94f2ab 100644
--- a/chrome/locale/zh-CN/scrapbook/prefs.dtd
+++ b/chrome/locale/zh-CN/scrapbook/prefs.dtd
@@ -11,8 +11,8 @@
<!ENTITY sb.prefs.ui.folderList.maxEntries.1 "突出显示于">
<!ENTITY sb.prefs.ui.folderList.maxEntries.2 "最近使用的文件夹">
<!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 e8ca022..b7eb150 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 c5662a8..8a10733 100644
--- a/chrome/locale/zh-TW/scrapbook/prefs.dtd
+++ b/chrome/locale/zh-TW/scrapbook/prefs.dtd
@@ -11,8 +11,8 @@
<!ENTITY sb.prefs.ui.folderList.maxEntries.1 "最多顯示">
<!ENTITY sb.prefs.ui.folderList.maxEntries.2 "項最近使用的資料夾">
<!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 de71cd2..27612be 100755
--- a/defaults/preferences/scrapbook-prefs.js
+++ b/defaults/preferences/scrapbook-prefs.js
@@ -2,8 +2,8 @@ pref("scrapbook.ui.contextMenu", true);
pref("scrapbook.ui.contextSubMenu", false);
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 bc3b372..76032ea 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.10</em:version>
+ <em:version>1.5.11</em:version>
<em:description>Helps you to save Web pages and organize the collection.</em:description>
<em:creator>Gomita</em:creator>
<em:localized>
diff --git a/modules/data.jsm b/modules/data.jsm
index bb1901e..feafb88 100644
--- a/modules/data.jsm
+++ b/modules/data.jsm
@@ -159,8 +159,8 @@ var ScrapBookData = {
aData == PREF_DOMAIN + "multibook.enabled") {
this._uninit();
this._init();
- ScrapBookUtils.refreshGlobal(true);
}
+ ScrapBookUtils.refreshGlobal(true);
break;
default:
}
--
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