1.5.5.2

Bugfix release <b>[locale(s)]</b> - Chinese (zh-CN) translation updated (thanks to Cye3s) - Polish (pl-PL) translation updated (thanks to Mrere) - Japanese (ja) translation updated (thanks to mm_k) <b>[fix(es)]</b> - Fx48+ & 'icons+text' mode & HiDPI mode: downloads button on navigation toolbar - Fx48+ & General Ui (2) > Bookmarks menu button > 'other bookmarks' options - Fx48+ & 'unsorted bookmarks' labels: renanamed to 'other bookmarks' -- Now labels match the current labels in Firefox 48+. -- Firefox 45-47 will keep showing 'other bookmarks' for all locales - Windows & Fx 47+ & 'Tabs (1) > hide tabs toolbar with one tab' option -- tweaked gap with active Firefox titlebar and disabled 'adjust titlebar space' sub option - Fx48+: Location bar (3) > Autocomplete popup > alternative appearance -- unusable location bar on Nightly 2016-8-04+ -- location bar on a bottom toolbar: --- 'disable height limit' sub option --- open autocomplete popup above location bar - Windows/MacOS & Fx 47+ & 'Tabs (1) > hide tabs toolbar with one tab' option -- glitch with OS titlebar and active 'adjust titlebar space' sub option -- gap with Firefox titlebar and disabled 'adjust titlebar space' sub option -- glitch when multiple windows get opened on startup -- title of sub option changed from 'keep titlebar' to 'automatically adjust titlebar space' - Win8 &'Tabs (1) > tabs not on top': wrong tabs toolbar color <b>[general change(s)]</b> - Fx49+: removed 'Firefox Hello' switch from CTRs prefwindow - minor prefwindow tweaks
Aris-t2 · Aug 5, 2016 · f02b44d · f02b44d
1 parent 3b29078
commit f02b44d
Show file tree

Hide file tree

Showing 16 changed files with 507 additions and 20 deletions.
diff --git a/xpi/content/css/bmbut_unsortedbookm.css b/xpi/content/css/bmbut_unsortedbookm.css
@@ -7,6 +7,7 @@
 	  display: unset !important;
 	}
 
+	#main-window[fx48plus="true"] #ctraddon_BMB_unsortedBookmarks_mm2sep,
 	#ctraddon_BMB_unsortedBookmarks_m2,
 	#ctraddon_BMB_unsortedBookmarks_mm2 {
 	  visibility: visible !important;
@@ -18,5 +19,13 @@
 	#ctraddon_BMB_unsortedBookmarks{
 	  display:none !important;
 	}
+
+	#main-window[fx48plus="true"] #ctraddon_BMB_unsortedBookmarks_mm2sep {
+	  -moz-box-ordinal-group: 1000 !important;
+	}
+
+	#main-window[fx48plus="true"] #ctraddon_BMB_unsortedBookmarks_mm2 {
+	  -moz-box-ordinal-group: 1001 !important;
+	}
 
 }
diff --git a/xpi/content/css/bmbut_unsortedbookm2.css b/xpi/content/css/bmbut_unsortedbookm2.css
@@ -3,16 +3,16 @@
 @-moz-document url(chrome://browser/content/browser.xul) {
 
 	#ctraddon_BMB_unsortedBookmarks_m,
-	#ctraddon_BMB_unsortedBookmarks_mm {
+	#main-window:not([fx48plus="true"]) #ctraddon_BMB_unsortedBookmarks_mm {
 	  display: unset !important;
 	}
 
 	#ctraddon_BMB_unsortedBookmarks_m,
-	#ctraddon_BMB_unsortedBookmarks_mm {
+	#main-window:not([fx48plus="true"]) #ctraddon_BMB_unsortedBookmarks_mm {
 	  visibility: visible !important;
 	}
 
