1.5.4beta8

<b>[locale(s)]</b>
- Estonian (et) translation updated (thanks to Maidur)
- Slovenian (sl-SI) translation updated (thanks to Klofutar)
- Spanish (es) translation updated (thanks to strel)
- Japanese (ja) translation updated (thanks to mm_k)
- Polish (pl-PL) translation updated (thanks to Mrere)

<b>[new option(s)]</b>
- Location bar (3) > Autocomplete popup > Highlighting of text hits >
-- > bold
-- > italic
-- > underlined

<b>[general change(s)]</b>
- removed autocomplete popup option 'bold & underlined marking of hits'
- minor tweaks on 'alt autocomplete popup' option

32 files changed, 154 insertions, 41 deletions

diff --git a/xpi/content/css/alt_autocompl_hl_b.css b/xpi/content/css/alt_autocompl_hl_b.css
new file mode 100644
index 0000000..8ca2c98
--- /dev/null
+++ b/xpi/content/css/alt_autocompl_hl_b.css
@@ -0,0 +1,12 @@
+@-moz-document url(chrome://browser/content/browser.xul) {
+	
+	panel[type="autocomplete-richlistbox"] richlistitem :-moz-any(.ac-emphasize-text-title, .ac-emphasize-text-tag, .ac-emphasize-text-url,.ac-emphasize-text),
+	#PopupAutoCompleteRichResult[autocompleteinput="urlbar"] richlistitem :-moz-any(.ac-emphasize-text-title, .ac-emphasize-text-tag, .ac-emphasize-text-url,.ac-emphasize-text) {
+	  font-weight: bold !important;
+	  box-shadow: unset !important;
+	  background-color: unset !important;
+	  border-radius: unset !important;
+	  text-shadow: unset !important;
+	}
+
+}
\ No newline at end of file
diff --git a/xpi/content/css/alt_autocompl_hl_i.css b/xpi/content/css/alt_autocompl_hl_i.css
new file mode 100644
index 0000000..42259a6
--- /dev/null
+++ b/xpi/content/css/alt_autocompl_hl_i.css
@@ -0,0 +1,12 @@
+@-moz-document url(chrome://browser/content/browser.xul) {
+	
+	panel[type="autocomplete-richlistbox"] richlistitem :-moz-any(.ac-emphasize-text-title, .ac-emphasize-text-tag, .ac-emphasize-text-url,.ac-emphasize-text),
+	#PopupAutoCompleteRichResult[autocompleteinput="urlbar"] richlistitem :-moz-any(.ac-emphasize-text-title, .ac-emphasize-text-tag, .ac-emphasize-text-url,.ac-emphasize-text) {
+	  font-style: italic !important;
+	  box-shadow: unset !important;
+	  background-color: unset !important;
+	  border-radius: unset !important;
+	  text-shadow: unset !important;
+	}
+
+}
\ No newline at end of file
diff --git a/xpi/content/css/alt_autocompl_highl.css b/xpi/content/css/alt_autocompl_hl_u.css
index d15498a..28d28d4 100644
--- a/xpi/content/css/alt_autocompl_highl.css
+++ b/xpi/content/css/alt_autocompl_hl_u.css
@@ -2,7 +2,6 @@
 	
 	panel[type="autocomplete-richlistbox"] richlistitem :-moz-any(.ac-emphasize-text-title, .ac-emphasize-text-tag, .ac-emphasize-text-url,.ac-emphasize-text),
 	#PopupAutoCompleteRichResult[autocompleteinput="urlbar"] richlistitem :-moz-any(.ac-emphasize-text-title, .ac-emphasize-text-tag, .ac-emphasize-text-url,.ac-emphasize-text) {
-	  font-weight: bold !important;
 	  text-decoration: underline !important;
 	  box-shadow: unset !important;
 	  background-color: unset !important;
diff --git a/xpi/content/css/alt_autocomplete.css b/xpi/content/css/alt_autocomplete.css
index cdcb9cd..bd108e2 100644
--- a/xpi/content/css/alt_autocomplete.css
+++ b/xpi/content/css/alt_autocomplete.css
@@ -22,16 +22,31 @@
 	panel[type="autocomplete-richlistbox"] .autocomplete-richlistitem .ac-separator,
 	#PopupAutoCompleteRichResult[autocompleteinput="urlbar"] .autocomplete-richlistitem .ac-separator {
 	  display:none !important;
+	  visibility: collapse !important;
 	}
 	
-	panel[type="autocomplete-richlistbox"] .ac-site-icon,
-	#PopupAutoCompleteRichResult[autocompleteinput="urlbar"] .ac-site-icon {
+	panel[type="autocomplete-richlistbox"] .autocomplete-richlistitem :-moz-any(.ac-site-icon,.ac-title,.ac-action,.ac-url),
+	#PopupAutoCompleteRichResult[autocompleteinput="urlbar"] .autocomplete-richlistitem :-moz-any(.ac-site-icon,.ac-title,.ac-action,.ac-url){
+	  -moz-margin-start: unset !important;
+	  -moz-margin-end: unset !important;
+	  -moz-padding-start: unset !important;
+	  -moz-padding-end: unset !important;
+	}
+
+	panel[type="autocomplete-richlistbox"] .autocomplete-richlistitem .ac-type-icon,
+	#PopupAutoCompleteRichResult[autocompleteinput="urlbar"] .autocomplete-richlistitem .ac-type-icon {
+	  margin-inline-start: 4px !important;
+	  margin-inline-end: unset !important;  
+	}
+
+	panel[type="autocomplete-richlistbox"] .autocomplete-richlistitem .ac-site-icon,
+	#PopupAutoCompleteRichResult[autocompleteinput="urlbar"] .autocomplete-richlistitem .ac-site-icon {
 	  -moz-margin-start: 1px !important;
 	}
 
 	panel[type="autocomplete-richlistbox"] .autocomplete-richlistitem .ac-title,
 	#PopupAutoCompleteRichResult[autocompleteinput="urlbar"] .autocomplete-richlistitem .ac-title{
-	  -moz-margin-start: -7px !important;
+	  -moz-margin-start: 4px !important;
 	  margin-top:-2px !important;
 	}
 
diff --git a/xpi/content/css/spaces_extra.css b/xpi/content/css/spaces_extra.css
index c87ac2a..fe27eb0 100644
--- a/xpi/content/css/spaces_extra.css
+++ b/xpi/content/css/spaces_extra.css
@@ -8,9 +8,7 @@
 	  background: url("chrome://classic_theme_restorer/content/images/flex_space.png") white center no-repeat;
 	  border: 1px solid black !important;
 	}
