1.5.5beta3

<b>[general change(s)]</b>
- CTR prefwindow: added 'Support' button with links to forums and Github
- increased delay for applying 'alt. bg color for panel menu popups'
option

<b>[add-on compatibility]</b>
- CTR prefwindow: additional note for 'Add-on Compatibility Reporter'
users

24 files changed, 186 insertions, 64 deletions

diff --git a/xpi/content/options.js b/xpi/content/options.js
index d55fdff..e7c02ba 100644
--- a/xpi/content/options.js
+++ b/xpi/content/options.js
@@ -135,13 +135,13 @@ classicthemerestorerjso.ctr = {
 		document.getElementById('ctraddon_pw_ib_nohovcolor').style.visibility = 'collapse';
 		document.getElementById('ctraddon_pw_altreaderico').style.visibility = 'collapse';
 	} else {
-		document.getElementById('ctraddon_pw_special_info2').style.visibility = 'collapse';
+		document.getElementById('ctraddon_pw_themes_note').style.visibility = 'collapse';
 		document.getElementById('ctraddon_pw_special_font').style.visibility = 'collapse';
 		document.getElementById('ctraddon_pw_tabforminfo').style.visibility = 'collapse';
 		document.getElementById('ctraddon_altoptions_list2').style.visibility = 'collapse';
 	};
 
-	//ColorfulTabs info label
+	// ColorfulTabs info label
 	document.getElementById('ctraddon_coltabsinfo').style.visibility = 'collapse';
 
 	// radio restart label