-	#menu_unsortedBookmarks,
+	#main-window:not([fx48plus="true"]) #menu_unsortedBookmarks,
 	#ctraddon_BMB_unsortedBookmarks{
 	  display:none !important;
 	}

diff --git a/xpi/content/css/mode_icons_and_text.css b/xpi/content/css/mode_icons_and_text.css
@@ -182,6 +182,11 @@
 		#main-window #nav-bar #bookmarks-menu-button[cui-areatype="toolbar"] > .toolbarbutton-menubutton-button > .toolbarbutton-icon{
 		  max-width: 32px !important;
 		}
+		#main-window[fx48plus="true"] .toolbarbutton-1:-moz-any(#downloads-button) > .toolbarbutton-icon,
+		#main-window[fx48plus="true"] .toolbarbutton-1:-moz-any(#downloads-button) > :-moz-any(.toolbarbutton-menubutton-button, .toolbarbutton-badge-stack) > .toolbarbutton-icon{
+		  width: 18px !important;
+		  max-width: 18px !important;
+		}
 		#main-window #PanelUI-menu-button .toolbarbutton-icon,
 		#main-window toolbar:not(#nav-bar) .toolbarbutton-1:-moz-any(#back-button, #forward-button, #home-button, #print-button, #downloads-button, #bookmarks-menu-button, #new-tab-button, #new-window-button, #fullscreen-button, #sync-button, #feed-button, #tabview-button, #social-share-button, #open-file-button, #find-button, #developer-button, #preferences-button, #ctraddon_preferences-button, #privatebrowsing-button, #save-page-button, #add-ons-button, #history-panelmenu, #nav-bar-overflow-button, #PanelUI-menu-button, #characterencoding-button, #email-link-button, #sidebar-button, #zoom-out-button, #zoom-reset-button, #zoom-in-button, #cut-button, #copy-button, #paste-button, #e10s-button, #panic-button, #web-apps-button, #webide-button, #loop-button, #pocket-button) > .toolbarbutton-icon,
 		#main-window toolbar:not(#nav-bar) .toolbarbutton-1:-moz-any(#back-button, #forward-button, #home-button, #print-button, #downloads-button, #bookmarks-menu-button, #new-tab-button, #new-window-button, #fullscreen-button, #sync-button, #feed-button, #tabview-button, #social-share-button, #open-file-button, #find-button, #developer-button, #preferences-button, #ctraddon_preferences-button, #privatebrowsing-button, #save-page-button, #add-ons-button, #history-panelmenu, #nav-bar-overflow-button, #PanelUI-menu-button, #characterencoding-button, #email-link-button, #sidebar-button, #zoom-out-button, #zoom-reset-button, #zoom-in-button, #cut-button, #copy-button, #paste-button, #e10s-button, #panic-button, #web-apps-button, #webide-button, #loop-button, #pocket-button) > :-moz-any(.toolbarbutton-menubutton-button, .toolbarbutton-badge-stack) > .toolbarbutton-icon,

diff --git a/xpi/content/css/mode_icons_and_text3.css b/xpi/content/css/mode_icons_and_text3.css
@@ -240,6 +240,11 @@
 		#main-window #nav-bar #bookmarks-menu-button[cui-areatype="toolbar"] > .toolbarbutton-menubutton-button > .toolbarbutton-icon{
 		  max-width: 32px !important;
 		}