-	toolbarpaletteitem[place="palette"] > toolbarseparator{
-	  /*background: url("chrome://classic_theme_restorer/content/images/separator.png") center no-repeat;*/
-	}
+
 	toolbarpaletteitem[place="palette"] > toolbarspacer{
 	  background: url("chrome://classic_theme_restorer/content/images/space1.png") center no-repeat;
 	}
@@ -21,7 +19,6 @@
 	  border: 1px solid black !important;
 	}
 	toolbarpaletteitem[place="toolbar"] > toolbarseparator{
-	  /*background: url("chrome://classic_theme_restorer/content/images/separator.png") center no-repeat;*/
 	  min-width: 5px;
 	  width: 5px;
 	}
diff --git a/xpi/content/css/win8/starinurlextra.css b/xpi/content/css/win8/starinurlextra.css
index 214b34e..12fcd8a 100644
--- a/xpi/content/css/win8/starinurlextra.css
+++ b/xpi/content/css/win8/starinurlextra.css
@@ -48,4 +48,16 @@
 	#main-window[defaultfxtheme="true"] #editBookmarkPanelStarIcon {
 	  list-style-image: url("chrome://classic_theme_restorer/content/images/starred48.png") !important;
 	}
+	
+	@media not all and (min-resolution: 1.1dppx) {
+
+		#main-window[defaultfxtheme="true"][fx48plus="true"] panel[type="autocomplete-richlistbox"] .autocomplete-richlistitem .ac-type-icon[type=bookmark],
+		#main-window[defaultfxtheme="true"][fx48plus="true"] #PopupAutoCompleteRichResult[autocompleteinput="urlbar"] .autocomplete-richlistitem .ac-type-icon[type=bookmark],
+		#main-window[defaultfxtheme="true"][fx48plus="true"] panel[type="autocomplete-richlistbox"] .autocomplete-richlistitem .ac-type-icon[type=bookmark][selected][current],
+		#main-window[defaultfxtheme="true"][fx48plus="true"] #PopupAutoCompleteRichResult[autocompleteinput="urlbar"] .autocomplete-richlistitem .ac-type-icon[type=bookmark][selected][current] {
+		  list-style-image: url("chrome://classic_theme_restorer/content/images/appmenu_bookmarks.png") !important;
+		}
+
+	}
+
 }
\ No newline at end of file
diff --git a/xpi/content/css/winaero/starinurlextra.css b/xpi/content/css/winaero/starinurlextra.css
index 214b34e..12fcd8a 100644
--- a/xpi/content/css/winaero/starinurlextra.css
+++ b/xpi/content/css/winaero/starinurlextra.css
@@ -48,4 +48,16 @@
 	#main-window[defaultfxtheme="true"] #editBookmarkPanelStarIcon {
 	  list-style-image: url("chrome://classic_theme_restorer/content/images/starred48.png") !important;
 	}
+	
+	@media not all and (min-resolution: 1.1dppx) {
+
+		#main-window[defaultfxtheme="true"][fx48plus="true"] panel[type="autocomplete-richlistbox"] .autocomplete-richlistitem .ac-type-icon[type=bookmark],
+		#main-window[defaultfxtheme="true"][fx48plus="true"] #PopupAutoCompleteRichResult[autocompleteinput="urlbar"] .autocomplete-richlistitem .ac-type-icon[type=bookmark],
+		#main-window[defaultfxtheme="true"][fx48plus="true"] panel[type="autocomplete-richlistbox"] .autocomplete-richlistitem .ac-type-icon[type=bookmark][selected][current],
+		#main-window[defaultfxtheme="true"][fx48plus="true"] #PopupAutoCompleteRichResult[autocompleteinput="urlbar"] .autocomplete-richlistitem .ac-type-icon[type=bookmark][selected][current] {
+		  list-style-image: url("chrome://classic_theme_restorer/content/images/appmenu_bookmarks.png") !important;
+		}
+
+	}
+
 }
\ No newline at end of file
diff --git a/xpi/content/css/winxp/starinurlextra.css b/xpi/content/css/winxp/starinurlextra.css
index 214b34e..12fcd8a 100644
--- a/xpi/content/css/winxp/starinurlextra.css
+++ b/xpi/content/css/winxp/starinurlextra.css
@@ -48,4 +48,16 @@
 	#main-window[defaultfxtheme="true"] #editBookmarkPanelStarIcon {
 	  list-style-image: url("chrome://classic_theme_restorer/content/images/starred48.png") !important;
 	}
+	
+	@media not all and (min-resolution: 1.1dppx) {
+
+		#main-window[defaultfxtheme="true"][fx48plus="true"] panel[type="autocomplete-richlistbox"] .autocomplete-richlistitem .ac-type-icon[type=bookmark],
+		#main-window[defaultfxtheme="true"][fx48plus="true"] #PopupAutoCompleteRichResult[autocompleteinput="urlbar"] .autocomplete-richlistitem .ac-type-icon[type=bookmark],
+		#main-window[defaultfxtheme="true"][fx48plus="true"] panel[type="autocomplete-richlistbox"] .autocomplete-richlistitem .ac-type-icon[type=bookmark][selected][current],
+		#main-window[defaultfxtheme="true"][fx48plus="true"] #PopupAutoCompleteRichResult[autocompleteinput="urlbar"] .autocomplete-richlistitem .ac-type-icon[type=bookmark][selected][current] {
+		  list-style-image: url("chrome://classic_theme_restorer/content/images/appmenu_bookmarks.png") !important;
+		}
+
+	}
+
 }
\ No newline at end of file
diff --git a/xpi/content/options.xul b/xpi/content/options.xul
index 5cef360..985bb1f 100644
--- a/xpi/content/options.xul
+++ b/xpi/content/options.xul
@@ -127,7 +127,9 @@
 		<preference id="ctraddon_altreaderico"	name="extensions.classicthemerestorer.altreaderico"	type="bool"		instantApply="true"/>
 		<preference id="ctraddon_altautocompl"	name="extensions.classicthemerestorer.altautocompl"	type="bool"		instantApply="true"/>
 		<preference id="ctraddon_autocompl_it"	name="extensions.classicthemerestorer.autocompl_it"	type="bool"		instantApply="true"/>
