summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--xpi/content/css/bmbut_bmbnounsort.css2
-rw-r--r--xpi/content/css/bmbut_unsortedbookm.css11
-rw-r--r--xpi/content/css/bmbut_unsortedbookm2.css22
-rw-r--r--xpi/content/css/empty_favicon_g0.css (renamed from xpi/content/css/empty_favicon2.css)36
-rw-r--r--xpi/content/css/empty_favicon_g1.css34
-rw-r--r--xpi/content/css/empty_favicon_g2.css34
-rw-r--r--xpi/content/css/empty_favicon_t0.css13
-rw-r--r--xpi/content/css/empty_favicon_t1.css (renamed from xpi/content/css/empty_favicon.css)0
-rw-r--r--xpi/content/css/empty_favicon_t2.css18
-rw-r--r--xpi/content/css/hideurlbarrelstop2.css9
-rw-r--r--xpi/content/css/urlbar_dropm2.css10
-rw-r--r--xpi/content/options.js36
-rw-r--r--xpi/content/options.xul31
-rw-r--r--xpi/content/overlay.css8
-rw-r--r--xpi/content/overlay.js104
-rw-r--r--xpi/content/overlay.xul24
-rw-r--r--xpi/content/overlay_prefs.css46
-rw-r--r--xpi/defaults/preferences/options.js8
-rw-r--r--xpi/install.rdf2
-rw-r--r--xpi/locale/cs/options.dtd9
-rw-r--r--xpi/locale/da/options.dtd9
-rw-r--r--xpi/locale/de/options.dtd11
-rw-r--r--xpi/locale/dsb/options.dtd9
-rw-r--r--xpi/locale/el/options.dtd9
-rw-r--r--xpi/locale/en-US/options.dtd11
-rw-r--r--xpi/locale/es/options.dtd9
-rw-r--r--xpi/locale/et/options.dtd9
-rw-r--r--xpi/locale/fr/options.dtd11
-rw-r--r--xpi/locale/hsb/options.dtd9
-rw-r--r--xpi/locale/it/options.dtd9
-rw-r--r--xpi/locale/pl/options.dtd9
-rw-r--r--xpi/locale/pt-BR/options.dtd11
-rw-r--r--xpi/locale/ru/options.dtd9
-rw-r--r--xpi/locale/sl/options.dtd9
-rw-r--r--xpi/locale/tr/options.dtd11
-rw-r--r--xpi/locale/uk/options.dtd9
-rw-r--r--xpi/locale/zh-CN/options.dtd9
-rw-r--r--xpi/locale/zh-TW/options.dtd9
38 files changed, 482 insertions, 147 deletions
diff --git a/xpi/content/css/bmbut_bmbnounsort.css b/xpi/content/css/bmbut_bmbnounsort.css
index 907c4cb..3431d0b 100644
--- a/xpi/content/css/bmbut_bmbnounsort.css
+++ b/xpi/content/css/bmbut_bmbnounsort.css
@@ -3,7 +3,9 @@
@-moz-document url(chrome://browser/content/browser.xul) {
* #ctraddon_BMB_unsortedBookmarks_m,
+ * #ctraddon_BMB_unsortedBookmarks_m2,
* #ctraddon_BMB_unsortedBookmarks_mm,
+ * #ctraddon_BMB_unsortedBookmarks_mm2,
#ctraddon_BMB_unsortedBookmarks,
#menu_unsortedBookmarks {
display:none !important;
diff --git a/xpi/content/css/bmbut_unsortedbookm.css b/xpi/content/css/bmbut_unsortedbookm.css
index d1a9284..30dc564 100644
--- a/xpi/content/css/bmbut_unsortedbookm.css
+++ b/xpi/content/css/bmbut_unsortedbookm.css
@@ -2,19 +2,16 @@
@-moz-document url(chrome://browser/content/browser.xul) {
- #ctraddon_BMB_unsortedBookmarks_m,
- #ctraddon_BMB_unsortedBookmarks_mm {
+ #ctraddon_BMB_unsortedBookmarks_m2,
+ #ctraddon_BMB_unsortedBookmarks_mm2 {
visibility: visible !important;
}
+ #ctraddon_BMB_unsortedBookmarks_m,
+ #ctraddon_BMB_unsortedBookmarks_mm,
#menu_unsortedBookmarks,
#ctraddon_BMB_unsortedBookmarks{
display:none !important;
}
- #ctraddon_BMB_bookmarksPopup .hide-if-empty-places-result,
- #bookmarksMenuPopup .hide-if-empty-places-result {
- visibility: collapse !important;
- }
-
} \ No newline at end of file
diff --git a/xpi/content/css/bmbut_unsortedbookm2.css b/xpi/content/css/bmbut_unsortedbookm2.css
new file mode 100644
index 0000000..35e477f
--- /dev/null
+++ b/xpi/content/css/bmbut_unsortedbookm2.css
@@ -0,0 +1,22 @@
+@namespace url(http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul);
+
+@-moz-document url(chrome://browser/content/browser.xul) {
+
+ #ctraddon_BMB_unsortedBookmarks_m,
+ #ctraddon_BMB_unsortedBookmarks_mm {
+ visibility: visible !important;
+ }
+
+ #menu_unsortedBookmarks,
+ #ctraddon_BMB_unsortedBookmarks{
+ display:none !important;
+ }
+
+ #ctraddon_BMB_unsortedBookmarks_m2,
+ #ctraddon_BMB_unsortedBookmarks_mm2,
+ #ctraddon_BMB_bookmarksPopup .hide-if-empty-places-result,
+ #bookmarksMenuPopup .hide-if-empty-places-result {
+ visibility: collapse !important;
+ }
+
+} \ No newline at end of file
diff --git a/xpi/content/css/empty_favicon2.css b/xpi/content/css/empty_favicon_g0.css
index 1493d7d..b16f3dd 100644
--- a/xpi/content/css/empty_favicon2.css
+++ b/xpi/content/css/empty_favicon_g0.css
@@ -7,28 +7,6 @@
url(chrome://browser/content/preferences/aboutPermissions.xul),
url(about:permissions) {
- #TabsToolbar .tabbrowser-tab:not([pinned]) .tab-icon-image:not([src]) {
- display: inline !important;
- list-style-image: url("chrome://classic_theme_restorer/content/images/default_favicon.png") !important;
- }
-
- #TabsToolbar .tabbrowser-tab:not([pinned])[busy] .tab-throbber + .tab-icon-image:not([src]) {
- display:none !important;
- }
-
- #tabbrowser-tabs .tab-icon-image:not(src){
- list-style-image: url("chrome://classic_theme_restorer/content/images/default_favicon.png") !important;
- }
-
- #alltabs-popup menuitem[image=""] > .menu-iconic-left > .menu-iconic-icon,
- .sidebar-placesTreechildren::-moz-tree-image(leaf),
- toolbaritem .bookmark-item:not(src):not([container]):not([type]),
- menupopup .bookmark-item:not(src):not([container]):not([type]),
- .site-favicon:not(src) {
- list-style-image: url("chrome://classic_theme_restorer/content/images/default_favicon.png") !important;
- -moz-image-region: rect(0px, 16px, 16px, 0px) !important;
- }
-
#all-sites-item > .site-container > .site-favicon {
list-style-image: none !important;
}
@@ -43,20 +21,6 @@
.bookmark-item[container][livemark] .bookmark-item[visited] {
-moz-image-region: rect(0px, 32px, 16px, 16px) !important; }
- #PopupAutoCompleteRichResult .ac-site-icon[src^="chrome://mozapps/skin/places/defaultFavicon.png"] {
- width: 0 !important;
- padding-right: 16px !important;
- background-image: url("chrome://classic_theme_restorer/content/images/default_favicon.png") !important;
- }
-
- treechildren::-moz-tree-image(title) {
- list-style-image: url("chrome://classic_theme_restorer/content/images/default_favicon.png") !important;
- padding-right: 2px !important;
- margin: 0px 2px !important;
- width: 16px !important;
- height: 16px !important;
- }
-
treechildren::-moz-tree-image(title, livemarkItem) {
list-style-image: url("chrome://browser/skin/places/livemark-item.png") !important;
}
diff --git a/xpi/content/css/empty_favicon_g1.css b/xpi/content/css/empty_favicon_g1.css
new file mode 100644
index 0000000..a369728
--- /dev/null
+++ b/xpi/content/css/empty_favicon_g1.css
@@ -0,0 +1,34 @@
+@import url(empty_favicon_g0.css);
+@namespace url(http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul);
+
+@-moz-document url(chrome://browser/content/browser.xul),
+ url(chrome://browser/content/places/places.xul),
+ url(chrome://browser/content/history/history-panel.xul),
+ url(chrome://browser/content/bookmarks/bookmarksPanel.xul),
+ url(chrome://browser/content/preferences/aboutPermissions.xul),
+ url(about:permissions) {
+
+ #alltabs-popup menuitem[image=""] > .menu-iconic-left > .menu-iconic-icon,
+ .sidebar-placesTreechildren::-moz-tree-image(leaf),
+ toolbaritem .bookmark-item:not(src):not([container]):not([type]),
+ menupopup .bookmark-item:not(src):not([container]):not([type]),
+ .site-favicon:not(src) {
+ list-style-image: url("chrome://classic_theme_restorer/content/images/default_dot_favicon.png") !important;
+ -moz-image-region: rect(0px, 16px, 16px, 0px) !important;
+ }
+
+ #PopupAutoCompleteRichResult .ac-site-icon[src^="chrome://mozapps/skin/places/defaultFavicon.png"] {
+ width: 0 !important;
+ padding-right: 16px !important;
+ background-image: url("chrome://classic_theme_restorer/content/images/default_dot_favicon.png") !important;
+ }
+
+ treechildren::-moz-tree-image(title) {
+ list-style-image: url("chrome://classic_theme_restorer/content/images/default_dot_favicon.png") !important;
+ padding-right: 2px !important;
+ margin: 0px 2px !important;
+ width: 16px !important;
+ height: 16px !important;
+ }
+
+} \ No newline at end of file
diff --git a/xpi/content/css/empty_favicon_g2.css b/xpi/content/css/empty_favicon_g2.css
new file mode 100644
index 0000000..6453b6c
--- /dev/null
+++ b/xpi/content/css/empty_favicon_g2.css
@@ -0,0 +1,34 @@
+@import url(empty_favicon_g0.css);
+@namespace url(http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul);
+
+@-moz-document url(chrome://browser/content/browser.xul),
+ url(chrome://browser/content/places/places.xul),
+ url(chrome://browser/content/history/history-panel.xul),
+ url(chrome://browser/content/bookmarks/bookmarksPanel.xul),
+ url(chrome://browser/content/preferences/aboutPermissions.xul),
+ url(about:permissions) {
+
+ #alltabs-popup menuitem[image=""] > .menu-iconic-left > .menu-iconic-icon,
+ .sidebar-placesTreechildren::-moz-tree-image(leaf),
+ toolbaritem .bookmark-item:not(src):not([container]):not([type]),
+ menupopup .bookmark-item:not(src):not([container]):not([type]),
+ .site-favicon:not(src) {
+ list-style-image: url("chrome://classic_theme_restorer/content/images/default_favicon.png") !important;
+ -moz-image-region: rect(0px, 16px, 16px, 0px) !important;
+ }
+
+ #PopupAutoCompleteRichResult .ac-site-icon[src^="chrome://mozapps/skin/places/defaultFavicon.png"] {
+ width: 0 !important;
+ padding-right: 16px !important;
+ background-image: url("chrome://classic_theme_restorer/content/images/default_favicon.png") !important;
+ }
+
+ treechildren::-moz-tree-image(title) {
+ list-style-image: url("chrome://classic_theme_restorer/content/images/default_favicon.png") !important;
+ padding-right: 2px !important;
+ margin: 0px 2px !important;
+ width: 16px !important;
+ height: 16px !important;
+ }
+
+} \ No newline at end of file
diff --git a/xpi/content/css/empty_favicon_t0.css b/xpi/content/css/empty_favicon_t0.css
new file mode 100644
index 0000000..cd85e3a
--- /dev/null
+++ b/xpi/content/css/empty_favicon_t0.css
@@ -0,0 +1,13 @@
+@namespace url(http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul);
+
+@-moz-document url(chrome://browser/content/browser.xul) {
+
+ .tabbrowser-tab:not([pinned]) .tab-icon-image:not([src]) {
+ display:inline !important;
+ }
+
+ .tabbrowser-tab:not([pinned])[busy] .tab-throbber + .tab-icon-image:not([src]) {
+ display:none !important;
+ }
+
+} \ No newline at end of file
diff --git a/xpi/content/css/empty_favicon.css b/xpi/content/css/empty_favicon_t1.css
index 763702f..763702f 100644
--- a/xpi/content/css/empty_favicon.css
+++ b/xpi/content/css/empty_favicon_t1.css
diff --git a/xpi/content/css/empty_favicon_t2.css b/xpi/content/css/empty_favicon_t2.css
new file mode 100644
index 0000000..8c9eb71
--- /dev/null
+++ b/xpi/content/css/empty_favicon_t2.css
@@ -0,0 +1,18 @@
+@namespace url(http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul);
+
+@-moz-document url(chrome://browser/content/browser.xul) {
+
+ .tabbrowser-tab:not([pinned]) .tab-icon-image:not([src]) {
+ display:inline !important;
+ }
+
+ #main-window .tabbrowser-tab:not([pinned]) .tab-icon-image:not([src]),
+ #main-window[fx44plus="true"] .tabbrowser-tab:not([pinned]) .tab-icon-image:not([src]) {
+ list-style-image:url('chrome://classic_theme_restorer/content/images/default_favicon.png') !important;
+ }
+
+ .tabbrowser-tab:not([pinned])[busy] .tab-throbber + .tab-icon-image:not([src]) {
+ display:none !important;
+ }
+
+} \ No newline at end of file
diff --git a/xpi/content/css/hideurlbarrelstop2.css b/xpi/content/css/hideurlbarrelstop2.css
new file mode 100644
index 0000000..6234930
--- /dev/null
+++ b/xpi/content/css/hideurlbarrelstop2.css
@@ -0,0 +1,9 @@
+@namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
+@-moz-document url(chrome://browser/content/browser.xul){
+
+ /* force go button visibility, if urlbars stop/reload buttons are hidden */
+ #urlbar-go-button {
+ visibility: visible !important;
+ }
+
+} \ No newline at end of file
diff --git a/xpi/content/css/urlbar_dropm2.css b/xpi/content/css/urlbar_dropm2.css
new file mode 100644
index 0000000..5951425
--- /dev/null
+++ b/xpi/content/css/urlbar_dropm2.css
@@ -0,0 +1,10 @@
+@namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
+@-moz-document url(chrome://browser/content/browser.xul){
+
+ #urlbar .autocomplete-history-dropmarker,
+ #urlbar .urlbar-history-dropmarker,
+ #urlbar:not(:hover) > .urlbar-textbox-container > .urlbar-history-dropmarker {
+ opacity: 1 !important;
+ }
+
+} \ No newline at end of file
diff --git a/xpi/content/options.js b/xpi/content/options.js
index db48cb8..ff5d5ea 100644
--- a/xpi/content/options.js
+++ b/xpi/content/options.js
@@ -391,6 +391,7 @@ classicthemerestorerjso.ctr = {
if (this.appversion < 44) {
document.getElementById('ctraddon_pw_altalertbox').style.visibility = 'collapse';
+ document.getElementById('ctraddon_pw_urlbardropm2').style.visibility = 'collapse';
}
@@ -482,7 +483,6 @@ classicthemerestorerjso.ctr = {
// update sub settings
this.ctrpwAppbuttonextra(this.prefs.getCharPref("appbutton"),false);
this.ctrpwAppbuttonColorExtra(this.prefs.getCharPref("appbuttonc"));
- this.ctrpwTabEmptyFavicon(this.prefs.getBoolPref("emptyfavicon2"));
this.ctrpwCtrOldSearch(this.prefs.getBoolPref("ctroldsearch"));
this.ctrpwFaviconextra(this.prefs.getBoolPref("faviconurl"));
this.ctrpwBFextra(this.prefs.getBoolPref("backforward"));
@@ -496,6 +496,8 @@ classicthemerestorerjso.ctr = {
this.ctrpwNavBarPadding(this.prefs.getBoolPref("navbarpad"));
this.ctrpwLocationSearchbarSize(this.prefs.getBoolPref("lbsbsize"));
this.ctrpwCompactAddonList(this.prefs.getBoolPref("am_compact"));
+ this.ctrpwUnsortBM(this.prefs.getBoolPref("bmbunsortbm"));
+ this.ctrpwHideUrlStopRel(this.prefs.getBoolPref("hideurelstop"));
var closetab_value = this.prefs.getCharPref("closetab");
@@ -628,10 +630,6 @@ classicthemerestorerjso.ctr = {
document.getElementById('ctraddon_padlock_extra').disabled = which;
},
- ctrpwTabEmptyFavicon: function(which) {
- document.getElementById('ctraddon_pw_tab_emptyfavicon').disabled = which;
- },
-
ctrpwBFextra: function(which) {
var itemvis = 'collapse';
@@ -744,6 +742,32 @@ classicthemerestorerjso.ctr = {
document.getElementById('ctraddon_pw_am_compact2').style.visibility = itemvis;
},
+ ctrpwUnsortBM: function(which) {
+ var itemvis = 'collapse';
+
+ if(which==true) {
+ which=false; itemvis = 'visible';
+ } else {
+ which=true; itemvis = 'collapse';
+ }
+
+ document.getElementById('ctraddon_pw_bmbunsortbm2').disabled = which;
+ document.getElementById('ctraddon_pw_bmbunsortbm2').style.visibility = itemvis;
+ },
+
+ ctrpwHideUrlStopRel: function(which) {
+ var itemvis = 'collapse';
+
+ if(which==true) {
+ which=false; itemvis = 'visible';
+ } else {
+ which=true; itemvis = 'collapse';
+ }
+
+ document.getElementById('ctraddon_pw_hideurelstop2').disabled = which;
+ document.getElementById('ctraddon_pw_hideurelstop2').style.visibility = itemvis;
+ },
+
ctrpwCtrOldSearch: function(which) {
var itemvis = 'collapse';
@@ -1004,7 +1028,7 @@ classicthemerestorerjso.ctr = {
this.prefs.setCharPref("findbar",'findbar_bottoma');
this.prefs.setBoolPref("hideprivmask",true);
this.prefs.setBoolPref("cpanelmenus",true);
- this.prefs.setBoolPref("emptyfavicon",true);
+ this.prefs.setCharPref("emptyfavico_t",'emptyfavico_t_dot');
this.prefs.setBoolPref("hidezoomres",true);
this.prefs.setBoolPref("faviconurl",true);
this.prefs.setBoolPref("bmanimation",true);
diff --git a/xpi/content/options.xul b/xpi/content/options.xul
index a45822e..9cd83c6 100644
--- a/xpi/content/options.xul
+++ b/xpi/content/options.xul
@@ -102,9 +102,11 @@
<preference id="ctraddon_feedinurl" name="extensions.classicthemerestorer.feedinurl" type="bool" instantApply="true"/>
<preference id="ctraddon_statusbar" name="extensions.classicthemerestorer.statusbar" type="bool" instantApply="true"/>
<preference id="ctraddon_hideurelstop" name="extensions.classicthemerestorer.hideurelstop" type="bool" instantApply="true"/>
+ <preference id="ctraddon_hideurelstop2" name="extensions.classicthemerestorer.hideurelstop2" type="bool" instantApply="true"/>
<preference id="ctraddon_hideurlgo" name="extensions.classicthemerestorer.hideurlgo" type="bool" instantApply="true"/>
<preference id="ctraddon_hideurlsrg" name="extensions.classicthemerestorer.hideurlsrg" type="bool" instantApply="true"/>
<preference id="ctraddon_urlbardropm" name="extensions.classicthemerestorer.urlbardropm" type="bool" instantApply="true"/>
+ <preference id="ctraddon_urlbardropm2" name="extensions.classicthemerestorer.urlbardropm2" type="bool" instantApply="true"/>
<preference id="ctraddon_altreaderico" name="extensions.classicthemerestorer.altreaderico" type="bool" instantApply="true"/>
<preference id="ctraddon_locsearchbw10" name="extensions.classicthemerestorer.locsearchbw10" type="bool" instantApply="true"/>
<preference id="ctraddon_combrelstop" name="extensions.classicthemerestorer.combrelstop" type="bool" instantApply="true"/>
@@ -208,12 +210,13 @@
<preference id="ctraddon_cpanelmenus" name="extensions.classicthemerestorer.cpanelmenus" type="bool" instantApply="true"/>
<preference id="ctraddon_bfurlbarfix" name="extensions.classicthemerestorer.bfurlbarfix" type="bool" instantApply="true"/>
<preference id="ctraddon_bf_space" name="extensions.classicthemerestorer.bf_space" type="bool" instantApply="true"/>
- <preference id="ctraddon_emptyfavicon" name="extensions.classicthemerestorer.emptyfavicon" type="bool" instantApply="true"/>
- <preference id="ctraddon_emptyfavicon2" name="extensions.classicthemerestorer.emptyfavicon2" type="bool" instantApply="true"/>
+ <preference id="ctraddon_emptyfavico_t" name="extensions.classicthemerestorer.emptyfavico_t" type="string" instantApply="true"/>
+ <preference id="ctraddon_emptyfavico_g" name="extensions.classicthemerestorer.emptyfavico_g" type="string" instantApply="true"/>
<preference id="ctraddon_noemptypticon" name="extensions.classicthemerestorer.noemptypticon" type="bool" instantApply="true"/>
<preference id="ctraddon_hidezoomres" name="extensions.classicthemerestorer.hidezoomres" type="bool" instantApply="true"/>
<preference id="ctraddon_bmbutpanelm" name="extensions.classicthemerestorer.bmbutpanelm" type="bool" instantApply="true"/>
<preference id="ctraddon_bmbunsortbm" name="extensions.classicthemerestorer.bmbunsortbm" type="bool" instantApply="true"/>
+ <preference id="ctraddon_bmbunsortbm2" name="extensions.classicthemerestorer.bmbunsortbm2" type="bool" instantApply="true"/>
<preference id="ctraddon_bmbviewbmtb" name="extensions.classicthemerestorer.bmbviewbmtb" type="bool" instantApply="true"/>
<preference id="ctraddon_bmbnounsort" name="extensions.classicthemerestorer.bmbnounsort" type="bool" instantApply="true"/>
<preference id="ctraddon_bmbutnotext" name="extensions.classicthemerestorer.bmbutnotext" type="bool" instantApply="true"/>
@@ -356,7 +359,14 @@
</menulist>
<checkbox label="&Ctr_square_edges;" preference="ctraddon_square_edges" id="ctraddon_pw_square_edges"/>
- <checkbox label="&Ctr_emptyfavicon;" preference="ctraddon_emptyfavicon" id="ctraddon_pw_tab_emptyfavicon"/>
+ <description class="ctraddon_font1">&Ctr_emptytfavico;</description>
+ <radiogroup preference="ctraddon_emptyfavico_t" id="ctraddon_pw_emptyfavico_t" orient="horizontal" value="">
+ <radio value="emptyfavico_t_none" label="&Ctr_emptytfavico_n;" id="ctraddon_emptyfavico_t_none"/>
+ <radio value="emptyfavico_t_gen" label="&Ctr_emptytfavico_g;" id="ctraddon_emptyfavico_t_gen"/>
+ <radio value="emptyfavico_t_dot" label="" id="ctraddon_emptyfavico_t_dot"/>
+ <radio value="emptyfavico_t_sheet" label="" id="ctraddon_emptyfavico_t_sheet"/>
+ </radiogroup>
+
<checkbox label="&Ctr_noemptypticon;" preference="ctraddon_noemptypticon" id="ctraddon_pw_tab_noemptypticon"/>
<checkbox label="&Ctr_tttitlebar;" preference="ctraddon_tttitlebar" id="ctraddon_pw_tttitlebar" class="ctraddon_windowsonly" oncommand="classicthemerestorerjso.ctr.needsBrowserRestart();"/>
<radiogroup preference="ctraddon_tabthrobber" id="ctraddon_pw_tabthrobber" orient="horizontal" value="">
@@ -845,9 +855,15 @@
<checkbox label="&Ctr_wincontrols;" preference="ctraddon_wincontrols" id="ctraddon_wincontrols"/>
<checkbox label="&Ctr_oldtoplevimg;" preference="ctraddon_oldtoplevimg" id="ctraddon_pw_oldtoplevimg"/>
<checkbox label="&Ctr_altalertbox;" preference="ctraddon_altalertbox" id="ctraddon_pw_altalertbox"/>
- <checkbox label="&Ctr_emptyfavicon2;" preference="ctraddon_emptyfavicon2" id="ctraddon_pw_emptyfavicon2" oncommand="if(this.checked) {classicthemerestorerjso.ctr.ctrpwTabEmptyFavicon(true);} else {classicthemerestorerjso.ctr.ctrpwTabEmptyFavicon(false);}"/>
<checkbox label="&Ctr_skipprintpr;" preference="ctraddon_skipprintpr" id="ctraddon_pw_skipprintpr" oncommand="classicthemerestorerjso.ctr.needsBrowserRestart()"/>
+ <description class="ctraddon_font1">&Ctr_emptygfavico;</description>
+ <radiogroup preference="ctraddon_emptyfavico_g" id="ctraddon_pw_emptyfavico_g" orient="horizontal" value="">
+ <radio value="emptyfavico_g_def" label="&Ctr_tabnor_t;" id="ctraddon_emptyfavico_g_def"/>
+ <radio value="emptyfavico_g_dot" label="" id="ctraddon_emptyfavico_g_dot"/>
+ <radio value="emptyfavico_g_sheet" label="" id="ctraddon_emptyfavico_g_sheet"/>
+ </radiogroup>
+
</groupbox>
</box>
@@ -862,7 +878,8 @@
<checkbox label="&Ctr_menupopupscr;" preference="ctraddon_menupopupscr"/>
<description class="ctraddon_font1">&Ctr_bmbutton;</description>
<checkbox label="&Ctr_bmbutpanelm;" preference="ctraddon_bmbutpanelm" id="ctraddon_pw_bmbutpanelm"/>
- <checkbox label="&Ctr_bmbunsortbm;" preference="ctraddon_bmbunsortbm" id="ctraddon_pw_bmbunsortbm"/>
+ <checkbox label="&Ctr_bmbunsortbm;" preference="ctraddon_bmbunsortbm" id="ctraddon_pw_bmbunsortbm" oncommand="if(this.checked) {classicthemerestorerjso.ctr.ctrpwUnsortBM(true);} else {classicthemerestorerjso.ctr.ctrpwUnsortBM(false);}"/>
+ <checkbox label="&Ctr_bmbunsortbm2;" preference="ctraddon_bmbunsortbm2" id="ctraddon_pw_bmbunsortbm2" class="ctraddonsuboption"/>
<checkbox label="&Ctr_bmbviewbmtb;" preference="ctraddon_bmbviewbmtb" id="ctraddon_pw_bmbviewbmtb"/>
<checkbox label="&Ctr_bmbnounsort;" preference="ctraddon_bmbnounsort" id="ctraddon_pw_bmbnounsort"/>
<checkbox label="&Ctr_bmbutnotext;" preference="ctraddon_bmbutnotext" id="ctraddon_pw_bmbutnotext"/>
@@ -995,10 +1012,12 @@
<description id="ctraddon_starinurl_info" class="ctraddonsuboption">&Ctr_starinurlinfo;</description>
</hbox>
<checkbox label="&Ctr_feedinurl;" preference="ctraddon_feedinurl" id="ctraddon_pw_feedinurl" oncommand="classicthemerestorerjso.ctr.ctrpwStarFeedDelay()"/>
- <checkbox label="&Ctr_hideurelstop;" preference="ctraddon_hideurelstop" id="ctraddon_pw_hideurelstop"/>
+ <checkbox label="&Ctr_hideurelstop;" preference="ctraddon_hideurelstop" id="ctraddon_pw_hideurelstop" oncommand="if(this.checked) {classicthemerestorerjso.ctr.ctrpwHideUrlStopRel(true);} else {classicthemerestorerjso.ctr.ctrpwHideUrlStopRel(false);}"/>
+ <checkbox label="&Ctr_hideurelstop2;" preference="ctraddon_hideurelstop2" id="ctraddon_pw_hideurelstop2" class="ctraddonsuboption"/>
<checkbox label="&Ctr_hideurlgo;" preference="ctraddon_hideurlgo" id="ctraddon_pw_hideurlgo"/>
<checkbox label="&Ctr_hideurlsrg;" preference="ctraddon_hideurlsrg" id="ctraddon_pw_hideurlsrg"/>
<checkbox label="&Ctr_urlbardropm;" preference="ctraddon_urlbardropm" id="ctraddon_pw_urlbardropm"/>
+ <checkbox label="&Ctr_urlbardropm2;" preference="ctraddon_urlbardropm2" id="ctraddon_pw_urlbardropm2"/>
<checkbox label="&Ctr_altreaderico;" preference="ctraddon_altreaderico" id="ctraddon_pw_altreaderico"/>
<checkbox label="&Ctr_hideprbutton;" preference="ctraddon_hideprbutton" id="ctraddon_pw_urlbarpblocked"/>
<checkbox label="&Ctr_extraurlkeycb;&openCmd.commandkey; &amp; Alt+&urlbar.accesskey; [Windows/Linux])" preference="ctraddon_extraurlkeycb" oncommand="classicthemerestorerjso.ctr.needsBrowserRestart()"/>
diff --git a/xpi/content/overlay.css b/xpi/content/overlay.css
index 7e5b454..f4f0f5c 100644
--- a/xpi/content/overlay.css
+++ b/xpi/content/overlay.css
@@ -421,7 +421,9 @@
#main-window[defaultfxtheme="true"] #appmenu_unsortedBookmarks,
#main-window[defaultfxtheme="true"] #ctraddon_BMB_unsortedBookmarks,
#main-window[defaultfxtheme="true"] #ctraddon_BMB_unsortedBookmarks_m,
- #main-window[defaultfxtheme="true"] #ctraddon_BMB_unsortedBookmarks_mm {
+ #main-window[defaultfxtheme="true"] #ctraddon_BMB_unsortedBookmarks_m2,
+ #main-window[defaultfxtheme="true"] #ctraddon_BMB_unsortedBookmarks_mm,
+ #main-window[defaultfxtheme="true"] #ctraddon_BMB_unsortedBookmarks_mm2 {
list-style-image: url("chrome://browser/skin/places/unsortedBookmarks.png");
-moz-image-region: auto;
}
@@ -430,7 +432,9 @@
#ctraddon_BMB_viewBookmarksToolbar,
#ctraddon_BMB_viewBookmarksToolbar + menuseparator,
#ctraddon_BMB_unsortedBookmarks_m,
- #ctraddon_BMB_unsortedBookmarks_mm {
+ #ctraddon_BMB_unsortedBookmarks_m2,
+ #ctraddon_BMB_unsortedBookmarks_mm,
+ #ctraddon_BMB_unsortedBookmarks_mm2 {
visibility: collapse;
}
diff --git a/xpi/content/overlay.js b/xpi/content/overlay.js
index c02a04c..93555fa 100644
--- a/xpi/content/overlay.js
+++ b/xpi/content/overlay.js
@@ -1134,13 +1134,33 @@ classicthemerestorerjs.ctr = {
break;
case "hideurelstop":
- if (branch.getBoolPref("hideurelstop")) classicthemerestorerjs.ctr.loadUnloadCSS("hideurelstop",true);
- else classicthemerestorerjs.ctr.loadUnloadCSS("hideurelstop",false);
+ if (branch.getBoolPref("hideurelstop")) {
+ classicthemerestorerjs.ctr.loadUnloadCSS("hideurelstop",true);
+
+ if (branch.getBoolPref("hideurelstop2") && branch.getBoolPref("hideurlgo")==false) classicthemerestorerjs.ctr.loadUnloadCSS("hideurelstop2",true);
+ }
+ else {
+ classicthemerestorerjs.ctr.loadUnloadCSS("hideurelstop",false);
+ classicthemerestorerjs.ctr.loadUnloadCSS("hideurelstop2",false);
+ }
+ break;
+
+ case "hideurelstop2":
+ if (branch.getBoolPref("hideurelstop2") && branch.getBoolPref("hideurelstop") && branch.getBoolPref("hideurlgo")==false) classicthemerestorerjs.ctr.loadUnloadCSS("hideurelstop2",true);
+ else classicthemerestorerjs.ctr.loadUnloadCSS("hideurelstop2",false);
break;
case "hideurlgo":
- if (branch.getBoolPref("hideurlgo")) classicthemerestorerjs.ctr.loadUnloadCSS("hideurlgo",true);
- else classicthemerestorerjs.ctr.loadUnloadCSS("hideurlgo",false);
+ if (branch.getBoolPref("hideurlgo")) {
+ classicthemerestorerjs.ctr.loadUnloadCSS("hideurlgo",true);
+
+ if (branch.getBoolPref("hideurelstop2") && branch.getBoolPref("hideurelstop")) classicthemerestorerjs.ctr.loadUnloadCSS("hideurelstop2",false);
+ }
+ else {
+ classicthemerestorerjs.ctr.loadUnloadCSS("hideurlgo",false);
+
+ if (branch.getBoolPref("hideurelstop2") && branch.getBoolPref("hideurelstop")) classicthemerestorerjs.ctr.loadUnloadCSS("hideurelstop2",true);
+ }
break;
case "hideurlsrg":
@@ -1153,6 +1173,11 @@ classicthemerestorerjs.ctr = {
else classicthemerestorerjs.ctr.loadUnloadCSS("urlbardropm",false);
break;
+ case "urlbardropm2":
+ if (branch.getBoolPref("urlbardropm2")) classicthemerestorerjs.ctr.loadUnloadCSS("urlbardropm2",true);
+ else classicthemerestorerjs.ctr.loadUnloadCSS("urlbardropm2",false);
+ break;
+
case "altreaderico":
if (branch.getBoolPref("altreaderico") && classicthemerestorerjs.ctr.fxdefaulttheme==true && classicthemerestorerjs.ctr.appversion >= 40) classicthemerestorerjs.ctr.loadUnloadCSS("altreaderico",true);
else classicthemerestorerjs.ctr.loadUnloadCSS("altreaderico",false);
@@ -1775,23 +1800,28 @@ classicthemerestorerjs.ctr = {
else classicthemerestorerjs.ctr.loadUnloadCSS("bf_space",false);
break;
- case "emptyfavicon":
- if (branch.getBoolPref("emptyfavicon") && branch.getBoolPref("emptyfavicon2")==false) classicthemerestorerjs.ctr.loadUnloadCSS("emptyfavicon",true);
- else classicthemerestorerjs.ctr.loadUnloadCSS("emptyfavicon",false);
+ case "emptyfavico_t":
+
+ classicthemerestorerjs.ctr.loadUnloadCSS('emptyfavico_t_dot',false);
+ classicthemerestorerjs.ctr.loadUnloadCSS('emptyfavico_t_gen',false);
+ classicthemerestorerjs.ctr.loadUnloadCSS('emptyfavico_t_sheet',false);
+
+ if (branch.getCharPref("emptyfavico_t")!="emptyfavico_t_none"){
+ classicthemerestorerjs.ctr.loadUnloadCSS(branch.getCharPref("emptyfavico_t"),true);
+ }
if (branch.getBoolPref("faviconurl")) {classicthemerestorerjs.ctr.favIconinUrlbarCTR();}
break;
-
- case "emptyfavicon2":
- if (branch.getBoolPref("emptyfavicon2")) {
- classicthemerestorerjs.ctr.loadUnloadCSS("emptyfavicon2",true);
- if (branch.getBoolPref("emptyfavicon")) { classicthemerestorerjs.ctr.loadUnloadCSS("emptyfavicon",false);}
- } else {
- classicthemerestorerjs.ctr.loadUnloadCSS("emptyfavicon2",false);
- if (branch.getBoolPref("emptyfavicon")) { classicthemerestorerjs.ctr.loadUnloadCSS("emptyfavicon",true);}
+
+ case "emptyfavico_g":
+
+ classicthemerestorerjs.ctr.loadUnloadCSS('emptyfavico_g_dot',false);
+ classicthemerestorerjs.ctr.loadUnloadCSS('emptyfavico_g_sheet',false);
+
+ if (branch.getCharPref("emptyfavico_g")!="emptyfavico_g_def"){
+ classicthemerestorerjs.ctr.loadUnloadCSS(branch.getCharPref("emptyfavico_g"),true);
}
- if (branch.getBoolPref("faviconurl")) {classicthemerestorerjs.ctr.favIconinUrlbarCTR();}
break;
case "noemptypticon":
@@ -1889,9 +1919,17 @@ classicthemerestorerjs.ctr = {
}
break;
- case "bmbunsortbm":
- if (branch.getBoolPref("bmbunsortbm")) classicthemerestorerjs.ctr.loadUnloadCSS("bmbunsortbm",true);
- else classicthemerestorerjs.ctr.loadUnloadCSS("bmbunsortbm",false);
+ case "bmbunsortbm": case "bmbunsortbm2":
+ if (branch.getBoolPref("bmbunsortbm") && branch.getBoolPref("bmbunsortbm2")==false) {
+ classicthemerestorerjs.ctr.loadUnloadCSS("bmbunsortbm",true);
+ classicthemerestorerjs.ctr.loadUnloadCSS("bmbunsortbm2",false);
+ } else if (branch.getBoolPref("bmbunsortbm") && branch.getBoolPref("bmbunsortbm2")) {
+ classicthemerestorerjs.ctr.loadUnloadCSS("bmbunsortbm",false);
+ classicthemerestorerjs.ctr.loadUnloadCSS("bmbunsortbm2",true);
+ } else {
+ classicthemerestorerjs.ctr.loadUnloadCSS("bmbunsortbm",false);
+ classicthemerestorerjs.ctr.loadUnloadCSS("bmbunsortbm2",false);
+ }
break;
case "bmbviewbmtb":
@@ -2629,6 +2667,7 @@ classicthemerestorerjs.ctr = {
setTimeout(function(){
try{
document.getElementById("ctraddon_BMB_unsortedBookmarks_mm").collapsed = true;
+ document.getElementById("ctraddon_BMB_unsortedBookmarks_mm2").collapsed = true;
} catch(e){}
},1000);
}
@@ -2784,8 +2823,7 @@ classicthemerestorerjs.ctr = {
} catch(e){}
}
- var emptyfavicon1 = Services.prefs.getBranch("extensions.classicthemerestorer.").getBoolPref("emptyfavicon");
- var emptyfavicon2 = Services.prefs.getBranch("extensions.classicthemerestorer.").getBoolPref("emptyfavicon2");
+ var emptyfavicon = Services.prefs.getBranch("extensions.classicthemerestorer.").getCharPref("emptyfavico_t");
var extrabrandico = Services.prefs.getBranch("extensions.classicthemerestorer.").getBoolPref("padlockex");
var ppsvalid = false; try { ppsvalid = document.getElementById("urlbar").getAttribute('pageproxystate')=='valid'; } catch(e){}
var ppsinvalid = false; try { ppsinvalid = document.getElementById("urlbar").getAttribute('pageproxystate')=='invalid'; } catch(e){}
@@ -2797,37 +2835,37 @@ classicthemerestorerjs.ctr = {
ppfavicon.setAttribute("src", gBrowser.selectedTab.image);
} catch(e){}
}
- else if(emptyfavicon1 && emptyfavicon2==false && extrabrandico && ppsvalid && ibchromeui){
+ else if(emptyfavicon=='emptyfavico_t_dot' && extrabrandico && ppsvalid && ibchromeui){
try {
ppfavicon.removeAttribute("src");
} catch(e){}
}
- else if(emptyfavicon2 && extrabrandico && ppsvalid && ibchromeui){
+ else if(emptyfavicon=='emptyfavico_t_sheet' && extrabrandico && ppsvalid && ibchromeui){
try {
ppfavicon.removeAttribute("src");
} catch(e){}
}
- else if(emptyfavicon1 && emptyfavicon2==false && ppsinvalid && ibukidentity) {
+ else if(emptyfavicon=='emptyfavico_t_dot' && ppsinvalid && ibukidentity) {
try {
ppfavicon.setAttribute("src", "chrome://classic_theme_restorer/content/images/default_dot_favicon.png");
} catch(e){}
}
- else if(emptyfavicon2 && ppsinvalid && ibukidentity) {
+ else if(emptyfavicon=='emptyfavico_t_sheet' && ppsinvalid && ibukidentity) {
try {
ppfavicon.setAttribute("src", "chrome://classic_theme_restorer/content/images/default_favicon.png");
} catch(e){}
}
- else if(emptyfavicon1 && emptyfavicon2==false) {
+ else if(emptyfavicon=='emptyfavico_t_dot') {
try {
ppfavicon.setAttribute("src", "chrome://classic_theme_restorer/content/images/default_dot_favicon.png");
} catch(e){}
}
- else if(emptyfavicon2) {
+ else if(emptyfavicon=='emptyfavico_t_sheet') {
try {
ppfavicon.setAttribute("src", "chrome://classic_theme_restorer/content/images/default_favicon.png");
} catch(e){}
}
- else if(emptyfavicon1==false && emptyfavicon2==false) {
+ else if(emptyfavicon=='emptyfavico_t_gen' || emptyfavicon=='emptyfavico_t_none') {
try {
ppfavicon.removeAttribute("src");
} catch(e){}
@@ -3517,9 +3555,11 @@ classicthemerestorerjs.ctr = {
case "feedinurl": manageCSS("feedinurl.css"); break;
case "statusbar": manageCSS("statusbar.css"); break;
case "hideurelstop": manageCSS("hideurlbarrelstop.css"); break;
+ case "hideurelstop2": manageCSS("hideurlbarrelstop2.css"); break;
case "hideurlgo": manageCSS("hideurlbargo.css"); break;
case "hideurlsrg": manageCSS("hideurlbarrelstopgo.css"); break;
case "urlbardropm": manageCSS("urlbar_dropm.css"); break;
+ case "urlbardropm2": manageCSS("urlbar_dropm2.css"); break;
case "altreaderico": manageCSS("alt_reader_icons.css"); break;
case "locsearchbw10": manageCSS("locationsearchbarw10.css"); break;
case "combrelstop": manageCSS("combrelstop.css"); break;
@@ -3553,8 +3593,11 @@ classicthemerestorerjs.ctr = {
case "alttabstb2": manageCSS("alttabstoolbar2.css"); break;
case "hidetbwotextra": manageCSS("hidetbwot_extra.css"); break;
- case "emptyfavicon": manageCSS("empty_favicon.css"); break;
- case "emptyfavicon2": manageCSS("empty_favicon2.css"); break;
+ case "emptyfavico_t_gen": manageCSS("empty_favicon_t0.css"); break;
+ case "emptyfavico_t_dot": manageCSS("empty_favicon_t1.css"); break;
+ case "emptyfavico_t_sheet": manageCSS("empty_favicon_t2.css"); break;
+ case "emptyfavico_g_dot": manageCSS("empty_favicon_g1.css"); break;
+ case "emptyfavico_g_sheet": manageCSS("empty_favicon_g2.css"); break;
case "noemptypticon": manageCSS("empty_favicon_pt.css"); break;
case "hidezoomres": manageCSS("hide_zoomreset.css"); break;
case "alt_newtabp": manageCSS("alt_newtabpage.css"); break;
@@ -3574,6 +3617,7 @@ classicthemerestorerjs.ctr = {
case "bmbutpanelm": manageCSS("bmbut_pmenu.css"); break;
case "bmbunsortbm": manageCSS("bmbut_unsortedbookm.css"); break;
+ case "bmbunsortbm2": manageCSS("bmbut_unsortedbookm2.css"); break;
case "bmbviewbmtb": manageCSS("bmbut_bmbviewbmtb.css"); break;
case "bmbnounsort": manageCSS("bmbut_bmbnounsort.css"); break;
case "bmbutnotext": manageCSS("bmbut_no_label.css"); break;
diff --git a/xpi/content/overlay.xul b/xpi/content/overlay.xul
index ed68c83..63edaff 100644
--- a/xpi/content/overlay.xul
+++ b/xpi/content/overlay.xul
@@ -146,6 +146,17 @@
new PlacesMenu(event, 'place:folder=UNFILED_BOOKMARKS',
PlacesUIUtils.getViewForNode(this.parentNode.parentNode).options);"/>
</menu>
+ <menu id="ctraddon_BMB_unsortedBookmarks_mm2"
+ class="menu-iconic bookmark-item"
+ label="&bookmarksMenuButton.unsorted.label;"
+ container="true">
+ <menupopup id="BMB_unsortedBookmarksPopup_mm2"
+ placespopup="true"
+ context="placesContext"
+ onpopupshowing="if (!this.parentNode._placesView)
+ new PlacesMenu(event, 'place:folder=UNFILED_BOOKMARKS',
+ PlacesUIUtils.getViewForNode(this.parentNode.parentNode).options);"/>
+ </menu>
</menugroup>
<!--### Add ability to open the 'more page info' window by clicking the icon inside identity box ###-->
@@ -824,7 +835,7 @@
class="menu-iconic bookmark-item"
label="&bookmarksMenuButton.unsorted.label;"
container="true">
- <menupopup id="BMB_unsortedBookmarksPopup"
+ <menupopup id="BMB_unsortedBookmarksPopup_m"
placespopup="true"
context="placesContext"
onpopupshowing="if (!this.parentNode._placesView)
@@ -840,6 +851,17 @@
label="&unsortedBookmarksCmd.label;"
oncommand="PlacesCommandHook.showPlacesOrganizer('UnfiledBookmarks');"
class="menuitem-iconic"/>
+ <menu id="ctraddon_BMB_unsortedBookmarks_m2"
+ class="menu-iconic bookmark-item"
+ label="&bookmarksMenuButton.unsorted.label;"
+ container="true">
+ <menupopup id="BMB_unsortedBookmarksPopup_m2"
+ placespopup="true"
+ context="placesContext"
+ onpopupshowing="if (!this.parentNode._placesView)
+ new PlacesMenu(event, 'place:folder=UNFILED_BOOKMARKS',
+ PlacesUIUtils.getViewForNode(this.parentNode.parentNode).options);"/>
+ </menu>
</menupopup>
</toolbarbutton>
diff --git a/xpi/content/overlay_prefs.css b/xpi/content/overlay_prefs.css
index 4f5112c..d544bcf 100644
--- a/xpi/content/overlay_prefs.css
+++ b/xpi/content/overlay_prefs.css
@@ -225,7 +225,6 @@ radio.ctraddontab .radio-check-box1 {
At least 'padding-left' does not create an empty space in front of ootion labels on rtl locales
*/
-#ctraddon_pw_tab_emptyfavicon label,
#ctraddon_pw_tab_noemptypticon label {
background:url('chrome://classic_theme_restorer/content/images/default_dot_favicon.png') no-repeat left !important;
padding-left:20px !important;
@@ -322,25 +321,51 @@ radio.ctraddontab .radio-check-box1 {
border: 1px solid Highlight !important;
}
+/**/
+
+#ctraddon_emptyfavico_t_sheet,
+#ctraddon_emptyfavico_g_sheet{
+ list-style-image:url('chrome://classic_theme_restorer/content/images/default_favicon.png');
+}
+
+#ctraddon_emptyfavico_t_dot,
+#ctraddon_emptyfavico_g_dot{
+ list-style-image:url('chrome://classic_theme_restorer/content/images/default_dot_favicon.png');
+}
+
+#ctraddon_emptyfavico_t_none.
+#ctraddon_emptyfavico_g_def {
+ -moz-margin-end: 0px;
+}
+
+#ctraddon_emptyfavico_t_gen,
+#ctraddon_emptyfavico_t_dot,
+#ctraddon_emptyfavico_g_dot,
+#ctraddon_emptyfavico_t_sheet,
+#ctraddon_emptyfavico_g_sheet{
+ margin-left: -1px;
+ margin-right: -1px;
+}
+
/* tab separator settings */
#ctraddon_tabsep_def {
-moz-margin-end:-2px;
}
#ctraddon_tabsep_black{
list-style-image:url('chrome://classic_theme_restorer/content/images/tab-separator.png');
- -moz-image-region: rect(0px, 3px, 24px, 0px);
+ -moz-image-region: rect(0px, 3px, 24px, 0px);
}
#ctraddon_tabsep_luna{
list-style-image:url('chrome://classic_theme_restorer/content/images/tab-separator-luna-blue.png');
- -moz-image-region: rect(0px, 3px, 24px, 0px);
+ -moz-image-region: rect(0px, 3px, 24px, 0px);
}
#ctraddon_tabsep_xp{
list-style-image:url('chrome://classic_theme_restorer/content/images/tab-separator-XP.png');
- -moz-image-region: rect(0px, 3px, 24px, 0px);
+ -moz-image-region: rect(0px, 3px, 24px, 0px);
}
#ctraddon_tabsep_white{
list-style-image:url('chrome://classic_theme_restorer/content/images/tab-separator-inv.png');
- -moz-image-region: rect(0px, 3px, 24px, 0px);
+ -moz-image-region: rect(0px, 3px, 24px, 0px);
}
#ctraddon_tabsep_black_sol{
list-style-image:url('chrome://classic_theme_restorer/content/images/tab-separator_solid.png');
@@ -420,12 +445,6 @@ radio.ctraddontab .radio-check-box1 {
min-height:16px !important;
}
-#ctraddon_pw_emptyfavicon2 label {
- background:url('chrome://classic_theme_restorer/content/images/default_favicon.png') no-repeat left !important;
- padding-left:20px !important;
- min-height:16px !important;
-}
-
#ctraddon_pw_activitythrobber label {
background:url('chrome://classic_theme_restorer/content/images/throbber_loading.png') no-repeat left !important;
padding-left:20px !important;
@@ -445,6 +464,7 @@ radio.ctraddontab .radio-check-box1 {
min-height:16px !important;
}
+#ctraddon_pw_hideurelstop2 label,
#ctraddon_pw_hideurlgo label {
background:url('chrome://classic_theme_restorer/content/images/urlgo.png') no-repeat left !important;
padding-left:20px !important;
@@ -457,7 +477,8 @@ radio.ctraddontab .radio-check-box1 {
min-height:16px !important;
}
-#ctraddon_pw_urlbardropm label{
+#ctraddon_pw_urlbardropm label,
+#ctraddon_pw_urlbardropm2 label{
background:url('chrome://classic_theme_restorer/content/images/pw_urlbar_dropmarker.png') no-repeat left !important;
padding-left:20px !important;
}
@@ -525,6 +546,7 @@ radio.ctraddontab .radio-check-box1 {
#ctraddon_pw_bmbutpanelm label,
#ctraddon_pw_bmbunsortbm label,
+#ctraddon_pw_bmbunsortbm2 label,
#ctraddon_pw_bmbutnotext label,
#ctraddon_pw_bmbviewbmtb label,
#ctraddon_pw_bmbnounsort label {
diff --git a/xpi/defaults/preferences/options.js b/xpi/defaults/preferences/options.js
index 67036a9..3933ef1 100644
--- a/xpi/defaults/preferences/options.js
+++ b/xpi/defaults/preferences/options.js
@@ -1,5 +1,4 @@
// tab settings
-// tab settings
pref("extensions.classicthemerestorer.tabs","tabs_squared");
pref("extensions.classicthemerestorer.tabsontop",'unset');
pref("extensions.classicthemerestorer.ctabheightcb",false);
@@ -7,7 +6,7 @@ pref("extensions.classicthemerestorer.square_edges",false);
pref("extensions.classicthemerestorer.ctabheight",28);
pref("extensions.classicthemerestorer.ctabmwidth",100);
pref("extensions.classicthemerestorer.ctabwidth",210);
-pref("extensions.classicthemerestorer.emptyfavicon",false);
+pref("extensions.classicthemerestorer.emptyfavico_t",'emptyfavico_t_none');
pref("extensions.classicthemerestorer.noemptypticon",false);
pref("extensions.classicthemerestorer.closetab","closetab_default");
pref("extensions.classicthemerestorer.closetabhfl",false);
@@ -51,7 +50,7 @@ pref("extensions.classicthemerestorer.iat_notf_vt",false);
pref("extensions.classicthemerestorer.wincontrols",false);
pref("extensions.classicthemerestorer.oldtoplevimg",false);
pref("extensions.classicthemerestorer.altalertbox",false);
-pref("extensions.classicthemerestorer.emptyfavicon2",false);
+pref("extensions.classicthemerestorer.emptyfavico_g",'emptyfavico_g_def');
pref("extensions.classicthemerestorer.panelmenucol",false);
pref("extensions.classicthemerestorer.cpanelmenus",false);
pref("extensions.classicthemerestorer.hidezoomres",false);
@@ -69,6 +68,7 @@ pref("extensions.classicthemerestorer.am_highlight",false);
pref("extensions.classicthemerestorer.alt_addonsp",false);
pref("extensions.classicthemerestorer.bmbutpanelm",false);
pref("extensions.classicthemerestorer.bmbunsortbm",false);
+pref("extensions.classicthemerestorer.bmbunsortbm2",true);
pref("extensions.classicthemerestorer.bmbviewbmtb",false);
pref("extensions.classicthemerestorer.bmbnounsort",false);
pref("extensions.classicthemerestorer.bmbutnotext",false);
@@ -104,10 +104,12 @@ pref("extensions.classicthemerestorer.tabseparator","tabsep_default");
pref("extensions.classicthemerestorer.starinurl",false);
pref("extensions.classicthemerestorer.feedinurl",false);
pref("extensions.classicthemerestorer.hideurelstop",false);
+pref("extensions.classicthemerestorer.hideurelstop2",false);
pref("extensions.classicthemerestorer.hideurlgo",false);
pref("extensions.classicthemerestorer.hideurlsrg",false);
pref("extensions.classicthemerestorer.hideprbutton",false);
pref("extensions.classicthemerestorer.urlbardropm",false);
+pref("extensions.classicthemerestorer.urlbardropm2",false);
pref("extensions.classicthemerestorer.altreaderico",false);
pref("extensions.classicthemerestorer.ib_nohovcolor",false);
diff --git a/xpi/install.rdf b/xpi/install.rdf
index 342552d..aee3939 100644
--- a/xpi/install.rdf
+++ b/xpi/install.rdf
@@ -5,7 +5,7 @@
<Description rdf:about="urn:mozilla:install-manifest">
<em:id>ClassicThemeRestorer@ArisT2Noia4dev</em:id>
<em:name>Classic Theme Restorer</em:name>
- <em:version>1.4.7</em:version>
+ <em:version>1.4.8beta1</em:version>
<em:type>2</em:type>
<em:multiprocessCompatible>true</em:multiprocessCompatible>
diff --git a/xpi/locale/cs/options.dtd b/xpi/locale/cs/options.dtd
index 44e386a..827fd77 100644
--- a/xpi/locale/cs/options.dtd
+++ b/xpi/locale/cs/options.dtd
@@ -57,7 +57,9 @@
<!ENTITY Ctr_square_edges "Hranaté horní rohy">
<!ENTITY Ctr_tttitlebar "Název panelu v &brandShortName; liště aplikace">
<!ENTITY Ctr_tabinsertion "Vložit související panel za aktuální (about:config)">
-<!ENTITY Ctr_emptyfavicon "Obnovit prázdnou faviconu (pokud stránka nemá vlastní)">
+<!ENTITY Ctr_emptytfavico "Show favicon (if a site does not offer one)">
+<!ENTITY Ctr_emptytfavico_n "None">
+<!ENTITY Ctr_emptytfavico_g "Generic">
<!ENTITY Ctr_noemptypticon "Odebrat prázdnou faviconu z připnutého panelu">
<!ENTITY Ctr_e10stab_notd "E10s tabs: zrušit podtržení">
<!ENTITY Ctr_closetab_0 "Zavřít panel">
@@ -127,7 +129,7 @@
<!ENTITY Ctr_wincontrols "Přesunutelné ovládací prvky okna v režimu celé obrazovky">
<!ENTITY Ctr_oldtoplevimg "'Top level domain' obrázků: klasický vzhled">
<!ENTITY Ctr_altalertbox "'Alert box': alternativní vzhled">
-<!ENTITY Ctr_emptyfavicon2 "Nahradit obecnou faviconu (prázdnou tečkovanou) faviconou listu">
+<!ENTITY Ctr_emptygfavico "Replace generic favicon">
<!ENTITY Ctr_mstatusbar "Přesunutelný stavový řádek">
<!ENTITY Ctr_mstatusbars4e "Stavový řádek je nastaven pomocí rozšíření 'Status-4-Evar'">
<!ENTITY Ctr_mstatusbartpp "Stavový řádek je nastaven pomocí rozšíření 'ThePuzzlePiece'">
@@ -172,6 +174,7 @@
<!ENTITY Ctr_bmbutton "Tlačítko menu záložek">
<!ENTITY Ctr_bmbutpanelm "Popup: panel menu vzhledu">
<!ENTITY Ctr_bmbunsortbm "Popup: 'Netříděné záložky' v submenu">
+<!ENTITY Ctr_bmbunsortbm2 "Menu above bookmarks">
<!ENTITY Ctr_bmbviewbmtb "Popup: ukázat 'Zobrazit lištu'">
<!ENTITY Ctr_bmbnounsort "Popup: skrýt 'Netříděné záložky'">
<!ENTITY Ctr_bmbutnotext "Skrýt návěští na liště záložek">
@@ -222,9 +225,11 @@
<!ENTITY Ctr_starinurlinfo "Skrýt tlačítka menu záložek">
<!ENTITY Ctr_feedinurl "Tlačítko kanálu">
<!ENTITY Ctr_hideurelstop "Skrýt tlačítka zastavit &amp; obnovit">
+<!ENTITY Ctr_hideurelstop2 "Always show 'go' button">
<!ENTITY Ctr_hideurlgo "Skrýt tlačítko 'přejít'">
<!ENTITY Ctr_hideurlsrg "Skrýt tlačítka 'obnovit, zastavit &amp; přejít' oddělovače &amp; mezery">
<!ENTITY Ctr_urlbardropm "Přesunout šipku na poslední pozici vpravo">
+<!ENTITY Ctr_urlbardropm2 "Make dropmarker always visible">
<!ENTITY Ctr_altreaderico "Alternativní ikona 'Readeru'">
<!ENTITY Ctr_hideprbutton "Nezobrazovat upozornění při blokování vyskakovacích oken">
<!ENTITY Ctr_locsearchbw10 "Snížit výšku adresního řádku a vyhledávače (experimentální)">
diff --git a/xpi/locale/da/options.dtd b/xpi/locale/da/options.dtd
index 84c53e3..ee2d4e7 100644
--- a/xpi/locale/da/options.dtd
+++ b/xpi/locale/da/options.dtd
@@ -57,7 +57,9 @@
<!ENTITY Ctr_square_edges "Firkantede øverste hjørner">
<!ENTITY Ctr_tttitlebar "Fanebladstitel i &brandShortName;-titellinje">
<!ENTITY Ctr_tabinsertion "Indsæt relaterede faneblad efter aktive faneblad (about:config)">
-<!ENTITY Ctr_emptyfavicon "Gendan tomme favicon (hvis webstedet ikke levere et)">
+<!ENTITY Ctr_emptytfavico "Show favicon (if a site does not offer one)">
+<!ENTITY Ctr_emptytfavico_n "None">
+<!ENTITY Ctr_emptytfavico_g "Generic">
<!ENTITY Ctr_noemptypticon "Fjern tomme favicon fra fastgjorte faneblade">
<!ENTITY Ctr_e10stab_notd "E10s faneblade: fjern understregning">
<!ENTITY Ctr_closetab_0 "Lukning af faneblad">
@@ -127,7 +129,7 @@
<!ENTITY Ctr_wincontrols "Flytbar fuldskærmsvindue kontrolelementer">
<!ENTITY Ctr_oldtoplevimg "'Top level domæne'-billeder: klassisk udseende">
<!ENTITY Ctr_altalertbox "'Alert-boks': alternativt udseende">
-<!ENTITY Ctr_emptyfavicon2 "Erstat generelle (tomme eller prikkede) favicon'er med papirark-favicon">
+<!ENTITY Ctr_emptygfavico "Replace generic favicon">
<!ENTITY Ctr_mstatusbar "Flytbare statuspanel">
<!ENTITY Ctr_mstatusbars4e "Statuslinje-panel styres af 'Status-4-Evar'">
<!ENTITY Ctr_mstatusbartpp "Statuslinje-panel styres af 'ThePuzzlePiece'">
@@ -172,6 +174,7 @@
<!ENTITY Ctr_bmbutton "Bogmærker-menuknap">
<!ENTITY Ctr_bmbutpanelm "Popup: panelmenu udseende">
<!ENTITY Ctr_bmbunsortbm "Popup: 'usorterede bogmærker'-undermenu">
+<!ENTITY Ctr_bmbunsortbm2 "Menu above bookmarks">
<!ENTITY Ctr_bmbviewbmtb "Popup: vis 'Vis værktøjslinje'">
<!ENTITY Ctr_bmbnounsort "Popup: skjul 'usorterede bogmærker'">
<!ENTITY Ctr_bmbutnotext "Skjul etiket på bogmærkelinje">
@@ -222,9 +225,11 @@
<!ENTITY Ctr_starinurlinfo "Standard bogmærker-menuknap skjules">
<!ENTITY Ctr_feedinurl "RSS feed-knap">
<!ENTITY Ctr_hideurelstop "Skjul knapperne 'Stop &amp; genindlæs'">
+<!ENTITY Ctr_hideurelstop2 "Always show 'go' button">
<!ENTITY Ctr_hideurlgo "Skjul 'gå'-knap">
<!ENTITY Ctr_hideurlsrg "Skjul 'genindlæs, stop &amp; gå'-knapseparatore &amp; mellemrum">
<!ENTITY Ctr_urlbardropm "Flyt rullemenu-pilen til den sidst mulige position">
+<!ENTITY Ctr_urlbardropm2 "Make dropmarker always visible">
<!ENTITY Ctr_altreaderico "Alternative 'Læser'-ikoner">
<!ENTITY Ctr_hideprbutton "Skjul notifikationsikonet når en popup blokeres">
<!ENTITY Ctr_locsearchbw10 "Reducér adresselinjers og søgelinjers højde (eksperimentel)">
diff --git a/xpi/locale/de/options.dtd b/xpi/locale/de/options.dtd
index e690c7e..8b2114d 100644
--- a/xpi/locale/de/options.dtd
+++ b/xpi/locale/de/options.dtd
@@ -57,7 +57,9 @@
<!ENTITY Ctr_square_edges "Eckige obere Tabränder">
<!ENTITY Ctr_tttitlebar "Tabtitel in der &brandShortName; Titelleiste">
<!ENTITY Ctr_tabinsertion "Verwandten Tab nach aktuellem Tab einfügen (about:config Einstellung)">
-<!ENTITY Ctr_emptyfavicon "Leeres Lesezeichensymbol auf Tabs wiederherstellen">
+<!ENTITY Ctr_emptytfavico "Zeige Lesezeichensymbol auf Tabs (falls keines vorhanden ist)">
+<!ENTITY Ctr_emptytfavico_n "Kein">
+<!ENTITY Ctr_emptytfavico_g "Allgemein">
<!ENTITY Ctr_noemptypticon "Leeres Lesezeichensymbol auf angehefteten Tabs verstecken">
<!ENTITY Ctr_e10stab_notd "E10s Tabs: Unterstreichung entfernen">
<!ENTITY Ctr_closetab_0 "'Tab schließen'">
@@ -127,7 +129,7 @@
<!ENTITY Ctr_wincontrols "Verschiebbare Fenster-Schaltflächen im Vollbild-Modus">
<!ENTITY Ctr_oldtoplevimg "Bilder oberster Ebene (Top-Level-Domain): klassische Darstellung">
<!ENTITY Ctr_altalertbox "'Benachrichtigungs-Box': alternative Darstellung">
-<!ENTITY Ctr_emptyfavicon2 "Leeres Lesezeichensymbol durch Papierblattsymbol ersetzen">
+<!ENTITY Ctr_emptygfavico "Allgemeines Lesezeichensymbol ersetzen">
<!ENTITY Ctr_mstatusbar "Statusbereich: sichtbar und verschiebbar">
<!ENTITY Ctr_mstatusbars4e "Statusbereich wird von 'Status-4-Evar' kontrolliert">
<!ENTITY Ctr_mstatusbartpp "Statusbereich wird von 'ThePuzzlePiece' kontrolliert">
@@ -171,7 +173,8 @@
<!ENTITY Ctr_xpinstallui "Altes Add-on Installationsfenster (about:config Einstellung)">
<!ENTITY Ctr_bmbutton "Lesezeichen-Menüschaltfläche">
<!ENTITY Ctr_bmbutpanelm "Aufklappmenü: 'Panel'-Darstellung">
-<!ENTITY Ctr_bmbunsortbm "Aufklappmenü: 'Unsortierte Lesezeichen' Untermenü">
+<!ENTITY Ctr_bmbunsortbm "Aufklappmenü: 'Unsortierte Lesezeichen' Menü">
+<!ENTITY Ctr_bmbunsortbm2 "Menü über den Lesezeichen">
<!ENTITY Ctr_bmbviewbmtb "Aufklappmenü: 'Lesezeichen-Symbolleiste anzeigen'">
<!ENTITY Ctr_bmbnounsort "Aufklappmenü: verstecke 'Unsortierte Lesezeichen'">
<!ENTITY Ctr_bmbutnotext "Text auf der Lesezeichenleiste verstecken">
@@ -222,9 +225,11 @@
<!ENTITY Ctr_starinurlinfo "Standard-Lesezeichenschaltfläche wird entfernt">
<!ENTITY Ctr_feedinurl "Feed abonnieren">
<!ENTITY Ctr_hideurelstop "Entferne 'Stopp' &amp; 'Neu laden'">
+<!ENTITY Ctr_hideurelstop2 "'Los' immer anzeigen">
<!ENTITY Ctr_hideurlgo "Entferne 'Los'">
<!ENTITY Ctr_hideurlsrg "Entferne 'Neu laden, Stopp &amp; Los' Trennlinien &amp; Leerstellen">
<!ENTITY Ctr_urlbardropm "Verschiebe die Aufklapp-Schaltfläche an die letztmögliche Position">
+<!ENTITY Ctr_urlbardropm2 "Aufklapp-Schaltfläche immer anzeigen">
<!ENTITY Ctr_altreaderico "Alternative Symbole für die 'Lese-Modus'-Schaltfläche">
<!ENTITY Ctr_hideprbutton "Verstecke 'Infosymbol' (wenn ein Popup-Fenster blockiert wurde)">
<!ENTITY Ctr_locsearchbw10 "Höhe der Adress- und Suchleiste reduzieren (experimentell)">
diff --git a/xpi/locale/dsb/options.dtd b/xpi/locale/dsb/options.dtd
index 5ea969b..2c2f8e0 100644
--- a/xpi/locale/dsb/options.dtd
+++ b/xpi/locale/dsb/options.dtd
@@ -57,7 +57,9 @@
<!ENTITY Ctr_square_edges "Kwadratiske górne rožki">
<!ENTITY Ctr_tttitlebar "Rejtarkowy titel w titelowej rědce &brandShortName;">
<!ENTITY Ctr_tabinsertion "Pśiswójźbny rejtark za aktualnym rejtarkom zasunuś (about:config)">
-<!ENTITY Ctr_emptyfavicon "Prozny faworitowy symbol wótnowiś (jolic sedło njepóbitujo žeden)">
+<!ENTITY Ctr_emptytfavico "Show favicon (if a site does not offer one)">
+<!ENTITY Ctr_emptytfavico_n "None">
+<!ENTITY Ctr_emptytfavico_g "Generic">
<!ENTITY Ctr_noemptypticon "Prozny faworitowy symbol z pśipětego rejtarka">
<!ENTITY Ctr_e10stab_notd "Rejtarki e10s: Pódsmužku wótpóraś">
<!ENTITY Ctr_closetab_0 "Rejtark zacyniś">
@@ -127,7 +129,7 @@
<!ENTITY Ctr_wincontrols "Pśesuwajobne wóźeńske elementy połneje wobrazowki">
<!ENTITY Ctr_oldtoplevimg "Wobraze 'nejwušeje domeny': klasiski wenkowny naglěd">
<!ENTITY Ctr_altalertbox "'Warnowański kašćik': alternatiwny wenkowny naglěd">
-<!ENTITY Ctr_emptyfavicon2 "Prozny a dypkaty faworitowy symbol pśez łopjenowy symbol wuměniś">
+<!ENTITY Ctr_emptygfavico "Replace generic favicon">
<!ENTITY Ctr_mstatusbar "Pśesuwajobny wobcerk statusoweje rědki">
<!ENTITY Ctr_mstatusbars4e "Wobcerk statusoweje rědki kontrolěrujo se pśez 'Status-4-Evar'">
<!ENTITY Ctr_mstatusbartpp "Wobcerk statusoweje rědki kontrolěrujo se pśez 'ThePuzzlePiece'">
@@ -172,6 +174,7 @@
<!ENTITY Ctr_bmbutton "Tłocašk menija cytańskich znamjenjow">
<!ENTITY Ctr_bmbutpanelm "Wuskokujucy meni: naglěd menijowego wuskokujucego wokna">
<!ENTITY Ctr_bmbunsortbm "Wuskokujucy meni: pódmeni 'Njesortěrowane cytańske znamjenja' submenu">
+<!ENTITY Ctr_bmbunsortbm2 "Menu above bookmarks">
<!ENTITY Ctr_bmbviewbmtb "Wuskokujucy meni: 'Rědku cytańskich znamjenjow pokazaś' pokazaś">
<!ENTITY Ctr_bmbnounsort "Wuskokujucy meni: 'Njesortěrowane cytańske znamjenja' schowaś">
<!ENTITY Ctr_bmbutnotext "Tekst na rědce cytańskich znamjenjow schowaś">
@@ -222,9 +225,11 @@
<!ENTITY Ctr_starinurlinfo "Standardny tłocašk menija Cytańske znamjenja se schowajo">
<!ENTITY Ctr_feedinurl "Kanalowy tłocašk">
<!ENTITY Ctr_hideurelstop "Tłocaška Stoj a Znowego adresowych rědkow schowaś">
+<!ENTITY Ctr_hideurelstop2 "Always show 'go' button">
<!ENTITY Ctr_hideurlgo "Tłocašk 'Start' schowaś">
<!ENTITY Ctr_hideurlsrg "Źěleńske smužki a prozne znamjenja za tłocaški 'Znowego, stoj a Start' schowaś">
<!ENTITY Ctr_urlbardropm "Tłocašk špica šypki do slědneje móžneje pozicije pśesunuś">
+<!ENTITY Ctr_urlbardropm2 "Make dropmarker always visible">
<!ENTITY Ctr_altreaderico "Alternatiwne 'cytakowe' symbole">
<!ENTITY Ctr_hideprbutton "Zdźěleński symbol schowaś, gaž wuskokujuce wokno se blokěrujo">
<!ENTITY Ctr_locsearchbw10 "Wusokosć adresowych a pytańskich pólow reducěrowaś (eksperimentelne)">
diff --git a/xpi/locale/el/options.dtd b/xpi/locale/el/options.dtd
index 1aaae69..bb463b6 100644
--- a/xpi/locale/el/options.dtd
+++ b/xpi/locale/el/options.dtd
@@ -57,7 +57,9 @@
<!ENTITY Ctr_square_edges "Τετραγωνισμένες γωνίες κορυφής">
<!ENTITY Ctr_tttitlebar "Τίτλος καρτέλας στη γραμμή τίτλου του &brandShortName;">
<!ENTITY Ctr_tabinsertion "Εισαγωγή συναφούς καρτέλας μετά την τρέχουσα καρτέλα (προτίμηση «about:config»)">
-<!ENTITY Ctr_emptyfavicon "Επαναφορά κενού εικονιδίου (εάν ένας ιστότοπος δεν διαθέτει εικονίδιο)">
+<!ENTITY Ctr_emptytfavico "Show favicon (if a site does not offer one)">
+<!ENTITY Ctr_emptytfavico_n "None">
+<!ENTITY Ctr_emptytfavico_g "Generic">
<!ENTITY Ctr_noemptypticon "Απομάκρυνση κενού εικονιδίου από καρτέλες εφαρμογών">
<!ENTITY Ctr_e10stab_notd "Καρτέλες E10s: απομάκρυνση υπογράμμισης">
<!ENTITY Ctr_closetab_0 "Κλείσιμο καρτέλας">
@@ -127,7 +129,7 @@
<!ENTITY Ctr_wincontrols "Μετακινήσιμα στοιχεία ελέγχου παραθύρου σε προβολή πλήρους οθόνης">
<!ENTITY Ctr_oldtoplevimg "Εικόνες τομέα «ανώτατου επιπέδου»: κλασική εμφάνιση">
<!ENTITY Ctr_altalertbox "«Πλαίσιο ειδοποίησης»: εναλλακτική εμφάνιση">
-<!ENTITY Ctr_emptyfavicon2 "Αντικατάσταση γενικού εικονιδίου (κενό και διάστικτο) με εικονίδιο φύλλου">
+<!ENTITY Ctr_emptygfavico "Replace generic favicon">
<!ENTITY Ctr_mstatusbar "Μετακινήσιμο πινακίδιο γραμμής κατάστασης">
<!ENTITY Ctr_mstatusbars4e "Το πινακίδιο γραμμής κατάστασης ελέγχεται από την επέκταση «Status-4-Evar»">
<!ENTITY Ctr_mstatusbartpp "Το πινακίδιο γραμμής κατάστασης ελέγχεται από την επέκταση «ThePuzzlePiece»">
@@ -172,6 +174,7 @@
<!ENTITY Ctr_bmbutton "Κουμπί μενού σελιδοδεικτών">
<!ENTITY Ctr_bmbutpanelm "Αναδυόμενο: εμφάνιση ως μενού πίνακα">
<!ENTITY Ctr_bmbunsortbm "Αναδυόμενο: υπομενού «Αταξινόμητοι σελιδοδείκτες»">
+<!ENTITY Ctr_bmbunsortbm2 "Menu above bookmarks">
<!ENTITY Ctr_bmbviewbmtb "Αναδυόμενο: εμφάνιση «Προβολή εργαλειοθήκης σελιδοδεικτών»">
<!ENTITY Ctr_bmbnounsort "Αναδυόμενο: απόκρυψη «Αταξινόμητοι σελιδοδείκτες»">
<!ENTITY Ctr_bmbutnotext "Απόκρυψη ετικέτας στην εργαλειοθήκη σελιδοδεικτών">
@@ -222,9 +225,11 @@
<!ENTITY Ctr_starinurlinfo "Το προεπιλεγμένο κουμπί μενού σελιδοδεικτών αποκρύπτεται">
<!ENTITY Ctr_feedinurl "Κουμπί «Συνδρομή» (RSS)">
<!ENTITY Ctr_hideurelstop "Απόκρυψη κουμπιών «Διακοπή» &amp; «Ανανέωση»">
+<!ENTITY Ctr_hideurelstop2 "Always show 'go' button">
<!ENTITY Ctr_hideurlgo "Απόκρυψη κουμπιού «Μετάβαση»">
<!ENTITY Ctr_hideurlsrg "Απόκρυψη διαχωριστικών &amp; διαστημάτων κουμπιών «Ανανέωση», «Διακοπή» &amp; «Μετάβαση»">
<!ENTITY Ctr_urlbardropm "Μετακίνηση του δείκτη ανάπτυξης στην τελευταία δυνατή θέση">
+<!ENTITY Ctr_urlbardropm2 "Make dropmarker always visible">
<!ENTITY Ctr_altreaderico "Εναλλακτικά εικονίδια «λειτουργίας ανάγνωσης»">
<!ENTITY Ctr_hideprbutton "Απόκρυψη εικονιδίου ειδοποίησης φραγής αναδυόμενου παραθύρου">
<!ENTITY Ctr_locsearchbw10 "Μείωση ύψους γραμμών τοποθεσιών και αναζήτησης (πειραματικό)">
diff --git a/xpi/locale/en-US/options.dtd b/xpi/locale/en-US/options.dtd
index dc0cec6..2621896 100644
--- a/xpi/locale/en-US/options.dtd
+++ b/xpi/locale/en-US/options.dtd
@@ -57,7 +57,9 @@
<!ENTITY Ctr_square_edges "Squared top corners">
<!ENTITY Ctr_tttitlebar "Tab title in &brandShortName; titlebar">
<!ENTITY Ctr_tabinsertion "Insert related tab after current tab (about:config preference)">
-<!ENTITY Ctr_emptyfavicon "Restore empty favicon (if a site does not offer one)">
+<!ENTITY Ctr_emptytfavico "Show favicon (if a site does not offer one)">
+<!ENTITY Ctr_emptytfavico_n "None">
+<!ENTITY Ctr_emptytfavico_g "Generic">
<!ENTITY Ctr_noemptypticon "Remove empty favicon from pinned tabs">
<!ENTITY Ctr_e10stab_notd "E10s tabs: remove underline">
<!ENTITY Ctr_closetab_0 "Tab Close">
@@ -127,7 +129,7 @@
<!ENTITY Ctr_wincontrols "Movable fullscreen window controls">
<!ENTITY Ctr_oldtoplevimg "'Top level domain' images: classic appearance">
<!ENTITY Ctr_altalertbox "'Alert box': alternative appearance">
-<!ENTITY Ctr_emptyfavicon2 "Replace generic (empty and dotted) favicon with sheet favicon">
+<!ENTITY Ctr_emptygfavico "Replace generic favicon">
<!ENTITY Ctr_mstatusbar "Movable status panel">
<!ENTITY Ctr_mstatusbars4e "Status-bar panel is controlled by 'Status-4-Evar'">
<!ENTITY Ctr_mstatusbartpp "Status-bar panel is controlled by 'ThePuzzlePiece'">
@@ -171,7 +173,8 @@
<!ENTITY Ctr_xpinstallui "Old add-on install window (about:config preference)">
<!ENTITY Ctr_bmbutton "Bookmarks menu button">
<!ENTITY Ctr_bmbutpanelm "Popup: panel menu appearance">
-<!ENTITY Ctr_bmbunsortbm "Popup: 'unsorted bookmarks' submenu">
+<!ENTITY Ctr_bmbunsortbm "Popup: 'unsorted bookmarks' menu">
+<!ENTITY Ctr_bmbunsortbm2 "Menu above bookmarks">
<!ENTITY Ctr_bmbviewbmtb "Popup: show 'View Toolbar'">
<!ENTITY Ctr_bmbnounsort "Popup: hide 'unsorted bookmarks'">
<!ENTITY Ctr_bmbutnotext "Hide label on bookmarks bar">
@@ -222,9 +225,11 @@
<!ENTITY Ctr_starinurlinfo "Default bookmarks menu button gets hidden">
<!ENTITY Ctr_feedinurl "RSS feed-button">
<!ENTITY Ctr_hideurelstop "Hide 'stop &amp; reload' buttons">
+<!ENTITY Ctr_hideurelstop2 "Always show 'go' button">
<!ENTITY Ctr_hideurlgo "Hide 'go' button">
<!ENTITY Ctr_hideurlsrg "Hide 'reload, stop &amp; go' button separators &amp; spaces">
<!ENTITY Ctr_urlbardropm "Move dropmarker to the last possible position">
+<!ENTITY Ctr_urlbardropm2 "Make dropmarker always visible">
<!ENTITY Ctr_altreaderico "Alternative 'Reader' icons">
<!ENTITY Ctr_hideprbutton "Hide notification icon when a popup gets blocked">
<!ENTITY Ctr_locsearchbw10 "Reduce location bars and search bars height (experimental)">
diff --git a/xpi/locale/es/options.dtd b/xpi/locale/es/options.dtd
index 3424562..59b78c0 100644
--- a/xpi/locale/es/options.dtd
+++ b/xpi/locale/es/options.dtd
@@ -57,7 +57,9 @@
<!ENTITY Ctr_square_edges "Esquinas superiores cuadradas">
<!ENTITY Ctr_tttitlebar "Título de pestaña en la barra de título de &brandShortName;">
<!ENTITY Ctr_tabinsertion "Insertar pestaña asociada tras la actual (about:config >> browser.tabs.insertRelatedAfterCurrent)">
-<!ENTITY Ctr_emptyfavicon "Restaurar favicon vacío (si un sitio no ofrece uno)">
+<!ENTITY Ctr_emptytfavico "Show favicon (if a site does not offer one)">
+<!ENTITY Ctr_emptytfavico_n "None">
+<!ENTITY Ctr_emptytfavico_g "Generic">
<!ENTITY Ctr_noemptypticon "Eliminar favicon vacío en pestañas fijadas">
<!ENTITY Ctr_e10stab_notd "Pestañas E10s: Eliminar subrayado">
<!ENTITY Ctr_closetab_0 "Botón de cierre de pestaña">
@@ -127,7 +129,7 @@
<!ENTITY Ctr_wincontrols "Controles de ventana móviles en pantalla completa">
<!ENTITY Ctr_oldtoplevimg "Imágenes del 'dominio de primer nivel': Apariencia clásica">
<!ENTITY Ctr_altalertbox "'Recuadro de alerta': Apariencia alternativa">
-<!ENTITY Ctr_emptyfavicon2 "Reemplazar favicon genérico (vacío y punteado) con uno de hoja en blanco">
+<!ENTITY Ctr_emptygfavico "Replace generic favicon">
<!ENTITY Ctr_mstatusbar "Mostrar panel móvil de la antigua barra de estado">
<!ENTITY Ctr_mstatusbars4e "El panel de barra de estado está controlado por 'Status-4-Evar'">
<!ENTITY Ctr_mstatusbartpp "El panel de barra de estado está controlado por 'ThePuzzlePiece'">
@@ -172,6 +174,7 @@
<!ENTITY Ctr_bmbutton "Botón de menú emergente de Marcadores">
<!ENTITY Ctr_bmbutpanelm "Estilo de panel para el menú emergente ">
<!ENTITY Ctr_bmbunsortbm "Mostrar submenú 'Marcadores no ordenados'">
+<!ENTITY Ctr_bmbunsortbm2 "Menu above bookmarks">
<!ENTITY Ctr_bmbviewbmtb "Mostrar 'Ver barra de herramientas'">
<!ENTITY Ctr_bmbnounsort "Ocultar 'Marcadores no ordenados'">
<!ENTITY Ctr_bmbutnotext "Ocultar etiquetas en la barra de marcadores">
@@ -222,9 +225,11 @@
<!ENTITY Ctr_starinurlinfo "Suprime el botón dual de marcadores de la barra de herramientas">
<!ENTITY Ctr_feedinurl "Botón de suscripción (RSS feed)">
<!ENTITY Ctr_hideurelstop "Ocultar botones 'Parar y Recargar'">
+<!ENTITY Ctr_hideurelstop2 "Always show 'go' button">
<!ENTITY Ctr_hideurlgo "Ocultar botón 'Ir'">
<!ENTITY Ctr_hideurlsrg "Ocultar separadores y espacios del botón 'Recargar, Parar e Ir'">
<!ENTITY Ctr_urlbardropm "Mover flecha de despliegue a la última posición posible">
+<!ENTITY Ctr_urlbardropm2 "Make dropmarker always visible">
<!ENTITY Ctr_altreaderico "Iconos de 'Vista de lectura' alternativos">
<!ENTITY Ctr_hideprbutton "Ocultar icono de notificación cuando se bloquee una ventana emergente">
<!ENTITY Ctr_locsearchbw10 "Reducir altura de la barra de direcciones y el recuadro de búsqueda (experimental)">
diff --git a/xpi/locale/et/options.dtd b/xpi/locale/et/options.dtd
index 7163a38..fc2d1c1 100644
--- a/xpi/locale/et/options.dtd
+++ b/xpi/locale/et/options.dtd
@@ -57,7 +57,9 @@
<!ENTITY Ctr_square_edges "Kandilised ülemised nurgad">
<!ENTITY Ctr_tttitlebar "Kaardi pealkiri &brandShortName;i tiitliribal">
<!ENTITY Ctr_tabinsertion "Pane seotud kaardid praeguse järele (about:config eelistus)">
-<!ENTITY Ctr_emptyfavicon "Taasta tühi lehe ikoon (kui sait seda ei paku)">
+<!ENTITY Ctr_emptytfavico "Show favicon (if a site does not offer one)">
+<!ENTITY Ctr_emptytfavico_n "None">
+<!ENTITY Ctr_emptytfavico_g "Generic">
<!ENTITY Ctr_noemptypticon "Eemalda püsikaartidelt tühjad lehe ikoonid">
<!ENTITY Ctr_e10stab_notd "E10s kaardid: eemalda allajoonimine">
<!ENTITY Ctr_closetab_0 "Kaardi sulgemise nupp">
@@ -127,7 +129,7 @@
<!ENTITY Ctr_wincontrols "Liigutatavad akna juhtelemendid täisekraani režiimis">
<!ENTITY Ctr_oldtoplevimg "'Tippdomeeni' pildid: klassikaline välimus">
<!ENTITY Ctr_altalertbox "'Teavituskast': alternatiivne välimus">
-<!ENTITY Ctr_emptyfavicon2 "Asenda üldine (tühi ja punktiiriga) lehe ikoon lehe kujutisega">
+<!ENTITY Ctr_emptygfavico "Replace generic favicon">
<!ENTITY Ctr_mstatusbar "Liigutatav olekupaneel">
<!ENTITY Ctr_mstatusbars4e "Olekuriba paneeli kontrollib 'Status-4-Evar'">
<!ENTITY Ctr_mstatusbartpp "Olekuriba paneeli kontrollib 'ThePuzzlePiece'">
@@ -172,6 +174,7 @@
<!ENTITY Ctr_bmbutton "Järjehoidjate menüü nupp">
<!ENTITY Ctr_bmbutpanelm "Menüühüpik: paneelimenüü välimus">
<!ENTITY Ctr_bmbunsortbm "Menüühüpik: alammenüü 'Sortimata järjehoidjad'">
+<!ENTITY Ctr_bmbunsortbm2 "Menu above bookmarks">
<!ENTITY Ctr_bmbviewbmtb "Menüühüpik: näita kirjet 'Kuva järjehoidjariba'">
<!ENTITY Ctr_bmbnounsort "Menüühüpik: peida kirje 'sortimata järjehoidjad'">
<!ENTITY Ctr_bmbutnotext "Peida järjehoidjate ribal sildid">
@@ -222,9 +225,11 @@
<!ENTITY Ctr_starinurlinfo "Järjehoidjate menüü vaikimisi nupp peidetakse">
<!ENTITY Ctr_feedinurl "RSS-voo nupp">
<!ENTITY Ctr_hideurelstop "Peida 'peata &amp; laadi uuesti' nupud">
+<!ENTITY Ctr_hideurelstop2 "Always show 'go' button">
<!ENTITY Ctr_hideurlgo "Peida 'mine' nupp">
<!ENTITY Ctr_hideurlsrg "Peida nuppude 'laadi uuesti, peata &amp; mine' eraldajad &amp; vahed">
<!ENTITY Ctr_urlbardropm "Liiguta rippmenüü avamise nupp võimalikult lõppu">
+<!ENTITY Ctr_urlbardropm2 "Make dropmarker always visible">
<!ENTITY Ctr_altreaderico "Alternatiivsed 'Lugemisvaate' ikoonid">
<!ENTITY Ctr_hideprbutton "Peida blokeeritud hüpikakende teavitusikoon">
<!ENTITY Ctr_locsearchbw10 "Vähenda aadressiriba ja otsinguriba kõrgust (katsejärgus)">
diff --git a/xpi/locale/fr/options.dtd b/xpi/locale/fr/options.dtd
index 17ecdd8..3ed614f 100644
--- a/xpi/locale/fr/options.dtd
+++ b/xpi/locale/fr/options.dtd
@@ -57,7 +57,9 @@
<!ENTITY Ctr_square_edges "Rendre carrés les angles supérieurs">
<!ENTITY Ctr_tttitlebar "Titre de l'onglet dans &brandShortName; titlebar">
<!ENTITY Ctr_tabinsertion "Insérer l'onglet connexe après l'onglet actuel (about:config)">
-<!ENTITY Ctr_emptyfavicon "Restaurer le favicon vide sur les onglets (sites ne possédant pas de favicon)">
+<!ENTITY Ctr_emptytfavico "Show favicon (if a site does not offer one)">
+<!ENTITY Ctr_emptytfavico_n "None">
+<!ENTITY Ctr_emptytfavico_g "Generic">
<!ENTITY Ctr_noemptypticon "Enlever les favicons vides des onglets épinglés">
<!ENTITY Ctr_e10stab_notd "Onglets E10s : enlever le soulignage">
<!ENTITY Ctr_closetab_0 "Bouton de fermeture">
@@ -127,7 +129,7 @@
<!ENTITY Ctr_wincontrols "Plein écran : boutons déplaçables">
<!ENTITY Ctr_oldtoplevimg "Images du 'domaine de 1er niveau' : appearance classique">
<!ENTITY Ctr_altalertbox "« Boîte d'alerte »: appearance alternative">
-<!ENTITY Ctr_emptyfavicon2 "Remplacer le favicon générique (vide avec pointillés) par un favicon avec l'aspect d'une feuille de papier">
+<!ENTITY Ctr_emptygfavico "Replace generic favicon">
<!ENTITY Ctr_mstatusbar "Barre d'état déplaçable">
<!ENTITY Ctr_mstatusbars4e "Barre d'état contrôlée par « Status-4-Evar »">
<!ENTITY Ctr_mstatusbartpp "Barre d'état contrôlée par « ThePuzzlePiece »">
@@ -171,7 +173,8 @@
<!ENTITY Ctr_xpinstallui "Ancienne fenêtre d'installation de modules (préférence about:config)">
<!ENTITY Ctr_bmbutton "Bouton Marque-pages">
<!ENTITY Ctr_bmbutpanelm "Popup : apparence Panneau menu">
-<!ENTITY Ctr_bmbunsortbm "Popup : sous menu des « marque-pages non triés » ">
+<!ENTITY Ctr_bmbunsortbm "Popup : sous menu des « marque-pages non triés »">
+<!ENTITY Ctr_bmbunsortbm2 "Menu above bookmarks">
<!ENTITY Ctr_bmbviewbmtb "Popup : afficher « Voir la barre d'outils »">
<!ENTITY Ctr_bmbnounsort "Popup : cacher les « marque-pages non triés »">
<!ENTITY Ctr_bmbutnotext "Cacher « Marque-pages » sur la barre personnelle">
@@ -222,9 +225,11 @@
<!ENTITY Ctr_starinurlinfo "Par défaut le bouton de menu des marque-pages est masqué">
<!ENTITY Ctr_feedinurl "Bouton d'abonnement">
<!ENTITY Ctr_hideurelstop "Masquer « stop-actualiser »">
+<!ENTITY Ctr_hideurelstop2 "Always show 'go' button">
<!ENTITY Ctr_hideurlgo "Masquer le bouton « aller à »">
<!ENTITY Ctr_hideurlsrg "Cacher les séparateurs de boutons « actualiser, stop &amp; aller à » &amp; espaces">
<!ENTITY Ctr_urlbardropm "Move dropmarker to the last possible position">
+<!ENTITY Ctr_urlbardropm2 "Make dropmarker always visible">
<!ENTITY Ctr_altreaderico "Icônes « Lecteur » alternatives">
<!ENTITY Ctr_hideprbutton "Masquer l'icône de notification quand un pop-up est bloqué">
<!ENTITY Ctr_locsearchbw10 "Réduire la hauteur de la barre d'adresse et la barre de recherche (expérimentale)">
diff --git a/xpi/locale/hsb/options.dtd b/xpi/locale/hsb/options.dtd
index b06993e..47e619e 100644
--- a/xpi/locale/hsb/options.dtd
+++ b/xpi/locale/hsb/options.dtd
@@ -57,7 +57,9 @@
<!ENTITY Ctr_square_edges "Kwadratiske hornje róžki">
<!ENTITY Ctr_tttitlebar "Rajtarkowy titul w titulne lajsće &brandShortName;">
<!ENTITY Ctr_tabinsertion "Přiwuzny rajtark za aktualnym rajtarkom zasadźić (about:config)">
-<!ENTITY Ctr_emptyfavicon "Prózdny faworitowy symbol wobnowić (jeli sydło žadyn njeposkića)">
+<!ENTITY Ctr_emptytfavico "Show favicon (if a site does not offer one)">
+<!ENTITY Ctr_emptytfavico_n "None">
+<!ENTITY Ctr_emptytfavico_g "Generic">
<!ENTITY Ctr_noemptypticon "Prózdny faworitowy symbol z připinjeneho rajtarka wotstronić">
<!ENTITY Ctr_e10stab_notd "E10s-rajtarki: podsmužku wotstronić">
<!ENTITY Ctr_closetab_0 "Rajtark začinić">
@@ -127,7 +129,7 @@
<!ENTITY Ctr_wincontrols "Přesuwajomne wodźenske elementy połneje wobrazowki">
<!ENTITY Ctr_oldtoplevimg "Wobrazy 'najwyšeje domeny': klasiski zwonkowny napohlad">
<!ENTITY Ctr_altalertbox "'Warnowanski kašćik': alternatiwny zwonkowny napohlad">
-<!ENTITY Ctr_emptyfavicon2 "Prózdny a dypkowany faworitowy symbol přez łopjenowy symbol wuměnić">
+<!ENTITY Ctr_emptygfavico "Replace generic favicon">
<!ENTITY Ctr_mstatusbar "Přesuwajomny wobłuk statusoweje lajsty">
<!ENTITY Ctr_mstatusbars4e "Statusowy wobłuk seo přez 'Status-4-Evar' kontroluje">
<!ENTITY Ctr_mstatusbartpp "Statusowy wobłuk so přez 'ThePuzzlePiece' kontroluje">
@@ -172,6 +174,7 @@
<!ENTITY Ctr_bmbutton "Tłóčatko menija zapołožkow">
<!ENTITY Ctr_bmbutpanelm "Wuskakowacy meni: napohlad wuskakowaceho menija">
<!ENTITY Ctr_bmbunsortbm "Wuskakowacy meni: podmeni 'Njesortěrowane zapołožki'">
+<!ENTITY Ctr_bmbunsortbm2 "Menu above bookmarks">
<!ENTITY Ctr_bmbviewbmtb "Wuskakowacy meni: 'Lajstu zapołožkow pokazać' pokazać">
<!ENTITY Ctr_bmbnounsort "Wuskakowcy meni: 'Njesortěrowane zapołožki' schować">
<!ENTITY Ctr_bmbutnotext "Tekst na lajśce zapołožkow schować">
@@ -222,9 +225,11 @@
<!ENTITY Ctr_starinurlinfo "Standardne tłóčatko menija Zapołožki so schowa">
<!ENTITY Ctr_feedinurl "Kanalowe tłóčatko RSS">
<!ENTITY Ctr_hideurelstop "Tłóčatce Stój a Znowa adresowych lajstow schować">
+<!ENTITY Ctr_hideurelstop2 "Always show 'go' button">
<!ENTITY Ctr_hideurlgo "Tłóčatko 'Start' schować">
<!ENTITY Ctr_hideurlsrg "Dźělatka a mjezery za tłošatka 'Znowa, Stój a Start' schować">
<!ENTITY Ctr_urlbardropm "Tłóčatko šipkoweho kónčka do poslednjeje móžneje pozicije přesunyć">
+<!ENTITY Ctr_urlbardropm2 "Make dropmarker always visible">
<!ENTITY Ctr_altreaderico "Alternatiwne 'čitakowe' symbolei">
<!ENTITY Ctr_hideprbutton "Zdźělenski symbol schować, hdyž so wuskakowace wokno blokuje">
<!ENTITY Ctr_locsearchbw10 "Wysokosć adresowych a pytanskich polow redukować (eksperimentelne)">
diff --git a/xpi/locale/it/options.dtd b/xpi/locale/it/options.dtd
index 6d7fed8..ad064aa 100644
--- a/xpi/locale/it/options.dtd
+++ b/xpi/locale/it/options.dtd
@@ -57,7 +57,9 @@
<!ENTITY Ctr_square_edges "Angoli superiori spigolosi">
<!ENTITY Ctr_tttitlebar "Titolo scheda nella barra del titolo di &brandShortName;">
<!ENTITY Ctr_tabinsertion "Inserisci la scheda relativa dopo la scheda corrente (about:config)">
-<!ENTITY Ctr_emptyfavicon "Nei siti che non hanno una favicon usa la vecchia favicon vuota">
+<!ENTITY Ctr_emptytfavico "Show favicon (if a site does not offer one)">
+<!ENTITY Ctr_emptytfavico_n "None">
+<!ENTITY Ctr_emptytfavico_g "Generic">
<!ENTITY Ctr_noemptypticon "Rimuovi la favicon vuota dalle schede bloccate">
<!ENTITY Ctr_e10stab_notd "Schede E10s: rimuovi la sottolineatura">
<!ENTITY Ctr_closetab_0 "Pulsante di chiusura schede">
@@ -127,7 +129,7 @@
<!ENTITY Ctr_wincontrols "Angoli finestra mobili in modalità schermo intero">
<!ENTITY Ctr_oldtoplevimg "Immagini domini di livello superiore: aspetto classico">
<!ENTITY Ctr_altalertbox "Finestra di avviso: aspetto alternativo">
-<!ENTITY Ctr_emptyfavicon2 "Sostituisci la favicon generica predefinita con un’icona a forma di foglio">
+<!ENTITY Ctr_emptygfavico "Replace generic favicon">
<!ENTITY Ctr_mstatusbar "Barra di stato mobile">
<!ENTITY Ctr_mstatusbars4e "La barra di stato è gestita da 'Status-4-Evar'">
<!ENTITY Ctr_mstatusbartpp "La barra di stato è gestita da 'ThePuzzlePiece'">
@@ -172,6 +174,7 @@
<!ENTITY Ctr_bmbutton "Menu del pulsante segnalibri">
<!ENTITY Ctr_bmbutpanelm "Popup: aspetto del menu a pannello">
<!ENTITY Ctr_bmbunsortbm "Popup: sottomenu 'Segnalibri non catalogati'">
+<!ENTITY Ctr_bmbunsortbm2 "Menu above bookmarks">
<!ENTITY Ctr_bmbviewbmtb "Popup: mostra 'Visualizza barra degli strumenti'">
<!ENTITY Ctr_bmbnounsort "Popup: nascondi 'Segnalibri non catalogati'">
<!ENTITY Ctr_bmbutnotext "Nascondi etichetta della barra dei segnalibri">
@@ -222,9 +225,11 @@
<!ENTITY Ctr_starinurlinfo "Il pulsante segnalibri viene nascosto">
<!ENTITY Ctr_feedinurl "Pulsante dei feed nella barra degli indirizzi">
<!ENTITY Ctr_hideurelstop "Nascondi i pulsanti Stop e Ricarica nella barra degli indirizzi">
+<!ENTITY Ctr_hideurelstop2 "Always show 'go' button">
<!ENTITY Ctr_hideurlgo "Nascondi il pulsante 'Vai'">
<!ENTITY Ctr_hideurlsrg "Nascondi spazio e separatori dai pulsanti Stop, Ricarica e Vai">
<!ENTITY Ctr_urlbardropm "Vai all’ultima posizione del menu cronologia">
+<!ENTITY Ctr_urlbardropm2 "Make dropmarker always visible">
<!ENTITY Ctr_altreaderico "Icone alternative per la modalità lettura">
<!ENTITY Ctr_hideprbutton "Nascondi l’icona di notifica quando un popup viene bloccato">
<!ENTITY Ctr_locsearchbw10 "Riduci l'altezza delle barre degli indirizzi e di ricerca (sperimentale)">
diff --git a/xpi/locale/pl/options.dtd b/xpi/locale/pl/options.dtd
index e4ec94f..e10efdb 100644
--- a/xpi/locale/pl/options.dtd
+++ b/xpi/locale/pl/options.dtd
@@ -57,7 +57,9 @@
<!ENTITY Ctr_square_edges "Kwadratowe górne rogi">
<!ENTITY Ctr_tttitlebar "Tytuł karty na pasku tytułu &brandShortName;">
<!ENTITY Ctr_tabinsertion "Wstaw powiązaną kartę za kartą bieżącą (about:config)">
-<!ENTITY Ctr_emptyfavicon "Przywróć pustą ikonę ulubionych (jeżeli strona nie zaoferuje żadnej)">
+<!ENTITY Ctr_emptytfavico "Show favicon (if a site does not offer one)">
+<!ENTITY Ctr_emptytfavico_n "None">
+<!ENTITY Ctr_emptytfavico_g "Generic">
<!ENTITY Ctr_noemptypticon "Usuń pustą ikonę ulubionych z przypiętej karty">
<!ENTITY Ctr_e10stab_notd "Karty E10s: usuń podkreślenie">
<!ENTITY Ctr_closetab_0 "Przycisk zamknięcia karty">
@@ -127,7 +129,7 @@
<!ENTITY Ctr_wincontrols "Ruchome kontrolki okna pełnego ekranu">
<!ENTITY Ctr_oldtoplevimg "Obrazy 'domeny najwyższego poziomu': klasyczny wygląd">
<!ENTITY Ctr_altalertbox "'Pole ostrzeżenia': alternatywny wygląd">
-<!ENTITY Ctr_emptyfavicon2 "Wymień standardową ikonę ulubionych (pusta i wykropkowana) na ikonę kartki">
+<!ENTITY Ctr_emptygfavico "Replace generic favicon">
<!ENTITY Ctr_mstatusbar "Ruchomy panel paska statusu">
<!ENTITY Ctr_mstatusbars4e "Panel paska statusu jest kontrolowany przez 'Status-4-Evar'">
<!ENTITY Ctr_mstatusbartpp "Panel paska statusu jest kontrolowany przez 'ThePuzzlePiece'">
@@ -172,6 +174,7 @@
<!ENTITY Ctr_bmbutton "Przycisk menu zakładek">
<!ENTITY Ctr_bmbutpanelm "Menu podręczne: wygląd menu panelu">
<!ENTITY Ctr_bmbunsortbm "Menu podręczne: podmenu 'nieposortowanych zakładek'">
+<!ENTITY Ctr_bmbunsortbm2 "Menu above bookmarks">
<!ENTITY Ctr_bmbviewbmtb "Menu podręczne: wyświetl 'Pokaż pasek narzędzi'">
<!ENTITY Ctr_bmbnounsort "Menu podręczne: ukryj 'nieposortowane zakładki'">
<!ENTITY Ctr_bmbutnotext "Ukryj etykietę na pasku zakładek">
@@ -222,9 +225,11 @@
<!ENTITY Ctr_starinurlinfo "Domyślny przycisk menu zakładek zostanie ukryty">
<!ENTITY Ctr_feedinurl "Przycisk RSS">
<!ENTITY Ctr_hideurelstop "Ukryj przyciski zatrzymania i odświeżania">
+<!ENTITY Ctr_hideurelstop2 "Always show 'go' button">
<!ENTITY Ctr_hideurlgo "Ukryj przycisk 'Przejdź'">
<!ENTITY Ctr_hideurlsrg "Ukryj separatory przycisków 'Odśwież, Zatrzymaj i Przejdź' oraz odstępy">
<!ENTITY Ctr_urlbardropm "Przenieś znacznik rozwinięcia na ostatnią możliwą pozycję">
+<!ENTITY Ctr_urlbardropm2 "Make dropmarker always visible">
<!ENTITY Ctr_altreaderico "Alternatywne ikony 'Popraw czytelność'">
<!ENTITY Ctr_hideprbutton "Ukryj ikonę powiadomienia, gdy wyskakujące okno zostanie zablokowane">
<!ENTITY Ctr_locsearchbw10 "Zredukuj wysokość paska adresu i wyszukiwania (eksperymentalne)">
diff --git a/xpi/locale/pt-BR/options.dtd b/xpi/locale/pt-BR/options.dtd
index 7a5bff9..e15915e 100644
--- a/xpi/locale/pt-BR/options.dtd
+++ b/xpi/locale/pt-BR/options.dtd
@@ -57,7 +57,9 @@
<!ENTITY Ctr_square_edges "Squared top corners">
<!ENTITY Ctr_tttitlebar "Tab title in &brandShortName; titlebar">
<!ENTITY Ctr_tabinsertion "Inserir a Aba Relacionada Depois da Aba Atual (about:config)">
-<!ENTITY Ctr_emptyfavicon "Restaurar o Favicon Vazio (Se um Site Não Oferecer Um)">
+<!ENTITY Ctr_emptytfavico "Show favicon (if a site does not offer one)">
+<!ENTITY Ctr_emptytfavico_n "None">
+<!ENTITY Ctr_emptytfavico_g "Generic">
<!ENTITY Ctr_noemptypticon "Remover o Favicon Vazio da Aba Fixa">
<!ENTITY Ctr_e10stab_notd "Abas E10s: Remover o Sublinhado">
<!ENTITY Ctr_closetab_0 "Fechar a Aba">
@@ -127,7 +129,7 @@
<!ENTITY Ctr_wincontrols "Controles Móveis da Janela em Tela Cheia">
<!ENTITY Ctr_oldtoplevimg "'Top level domain' images: classic appearance">
<!ENTITY Ctr_altalertbox "'Alert box': alternative appearance">
-<!ENTITY Ctr_emptyfavicon2 "Substituir o Favicon Genérico (Vazio e Pontilhado) Pelo Favicon de Folha">
+<!ENTITY Ctr_emptygfavico "Replace generic favicon">
<!ENTITY Ctr_mstatusbar "Painel da Barra de Status Móvel">
<!ENTITY Ctr_mstatusbars4e "O Painel da Barra de Status é Controlado Pelo 'Status-4-Evar'">
<!ENTITY Ctr_mstatusbartpp "O Painel da Barra de Status é Controlado Pelo 'ThePuzzlePiece'">
@@ -171,7 +173,8 @@
<!ENTITY Ctr_xpinstallui "Old add-on install window (about:config preference)">
<!ENTITY Ctr_bmbutton "Bookmarks menu button">
<!ENTITY Ctr_bmbutpanelm "Popup: panel menu appearance">
-<!ENTITY Ctr_bmbunsortbm "Popup: 'unsorted bookmarks' submenu">
+<!ENTITY Ctr_bmbunsortbm "Popup: 'unsorted bookmarks' menu">
+<!ENTITY Ctr_bmbunsortbm2 "Menu above bookmarks">
<!ENTITY Ctr_bmbviewbmtb "Popup: show 'View Toolbar'">
<!ENTITY Ctr_bmbnounsort "Popup: hide 'unsorted bookmarks'">
<!ENTITY Ctr_bmbutnotext "Hide label on bookmarks bar">
@@ -222,9 +225,11 @@
<!ENTITY Ctr_starinurlinfo "Default bookmarks menu button gets hidden">
<!ENTITY Ctr_feedinurl "Botão Feed">
<!ENTITY Ctr_hideurelstop "Ocultar os Botões Parar e Recarregar">
+<!ENTITY Ctr_hideurelstop2 "Always show 'go' button">
<!ENTITY Ctr_hideurlgo "Hide 'go' button">
<!ENTITY Ctr_hideurlsrg "Hide 'reload, stop &amp; go' button separators &amp; spaces">
<!ENTITY Ctr_urlbardropm "Move dropmarker to the last possible position">
+<!ENTITY Ctr_urlbardropm2 "Make dropmarker always visible">
<!ENTITY Ctr_altreaderico "Alternative 'Reader' icons">
<!ENTITY Ctr_hideprbutton "Ocultar o Ícone de Notificação Quando um Pop-up Ficar Bloqueado">
<!ENTITY Ctr_locsearchbw10 "Reduce location bars and search bars height (experimental)">
diff --git a/xpi/locale/ru/options.dtd b/xpi/locale/ru/options.dtd
index 6e56c2d..e27c1cb 100644
--- a/xpi/locale/ru/options.dtd
+++ b/xpi/locale/ru/options.dtd
@@ -57,7 +57,9 @@
<!ENTITY Ctr_square_edges "Верхние углы квадратные">
<!ENTITY Ctr_tttitlebar "Название вкладки в заголовке &brandShortName;">
<!ENTITY Ctr_tabinsertion "Открывать связанную вкладку после текущей вкладки (about:config)">
-<!ENTITY Ctr_emptyfavicon "Восстановить пустой значок на вкладках">
+<!ENTITY Ctr_emptytfavico "Show favicon (if a site does not offer one)">
+<!ENTITY Ctr_emptytfavico_n "None">
+<!ENTITY Ctr_emptytfavico_g "Generic">
<!ENTITY Ctr_noemptypticon "Удалить пустой значок из прикреплённой вкладки">
<!ENTITY Ctr_e10stab_notd "E10s вкладки: удалить подчёркивание">
<!ENTITY Ctr_closetab_0 "Кнопка закрытия вкладки">
@@ -127,7 +129,7 @@
<!ENTITY Ctr_wincontrols "Подвижное управление полноэкранным режимом">
<!ENTITY Ctr_oldtoplevimg "Изображение «домена верхнего уровня»: классический вид">
<!ENTITY Ctr_altalertbox "«Окно предупреждений»: альтернативный вид">
-<!ENTITY Ctr_emptyfavicon2 "Установить общий значок (пустой и пунктирный)">
+<!ENTITY Ctr_emptygfavico "Replace generic favicon">
<!ENTITY Ctr_mstatusbar "Подвижная строка состояния">
<!ENTITY Ctr_mstatusbars4e "Панель статуса контролируется 'Status-4-Evar'">
<!ENTITY Ctr_mstatusbartpp "Панель статуса контролируется 'ThePuzzlePiece'">
@@ -172,6 +174,7 @@
<!ENTITY Ctr_bmbutton "Кнопка меню закладок">
<!ENTITY Ctr_bmbutpanelm "Всплывающее окно: вид панели меню">
<!ENTITY Ctr_bmbunsortbm "Всплывающее окно: подменю «Неподшитые закладки»">
+<!ENTITY Ctr_bmbunsortbm2 "Menu above bookmarks">
<!ENTITY Ctr_bmbviewbmtb "Всплывающее окно: «Показать панель закладок»">
<!ENTITY Ctr_bmbnounsort "Всплывающее окно: скрыть «Неподшитые закладки»">
<!ENTITY Ctr_bmbutnotext "Скрыть текст на панели закладок">
@@ -222,9 +225,11 @@
<!ENTITY Ctr_starinurlinfo "Кнопка меню закладок по умолчанию будет скрыта">
<!ENTITY Ctr_feedinurl "Кнопка RSS в адресной строке">
<!ENTITY Ctr_hideurelstop "Скрыть кнопку «Остановить и перезагрузить»">
+<!ENTITY Ctr_hideurelstop2 "Always show 'go' button">
<!ENTITY Ctr_hideurlgo "Скрыть кнопку «Перейти»">
<!ENTITY Ctr_hideurlsrg "Скрыть разделители и пробелы между кнопками «Обновить», «Остановить» и «Перейти»">
<!ENTITY Ctr_urlbardropm "Переместить дропмаркер до последней возможной позиции">
+<!ENTITY Ctr_urlbardropm2 "Make dropmarker always visible">
<!ENTITY Ctr_altreaderico "Альтернативный значок «Чтения»">
<!ENTITY Ctr_hideprbutton "Скрыть значок уведомления, когда блокируется всплывающее окно">
<!ENTITY Ctr_locsearchbw10 "Уменьшить высоту панелей адреса и поиска (экспериментально)">
diff --git a/xpi/locale/sl/options.dtd b/xpi/locale/sl/options.dtd
index 78803a2..a18f9ff 100644
--- a/xpi/locale/sl/options.dtd
+++ b/xpi/locale/sl/options.dtd
@@ -57,7 +57,9 @@
<!ENTITY Ctr_square_edges "Kvadratasti zgornji koti">
<!ENTITY Ctr_tttitlebar "Naziv zavihka v nazivni vrstici &brandShortName;">
<!ENTITY Ctr_tabinsertion "Vstavi odprti zavihek poleg trenutnega (možnost about:config)">
-<!ENTITY Ctr_emptyfavicon "Obnovi prazno zaznamko (če je stran ne dobavi)">
+<!ENTITY Ctr_emptytfavico "Show favicon (if a site does not offer one)">
+<!ENTITY Ctr_emptytfavico_n "None">
+<!ENTITY Ctr_emptytfavico_g "Generic">
<!ENTITY Ctr_noemptypticon "Odstrani prazno zaznamko iz pripetih zavihkov">
<!ENTITY Ctr_e10stab_notd "Zavihki E10s: odstrani podčrtanje">
<!ENTITY Ctr_closetab_0 "Gumb Zapri zavihek">
@@ -127,7 +129,7 @@
<!ENTITY Ctr_wincontrols "Premakljive nadzorne tipke celozaslonskega okna">
<!ENTITY Ctr_oldtoplevimg "Slike 'vrhnje domene': klasični videz">
<!ENTITY Ctr_altalertbox "'Okno opozorila': nadomestni videz">
-<!ENTITY Ctr_emptyfavicon2 "Nadomesti splošno zaznamko (prazno in pikčasto) z zaznamko lista">
+<!ENTITY Ctr_emptygfavico "Replace generic favicon">
<!ENTITY Ctr_mstatusbar "Premakljivo podokno stanja">
<!ENTITY Ctr_mstatusbars4e "Podokno stanja nadzira 'Status-4-Evar'">
<!ENTITY Ctr_mstatusbartpp "Podokno stanja nadzira 'ThePuzzlePiece'">
@@ -172,6 +174,7 @@
<!ENTITY Ctr_bmbutton "Gumb menija zaznamkov">
<!ENTITY Ctr_bmbutpanelm "Pojavna okna: videz ploščastega menija">
<!ENTITY Ctr_bmbunsortbm "Pojavna okna: podmeni 'nerazvrščeni zaznamki'">
+<!ENTITY Ctr_bmbunsortbm2 "Menu above bookmarks">
<!ENTITY Ctr_bmbviewbmtb "Pojavna okna: prikaži 'Orodno vrstico pogledov'">
<!ENTITY Ctr_bmbnounsort "Pojavna okna: skrij 'nerazvrščeni zaznamki'">
<!ENTITY Ctr_bmbutnotext "Skrij oznako na vrstici zaznamkov">
@@ -222,9 +225,11 @@
<!ENTITY Ctr_starinurlinfo "Privzeti gumb menija zaznamkov se skrije">
<!ENTITY Ctr_feedinurl "Gumb vira RSS">
<!ENTITY Ctr_hideurelstop "Skrij gumba 'Ustavi in Ponovno naloži'">
+<!ENTITY Ctr_hideurelstop2 "Always show 'go' button">
<!ENTITY Ctr_hideurlgo "Skrij gumb 'Pojdi'">
<!ENTITY Ctr_hideurlsrg "Skrij ločila in presledke gumbov 'Ponovno naloži, Ustavi in Pojdi'">
<!ENTITY Ctr_urlbardropm "Premakni spustno oznako na zadnji možni položaj">
+<!ENTITY Ctr_urlbardropm2 "Make dropmarker always visible">
<!ENTITY Ctr_altreaderico "Nadomestne ikone 'Bralnika'">
<!ENTITY Ctr_hideprbutton "Skrij ikono obvestil ob blokiranju pojavnega okna">
<!ENTITY Ctr_locsearchbw10 "Zmanjšaj višino naslovne in iskalnne vrstice (preskusno)">
diff --git a/xpi/locale/tr/options.dtd b/xpi/locale/tr/options.dtd
index b74b7af..43c500f 100644
--- a/xpi/locale/tr/options.dtd
+++ b/xpi/locale/tr/options.dtd
@@ -57,7 +57,9 @@
<!ENTITY Ctr_square_edges "Squared top corners">
<!ENTITY Ctr_tttitlebar "Tab title in &brandShortName; titlebar">
<!ENTITY Ctr_tabinsertion "İlgili sekmeyi geçerli sekmeden sonra ekle (about:config tercihi)">
-<!ENTITY Ctr_emptyfavicon "Boş faviconu yükle (sitenin faviconu yoksa eğer)">
+<!ENTITY Ctr_emptytfavico "Show favicon (if a site does not offer one)">
+<!ENTITY Ctr_emptytfavico_n "None">
+<!ENTITY Ctr_emptytfavico_g "Generic">
<!ENTITY Ctr_noemptypticon "Tutturulmuş sekmelerde boş faviconu kaldır">
<!ENTITY Ctr_e10stab_notd "E10s sekmeler: altçizgiyi kaldır">
<!ENTITY Ctr_closetab_0 "Sekme Kapat">
@@ -127,7 +129,7 @@
<!ENTITY Ctr_wincontrols "Hareketli tam ekran penceresi kontrolleri">
<!ENTITY Ctr_oldtoplevimg "'Top level domain' images: classic appearance">
<!ENTITY Ctr_altalertbox "'Alert box': alternative appearance">
-<!ENTITY Ctr_emptyfavicon2 "Genel(boş noktalı) faviconu kağıt görünümlü favicon ile değiştir">
+<!ENTITY Ctr_emptygfavico "Replace generic favicon">
<!ENTITY Ctr_mstatusbar "Hareketli durum çubuğu paneli">
<!ENTITY Ctr_mstatusbars4e "Durum çubuğu paneli 'Status-4-Evar' tarafından kontrol edilir">
<!ENTITY Ctr_mstatusbartpp "Durum çubuğu paneli 'ThePuzzlePiece' tarafından kontrol edilir">
@@ -171,7 +173,8 @@
<!ENTITY Ctr_xpinstallui "Old add-on install window (about:config preference)">
<!ENTITY Ctr_bmbutton "Yer imleri menü düğmesi">
<!ENTITY Ctr_bmbutpanelm "Popup: panel menu görünümü">
-<!ENTITY Ctr_bmbunsortbm "Popup: 'unsorted bookmarks' submenu">
+<!ENTITY Ctr_bmbunsortbm "Popup: 'unsorted bookmarks' menu">
+<!ENTITY Ctr_bmbunsortbm2 "Menu above bookmarks">
<!ENTITY Ctr_bmbviewbmtb "Popup: show 'View Toolbar'">
<!ENTITY Ctr_bmbnounsort "Popup: hide 'unsorted bookmarks'">
<!ENTITY Ctr_bmbutnotext "Bar üzerinde etiketi gizle">
@@ -222,9 +225,11 @@
<!ENTITY Ctr_starinurlinfo "Default bookmarks menu button gets hidden">
<!ENTITY Ctr_feedinurl "RSS feed-butonu">
<!ENTITY Ctr_hideurelstop "'Dur &amp; Yenile' butonlarını gizle">
+<!ENTITY Ctr_hideurelstop2 "Always show 'go' button">
<!ENTITY Ctr_hideurlgo "Hide 'go' button">
<!ENTITY Ctr_hideurlsrg "Hide 'reload, stop &amp; go' button separators &amp; spaces">
<!ENTITY Ctr_urlbardropm "Move dropmarker to the last possible position">
+<!ENTITY Ctr_urlbardropm2 "Make dropmarker always visible">
<!ENTITY Ctr_altreaderico "Alternative 'Reader' icons">
<!ENTITY Ctr_hideprbutton "Popup engellendiğinde beliren uyarıyı gizle">
<!ENTITY Ctr_locsearchbw10 "Reduce location bars and search bars height (experimental)">
diff --git a/xpi/locale/uk/options.dtd b/xpi/locale/uk/options.dtd
index a3d6b0e..beaa973 100644
--- a/xpi/locale/uk/options.dtd
+++ b/xpi/locale/uk/options.dtd
@@ -57,7 +57,9 @@
<!ENTITY Ctr_square_edges "Квадратні верхні кути">
<!ENTITY Ctr_tttitlebar "Заголовок вкладки на панелі заголовку &brandShortName;">
<!ENTITY Ctr_tabinsertion "Вставити відповідну вкладку після поточної вкладки (about:config)">
-<!ENTITY Ctr_emptyfavicon "Відновити порожній значок сайту (якщо сайт не пропонує його)">
+<!ENTITY Ctr_emptytfavico "Show favicon (if a site does not offer one)">
+<!ENTITY Ctr_emptytfavico_n "None">
+<!ENTITY Ctr_emptytfavico_g "Generic">
<!ENTITY Ctr_noemptypticon "Прибрати порожній значок адреси з прикріпленої вкладки">
<!ENTITY Ctr_e10stab_notd "E10s вкладки: видалити підкреслення">
<!ENTITY Ctr_closetab_0 "Кнопка закриття вкладки">
@@ -127,7 +129,7 @@
<!ENTITY Ctr_wincontrols "Рухоме управління повноекранним режимом">
<!ENTITY Ctr_oldtoplevimg "Зображення «домену верхнього рівня»: класичний вигляд">
<!ENTITY Ctr_altalertbox "«Вікно попереджень»: альтернативний вигляд">
-<!ENTITY Ctr_emptyfavicon2 "Замінити загальний значок сайту (порожній і пунктирний)">
+<!ENTITY Ctr_emptygfavico "Replace generic favicon">
<!ENTITY Ctr_mstatusbar "Рухомий рядок стану">
<!ENTITY Ctr_mstatusbars4e "Панель статусу контролюється додатком «Status-4-Evar»">
<!ENTITY Ctr_mstatusbartpp "Панель статусу контролюється додатком «ThePuzzlePiece»">
@@ -172,6 +174,7 @@
<!ENTITY Ctr_bmbutton "Кнопка меню закладок">
<!ENTITY Ctr_bmbutpanelm "Спливаюче вікно: вигляд меню панелі">
<!ENTITY Ctr_bmbunsortbm "Спливаюче вікно: субменю «несортованих закладок»">
+<!ENTITY Ctr_bmbunsortbm2 "Menu above bookmarks">
<!ENTITY Ctr_bmbviewbmtb "Спливаюче вікно: показати «Огляд панелі»">
<!ENTITY Ctr_bmbnounsort "Спливаюче вікно: приховати «несортовані закладки»">
<!ENTITY Ctr_bmbutnotext "Приховати ярлик на панелі закладок">
@@ -222,9 +225,11 @@
<!ENTITY Ctr_starinurlinfo "Кнопка меню закладок за замовчуванням буде прихованою">
<!ENTITY Ctr_feedinurl "Кнопка RSS">
<!ENTITY Ctr_hideurelstop "Приховати кнопку «Зупинити та Перезавантажити»">
+<!ENTITY Ctr_hideurelstop2 "Always show 'go' button">
<!ENTITY Ctr_hideurlgo "Приховати кнопку «Перейти»">
<!ENTITY Ctr_hideurlsrg "Приховати розділювачі та пробіли кнопок «перезавантажити, зупинити та перейти»">
<!ENTITY Ctr_urlbardropm "Рухати позначку випадного списку в останню можливу позицію">
+<!ENTITY Ctr_urlbardropm2 "Make dropmarker always visible">
<!ENTITY Ctr_altreaderico "Альтернативні іконки «Читача»">
<!ENTITY Ctr_hideprbutton "Приховати інфо кнопку «спливаюче вікно блоковано»">
<!ENTITY Ctr_locsearchbw10 "Зменшити висоту панелей рядку адреси та пошуку (експериментальне)">
diff --git a/xpi/locale/zh-CN/options.dtd b/xpi/locale/zh-CN/options.dtd
index fc68999..c3db94c 100644
--- a/xpi/locale/zh-CN/options.dtd
+++ b/xpi/locale/zh-CN/options.dtd
@@ -57,7 +57,9 @@
<!ENTITY Ctr_square_edges "方形顶部边角">
<!ENTITY Ctr_tttitlebar "在 &brandShortName; 标题栏显示标签页标题">
<!ENTITY Ctr_tabinsertion "在当前标签页后插入关联标签页 (about:config)">
-<!ENTITY Ctr_emptyfavicon "使用空白网站小图标 (如果网站没有提供)">
+<!ENTITY Ctr_emptytfavico "Show favicon (if a site does not offer one)">
+<!ENTITY Ctr_emptytfavico_n "None">
+<!ENTITY Ctr_emptytfavico_g "Generic">
<!ENTITY Ctr_noemptypticon "为固定的标签页移除空白小图标">
<!ENTITY Ctr_e10stab_notd "E10s 标签页: 移除下划线">
<!ENTITY Ctr_closetab_0 "标签页关闭按钮">
@@ -127,7 +129,7 @@
<!ENTITY Ctr_wincontrols "全屏窗口控制按钮可以移动">
<!ENTITY Ctr_oldtoplevimg "“顶级域名”图片: 经典外观">
<!ENTITY Ctr_altalertbox "“提示框”: 备选的外观">
-<!ENTITY Ctr_emptyfavicon2 "使用空白页面图标来代替常规图标(空白或虚线框)">
+<!ENTITY Ctr_emptygfavico "Replace generic favicon">
<!ENTITY Ctr_mstatusbar "使状态栏面板可以移动">
<!ENTITY Ctr_mstatusbars4e "状态栏面板由“Status-4-Evar”所控制">
<!ENTITY Ctr_mstatusbartpp "状态栏面板由“ThePuzzlePiece”所控制">
@@ -172,6 +174,7 @@
<!ENTITY Ctr_bmbutton "书签菜单按钮">
<!ENTITY Ctr_bmbutpanelm "弹出式菜单: 面板式菜单外观">
<!ENTITY Ctr_bmbunsortbm "弹出式菜单: “未分类书签”子菜单">
+<!ENTITY Ctr_bmbunsortbm2 "Menu above bookmarks">
<!ENTITY Ctr_bmbviewbmtb "弹出式菜单: 显示“查看工具栏”">
<!ENTITY Ctr_bmbnounsort "弹出式菜单: 隐藏“未分类书签”">
<!ENTITY Ctr_bmbutnotext "隐藏书签工具栏上的文本标签">
@@ -222,9 +225,11 @@
<!ENTITY Ctr_starinurlinfo "默认书签菜单按钮被隐藏">
<!ENTITY Ctr_feedinurl "RSS源按钮">
<!ENTITY Ctr_hideurelstop "隐藏停止和重新载入按钮">
+<!ENTITY Ctr_hideurelstop2 "Always show 'go' button">
<!ENTITY Ctr_hideurlgo "隐藏 “转到” 按钮">
<!ENTITY Ctr_hideurlsrg "隐藏 “重新载入,停止和转到” 按钮的分隔符与空白">
<!ENTITY Ctr_urlbardropm "尽可能移动下拉按钮到最后的位置">
+<!ENTITY Ctr_urlbardropm2 "Make dropmarker always visible">
<!ENTITY Ctr_altreaderico "备选的 “阅读模式” 图标">
<!ENTITY Ctr_hideprbutton "当弹出窗口被阻止时隐藏通知图标">
<!ENTITY Ctr_locsearchbw10 "减小地址栏与搜索栏高度(实验性)">
diff --git a/xpi/locale/zh-TW/options.dtd b/xpi/locale/zh-TW/options.dtd
index cbb2c71..961609c 100644
--- a/xpi/locale/zh-TW/options.dtd
+++ b/xpi/locale/zh-TW/options.dtd
@@ -57,7 +57,9 @@
<!ENTITY Ctr_square_edges "使分頁標籤四角為嚴格直角">
<!ENTITY Ctr_tttitlebar "將分頁標題文字顯示於 &brandShortName; 標題列">
<!ENTITY Ctr_tabinsertion "在網頁上點選連結時,將新分頁開啟於目前分頁的旁邊,即把預設行為 [a][b][c][1][2][3] 改為 [a][1][2][3][b][c] (about:config » browser.tabs.insertRelatedAfterCurrent)">
-<!ENTITY Ctr_emptyfavicon "開啟的網頁若未提供網站圖示,仍在該分頁顯示空圖示">
+<!ENTITY Ctr_emptytfavico "Show favicon (if a site does not offer one)">
+<!ENTITY Ctr_emptytfavico_n "None">
+<!ENTITY Ctr_emptytfavico_g "Generic">
<!ENTITY Ctr_noemptypticon "從釘選分頁移除空圖示">
<!ENTITY Ctr_e10stab_notd "e10s 分頁: 移除底線">
<!ENTITY Ctr_closetab_0 "關閉按鈕">
@@ -127,7 +129,7 @@
<!ENTITY Ctr_wincontrols "可移動的全螢幕視窗控制項">
<!ENTITY Ctr_oldtoplevimg "「頂層網域」圖示: 經典外觀">
<!ENTITY Ctr_altalertbox "「警示方塊」: 換個外觀">
-<!ENTITY Ctr_emptyfavicon2 "以白紙圖示取代空圖示">
+<!ENTITY Ctr_emptygfavico "Replace generic favicon">
<!ENTITY Ctr_mstatusbar "使狀態列可移動">
<!ENTITY Ctr_mstatusbars4e "狀態列由 Status-4-Evar 控制">
<!ENTITY Ctr_mstatusbartpp "狀態列由 The Puzzle Piece 控制">
@@ -172,6 +174,7 @@
<!ENTITY Ctr_bmbutton "書籤選單按鈕">
<!ENTITY Ctr_bmbutpanelm "彈出式書籤選單: 書籤選單使用和面板選單同風格的外觀">
<!ENTITY Ctr_bmbunsortbm "彈出式書籤選單: 「未排序書籤」項目附加子選單">
+<!ENTITY Ctr_bmbunsortbm2 "Menu above bookmarks">
<!ENTITY Ctr_bmbviewbmtb "彈出式書籤選單: 顯示「檢視書籤工具列」項目">
<!ENTITY Ctr_bmbnounsort "彈出式書籤選單: 隱藏「未排序書籤」項目">
<!ENTITY Ctr_bmbutnotext "當此按鈕位於書籤列時,隱藏按鈕文字標籤">
@@ -222,9 +225,11 @@
<!ENTITY Ctr_starinurlinfo "原書籤按鈕將被隱藏">
<!ENTITY Ctr_feedinurl "網址列中顯示消息來源訂閱按鈕">
<!ENTITY Ctr_hideurelstop "隱藏網址列中的停止與重新載入按鈕">
+<!ENTITY Ctr_hideurelstop2 "Always show 'go' button">
<!ENTITY Ctr_hideurlgo "隱藏「衝」按鈕">
<!ENTITY Ctr_hideurlsrg "隱藏「重新載入、停止載入、衝」按鈕兩側的分隔線和空白">
<!ENTITY Ctr_urlbardropm "將下拉式三角按鈕儘可能地移動到網址列最末端">
+<!ENTITY Ctr_urlbardropm2 "Make dropmarker always visible">
<!ENTITY Ctr_altreaderico "換個「閱讀模式」圖示">
<!ENTITY Ctr_hideprbutton "當彈出型廣告視窗被封鎖時,不顯示通知圖示">
<!ENTITY Ctr_locsearchbw10 "減少網址列和搜尋列高度 (實驗性)">