+		#main-window[fx48plus="true"] .toolbarbutton-1:-moz-any(#downloads-button) > .toolbarbutton-icon,
+		#main-window[fx48plus="true"] .toolbarbutton-1:-moz-any(#downloads-button) > :-moz-any(.toolbarbutton-menubutton-button, .toolbarbutton-badge-stack) > .toolbarbutton-icon{
+		  width: 18px !important;
+		  max-width: 18px !important;
+		}
 		#main-window #PanelUI-menu-button .toolbarbutton-icon,
 		#main-window toolbar:not(#nav-bar) .toolbarbutton-1:-moz-any(#back-button, #forward-button, #home-button, #print-button, #downloads-button, #bookmarks-menu-button, #new-tab-button, #new-window-button, #fullscreen-button, #sync-button, #feed-button, #tabview-button, #social-share-button, #open-file-button, #find-button, #developer-button, #preferences-button, #ctraddon_preferences-button, #privatebrowsing-button, #save-page-button, #add-ons-button, #history-panelmenu, #nav-bar-overflow-button, #PanelUI-menu-button, #characterencoding-button, #email-link-button, #sidebar-button, #zoom-out-button, #zoom-reset-button, #zoom-in-button, #cut-button, #copy-button, #paste-button, #e10s-button, #panic-button, #web-apps-button, #webide-button, #loop-button, #pocket-button) > .toolbarbutton-icon,
 		#main-window toolbar:not(#nav-bar) .toolbarbutton-1:-moz-any(#back-button, #forward-button, #home-button, #print-button, #downloads-button, #bookmarks-menu-button, #new-tab-button, #new-window-button, #fullscreen-button, #sync-button, #feed-button, #tabview-button, #social-share-button, #open-file-button, #find-button, #developer-button, #preferences-button, #ctraddon_preferences-button, #privatebrowsing-button, #save-page-button, #add-ons-button, #history-panelmenu, #nav-bar-overflow-button, #PanelUI-menu-button, #characterencoding-button, #email-link-button, #sidebar-button, #zoom-out-button, #zoom-reset-button, #zoom-in-button, #cut-button, #copy-button, #paste-button, #e10s-button, #panic-button, #web-apps-button, #webide-button, #loop-button, #pocket-button) > :-moz-any(.toolbarbutton-menubutton-button, .toolbarbutton-badge-stack) > .toolbarbutton-icon,