-		<preference id="ctraddon_autocompl_hl"	name="extensions.classicthemerestorer.autocompl_hl"	type="bool"		instantApply="true"/>
+		<preference id="ctraddon_autocompl_hlb"	name="extensions.classicthemerestorer.autocompl_hlb" type="bool"	instantApply="true"/>
+		<preference id="ctraddon_autocompl_hlu"	name="extensions.classicthemerestorer.autocompl_hlu" type="bool"	instantApply="true"/>
+		<preference id="ctraddon_autocompl_hli"	name="extensions.classicthemerestorer.autocompl_hli" type="bool"	instantApply="true"/>
 		<preference id="ctraddon_autocompl_sep"	name="extensions.classicthemerestorer.autocompl_sep" 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"/>
@@ -1142,9 +1144,15 @@
 		<description class="ctraddonsuboption" id="ctraddon_pw_urlbar_uc_desc">about:config &gt;&gt; browser.urlbar.unifiedcomplete</description>
 		<checkbox label="&Ctr_lbsugresi;" preference="ctraddon_urlresults" id="ctraddon_pw_urlresults" oncommand="if(this.checked) {classicthemerestorerjso.ctr.ctrpwAutoCompleteHeight(true);} else {classicthemerestorerjso.ctr.ctrpwAutoCompleteHeight(false);}"/>
 		<checkbox label="&Ctr_autocompl_it;" preference="ctraddon_autocompl_it" id="ctraddon_pw_autocompl_it"/>
-		<checkbox label="&Ctr_autocompl_hl;" preference="ctraddon_autocompl_hl" id="ctraddon_pw_autocompl_hl"/>
 		<checkbox label="&Ctr_autocompl_sep;" preference="ctraddon_autocompl_sep" id="ctraddon_pw_autocompl_sep"/>
 		
+		<description id="ctraddon_lbsugres" class="ctraddon_font1">&Ctr_autocompl_hl;</description>
+		<hbox>
+		  <checkbox label="&Ctr_bold;" preference="ctraddon_autocompl_hlb" id="ctraddon_pw_autocompl_hlb"/>
+		  <checkbox label="&Ctr_italic;" preference="ctraddon_autocompl_hli" id="ctraddon_pw_autocompl_hli"/>
+		  <checkbox label="&Ctr_underlined;" preference="ctraddon_autocompl_hlu" id="ctraddon_pw_autocompl_hlu"/>
+		</hbox>
+		
 		<description id="ctraddon_lbsugres" class="ctraddon_font1">&Ctr_lbsugres;</description>
 		<description>about:config &gt;&gt; browser.urlbar.maxRichResults</description>
 		<hbox id="ctraddon_pw_lbsugresbox" align="center">