@@ -160,6 +160,9 @@ classicthemerestorerjso.ctr = {
 	// 'Tabs on bottom' add-ons
 	document.getElementById('ctraddon_tobinfotab').style.visibility = 'collapse';
 	
+	// Add-on comaptibiliy reporter note
+	document.getElementById('ctraddon_pw_acr_note').style.visibility = 'collapse';
+	
 	// extra checks to not enable tab width settings while 'TabMixPlus' or 'TabUtilities' is enabled
 	AddonManager.getAddonByID('{dc572301-7619-498c-a57d-39143191b318}', function(addon) {
 	  if(addon && addon.isActive) {
@@ -345,6 +348,26 @@ classicthemerestorerjso.ctr = {
 	   }
 	};
 	AddonManager.addAddonListener(TOB2Listener);
+	
+	// 'Add-on comaptibiliy reporter' note
+	AddonManager.getAddonByID('compatibility@addons.mozilla.org', function(addon) {
+	  if(addon && addon.isActive) {
+		document.getElementById('ctraddon_pw_acr_note').style.visibility = 'visible';
+	  }
+	});
+	var ACRListener = {
+	   onEnabled: function(addon) {
+		  if(addon.id == 'compatibility@addons.mozilla.org') {
+			document.getElementById('ctraddon_pw_acr_note').style.visibility = 'visible';
+		  }
+	   },
+	   onDisabled: function(addon) {
+		  if(addon.id == 'compatibility@addons.mozilla.org') {
+			document.getElementById('ctraddon_pw_acr_note').style.visibility = 'collapse';
+		  }
+	   }
+	};
+	AddonManager.addAddonListener(ACRListener);
 
 	// disable bookmark animation checkbox, if 'star button in urlbar' is used
 	if (this.prefs.getBoolPref('starinurl')) document.getElementById('ctraddon_pw_bmanimation').disabled = true;
diff --git a/xpi/content/options.xul b/xpi/content/options.xul
index d5939ca..4d34502 100644
--- a/xpi/content/options.xul
+++ b/xpi/content/options.xul
@@ -1498,11 +1498,13 @@
   </deck>
 </hbox>
 
-  <hbox flex="1" id="ctraddon_pw_special_info2">
-	<spacer flex="1" />
+  <vbox id="ctraddon_pw_themes_note" align="center">
 	<description class="ctraddon_topic">&Ctr_special_info2;</description>
-	<spacer flex="1" />
-  </hbox>
+  </vbox>
+  
+  <vbox id="ctraddon_pw_acr_note" align="center">
+	<description class="ctraddon_topic">&Ctr_special_acr;</description>
+  </vbox>
 
   <popupset>
 	<menupopup id="ctr_pw_settingsPopup" position="before_start">
@@ -1522,12 +1524,23 @@
 	</menupopup>
   </popupset>
   
-  <hbox align="center" flex="1" style="padding-top:5px;">
+  <popupset>
+	<menupopup id="ctr_pw_supportPopup" position="before_end">
+		<menuitem class="menuitem-iconic" label="&Ctr_newversion;" id="ctraddon_newversion" onclick="if(event.button == 0) { window.close(); window.opener.openURL('https://addons.mozilla.org/addon/classicthemerestorer/versions/'); };"/>
+		<menuseparator/>
+		<menuitem class="menuitem-iconic" label="&Ctr_support_forum1;" id="ctr_pw_support_forum1" onclick="if(event.button == 0) { window.close(); window.opener.openURL('http://forums.mozillazine.org/viewtopic.php?t=2827985'); };"/>
+		<menuitem class="menuitem-iconic" label="&Ctr_support_forum2;" id="ctr_pw_support_forum2" onclick="if(event.button == 0) { window.close(); window.opener.openURL('https://www.camp-firefox.de/forum/viewtopic.php?t=108235'); };"/>
+		<menuitem class="menuitem-iconic" label="&Ctr_github_issues;" id="ctr_pw_support_git" onclick="if(event.button == 0) { window.close(); window.opener.openURL('https://github.com/Aris-t2/ClassicThemeRestorer/issues'); };"/>
+		<menuseparator/>
+		<menuitem class="menuitem-iconic" label="aris-addons [@] gmx [.] net" id="ctr_pw_em_con"/>
+	</menupopup>
+  </popupset>
+  
+  <hbox align="center" style="padding-top:5px;">
     <button label="&Ctr_pw_settings;" popup="ctr_pw_settingsPopup"/>
 	<button label="Classic Toolbar Buttons" class="ctraddon_windowsonly" onclick="if(event.button == 0) { window.close(); window.opener.openURL('https://addons.mozilla.org/addon/cstbb/versions/'); };"/>
 	<spacer flex="1" />
-	<button label="&Ctr_support;" id="ctraddon_support" onclick="if(event.button == 0) { window.close(); window.opener.openURL('http://forums.mozillazine.org/viewtopic.php?t=2827985'); };"/>
-	<button label="&Ctr_newversion;" id="ctraddon_newversion" onclick="if(event.button == 0) { window.close(); window.opener.openURL('https://addons.mozilla.org/addon/classicthemerestorer/versions/'); };"/>
+	<button label="&Ctr_support;" id="ctraddon_support"  popup="ctr_pw_supportPopup"/>
 	<button dlgtype="accept" id="ctraddon_pw_okbutton"/>
   </hbox> 
 
diff --git a/xpi/content/overlay.js b/xpi/content/overlay.js
index bbd324d..9a9f4f6 100644
--- a/xpi/content/overlay.js
+++ b/xpi/content/overlay.js
@@ -2067,14 +2067,20 @@ classicthemerestorerjs.ctr = {
 			if (branch.getBoolPref("bmbutpanelm")) {
 			  classicthemerestorerjs.ctr.loadUnloadCSS("bmbutpanelm",true);
 			}
-			else classicthemerestorerjs.ctr.loadUnloadCSS("bmbutpanelm",false);
-			  
-			if (branch.getBoolPref("panelmenucol")) {
-			  branch.setBoolPref("panelmenucol",false);
-			  setTimeout(function(){
-				branch.setBoolPref("panelmenucol",true);
-			  },1000);
+			else {
+			  classicthemerestorerjs.ctr.loadUnloadCSS("bmbutpanelm",false);
 			}
+			  
+			setTimeout(function(){
+			
+			  if (branch.getBoolPref("panelmenucol")) {
+				branch.setBoolPref("panelmenucol",false);
+				setTimeout(function(){
+				  branch.setBoolPref("panelmenucol",true);
+				},1500);
+			  }
+			},1500);
+
 		  break;
 
 		  case "bmbunsortbm": case "bmbunsortbm2":
diff --git a/xpi/install.rdf b/xpi/install.rdf
index 9caa2ac..a894924 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.5beta2</em:version>
+		<em:version>1.5.5beta3</em:version>
 		<em:type>2</em:type>
 		<em:multiprocessCompatible>true</em:multiprocessCompatible>
 
@@ -15,11 +15,11 @@
 			<Description>
 				<em:id>{ec8030f7-c20a-464f-9b0e-13a3a9e97384}</em:id>
 				<em:minVersion>45.0</em:minVersion>
-				<em:maxVersion>50.0</em:maxVersion>
+				<em:maxVersion>51.0</em:maxVersion>
 			</Description>
 		</em:targetApplication>
 
-		<em:description>'Classic Theme Restorer' brings back appmenu button, squared tabs, add-ons bar, small nav-bar buttons, a few older buttons and more to Firefox Australis UI. Use 'Customize' menu to move buttons on toolbars.</em:description>
+		<em:description>'Classic Theme Restorer' restores many customization features Firefox lost over time like old 'Firefox'-button, squared tabs, add-ons bar, small navigation bar buttons, old search, old preference window, old location bar menu, eye-friendly add-ons manager, old buttons and many more.</em:description>
 		<em:homepageURL>https://addons.mozilla.org/addon/classicthemerestorer/</em:homepageURL>
 		<em:creator>Aris</em:creator>
 		
@@ -61,7 +61,7 @@
 			<Description>
 				<em:name>Classic Theme Restorer</em:name>
 				<em:locale>cs</em:locale>
-				<em:description>'Classic Theme Restorer' restores appmenu button, squared tabs, add-ons bar, small nav-bar buttons, other buttons and more. Use 'Customize' menu to move buttons on toolbars.</em:description>
+				<em:description>'Classic Theme Restorer' restores many customization features Firefox lost over time like old 'Firefox'-button, squared tabs, add-ons bar, small navigation bar buttons, old search, old preference window, old location bar menu, eye-friendly add-ons manager, old buttons and many more.</em:description>
 				<em:translator>MichalS (cs) - Czech</em:translator>
 			</Description>
 		</em:localized>
@@ -79,7 +79,7 @@
 			<Description>
 				<em:name>Classic Theme Restorer</em:name>
 				<em:locale>de</em:locale>
-				<em:description>'Classic Theme Restorer' stellt bekannte Elemente wie die Firefox-Menüschaltfläche, quadratische Tabs, Add-on-Leiste, kleine Schaltflächenansicht und einige Schaltflächen wieder her. Über das 'Anpassen'-Menü lassen sich Buttons auf Leisten verschieben.</em:description>
+				<em:description>'Classic Theme Restorer' stellt viele aus älteren Firefoxversionen bekannte Elemente wieder her, die Firefox mit der Zeit verloren hat (u.a. Firefox-Menüschaltfläche, quadratische Tabs, Add-on-Leiste, kleine Schaltflächenansicht, alte Suche, altes Einstellungsfenster, altes Adressleistenmenü, augenfreundlicher Add-ons-Manager, alte Schaltflächen und vieles mehr).</em:description>
 			</Description>
 		</em:localized>
 		
@@ -92,7 +92,7 @@
 			</Description>
 		</em:localized>
 		
-		<em:localized><!-- Greek -->
+		<em:localized>
 			<Description>
 				<em:name>Classic Theme Restorer</em:name>
 				<em:locale>el</em:locale>
@@ -204,7 +204,7 @@
 			<Description>
 				<em:name>Classic Theme Restorer</em:name>
 				<em:locale>tr</em:locale>
-				<em:description>'Classic Theme Restorer' restores appmenu button, squared tabs, add-ons bar, small nav-bar buttons, other buttons and more. Use 'Customize' menu to move buttons on toolbars.</em:description>
+				<em:description>'Classic Theme Restorer' restores many customization features Firefox lost over time like old 'Firefox'-button, squared tabs, add-ons bar, small navigation bar buttons, old search, old preference window, old location bar menu, eye-friendly add-ons manager, old buttons and many more.</em:description>
 				<em:translator>Bekir Uçarci (tr) - Turkish</em:translator>
 			</Description>
 		</em:localized>
@@ -213,7 +213,7 @@
 			<Description>
 				<em:name>Classic Theme Restorer</em:name>
 				<em:locale>uk</em:locale>
-				<em:description>'Classic Theme Restorer' restores appmenu button, squared tabs, add-ons bar, small nav-bar buttons, other buttons and more. Use 'Customize' menu to move buttons on toolbars.</em:description>
+				<em:description>'Classic Theme Restorer' restores many customization features Firefox lost over time like old 'Firefox'-button, squared tabs, add-ons bar, small navigation bar buttons, old search, old preference window, old location bar menu, eye-friendly add-ons manager, old buttons and many more.</em:description>
 				<em:translator>Sacredwheels (uk) - Ukrainian</em:translator>
 			</Description>
 		</em:localized>
diff --git a/xpi/locale/cs/options.dtd b/xpi/locale/cs/options.dtd
index 8eddb0a..f5d7fda 100644
--- a/xpi/locale/cs/options.dtd
+++ b/xpi/locale/cs/options.dtd
@@ -385,8 +385,12 @@
 <!ENTITY Ctr_special_font	"Nastavení pozadí ovlivní pouze výchozí vzhled!">
 <!ENTITY Ctr_special_info	"Některé volby nemusí vzhled vůbec ovlivnit">
 <!ENTITY Ctr_special_info2	"Možnosti jsou pro výchozí vzhled &brandShortName; a nemusí fungovat s jinými nainstalovanými vzhledy!">
-<!ENTITY Ctr_support		"Fórum podpory">
-<!ENTITY Ctr_newversion		"Nová verze?">
+<!ENTITY Ctr_special_acr	"Only report issues through official support channels and not by using 'Add-on Compatibility Reporter'!">
+<!ENTITY Ctr_support		"Support">
+<!ENTITY Ctr_support_forum1	"MozillaZine (English forum)">
+<!ENTITY Ctr_support_forum2	"Camp Firefox (German forum)">
+<!ENTITY Ctr_github_issues	"Report issue on Github">
+<!ENTITY Ctr_newversion		"Check for new version">
 
 <!ENTITY Ctr_addon-bar.accesskey		"D">
 <!ENTITY appMenuGettingStarted.label	"Začínáme">
diff --git a/xpi/locale/da/options.dtd b/xpi/locale/da/options.dtd
index 2c92970..d1a2734 100644
--- a/xpi/locale/da/options.dtd
+++ b/xpi/locale/da/options.dtd
@@ -385,8 +385,12 @@
 <!ENTITY Ctr_special_font	"Indstillinger til baggrundsfarve gælder kun til standard tema!">
 <!ENTITY Ctr_special_info	"Nogle indstillinger giver måske ikke altid synlige ændringer">
 <!ENTITY Ctr_special_info2	"Indstillinger foretages til &brandShortName; standard tema og virker måske ikke med alle tredjeparts temaer!">
-<!ENTITY Ctr_support		"Supportforum">
-<!ENTITY Ctr_newversion		"Ny version?">
+<!ENTITY Ctr_special_acr	"Only report issues through official support channels and not by using 'Add-on Compatibility Reporter'!">
+<!ENTITY Ctr_support		"Support">
+<!ENTITY Ctr_support_forum1	"MozillaZine (English forum)">
+<!ENTITY Ctr_support_forum2	"Camp Firefox (German forum)">
+<!ENTITY Ctr_github_issues	"Report issue on Github">
+<!ENTITY Ctr_newversion		"Check for new version">
 
 <!ENTITY Ctr_addon-bar.accesskey		"A">
 <!ENTITY appMenuGettingStarted.label	"Kom i gang">
diff --git a/xpi/locale/de/options.dtd b/xpi/locale/de/options.dtd
index cdff96e..b40d962 100644
--- a/xpi/locale/de/options.dtd
+++ b/xpi/locale/de/options.dtd
@@ -385,8 +385,12 @@
 <!ENTITY Ctr_special_font	"Hintergrundfarbeinstellungen sind nur für das Standard-Thema vorhanden!">
 <!ENTITY Ctr_special_info	"Einige Optionen haben nur in bestimmten Fällen sichtbare Auswirkungen!">
 <!ENTITY Ctr_special_info2	"Vollständiges 'Thema' erkannt! Einige Einstellungen funktionieren nicht mit Themen!">
-<!ENTITY Ctr_support		"Hilfe-Forum">
-<!ENTITY Ctr_newversion		"Neue Version?">
+<!ENTITY Ctr_special_acr	"Probleme nur über offizielle Hilfskanäle melden und nicht über 'Add-on Compatibility Reporter'!">
+<!ENTITY Ctr_support		"Hilfe">
+<!ENTITY Ctr_support_forum1	"MozillaZine (Englisches Forum)">
+<!ENTITY Ctr_support_forum2	"Camp Firefox (Deutsches Forum)">
+<!ENTITY Ctr_github_issues	"Problem melden auf Github">
+<!ENTITY Ctr_newversion		"Neue Version suchen">
 
 <!ENTITY Ctr_addon-bar.accesskey		"A">
 <!ENTITY appMenuGettingStarted.label	"Erste Schritte">
diff --git a/xpi/locale/dsb/options.dtd b/xpi/locale/dsb/options.dtd
index 9e876cc..746f97b 100644
--- a/xpi/locale/dsb/options.dtd
+++ b/xpi/locale/dsb/options.dtd
@@ -385,8 +385,12 @@
 <!ENTITY Ctr_special_font	"Nastajenja za slězynowu barwu su jano za standardnu drastwu!">
 <!ENTITY Ctr_special_info	"Někotare nastajenja njepóbituju wizuelne změny we wšych padach!">
 <!ENTITY Ctr_special_info2	"Drastwa tśeśego póbitowarja jo se namakała! Někotare nastajenja njefunkcioněruju z drastwami tśeśich póbitowarjow!">
-<!ENTITY Ctr_support		"Pódpěrowański forum">
-<!ENTITY Ctr_newversion		"Nowa wersija?">
+<!ENTITY Ctr_special_acr	"Only report issues through official support channels and not by using 'Add-on Compatibility Reporter'!">
+<!ENTITY Ctr_support		"Support">
+<!ENTITY Ctr_support_forum1	"MozillaZine (English forum)">
+<!ENTITY Ctr_support_forum2	"Camp Firefox (German forum)">
+<!ENTITY Ctr_github_issues	"Report issue on Github">
+<!ENTITY Ctr_newversion		"Check for new version">
 
 <!ENTITY Ctr_addon-bar.accesskey		"R">
 <!ENTITY appMenuGettingStarted.label	"Prědne kšace">
diff --git a/xpi/locale/el/options.dtd b/xpi/locale/el/options.dtd
index efdad36..d625f74 100644
--- a/xpi/locale/el/options.dtd
+++ b/xpi/locale/el/options.dtd
@@ -385,8 +385,12 @@
 <!ENTITY Ctr_special_font	"Οι ρυθμίσεις χρώματος φόντου είναι για το προεπιλεγμένο θέμα μόνο!">
 <!ENTITY Ctr_special_info	"Ορισμένες επιλογές ενδέχεται να μην προσφέρουν ορατές αλλαγές σε όλες τις περιπτώσεις">
 <!ENTITY Ctr_special_info2	"Aνιχνεύθηκε θέμα τρίτων! Ορισμένες επιλογές δε λειτουργούν με θέματα τρίτων!">
-<!ENTITY Ctr_support		"Φόρουμ υποστήριξης">
-<!ENTITY Ctr_newversion		"Νέα έκδοση;">
+<!ENTITY Ctr_special_acr	"Only report issues through official support channels and not by using 'Add-on Compatibility Reporter'!">
+<!ENTITY Ctr_support		"Support">
+<!ENTITY Ctr_support_forum1	"MozillaZine (English forum)">
+<!ENTITY Ctr_support_forum2	"Camp Firefox (German forum)">
+<!ENTITY Ctr_github_issues	"Report issue on Github">
+<!ENTITY Ctr_newversion		"Check for new version">
 
 <!ENTITY Ctr_addon-bar.accesskey		"λ">
 <!ENTITY appMenuGettingStarted.label	"Ξεκινώντας">
diff --git a/xpi/locale/en-US/options.dtd b/xpi/locale/en-US/options.dtd
index 695751d..dca1b6b 100644
--- a/xpi/locale/en-US/options.dtd
+++ b/xpi/locale/en-US/options.dtd
@@ -385,8 +385,12 @@
 <!ENTITY Ctr_special_font	"Background color settings are for default theme only!">
 <!ENTITY Ctr_special_info	"Some options may not always offer visible changes">
 <!ENTITY Ctr_special_info2	"Third party theme detected! Some options do not work with third party themes!">
-<!ENTITY Ctr_support		"Support Forum">
-<!ENTITY Ctr_newversion		"New version?">
+<!ENTITY Ctr_special_acr	"Only report issues through official support channels and not by using 'Add-on Compatibility Reporter'!">
+<!ENTITY Ctr_support		"Support">
+<!ENTITY Ctr_support_forum1	"MozillaZine (English forum)">
+<!ENTITY Ctr_support_forum2	"Camp Firefox (German forum)">
+<!ENTITY Ctr_github_issues	"Report issue on Github">
+<!ENTITY Ctr_newversion		"Check for new version">
 
 <!ENTITY Ctr_addon-bar.accesskey		"A">
 <!ENTITY appMenuGettingStarted.label	"Getting started">
diff --git a/xpi/locale/es/options.dtd b/xpi/locale/es/options.dtd
index a7f4552..0ce59a9 100644
--- a/xpi/locale/es/options.dtd
+++ b/xpi/locale/es/options.dtd
@@ -385,8 +385,12 @@
 <!ENTITY Ctr_special_font	"¡Las configuraciones de color de fondo son sólo para el tema decorativo predeterminado!">
 <!ENTITY Ctr_special_info	"¡Algunas opciones podrían no ofrecer cambios visuales en todos los casos!">
 <!ENTITY Ctr_special_info2	"¡Detectado tema decorativo de terceros! ¡Algunas opciones no funcionarán con ellos!">
-<!ENTITY Ctr_support		"Foro de soporte">
-<!ENTITY Ctr_newversion		"¿Nueva versión?">
+<!ENTITY Ctr_special_acr	"Only report issues through official support channels and not by using 'Add-on Compatibility Reporter'!">
+<!ENTITY Ctr_support		"Support">
+<!ENTITY Ctr_support_forum1	"MozillaZine (English forum)">
+<!ENTITY Ctr_support_forum2	"Camp Firefox (German forum)">
+<!ENTITY Ctr_github_issues	"Report issue on Github">
+<!ENTITY Ctr_newversion		"Check for new version">
 
 <!ENTITY Ctr_addon-bar.accesskey		"C">
 <!ENTITY appMenuGettingStarted.label	"Comenzar">
diff --git a/xpi/locale/et/options.dtd b/xpi/locale/et/options.dtd
index 7767fcb..02382cd 100644
--- a/xpi/locale/et/options.dtd
+++ b/xpi/locale/et/options.dtd
@@ -385,8 +385,12 @@
 <!ENTITY Ctr_special_font	"Taustavärvi sätted on ainult vaikimisi välimuse jaoks!">
 <!ENTITY Ctr_special_info	"Mõned sätted ei pruugi alati nähtavaid muudatusi pakkuda">
 <!ENTITY Ctr_special_info2	"Tuvastati kolmanda osapoole välimus! Mõned sätted ei tööta kolmandate osapoolte välimustega!">
-<!ENTITY Ctr_support		"Kasutajatoe foorum">
-<!ENTITY Ctr_newversion		"Uus versioon?">
+<!ENTITY Ctr_special_acr	"Only report issues through official support channels and not by using 'Add-on Compatibility Reporter'!">
+<!ENTITY Ctr_support		"Support">
+<!ENTITY Ctr_support_forum1	"MozillaZine (English forum)">
+<!ENTITY Ctr_support_forum2	"Camp Firefox (German forum)">
+<!ENTITY Ctr_github_issues	"Report issue on Github">
+<!ENTITY Ctr_newversion		"Check for new version">
 
 <!ENTITY Ctr_addon-bar.accesskey		"A">
 <!ENTITY appMenuGettingStarted.label	"Alustamine">
diff --git a/xpi/locale/fr/options.dtd b/xpi/locale/fr/options.dtd
index cf76a48..454d6ef 100644
--- a/xpi/locale/fr/options.dtd
+++ b/xpi/locale/fr/options.dtd
@@ -385,8 +385,12 @@
 <!ENTITY Ctr_special_font	"La personnalisation de la couleur d'arrière-plan est réservée au thème par défaut !">
 <!ENTITY Ctr_special_info	"Certaines options peuvent ne pas toujours offrir de changements visibles.">
 <!ENTITY Ctr_special_info2	"Thème de tierce partie détecté ! Certains paramètres ne fonctionnent pas avec de tels thèmes !">
-<!ENTITY Ctr_support		"Forum d'assistance">
-<!ENTITY Ctr_newversion		"Nouvelle version ?">
+<!ENTITY Ctr_special_acr	"Only report issues through official support channels and not by using 'Add-on Compatibility Reporter'!">
+<!ENTITY Ctr_support		"Support">
+<!ENTITY Ctr_support_forum1	"MozillaZine (English forum)">
+<!ENTITY Ctr_support_forum2	"Camp Firefox (German forum)">
+<!ENTITY Ctr_github_issues	"Report issue on Github">
+<!ENTITY Ctr_newversion		"Check for new version">
 
 <!ENTITY Ctr_addon-bar.accesskey		"U">
 <!ENTITY appMenuGettingStarted.label	"Commencer">
diff --git a/xpi/locale/hsb/options.dtd b/xpi/locale/hsb/options.dtd
index 7ddb9a1..d42bb27 100644
--- a/xpi/locale/hsb/options.dtd
+++ b/xpi/locale/hsb/options.dtd
@@ -385,8 +385,12 @@
 <!ENTITY Ctr_special_font	"Nastajenja za pozadkowu barbu su jenož za standardnu drastu!">
 <!ENTITY Ctr_special_info	"Někotre nastajenja snano wizuelne změny nic we wšěch padach poskićeja!">
 <!ENTITY Ctr_special_info2	"Drasta třećeho poskićowarja je so wotkryła! Někotre nastajenja z drastami třećich poskićowarjow njefunguja!">
-<!ENTITY Ctr_support		"Podpěranski forum">
-<!ENTITY Ctr_newversion		"Nowa wersija?">
+<!ENTITY Ctr_special_acr	"Only report issues through official support channels and not by using 'Add-on Compatibility Reporter'!">
+<!ENTITY Ctr_support		"Support">
+<!ENTITY Ctr_support_forum1	"MozillaZine (English forum)">
+<!ENTITY Ctr_support_forum2	"Camp Firefox (German forum)">
+<!ENTITY Ctr_github_issues	"Report issue on Github">
+<!ENTITY Ctr_newversion		"Check for new version">
 
 <!ENTITY Ctr_addon-bar.accesskey		"d">
 <!ENTITY appMenuGettingStarted.label	"Prěnje kroki">
diff --git a/xpi/locale/it/options.dtd b/xpi/locale/it/options.dtd
index 18a1379..7fe6cd3 100644
--- a/xpi/locale/it/options.dtd
+++ b/xpi/locale/it/options.dtd
@@ -385,8 +385,12 @@
 <!ENTITY Ctr_special_font	"La modifica del colore di sfondo si applica solo utilizzando il tema predefinito!">
 <!ENTITY Ctr_special_info	"Alcune opzioni si applicano solo in casi particolari">
 <!ENTITY Ctr_special_info2	"Le impostazioni sono pensate per il tema predefinito e potrebbero non funzionare con altri temi">
-<!ENTITY Ctr_support		"Forum di supporto">
-<!ENTITY Ctr_newversion		"È disponibile una nuova versione?">
+<!ENTITY Ctr_special_acr	"Only report issues through official support channels and not by using 'Add-on Compatibility Reporter'!">
+<!ENTITY Ctr_support		"Support">
+<!ENTITY Ctr_support_forum1	"MozillaZine (English forum)">
+<!ENTITY Ctr_support_forum2	"Camp Firefox (German forum)">
+<!ENTITY Ctr_github_issues	"Report issue on Github">
+<!ENTITY Ctr_newversion		"Check for new version">
 
 <!ENTITY Ctr_addon-bar.accesskey		"B">
 <!ENTITY appMenuGettingStarted.label	"Primi passi">
diff --git a/xpi/locale/ja/options.dtd b/xpi/locale/ja/options.dtd
index b3a9319..683d217 100644
--- a/xpi/locale/ja/options.dtd
+++ b/xpi/locale/ja/options.dtd
@@ -385,8 +385,12 @@
 <!ENTITY Ctr_special_font	"背景色の設定はデフォルトテーマのみに適用されます。">
 <!ENTITY Ctr_special_info	"一部オプションは特定の条件でのみ動作します。">
 <!ENTITY Ctr_special_info2	"設定は &brandShortName; デフォルトテーマ用に作成されたもので、サードパーティのテーマで動作しない可能性があります。">
-<!ENTITY Ctr_support		"サポートフォーラム (英語)">
-<!ENTITY Ctr_newversion		"新バージョンをチェック">
+<!ENTITY Ctr_special_acr	"Only report issues through official support channels and not by using 'Add-on Compatibility Reporter'!">
+<!ENTITY Ctr_support		"Support">
+<!ENTITY Ctr_support_forum1	"MozillaZine (English forum)">
+<!ENTITY Ctr_support_forum2	"Camp Firefox (German forum)">
+<!ENTITY Ctr_github_issues	"Report issue on Github">
+<!ENTITY Ctr_newversion		"Check for new version">
 
 <!ENTITY Ctr_addon-bar.accesskey		"A">
 <!ENTITY appMenuGettingStarted.label	"入門">
diff --git a/xpi/locale/pl/options.dtd b/xpi/locale/pl/options.dtd
index 59653a4..4a634c4 100644
--- a/xpi/locale/pl/options.dtd
+++ b/xpi/locale/pl/options.dtd
@@ -385,8 +385,12 @@
 <!ENTITY Ctr_special_font	"Ustawienia koloru tła są tylko dla domyślnego motywu!">
 <!ENTITY Ctr_special_info	"Niektóre opcje mogą nie oferować widocznych zmian we wszystkich przypadkach">
 <!ENTITY Ctr_special_info2	"Wykryto motyw autorstwa osób trzecich! Niektóre opcje nie działają z motywami autorstwa osób trzecich!">
-<!ENTITY Ctr_support		"Forum wsparcia">
-<!ENTITY Ctr_newversion		"Nowa wersja?">
+<!ENTITY Ctr_special_acr	"Only report issues through official support channels and not by using 'Add-on Compatibility Reporter'!">
+<!ENTITY Ctr_support		"Support">
+<!ENTITY Ctr_support_forum1	"MozillaZine (English forum)">
+<!ENTITY Ctr_support_forum2	"Camp Firefox (German forum)">
+<!ENTITY Ctr_github_issues	"Report issue on Github">
+<!ENTITY Ctr_newversion		"Check for new version">
 
 <!ENTITY Ctr_addon-bar.accesskey		"A">
 <!ENTITY appMenuGettingStarted.label	"Pierwsze kroki">
diff --git a/xpi/locale/pt-BR/options.dtd b/xpi/locale/pt-BR/options.dtd
index b3388e6..6f4fccf 100644
--- a/xpi/locale/pt-BR/options.dtd
+++ b/xpi/locale/pt-BR/options.dtd
@@ -385,8 +385,12 @@
 <!ENTITY Ctr_special_font	"As configurações da cor do fundo são só para o tema padrão!">
 <!ENTITY Ctr_special_info	"Algumas opções podem oferecer alterações visuais só em certos casos!">
 <!ENTITY Ctr_special_info2	"As configurações são feitas para o tema padrão do &brandShortName;, e podem não funcionar com temas de terceiros!">
-<!ENTITY Ctr_support		"Forum de suporte">
-<!ENTITY Ctr_newversion		"Há uma nova versão?">
+<!ENTITY Ctr_special_acr	"Only report issues through official support channels and not by using 'Add-on Compatibility Reporter'!">
+<!ENTITY Ctr_support		"Support">
+<!ENTITY Ctr_support_forum1	"MozillaZine (English forum)">
+<!ENTITY Ctr_support_forum2	"Camp Firefox (German forum)">
+<!ENTITY Ctr_github_issues	"Report issue on Github">
+<!ENTITY Ctr_newversion		"Check for new version">
 
 <!ENTITY Ctr_addon-bar.accesskey		"A">
 <!ENTITY appMenuGettingStarted.label	"Guia rápido">
diff --git a/xpi/locale/ru/options.dtd b/xpi/locale/ru/options.dtd
index 39c7918..1f2fd50 100644
--- a/xpi/locale/ru/options.dtd
+++ b/xpi/locale/ru/options.dtd
@@ -385,8 +385,12 @@
 <!ENTITY Ctr_special_font	"Настройки цвета фона — только для темы по умолчанию!">
 <!ENTITY Ctr_special_info	"Некоторые параметры могут предложить визуальные изменения только в определённых случаях!">
 <!ENTITY Ctr_special_info2	"Настройки сделаны для темы &brandShortName; по умолчанию и не могут работать со всеми сторонними темами!">
-<!ENTITY Ctr_support		"Форум поддержки">
-<!ENTITY Ctr_newversion		"Новая версия?">
+<!ENTITY Ctr_special_acr	"Only report issues through official support channels and not by using 'Add-on Compatibility Reporter'!">
+<!ENTITY Ctr_support		"Support">
+<!ENTITY Ctr_support_forum1	"MozillaZine (English forum)">
+<!ENTITY Ctr_support_forum2	"Camp Firefox (German forum)">
+<!ENTITY Ctr_github_issues	"Report issue on Github">
+<!ENTITY Ctr_newversion		"Check for new version">
 
 <!ENTITY Ctr_addon-bar.accesskey		"A">
 <!ENTITY appMenuGettingStarted.label	"Начало работы">
diff --git a/xpi/locale/sl/options.dtd b/xpi/locale/sl/options.dtd
index f8a4daf..6bae525 100644
--- a/xpi/locale/sl/options.dtd
+++ b/xpi/locale/sl/options.dtd
@@ -385,8 +385,12 @@
 <!ENTITY Ctr_special_font	"Nastavitve barve ozadja so samo za privzeto temo!">
 <!ENTITY Ctr_special_info	"Nekatere možnosti v vseh primerih morda ne bodo povzročile vidnih sprememb">
 <!ENTITY Ctr_special_info2	"Nastavitve so narejene za &brandShortName;ovo privzeto temo in morda ne bodo delovale z vsemi temami tretjih oseb!">
-<!ENTITY Ctr_support		"Forum za podporo">
-<!ENTITY Ctr_newversion		"Nova različica?">
+<!ENTITY Ctr_special_acr	"Only report issues through official support channels and not by using 'Add-on Compatibility Reporter'!">
+<!ENTITY Ctr_support		"Support">
+<!ENTITY Ctr_support_forum1	"MozillaZine (English forum)">
+<!ENTITY Ctr_support_forum2	"Camp Firefox (German forum)">
+<!ENTITY Ctr_github_issues	"Report issue on Github">
+<!ENTITY Ctr_newversion		"Check for new version">
 
 <!ENTITY Ctr_addon-bar.accesskey		"d">
 <!ENTITY appMenuGettingStarted.label	"Začetek">
diff --git a/xpi/locale/tr/options.dtd b/xpi/locale/tr/options.dtd
index cfc70f3..264108f 100644
--- a/xpi/locale/tr/options.dtd
+++ b/xpi/locale/tr/options.dtd
@@ -385,8 +385,12 @@
 <!ENTITY Ctr_special_font	"Arka plan renk ayarları varsayılan tema içindir!">
 <!ENTITY Ctr_special_info	"Bazı seçenekler, yalnızca belirli durumlarda görsel değişiklikler yapabilir!">
 <!ENTITY Ctr_special_info2	"Ayarlar &brandShortName; varsayılan teması için yapılmıştır ve diğer üçüncü parti temalar ile çalışmayabilir!">
-<!ENTITY Ctr_support		"Destek Forumu">
-<!ENTITY Ctr_newversion		"Yeni versiyon?">
+<!ENTITY Ctr_special_acr	"Only report issues through official support channels and not by using 'Add-on Compatibility Reporter'!">
+<!ENTITY Ctr_support		"Support">
+<!ENTITY Ctr_support_forum1	"MozillaZine (English forum)">
+<!ENTITY Ctr_support_forum2	"Camp Firefox (German forum)">
+<!ENTITY Ctr_github_issues	"Report issue on Github">
+<!ENTITY Ctr_newversion		"Check for new version">
 
 <!ENTITY Ctr_addon-bar.accesskey		"A">
 <!ENTITY appMenuGettingStarted.label	"Başlarken">
diff --git a/xpi/locale/uk/options.dtd b/xpi/locale/uk/options.dtd
index 5afda49..98c71f2 100644
--- a/xpi/locale/uk/options.dtd
+++ b/xpi/locale/uk/options.dtd
@@ -385,8 +385,12 @@
 <!ENTITY Ctr_special_font	"Налаштування кольору тла - тільки для типової теми!">
 <!ENTITY Ctr_special_info	"Деякі параметри не можуть запропонувати візуальні зміни в усіх випадках">
 <!ENTITY Ctr_special_info2	"Налаштування зроблені для типової теми &brandShortName; і не можуть працювати з усіма сторонніми темами!">
-<!ENTITY Ctr_support		"Форум підтримки">
-<!ENTITY Ctr_newversion		"Нова версія?">
+<!ENTITY Ctr_special_acr	"Only report issues through official support channels and not by using 'Add-on Compatibility Reporter'!">
+<!ENTITY Ctr_support		"Support">
+<!ENTITY Ctr_support_forum1	"MozillaZine (English forum)">
+<!ENTITY Ctr_support_forum2	"Camp Firefox (German forum)">
+<!ENTITY Ctr_github_issues	"Report issue on Github">
+<!ENTITY Ctr_newversion		"Check for new version">
 
 <!ENTITY Ctr_addon-bar.accesskey		"A">
 <!ENTITY appMenuGettingStarted.label	"Початок роботи">
diff --git a/xpi/locale/zh-CN/options.dtd b/xpi/locale/zh-CN/options.dtd
index f32020d..f7be469 100644
--- a/xpi/locale/zh-CN/options.dtd
+++ b/xpi/locale/zh-CN/options.dtd
@@ -385,8 +385,12 @@
 <!ENTITY Ctr_special_font	"只有默认主题才能设置背景颜色!">
 <!ENTITY Ctr_special_info	"一些选项可能无法在所有情况下提供视觉变化!">
 <!ENTITY Ctr_special_info2	"有些设置只能在 &brandShortName; 默认主题中生效，第三方主题可能无法生效!">
-<!ENTITY Ctr_support		"支持讨论区">
-<!ENTITY Ctr_newversion		"有新版本?">
+<!ENTITY Ctr_special_acr	"Only report issues through official support channels and not by using 'Add-on Compatibility Reporter'!">
+<!ENTITY Ctr_support		"Support">
+<!ENTITY Ctr_support_forum1	"MozillaZine (English forum)">
+<!ENTITY Ctr_support_forum2	"Camp Firefox (German forum)">
+<!ENTITY Ctr_github_issues	"Report issue on Github">
+<!ENTITY Ctr_newversion		"Check for new version">
 
 <!ENTITY Ctr_addon-bar.accesskey		"A">
 <!ENTITY appMenuGettingStarted.label	"开始使用">
diff --git a/xpi/locale/zh-TW/options.dtd b/xpi/locale/zh-TW/options.dtd
index ffc2cc5..181c66c 100644
--- a/xpi/locale/zh-TW/options.dtd
+++ b/xpi/locale/zh-TW/options.dtd
@@ -385,8 +385,12 @@
 <!ENTITY Ctr_special_font	"背景色彩設定僅生效於預設佈景主題!">
 <!ENTITY Ctr_special_info	"部份選項僅在某些情況下提供視覺上的變化!">
 <!ENTITY Ctr_special_info2	"設定僅在 &brandShortName; 的預設佈景主題下測試，因此可能不生效於第三方佈景主題!">
-<!ENTITY Ctr_support		"技術支援討論區">
-<!ENTITY Ctr_newversion		"有新版本?">
+<!ENTITY Ctr_special_acr	"Only report issues through official support channels and not by using 'Add-on Compatibility Reporter'!">
+<!ENTITY Ctr_support		"Support">
+<!ENTITY Ctr_support_forum1	"MozillaZine (English forum)">
+<!ENTITY Ctr_support_forum2	"Camp Firefox (German forum)">
+<!ENTITY Ctr_github_issues	"Report issue on Github">
+<!ENTITY Ctr_newversion		"Check for new version">
 
 <!ENTITY Ctr_addon-bar.accesskey		"A">
 <!ENTITY appMenuGettingStarted.label	"Getting started">