diff --git a/xpi/content/css/old_toplevel_img2.css b/xpi/content/css/old_toplevel_img2.css
@@ -0,0 +1,20 @@
+@media not print {
+
+	html > head:first-child + body:not([background]):not([background-image]):not([class]):not([style]):not([id]):last-child {
+      background-image: unset !important;
+	}
+
+	html > head:first-child + body:not([background]):not([background-image]):not([class]):not([style]):not([id]):last-child > img.transparent:first-child:last-child {
+      background: unset !important;
+	}
+
+	html > head:first-child + body:not([background]):not([background-image]):not([class]):not([style]):not([id]):last-child > img:first-child:last-child {
+	  text-align: unset !important;
+	  margin: unset !important;
+	  top: 8px !important;
+	  right: 8px !important;
+	  bottom: 8px !important;
+	  left: 8px !important;
+	}
+
+}
diff --git a/xpi/content/options.js b/xpi/content/options.js
@@ -548,6 +548,7 @@ classicthemerestorerjso.ctr = {
 	this.ctrpwSearchPopupSize(this.prefs.getBoolPref("osearch_cwidth"));
 	this.ctrpwAeroColors(this.prefs.getBoolPref("aerocolors"));
 	this.ctrpwAutoCompleteHeight(this.prefs.getBoolPref("urlresults"));
+	this.ctrpwOldTopLevelImg(this.prefs.getBoolPref("oldtoplevimg"));
 
 	var closetab_value = this.prefs.getCharPref("closetab");
 
@@ -865,6 +866,19 @@ classicthemerestorerjso.ctr = {
 	document.getElementById('ctraddon_pw_aerocolorsg').style.visibility = itemvis;
   },
 
+  ctrpwOldTopLevelImg:function(which) {
+	var itemvis = 'collapse';
+
+    if(which==true) {
+	  which=false; itemvis = 'visible';
+	} else {
+	  which=true; itemvis = 'collapse';
+	}
+
+    document.getElementById('ctraddon_pw_oldtoplevimg2').disabled = which;
+	document.getElementById('ctraddon_pw_oldtoplevimg2').style.visibility = itemvis;
+  },
+
   ctrpwAutoCompleteHeight: function(which) {
 	var itemvis = 'collapse';
 

diff --git a/xpi/content/options.xul b/xpi/content/options.xul
@@ -107,6 +107,7 @@
 		<preference id="ctraddon_wincontrols"	name="extensions.classicthemerestorer.wincontrols"	type="bool"		instantApply="true"/>
 		<preference id="ctraddon_puibuttonsep"	name="extensions.classicthemerestorer.puibuttonsep"	type="string"	instantApply="true"/>
 		<preference id="ctraddon_oldtoplevimg"	name="extensions.classicthemerestorer.oldtoplevimg"	type="bool"		instantApply="true"/>
+		<preference id="ctraddon_oldtoplevimg2"	name="extensions.classicthemerestorer.oldtoplevimg2" type="bool"	instantApply="true"/>
 		<preference id="ctraddon_altalertbox"	name="extensions.classicthemerestorer.altalertbox"	type="bool"		instantApply="true"/>
 		<preference id="ctraddon_hideprbutton"	name="extensions.classicthemerestorer.hideprbutton"	type="bool"		instantApply="true"/>
 		<preference id="ctraddon_extraurlkeycb"	name="extensions.classicthemerestorer.extraurlkeycb" type="bool"	instantApply="true"/>
@@ -931,7 +932,8 @@
 
 	  <groupbox>
 	    <caption  label="&Ctr_ui;" class="ctraddon_topic"/>
-		<checkbox label="&Ctr_oldtoplevimg;"	preference="ctraddon_oldtoplevimg" id="ctraddon_pw_oldtoplevimg"/>
+		<checkbox label="&Ctr_oldtoplevimg;"	preference="ctraddon_oldtoplevimg" id="ctraddon_pw_oldtoplevimg" oncommand="if(this.checked) {classicthemerestorerjso.ctr.ctrpwOldTopLevelImg(true);} else {classicthemerestorerjso.ctr.ctrpwOldTopLevelImg(false);}"/>
+		<checkbox label="&Ctr_oldtoplevimg; (v2)" preference="ctraddon_oldtoplevimg2" id="ctraddon_pw_oldtoplevimg2" class="ctraddonsuboption"/>
 		<checkbox label="&Ctr_altalertbox;"		preference="ctraddon_altalertbox" id="ctraddon_pw_altalertbox"/>
 		<checkbox label="&Ctr_skipprintpr;"		preference="ctraddon_skipprintpr" id="ctraddon_pw_skipprintpr" oncommand="classicthemerestorerjso.ctr.needsBrowserRestart()"/>
 		<checkbox label="&Ctr_panelmenucol;"	preference="ctraddon_panelmenucol" id="ctraddon_pw_panelmenucolor"/>

diff --git a/xpi/content/overlay.css b/xpi/content/overlay.css
@@ -442,6 +442,8 @@
 	#ctraddon_BMB_viewBookmarksToolbar {
 	  display:none;
 	}
+
+	#ctraddon_BMB_unsortedBookmarks_mm2sep,
 	#ctraddon_BMB_viewBookmarksToolbar + menuseparator {
 	  visibility: collapse;
 	}

diff --git a/xpi/content/overlay.dtd b/xpi/content/overlay.dtd
@@ -110,6 +110,7 @@
 <!ENTITY subscribeToPageMenupopup.label	"Subscribe to This Page">
 <!ENTITY personalbarCmd.label			"Bookmarks Toolbar">
 <!ENTITY bookmarksMenuButton.unsorted.label	"Unsorted Bookmarks">
+<!ENTITY bookmarksMenuButton.other.label "Other Bookmarks">
 <!ENTITY historyButton.label			"History">
 <!ENTITY backCmd.label					"Back">
 <!ENTITY forwardCmd.label				"Forward">