diff --git a/xpi/content/overlay.js b/xpi/content/overlay.js
index 12c728c..076e92f 100644
--- a/xpi/content/overlay.js
+++ b/xpi/content/overlay.js
@@ -1213,11 +1213,21 @@ classicthemerestorerjs.ctr = {
 			  else classicthemerestorerjs.ctr.loadUnloadCSS("autocompl_it",false);
 		  break;
 		  
-		  case "autocompl_hl":
-			if (branch.getBoolPref("autocompl_hl")) classicthemerestorerjs.ctr.loadUnloadCSS("autocompl_hl",true);
-			  else classicthemerestorerjs.ctr.loadUnloadCSS("autocompl_hl",false);
+		  case "autocompl_hlb":
+			if (branch.getBoolPref("autocompl_hlb")) classicthemerestorerjs.ctr.loadUnloadCSS("autocompl_hlb",true);
+			  else classicthemerestorerjs.ctr.loadUnloadCSS("autocompl_hlb",false);
 		  break;
-		  
+
+		  case "autocompl_hlu":
+			if (branch.getBoolPref("autocompl_hlu")) classicthemerestorerjs.ctr.loadUnloadCSS("autocompl_hlu",true);
+			  else classicthemerestorerjs.ctr.loadUnloadCSS("autocompl_hlu",false);
+		  break;
+
+		  case "autocompl_hli":
+			if (branch.getBoolPref("autocompl_hli")) classicthemerestorerjs.ctr.loadUnloadCSS("autocompl_hli",true);
+			  else classicthemerestorerjs.ctr.loadUnloadCSS("autocompl_hli",false);
+		  break;
+
 		  case "autocompl_sep":
 			if (branch.getBoolPref("autocompl_sep")) classicthemerestorerjs.ctr.loadUnloadCSS("autocompl_sep",true);
 			  else classicthemerestorerjs.ctr.loadUnloadCSS("autocompl_sep",false);
@@ -3981,7 +3991,9 @@ classicthemerestorerjs.ctr = {
 		case "altreaderico": 		manageCSS("alt_reader_icons.css");		break;
 		case "altautocompl": 		manageCSS("alt_autocomplete.css");		break;
 		case "autocompl_it": 		manageCSS("alt_autocompl_items.css");	break;
-		case "autocompl_hl": 		manageCSS("alt_autocompl_highl.css");	break;
+		case "autocompl_hlb": 		manageCSS("alt_autocompl_hl_b.css");	break;
+		case "autocompl_hlu": 		manageCSS("alt_autocompl_hl_u.css");	break;
+		case "autocompl_hli": 		manageCSS("alt_autocompl_hl_i.css");	break;
 		case "autocompl_sep": 		manageCSS("alt_autocompl_sep.css");		break;
 		case "locsearchbw10": 		manageCSS("locationsearchbarw10.css");	break;
 		case "combrelstop":			manageCSS("combrelstop.css");			break;
diff --git a/xpi/defaults/preferences/options.js b/xpi/defaults/preferences/options.js
index a40bab5..675edd5 100644
--- a/xpi/defaults/preferences/options.js
+++ b/xpi/defaults/preferences/options.js
@@ -125,7 +125,9 @@ pref("extensions.classicthemerestorer.urlbardropm2",false);
 pref("extensions.classicthemerestorer.altreaderico",false);
 pref("extensions.classicthemerestorer.altautocompl",false);
 pref("extensions.classicthemerestorer.autocompl_it",false);
-pref("extensions.classicthemerestorer.autocompl_hl",false);
+pref("extensions.classicthemerestorer.autocompl_hlb",false);
+pref("extensions.classicthemerestorer.autocompl_hlu",false);
+pref("extensions.classicthemerestorer.autocompl_hli",false);
 pref("extensions.classicthemerestorer.autocompl_sep",false);
 
 pref("extensions.classicthemerestorer.ib_nohovcolor",false);
diff --git a/xpi/install.rdf b/xpi/install.rdf
index 5a46dd3..1d28275 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.5.4beta7</em:version>
+		<em:version>1.5.4beta8</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 74315f5..d36f217 100644
--- a/xpi/locale/cs/options.dtd
+++ b/xpi/locale/cs/options.dtd
@@ -232,6 +232,7 @@
 <!ENTITY Ctr_ntabhov		"Nový panel (najetí myši)">
 <!ENTITY Ctr_bold			"Tučný">
 <!ENTITY Ctr_italic			"Kurzíva">
+<!ENTITY Ctr_underlined		"Underlined">
 <!ENTITY Ctr_notabhov		"Zvoleným nastavením přepsat 'najetí myši'">
 <!ENTITY Ctr_tabc_act_tb	"Barva pozadí lišt">
 
@@ -268,7 +269,7 @@
 <!ENTITY Ctr_autocomplete	"Okno autokompletace">
 <!ENTITY Ctr_altautocompl	"Alternativní vzhled">
 <!ENTITY Ctr_autocompl_it	"Odstranit položky 'Vyhledat pomocí...' a 'Navštívit' (pokud se vyskytují)">
-<!ENTITY Ctr_autocompl_hl	"Marking of hits: Bold and Underlined">
+<!ENTITY Ctr_autocompl_hl	"Highlighting of text hits">
 <!ENTITY Ctr_autocompl_sep	"Show separator between results">
 <!ENTITY Ctr_urlbar_uc		"Zakázat automatické doplňování">
 <!ENTITY Ctr_lbsugresi		"Zrušit limit pro výšku">
diff --git a/xpi/locale/da/options.dtd b/xpi/locale/da/options.dtd
index 2691755..383462f 100644
--- a/xpi/locale/da/options.dtd
+++ b/xpi/locale/da/options.dtd
@@ -232,6 +232,7 @@
 <!ENTITY Ctr_ntabhov		"Nyt faneblad der peges på">
 <!ENTITY Ctr_bold			"Fed">
 <!ENTITY Ctr_italic			"Kursiv">
+<!ENTITY Ctr_underlined		"Underlined">
 <!ENTITY Ctr_notabhov		"Aktiveret indstillinger overstyrer 'Der peges på'-indstillinger">
 <!ENTITY Ctr_tabc_act_tb	"Baggrundsfarve på værktøjslinjer">
 
@@ -268,7 +269,7 @@
 <!ENTITY Ctr_autocomplete	"Autofuldfør-popup">
 <!ENTITY Ctr_altautocompl	"Alternativt udseende">
 <!ENTITY Ctr_autocompl_it	"Remove 'Search with...' and 'Visit' items (if present)">
-<!ENTITY Ctr_autocompl_hl	"Marking of hits: Bold and Underlined">
+<!ENTITY Ctr_autocompl_hl	"Highlighting of text hits">
 <!ENTITY Ctr_autocompl_sep	"Show separator between results">
 <!ENTITY Ctr_urlbar_uc		"Deaktivér 'samlede autofuldfør'-funktion">
 <!ENTITY Ctr_lbsugresi		"Deaktivér højdegrænse">
diff --git a/xpi/locale/de/options.dtd b/xpi/locale/de/options.dtd
index 44053a8..b5fa328 100644
--- a/xpi/locale/de/options.dtd
+++ b/xpi/locale/de/options.dtd
@@ -232,6 +232,7 @@
 <!ENTITY Ctr_ntabhov		"Neuer Tab (hover)">
 <!ENTITY Ctr_bold			"Fett">
 <!ENTITY Ctr_italic			"Kursiv">
+<!ENTITY Ctr_underlined		"Unterstrichen">
 <!ENTITY Ctr_notabhov		"Aktivierte Einstellungen ersetzen 'Hover-Einstellungen'">
 <!ENTITY Ctr_tabc_act_tb	"Tab-Hintergrundfarbe auf Leisten">
 
@@ -268,7 +269,7 @@
 <!ENTITY Ctr_autocomplete	"Autovervollständigungs-Pop-up">
 <!ENTITY Ctr_altautocompl	"Alternative Darstellung">
 <!ENTITY Ctr_autocompl_it	"'Mit ... suchen' und 'Aufrufen' Elemente entfernen (falls vorhanden)">
-<!ENTITY Ctr_autocompl_hl	"Trefferhervorhebung: Fett und Unterstrichen">
+<!ENTITY Ctr_autocompl_hl	"Hervorhebung von Texttreffern">
 <!ENTITY Ctr_autocompl_sep	"Trennlinie zwischen den Ergebnissen anzeigen">
 <!ENTITY Ctr_urlbar_uc		"'Vereinigte Autovervollständigung' deaktivieren">
 <!ENTITY Ctr_lbsugresi		"Höhenlimit deaktivieren">
diff --git a/xpi/locale/dsb/options.dtd b/xpi/locale/dsb/options.dtd
index 20aded7..f2e546f 100644
--- a/xpi/locale/dsb/options.dtd
+++ b/xpi/locale/dsb/options.dtd
@@ -232,6 +232,7 @@
 <!ENTITY Ctr_ntabhov		"Nowy rejtark (hover)">
 <!ENTITY Ctr_bold			"Tucny">
 <!ENTITY Ctr_italic			"Kursiwny">
+<!ENTITY Ctr_underlined		"Underlined">
 <!ENTITY Ctr_notabhov		"Zmóžnjone nastajenja pśepisuju 'hover-nastajenja">
 <!ENTITY Ctr_tabc_act_tb	"Slězynowa barwa na symbolowych rědkach">
 
@@ -268,7 +269,7 @@
 <!ENTITY Ctr_autocomplete	"Wuskokujuce wokno awtowudopołnjenja">
 <!ENTITY Ctr_altautocompl	"Alternatiwny naglěd">
 <!ENTITY Ctr_autocompl_it	"Remove 'Search with...' and 'Visit' items (if present)">
-<!ENTITY Ctr_autocompl_hl	"Marking of hits: Bold and Underlined">
+<!ENTITY Ctr_autocompl_hl	"Highlighting of text hits">
 <!ENTITY Ctr_autocompl_sep	"Show separator between results">
 <!ENTITY Ctr_urlbar_uc		"Funkciju 'zjadnośone awotwudopołnjenje' znjemóžniś">
 <!ENTITY Ctr_lbsugresi		"Limit wusokosći znjemóžniś">
diff --git a/xpi/locale/el/options.dtd b/xpi/locale/el/options.dtd
index 5d47054..cc7071c 100644
--- a/xpi/locale/el/options.dtd
+++ b/xpi/locale/el/options.dtd
@@ -232,6 +232,7 @@
 <!ENTITY Ctr_ntabhov		"Κατάδειξη νέας καρτέλας">
 <!ENTITY Ctr_bold		    "Έντονη γραφή">
 <!ENTITY Ctr_italic			"Πλάγια γραφή">
+<!ENTITY Ctr_underlined		"Underlined">
 <!ENTITY Ctr_notabhov		"Παράκαμψη ρυθμίσεων κατάδειξης από τις ενεργοποιημένες ρυθμίσεις εδώ">
 <!ENTITY Ctr_tabc_act_tb	"Χρώμα φόντου σε εργαλειοθήκες">
 
@@ -268,7 +269,7 @@
 <!ENTITY Ctr_autocomplete	"Αναδυόμενο αυτόματης συμπλήρωσης">
 <!ENTITY Ctr_altautocompl	"Εναλλακτική εμφάνιση">
 <!ENTITY Ctr_autocompl_it	"Remove 'Search with...' and 'Visit' items (if present)">
-<!ENTITY Ctr_autocompl_hl	"Marking of hits: Bold and Underlined">
+<!ENTITY Ctr_autocompl_hl	"Highlighting of text hits">
 <!ENTITY Ctr_autocompl_sep	"Show separator between results">
 <!ENTITY Ctr_urlbar_uc		"Απενεργοποίηση χαρακτηριστικού ενιαίας αυτόματης συμπλήρωσης">
 <!ENTITY Ctr_lbsugresi		"Απενεργοποίηση ορίου ύψους">
diff --git a/xpi/locale/en-US/options.dtd b/xpi/locale/en-US/options.dtd
index cd81fdd..491384c 100644
--- a/xpi/locale/en-US/options.dtd
+++ b/xpi/locale/en-US/options.dtd
@@ -232,6 +232,7 @@
 <!ENTITY Ctr_ntabhov		"Hovered New tab">
 <!ENTITY Ctr_bold			"Bold">
 <!ENTITY Ctr_italic			"Italic">
+<!ENTITY Ctr_underlined		"Underlined">
 <!ENTITY Ctr_notabhov		"Enabled settings override 'hovered' settings">
 <!ENTITY Ctr_tabc_act_tb	"Background color on toolbars">
 
@@ -268,7 +269,7 @@
 <!ENTITY Ctr_autocomplete	"Autocomplete popup">
 <!ENTITY Ctr_altautocompl	"Alternative appearance">
 <!ENTITY Ctr_autocompl_it	"Remove 'Search with...' and 'Visit' items (if present)">
-<!ENTITY Ctr_autocompl_hl	"Marking of hits: Bold and Underlined">
+<!ENTITY Ctr_autocompl_hl	"Highlighting of text hits">
 <!ENTITY Ctr_autocompl_sep	"Show separator between results">
 <!ENTITY Ctr_urlbar_uc		"Disable 'unified autocomplete' feature">
 <!ENTITY Ctr_lbsugresi		"Disable height limit">
diff --git a/xpi/locale/es/options.dtd b/xpi/locale/es/options.dtd
index 3a40b58..930d4f9 100644
--- a/xpi/locale/es/options.dtd
+++ b/xpi/locale/es/options.dtd
@@ -132,7 +132,7 @@
 <!ENTITY Ctr_puibut_l_sep	"Izquierda">
 <!ENTITY Ctr_puibut_r_sep	"Derecha">
 <!ENTITY Ctr_html5warning	"Advertencia de pantalla completa de contenidos HTML5">
-<!ENTITY Ctr_oldtoplevimg	"Apariencia clásica de imagen sobre fondo blanco">
+<!ENTITY Ctr_oldtoplevimg	"Vista de imagen: Apariencia clásica sobre fondo blanco">
 <!ENTITY Ctr_altalertbox	"'Recuadro de alerta': Apariencia alternativa">
 <!ENTITY Ctr_emptygfavico	"Reemplazar favicon genérico">
 <!ENTITY Ctr_mstatusbar		"Mostrar panel móvil de contenedor de la antigua barra de estado">
@@ -232,6 +232,7 @@
 <!ENTITY Ctr_ntabhov		"Nueva pestaña señalada">
 <!ENTITY Ctr_bold			"Negrita">
 <!ENTITY Ctr_italic			"Cursiva">
+<!ENTITY Ctr_underlined		"Subrayadas">
 <!ENTITY Ctr_notabhov		"Las configuraciones habilitadas se imponen a las de pestaña 'señalada'">
 <!ENTITY Ctr_tabc_act_tb	"Color de fondo en barras de herramientas">
 
@@ -269,8 +270,8 @@
 <!ENTITY Ctr_urlbar_uc		"Deshabilitar 'Autocompletado unificado'">
 <!ENTITY Ctr_altautocompl	"Apariencia alternativa">
 <!ENTITY Ctr_autocompl_it	"Eliminar los elementos 'Buscar con...' y 'Visitar' (si están presentes)">
-<!ENTITY Ctr_autocompl_hl	"Marcado de coincidencias: En negrita y subrayadas">
-<!ENTITY Ctr_autocompl_sep	"Show separator between results">
+<!ENTITY Ctr_autocompl_hl	"Marcado de coincidencias">
+<!ENTITY Ctr_autocompl_sep	"Mostrar separador entre resultados">
 <!ENTITY Ctr_lbsugresi		"Deshabilitar límite de altura">
 <!ENTITY Ctr_lbsugres		"Número de resultados">
 <!ENTITY Ctr_lbsbradius		"Borde de radio personalizado para barra de direcciones y barra de búsqueda">
diff --git a/xpi/locale/et/options.dtd b/xpi/locale/et/options.dtd
index ea95eae..8445d73 100644
--- a/xpi/locale/et/options.dtd
+++ b/xpi/locale/et/options.dtd
@@ -232,6 +232,7 @@
 <!ENTITY Ctr_ntabhov		"Uus kaart, millele on hiirekursoriga osutatud">
 <!ENTITY Ctr_bold			"Paks">
 <!ENTITY Ctr_italic			"Kaldkiri">
+<!ENTITY Ctr_underlined		"Allajoonitud">
 <!ENTITY Ctr_notabhov		"Valitud sätted tühistavad 'osutatud' sätted">
 <!ENTITY Ctr_tabc_act_tb	"Tööriistaribade taustavärv">
 
@@ -268,7 +269,7 @@
 <!ENTITY Ctr_autocomplete	"Automaatlõpetamise hüpik">
 <!ENTITY Ctr_altautocompl	"Alternatiivne välimus">
 <!ENTITY Ctr_autocompl_it	"Eemalda kirjed 'Otsi otsingumootoriga...' ja 'Külasta' (kui on)">
-<!ENTITY Ctr_autocompl_hl	"Tabamuste märgistamine: paks ja allajoonitud tekst">
+<!ENTITY Ctr_autocompl_hl	"Tabamuste märgistamine">
 <!ENTITY Ctr_autocompl_sep	"Näita tulemuste vahel eraldusjooni">
 <!ENTITY Ctr_urlbar_uc		"Keela ühtse automaatlõpetamise funktsioon 'unified autocomplete'">
 <!ENTITY Ctr_lbsugresi		"Keela kõrguse piirang">
diff --git a/xpi/locale/fr/options.dtd b/xpi/locale/fr/options.dtd
index 4519cd3..aab974d 100644
--- a/xpi/locale/fr/options.dtd
+++ b/xpi/locale/fr/options.dtd
@@ -232,6 +232,7 @@
 <!ENTITY Ctr_ntabhov		"Nouvel onglet survolé">
 <!ENTITY Ctr_bold			"Gras">
 <!ENTITY Ctr_italic			"Italique">
+<!ENTITY Ctr_underlined		"Underlined">
 <!ENTITY Ctr_notabhov		"Les paramètres activés supplantent les paramètres « Survolé »">
 <!ENTITY Ctr_tabc_act_tb	"Couleur d'arrière-plan pour les barres d'outils">
 
@@ -269,7 +270,7 @@
 <!ENTITY Ctr_autocomplete	"Fenêtre surgissante d'autocomplétion">
 <!ENTITY Ctr_altautocompl	"Apparence alternative">
 <!ENTITY Ctr_autocompl_it	"Remove 'Search with...' and 'Visit' items (if present)">
-<!ENTITY Ctr_autocompl_hl	"Marking of hits: Bold and Underlined">
+<!ENTITY Ctr_autocompl_hl	"Highlighting of text hits">
 <!ENTITY Ctr_autocompl_sep	"Show separator between results">
 <!ENTITY Ctr_lbsugresi		"Désactiver la limite de hauteur">
 <!ENTITY Ctr_lbsugres		"Nombre de résultats :">
diff --git a/xpi/locale/hsb/options.dtd b/xpi/locale/hsb/options.dtd
index 8022345..e1df7c3 100644
--- a/xpi/locale/hsb/options.dtd
+++ b/xpi/locale/hsb/options.dtd
@@ -232,6 +232,7 @@
 <!ENTITY Ctr_ntabhov		"Nowy rajtark (hover)">
 <!ENTITY Ctr_bold			"Tučny">
 <!ENTITY Ctr_italic			"Kursiwny">
+<!ENTITY Ctr_underlined		"Underlined">
 <!ENTITY Ctr_notabhov		"Zmóžnjene nastajenja přepisuja 'hover-nastajenja'">
 <!ENTITY Ctr_tabc_act_tb	"Pozadkowa barba na symbolowych lajstach">
 
@@ -268,7 +269,7 @@
 <!ENTITY Ctr_autocomplete	"Wuskakowace wokno awtowudospołnjenja">
 <!ENTITY Ctr_altautocompl	"Alternatiwny napohlad">
 <!ENTITY Ctr_autocompl_it	"Remove 'Search with...' and 'Visit' items (if present)">
-<!ENTITY Ctr_autocompl_hl	"Marking of hits: Bold and Underlined">
+<!ENTITY Ctr_autocompl_hl	"Highlighting of text hits">
 <!ENTITY Ctr_autocompl_sep	"Show separator between results">
 <!ENTITY Ctr_urlbar_uc		"Funkciju 'Zjednoćene awtowudospołnjenje' znjemóžnić">
 <!ENTITY Ctr_lbsugresi		"Limit wysokosće znjemóžnić">
diff --git a/xpi/locale/it/options.dtd b/xpi/locale/it/options.dtd
index 06f1a8f..68dc296 100644
--- a/xpi/locale/it/options.dtd
+++ b/xpi/locale/it/options.dtd
@@ -232,6 +232,7 @@
 <!ENTITY Ctr_ntabhov		"Nuova scheda al passaggio del mouse">
 <!ENTITY Ctr_bold			"Grassetto">
 <!ENTITY Ctr_italic			"Corsivo">
+<!ENTITY Ctr_underlined		"Underlined">
 <!ENTITY Ctr_notabhov		"Le impostazioni attivate prevalgono su quelle del passaggio del mouse">
 <!ENTITY Ctr_tabc_act_tb	"Colore di sfondo delle barre degli strumenti">
 
@@ -268,7 +269,7 @@
 <!ENTITY Ctr_autocomplete	"Completamento automatico">
 <!ENTITY Ctr_altautocompl	"Aspetto alternativo">
 <!ENTITY Ctr_autocompl_it	"Remove 'Search with...' and 'Visit' items (if present)">
-<!ENTITY Ctr_autocompl_hl	"Marking of hits: Bold and Underlined">
+<!ENTITY Ctr_autocompl_hl	"Highlighting of text hits">
 <!ENTITY Ctr_autocompl_sep	"Show separator between results">
 <!ENTITY Ctr_urlbar_uc		"Disattiva il completamento automatico">
 <!ENTITY Ctr_lbsugresi		"Disattiva il limite di altezza">
diff --git a/xpi/locale/ja/options.dtd b/xpi/locale/ja/options.dtd
index 3a9fcf5..66db461 100644
--- a/xpi/locale/ja/options.dtd
+++ b/xpi/locale/ja/options.dtd
@@ -232,6 +232,7 @@
 <!ENTITY Ctr_ntabhov		"新しいタブ (hover)">
 <!ENTITY Ctr_bold			"太字">
 <!ENTITY Ctr_italic			"斜体">
+<!ENTITY Ctr_underlined		"Underlined">
 <!ENTITY Ctr_notabhov		"hover の設定を上書きする">
 <!ENTITY Ctr_tabc_act_tb	"ツールバーに背景色をつける">
 
@@ -268,8 +269,8 @@
 <!ENTITY Ctr_autocomplete	"自動補完リスト">
 <!ENTITY Ctr_altautocompl	"替わりの補完候補機能で置き換える">
 <!ENTITY Ctr_autocompl_it	"「…で検索」と「…を開く」を表示しない (可能ならば)">
-<!ENTITY Ctr_autocompl_hl	"一致部分を太字と下線で表示する">
-<!ENTITY Ctr_autocompl_sep	"Show separator between results">
+<!ENTITY Ctr_autocompl_hl	"Highlighting of text hits">
+<!ENTITY Ctr_autocompl_sep	"結果を境界線で区切る">
 <!ENTITY Ctr_urlbar_uc		"検索候補機能を統合しない">
 <!ENTITY Ctr_lbsugresi		"候補数を制限しない">
 <!ENTITY Ctr_lbsugres		"候補の表示数">
diff --git a/xpi/locale/pl/options.dtd b/xpi/locale/pl/options.dtd
index 9819c69..8a33ae1 100644
--- a/xpi/locale/pl/options.dtd
+++ b/xpi/locale/pl/options.dtd
@@ -232,6 +232,7 @@
 <!ENTITY Ctr_ntabhov		"Nowa karta najechana">
 <!ENTITY Ctr_bold			"Pogrubiona">
 <!ENTITY Ctr_italic			"Kursywa">
+<!ENTITY Ctr_underlined		"Podkreślone">
 <!ENTITY Ctr_notabhov		"Włączone ustawienia nie uwzględniają ustawień 'najechania'">
 <!ENTITY Ctr_tabc_act_tb	"Kolor tła na paskach narzędzi">
 
@@ -268,8 +269,8 @@
 <!ENTITY Ctr_autocomplete	"Menu podręczne autouzupełniania">
 <!ENTITY Ctr_altautocompl	"Alternatywny wygląd">
 <!ENTITY Ctr_autocompl_it	"Usuń elementy 'szukaj w...' oraz 'otwórz stronę' (jeżeli obecne)">
-<!ENTITY Ctr_autocompl_hl	"Znakowanie wystąpień: pogrubione i podkreślone">
-<!ENTITY Ctr_autocompl_sep	"Show separator between results">
+<!ENTITY Ctr_autocompl_hl	"Znakowanie wystąpień">
+<!ENTITY Ctr_autocompl_sep	"Pokaż separator pomiędzy wynikami">
 <!ENTITY Ctr_urlbar_uc		"Wyłącz funkcję 'ujednolicone autouzupełnianie'">
 <!ENTITY Ctr_lbsugresi		"Wyłącz ograniczenie wysokości">
 <!ENTITY Ctr_lbsugres		"Liczba wyników">
diff --git a/xpi/locale/pt-BR/options.dtd b/xpi/locale/pt-BR/options.dtd
index ef7714c..30d79a6 100644
--- a/xpi/locale/pt-BR/options.dtd
+++ b/xpi/locale/pt-BR/options.dtd
@@ -232,6 +232,7 @@
 <!ENTITY Ctr_ntabhov		"Nova Aba (Flutuante)">
 <!ENTITY Ctr_bold			"Negrito">
 <!ENTITY Ctr_italic			"Itálico">
+<!ENTITY Ctr_underlined		"Underlined">
 <!ENTITY Ctr_notabhov		"As Configurações Habilitadas Substituirão as Configurações 'Flutuantes'">
 <!ENTITY Ctr_tabc_act_tb	"Cor de Fundo nas Barras de Ferramentas">
 
@@ -268,7 +269,7 @@
 <!ENTITY Ctr_autocomplete	"Autocomplete popup">
 <!ENTITY Ctr_altautocompl	"Alternative appearance">
 <!ENTITY Ctr_autocompl_it	"Remove 'Search with...' and 'Visit' items (if present)">
-<!ENTITY Ctr_autocompl_hl	"Marking of hits: Bold and Underlined">
+<!ENTITY Ctr_autocompl_hl	"Highlighting of text hits">
 <!ENTITY Ctr_autocompl_sep	"Show separator between results">
 <!ENTITY Ctr_urlbar_uc		"Disable 'unified autocomplete' feature">
 <!ENTITY Ctr_lbsugresi		"Disable height limit">
diff --git a/xpi/locale/ru/options.dtd b/xpi/locale/ru/options.dtd
index 2feeaf1..d2a0a04 100644
--- a/xpi/locale/ru/options.dtd
+++ b/xpi/locale/ru/options.dtd
@@ -232,6 +232,7 @@
 <!ENTITY Ctr_ntabhov		"Ожидающая новая вкладка">
 <!ENTITY Ctr_bold			"Полужирный">
 <!ENTITY Ctr_italic			"Курсив">
+<!ENTITY Ctr_underlined		"Underlined">
 <!ENTITY Ctr_notabhov		"Включение настройки не учитывает параметры «в ожидании»">
 <!ENTITY Ctr_tabc_act_tb	"Цвет фона панели инструментов">
 
@@ -268,7 +269,7 @@
 <!ENTITY Ctr_autocomplete	"Автозаполнение">
 <!ENTITY Ctr_altautocompl	"Альтернативный внешний вид">
 <!ENTITY Ctr_autocompl_it	"Удалить пункты «Искать в...» и «Посетить» (при наличии)">
-<!ENTITY Ctr_autocompl_hl	"Marking of hits: Bold and Underlined">
+<!ENTITY Ctr_autocompl_hl	"Highlighting of text hits">
 <!ENTITY Ctr_autocompl_sep	"Show separator between results">
 <!ENTITY Ctr_urlbar_uc		"Отключить функцию «автозаполнение»">
 <!ENTITY Ctr_lbsugresi		"Отключить ограничение по высоте">
diff --git a/xpi/locale/sl/options.dtd b/xpi/locale/sl/options.dtd
index fdc2e5d..da69ed7 100644
--- a/xpi/locale/sl/options.dtd
+++ b/xpi/locale/sl/options.dtd
@@ -232,6 +232,7 @@
 <!ENTITY Ctr_ntabhov		"Nov zavihek ob prehodu z miško">
 <!ENTITY Ctr_bold			"Krepko">
 <!ENTITY Ctr_italic			"Ležeče">
+<!ENTITY Ctr_underlined		"Podčrtano">
 <!ENTITY Ctr_notabhov		"Omogočene nastavitve preglasijo nastavitve 'ob prehodu z miško'">
 <!ENTITY Ctr_tabc_act_tb	"Barva ozadja na orodnih vrsticah">
 
@@ -268,7 +269,7 @@
 <!ENTITY Ctr_autocomplete	"Pojavno okno samodokončevanja">
 <!ENTITY Ctr_altautocompl	"Nadomestni videz">
 <!ENTITY Ctr_autocompl_it	"Odstrani predmeta 'Išči s/z …' in 'Obišči' (če sta prisotna)">
-<!ENTITY Ctr_autocompl_hl	"Označevanje zadetkov: krepko in podčrtano">
+<!ENTITY Ctr_autocompl_hl	"Označevanje zadetkov">
 <!ENTITY Ctr_autocompl_sep	"Prikaži ločilo med rezultati">
 <!ENTITY Ctr_urlbar_uc		"Onemogoči značilnost 'poenotenega samodokončevanja'">
 <!ENTITY Ctr_lbsugresi		"Onemogoči omejitev višine">
diff --git a/xpi/locale/tr/options.dtd b/xpi/locale/tr/options.dtd
index 11a7284..628742a 100644
--- a/xpi/locale/tr/options.dtd
+++ b/xpi/locale/tr/options.dtd
@@ -232,6 +232,7 @@
 <!ENTITY Ctr_ntabhov		"Yeni sekme (duraksamış)">
 <!ENTITY Ctr_bold			"Kalın">
 <!ENTITY Ctr_italic			"İtalik">
+<!ENTITY Ctr_underlined		"Underlined">
 <!ENTITY Ctr_notabhov		"Enabled settings override 'hovered' settings">
 <!ENTITY Ctr_tabc_act_tb	"Araç çubukları üzerinde arka plan rengi">
 
@@ -268,7 +269,7 @@
 <!ENTITY Ctr_autocomplete	"Autocomplete popup">
 <!ENTITY Ctr_altautocompl	"Alternative appearance">
 <!ENTITY Ctr_autocompl_it	"Remove 'Search with...' and 'Visit' items (if present)">
-<!ENTITY Ctr_autocompl_hl	"Marking of hits: Bold and Underlined">
+<!ENTITY Ctr_autocompl_hl	"Highlighting of text hits">
 <!ENTITY Ctr_autocompl_sep	"Show separator between results">
 <!ENTITY Ctr_urlbar_uc		"Disable 'unified autocomplete' feature">
 <!ENTITY Ctr_lbsugresi		"Disable height limit">
diff --git a/xpi/locale/uk/options.dtd b/xpi/locale/uk/options.dtd
index d98d5dd..664a3ea 100644
--- a/xpi/locale/uk/options.dtd
+++ b/xpi/locale/uk/options.dtd
@@ -232,6 +232,7 @@
 <!ENTITY Ctr_ntabhov		"Нова вкладка (в очікуванні)">
 <!ENTITY Ctr_bold			"Жирний">
 <!ENTITY Ctr_italic			"Курсив">
+<!ENTITY Ctr_underlined		"Underlined">
 <!ENTITY Ctr_notabhov		"Увімкнені налаштування скасовують налаштування «в очікуванні»">
 <!ENTITY Ctr_tabc_act_tb	"Колір тла на панелях">
 
@@ -268,7 +269,7 @@
 <!ENTITY Ctr_autocomplete	"Спливаюче вікно автозаповнення">
 <!ENTITY Ctr_altautocompl	"Альтернативний вигляд">
 <!ENTITY Ctr_autocompl_it	"Remove 'Search with...' and 'Visit' items (if present)">
-<!ENTITY Ctr_autocompl_hl	"Marking of hits: Bold and Underlined">
+<!ENTITY Ctr_autocompl_hl	"Highlighting of text hits">
 <!ENTITY Ctr_autocompl_sep	"Show separator between results">
 <!ENTITY Ctr_urlbar_uc		"Вимкнути функцію «автозаповнення»">
 <!ENTITY Ctr_lbsugresi		"Вимкнути обмеження висоти">
diff --git a/xpi/locale/zh-CN/options.dtd b/xpi/locale/zh-CN/options.dtd
index 07f20b4..236ca97 100644
--- a/xpi/locale/zh-CN/options.dtd
+++ b/xpi/locale/zh-CN/options.dtd
@@ -232,6 +232,7 @@
 <!ENTITY Ctr_ntabhov		"悬停新标签页">
 <!ENTITY Ctr_bold			"加粗">
 <!ENTITY Ctr_italic			"斜体">
+<!ENTITY Ctr_underlined		"Underlined">
 <!ENTITY Ctr_notabhov		"启用设置覆盖“悬停”设置">
 <!ENTITY Ctr_tabc_act_tb	"工具栏使用背景色">
 
@@ -268,7 +269,7 @@
 <!ENTITY Ctr_autocomplete	"自动完成弹出框">
 <!ENTITY Ctr_altautocompl	"备选的外观">
 <!ENTITY Ctr_autocompl_it	"移除 “使用...搜索” 和 “访问” 项目 (如果存在的话)">
-<!ENTITY Ctr_autocompl_hl	"Marking of hits: Bold and Underlined">
+<!ENTITY Ctr_autocompl_hl	"Highlighting of text hits">
 <!ENTITY Ctr_autocompl_sep	"Show separator between results">
 <!ENTITY Ctr_urlbar_uc		"禁用 “统一自动完成” 功能">
 <!ENTITY Ctr_lbsugresi		"禁用高度限制">
diff --git a/xpi/locale/zh-TW/options.dtd b/xpi/locale/zh-TW/options.dtd
index 2bc4b8b..33b0a34 100644
--- a/xpi/locale/zh-TW/options.dtd
+++ b/xpi/locale/zh-TW/options.dtd
@@ -232,6 +232,7 @@
 <!ENTITY Ctr_ntabhov		"新分頁 (懸停)">
 <!ENTITY Ctr_bold			"粗體">
 <!ENTITY Ctr_italic			"斜體">
+<!ENTITY Ctr_underlined		"Underlined">
 <!ENTITY Ctr_notabhov		"優先權高於「分頁(懸停)」的設定">
 <!ENTITY Ctr_tabc_act_tb	"將目前分頁的背景顏色套用到工具列上">
 
@@ -268,7 +269,7 @@
 <!ENTITY Ctr_autocomplete	"Autocomplete popup">
 <!ENTITY Ctr_altautocompl	"Alternative appearance">
 <!ENTITY Ctr_autocompl_it	"Remove 'Search with...' and 'Visit' items (if present)">
-<!ENTITY Ctr_autocompl_hl	"Marking of hits: Bold and Underlined">
+<!ENTITY Ctr_autocompl_hl	"Highlighting of text hits">
 <!ENTITY Ctr_autocompl_sep	"Show separator between results">
 <!ENTITY Ctr_urlbar_uc		"Disable 'unified autocomplete' feature">
 <!ENTITY Ctr_lbsugresi		"Disable height limit">