diff --git a/xpi/content/overlay.js b/xpi/content/overlay.js
@@ -897,9 +897,17 @@ classicthemerestorerjs.ctr = {
 			  else classicthemerestorerjs.ctr.loadUnloadCSS("altalertbox",false);
 		  break;
 
-		  case "oldtoplevimg":
-			if (branch.getBoolPref("oldtoplevimg")) classicthemerestorerjs.ctr.loadUnloadCSS("oldtoplevimg",true);
-			  else classicthemerestorerjs.ctr.loadUnloadCSS("oldtoplevimg",false);
+		  case "oldtoplevimg": case "oldtoplevimg2":
+			if (branch.getBoolPref("oldtoplevimg") && branch.getBoolPref("oldtoplevimg2")) {
+			  classicthemerestorerjs.ctr.loadUnloadCSS("oldtoplevimg",false);
+			  classicthemerestorerjs.ctr.loadUnloadCSS("oldtoplevimg2",true);
+			} else if (branch.getBoolPref("oldtoplevimg") && branch.getBoolPref("oldtoplevimg2")==false) {
+			  classicthemerestorerjs.ctr.loadUnloadCSS("oldtoplevimg",true);
+			  classicthemerestorerjs.ctr.loadUnloadCSS("oldtoplevimg2",false);
+			} else {
+			  classicthemerestorerjs.ctr.loadUnloadCSS("oldtoplevimg",false);
+			  classicthemerestorerjs.ctr.loadUnloadCSS("oldtoplevimg2",false);
+			}
 		  break;
 
 		  case "activndicat":
@@ -2957,6 +2965,7 @@ classicthemerestorerjs.ctr = {
 		try{
 		  document.getElementById("ctraddon_BMB_unsortedBookmarks_mm").collapsed = true;
 		  document.getElementById("ctraddon_BMB_unsortedBookmarks_mm2").collapsed = true;
+		  document.getElementById("ctraddon_BMB_unsortedBookmarks_mm2sep").collapsed = true;
 		} catch(e){}
 	  },1000);
 	}
@@ -3079,7 +3088,7 @@ classicthemerestorerjs.ctr = {
 
 		} else if(classicthemerestorerjs.ctr.osstring=="WINNT" && tabsintitlebar==true){
 			if(classicthemerestorerjs.ctr.appversion >= 47)
-		      recentWindow.document.getElementById("titlebar").style.marginBottom="-26px";
+		      recentWindow.document.getElementById("titlebar").style.marginBottom="-23px";
 		} else if(classicthemerestorerjs.ctr.osstring=="Darwin" && tabsintitlebar==true){
 			if(classicthemerestorerjs.ctr.appversion >= 47)
 		      recentWindow.document.getElementById("titlebar").style.marginBottom="-28px";
@@ -3109,7 +3118,7 @@ classicthemerestorerjs.ctr = {
 		  } else {} //Linux does not need special treatment
 		} else if(classicthemerestorerjs.ctr.osstring=="WINNT" && tabsintitlebar==true){
 			if(classicthemerestorerjs.ctr.appversion >= 47)
-		      recentWindow.document.getElementById("titlebar").style.marginBottom="-26px";
+		      recentWindow.document.getElementById("titlebar").style.marginBottom="-23px";
 		} else if(classicthemerestorerjs.ctr.osstring=="Darwin" && tabsintitlebar==true){
 			if(classicthemerestorerjs.ctr.appversion >= 47)
 		      recentWindow.document.getElementById("titlebar").style.marginBottom="-28px";
@@ -3982,6 +3991,7 @@ classicthemerestorerjs.ctr = {
 		case "puib_leftsep": 		manageCSS("puibutton_leftsep.css");		break;
 		case "puib_rightsep": 		manageCSS("puibutton_rightsep.css");	break;
 		case "oldtoplevimg": 		manageCSS("old_toplevel_img.css");		break;
+		case "oldtoplevimg2": 		manageCSS("old_toplevel_img2.css");		break;
 		case "altalertbox": 		manageCSS("alt_alertboxfx44.css");		break;
 		case "navthrobber": 		manageCSS("navthrobber.css");			break;
 		case "hideprbutton": 		manageCSS("hidepagereportbutton.css");	break;

diff --git a/xpi/content/overlay.xul b/xpi/content/overlay.xul
@@ -143,7 +143,7 @@
 	<menugroup id="bookmarksMenuPopup">
       <menu id="ctraddon_BMB_unsortedBookmarks_mm"
                   class="menu-iconic bookmark-item"
-                  label="&bookmarksMenuButton.unsorted.label;"
+                  label="&bookmarksMenuButton.other.label;"
                   container="true"
 				  insertbefore="bookmarksMenuItemsSeparator">
         <menupopup id="BMB_unsortedBookmarksPopup_mm"
@@ -153,9 +153,11 @@
                                     new PlacesMenu(event, 'place:folder=UNFILED_BOOKMARKS',
                                     PlacesUIUtils.getViewForNode(this.parentNode.parentNode).options);"/>
       </menu>
+
+	  <menuseparator id="ctraddon_BMB_unsortedBookmarks_mm2sep"/>
       <menu id="ctraddon_BMB_unsortedBookmarks_mm2"
                   class="menu-iconic bookmark-item"
-                  label="&bookmarksMenuButton.unsorted.label;"
+                  label="&bookmarksMenuButton.other.label;"
                   container="true">
         <menupopup id="BMB_unsortedBookmarksPopup_mm2"
                   placespopup="true"
@@ -478,7 +480,7 @@
 				  <menuseparator builder="end"
 								 class="hide-if-empty-places-result"/>
 				  <menuitem id="appmenu_unsortedBookmarks"
-							label="&unsortedBookmarksCmd.label;"
+							label="&bookmarksMenuButton.other.label;"
 							class="menuitem-iconic"
 							oncommand="PlacesCommandHook.showPlacesOrganizer('UnfiledBookmarks');"/>
 				</menupopup>
@@ -811,7 +813,7 @@
           </menu>
           <menu id="ctraddon_BMB_unsortedBookmarks_m"
                   class="menu-iconic bookmark-item"
-                  label="&bookmarksMenuButton.unsorted.label;"
+                  label="&bookmarksMenuButton.other.label;"
                   container="true">
               <menupopup id="BMB_unsortedBookmarksPopup_m"
                          placespopup="true"
@@ -826,12 +828,12 @@
           <menuseparator builder="end"
                          class="hide-if-empty-places-result"/>
           <menuitem id="ctraddon_BMB_unsortedBookmarks"
-                    label="&unsortedBookmarksCmd.label;"
+                    label="&bookmarksMenuButton.other.label;"
                     oncommand="PlacesCommandHook.showPlacesOrganizer('UnfiledBookmarks');"
                     class="menuitem-iconic"/>
           <menu id="ctraddon_BMB_unsortedBookmarks_m2"
                   class="menu-iconic bookmark-item"
-                  label="&bookmarksMenuButton.unsorted.label;"
+                  label="&bookmarksMenuButton.other.label;"
                   container="true">
               <menupopup id="BMB_unsortedBookmarksPopup_m2"
                          placespopup="true"

diff --git a/xpi/defaults/preferences/options.js b/xpi/defaults/preferences/options.js
@@ -50,6 +50,7 @@ pref("extensions.classicthemerestorer.iat_notf_vt",false);
 pref("extensions.classicthemerestorer.wincontrols",false);
 pref("extensions.classicthemerestorer.puibuttonsep",'puib_nosep');
 pref("extensions.classicthemerestorer.oldtoplevimg",false);
+pref("extensions.classicthemerestorer.oldtoplevimg2",false);
 pref("extensions.classicthemerestorer.altalertbox",false);
 pref("extensions.classicthemerestorer.emptyfavico_g",'emptyfavico_g_def');
 pref("extensions.classicthemerestorer.panelmenucol",false);

diff --git 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.5.5.2beta5</em:version>
+		<em:version>1.5.5.2</em:version>
 		<em:type>2</em:type>
 		<em:multiprocessCompatible>true</em:multiprocessCompatible>
 

diff --git a/xpi/locale/de/options.dtd b/xpi/locale/de/options.dtd
@@ -187,11 +187,11 @@
 <!ENTITY Ctr_hiderecentbm	"Lesezeichen-Pop-up: zuletzt hinzugefügte Lesezeichen verstecken">
 <!ENTITY Ctr_hideeditbm		"Lesezeichen-Stern: Pop-up verstecken (wenn Seite noch kein Lesezeichen ist)">
 <!ENTITY Ctr_bmbutpanelm	"Aufklappmenü: 'Panel'-Darstellung">
-<!ENTITY Ctr_bmbunsortbm	"Aufklappmenü: 'Unsortierte Lesezeichen'-Menü anzeigen">
+<!ENTITY Ctr_bmbunsortbm	"Aufklappmenü: 'Weitere Lesezeichen'-Menü anzeigen">
 <!ENTITY Ctr_bmbunsortbm2	"Menü über den Lesezeichen">
 <!ENTITY Ctr_bmbviewbmsb	"Aufklappmenü: 'Lesezeichen-Seitenleiste' anzeigen">
 <!ENTITY Ctr_bmbviewbmtb	"Aufklappmenü: 'Lesezeichen-Symbolleiste' anzeigen">
-<!ENTITY Ctr_bmbnounsort	"Aufklappmenü: 'Unsortierte Lesezeichen' verstecken">
+<!ENTITY Ctr_bmbnounsort	"Aufklappmenü: 'Weitere Lesezeichen' verstecken">
 <!ENTITY Ctr_bmbutnotext	"Text auch auf der Lesezeichen-Symbolleiste verstecken">
 <!ENTITY Ctr_skipprintpr	"Drucken-Schaltfläche: Druckvorschau überspringen">
 <!ENTITY Ctr_tbconmenu		"Leistenkontextmenü: 'In Menü verschieben', 'Aus Symbolleiste entfernen', 'Alle Tabs neu laden', 'Lesezeichen für alle Tabs hinzufügen …' und 'Geschlossenen Tab wiederherstellen' verstecken">

diff --git a/xpi/locale/en-US/options.dtd b/xpi/locale/en-US/options.dtd
@@ -187,11 +187,11 @@
 <!ENTITY Ctr_hiderecentbm	"Bookmarks popup: hide recently added bookmarks">
 <!ENTITY Ctr_hideeditbm		"Bookmarks star: hide popup (if page is not bookmarked)">
 <!ENTITY Ctr_bmbutpanelm	"Popup: panel menu appearance">
-<!ENTITY Ctr_bmbunsortbm	"Popup: 'Unsorted Bookmarks' menu">
+<!ENTITY Ctr_bmbunsortbm	"Popup: 'Other Bookmarks' menu">
 <!ENTITY Ctr_bmbunsortbm2	"Menu above bookmarks">
 <!ENTITY Ctr_bmbviewbmsb	"Popup: show 'View Bookmarks Sidebar'">
 <!ENTITY Ctr_bmbviewbmtb	"Popup: show 'View Bookmarks Toolbar'">
-<!ENTITY Ctr_bmbnounsort	"Popup: hide 'Unsorted Bookmarks'">
+<!ENTITY Ctr_bmbnounsort	"Popup: hide 'Other Bookmarks'">
 <!ENTITY Ctr_bmbutnotext	"Hide label on bookmarks bar">
 <!ENTITY Ctr_skipprintpr	"Print button: skip print preview">
 <!ENTITY Ctr_tbconmenu		"Toolbar context menu: hide 'move to menu', 'remove from toolbar', 'reload/bookmark all tabs' and 'undo close tab'">