From 245e2a5033465faa128246be8a731d09d19c86ed Mon Sep 17 00:00:00 2001
From: RealRaven2000 <axel.grude@gmail.com>
Date: Mon, 11 Nov 2019 12:14:47 +0000
Subject: [PATCH] 2.5 Released on 11/11/19

---
 build.bat                               |    4 +-
 content/settings.js                     |    9 +-
 content/settings.xul                    |    9 +-
 content/smartTemplate-main.js           |   12 +
 content/smartTemplate-overlay.js        |   12 +-
 content/smartTemplate-util.js           |   51 +-
 install.rdf                             |   18 +-
 locale/cs/messages.properties           |    1 +
 locale/cs/settings.properties           |    2 +
 locale/cs/smartTemplate-settings.dtd    |    3 +
 locale/es-ES/messages.properties        |    9 +
 locale/es-ES/settings.properties        |    2 +
 locale/es-ES/smartTemplate-settings.dtd |    3 +
 locale/fi/messages.properties           |    1 +
 locale/fi/register.dtd                  |    1 +
 locale/fi/settings.properties           |    2 +
 locale/fi/smartTemplate-settings.dtd    |    1 +
 locale/fr/messages.properties           |    1 +
 locale/fr/settings.properties           |    1 +
 locale/fr/smartTemplate-settings.dtd    |    1 +
 locale/id-ID/messages.properties        |   28 +
 locale/id-ID/register.dtd               |    6 +
 locale/id-ID/settings.properties        |    4 +
 locale/id-ID/smartTemplate-msg.dtd      |    1 +
 locale/id-ID/smartTemplate-overlay.dtd  |    1 +
 locale/id-ID/smartTemplate-settings.dtd |   16 +
 locale/it/messages.properties           |    1 +
 locale/it/settings.properties           |    1 +
 locale/it/smartTemplate-settings.dtd    |    1 +
 locale/ja/settings.properties           |    1 +
 locale/ja/smartTemplate-settings.dtd    |    1 +
 locale/nl/settings.properties           |    1 +
 locale/nl/smartTemplate-settings.dtd    |    1 +
 locale/oc/messages.properties           |   37 +
 locale/oc/register.dtd                  |    7 +
 locale/oc/settings.properties           |    7 +
 locale/oc/smartTemplate-overlay.dtd     |    5 +
 locale/oc/smartTemplate-settings.dtd    |  106 +
 locale/pl/messages.properties           |    1 +
 locale/pl/settings.properties           |    2 +
 locale/pl/smartTemplate-settings.dtd    |    2 +
 locale/pt-BR/messages.properties        |   13 +
 locale/pt-BR/settings.properties        |    2 +
 locale/pt-BR/smartTemplate-overlay.dtd  |    5 +
 locale/pt-BR/smartTemplate-settings.dtd | 8209 +++++++++++++++++++++++
 locale/ru/messages.properties           |   10 +
 locale/ru/settings.properties           |    2 +
 locale/ru/smartTemplate-overlay.dtd     |    5 +
 locale/ru/smartTemplate-settings.dtd    |   12 +
 locale/sl/messages.properties           |   14 +
 locale/sl/settings.properties           |    2 +
 locale/sl/smartTemplate-overlay.dtd     |    5 +
 locale/sl/smartTemplate-settings.dtd    |   11 +
 locale/sr/messages.properties           |   30 +
 locale/sr/register.dtd                  |   11 +
 locale/sr/settings.properties           |    5 +
 locale/sr/smartTemplate-overlay.dtd     |    5 +
 locale/sr/smartTemplate-settings.dtd    |   31 +
 locale/sv-SE/messages.properties        |    1 +
 locale/sv-SE/settings.properties        |    2 +
 locale/sv-SE/smartTemplate-settings.dtd |    4 +
 locale/uk/messages.properties           |   24 +
 locale/uk/register.dtd                  |    7 +
 locale/uk/settings.properties           |    2 +
 locale/uk/smartTemplate-overlay.dtd     |    5 +
 locale/uk/smartTemplate-settings.dtd    |   24 +
 locale/zh-CN/messages.properties        |   14 +
 locale/zh-CN/settings.properties        |    2 +
 locale/zh-CN/smartTemplate-overlay.dtd  |    5 +
 locale/zh-CN/smartTemplate-settings.dtd |   31 +
 locale/zh-TW/messages.properties        |   15 +
 locale/zh-TW/settings.properties        |    7 +
 locale/zh-TW/smartTemplate-overlay.dtd  |    5 +
 locale/zh-TW/smartTemplate-settings.dtd |  118 +
 manifest.json                           |    4 +-
 release-notes.html                      |   17 +-
 revision.txt                            |    2 +-
 skin/common/style.css                   |    8 +-
 78 files changed, 9006 insertions(+), 36 deletions(-)

diff --git a/build.bat b/build.bat
index 66c94b0d4..219407b2c 100644
--- a/build.bat
+++ b/build.bat
@@ -6,6 +6,6 @@ pwsh -Command "(gc -en UTF8NoBOM manifest.json) -replace 'pre%oldRev%', 'pre%sma
 rem "C:\Program Files\7-Zip\7z" a -xr!.svn smartTemplate.zip install.rdf chrome.manifest content defaults locale skin license.txt icon.png 
 "C:\Program Files\7-Zip\7z" a -xr!.svn smartTemplateWeb.zip manifest.json install.rdf chrome.manifest content defaults locale skin license.txt icon.png 
 echo %smartTemplateRev% > revision.txt
-move smartTemplate-*.xpi "..\..\Test Versions\2.4.2\"
+move smartTemplate-*.xpi "..\..\Test Versions\2.5\"
 pwsh -Command "Start-Sleep -m 150"
-rename smartTemplateWeb.zip smartTemplate-fx-2.4.2pre%smartTemplateRev%.xpi
\ No newline at end of file
+rename smartTemplateWeb.zip smartTemplate-fx-2.5pre%smartTemplateRev%.xpi
\ No newline at end of file
diff --git a/content/settings.js b/content/settings.js
index 53892dd72..ac6080e09 100644
--- a/content/settings.js
+++ b/content/settings.js
@@ -986,11 +986,18 @@ SmartTemplate4.Settings = {
 			idx++;
 		}
 		//
-		if (idkey == "fileTemplates") {
+    let btnSave = document.getElementById("btnSaveTemplate"),
+        btnLoad = document.getElementById("btnLoadTemplate"),
+        tipHelp = document.getElementById("helpTemplates"),
+        isShowTemplateSelector = (idkey == "fileTemplates");
+		if (isShowTemplateSelector) {
 			found = true;
 			deck.selectedIndex = 1;
 			this.accountKey = "files";
 		}
+    btnSave.collapsed = (isShowTemplateSelector);
+    btnLoad.collapsed = (isShowTemplateSelector);
+    tipHelp.collapsed = (!isShowTemplateSelector);
 
 		// nothing found, then we are in common! (changed from previous behavior where common accountKey was "", now it is ".common"
 		if (!found) {
diff --git a/content/settings.xul b/content/settings.xul
index 3ae793e58..2b20ebb80 100644
--- a/content/settings.xul
+++ b/content/settings.xul
@@ -49,6 +49,12 @@
 			<toolbar id="templateTools" 
 			         mode="icons" 
 							 customizable="false">
+        <toolbarbutton id="helpTemplates"
+            class="toolbarbutton-1 chromeclass-toolbar-additional"
+            onclick = "SmartTemplate4.Util.showStationeryHelpPage();" 
+            label = ""
+            tooltiptext="&tip.fileTemplates;"
+            />
 				<toolbarbutton id="btnSaveTemplate"
 											 class="toolbarbutton-1 chromeclass-toolbar-additional"
 											 tooltiptext="&btnSaveTemplate.tooltip;"
@@ -62,7 +68,8 @@
 											 tooltiptext="&btnYouTube.tooltip;"
 											 onclick="SmartTemplate4.Util.showYouTubePage();" 
 											 />
-			</toolbar>
+      </toolbar>
+
 			<spacer flex = "1" />
 			<button id="btnAdvanced"
 			        class = "buttonIcon"
diff --git a/content/smartTemplate-main.js b/content/smartTemplate-main.js
index 6c6302f34..b5e0933b8 100644
--- a/content/smartTemplate-main.js
+++ b/content/smartTemplate-main.js
@@ -371,6 +371,18 @@ END LICENSE BLOCK
       for now, SmartTemplate⁴ allows using these again for versions smaller than 69
       
 		
+	Version 2.5 - WIP
+    # Added switch for toggling automatic proofing; %spellcheck(off)% to disable, %spellcheck(on)% to enable
+      To force switching and change to a different language do the toggle command first.
+    # [issue 21] %spellcheck% sometimes doesn't remove red proofing lines after setting language
+    # Improved UI on Template Files page for Stationery users:
+      - removed irrelevant Save and Load buttons
+      - added a (?) button which links to the Stationery help page
+    # Completed some of the missing translations for new functionality in the Finnish, French, Czech, 
+      Spanish, Italian, Polish and Swedish locales.
+    # Extended error log for trouble shooting getFileAsDataURI
+  
+  
   ...........	
 	
 	Version 2.x
diff --git a/content/smartTemplate-overlay.js b/content/smartTemplate-overlay.js
index caf880942..122c2dca3 100644
--- a/content/smartTemplate-overlay.js
+++ b/content/smartTemplate-overlay.js
@@ -2215,14 +2215,7 @@ SmartTemplate4.regularize = function regularize(msg, composeType, isStationery,
 		    composerWin = Cc["@mozilla.org/appshell/window-mediator;1"]
 		      .getService(Ci.nsIWindowMediator).getMostRecentWindow("msgcompose") || window,
 		    attachments=[];
-		try {
-			// https://dxr.mozilla.org/comm-central/source/mail/components/compose/content/MsgComposeCommands.js#2508
-			/*
-			let nsFile = Services.io.getProtocolHandler("file")
-				.QueryInterface(Ci.nsIFileProtocolHandler)
-				.getFileFromURLSpec(uri); // img.src
-			*/
-				
+		try {			
 			let FileUtils = Cu.import("resource://gre/modules/FileUtils.jsm").FileUtils;
 			
 			if (!FileUtils) {
@@ -2232,7 +2225,8 @@ SmartTemplate4.regularize = function regularize(msg, composeType, isStationery,
       let localFile = new FileUtils.File(pathUri);				
 			
 			if (!localFile.exists()) {
-				alert("file not found: " + pathUri);
+        let wrn = util.getBundleString("SmartTemplate4.fileFunction.notExists", "Function {0} could not find or access file. Check path below:");
+				alert(wrn.replace("{0}", "'attachFile()'") + "\n" + pathUri);
 				return;
 			}
 			
diff --git a/content/smartTemplate-util.js b/content/smartTemplate-util.js
index d01c62e84..cf29027d4 100644
--- a/content/smartTemplate-util.js
+++ b/content/smartTemplate-util.js
@@ -18,7 +18,7 @@ var SmartTemplate4_TabURIregexp = {
 };
 
 SmartTemplate4.Util = {
-	HARDCODED_CURRENTVERSION : "2.4.2",
+	HARDCODED_CURRENTVERSION : "2.5",
 	HARDCODED_EXTENSION_TOKEN : ".hc",
 	ADDON_ID: "smarttemplate4@thunderbird.extension",
 	VersionProxyRunning: false,
@@ -1286,7 +1286,9 @@ SmartTemplate4.Util = {
 		const prefs = SmartTemplate4.Preferences,
 		      util = SmartTemplate4.Util,
 					Ci = Components.interfaces,
-		      Cc = Components.classes;
+		      Cc = Components.classes,
+          MimeService = Cc["@mozilla.org/mime;1"].getService(Ci.nsIMIMEService);
+          
     let filename = aURL.substr(aURL.lastIndexOf("/") + 1);
     filename = decodeURIComponent(filename);
 		util.logDebugOptional('images',"getFileAsDataURI()\nfilename=" + filename);
@@ -1297,7 +1299,18 @@ SmartTemplate4.Util = {
 			Components.utils.import('resource://gre/modules/Services.jsm');
 		
     let url = Services.io.newURI(aURL), // , null, null
-        contentType = Cc["@mozilla.org/mime;1"].getService(Ci.nsIMIMEService).getTypeFromURI(url);
+        contentType;
+    try {
+      contentType = MimeService.getTypeFromURI(url);
+    }
+    catch(ex) {
+      util.logException("MimeService failed to determine MIME type from url:\n"
+        + "asciiSpec: " + url.asciiSpec + "\n"
+        + "path: " + url.path + "\n"
+        + "I cannot convert this into a data URI, therefore you may get security warnings when Composer loads content.\n"
+        + "returning raw URL: " + aURL, ex);
+      return aURL;
+    }
     if (!contentType.startsWith("image/")) {
 			util.logDebugOptional('images',"getFileAsDataURI()\nthe file is not an image\ncontentType = " + contentType);
 			// non-image content-type; let Thunderbird show a warning after insertion
@@ -2515,15 +2528,29 @@ SmartTemplate4.Util = {
 		}
 	} ,
   
-  setSpellchecker: function(language) {
+  // isDisabled - force disabled (on retry)
+  setSpellchecker: function(language, isDisabled) {
 		const Ci = Components.interfaces,
 		      Cc = Components.classes,
 		      util = SmartTemplate4.Util;
+    
     let retry = util.retrySpellCheck || 0;
     try {
       let spellChecker = gSpellChecker.mInlineSpellChecker.spellChecker,
           o1 = {}, 
           o2 = {};
+      if (language=='on') {
+        gSpellChecker.enabled = true;
+        util.logDebug('Enabled automatic spellcheck');
+        return;
+      }
+      if (!isDisabled)
+        isDisabled = (gSpellChecker.enabled == false);
+      if (isDisabled && language!='off') {
+        // temporarily enable
+        gSpellChecker.enabled = true;
+        spellChecker = gSpellChecker.mInlineSpellChecker.spellChecker;
+      }
       if (!spellChecker) {
         if (retry<5) {
           retry++;
@@ -2531,7 +2558,7 @@ SmartTemplate4.Util = {
           util.logDebug("spellChecker not available, retrying later...{ attempt " + retry + " }");
           // if spellChecker is not ready, we try again in 2 seconds.
           setTimeout(function() {
-            util.setSpellchecker(language);
+            util.setSpellchecker(language, isDisabled); // force disabled if this is set globally.
           }, 2000);
           return;
         }
@@ -2541,6 +2568,12 @@ SmartTemplate4.Util = {
           throw wrn;          
         }
       }
+      if (language=='off') {
+        gSpellChecker.enabled = false; // restore disabled status if this is a global setting.
+        util.logDebug('Disabled automatic spellcheck');
+        return;
+      }
+      
       spellChecker.GetDictionaryList(o1, o2);
       util.retrySpellCheck=0;
       // Cc['@mozilla.org/spellchecker/engine;1'].getService(Ci.mozISpellCheckingEngine).getDictionaryList(o1, o2);
@@ -2568,6 +2601,14 @@ SmartTemplate4.Util = {
         util.logDebug("Setting spellchecker / document language to: " + language);
         document.documentElement.setAttribute("lang", language); 
         spellChecker.SetCurrentDictionary(language);
+        // force re-checking:
+        if (gSpellChecker.enabled) {
+          gSpellChecker.mInlineSpellChecker.spellCheckRange(null);
+        }
+        if (isDisabled) { // force restoring disabled status
+          gSpellChecker.enabled = false; 
+          util.logDebug('Disabling automatic spellcheck according to global setting.');
+        }
       }
       else {
         let wrn = util.getBundleString("SmartTemplate4.notification.spellcheck.notFound", "Dictionary '{0}' not found.");
diff --git a/install.rdf b/install.rdf
index 0781dfe43..2da77302d 100644
--- a/install.rdf
+++ b/install.rdf
@@ -27,12 +27,12 @@
    em:name="SmartTemplate4"
    em:creator="Axel Grude"
    em:contributor="Benito van der Zander [Bug 25676]"
-   em:description="SmartTemplate4 customizes 'quote headers' and Mail template per account."
+   em:description="SmartTemplate4 customizes 'quote headers' and Mail template per account. It also replaces Stationery in Tb 68."
    em:iconURL="chrome://smartTemplate4/skin/icon32x32.png"
    em:icon64URL="chrome://smartTemplate4/skin/icon64x64.png"
    em:optionsURL="chrome://smartTemplate4/content/settings.xul"
    em:aboutURL="chrome://smartTemplate4/content/about.xul">
-	  <em:version>2.4.2</em:version>
+	  <em:version>2.5</em:version>
     <em:homepageURL>http://smarttemplate4.mozdev.org/index.html</em:homepageURL>
     <em:type>2</em:type>
     <em:targetApplication RDF:resource="rdf:#$Vsomz2"/>
@@ -44,7 +44,7 @@
 			<Description>
 				<em:locale>de</em:locale>
 				<em:name>SmartTemplate4</em:name>
-				<em:description>SmartTemplate4 bietet die Option die Standard Thunderbird Mailheader quote-header komfortabel anzupassen</em:description>
+				<em:description>SmartTemplate4 bietet die Option die Standard Thunderbird Mailheader quote-header komfortabel anzupassen, und ersetzt Stationery (Tb68)</em:description>
 				<em:creator>Axel Grude</em:creator>
 				<em:developer>Axel Grude</em:developer>
 				<em:contributor>Marky Mark - website, support, management</em:contributor>
@@ -59,7 +59,7 @@
 			<Description>
 				<em:locale>en-US</em:locale>
 				<em:name>SmartTemplate4</em:name>
-				<em:description>The smart template which can customize quote header per account</em:description>
+				<em:description>SmartTemplate4 customizes 'quote headers' and Mail template per account. It also replaces Stationery in Tb 68.</em:description>
 				<em:creator>Axel Grude</em:creator>
 				<em:developer>Axel Grude</em:developer>
 				<em:contributor>Marky Mark - website, support, management</em:contributor>
@@ -88,7 +88,7 @@
 			<Description>
 				<em:locale>fi</em:locale>
 				<em:name>SmartTemplate4</em:name>
-				<em:description>SmartTempalate4:n avulla voit muokata lainauksen otsakkeita tileittän ja luoda valmiita pohjia viesteille</em:description>
+				<em:description>SmartTemplate4 avulla voit muokata lainauksen otsakkeita tileittän ja luoda valmiita pohjia viesteille. Se korvaa myös ilmaisun Stationery kohdassa Tb 68.</em:description>
 				<em:creator>Axel Grude</em:creator>
 				<em:developer>Axel Grude</em:developer>
 				<em:contributor>Marky Mark - website, support, management</em:contributor>
@@ -103,7 +103,7 @@
 			<Description>
 				<em:locale>fr</em:locale>
 				<em:name>SmartTemplate4</em:name>
-				<em:description>Le smart modèle qui peut personnaliser l'en-tête de la citation pour les comptes</em:description>
+				<em:description>Le smart modèle qui peut personnaliser l'en-tête de la citation pour les comptes. Il remplace également Stationery dans Tb 68.</em:description>
 				<em:creator>Axel Grude</em:creator>
 				<em:developer>Axel Grude</em:developer>
 				<em:contributor>Marky Mark - website, support, management</em:contributor>
@@ -118,7 +118,7 @@
 			<Description>
 				<em:locale>it</em:locale>
 				<em:name>SmartTemplate4</em:name>
-				<em:description>Permette di personalizzare l&apos;intestazione delle citazioni per gli account di posta</em:description>
+				<em:description>Permette di personalizzare l&apos;intestazione delle citazioni per gli account di posta. Sostituisce anche Stationery nella Tb 68.</em:description>
 				<em:creator>Axel Grude</em:creator>
 				<em:developer>Axel Grude</em:developer>
 				<em:contributor>Marky Mark - website, support, management</em:contributor>
@@ -149,7 +149,7 @@
 			<Description>
 				<em:locale>nl</em:locale>
 				<em:name>SmartTemplate4</em:name>
-				<em:description>Het slimme sjabloon dat de koptekst per account kan aanpassen</em:description>
+				<em:description>Het slimme sjabloon dat de koptekst per account kan aanpassen. Het vervangt ook Stationery in Tb 68.</em:description>
 				<em:creator>Axel Grude</em:creator>
 				<em:developer>Axel Grude</em:developer>
 				<em:contributor>Marky Mark - website, support, management</em:contributor>
@@ -180,7 +180,7 @@
 			<Description>
 				<em:locale>pl</em:locale>
 				<em:name>SmartTemplate4</em:name>
-				<em:description>Inteligentne szablony naglówków, które mozna dostosowywac dla kazdego konta.</em:description>
+				<em:description>Inteligentne szablony naglówków, które mozna dostosowywac dla kazdego konta. Nahrazuje také Stationery v Tb 68.</em:description>
 				<em:creator>Axel Grude</em:creator>
 				<em:developer>Axel Grude</em:developer>
 				<em:contributor>Marky Mark - website, support, management</em:contributor>
diff --git a/locale/cs/messages.properties b/locale/cs/messages.properties
index d07f1fe84..2b87dd943 100644
--- a/locale/cs/messages.properties
+++ b/locale/cs/messages.properties
@@ -39,6 +39,7 @@ SmartTemplate4.fileTemplates.wrnEnterTitle=Zadejte název!
 SmartTemplate4.fileTemplates.wrnEnterPath=Vyberte prosím platnou cestu!
 SmartTemplate4.fileTemplates.openFile=Otevřít soubor šablony SmartTemplate⁴…
 SmartTemplate4.fileTemplates.restrictTemplates=Abyste mohli používat více než {1} šablon, potřebujete licenci SmartTemplate⁴!
+SmartTemplate4.fileTemplates.error.charSet=Problems converting a HTML template from charset [{1}]\nUsing raw string data instead.\nIf this results in garbled characters, try adding an explicit 'meta charset=' to the head section. Maybe try ISO-8859-1?
 SmartTemplate4.fileTemplates.error.filePath=Soubor šablony '{0}' nelze načíst z cesty: \n{1}\n Soubor byl pravděpodobně odstraněn nebo přejmenován.
 SmartTemplate4.fileFunction.notExists=Funkce {0} nemohla najít nebo získat přístup k souboru. Zkontrolujte cestu níže:
 SmartTemplate4.notification.noStationery=Nelze najít doplněk „Stationery“ - je nainstalován?
diff --git a/locale/cs/settings.properties b/locale/cs/settings.properties
index 37680256c..bd7c333fb 100644
--- a/locale/cs/settings.properties
+++ b/locale/cs/settings.properties
@@ -7,3 +7,5 @@ fpJsonFile=JSON soubor
 fpImageFile=Soubor obrázku
 prompt.text=Vlož text pro přidání nebo nastavení
 prompt.email=Vlož e-mail
+#### DESCRIPTION FOR LOAD HTML TEMPLATE WINDOW ####
+fpFilterHtmlTemplate=HTML Template
diff --git a/locale/cs/smartTemplate-settings.dtd b/locale/cs/smartTemplate-settings.dtd
index 43179a6d8..ba63ab48c 100644
--- a/locale/cs/smartTemplate-settings.dtd
+++ b/locale/cs/smartTemplate-settings.dtd
@@ -59,6 +59,7 @@
 <!ENTITY btnSaveTemplate.tooltip "Ulož Šablonu...">
 <!ENTITY btnLoadTemplate.tooltip "Nahraj Šablonu...">
 <!ENTITY btnYouTube.tooltip "Navštiv 'Thunderbird Daily' YouTube kanál - pro typy a návody jak použít Stationery a ostatní rozšížení">
+<!ENTITY tip.fileTemplates "Click to read full documentation about Stationery and external HTML templates on our support site…">
 <!ENTITY pref_server_def "Společné">
 <!ENTITY pref_def.label "Použij společné">
 <!ENTITY pref_def.cap "Pokud si chcete přizpůsobit řádek uvození citace, zrušte volbu 'Použij společné'.">
@@ -127,6 +128,7 @@
 <!ENTITY fileImage.label "Obrázkový soubor(png, jpg, gif, bmp, svg). Volitelný 'altText' je zobrazen pokud obrázek nemůže být nalezen.">
 <!ENTITY attach.label "Add file as attachment">
 <!ENTITY cursor.label "nastav pozici kurzoru">
+<!ENTITY spellcheck.label "Sets the spell-checking language. Example values: (en, de-DE, es-ES, ru) - note that the dictionary must be installed.">
 <!ENTITY to_var.cap "Příjemce (To)">
 <!ENTITY to_note.label "Když jméno není dostupné, e-mail bude zobrazen místo něj">
 <!ENTITY to.label "Jméno příjemce (defaultní)">
@@ -249,6 +251,7 @@
 <!ENTITY licenseValidation.notMatchedMail "Šifrovaná e-mailová adresa neodpovídá čitelné adrese.">
 <!ENTITY premiumConfig "Šifrovaná e-mailová adresa neodpovídá čitelné adrese.">
 <!ENTITY label.premiumFeaturesSite "Přečtěte si více o prémiových funkcích na našem webu">
+<!-- #####  Support ##### -->
 <!ENTITY support.title "Mail na podporu">
 <!ENTITY support.type "Typ:">
 <!ENTITY support.type.selectOne "Vyber téma!">
diff --git a/locale/es-ES/messages.properties b/locale/es-ES/messages.properties
index d5ab4b96e..b2670a01b 100644
--- a/locale/es-ES/messages.properties
+++ b/locale/es-ES/messages.properties
@@ -25,12 +25,21 @@ SmartTemplate4.notification.donate=Donar
 SmartTemplate4.notification.licensing=Más sobre licencias
 SmartTemplate4.notification.dontShowAgain=No mostrar este mensaje de nuevo.
 SmartTemplate4.notification.spellcheck.noDictionary=No hay diccionarios instalados.
+SmartTemplate4.notification.spellcheck.notFound=Dictionary '{0}' not found.
+SmartTemplate4.notification.spellcheck.error=Cannot switch spell checker language. Have you installed the correct dictionary?
 SmartTemplate4.licenseValidation.expired=Su licencia expiró el:
 SmartTemplate4.licenseValidation.guessAddon=(La clave introducida puede ser para {2}).
 SmartTemplate4.prompt.switchDomainLicense=¿Cambiar a Licencia de Dominio?
 SmartTemplate4.trialDays=Te quedan {0} días de prueba.
 SmartTemplate4.trialExpiry=Su período de prueba expiró hace {0} días.
+SmartTemplate4.fileTemplates=Template Files
+SmartTemplate4.fileTemplates.wrnSelectUpdateItem=You have to select an item from the list to update!
+SmartTemplate4.fileTemplates.wrnSelectUpdateItem.caption=Update Templates
+SmartTemplate4.fileTemplates.wrnEnterTitle=Please enter a title!
+SmartTemplate4.fileTemplates.wrnEnterPath=Please select a valid path!
+SmartTemplate4.fileTemplates.openFile=Open SmartTemplate⁴ template file…
 SmartTemplate4.fileTemplates.restrictTemplates=¡Necesita una licencia SmartTemplate⁴ para usar más de {1} plantillas!
+SmartTemplate4.fileTemplates.error.charSet=Problems converting a HTML template from charset [{1}]\nUsing raw string data instead.\nIf this results in garbled characters, try adding an explicit 'meta charset=' to the head section. Maybe try ISO-8859-1?
 SmartTemplate4.fileTemplates.error.filePath=No se pudo cargar la plantilla de archivo '{0}' desde la ruta: \n{1}\nEl archivo puede haber sido eliminado o renombrado.
 SmartTemplate4.fileFunction.notExists=La función {0} no pudo encontrar o acceder al archivo. Verifique la ruta a continuación:
 SmartTemplate4.notification.noStationery=No se pudo encontrar el complemento 'Stationery': ¿está instalado?
diff --git a/locale/es-ES/settings.properties b/locale/es-ES/settings.properties
index bb9eabbac..47ece269b 100644
--- a/locale/es-ES/settings.properties
+++ b/locale/es-ES/settings.properties
@@ -7,3 +7,5 @@ fpJsonFile=Archivo JSON
 fpImageFile=Archivo de imagen
 prompt.text=Introduzca el texto a añadir o cambiar
 prompt.email=Introduzca una dirección de correo
+#### DESCRIPTION FOR LOAD HTML TEMPLATE WINDOW ####
+fpFilterHtmlTemplate=HTML Template
diff --git a/locale/es-ES/smartTemplate-settings.dtd b/locale/es-ES/smartTemplate-settings.dtd
index eb708b673..6164c1405 100644
--- a/locale/es-ES/smartTemplate-settings.dtd
+++ b/locale/es-ES/smartTemplate-settings.dtd
@@ -59,6 +59,7 @@
 <!ENTITY btnSaveTemplate.tooltip "Guardar plantilla…">
 <!ENTITY btnLoadTemplate.tooltip "Cargar plantilla…">
 <!ENTITY btnYouTube.tooltip "Visite el canal &quot;Thunderbird Daily&quot; en Youtube: encontrará consejos y tutoriales sobre Stationery y otros complementos.">
+<!ENTITY tip.fileTemplates "Click to read full documentation about Stationery and external HTML templates on our support site…">
 <!ENTITY pref_server_def "Común">
 <!ENTITY pref_def.label "Usar común">
 <!ENTITY pref_def.cap "Deseleccione 'Usar común' para crear un encabezado de cita personalizado para esta cuenta.">
@@ -127,6 +128,7 @@
 <!ENTITY fileImage.label "Archivo de imagen (png,jpg,gif,bmp,svg). El texto alternativo opcional se muestra si no se puede encontrar la imagen.">
 <!ENTITY attach.label "Añadir archivo como adjunto">
 <!ENTITY cursor.label "Establece la posición del cursor">
+<!ENTITY spellcheck.label "Sets the spell-checking language. Example values: (en, de-DE, es-ES, ru) - note that the dictionary must be installed.">
 <!ENTITY to_var.cap "Destinatario (Para)">
 <!ENTITY to_note.label "Si no se dispone del nombre, se mostrará la dirección de correo">
 <!ENTITY to.label "Nombre del destinatario (predeterminado)">
@@ -249,6 +251,7 @@
 <!ENTITY licenseValidation.notMatchedMail "La dirección de correo encriptada no coincide con la legible.">
 <!ENTITY premiumConfig "Funcionalidades premium">
 <!ENTITY label.premiumFeaturesSite "Para saber más sobre las funcionalidades premium visite nuestre página web.">
+<!-- #####  Support ##### -->
 <!ENTITY support.title "Escribir un correo electrónico a Soporte">
 <!ENTITY support.type "Tipo:">
 <!ENTITY support.type.selectOne "¡Seleccione un tema!">
diff --git a/locale/fi/messages.properties b/locale/fi/messages.properties
index 67a152f51..d8a600988 100644
--- a/locale/fi/messages.properties
+++ b/locale/fi/messages.properties
@@ -39,6 +39,7 @@ SmartTemplate4.fileTemplates.wrnEnterTitle=Anna otsikko!
 SmartTemplate4.fileTemplates.wrnEnterPath=Valitse oikea polku!
 SmartTemplate4.fileTemplates.openFile=Avaa SmartTemplate⁴-mallitiedosto…
 SmartTemplate4.fileTemplates.restrictTemplates=Tarvitset SmartTemplate⁴ -lisenssin käyttääksesi enemmän kuin {1} mallia!
+SmartTemplate4.fileTemplates.error.charSet=Problems converting a HTML template from charset [{1}]\nUsing raw string data instead.\nIf this results in garbled characters, try adding an explicit 'meta charset=' to the head section. Maybe try ISO-8859-1?
 SmartTemplate4.fileTemplates.error.filePath=Tiedostomallia '{0}' ei voitu ladata polusta: \n{1} \nTiedosto on ehkä poistettu tai nimetty uudelleen.
 SmartTemplate4.fileFunction.notExists=Toiminto {0} ei löytänyt tiedostoa tai pääsy siihen. Tarkista alla oleva polku:
 SmartTemplate4.notification.noStationery=Lisäosaa 'Stationery' ei löytynyt - onko se asennettu?
diff --git a/locale/fi/register.dtd b/locale/fi/register.dtd
index 2199c7ec9..4cc118d9a 100644
--- a/locale/fi/register.dtd
+++ b/locale/fi/register.dtd
@@ -11,6 +11,7 @@
 <!ENTITY yearlyLicense.usageTerm "Lisenssi on tarkoitettu henkilökohtaiseen käyttöön ja se on sidottu sähköpostiosoitteeseesi. Voit asentaa sen useisiin sähköpostiohjelmiin niin kauan kuin ne on määritetty käyttämään kyseistä osoitetta.">
 <!ENTITY yearlyLicense.usageTerm1 "Kaikki muut sähköpostiosoitteet eivät ole ongelma - ne eivät vaadi erillistä lisenssiä. Jos sinulla on kysymyksiä, pääset minut tukisivun kautta.">
 <!ENTITY domainLicense.email "Otamme sinuun yhteyttä käyttämällä tätä sähköpostiosoitetta luodaksesi verkkotunnuksen lisenssin; ota yhteyttä kahteen työpäivään. Anna lisenssin verkkotunnus seuraavalla sivulla.">
+<!ENTITY domainLicense.header "Licensed Email Domain">
 <!ENTITY domainLicense.instruct "Lisenssi on merkitty yrityksesi verkkotunnukseen. Lisenssin avulla käyttäjät, joilla on sähköpostiosoite, jotka päättyvät tähän sähköpostialueeseen, käyttävät SmartTemplate⁴ Pro -ohjelmaa. Esimerkiksi. jos annat verkkotunnuksen 'abc.com', niin sähköpostin käyttäjät, kuten fred@abc.com, martha@abc.com, mike.doe@abc.com jne. saavat käyttää lisenssiä. Voimassa olevien yksittäisten käyttäjien enimmäismäärä on numero, jonka olet antanut aloitusnäytölle.">
 <!ENTITY domainLicense.validate "Varmista, että annat verkkotunnuksen * täsmälleen sellaisena kuin se on * yrityksesi sähköpostiosoitteissa (osassa * @ -merkin jälkeen), koska sitä käytetään valtuuttamaan käyttäjien sähköpostiosoitteet.">
 <!ENTITY updates.title "Päivitykset">
diff --git a/locale/fi/settings.properties b/locale/fi/settings.properties
index 37fcd9103..28292640f 100644
--- a/locale/fi/settings.properties
+++ b/locale/fi/settings.properties
@@ -7,3 +7,5 @@ fpJsonFile=JSON-tiedosto
 fpImageFile=Kuvatiedosto
 prompt.text=Syötä teksti lisättäväksi tai asettavaksi
 prompt.email=Syötä sähköpostiosoite
+#### DESCRIPTION FOR LOAD HTML TEMPLATE WINDOW ####
+fpFilterHtmlTemplate=HTML Template
diff --git a/locale/fi/smartTemplate-settings.dtd b/locale/fi/smartTemplate-settings.dtd
index 743f23165..9690d9dc3 100644
--- a/locale/fi/smartTemplate-settings.dtd
+++ b/locale/fi/smartTemplate-settings.dtd
@@ -251,6 +251,7 @@
 <!ENTITY licenseValidation.notMatchedMail "Salattu sähköpostiosoite ei vastaa lukukelpoista">
 <!ENTITY premiumConfig "Maksulliset lisätoiminnot">
 <!ENTITY label.premiumFeaturesSite "Lisätietoja maksullisista lisätoiminnoista saat verkkosivuiltamme">
+<!-- #####  Support ##### -->
 <!ENTITY support.title "Lähetä sähköpostia tukeen">
 <!ENTITY support.type "Tyyppi:">
 <!ENTITY support.type.selectOne "Valitse aihe!">
diff --git a/locale/fr/messages.properties b/locale/fr/messages.properties
index 207cd5783..b644df7ce 100644
--- a/locale/fr/messages.properties
+++ b/locale/fr/messages.properties
@@ -39,6 +39,7 @@ SmartTemplate4.fileTemplates.wrnEnterTitle=S'il vous plaît entrer un titre!
 SmartTemplate4.fileTemplates.wrnEnterPath=Veuillez sélectionner un chemin valide!
 SmartTemplate4.fileTemplates.openFile=Ouvrir le fichier de modèle SmartTemplate⁴…
 SmartTemplate4.fileTemplates.restrictTemplates=Vous avez besoin d'une licence SmartTemplate⁴ pour utiliser plus de {1} modèles!
+SmartTemplate4.fileTemplates.error.charSet=Problems converting a HTML template from charset [{1}]\nUsing raw string data instead.\nIf this results in garbled characters, try adding an explicit 'meta charset=' to the head section. Maybe try ISO-8859-1?
 SmartTemplate4.fileTemplates.error.filePath=Impossible de charger le modèle de fichier '{0}' à partir du chemin: \n{1} \nLe fichier a peut-être été supprimé ou renommé.
 SmartTemplate4.fileFunction.notExists=La fonction {0} n'a pas pu trouver ou accéder au fichier. Vérifiez le chemin ci-dessous:
 SmartTemplate4.notification.noStationery=Impossible de trouver l'add-on 'Stationery' - est-il installé?
diff --git a/locale/fr/settings.properties b/locale/fr/settings.properties
index 917ed9ce7..517849ad1 100644
--- a/locale/fr/settings.properties
+++ b/locale/fr/settings.properties
@@ -7,4 +7,5 @@ fpJsonFile=Fichier JSON
 fpImageFile=Fichier image
 prompt.text=Indiquer le texte à ajouter ou définir
 prompt.email=Indiquer une adresse électronique
+#### DESCRIPTION FOR LOAD HTML TEMPLATE WINDOW ####
 fpFilterHtmlTemplate=Modèle HTML
diff --git a/locale/fr/smartTemplate-settings.dtd b/locale/fr/smartTemplate-settings.dtd
index 54593c1cd..2fb97de02 100644
--- a/locale/fr/smartTemplate-settings.dtd
+++ b/locale/fr/smartTemplate-settings.dtd
@@ -251,6 +251,7 @@
 <!ENTITY licenseValidation.notMatchedMail "Une adresse électronique chiffrée ne peut être reconnue.">
 <!ENTITY premiumConfig "Fonctionnalités Premium">
 <!ENTITY label.premiumFeaturesSite "Read more about Premium Features on our Website">
+<!-- #####  Support ##### -->
 <!ENTITY support.title "Courrier au support">
 <!ENTITY support.type "Genre:">
 <!ENTITY support.type.selectOne "Choisissez un sujet!">
diff --git a/locale/id-ID/messages.properties b/locale/id-ID/messages.properties
index 158067e4a..11efc6dfa 100644
--- a/locale/id-ID/messages.properties
+++ b/locale/id-ID/messages.properties
@@ -1,18 +1,46 @@
+#### ERROR MESSAGES FOR ERROR CONSOLE ####
 contextError=Variabel {1} tidak dapat digunakan untuk pesan "baru"! Silakan lihat bantuan untuk daftar variabel yang diizinkan
+#### PROMPTS ####
 SmartTemplate4.confirmVersionLink=Menampilkan log perubahan untuk SmartTemplate4?
+#### UPDATE MESSAGES ####
 SmartTemplate4.updateMessageVersion=SmartTemplate⁴ berhasil diperbarui ke versi {1}!
 SmartTemplate4.updateMessageNewBrackets1=Kepada pengguna SmartTemplate⁴, dengan senang hati kami mengumumkan dari versi ini, SmartTemplate⁴ mendukung penggunaan kurung kurawa {} dan tanda <style> sehingga kini anda dapat menerapkan kostumisasi css dalam Template anda.
 SmartTemplate4.updateMessageNewBrackets2=Dari sekarang, syntax spesifik untuk penggunaan tanda kurung diubah: Bukannya kurung kurawa {%cc(name)%} gunakan tanda kurung ganda [[%cc(name)%]] - untuk detail lebih lanjut, lihat Bantuan.
 SmartTemplate4.updateMessageNewBrackets3=Sekarang SmartTemplate⁴ akan mengonversi templat yang ada sehingga Anda dapat tetap menggunakannya dalam versi baru. Tekan [OK] untuk lanjut.
+SmartTemplate4.notification.license.text=From now on, SmartTemplate⁴ requires at least a standard license. Read more about this on our licensing page.
+#SmartTemplate4 Pro specific
+SmartTemplate4.notification.license.required=SmartTemplate⁴ requires a license to continue working. Read more at the bottom of the compose window.
+SmartTemplate4.notification.parsing=Parsing variables:
 SmartTemplate4.notification.premium.title=Fitur Premium
 SmartTemplate4.notification.premium.text={1} adalah fitur Premium, dapatkan Lisensi SmartTemplate⁴ Pro untuk menggunakannya secara permanen.
 SmartTemplate4.notification.premium.text.plural={1} adalah fitur Premium, dapatkan Lisensi SmartTemplate⁴ Pro untuk menggunakannya secara permanen.
 SmartTemplate4.notification.premium.btn.getLicense=Beli Lisensi
 SmartTemplate4.notification.premium.btn.hotKey=L
+SmartTemplate4.notification.premium.btn.upgrade=Upgrade to Pro
+SmartTemplate4.notification.premium.btn.upgrade.hotKey=U
 SmartTemplate4.notification.premium.btn.renewLicense=Perbarui Lisensi
 SmartTemplate4.notification.premium.btn.extendLicense=Perpanjang Lisensi
 SmartTemplate4.notification.premium.btn.extendLicense.tooltip=Ini akan memperpanjang tanggal lisensi saat ini hingga 1 tahun. Ini biasanya lebih murah daripada lisensi baru.
 SmartTemplate4.notification.donate=Donasi
+SmartTemplate4.notification.licensing=More about licensing
+SmartTemplate4.notification.dontShowAgain=Do not show this message again.
+SmartTemplate4.notification.spellcheck.noDictionary=No dictionaries installed.
+SmartTemplate4.notification.spellcheck.notFound=Dictionary '{0}' not found.
+SmartTemplate4.notification.spellcheck.error=Cannot switch spell checker language. Have you installed the correct dictionary?
 SmartTemplate4.licenseValidation.expired=Lisensi Anda kedaluwarsa pada:
 SmartTemplate4.licenseValidation.guessAddon=(Lisensi yang dimasukkan mungkin untuk {2}).
 SmartTemplate4.prompt.switchDomainLicense=Beralih ke Lisensi Domain?
+SmartTemplate4.trialDays=You have {0} trial days left.
+SmartTemplate4.trialExpiry=Your trial period expired {0} days ago.
+SmartTemplate4.fileTemplates=Template Files
+SmartTemplate4.fileTemplates.wrnSelectUpdateItem=You have to select an item from the list to update!
+SmartTemplate4.fileTemplates.wrnSelectUpdateItem.caption=Update Templates
+SmartTemplate4.fileTemplates.wrnEnterTitle=Please enter a title!
+SmartTemplate4.fileTemplates.wrnEnterPath=Please select a valid path!
+SmartTemplate4.fileTemplates.openFile=Open SmartTemplate⁴ template file…
+SmartTemplate4.fileTemplates.restrictTemplates=You need a SmartTemplate⁴ license to use more than {1} templates!
+SmartTemplate4.fileTemplates.error.charSet=Problems converting a HTML template from charset [{1}]\nUsing raw string data instead.\nIf this results in garbled characters, try adding an explicit 'meta charset=' to the head section. Maybe try ISO-8859-1?
+SmartTemplate4.fileTemplates.error.filePath=Could not load the template file '{0}' from path:\n{1}\nThe file may have been removed or renamed.
+SmartTemplate4.fileFunction.notExists=Function {0} could not find or access file. Check the path below:
+SmartTemplate4.notification.noStationery=Could not find the Add-on 'Stationery' - is it installed?
+SmartTemplate4.fileTemplates.replaceStationery=From Thunderbird 68 onward, unfortunately Stationery does not work anymore.\nTherefore SmartTemplate⁴ now offers its own HTML template management system; click Ok to set it up.
diff --git a/locale/id-ID/register.dtd b/locale/id-ID/register.dtd
index 6cc13bd1c..b7b8a11f5 100644
--- a/locale/id-ID/register.dtd
+++ b/locale/id-ID/register.dtd
@@ -2,7 +2,9 @@
 <!ENTITY label.licenseValid "Lisensi Anda berlaku hingga:">
 <!ENTITY label.haveLicense "Sudah memiliki Lisensi?">
 <!ENTITY getSmartTemplate4 "Dapatkan Lisensi SmartTemplate⁴">
+<!ENTITY licenseTypes "Going forward, SmartTemplate⁴ offers two licenses, Standard and Pro; these are necessary to keep up with the changes in the Thunderbird platform and to finance Innovations and repairs of the Add-on. As breaking changes are rolled out in a yearly cycle, the license will also be valid for 1 year.">
 <!ENTITY intro "Lisensi tahunan SmartTemplate⁴ Pro memberikan anda semua fitur premium selama setahun. Itu juga memungkinkan kami untuk mendukung dan menumbuhkan produk lebih lanjut dan mengubahnya menjadi sesuatu yang bahkan lebih menakjubkan.">
+<!ENTITY testDriveS "You can test drive the premium features with the standard license, but they may be slightly restricted.">
 <!ENTITY yearlyLicense.title "Lisensi Tahunan">
 <!ENTITY yearlyLicense.premiumFeatures "SmartTemplate⁴ Pro memberi Anda akses tak terbatas ke fitur premium.">
 <!ENTITY yearlyLicense.premiumFeatures.moreInfoLink "Info tentang fitur premium.">
@@ -20,6 +22,10 @@
 <!ENTITY email.label "Email:">
 <!ENTITY firstName.label "Nama Depan:">
 <!ENTITY lastName.label "Nama Belakang:">
+<!ENTITY buyPremiumLicense.instruct "Want to use all premium features without restrictions? Get a SmartTemplate⁴ Pro license. It is bound to your personal Email address and can be used in multiple installations.">
+<!ENTITY buyPremiumLicense.button "Buy Pro License!">
+<!ENTITY buyStandardLicense.instruct "Can't afford the premium functions? Get a highly affordable standard license and keep testing premium functions.">
+<!ENTITY buyStandardLicense.button "Buy Standard License!">
 <!ENTITY buyDomainLicense.instruct "Butuh Lisensi untuk perusahaan dengan lebih dari lima pengguna? Mendapatkan lisensi domain yang lebih murah:">
 <!ENTITY buyDomainLicense.button "Beli Lisensi Domain">
 <!ENTITY enterLicenseKey.button "Masukkan Kunci Lisensi...">
diff --git a/locale/id-ID/settings.properties b/locale/id-ID/settings.properties
index c482023a0..20ea7aa0f 100644
--- a/locale/id-ID/settings.properties
+++ b/locale/id-ID/settings.properties
@@ -1,7 +1,11 @@
+#### DESCRIPTION FOR ADDON MANAGER ####
 extensions.smarttemplate4@thunderbird.extension.description=Pengaya SmartTemplate4 dapat menyesuaikan 'header kutipan' per akun.
+#### DESCRIPTION FOR EXPORT/IMPORT WINDOW ####
 fpFilterName=Berkas SmartTemplate4
 fpHTMLFile=Berkas HTML / Berkas Teks
 fpJsonFile=Berkas JSON
 fpImageFile=Berkas Gambar
 prompt.text=Masukkan teks untuk ditambahkan atau disetel
 prompt.email=Masukkan alamat email
+#### DESCRIPTION FOR LOAD HTML TEMPLATE WINDOW ####
+fpFilterHtmlTemplate=HTML Template
diff --git a/locale/id-ID/smartTemplate-msg.dtd b/locale/id-ID/smartTemplate-msg.dtd
index 597a36614..b9e7a604d 100644
--- a/locale/id-ID/smartTemplate-msg.dtd
+++ b/locale/id-ID/smartTemplate-msg.dtd
@@ -1,3 +1,4 @@
+<!-- #### BUTTONS #### -->
 <!ENTITY accept_button "OK">
 <!ENTITY cancel_button "Batal">
 <!ENTITY yes_button "Ya">
diff --git a/locale/id-ID/smartTemplate-overlay.dtd b/locale/id-ID/smartTemplate-overlay.dtd
index 6af038df7..5f7c4f886 100644
--- a/locale/id-ID/smartTemplate-overlay.dtd
+++ b/locale/id-ID/smartTemplate-overlay.dtd
@@ -1,3 +1,4 @@
+<!-- #### OVERLAYS #### -->
 <!ENTITY smartTemplate4.settings.label "SmartTemplate⁴">
 <!ENTITY smartTemplate4.settings.tooltip "Setelan SmartTemplate⁴">
 <!ENTITY smartTemplate4.cleandeferred.label "Membersihkan!">
diff --git a/locale/id-ID/smartTemplate-settings.dtd b/locale/id-ID/smartTemplate-settings.dtd
index 0f1a9113b..48049f6de 100644
--- a/locale/id-ID/smartTemplate-settings.dtd
+++ b/locale/id-ID/smartTemplate-settings.dtd
@@ -59,6 +59,7 @@
 <!ENTITY btnSaveTemplate.tooltip "Simpan Template...">
 <!ENTITY btnLoadTemplate.tooltip "Memuat Template...">
 <!ENTITY btnYouTube.tooltip "Kunjungi kanal Youtube 'Thunderbird Daily' - untuk tips dan tutorial dalam penggunaan Peralatan dan Pengaya lainnya">
+<!ENTITY tip.fileTemplates "Click to read full documentation about Stationery and external HTML templates on our support site…">
 <!ENTITY pref_server_def "Umum">
 <!ENTITY pref_def.label "Gunakan Umum">
 <!ENTITY pref_def.cap "Hapus centang 'Gunakan Umum' untuk membuat kutipan tajuk yang disesuaikan untuk akun ini.">
@@ -105,6 +106,7 @@
 <!ENTITY pref_defaultCharset_tip "Saat membaca header, kembali ke set karakter ini jika tidak dapat ditentukan.">
 <!-- #### ABOUT #### -->
 <!ENTITY about.cap "Tentang SmartTemplate⁴">
+<!ENTITY support.tab "Support">
 <!ENTITY creator.label "Pencipta">
 <!ENTITY developer.label "Pengembang">
 <!ENTITY localename.label "Ing-AS">
@@ -126,6 +128,7 @@
 <!ENTITY fileImage.label "Berkas gambar (png,jpg,gif,bmp,svg). AltText opsional ditampilkan jika gambar tidak dapat ditemukan.">
 <!ENTITY attach.label "Tambah berkas lampiran">
 <!ENTITY cursor.label "Setel posisi kursor">
+<!ENTITY spellcheck.label "Sets the spell-checking language. Example values: (en, de-DE, es-ES, ru) - note that the dictionary must be installed.">
 <!ENTITY to_var.cap "Penerima (Untuk)">
 <!ENTITY to_note.label "Ketika nama tidak tersedia, alamat email akan ditampilkan">
 <!ENTITY to.label "Nama penerima (bawaan)">
@@ -240,6 +243,7 @@
 <!ENTITY button.validateLicense "mengesahkan">
 <!ENTITY label.licenseValid "Lisensi Anda berlaku hingga:">
 <!ENTITY licenseValidation.passed "Terima kasih telah mendaftar SmartTemplate⁴ Pro! Semua fitur premium sekarang terbuka.">
+<!ENTITY licenseValidation.standard "Thanks for registering SmartTemplate⁴ Standard - You are helping the Add-on immensely! You also can now test drive all premium functions.">
 <!ENTITY licenseValidation.failed "Kunci lisensi yang anda masukkan tidak valid. Periksa email anda dari FastSpring untuk mendapatkan petunjuk. Jika anda masih mengalami masalah, silakan hubungi saya dari tab Dukungan.">
 <!ENTITY licenseValidation.expired "Kunci lisensi yang Anda masukkan sudah kadaluarsa. Silakan tekan tombol di bawah ini untuk memperbarui lisensi Anda.">
 <!ENTITY licenseValidation.invalidAddon "Kunci lisensi yang Anda masukkan mungkin untuk Pengaya yang berbeda. Kunci lisensi untuk {0} dimulai dengan {1}.">
@@ -247,3 +251,15 @@
 <!ENTITY licenseValidation.notMatchedMail "Alamat Email terenkripsi tidak cocok dengan yang dapat dibaca.">
 <!ENTITY premiumConfig "Fitur Premium">
 <!ENTITY label.premiumFeaturesSite "Baca selengkapnya tentang Fitur Premium di Situs Web kami">
+<!-- #####  Support ##### -->
+<!ENTITY support.title "Mail to Support">
+<!ENTITY support.type "Type:">
+<!ENTITY support.type.selectOne "Select a topic!">
+<!ENTITY support.type.license "Licensing related">
+<!ENTITY support.type.tech "Technical">
+<!ENTITY support.type.html "Help with HTML / CSS">
+<!ENTITY support.type.other "Other">
+<!ENTITY support.subject "Subject:">
+<!ENTITY support.mail.instructions "Click the button below to open a new Email to support. If you are having technical problems, consider adding a screenshot.">
+<!ENTITY support.compose "Write to support…">
+<!ENTITY support.links "Support Links">
diff --git a/locale/it/messages.properties b/locale/it/messages.properties
index ba2274369..f37553d2a 100644
--- a/locale/it/messages.properties
+++ b/locale/it/messages.properties
@@ -39,6 +39,7 @@ SmartTemplate4.fileTemplates.wrnEnterTitle=Per favore, inserisci un titolo!
 SmartTemplate4.fileTemplates.wrnEnterPath=Seleziona un percorso valido!
 SmartTemplate4.fileTemplates.openFile=Apri il file modello SmartTemplate⁴…
 SmartTemplate4.fileTemplates.restrictTemplates=È necessaria una licenza SmartTemplate⁴ per utilizzare più di {1} modelli!
+SmartTemplate4.fileTemplates.error.charSet=Problems converting a HTML template from charset [{1}]\nUsing raw string data instead.\nIf this results in garbled characters, try adding an explicit 'meta charset=' to the head section. Maybe try ISO-8859-1?
 SmartTemplate4.fileTemplates.error.filePath=Impossibile caricare il modello di file '{0}' dal percorso: \n{1} \nIl file potrebbe essere stato rimosso o rinominato.
 SmartTemplate4.fileFunction.notExists=La funzione {0} non è stata in grado di trovare o accedere al file. Controlla il percorso seguente:
 SmartTemplate4.notification.noStationery=Impossibile trovare il componente aggiuntivo "Stationery": è installato?
diff --git a/locale/it/settings.properties b/locale/it/settings.properties
index 4d35e64de..b38900335 100644
--- a/locale/it/settings.properties
+++ b/locale/it/settings.properties
@@ -7,4 +7,5 @@ fpJsonFile=File JSON
 fpImageFile=File di immagine
 prompt.text=Inserire il testo da aggiungere o impostare
 prompt.email=Inserire un indirizzo di posta elettronica
+#### DESCRIPTION FOR LOAD HTML TEMPLATE WINDOW ####
 fpFilterHtmlTemplate=Modello HTML
diff --git a/locale/it/smartTemplate-settings.dtd b/locale/it/smartTemplate-settings.dtd
index 7a4a05c0e..68953c880 100644
--- a/locale/it/smartTemplate-settings.dtd
+++ b/locale/it/smartTemplate-settings.dtd
@@ -251,6 +251,7 @@
 <!ENTITY licenseValidation.notMatchedMail "L'indirizzo di posta elettronica crittografato non corrisponde a quello in chiaro">
 <!ENTITY premiumConfig "Caratteristiche Premium">
 <!ENTITY label.premiumFeaturesSite "Maggiori informazioni sulle funzionalità Premium sul nostro sito Web">
+<!-- #####  Support ##### -->
 <!ENTITY support.title "Posta al supporto">
 <!ENTITY support.type "Genere:">
 <!ENTITY support.type.selectOne "Seleziona un argomento!">
diff --git a/locale/ja/settings.properties b/locale/ja/settings.properties
index abbd1888a..544c57171 100644
--- a/locale/ja/settings.properties
+++ b/locale/ja/settings.properties
@@ -7,4 +7,5 @@ fpJsonFile=JSON ファイル
 fpImageFile=画像ファイル
 prompt.text=置換/追記するテキストを入力してください
 prompt.email=メールアドレスを入力してください
+#### DESCRIPTION FOR LOAD HTML TEMPLATE WINDOW ####
 fpFilterHtmlTemplate=HTML テンプレート
diff --git a/locale/ja/smartTemplate-settings.dtd b/locale/ja/smartTemplate-settings.dtd
index 5eb28ee0c..5c97cc09d 100644
--- a/locale/ja/smartTemplate-settings.dtd
+++ b/locale/ja/smartTemplate-settings.dtd
@@ -251,6 +251,7 @@
 <!ENTITY licenseValidation.notMatchedMail "暗号化されたメールアドレスが読めるメールアドレスと一致しません。">
 <!ENTITY premiumConfig "プレミアム機能">
 <!ENTITY label.premiumFeaturesSite "プレミアム機能についての詳細はウェブサイトをご覧ください">
+<!-- #####  Support ##### -->
 <!ENTITY support.title "サポートにメール">
 <!ENTITY support.type "タイプ:">
 <!ENTITY support.type.selectOne "トピックを選択してください！">
diff --git a/locale/nl/settings.properties b/locale/nl/settings.properties
index b8d72c9a6..a871a8cac 100644
--- a/locale/nl/settings.properties
+++ b/locale/nl/settings.properties
@@ -7,4 +7,5 @@ fpJsonFile=JSON-bestand
 fpImageFile=Afbeeldingsbestand
 prompt.text=Voer de toe te voegen of in te stellen tekst in
 prompt.email=Voer een e-mailadres in
+#### DESCRIPTION FOR LOAD HTML TEMPLATE WINDOW ####
 fpFilterHtmlTemplate=HTML-sjabloon
diff --git a/locale/nl/smartTemplate-settings.dtd b/locale/nl/smartTemplate-settings.dtd
index 957a3b448..213ca5568 100644
--- a/locale/nl/smartTemplate-settings.dtd
+++ b/locale/nl/smartTemplate-settings.dtd
@@ -251,6 +251,7 @@
 <!ENTITY licenseValidation.notMatchedMail "Versleutelde e-mailadres komt niet overeen met het leesbare e-mailadres.">
 <!ENTITY premiumConfig "Premium-functies">
 <!ENTITY label.premiumFeaturesSite "Lees meer over Premium-functies op onze website">
+<!-- #####  Support ##### -->
 <!ENTITY support.title "E-mailbericht voor ondersteuning">
 <!ENTITY support.type "Type:">
 <!ENTITY support.type.selectOne "Selecteer een onderwerp!">
diff --git a/locale/oc/messages.properties b/locale/oc/messages.properties
index efa1bdc92..f240e1ed4 100644
--- a/locale/oc/messages.properties
+++ b/locale/oc/messages.properties
@@ -7,3 +7,40 @@ SmartTemplate4.updateMessageVersion=SmartTemplate4 es estada mesa al nivèl a la
 SmartTemplate4.updateMessageNewBrackets1=Cars utilizaires de SmartTemplate4, sèm tot excitats de vos anonciar qu'a partir d'aquesta version, SmartTemplate4 pren tanben en carga l'utilizacion d'acoladas {} e de la balisa <style> per qu'ara poscatz definir l'estil css d'un biais avançat dins vòstres modèls.
 SmartTemplate4.updateMessageNewBrackets2=A partir d'ara, la sintaxi especifica per las expressions es estada modificada : al luòc d'utilizar d'acoladas {%cc(name)%}, utilizatz de croquets dobles [[%cc(name)%]] - per mai d'informacions, rendètz-vos a l'ajuda.
 SmartTemplate4.updateMessageNewBrackets3=SmartTemplate4 ara va procedir a la conversion de vòstres modèls existent pr'amor que los poscatz utilizar dins la novèla version. Quichatz sus [OK] per contunhar.
+SmartTemplate4.notification.license.text=From now on, SmartTemplate⁴ requires at least a standard license. Read more about this on our licensing page.
+#SmartTemplate4 Pro specific
+SmartTemplate4.notification.license.required=SmartTemplate⁴ requires a license to continue working. Read more at the bottom of the compose window.
+SmartTemplate4.notification.parsing=Parsing variables:
+SmartTemplate4.notification.premium.title=Premium Feature
+SmartTemplate4.notification.premium.text={1} is a Premium feature, please upgrade to a SmartTemplate⁴ Pro License for using it permanently.
+SmartTemplate4.notification.premium.text.plural={1} are Premium features, please upgrade to a SmartTemplate⁴ Pro License for using them permanently.
+SmartTemplate4.notification.premium.btn.getLicense=Buy License
+SmartTemplate4.notification.premium.btn.hotKey=L
+SmartTemplate4.notification.premium.btn.upgrade=Upgrade to Pro
+SmartTemplate4.notification.premium.btn.upgrade.hotKey=U
+SmartTemplate4.notification.premium.btn.renewLicense=Renew License
+SmartTemplate4.notification.premium.btn.extendLicense=Extend License
+SmartTemplate4.notification.premium.btn.extendLicense.tooltip=This will extend the current license date by 1 year. It's typically cheaper than a new license.
+SmartTemplate4.notification.donate=Donate
+SmartTemplate4.notification.licensing=More about licensing
+SmartTemplate4.notification.dontShowAgain=Do not show this message again.
+SmartTemplate4.notification.spellcheck.noDictionary=No dictionaries installed.
+SmartTemplate4.notification.spellcheck.notFound=Dictionary '{0}' not found.
+SmartTemplate4.notification.spellcheck.error=Cannot switch spell checker language. Have you installed the correct dictionary?
+SmartTemplate4.licenseValidation.expired=Your license expired on:
+SmartTemplate4.licenseValidation.guessAddon=(The key entered may be for {2}).
+SmartTemplate4.prompt.switchDomainLicense=Switch to Domain License?
+SmartTemplate4.trialDays=You have {0} trial days left.
+SmartTemplate4.trialExpiry=Your trial period expired {0} days ago.
+SmartTemplate4.fileTemplates=Template Files
+SmartTemplate4.fileTemplates.wrnSelectUpdateItem=You have to select an item from the list to update!
+SmartTemplate4.fileTemplates.wrnSelectUpdateItem.caption=Update Templates
+SmartTemplate4.fileTemplates.wrnEnterTitle=Please enter a title!
+SmartTemplate4.fileTemplates.wrnEnterPath=Please select a valid path!
+SmartTemplate4.fileTemplates.openFile=Open SmartTemplate⁴ template file…
+SmartTemplate4.fileTemplates.restrictTemplates=You need a SmartTemplate⁴ license to use more than {1} templates!
+SmartTemplate4.fileTemplates.error.charSet=Problems converting a HTML template from charset [{1}]\nUsing raw string data instead.\nIf this results in garbled characters, try adding an explicit 'meta charset=' to the head section. Maybe try ISO-8859-1?
+SmartTemplate4.fileTemplates.error.filePath=Could not load the template file '{0}' from path:\n{1}\nThe file may have been removed or renamed.
+SmartTemplate4.fileFunction.notExists=Function {0} could not find or access file. Check the path below:
+SmartTemplate4.notification.noStationery=Could not find the Add-on 'Stationery' - is it installed?
+SmartTemplate4.fileTemplates.replaceStationery=From Thunderbird 68 onward, unfortunately Stationery does not work anymore.\nTherefore SmartTemplate⁴ now offers its own HTML template management system; click Ok to set it up.
diff --git a/locale/oc/register.dtd b/locale/oc/register.dtd
index fa10fcd32..929afb88a 100644
--- a/locale/oc/register.dtd
+++ b/locale/oc/register.dtd
@@ -2,11 +2,14 @@
 <!ENTITY label.licenseValid "Your license is valid until:">
 <!ENTITY label.haveLicense "Already have a License?">
 <!ENTITY getSmartTemplate4 "Get SmartTemplate⁴ Pro">
+<!ENTITY licenseTypes "Going forward, SmartTemplate⁴ offers two licenses, Standard and Pro; these are necessary to keep up with the changes in the Thunderbird platform and to finance Innovations and repairs of the Add-on. As breaking changes are rolled out in a yearly cycle, the license will also be valid for 1 year.">
 <!ENTITY intro "An annual license for SmartTemplate⁴ Pro gives you all premium features for a year. It also enables us to support and grow the product further and turn it into something even more awesome.">
+<!ENTITY testDriveS "You can test drive the premium features with the standard license, but they may be slightly restricted.">
 <!ENTITY yearlyLicense.title "Annual License">
 <!ENTITY yearlyLicense.premiumFeatures "SmartTemplate⁴ Pro gives you full unrestricted access to the premium features.">
 <!ENTITY yearlyLicense.premiumFeatures.moreInfoLink "More about premium features.">
 <!ENTITY yearlyLicense.usageTerm "The license is for your personal use and is tied to your email address. You can install it on multiple email clients as long as they are configured to use that address.">
+<!ENTITY yearlyLicense.usageTerm1 "Any additional email addresses are no problem - they do not require a separate license. In case of questions you can reach me via the support tab.">
 <!ENTITY domainLicense.email "We will contact you using this email address to generate your domain license; please allow two business days for us to get in touch. Enter the domain name for the license on the next page.">
 <!ENTITY domainLicense.header "Licensed Email Domain">
 <!ENTITY domainLicense.instruct "The license is keyed to your company domain. The license will allow users with email addresses ending on this email domain to use SmartTemplate⁴ Pro. E.g. if you enter the domain name 'abc.com' then mail users like fred@abc.com, martha@abc.com, mike.doe@abc.com etc. are allowed to use the license. The maximum number of valid individual users is the number you have entered on the initial screen.">
@@ -19,6 +22,10 @@
 <!ENTITY email.label "Email:">
 <!ENTITY firstName.label "First Name:">
 <!ENTITY lastName.label "Last Name:">
+<!ENTITY buyPremiumLicense.instruct "Want to use all premium features without restrictions? Get a SmartTemplate⁴ Pro license. It is bound to your personal Email address and can be used in multiple installations.">
+<!ENTITY buyPremiumLicense.button "Buy Pro License!">
+<!ENTITY buyStandardLicense.instruct "Can't afford the premium functions? Get a highly affordable standard license and keep testing premium functions.">
+<!ENTITY buyStandardLicense.button "Buy Standard License!">
 <!ENTITY buyDomainLicense.instruct "Need Licenses for a company with more than five users? Getting a domain license will work out cheaper:">
 <!ENTITY buyDomainLicense.button "Buy Domain License">
 <!ENTITY enterLicenseKey.button "Enter License Key…">
diff --git a/locale/oc/settings.properties b/locale/oc/settings.properties
index c56d12849..27907e9a6 100644
--- a/locale/oc/settings.properties
+++ b/locale/oc/settings.properties
@@ -2,3 +2,10 @@
 extensions.smarttemplate4@thunderbird.extension.description=Lo smart modèl que pòt personalizar l'entèsta de la citacion pels comptes.
 #### DESCRIPTION FOR EXPORT/IMPORT WINDOW ####
 fpFilterName=Fichièr SmartTemplate4
+fpHTMLFile=HTML File / Text File
+fpJsonFile=JSON File
+fpImageFile=Image File
+prompt.text=Enter the text to add or set
+prompt.email=Enter an email address
+#### DESCRIPTION FOR LOAD HTML TEMPLATE WINDOW ####
+fpFilterHtmlTemplate=HTML Template
diff --git a/locale/oc/smartTemplate-overlay.dtd b/locale/oc/smartTemplate-overlay.dtd
index 81cba2b79..ec28625f7 100644
--- a/locale/oc/smartTemplate-overlay.dtd
+++ b/locale/oc/smartTemplate-overlay.dtd
@@ -1,3 +1,8 @@
 <!-- #### OVERLAYS #### -->
 <!ENTITY smartTemplate4.settings.label "SmartTemplate⁴">
 <!ENTITY smartTemplate4.settings.tooltip "Opcions de SmartTemplate⁴">
+<!ENTITY smartTemplate4.cleandeferred.label "Clean up!">
+<!ENTITY smartTemplate4.cleandeferred.tooltip "Clean up all SmartTemplate variables">
+<!ENTITY smartTemplate4.deferredcontext.update "Update SmartTemplate⁴ contents">
+<!ENTITY smartTemplate4.deferredcontext.cleanup "Update and Replace with Content">
+<!ENTITY smartTemplate4.deferredcontext.delete "Remove SmartTemplate⁴ variable">
diff --git a/locale/oc/smartTemplate-settings.dtd b/locale/oc/smartTemplate-settings.dtd
index 61217f6c5..40f29719c 100644
--- a/locale/oc/smartTemplate-settings.dtd
+++ b/locale/oc/smartTemplate-settings.dtd
@@ -24,12 +24,26 @@
 <!ENTITY pref_help.tab "Assistent">
 <!ENTITY pref_about.tab "A prepaus">
 <!ENTITY pref_global.tab "Paramètres generals">
+<!ENTITY pref_advanced.tab "Advanced Settings">
 <!ENTITY pref_variables.tab "Variablas">
+<!ENTITY pref_examples.tab "Examples (online only)">
+<!ENTITY pref_examples.tooltip "Show example templates from http://smarttemplate4.mozdev.org/templates.html. Only available in online mode.">
 <!-- #### BUTTONS #### -->
 <!ENTITY accept_button "Acceptar">
 <!ENTITY cancel_button "Anullar">
 <!ENTITY contribute_button "Contribuir">
+<!ENTITY button.updateThunderbird "Update Thunderbird!">
 <!-- #### ABOUT #### -->
+<!ENTITY pref_groupMailContent "Mail Content">
+<!ENTITY pref_groupSignatures "Signatures">
+<!ENTITY pref_groupAdvanced "Advanced Functions">
+<!ENTITY pref_groupUI "User Interface">
+<!ENTITY pref_groupNameRules "Name Rules">
+<!ENTITY pref_groupTroubleShooting "Troubleshooting">
+<!ENTITY pref_addSigBreakHTML.label "Add -- in HTML mail">
+<!ENTITY pref_addSigBreakHTML.tooltip "Always add the -- delimiter before the Signature (in HTML mails)">
+<!ENTITY pref_addSigBreakPlaintext.label "Add -- in plain text mail">
+<!ENTITY pref_addSigBreakPlaintext.tooltip "Always add the -- delimiter before the Signature (in plain text mails)">
 <!ENTITY pref_quoteHeaderBox.label "Títol de citacion">
 <!ENTITY pref_quoteHeaderBox_tip "Escrivètz vòstra entèsta dins aquesta bóstia, ex. : Lo &#37;date&#37; a escrich &#37;from(name)&#37; :">
 <!ENTITY pref_templateBox.label "Modèl">
@@ -37,8 +51,15 @@
 <!ENTITY pref_breaksOnTop.label "Nombre de retorns a la linha en naut :">
 <!ENTITY pref_removeSig.label "Suprimir la signatura al moment del cambiament de compte de mail">
 <!ENTITY pref_showStatusIcon.label "Afichar un boton dins la barra dels moduls">
+<!ENTITY pref_StatusIcon.IconOnly "Icon Only">
+<!ENTITY pref_StatusIcon.IconText "Icon And Text">
+<!ENTITY pref_StatusIcon.IconHoverText "Text on Hover">
 <!ENTITY pref_fontSettings.label "Poliça de l'editor de gabarit">
 <!ENTITY pref_server_desc "Compte">
+<!ENTITY btnSaveTemplate.tooltip "Save Template…">
+<!ENTITY btnLoadTemplate.tooltip "Load Template…">
+<!ENTITY btnYouTube.tooltip "Visit 'Thunderbird Daily' YouTube channel - for tips and tutorials for using Stationery and other Addons">
+<!ENTITY tip.fileTemplates "Click to read full documentation about Stationery and external HTML templates on our support site…">
 <!ENTITY pref_server_def "Opcions globalas">
 <!ENTITY pref_def.label "Utilizar las opcions globalas">
 <!ENTITY pref_def.cap "Desactivar « Utilizar las opcions globalas » per crear una entèsta personalizada per aqueste compte.">
@@ -55,9 +76,37 @@
 <!ENTITY help_dialog_title "Ajuda de SmartTemplate⁴">
 <!ENTITY help_keyword.cap "Ajuda">
 <!ENTITY pref_debug_check "Mòde desbugatge">
+<!ENTITY pref_hideExamples "Hide examples tab">
 <!ENTITY pref_debug_tip "Clic drech per las opcions avançadas de desbugatge">
+<!ENTITY pref_nameSwap "Correct LastName, FirstName">
+<!ENTITY pref_nameSwap_tip "Changes 'LastName, FirstName' to 'First Last'">
+<!ENTITY defaultMimeFormat "Default address format:">
+<!ENTITY defaultMimeFormat_tip "Format to use when replacing plain &#37;to&#37; &#37;from&#37; &#37;cc&#37; addresses. E.g. firstname,lastname,??mail will show first name followed by last name; if both are unavailable, it will show the mail address.">
+<!ENTITY pref_addressDelimiter "Delimit multiple correspondents with:">
+<!ENTITY pref_addressDelimiter_tip "Delimiter between multiple correspondents. Outlook uses semicolon (;) Default for Thunderbird is Comma (,)">
+<!ENTITY resolveNamesFromAB "Resolve names from address books">
+<!ENTITY resolveNamesFromAB_tip "This feature does not work with certain remote address books, such as LDAP.">
+<!ENTITY resolveNamesFromABNick "Replace first name with Nickname if present">
+<!ENTITY resolveNamesFromABDisplay "Use Display Name if first name missing">
+<!ENTITY resolveABRemoveMail "Remove email address unless format parameter is specified">
+<!ENTITY suppressMailtToLink "Suppress Mail Clients adding links to Email addresses.">
+<!ENTITY capitalizeNames "Capitalize Names">
+<!ENTITY guessNameFromMail "Guess Name parts from email address if missing">
+<!ENTITY pref_parseSignature "Process signature">
+<!ENTITY pref_parseSignature_tip "Replace variables in signature.">
+<!ENTITY pref_cursorInsertSpace "Insert Space to highlight &#37;cursor&#37;">
+<!ENTITY pref_stationerySupport "Support Stationery addon">
+<!ENTITY pref_stationerySupport_tip "Supports using Stationery at the same time with SmartTemplate⁴.">
+<!ENTITY pref_stationerySupport_tip2 "This makes it possible to use template variables in your Stationery.">
+<!ENTITY pref_stationeryLink "Stationery Addon">
+<!ENTITY pref_forceParagraph "Force Paragraph Mode">
+<!ENTITY pref_forceParagraph_tip "Makes sure that the cursor position starts off in a paragraph. We also recommend the Thunderbird Composition option to create a new paragraph on pressing the [Enter] key.">
+<!ENTITY pref_stationeryLink_tip "Get Stationery…">
+<!ENTITY pref_defaultCharset.label "Default charset">
+<!ENTITY pref_defaultCharset_tip "When reading the headers, fall back to this character set if it cannot be determined.">
 <!-- #### HELP #### -->
 <!ENTITY about.cap "A prepaus de SmartTemplate⁴">
+<!ENTITY support.tab "Support">
 <!ENTITY creator.label "Creator">
 <!ENTITY developer.label "Desvolopaire">
 <!ENTITY localename.label "oc">
@@ -75,11 +124,17 @@
 <!ENTITY ccmail.label "Adreça electronica dels destinataris en còpia">
 <!ENTITY sig.label "Signatura eissida dels paramètres del compte">
 <!ENTITY sig2.label "Signatura eissida dels paramètres del compte, mas sens '--'">
+<!ENTITY fileHTML.label "HTML or plain text file. UTF-8 is assumed when omitting the optional charset parameter.">
+<!ENTITY fileImage.label "Image file (png,jpg,gif,bmp,svg). The optional altText is displayed if the image can't be found.">
+<!ENTITY attach.label "Add file as attachment">
+<!ENTITY cursor.label "Sets the cursor position">
+<!ENTITY spellcheck.label "Sets the spell-checking language. Example values: (en, de-DE, es-ES, ru) - note that the dictionary must be installed.">
 <!ENTITY to_var.cap "Destinataris (Per)">
 <!ENTITY to_note.label "Quand lo nom es pas disponible, l'adreça electronica serà pas afichada a la plaça">
 <!ENTITY to.label "Noms dels destinataris (defaut)">
 <!ENTITY tofirstname.label "Pichons noms dels destinataris">
 <!ENTITY toname.label "Noms dels destinataris">
+<!ENTITY tofwd.label "Use fwd to add the clickable recipient in forwarded mails">
 <!ENTITY from_var.cap "Expeditor (De)">
 <!ENTITY from_note.label "Quand lo nom es pas disponible, l'adreça electronica serà pas afichada a la plaça">
 <!ENTITY from.label "Nom de l'expeditor (defaut)">
@@ -102,12 +157,31 @@
 <!ENTITY newsgr.label "Newsgroups">
 <!ENTITY xmail.label "X-Mailer">
 <!ENTITY any.label "Quina entèsta que siá">
+<!ENTITY header_function.cap "Modify Mail Header">
+<!ENTITY header_function.explain "These functions can be used to modify mail headers, as described here:">
+<!ENTITY header_function.scope "It can be used with the these headers:">
+<!ENTITY header.set.subject "replace subject with the text">
+<!ENTITY header.prefix.subject "prefix subject with the text">
+<!ENTITY header.append.subject "append text to subject">
+<!ENTITY header.set.to "replace recipient with email address">
+<!ENTITY header.append.to "add email to recipient list">
+<!ENTITY stringmanip_function.cap "String Manipulation">
+<!ENTITY stringmanip_function.explain "These functions can be used to delete or replace text within the Email template or quote header.">
+<!ENTITY deleteText "Remove some text from the Quote, e.g. deleteText(&quot;via Paypal&quot;)">
+<!ENTITY replaceText "Replace some text with something else.">
+<!ENTITY matchTextFromBody "Find a RegEx pattern in quoted Email and insert at function location.">
+<!ENTITY matchTextFromSubject "Find a RegEx pattern in subject and insert at function location.">
+<!ENTITY stringmanip.match.comment "match Functions: The first parameter (the regular expression) must be within double quotes. The second parameter is the match group number. Use 0 to match the complete expression, 1 for the first group etc.">
 <!ENTITY fix_vartz.cap "Variablas fixas pel format de data e la zòna orària">
 <!ENTITY fix_vartz_note.label "Pòt èsser combinada amb &#37;X:=sent&#37;">
 <!ENTITY datelocal.label "Data e ora (format local)">
 <!ENTITY dateshort.label "Data e ora cortas (ex. : 01.01.2000 1:23:45)">
 <!ENTITY datetz.label "Fus orari (+0100, +0200, ... )">
 <!ENTITY tzname.label "GMT, PST, EST,…">
+<!ENTITY timezone.explain "Force specific timezone for date variables by replacing the tz parameter (GMT, EST, CST, PST etc.)">
+<!ENTITY dateoffset_note.label "The following function adds an offset to all following displayed times.">
+<!ENTITY calculate.explain "DD=number of days to add. H=number of hours to add (optional). MM=minutes to add (optional) ">
+<!ENTITY calculate.reset "Set the argument to 0 to stop modifying any dates.">
 <!ENTITY var_custom.cap "Variablas per personalizar lo format de data ">
 <!ENTITY customdf_note.label "Pòt èsser combinada amb &#37;X:=sent&#37;">
 <!ENTITY A.label "Jorn de la setmana (Divendres)">
@@ -129,6 +203,9 @@
 <!ENTITY p1.label "a.m.">
 <!ENTITY p2.label "A.M.">
 <!ENTITY p3.label "AM">
+<!ENTITY dateformat.label "Function for inserting current time (clickable field).">
+<!ENTITY dateformat.explain "Most time variables from above can be used in the parameter string by omitting &#37;. See also:">
+<!ENTITY dateformat.example "Example: ">
 <!ENTITY var_xsent.cap "Lo modificador &#37;X:=sent&#37;">
 <!ENTITY xsent_note.label "Per defaut, las variablas de data e ora seràn totjorn inicializadas amb las valors correntas (al moment de la creacion del messatge). Combinat amb &#37;X:=sent&#37;, las variablas de data e ora seràn las del messatge original.">
 <!ENTITY xsent_long.cap "Exemple d'un format long:">
@@ -153,7 +230,36 @@
 <!ENTITY html_note.label "Mercé d'utilizar pas que lo jòc de caractèrs UTF-8 (Unicode) dins lo HTML !">
 <!ENTITY table.cap "Utilizacion de las variablas">
 <!ENTITY table_note.label "Se una variabla es utilizada d'un biais incorrècte, un messatge d'error serà mandat cap a la consòla d'error.">
+<!-- #### TABLE #### -->
 <!ENTITY table_keyword.label "Variabla">
 <!ENTITY table_new.label "Novèl">
 <!ENTITY table_reply.label "Respondre">
 <!ENTITY table_fwd.label "Transferir">
+<!-- SmartTemplate4 Pro stuff -->
+<!ENTITY tab.gopro "SmartTemplate⁴ Pro">
+<!ENTITY label.insertLicense "Insert your personal License key here:">
+<!ENTITY label.insertLicense.tooltip "Your license key is contained in your order confirmation email from Fastspring.">
+<!ENTITY button.pasteLicense "paste">
+<!ENTITY button.validateLicense "validate">
+<!ENTITY label.licenseValid "Your license is valid until:">
+<!ENTITY licenseValidation.passed "Thanks for registering SmartTemplate⁴ Pro! All premium features are now unlocked.">
+<!ENTITY licenseValidation.standard "Thanks for registering SmartTemplate⁴ Standard - You are helping the Add-on immensely! You also can now test drive all premium functions.">
+<!ENTITY licenseValidation.failed "The license key you entered is not valid. Check your email from FastSpring for instructions. If you still have problems, please contact me from the Support tab.">
+<!ENTITY licenseValidation.expired "The license key you entered is expired. Please press the button below to renew your license.">
+<!ENTITY licenseValidation.invalidAddon "The license key you entered may be for a different Add-on. License keys for {0} start with {1}.">
+<!ENTITY licenseValidation.invalidMail "The email address that is bound to the license key [{1}] is currently not listed in any of your mail accounts. Please contact me from the Support tab for assistance.">
+<!ENTITY licenseValidation.notMatchedMail "Encrypted Email address does not match readable one.">
+<!ENTITY premiumConfig "Premium Features">
+<!ENTITY label.premiumFeaturesSite "Read more about Premium Features on our Website">
+<!-- #####  Support ##### -->
+<!ENTITY support.title "Mail to Support">
+<!ENTITY support.type "Type:">
+<!ENTITY support.type.selectOne "Select a topic!">
+<!ENTITY support.type.license "Licensing related">
+<!ENTITY support.type.tech "Technical">
+<!ENTITY support.type.html "Help with HTML / CSS">
+<!ENTITY support.type.other "Other">
+<!ENTITY support.subject "Subject:">
+<!ENTITY support.mail.instructions "Click the button below to open a new Email to support. If you are having technical problems, consider adding a screenshot.">
+<!ENTITY support.compose "Write to support…">
+<!ENTITY support.links "Support Links">
diff --git a/locale/pl/messages.properties b/locale/pl/messages.properties
index 6cd032c00..7c6acc347 100644
--- a/locale/pl/messages.properties
+++ b/locale/pl/messages.properties
@@ -39,6 +39,7 @@ SmartTemplate4.fileTemplates.wrnEnterTitle=Proszę podać tytuł!
 SmartTemplate4.fileTemplates.wrnEnterPath=Wybierz prawidłową ścieżkę!
 SmartTemplate4.fileTemplates.openFile=Otwórz plik szablonu SmartTemplate⁴…
 SmartTemplate4.fileTemplates.restrictTemplates=Aby korzystać z więcej niż {1} szablonów, potrzebujesz licencji SmartTemplate!!
+SmartTemplate4.fileTemplates.error.charSet=Problems converting a HTML template from charset [{1}]\nUsing raw string data instead.\nIf this results in garbled characters, try adding an explicit 'meta charset=' to the head section. Maybe try ISO-8859-1?
 SmartTemplate4.fileTemplates.error.filePath=Nie można załadować szablonu pliku „{0}” ze ścieżki: \n{1}\nPlik mógł zostać usunięty lub zmieniono jego nazwę.
 SmartTemplate4.fileFunction.notExists=Funkcja {0} nie mogła znaleźć pliku lub uzyskać do niego dostępu. Sprawdź ścieżkę poniżej:
 SmartTemplate4.notification.noStationery=Nie można znaleźć dodatku „Stationery” - czy jest zainstalowany?
diff --git a/locale/pl/settings.properties b/locale/pl/settings.properties
index 60ddd7b44..d170c07b2 100644
--- a/locale/pl/settings.properties
+++ b/locale/pl/settings.properties
@@ -7,3 +7,5 @@ fpJsonFile=Plik JSON
 fpImageFile=Plik obrazka
 prompt.text=Wprowadź tekst, aby dodać lub ustawić
 prompt.email=Wprowadź adres wiadomości
+#### DESCRIPTION FOR LOAD HTML TEMPLATE WINDOW ####
+fpFilterHtmlTemplate=HTML Template
diff --git a/locale/pl/smartTemplate-settings.dtd b/locale/pl/smartTemplate-settings.dtd
index 9738ad71d..fe5e4a9fe 100644
--- a/locale/pl/smartTemplate-settings.dtd
+++ b/locale/pl/smartTemplate-settings.dtd
@@ -235,6 +235,7 @@
 <!ENTITY table_new.label "Nowa">
 <!ENTITY table_reply.label "Odpowiedz">
 <!ENTITY table_fwd.label "Przekaż">
+<!-- SmartTemplate4 Pro stuff -->
 <!ENTITY tab.gopro "SmartTemplate⁴ Pro">
 <!ENTITY label.insertLicense "Wklej tutaj twój osobisty klucz licencji:">
 <!ENTITY label.insertLicense.tooltip "Twój klucz licencyjny zawarty jest w mailu od Fastspring potwierdzającym zamówienie">
@@ -250,6 +251,7 @@
 <!ENTITY licenseValidation.notMatchedMail "Zaszyfrowany adres e-mail nie odpowiada oryginałowi.">
 <!ENTITY premiumConfig "Funkcje premium">
 <!ENTITY label.premiumFeaturesSite "Przeczytaj więcej o funkcjach Premium na naszej stronie internetowej">
+<!-- #####  Support ##### -->
 <!ENTITY support.title "Wyślij pocztą do wsparcia">
 <!ENTITY support.type "Rodzaj:">
 <!ENTITY support.type.selectOne "Wybierz temat!">
diff --git a/locale/pt-BR/messages.properties b/locale/pt-BR/messages.properties
index f1159ede9..0bc898720 100644
--- a/locale/pt-BR/messages.properties
+++ b/locale/pt-BR/messages.properties
@@ -24,10 +24,23 @@ SmartTemplate4.notification.premium.btn.extendLicense.tooltip=Isso aumentará a
 SmartTemplate4.notification.donate=Doar
 SmartTemplate4.notification.licensing=Mais sobre licenciamento
 SmartTemplate4.notification.dontShowAgain=Não mostrar esta mensagem novamente.
+SmartTemplate4.notification.spellcheck.noDictionary=No dictionaries installed.
+SmartTemplate4.notification.spellcheck.notFound=Dictionary '{0}' not found.
+SmartTemplate4.notification.spellcheck.error=Cannot switch spell checker language. Have you installed the correct dictionary?
 SmartTemplate4.licenseValidation.expired=Sua licença expira em:
 SmartTemplate4.licenseValidation.guessAddon=(A chave inserida pode ser para {2}).
 SmartTemplate4.prompt.switchDomainLicense=Mudar para a Licença de Domínio?
 SmartTemplate4.trialDays=Você tem {0} dias de teste restantes.
+SmartTemplate4.trialExpiry=Your trial period expired {0} days ago.
+SmartTemplate4.fileTemplates=Template Files
+SmartTemplate4.fileTemplates.wrnSelectUpdateItem=You have to select an item from the list to update!
+SmartTemplate4.fileTemplates.wrnSelectUpdateItem.caption=Update Templates
+SmartTemplate4.fileTemplates.wrnEnterTitle=Please enter a title!
+SmartTemplate4.fileTemplates.wrnEnterPath=Please select a valid path!
+SmartTemplate4.fileTemplates.openFile=Open SmartTemplate⁴ template file…
+SmartTemplate4.fileTemplates.restrictTemplates=You need a SmartTemplate⁴ license to use more than {1} templates!
+SmartTemplate4.fileTemplates.error.charSet=Problems converting a HTML template from charset [{1}]\nUsing raw string data instead.\nIf this results in garbled characters, try adding an explicit 'meta charset=' to the head section. Maybe try ISO-8859-1?
+SmartTemplate4.fileTemplates.error.filePath=Could not load the template file '{0}' from path:\n{1}\nThe file may have been removed or renamed.
 SmartTemplate4.fileFunction.notExists=A função {0} não pôde encontrar ou acessar o arquivo. Verifique o caminho abaixo:
 SmartTemplate4.notification.noStationery=Não foi possível encontrar o 'Stationery' do complemento - ele está instalado?
 SmartTemplate4.fileTemplates.replaceStationery=A partir do Thunderbird 68 em diante, infelizmente o 'Stationery' não funciona mais.\nPortanto, o SmartTemplate⁴ agora oferece seu próprio sistema de gerenciamento de modelos HTML; clique em Ok para configurá-lo.
diff --git a/locale/pt-BR/settings.properties b/locale/pt-BR/settings.properties
index b7b5030f2..d8005f5b6 100644
--- a/locale/pt-BR/settings.properties
+++ b/locale/pt-BR/settings.properties
@@ -7,3 +7,5 @@ fpJsonFile=Arquivo JSON
 fpImageFile=Arquivo de Imagem
 prompt.text=Digite o texto para adicionar ou definir
 prompt.email=Digite um endereço de email
+#### DESCRIPTION FOR LOAD HTML TEMPLATE WINDOW ####
+fpFilterHtmlTemplate=HTML Template
diff --git a/locale/pt-BR/smartTemplate-overlay.dtd b/locale/pt-BR/smartTemplate-overlay.dtd
index 6e89a6739..361be3cde 100644
--- a/locale/pt-BR/smartTemplate-overlay.dtd
+++ b/locale/pt-BR/smartTemplate-overlay.dtd
@@ -1,3 +1,8 @@
 <!-- #### OVERLAYS #### -->
 <!ENTITY smartTemplate4.settings.label "SmartTemplate⁴">
 <!ENTITY smartTemplate4.settings.tooltip "Opções do SmartTemplate⁴">
+<!ENTITY smartTemplate4.cleandeferred.label "Clean up!">
+<!ENTITY smartTemplate4.cleandeferred.tooltip "Clean up all SmartTemplate variables">
+<!ENTITY smartTemplate4.deferredcontext.update "Update SmartTemplate⁴ contents">
+<!ENTITY smartTemplate4.deferredcontext.cleanup "Update and Replace with Content">
+<!ENTITY smartTemplate4.deferredcontext.delete "Remove SmartTemplate⁴ variable">
diff --git a/locale/pt-BR/smartTemplate-settings.dtd b/locale/pt-BR/smartTemplate-settings.dtd
index 4c09a79ca..ad38cacca 100644
--- a/locale/pt-BR/smartTemplate-settings.dtd
+++ b/locale/pt-BR/smartTemplate-settings.dtd
@@ -59,6 +59,7 @@
 <!ENTITY btnSaveTemplate.tooltip "Salvar modelo...">
 <!ENTITY btnLoadTemplate.tooltip "Carregar modelo...">
 <!ENTITY btnYouTube.tooltip "Visite o canal 'Thunderbird Daily' no YouTube - para dicas e tutoriais usando o Stationery e outras complementos">
+<!ENTITY tip.fileTemplates "Click to read full documentation about Stationery and external HTML templates on our support site…">
 <!ENTITY pref_server_def "Configuração global">
 <!ENTITY pref_def.label "Usar configuração global">
 <!ENTITY pref_def.cap "Para fazer configurações específicas nesta conta, desmarque a opção 'Usar configuração global'.">
@@ -80,6 +81,7 @@
 <!ENTITY pref_nameSwap "Corrigir sobrenome, nome">
 <!ENTITY pref_nameSwap_tip "Altera 'sobrenome, nome'' para 'Primeiro Último'">
 <!ENTITY defaultMimeFormat "Formato de endereço padrão:">
+<!ENTITY defaultMimeFormat_tip "Format to use when replacing plain &#37;to&#37; &#37;from&#37; &#37;cc&#37; addresses. E.g. firstname,lastname,??mail will show first name followed by last name; if both are unavailable, it will show the mail address.">
 <!ENTITY pref_addressDelimiter "Delimitar vários correspondentes com:">
 <!ENTITY pref_addressDelimiter_tip "Delimitador entre vários correspondentes. O Outlook usa ponto e vírgula (;) O padrão do Thunderbird é Vírgula (,)">
 <!ENTITY resolveNamesFromAB "Resolver nomes do catálogo de endereços">
@@ -104,6 +106,7 @@
 <!ENTITY pref_defaultCharset_tip "Ao ler cabeçalhos, retroceder a esta codificação se não puder ser determinada.">
 <!-- #### ABOUT #### -->
 <!ENTITY about.cap "Sobre SmartTemplate⁴">
+<!ENTITY support.tab "Support">
 <!ENTITY creator.label "Criação">
 <!ENTITY developer.label "Desenvolvimento">
 <!ENTITY localename.label "pt-BR">
@@ -125,11 +128,13 @@
 <!ENTITY fileImage.label "Arquivo de imagem (PNG, JOG, GIF, BMP, SVG). O texto alternativoé exibido se a imagem não pode ser localizada.">
 <!ENTITY attach.label "Adicionar arquivo como anexo">
 <!ENTITY cursor.label "Definir a posição do cursor">
+<!ENTITY spellcheck.label "Sets the spell-checking language. Example values: (en, de-DE, es-ES, ru) - note that the dictionary must be installed.">
 <!ENTITY to_var.cap "Variáveis de destinatário (Para)">
 <!ENTITY to_note.label "Quando o nome não estiver disponível, o endereço de e-mail será exibido no lugar">
 <!ENTITY to.label "Destinatário (padrão)">
 <!ENTITY tofirstname.label "Primeiro nome do destinatário">
 <!ENTITY toname.label "Nome do destinatário">
+<!ENTITY tofwd.label "Use fwd to add the clickable recipient in forwarded mails">
 <!ENTITY from_var.cap "Variáveis de remetente (De)">
 <!ENTITY from_note.label "Quando o nome não estiver disponível, o endereço de e-mail será exibido no lugar">
 <!ENTITY from.label "Remetente (padrão)">
@@ -8326,6 +8331,8198 @@
 
 
 
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 
 
 
@@ -8437,3 +16634,15 @@
 <!ENTITY licenseValidation.notMatchedMail "O endereço de e-mail criptografado não corresponde ao legível.">
 <!ENTITY premiumConfig "Recursos Premium">
 <!ENTITY label.premiumFeaturesSite "Leia mais sobre os Recursos Premium em nosso site">
+<!-- #####  Support ##### -->
+<!ENTITY support.title "Mail to Support">
+<!ENTITY support.type "Type:">
+<!ENTITY support.type.selectOne "Select a topic!">
+<!ENTITY support.type.license "Licensing related">
+<!ENTITY support.type.tech "Technical">
+<!ENTITY support.type.html "Help with HTML / CSS">
+<!ENTITY support.type.other "Other">
+<!ENTITY support.subject "Subject:">
+<!ENTITY support.mail.instructions "Click the button below to open a new Email to support. If you are having technical problems, consider adding a screenshot.">
+<!ENTITY support.compose "Write to support…">
+<!ENTITY support.links "Support Links">
diff --git a/locale/ru/messages.properties b/locale/ru/messages.properties
index 62eff1822..49b34c426 100644
--- a/locale/ru/messages.properties
+++ b/locale/ru/messages.properties
@@ -26,11 +26,21 @@ SmartTemplate4.notification.licensing=Подробнее о лицензиров
 SmartTemplate4.notification.dontShowAgain=Не показывать это сообщение снова.
 SmartTemplate4.notification.spellcheck.noDictionary=Словари не установлены.
 SmartTemplate4.notification.spellcheck.notFound=Словарь '{0}' не найден.
+SmartTemplate4.notification.spellcheck.error=Cannot switch spell checker language. Have you installed the correct dictionary?
 SmartTemplate4.licenseValidation.expired=Ваша лицензия истекает:
 SmartTemplate4.licenseValidation.guessAddon=(Введённый ключ может быть для {2}).
 SmartTemplate4.prompt.switchDomainLicense=SПерейти на доменную лицензию?
 SmartTemplate4.trialDays=У вас осталось {0} пробных дней.
 SmartTemplate4.trialExpiry=Пробный период истек {0} дней назад.
+SmartTemplate4.fileTemplates=Template Files
+SmartTemplate4.fileTemplates.wrnSelectUpdateItem=You have to select an item from the list to update!
+SmartTemplate4.fileTemplates.wrnSelectUpdateItem.caption=Update Templates
+SmartTemplate4.fileTemplates.wrnEnterTitle=Please enter a title!
+SmartTemplate4.fileTemplates.wrnEnterPath=Please select a valid path!
+SmartTemplate4.fileTemplates.openFile=Open SmartTemplate⁴ template file…
+SmartTemplate4.fileTemplates.restrictTemplates=You need a SmartTemplate⁴ license to use more than {1} templates!
+SmartTemplate4.fileTemplates.error.charSet=Problems converting a HTML template from charset [{1}]\nUsing raw string data instead.\nIf this results in garbled characters, try adding an explicit 'meta charset=' to the head section. Maybe try ISO-8859-1?
 SmartTemplate4.fileTemplates.error.filePath=Не удалось загрузить шаблон файла '{0}' по пути: \n{1} \nФайл, возможно, был удален или переименован.
 SmartTemplate4.fileFunction.notExists=Функция {0} не может найти или получить доступ к файлу. Проверьте путь ниже:
+SmartTemplate4.notification.noStationery=Could not find the Add-on 'Stationery' - is it installed?
 SmartTemplate4.fileTemplates.replaceStationery=Начиная с Thunderbird 68 и далее, к сожалению, канцелярские товары больше не работают.\nПоэтому SmartTemplate⁴ теперь предлагает свою собственную систему управления шаблонами HTML; нажмите Ok, чтобы настроить его.
diff --git a/locale/ru/settings.properties b/locale/ru/settings.properties
index 89e5106f1..392dc34cd 100644
--- a/locale/ru/settings.properties
+++ b/locale/ru/settings.properties
@@ -7,3 +7,5 @@ fpJsonFile=Файл JSON
 fpImageFile=Картинка
 prompt.text=Введите текст
 prompt.email=Введите адрес
+#### DESCRIPTION FOR LOAD HTML TEMPLATE WINDOW ####
+fpFilterHtmlTemplate=HTML Template
diff --git a/locale/ru/smartTemplate-overlay.dtd b/locale/ru/smartTemplate-overlay.dtd
index 01aeeb48e..edacf792f 100644
--- a/locale/ru/smartTemplate-overlay.dtd
+++ b/locale/ru/smartTemplate-overlay.dtd
@@ -1,3 +1,8 @@
 <!-- #### OVERLAYS #### -->
 <!ENTITY smartTemplate4.settings.label "SmartTemplate⁴">
 <!ENTITY smartTemplate4.settings.tooltip "Настройки SmartTemplate⁴">
+<!ENTITY smartTemplate4.cleandeferred.label "Clean up!">
+<!ENTITY smartTemplate4.cleandeferred.tooltip "Clean up all SmartTemplate variables">
+<!ENTITY smartTemplate4.deferredcontext.update "Update SmartTemplate⁴ contents">
+<!ENTITY smartTemplate4.deferredcontext.cleanup "Update and Replace with Content">
+<!ENTITY smartTemplate4.deferredcontext.delete "Remove SmartTemplate⁴ variable">
diff --git a/locale/ru/smartTemplate-settings.dtd b/locale/ru/smartTemplate-settings.dtd
index 20ed15301..4e18ba767 100644
--- a/locale/ru/smartTemplate-settings.dtd
+++ b/locale/ru/smartTemplate-settings.dtd
@@ -59,6 +59,7 @@
 <!ENTITY btnSaveTemplate.tooltip "Сохранить шаблон…">
 <!ENTITY btnLoadTemplate.tooltip "Загрузить шаблон…">
 <!ENTITY btnYouTube.tooltip "Посетите YouTube канал 'Thunderbird ежедневно' - для советов и руководств по использованию Stationery и других дополнений">
+<!ENTITY tip.fileTemplates "Click to read full documentation about Stationery and external HTML templates on our support site…">
 <!ENTITY pref_server_def "Общие настройки">
 <!ENTITY pref_def.label "Использовать общие настройки">
 <!ENTITY pref_def.cap "Отключить 'Использовать общие настройки' для создания индивидуального заголовка цитат для этой учётной записи.">
@@ -79,6 +80,8 @@
 <!ENTITY pref_debug_tip "Для настроек режима отладки нажмите правую кнопку мыши">
 <!ENTITY pref_nameSwap "Исправить фамилию, имя">
 <!ENTITY pref_nameSwap_tip "Меняет 'фамилия, имя' на 'имя, фамилия'">
+<!ENTITY defaultMimeFormat "Default address format:">
+<!ENTITY defaultMimeFormat_tip "Format to use when replacing plain &#37;to&#37; &#37;from&#37; &#37;cc&#37; addresses. E.g. firstname,lastname,??mail will show first name followed by last name; if both are unavailable, it will show the mail address.">
 <!ENTITY pref_addressDelimiter "Разделитель в списке корреспондентов:">
 <!ENTITY pref_addressDelimiter_tip "Разделитель между несколькими корреспондентами. Outlook использует точку с запятой (;), Thunderbird  стандартно запятую (,)">
 <!ENTITY resolveNamesFromAB "Брать имена из адресных книг">
@@ -125,11 +128,13 @@
 <!ENTITY fileImage.label "Картинка (png,jpg,gif,bmp,svg). Если файл не будет найден, будет показываться указанный altText.">
 <!ENTITY attach.label "Добавить файл как вложение">
 <!ENTITY cursor.label "Установить позицию курсора">
+<!ENTITY spellcheck.label "Sets the spell-checking language. Example values: (en, de-DE, es-ES, ru) - note that the dictionary must be installed.">
 <!ENTITY to_var.cap "Получатель (Кому)">
 <!ENTITY to_note.label "Если имя отсутствует, будет использован адрес">
 <!ENTITY to.label "Инициалы получателя (стандарт)">
 <!ENTITY tofirstname.label "Имя получателя">
 <!ENTITY toname.label "Фамилия получателя">
+<!ENTITY tofwd.label "Use fwd to add the clickable recipient in forwarded mails">
 <!ENTITY from_var.cap "Отправитель (От)">
 <!ENTITY from_note.label "Если имя отсутствует, будет использован адрес">
 <!ENTITY from.label "Инициалы отправителя (стандарт)">
@@ -173,6 +178,10 @@
 <!ENTITY dateshort.label "Дата / время кратко (01.01.2000 1:23:45)">
 <!ENTITY datetz.label "Часовогй пояс (+0100, +0200, ...)">
 <!ENTITY tzname.label "GMT, PST, EST, ...">
+<!ENTITY timezone.explain "Force specific timezone for date variables by replacing the tz parameter (GMT, EST, CST, PST etc.)">
+<!ENTITY dateoffset_note.label "The following function adds an offset to all following displayed times.">
+<!ENTITY calculate.explain "DD=number of days to add. H=number of hours to add (optional). MM=minutes to add (optional) ">
+<!ENTITY calculate.reset "Set the argument to 0 to stop modifying any dates.">
 <!ENTITY var_custom.cap "Переменные для настраиваемой даты">
 <!ENTITY customdf_note.label "Может быть использована с &#37;X:=sent&#37;">
 <!ENTITY A.label "День недели(Пятница)">
@@ -194,6 +203,8 @@
 <!ENTITY p1.label "д.п.">
 <!ENTITY p2.label "Д.П.">
 <!ENTITY p3.label "ДП">
+<!ENTITY dateformat.label "Function for inserting current time (clickable field).">
+<!ENTITY dateformat.explain "Most time variables from above can be used in the parameter string by omitting &#37;. See also:">
 <!ENTITY dateformat.example "Пример:">
 <!ENTITY var_xsent.cap "Использовать &#37;X:=sent&#37;">
 <!ENTITY xsent_note.label "Дата / время имеют изначально текущие значения. В комбинации с &#37;X:=sent&#37; будет использовано значение из сообщения.">
@@ -240,6 +251,7 @@
 <!ENTITY licenseValidation.notMatchedMail "Зашифрованный адрес не совпадает с имеющимся.">
 <!ENTITY premiumConfig "Премиум-функции">
 <!ENTITY label.premiumFeaturesSite "Узнать больше о премиум-функциях на нашей странице">
+<!-- #####  Support ##### -->
 <!ENTITY support.title "Почта в службу поддержки">
 <!ENTITY support.type "Тип:">
 <!ENTITY support.type.selectOne "Выберите тему!">
diff --git a/locale/sl/messages.properties b/locale/sl/messages.properties
index 9a984cfe9..2a68e38fd 100644
--- a/locale/sl/messages.properties
+++ b/locale/sl/messages.properties
@@ -24,9 +24,23 @@ SmartTemplate4.notification.premium.btn.extendLicense.tooltip=To bo podaljšalo
 SmartTemplate4.notification.donate=Daruj
 SmartTemplate4.notification.licensing=Več o licenciranju
 SmartTemplate4.notification.dontShowAgain=Tega sporočila ne prikažite več.
+SmartTemplate4.notification.spellcheck.noDictionary=No dictionaries installed.
+SmartTemplate4.notification.spellcheck.notFound=Dictionary '{0}' not found.
+SmartTemplate4.notification.spellcheck.error=Cannot switch spell checker language. Have you installed the correct dictionary?
 SmartTemplate4.licenseValidation.expired=Vaše dovoljenje je poteklo:
 SmartTemplate4.licenseValidation.guessAddon=(vneseni ključ je lahko za {2}).
 SmartTemplate4.prompt.switchDomainLicense=Preklopi na domensko dovoljenje?
 SmartTemplate4.trialDays=Preostali ste {0} preskusnih dni.
+SmartTemplate4.trialExpiry=Your trial period expired {0} days ago.
+SmartTemplate4.fileTemplates=Template Files
+SmartTemplate4.fileTemplates.wrnSelectUpdateItem=You have to select an item from the list to update!
+SmartTemplate4.fileTemplates.wrnSelectUpdateItem.caption=Update Templates
+SmartTemplate4.fileTemplates.wrnEnterTitle=Please enter a title!
+SmartTemplate4.fileTemplates.wrnEnterPath=Please select a valid path!
+SmartTemplate4.fileTemplates.openFile=Open SmartTemplate⁴ template file…
+SmartTemplate4.fileTemplates.restrictTemplates=You need a SmartTemplate⁴ license to use more than {1} templates!
+SmartTemplate4.fileTemplates.error.charSet=Problems converting a HTML template from charset [{1}]\nUsing raw string data instead.\nIf this results in garbled characters, try adding an explicit 'meta charset=' to the head section. Maybe try ISO-8859-1?
+SmartTemplate4.fileTemplates.error.filePath=Could not load the template file '{0}' from path:\n{1}\nThe file may have been removed or renamed.
+SmartTemplate4.fileFunction.notExists=Function {0} could not find or access file. Check the path below:
 SmartTemplate4.notification.noStationery=Ni bilo mogoče najti dodatka »Stationery« - ali je nameščen?
 SmartTemplate4.fileTemplates.replaceStationery=Od Thunderbird 68 naprej „Stationery“ na žalost ne delujejo več.\nZato SmartTemplate⁴ zdaj ponuja svoj sistem upravljanja predloge HTML; kliknite V redu, da ga nastavite.
diff --git a/locale/sl/settings.properties b/locale/sl/settings.properties
index 461108c55..ac6c0b083 100644
--- a/locale/sl/settings.properties
+++ b/locale/sl/settings.properties
@@ -7,3 +7,5 @@ fpJsonFile=Datoteka JSON
 fpImageFile=Slikovna datoteka
 prompt.text=Vnesite besedilo za dodajanje ali nastavitev
 prompt.email=Vnesite e-poštni naslov
+#### DESCRIPTION FOR LOAD HTML TEMPLATE WINDOW ####
+fpFilterHtmlTemplate=HTML Template
diff --git a/locale/sl/smartTemplate-overlay.dtd b/locale/sl/smartTemplate-overlay.dtd
index 053ff65d7..1dd1959e0 100644
--- a/locale/sl/smartTemplate-overlay.dtd
+++ b/locale/sl/smartTemplate-overlay.dtd
@@ -1,3 +1,8 @@
 <!-- #### OVERLAYS #### -->
 <!ENTITY smartTemplate4.settings.label "SmartTemplate⁴">
 <!ENTITY smartTemplate4.settings.tooltip "Nastavitve SmartTemplate⁴">
+<!ENTITY smartTemplate4.cleandeferred.label "Clean up!">
+<!ENTITY smartTemplate4.cleandeferred.tooltip "Clean up all SmartTemplate variables">
+<!ENTITY smartTemplate4.deferredcontext.update "Update SmartTemplate⁴ contents">
+<!ENTITY smartTemplate4.deferredcontext.cleanup "Update and Replace with Content">
+<!ENTITY smartTemplate4.deferredcontext.delete "Remove SmartTemplate⁴ variable">
diff --git a/locale/sl/smartTemplate-settings.dtd b/locale/sl/smartTemplate-settings.dtd
index 89ace7797..739b6c6b2 100644
--- a/locale/sl/smartTemplate-settings.dtd
+++ b/locale/sl/smartTemplate-settings.dtd
@@ -59,6 +59,7 @@
 <!ENTITY btnSaveTemplate.tooltip "Shrani predlogo ...">
 <!ENTITY btnLoadTemplate.tooltip "Naloži predlogo ...">
 <!ENTITY btnYouTube.tooltip "Obiščite kanal 'Thunderbird Daily' na YouTubu za nasvete in vodnike o uporabi dodatkov Stationary in drugih">
+<!ENTITY tip.fileTemplates "Click to read full documentation about Stationery and external HTML templates on our support site…">
 <!ENTITY pref_server_def "Splošno">
 <!ENTITY pref_def.label "Uporabi splošno">
 <!ENTITY pref_def.cap "Odznačite 'Uporabi splošno' za ustvarjanje glave navedka po meri za ta račun,">
@@ -79,6 +80,8 @@
 <!ENTITY pref_debug_tip "Desno kliknite za napredne razhroščevalne možnosti">
 <!ENTITY pref_nameSwap "Pravilni priimek, ime">
 <!ENTITY pref_nameSwap_tip "Spremeni 'priimek, ime' v 'ime priimek'">
+<!ENTITY defaultMimeFormat "Default address format:">
+<!ENTITY defaultMimeFormat_tip "Format to use when replacing plain &#37;to&#37; &#37;from&#37; &#37;cc&#37; addresses. E.g. firstname,lastname,??mail will show first name followed by last name; if both are unavailable, it will show the mail address.">
 <!ENTITY pref_addressDelimiter "Loči dopisnike s/z:">
 <!ENTITY pref_addressDelimiter_tip "Ločilo med dopisniki. Outlook uporablja podpičje (;). Privzeto za Thunderbird je vejica (,).">
 <!ENTITY resolveNamesFromAB "Razreši imena iz imenika">
@@ -88,6 +91,7 @@
 <!ENTITY resolveABRemoveMail "Odstrani e-poštni naslov, razen če je določen parameter oblike">
 <!ENTITY suppressMailtToLink "Onemogoči poštne odjemalce, ki e-poštnim naslovom dodajajo povezave.">
 <!ENTITY capitalizeNames "Vstavi imena z velikim črkami">
+<!ENTITY guessNameFromMail "Guess Name parts from email address if missing">
 <!ENTITY pref_parseSignature "Podpis opravila">
 <!ENTITY pref_parseSignature_tip "Nadomesti spremenljivke v podpisu.">
 <!ENTITY pref_cursorInsertSpace "Vstavi presledek za označitev &#37;cursor&#37;">
@@ -124,11 +128,13 @@
 <!ENTITY fileImage.label "Slikovna datoteka (png, jpg, gif, bmp, svg). Če slike ni mogoče najti, je prikazano izbirno besedilo altText.">
 <!ENTITY attach.label "Dodaj datoteko kot prilogo">
 <!ENTITY cursor.label "Nastavi položaj kazalca">
+<!ENTITY spellcheck.label "Sets the spell-checking language. Example values: (en, de-DE, es-ES, ru) - note that the dictionary must be installed.">
 <!ENTITY to_var.cap "Prejemnik (Za)">
 <!ENTITY to_note.label "Kadar ime ni na voljo, bo namesto tega prikazan e-poštni naslov">
 <!ENTITY to.label "Prejemnikovo ime (privzeto)">
 <!ENTITY tofirstname.label "Prejemnikovo ime">
 <!ENTITY toname.label "Prejemnikov priimek">
+<!ENTITY tofwd.label "Use fwd to add the clickable recipient in forwarded mails">
 <!ENTITY from_var.cap "Pošiljatelj (Od)">
 <!ENTITY from_note.label "Kadar ime ni na voljo, bo namesto tega prikazan e-poštni naslov">
 <!ENTITY from.label "Pošiljateljevo ime (privzeto)">
@@ -172,7 +178,9 @@
 <!ENTITY dateshort.label "Datum / Čas kratko (npr. 01.01.2000 1:23:45)">
 <!ENTITY datetz.label "Časovni pas (+0100, +0200, ... )">
 <!ENTITY tzname.label "GMT, PST, EST, ... ">
+<!ENTITY timezone.explain "Force specific timezone for date variables by replacing the tz parameter (GMT, EST, CST, PST etc.)">
 <!ENTITY dateoffset_note.label "Ta funkcija doda odmik vsem naslednjim prikazanim časom.">
+<!ENTITY calculate.explain "DD=number of days to add. H=number of hours to add (optional). MM=minutes to add (optional) ">
 <!ENTITY calculate.reset "Nastavite argument na 0, da ustavite spreminjanje datumov.">
 <!ENTITY var_custom.cap "Spremenljivke za 'obliko datuma' po meri">
 <!ENTITY customdf_note.label "Se lahko kombinira z &#37;X:=sent&#37;">
@@ -196,6 +204,8 @@
 <!ENTITY p2.label "dop.">
 <!ENTITY p3.label "dop.">
 <!ENTITY dateformat.label "Funkcija za vstavljanje trenutnega časa (polje, ki ga je mogoče klikniti).">
+<!ENTITY dateformat.explain "Most time variables from above can be used in the parameter string by omitting &#37;. See also:">
+<!ENTITY dateformat.example "Example: ">
 <!ENTITY var_xsent.cap "Spremenilnik  - z vodilno ničlo">
 <!ENTITY xsent_note.label "Privzeto bodo spremenljivke za datum/čas vedno vzpostavljene s trenutnimi vrednostmi (trenutno je ob času ustvarjanja e-pošte). Ob kombinaciji z &#37;X:=sent&#37; bodo spremenljivke za datum/čas odražale izvirni datum/čas sporočila.">
 <!ENTITY xsent_long.cap "Primer dolgega niza">
@@ -241,6 +251,7 @@
 <!ENTITY licenseValidation.notMatchedMail "Šifriran e-poštni naslov se ne ujema z berljivim.">
 <!ENTITY premiumConfig "Lastnosti premium">
 <!ENTITY label.premiumFeaturesSite "Več o lastnostih premium lahko preberete na naši spletni strani">
+<!-- #####  Support ##### -->
 <!ENTITY support.title "Pošlji na podporo">
 <!ENTITY support.type "Vrsta:">
 <!ENTITY support.type.selectOne "Izberite temo!">
diff --git a/locale/sr/messages.properties b/locale/sr/messages.properties
index b634ce0ab..1c29991dc 100644
--- a/locale/sr/messages.properties
+++ b/locale/sr/messages.properties
@@ -7,10 +7,40 @@ SmartTemplate4.updateMessageVersion=SmartTemplate⁴ је успешно дог
 SmartTemplate4.updateMessageNewBrackets1=Драги корисниче, са узбуђењем вам саопштавамо да, почев од ове верзије, SmartTemplate⁴ подржава и употребу витичастих заграда { } и ознаку <style>, тако да од сада можете детаљније да подешавате CSS унутар шаблона.
 SmartTemplate4.updateMessageNewBrackets2=Промењена је одређена синтакса за изразе уоквирене заградама; уместо витичастих {%cc(name)%} користите угласте заграде [[%cc(name)%]]. За више информација погледајте помоћ.
 SmartTemplate4.updateMessageNewBrackets3=SmartTemplate⁴ ће сада претворити постојеће шаблоне у формат сагласан са новом верзијом. Кликните на „У реду“ да наставите.
+SmartTemplate4.notification.license.text=From now on, SmartTemplate⁴ requires at least a standard license. Read more about this on our licensing page.
 #SmartTemplate4 Pro specific
+SmartTemplate4.notification.license.required=SmartTemplate⁴ requires a license to continue working. Read more at the bottom of the compose window.
+SmartTemplate4.notification.parsing=Parsing variables:
 SmartTemplate4.notification.premium.title=Премијум могућност
 SmartTemplate4.notification.premium.text={1} је доступна у премијум верзији. Региструјете SmartTemplate⁴ Pro, ако желите трајно да користите.
+SmartTemplate4.notification.premium.text.plural={1} are Premium features, please upgrade to a SmartTemplate⁴ Pro License for using them permanently.
 SmartTemplate4.notification.premium.btn.getLicense=Набави лиценцу
 SmartTemplate4.notification.premium.btn.hotKey=л
+SmartTemplate4.notification.premium.btn.upgrade=Upgrade to Pro
+SmartTemplate4.notification.premium.btn.upgrade.hotKey=U
+SmartTemplate4.notification.premium.btn.renewLicense=Renew License
+SmartTemplate4.notification.premium.btn.extendLicense=Extend License
+SmartTemplate4.notification.premium.btn.extendLicense.tooltip=This will extend the current license date by 1 year. It's typically cheaper than a new license.
+SmartTemplate4.notification.donate=Donate
+SmartTemplate4.notification.licensing=More about licensing
+SmartTemplate4.notification.dontShowAgain=Do not show this message again.
+SmartTemplate4.notification.spellcheck.noDictionary=No dictionaries installed.
+SmartTemplate4.notification.spellcheck.notFound=Dictionary '{0}' not found.
+SmartTemplate4.notification.spellcheck.error=Cannot switch spell checker language. Have you installed the correct dictionary?
+SmartTemplate4.licenseValidation.expired=Your license expired on:
+SmartTemplate4.licenseValidation.guessAddon=(The key entered may be for {2}).
+SmartTemplate4.prompt.switchDomainLicense=Switch to Domain License?
+SmartTemplate4.trialDays=You have {0} trial days left.
+SmartTemplate4.trialExpiry=Your trial period expired {0} days ago.
+SmartTemplate4.fileTemplates=Template Files
+SmartTemplate4.fileTemplates.wrnSelectUpdateItem=You have to select an item from the list to update!
+SmartTemplate4.fileTemplates.wrnSelectUpdateItem.caption=Update Templates
+SmartTemplate4.fileTemplates.wrnEnterTitle=Please enter a title!
+SmartTemplate4.fileTemplates.wrnEnterPath=Please select a valid path!
+SmartTemplate4.fileTemplates.openFile=Open SmartTemplate⁴ template file…
+SmartTemplate4.fileTemplates.restrictTemplates=You need a SmartTemplate⁴ license to use more than {1} templates!
+SmartTemplate4.fileTemplates.error.charSet=Problems converting a HTML template from charset [{1}]\nUsing raw string data instead.\nIf this results in garbled characters, try adding an explicit 'meta charset=' to the head section. Maybe try ISO-8859-1?
+SmartTemplate4.fileTemplates.error.filePath=Could not load the template file '{0}' from path:\n{1}\nThe file may have been removed or renamed.
+SmartTemplate4.fileFunction.notExists=Function {0} could not find or access file. Check the path below:
 SmartTemplate4.notification.noStationery=Не можете пронаћи додатак „Stationery“ - да ли је инсталиран?
 SmartTemplate4.fileTemplates.replaceStationery=Нажалост, од Тхундербирд-а 68 даље, нажалост, „Stationery“ више не ради.\nСтога СмартТемплате⁴ сада нуди свој властити ХТМЛ систем за управљање шаблонима; кликните ОК да бисте га поставили.
diff --git a/locale/sr/register.dtd b/locale/sr/register.dtd
index 56f183378..f059d9259 100644
--- a/locale/sr/register.dtd
+++ b/locale/sr/register.dtd
@@ -2,11 +2,18 @@
 <!ENTITY label.licenseValid "Ваша лиценца важи до:">
 <!ENTITY label.haveLicense "Већ имате лиценцу?">
 <!ENTITY getSmartTemplate4 "Набавите лиценцу за СмартТемплате⁴">
+<!ENTITY licenseTypes "Going forward, SmartTemplate⁴ offers two licenses, Standard and Pro; these are necessary to keep up with the changes in the Thunderbird platform and to finance Innovations and repairs of the Add-on. As breaking changes are rolled out in a yearly cycle, the license will also be valid for 1 year.">
 <!ENTITY intro "Годишња лиценца за SmartTemplate⁴ вам пружа све премијум могућности годину дана. Такође, помаже нам да развијемо и усавршимо производ, како би био још бољи.">
+<!ENTITY testDriveS "You can test drive the premium features with the standard license, but they may be slightly restricted.">
 <!ENTITY yearlyLicense.title "Годишња лиценца">
 <!ENTITY yearlyLicense.premiumFeatures "SmartTemplate⁴ Pro пружа вам приступ свим премијум могућностима. Осим тога, биће искључене напомене за донацију, које се приказују након ажурирања бесплатне верзије SmartTemplate⁴-а. Неке нове премијум могућности ће бити додаване у том периоду, а и „ексклузивне премијум” могућности, невидљиве за обичне кориснике.">
 <!ENTITY yearlyLicense.premiumFeatures.moreInfoLink "Више о премијум могућностима.">
 <!ENTITY yearlyLicense.usageTerm "Лиценца је за вашу личну употрету и везана је за вашу ел. адресу. Можете је инсталирати на више програма, док год су подешени за рад са том ел. адресом.">
+<!ENTITY yearlyLicense.usageTerm1 "Any additional email addresses are no problem - they do not require a separate license. In case of questions you can reach me via the support tab.">
+<!ENTITY domainLicense.email "We will contact you using this email address to generate your domain license; please allow two business days for us to get in touch. Enter the domain name for the license on the next page.">
+<!ENTITY domainLicense.header "Licensed Email Domain">
+<!ENTITY domainLicense.instruct "The license is keyed to your company domain. The license will allow users with email addresses ending on this email domain to use SmartTemplate⁴ Pro. E.g. if you enter the domain name 'abc.com' then mail users like fred@abc.com, martha@abc.com, mike.doe@abc.com etc. are allowed to use the license. The maximum number of valid individual users is the number you have entered on the initial screen.">
+<!ENTITY domainLicense.validate "Make sure you enter the domain name *exactly as it is* on your Company's email addresses (the part *after* the @ sign), as it will be used to authorize the email addresses of your users.">
 <!ENTITY updates.title "Ажурирања">
 <!ENTITY updatesExpiry "SmartTemplate⁴ Pro ће аутоматски бити ажуриран преко addons.thunderbird.net, као и обично. Након годину дана, можете обновити лиценцу или наставити да користите премијум могућности под истим условима као и корисници бесплатне верзије. Премијум могућности ће захтевати регистрациони кључ.">
 <!ENTITY vouchers.title "Купони">
@@ -15,6 +22,10 @@
 <!ENTITY email.label "Ел. адреса:">
 <!ENTITY firstName.label "Име:">
 <!ENTITY lastName.label "Презиме:">
+<!ENTITY buyPremiumLicense.instruct "Want to use all premium features without restrictions? Get a SmartTemplate⁴ Pro license. It is bound to your personal Email address and can be used in multiple installations.">
+<!ENTITY buyPremiumLicense.button "Buy Pro License!">
+<!ENTITY buyStandardLicense.instruct "Can't afford the premium functions? Get a highly affordable standard license and keep testing premium functions.">
+<!ENTITY buyStandardLicense.button "Buy Standard License!">
 <!ENTITY buyDomainLicense.instruct "Треба вам лиценца за предузеће или више од пет корисника? Куповина групне лиценце је исплативија:">
 <!ENTITY buyDomainLicense.button "Купи групну лиценцу">
 <!ENTITY enterLicenseKey.button "Унесите број лиценце...">
diff --git a/locale/sr/settings.properties b/locale/sr/settings.properties
index 671603ada..e7bfdded6 100644
--- a/locale/sr/settings.properties
+++ b/locale/sr/settings.properties
@@ -3,4 +3,9 @@ extensions.smarttemplate4@thunderbird.extension.description=Додатак Smart
 #### DESCRIPTION FOR EXPORT/IMPORT WINDOW ####
 fpFilterName=Датотека SmartTemplate4-а
 fpHTMLFile=HTML датотека/текстуална датотека
+fpJsonFile=JSON File
 fpImageFile=Датотека слике
+prompt.text=Enter the text to add or set
+prompt.email=Enter an email address
+#### DESCRIPTION FOR LOAD HTML TEMPLATE WINDOW ####
+fpFilterHtmlTemplate=HTML Template
diff --git a/locale/sr/smartTemplate-overlay.dtd b/locale/sr/smartTemplate-overlay.dtd
index 6c320295d..2cf2342eb 100644
--- a/locale/sr/smartTemplate-overlay.dtd
+++ b/locale/sr/smartTemplate-overlay.dtd
@@ -1,3 +1,8 @@
 <!-- #### OVERLAYS #### -->
 <!ENTITY smartTemplate4.settings.label "SmartTemplate⁴">
 <!ENTITY smartTemplate4.settings.tooltip "Подешавања SmartTemplate⁴-а">
+<!ENTITY smartTemplate4.cleandeferred.label "Clean up!">
+<!ENTITY smartTemplate4.cleandeferred.tooltip "Clean up all SmartTemplate variables">
+<!ENTITY smartTemplate4.deferredcontext.update "Update SmartTemplate⁴ contents">
+<!ENTITY smartTemplate4.deferredcontext.cleanup "Update and Replace with Content">
+<!ENTITY smartTemplate4.deferredcontext.delete "Remove SmartTemplate⁴ variable">
diff --git a/locale/sr/smartTemplate-settings.dtd b/locale/sr/smartTemplate-settings.dtd
index 709627b53..d3b2b6ebc 100644
--- a/locale/sr/smartTemplate-settings.dtd
+++ b/locale/sr/smartTemplate-settings.dtd
@@ -59,6 +59,7 @@
 <!ENTITY btnSaveTemplate.tooltip "Save Template…">
 <!ENTITY btnLoadTemplate.tooltip "Load Template…">
 <!ENTITY btnYouTube.tooltip "Visit 'Thunderbird Daily' YouTube channel - for tips and tutorials for using Stationery and other Addons">
+<!ENTITY tip.fileTemplates "Click to read full documentation about Stationery and external HTML templates on our support site…">
 <!ENTITY pref_server_def "Уобичајено">
 <!ENTITY pref_def.label "Користи подразумевано">
 <!ENTITY pref_def.cap "Демаркирајте „Користи подразумевано“ да бисте направили прилагођено заглавље цитирања на овом налогу.">
@@ -79,14 +80,18 @@
 <!ENTITY pref_debug_tip "Притисните десним тастером миша за напредније опције отклањања грешака.">
 <!ENTITY pref_nameSwap "Исправи LastName, FirstName">
 <!ENTITY pref_nameSwap_tip "Мења „LastName, FirstName“ у „First Last“">
+<!ENTITY defaultMimeFormat "Default address format:">
+<!ENTITY defaultMimeFormat_tip "Format to use when replacing plain &#37;to&#37; &#37;from&#37; &#37;cc&#37; addresses. E.g. firstname,lastname,??mail will show first name followed by last name; if both are unavailable, it will show the mail address.">
 <!ENTITY pref_addressDelimiter "Delimit multiple correspondents with:">
 <!ENTITY pref_addressDelimiter_tip "Delimiter between multiple correspondents. Outlook uses semicolon (;) Default for Thunderbird is Comma (,)">
 <!ENTITY resolveNamesFromAB "Разреши имена из адресара">
 <!ENTITY resolveNamesFromAB_tip "Ова функција не ради с одређеним удаљеним адресарима као што је LDAP.">
 <!ENTITY resolveNamesFromABNick "Замени име ако је доступан надимак">
+<!ENTITY resolveNamesFromABDisplay "Use Display Name if first name missing">
 <!ENTITY resolveABRemoveMail "Уклони е-адресу ако формат није наведен">
 <!ENTITY suppressMailtToLink "Suppress Mail Clients adding links to Email addresses.">
 <!ENTITY capitalizeNames "Капитализуј имена">
+<!ENTITY guessNameFromMail "Guess Name parts from email address if missing">
 <!ENTITY pref_parseSignature "Обради потпис">
 <!ENTITY pref_parseSignature_tip "Замените променљиве у потпису.">
 <!ENTITY pref_cursorInsertSpace "Убаци размак ради истицања &#37;cursor&#37;">
@@ -101,6 +106,7 @@
 <!ENTITY pref_defaultCharset_tip "Приликом читања заглавља, врати се на овај скуп знакова, уколико не може да се одреди.">
 <!-- #### ABOUT #### -->
 <!ENTITY about.cap "О додатку">
+<!ENTITY support.tab "Support">
 <!ENTITY creator.label "Аутор">
 <!ENTITY developer.label "Програмер">
 <!ENTITY localename.label "sr-RS">
@@ -120,12 +126,15 @@
 <!ENTITY sig2.label "Потпис из подешавања налога, али без две цртице (--)">
 <!ENTITY fileHTML.label "HTML или обична текстуална датотека. Ако не наведете кодирање, користиће се UTF-8.">
 <!ENTITY fileImage.label "Датотека слике (PNG, JPG, GIF, BMP или SVG). Ако слика недостаје, altText ће бити приказан.">
+<!ENTITY attach.label "Add file as attachment">
 <!ENTITY cursor.label "Sets the cursor position">
+<!ENTITY spellcheck.label "Sets the spell-checking language. Example values: (en, de-DE, es-ES, ru) - note that the dictionary must be installed.">
 <!ENTITY to_var.cap "Прималац">
 <!ENTITY to_note.label "Када име није доступно, биће приказана е-адреса">
 <!ENTITY to.label "Име примаоца (подразумевано)">
 <!ENTITY tofirstname.label "Име примаоца">
 <!ENTITY toname.label "Име примаоца">
+<!ENTITY tofwd.label "Use fwd to add the clickable recipient in forwarded mails">
 <!ENTITY from_var.cap "Пошиљалац">
 <!ENTITY from_note.label "Када име није доступно, биће приказана е-адреса">
 <!ENTITY from.label "Име пошиљаоца (подразумевано)">
@@ -169,6 +178,10 @@
 <!ENTITY dateshort.label "Скраћени датум/време (нпр. 01. 01. 2000. 1:23:45)">
 <!ENTITY datetz.label "Временска зона (+0100, +0200…)">
 <!ENTITY tzname.label "GMT, PST, EST…">
+<!ENTITY timezone.explain "Force specific timezone for date variables by replacing the tz parameter (GMT, EST, CST, PST etc.)">
+<!ENTITY dateoffset_note.label "The following function adds an offset to all following displayed times.">
+<!ENTITY calculate.explain "DD=number of days to add. H=number of hours to add (optional). MM=minutes to add (optional) ">
+<!ENTITY calculate.reset "Set the argument to 0 to stop modifying any dates.">
 <!ENTITY var_custom.cap "Променљиве за прилагођени формат датума">
 <!ENTITY customdf_note.label "Може да се комбинује са &#37;X:=sent&#37;">
 <!ENTITY A.label "Дан у недељи (пун назив)">
@@ -190,6 +203,9 @@
 <!ENTITY p1.label "a.m.">
 <!ENTITY p2.label "A.M.">
 <!ENTITY p3.label "AM">
+<!ENTITY dateformat.label "Function for inserting current time (clickable field).">
+<!ENTITY dateformat.explain "Most time variables from above can be used in the parameter string by omitting &#37;. See also:">
+<!ENTITY dateformat.example "Example: ">
 <!ENTITY var_xsent.cap "Модификатор &#37;X:=sent&#37;">
 <!ENTITY xsent_note.label "По подразумеваним поставкама, променљиве за датум и време ће увек приказивати тренутно време. У комбинацији са &#37;X:=sent&#37;, променљиве ће одражавати датум и време оригиналних порука.">
 <!ENTITY xsent_long.cap "Пример LongString-а">
@@ -227,8 +243,23 @@
 <!ENTITY button.validateLicense "потврди">
 <!ENTITY label.licenseValid "Ваша лиценца важи до:">
 <!ENTITY licenseValidation.passed "Хвала што сте регистровали SmartTemplate⁴ про! Све могућности су сада откључане.">
+<!ENTITY licenseValidation.standard "Thanks for registering SmartTemplate⁴ Standard - You are helping the Add-on immensely! You also can now test drive all premium functions.">
 <!ENTITY licenseValidation.failed "Кључ лиценце који сте унели је неважећи. Проверите своју ел. пошту од FastSpring-а за упутства. Ако још увек имате проблема, контактирајте ме преко језичка Подршка.">
 <!ENTITY licenseValidation.expired "Кључ лиценце који сте унели је истекао. Притисните дугме испод, да бисте обновили своју лиценцу.">
+<!ENTITY licenseValidation.invalidAddon "The license key you entered may be for a different Add-on. License keys for {0} start with {1}.">
 <!ENTITY licenseValidation.invalidMail "Ел. адреса која је повезана са кључем лиценце [{1}] тренутно се не налази у твојим налозима ел. поште. Контактирајте ме преко језичка Подршка, ако вам затреба помоћ.">
 <!ENTITY licenseValidation.notMatchedMail "Шифроване ел. адресе се не подударају са читљивима.">
 <!ENTITY premiumConfig "Премијум могућности">
+<!ENTITY label.premiumFeaturesSite "Read more about Premium Features on our Website">
+<!-- #####  Support ##### -->
+<!ENTITY support.title "Mail to Support">
+<!ENTITY support.type "Type:">
+<!ENTITY support.type.selectOne "Select a topic!">
+<!ENTITY support.type.license "Licensing related">
+<!ENTITY support.type.tech "Technical">
+<!ENTITY support.type.html "Help with HTML / CSS">
+<!ENTITY support.type.other "Other">
+<!ENTITY support.subject "Subject:">
+<!ENTITY support.mail.instructions "Click the button below to open a new Email to support. If you are having technical problems, consider adding a screenshot.">
+<!ENTITY support.compose "Write to support…">
+<!ENTITY support.links "Support Links">
diff --git a/locale/sv-SE/messages.properties b/locale/sv-SE/messages.properties
index 86f77e1eb..da2e24f1f 100644
--- a/locale/sv-SE/messages.properties
+++ b/locale/sv-SE/messages.properties
@@ -39,6 +39,7 @@ SmartTemplate4.fileTemplates.wrnEnterTitle=Ange en titel!
 SmartTemplate4.fileTemplates.wrnEnterPath=Välj en giltig sökväg!
 SmartTemplate4.fileTemplates.openFile=Öppna SmartTemplate⁴-mallfilen…
 SmartTemplate4.fileTemplates.restrictTemplates=Du behöver en SmartTemplate⁴-licens för att kunna använda fler än {1} mallar!
+SmartTemplate4.fileTemplates.error.charSet=Problems converting a HTML template from charset [{1}]\nUsing raw string data instead.\nIf this results in garbled characters, try adding an explicit 'meta charset=' to the head section. Maybe try ISO-8859-1?
 SmartTemplate4.fileTemplates.error.filePath=Det gick inte att ladda filmallen '{0}' från sökvägen: \n{1} \nFilen kan ha tagits bort eller bytt namn.
 SmartTemplate4.fileFunction.notExists=Funktion {0} kunde inte hitta eller komma åt filen. Kolla vägen nedan:
 SmartTemplate4.notification.noStationery=Hittade inte tillägget "Stationery" - är det installerat?
diff --git a/locale/sv-SE/settings.properties b/locale/sv-SE/settings.properties
index 7def24995..a10d97dbf 100644
--- a/locale/sv-SE/settings.properties
+++ b/locale/sv-SE/settings.properties
@@ -7,3 +7,5 @@ fpJsonFile=JSON-fil
 fpImageFile=Bildfil
 prompt.text=Ange texten att lägg till eller ändra
 prompt.email=Ange en e-postadress
+#### DESCRIPTION FOR LOAD HTML TEMPLATE WINDOW ####
+fpFilterHtmlTemplate=HTML Template
diff --git a/locale/sv-SE/smartTemplate-settings.dtd b/locale/sv-SE/smartTemplate-settings.dtd
index 9c4cb4f6c..c57eec12f 100644
--- a/locale/sv-SE/smartTemplate-settings.dtd
+++ b/locale/sv-SE/smartTemplate-settings.dtd
@@ -114,6 +114,7 @@
 <!ENTITY translatorNickname.label "Lakrits (BabelZilla)">
 <!ENTITY contributor.label "Contributor">
 <!ENTITY about.label "SmartTemplate⁴ erbjuder en intelligent / enkelt sätt mallar att använda som anpassar standard Thunderbird quote-Header. Mallar (citat-Header) kan användas för enda konto eller globala inställningar (gemensamma konton).">
+<!-- #### HELP #### -->
 <!ENTITY fix_var.cap "Fasta variabler">
 <!ENTITY ownname.label "Ditt namn">
 <!ENTITY ownmail.label "Din e-postadress">
@@ -229,10 +230,12 @@
 <!ENTITY html_note.label "Använd endast teckenuppsättningen UTF-8 (Unicode) i HTML-mallar!">
 <!ENTITY table.cap "ExampleUsage av variablerna">
 <!ENTITY table_note.label "Om en variabel som används felaktigt ett fel är inloggad Errorconsole!">
+<!-- #### TABLE #### -->
 <!ENTITY table_keyword.label "Variabel">
 <!ENTITY table_new.label "Nytt">
 <!ENTITY table_reply.label "Svara">
 <!ENTITY table_fwd.label "Framåt">
+<!-- SmartTemplate4 Pro stuff -->
 <!ENTITY tab.gopro "SmartTemplate⁴ Pro">
 <!ENTITY label.insertLicense "Infoga din personliga licensnyckel here:">
 <!ENTITY label.insertLicense.tooltip "Din licensnyckel finns i det orderbekräftelsemeddelande du fick från Fastspring.">
@@ -248,6 +251,7 @@
 <!ENTITY licenseValidation.notMatchedMail "Den krypterade e-postadressen matchar inte den läsbara adressen.">
 <!ENTITY premiumConfig "Premiumfunktioner">
 <!ENTITY label.premiumFeaturesSite "Läs mer om premiumfunktioner på vår webbplats">
+<!-- #####  Support ##### -->
 <!ENTITY support.title "skriva Mail to Support">
 <!ENTITY support.type "Typ:">
 <!ENTITY support.type.selectOne "Välj ett ämne!">
diff --git a/locale/uk/messages.properties b/locale/uk/messages.properties
index a84d0383b..cde98e716 100644
--- a/locale/uk/messages.properties
+++ b/locale/uk/messages.properties
@@ -7,16 +7,40 @@ SmartTemplate4.updateMessageVersion=SmartTemplate⁴ був успішно он
 SmartTemplate4.updateMessageNewBrackets1=Шановні користувачі SmartTemplate⁴, ми раді повідомити, що починаючи з цієї версії, SmartTemplate⁴ також підтримує використання фігурних дужок {} і &lt;style&gt; тегів, так що тепер ви можете робити записи у Вашому шаблоні використовуючи стилі CSS.
 SmartTemplate4.updateMessageNewBrackets2=З цього моменту, особливий синтаксис для виразів у дужках змінюється: замість запису у фігурних дужках {%сс(name)%} використовується запис у подвійних квадратних дужках [[%сс(name)%]] - докладніше див в довідці.
 SmartTemplate4.updateMessageNewBrackets3=SmartTemplate⁴ тепер може перетворювати існуючі шаблони, так що ви можете продовжувати використовувати їх в новій версії. Натисніть [OK], щоб продовжити.
+SmartTemplate4.notification.license.text=From now on, SmartTemplate⁴ requires at least a standard license. Read more about this on our licensing page.
 #SmartTemplate4 Pro specific
+SmartTemplate4.notification.license.required=SmartTemplate⁴ requires a license to continue working. Read more at the bottom of the compose window.
+SmartTemplate4.notification.parsing=Parsing variables:
 SmartTemplate4.notification.premium.title=Преміум-функція
 SmartTemplate4.notification.premium.text={1} є преміум-функцією, будь ласка, отримайте ліцензію SmartTemplate⁴ Pro на постійне використання.
 SmartTemplate4.notification.premium.text.plural={1} - це преміум-функції, будь ласка, отримайте ліцензію SmartTemplate⁴ Pro для постійного використання цих функцій.
 SmartTemplate4.notification.premium.btn.getLicense=Купити ліцензію
 SmartTemplate4.notification.premium.btn.hotKey=L
+SmartTemplate4.notification.premium.btn.upgrade=Upgrade to Pro
+SmartTemplate4.notification.premium.btn.upgrade.hotKey=U
 SmartTemplate4.notification.premium.btn.renewLicense=Оновити ліцензію
+SmartTemplate4.notification.premium.btn.extendLicense=Extend License
+SmartTemplate4.notification.premium.btn.extendLicense.tooltip=This will extend the current license date by 1 year. It's typically cheaper than a new license.
 SmartTemplate4.notification.donate=Пожертвувати
+SmartTemplate4.notification.licensing=More about licensing
+SmartTemplate4.notification.dontShowAgain=Do not show this message again.
+SmartTemplate4.notification.spellcheck.noDictionary=No dictionaries installed.
+SmartTemplate4.notification.spellcheck.notFound=Dictionary '{0}' not found.
+SmartTemplate4.notification.spellcheck.error=Cannot switch spell checker language. Have you installed the correct dictionary?
 SmartTemplate4.licenseValidation.expired=Термін дії вашої ліцензії минув:
 SmartTemplate4.licenseValidation.guessAddon=(Введений ключ може бути для {2}).
 SmartTemplate4.prompt.switchDomainLicense=Перейти до ліцензії на домен?
+SmartTemplate4.trialDays=You have {0} trial days left.
+SmartTemplate4.trialExpiry=Your trial period expired {0} days ago.
+SmartTemplate4.fileTemplates=Template Files
+SmartTemplate4.fileTemplates.wrnSelectUpdateItem=You have to select an item from the list to update!
+SmartTemplate4.fileTemplates.wrnSelectUpdateItem.caption=Update Templates
+SmartTemplate4.fileTemplates.wrnEnterTitle=Please enter a title!
+SmartTemplate4.fileTemplates.wrnEnterPath=Please select a valid path!
+SmartTemplate4.fileTemplates.openFile=Open SmartTemplate⁴ template file…
+SmartTemplate4.fileTemplates.restrictTemplates=You need a SmartTemplate⁴ license to use more than {1} templates!
+SmartTemplate4.fileTemplates.error.charSet=Problems converting a HTML template from charset [{1}]\nUsing raw string data instead.\nIf this results in garbled characters, try adding an explicit 'meta charset=' to the head section. Maybe try ISO-8859-1?
+SmartTemplate4.fileTemplates.error.filePath=Could not load the template file '{0}' from path:\n{1}\nThe file may have been removed or renamed.
+SmartTemplate4.fileFunction.notExists=Function {0} could not find or access file. Check the path below:
 SmartTemplate4.notification.noStationery=Не вдалося знайти надбудову "Stationery" - вона встановлена?
 SmartTemplate4.fileTemplates.replaceStationery=На жаль, Thunderbird 68 і надалі "Stationery" більше не працює.\nТому SmartTemplate⁴ тепер пропонує власну систему управління шаблонами HTML; натисніть ОК, щоб налаштувати його.
diff --git a/locale/uk/register.dtd b/locale/uk/register.dtd
index ee22d77cb..ed2e60429 100644
--- a/locale/uk/register.dtd
+++ b/locale/uk/register.dtd
@@ -2,11 +2,14 @@
 <!ENTITY label.licenseValid "Ваша ліцензія дійсна до:">
 <!ENTITY label.haveLicense "Ви вже маєте ліцензію?">
 <!ENTITY getSmartTemplate4 "Купити ліцензію SmartTemplate⁴">
+<!ENTITY licenseTypes "Going forward, SmartTemplate⁴ offers two licenses, Standard and Pro; these are necessary to keep up with the changes in the Thunderbird platform and to finance Innovations and repairs of the Add-on. As breaking changes are rolled out in a yearly cycle, the license will also be valid for 1 year.">
 <!ENTITY intro "Щорічна ліцензія SmartTemplate⁴ Pro надає вам всі преміум-функції протягом року. Це також дозволяє нам підтримувати та розвивати продукт ще більше і перетворити його на щось ще більш приголомшливе.">
+<!ENTITY testDriveS "You can test drive the premium features with the standard license, but they may be slightly restricted.">
 <!ENTITY yearlyLicense.title "Щорічна ліцензія">
 <!ENTITY yearlyLicense.premiumFeatures "SmartTemplate⁴ Pro дає вам повний необмежений доступ до функцій преміум-класу.">
 <!ENTITY yearlyLicense.premiumFeatures.moreInfoLink "Докладніше про преміум-функції.">
 <!ENTITY yearlyLicense.usageTerm "Ліцензія призначена для особистого користування та прив'язана до вашої електронної адреси. Ви можете встановити його на декількох клієнтах електронної пошти, якщо вони налаштовані на використання цієї адреси.">
+<!ENTITY yearlyLicense.usageTerm1 "Any additional email addresses are no problem - they do not require a separate license. In case of questions you can reach me via the support tab.">
 <!ENTITY domainLicense.email "Ми зв'яжемося з вами за допомогою цієї електронної адреси, щоб створити для домену ліцензію; будь ласка, зачекайте протягом двох робочих днів, щоб ми могли зв'язатися з Вами. Введіть ім'я ліцензії домена на наступній сторінці.">
 <!ENTITY domainLicense.header "Ліцензійний Email Домен">
 <!ENTITY domainLicense.instruct "Ліцензія додається до домену вашої компанії. Ліцензія дозволить користувачам з адресами електронної пошти, що закінчуються цим доменом електронної пошти, використовувати SmartTemplate⁴ Pro. Наприклад, якщо ви вводите доменне ім'я &quot;abc.com&quot;, тоді користувачі електронної пошти, такі як fred@abc.com, martha@abc.com, mike.doe@abc.com тощо, можуть використовувати ліцензію. Максимальна кількість дійсних окремих користувачів - це номер, який ви ввели на початковому екрані.">
@@ -19,6 +22,10 @@
 <!ENTITY email.label "Email:">
 <!ENTITY firstName.label "Ім'я:">
 <!ENTITY lastName.label "Прізвище:">
+<!ENTITY buyPremiumLicense.instruct "Want to use all premium features without restrictions? Get a SmartTemplate⁴ Pro license. It is bound to your personal Email address and can be used in multiple installations.">
+<!ENTITY buyPremiumLicense.button "Buy Pro License!">
+<!ENTITY buyStandardLicense.instruct "Can't afford the premium functions? Get a highly affordable standard license and keep testing premium functions.">
+<!ENTITY buyStandardLicense.button "Buy Standard License!">
 <!ENTITY buyDomainLicense.instruct "Потрібні ліцензії для компанії з більш ніж п'ятьма користувачами? Отримання ліцензії на домен буде дешевше:">
 <!ENTITY buyDomainLicense.button "Купити доменну ліцензію">
 <!ENTITY enterLicenseKey.button "Введіть ліцензійний ключ ...">
diff --git a/locale/uk/settings.properties b/locale/uk/settings.properties
index 9a6cc9f07..584b61ee9 100644
--- a/locale/uk/settings.properties
+++ b/locale/uk/settings.properties
@@ -7,3 +7,5 @@ fpJsonFile=JSON файл
 fpImageFile=Файл зображень
 prompt.text=Введіть текст для додавання або встановлення
 prompt.email=Введіть адресу електронної пошти
+#### DESCRIPTION FOR LOAD HTML TEMPLATE WINDOW ####
+fpFilterHtmlTemplate=HTML Template
diff --git a/locale/uk/smartTemplate-overlay.dtd b/locale/uk/smartTemplate-overlay.dtd
index e85bba6eb..bb8a8f37f 100644
--- a/locale/uk/smartTemplate-overlay.dtd
+++ b/locale/uk/smartTemplate-overlay.dtd
@@ -1,3 +1,8 @@
 <!-- #### OVERLAYS #### -->
 <!ENTITY smartTemplate4.settings.label "SmartTemplate⁴">
 <!ENTITY smartTemplate4.settings.tooltip "SmartTemplate⁴ налаштування">
+<!ENTITY smartTemplate4.cleandeferred.label "Clean up!">
+<!ENTITY smartTemplate4.cleandeferred.tooltip "Clean up all SmartTemplate variables">
+<!ENTITY smartTemplate4.deferredcontext.update "Update SmartTemplate⁴ contents">
+<!ENTITY smartTemplate4.deferredcontext.cleanup "Update and Replace with Content">
+<!ENTITY smartTemplate4.deferredcontext.delete "Remove SmartTemplate⁴ variable">
diff --git a/locale/uk/smartTemplate-settings.dtd b/locale/uk/smartTemplate-settings.dtd
index 607064c6b..dc4c48e93 100644
--- a/locale/uk/smartTemplate-settings.dtd
+++ b/locale/uk/smartTemplate-settings.dtd
@@ -59,6 +59,7 @@
 <!ENTITY btnSaveTemplate.tooltip "Зберегти шаблон...">
 <!ENTITY btnLoadTemplate.tooltip "Завантажити шаблон...">
 <!ENTITY btnYouTube.tooltip "Відвідайте YouTube канал &quot;Thunderbird Daily&quot; - для поради та навчальні посібників з використання додатків">
+<!ENTITY tip.fileTemplates "Click to read full documentation about Stationery and external HTML templates on our support site…">
 <!ENTITY pref_server_def "Загальні">
 <!ENTITY pref_def.label "Використовувати загальні">
 <!ENTITY pref_def.cap "Зніміть прапорець 'Використовувати загальні', щоб створити індивідуальний заголовок для цього запису.">
@@ -79,6 +80,8 @@
 <!ENTITY pref_debug_tip "Клацніть правою кнопкою миші для виклику додаткових опцій відладки">
 <!ENTITY pref_nameSwap "Змінювати Прізвище, Ім'я">
 <!ENTITY pref_nameSwap_tip "Змінювати &quot;Прізвище, Ім'я&quot; на Ім'я">
+<!ENTITY defaultMimeFormat "Default address format:">
+<!ENTITY defaultMimeFormat_tip "Format to use when replacing plain &#37;to&#37; &#37;from&#37; &#37;cc&#37; addresses. E.g. firstname,lastname,??mail will show first name followed by last name; if both are unavailable, it will show the mail address.">
 <!ENTITY pref_addressDelimiter "Розділити декілька кореспондентів за допомогою:">
 <!ENTITY pref_addressDelimiter_tip "Розділ між кількома кореспондентами. Outlook використовує крапку з комою (;) За умовчанням для Thunderbird це кома (,)">
 <!ENTITY resolveNamesFromAB "Розпізнавати імена використовуючи адресну книгу">
@@ -88,6 +91,7 @@
 <!ENTITY resolveABRemoveMail "Видалити адреса електронної пошти, якщо не вказано параметр формату">
 <!ENTITY suppressMailtToLink "Подавити поштовими клієнтами додавання посилання на адреси електронної пошти.">
 <!ENTITY capitalizeNames "Назви прописними ">
+<!ENTITY guessNameFromMail "Guess Name parts from email address if missing">
 <!ENTITY pref_parseSignature "Підписання">
 <!ENTITY pref_parseSignature_tip "Заміна змінних у підпису">
 <!ENTITY pref_cursorInsertSpace "Вставити пробіл, щоб виділити &#37;курсор&#37;">
@@ -102,6 +106,7 @@
 <!ENTITY pref_defaultCharset_tip "При читанні заголовків, повернутися до цього кодування, якщо вони не можуть бути визначенні.">
 <!-- #### ABOUT #### -->
 <!ENTITY about.cap "Про SmartTemplate⁴">
+<!ENTITY support.tab "Support">
 <!ENTITY creator.label "Автор">
 <!ENTITY developer.label "Розробник">
 <!ENTITY localename.label "uk">
@@ -123,11 +128,13 @@
 <!ENTITY fileImage.label "Файл зображення (png,jpg,gif,bmp,svg). Альтернативний текст відображається, якщо зображення не може бути знайдено.">
 <!ENTITY attach.label "Додати файл як вкладення">
 <!ENTITY cursor.label "Позиції курсора">
+<!ENTITY spellcheck.label "Sets the spell-checking language. Example values: (en, de-DE, es-ES, ru) - note that the dictionary must be installed.">
 <!ENTITY to_var.cap "Отримувач (To)">
 <!ENTITY to_note.label "Якщо ім'я відсутнє, адреса електронної пошти відображатиметься замість неї">
 <!ENTITY to.label "Прізвище отримувача (за замовчуванням)">
 <!ENTITY tofirstname.label "Ім'я отримувача">
 <!ENTITY toname.label "Прізвище отримувача">
+<!ENTITY tofwd.label "Use fwd to add the clickable recipient in forwarded mails">
 <!ENTITY from_var.cap "Відправник (From)">
 <!ENTITY from_note.label "Якщо ім'я відсутнє, адреса електронної пошти відображатиметься замість неї">
 <!ENTITY from.label "Прізвище відправника (за замовчуванням)">
@@ -171,6 +178,7 @@
 <!ENTITY dateshort.label "Дата / Час короткий запис (напр. 01.01.2000 1:23:45)">
 <!ENTITY datetz.label "Часовий пояс (+0100, +0200, ... )">
 <!ENTITY tzname.label "GMT, PST, EST, ...">
+<!ENTITY timezone.explain "Force specific timezone for date variables by replacing the tz parameter (GMT, EST, CST, PST etc.)">
 <!ENTITY dateoffset_note.label "Наступна функція додає зміщення на всі наступні відображення часу.">
 <!ENTITY calculate.explain "DD=кількість днів до додавання. H=кількість годин для додавання (необов'язково). MM=хвилини для додавання (необов'язково)">
 <!ENTITY calculate.reset "Встановіть аргумент на 0, щоб зупинити зміну будь-яких дат.">
@@ -195,6 +203,9 @@
 <!ENTITY p1.label "д.о">
 <!ENTITY p2.label "Д.О.">
 <!ENTITY p3.label "ДО">
+<!ENTITY dateformat.label "Function for inserting current time (clickable field).">
+<!ENTITY dateformat.explain "Most time variables from above can be used in the parameter string by omitting &#37;. See also:">
+<!ENTITY dateformat.example "Example: ">
 <!ENTITY var_xsent.cap "&#37;X:=sent&#37; модифікатор">
 <!ENTITY xsent_note.label "За замовчуванням, змінні дата / час завжди ініціалізувалися за поточними значеннями (час, коли ви створюєте електронну пошту). У поєднанні з &#37;X:=sent&#37;, дата / час змінні відображають первісну дату або час повідомлень.">
 <!ENTITY xsent_long.cap "Приклад для довго рядка">
@@ -232,6 +243,7 @@
 <!ENTITY button.validateLicense "перевірити">
 <!ENTITY label.licenseValid "Ваша ліцензія дійсна до:">
 <!ENTITY licenseValidation.passed "Дякуємо за реєстрацію SmartTemplate⁴ Pro! Всі преміум-функції тепер розблоковано.">
+<!ENTITY licenseValidation.standard "Thanks for registering SmartTemplate⁴ Standard - You are helping the Add-on immensely! You also can now test drive all premium functions.">
 <!ENTITY licenseValidation.failed "Введений ліцензійний ключ недійсний. Перевірте свою електронну пошту з FastSpring за інструкціями. Якщо у вас все ще є проблеми, зв'яжіться зі мною на вкладці Підтримка.">
 <!ENTITY licenseValidation.expired "Термін дії ліцензійного ключа закінчився. Будь ласка, натисніть кнопку нижче, щоб оновити свою ліцензію.">
 <!ENTITY licenseValidation.invalidAddon "Введений ліцензійний ключ може бути для іншого надбудови. Ліцензійні ключі для {0} починаються з {1}.">
@@ -239,3 +251,15 @@
 <!ENTITY licenseValidation.notMatchedMail "Зашифрована адреса електронної пошти не відповідає жодній допустимій.">
 <!ENTITY premiumConfig "Преміальні функції">
 <!ENTITY label.premiumFeaturesSite "Дізнайтеся більше про преміум-функції на нашому веб-сайті">
+<!-- #####  Support ##### -->
+<!ENTITY support.title "Mail to Support">
+<!ENTITY support.type "Type:">
+<!ENTITY support.type.selectOne "Select a topic!">
+<!ENTITY support.type.license "Licensing related">
+<!ENTITY support.type.tech "Technical">
+<!ENTITY support.type.html "Help with HTML / CSS">
+<!ENTITY support.type.other "Other">
+<!ENTITY support.subject "Subject:">
+<!ENTITY support.mail.instructions "Click the button below to open a new Email to support. If you are having technical problems, consider adding a screenshot.">
+<!ENTITY support.compose "Write to support…">
+<!ENTITY support.links "Support Links">
diff --git a/locale/zh-CN/messages.properties b/locale/zh-CN/messages.properties
index 307a75a00..e59765174 100644
--- a/locale/zh-CN/messages.properties
+++ b/locale/zh-CN/messages.properties
@@ -24,9 +24,23 @@ SmartTemplate4.notification.premium.btn.extendLicense.tooltip=这将使当前许
 SmartTemplate4.notification.donate=捐
 SmartTemplate4.notification.licensing=更多关于许可
 SmartTemplate4.notification.dontShowAgain=不要再顯示此消息。
+SmartTemplate4.notification.spellcheck.noDictionary=No dictionaries installed.
+SmartTemplate4.notification.spellcheck.notFound=Dictionary '{0}' not found.
+SmartTemplate4.notification.spellcheck.error=Cannot switch spell checker language. Have you installed the correct dictionary?
 SmartTemplate4.licenseValidation.expired=您的購買憑證將在後面的日期到期：
 SmartTemplate4.licenseValidation.guessAddon=輸入的金鑰或許是適用在{2}
 SmartTemplate4.prompt.switchDomainLicense=切换到域许可证？
 SmartTemplate4.trialDays=您还剩{0}个试用期。
+SmartTemplate4.trialExpiry=Your trial period expired {0} days ago.
+SmartTemplate4.fileTemplates=Template Files
+SmartTemplate4.fileTemplates.wrnSelectUpdateItem=You have to select an item from the list to update!
+SmartTemplate4.fileTemplates.wrnSelectUpdateItem.caption=Update Templates
+SmartTemplate4.fileTemplates.wrnEnterTitle=Please enter a title!
+SmartTemplate4.fileTemplates.wrnEnterPath=Please select a valid path!
+SmartTemplate4.fileTemplates.openFile=Open SmartTemplate⁴ template file…
+SmartTemplate4.fileTemplates.restrictTemplates=You need a SmartTemplate⁴ license to use more than {1} templates!
+SmartTemplate4.fileTemplates.error.charSet=Problems converting a HTML template from charset [{1}]\nUsing raw string data instead.\nIf this results in garbled characters, try adding an explicit 'meta charset=' to the head section. Maybe try ISO-8859-1?
+SmartTemplate4.fileTemplates.error.filePath=Could not load the template file '{0}' from path:\n{1}\nThe file may have been removed or renamed.
+SmartTemplate4.fileFunction.notExists=Function {0} could not find or access file. Check the path below:
 SmartTemplate4.notification.noStationery=找不到附加'Stationery' - 是否已安装？
 SmartTemplate4.fileTemplates.replaceStationery=从Thunderbird 68开始，不幸的是'Stationery'不再适用了。\n因此，SmartTemplate⁴ 现在提供了自己的HTML模板管理系统。 单击“确定”进行设置。
diff --git a/locale/zh-CN/settings.properties b/locale/zh-CN/settings.properties
index 333969b5b..a3abbc258 100644
--- a/locale/zh-CN/settings.properties
+++ b/locale/zh-CN/settings.properties
@@ -7,3 +7,5 @@ fpJsonFile=JSON 文件
 fpImageFile=图像文件
 prompt.text=请输入要添加或设置的文本
 prompt.email=请输入一个电子邮件地址
+#### DESCRIPTION FOR LOAD HTML TEMPLATE WINDOW ####
+fpFilterHtmlTemplate=HTML Template
diff --git a/locale/zh-CN/smartTemplate-overlay.dtd b/locale/zh-CN/smartTemplate-overlay.dtd
index f71731083..f80ea413e 100644
--- a/locale/zh-CN/smartTemplate-overlay.dtd
+++ b/locale/zh-CN/smartTemplate-overlay.dtd
@@ -1,3 +1,8 @@
 <!-- #### OVERLAYS #### -->
 <!ENTITY smartTemplate4.settings.label "SmartTemplate⁴">
 <!ENTITY smartTemplate4.settings.tooltip "SmartTemplate⁴ 选项">
+<!ENTITY smartTemplate4.cleandeferred.label "Clean up!">
+<!ENTITY smartTemplate4.cleandeferred.tooltip "Clean up all SmartTemplate variables">
+<!ENTITY smartTemplate4.deferredcontext.update "Update SmartTemplate⁴ contents">
+<!ENTITY smartTemplate4.deferredcontext.cleanup "Update and Replace with Content">
+<!ENTITY smartTemplate4.deferredcontext.delete "Remove SmartTemplate⁴ variable">
diff --git a/locale/zh-CN/smartTemplate-settings.dtd b/locale/zh-CN/smartTemplate-settings.dtd
index 79cdaa006..aa31cabc4 100644
--- a/locale/zh-CN/smartTemplate-settings.dtd
+++ b/locale/zh-CN/smartTemplate-settings.dtd
@@ -59,6 +59,7 @@
 <!ENTITY btnSaveTemplate.tooltip "保存模板…">
 <!ENTITY btnLoadTemplate.tooltip "载入模板…">
 <!ENTITY btnYouTube.tooltip "访问 'Thunderbird Daily' YouTube 频道 - 使用 Stationery 和其他扩展的技巧与教程">
+<!ENTITY tip.fileTemplates "Click to read full documentation about Stationery and external HTML templates on our support site…">
 <!ENTITY pref_server_def "通用">
 <!ENTITY pref_def.label "使用通用">
 <!ENTITY pref_def.cap "如果您想要为这个帐户创建自定义的引用头，请取消选中“使用通用”">
@@ -80,6 +81,7 @@
 <!ENTITY pref_nameSwap "纠正 LastName, FirstName">
 <!ENTITY pref_nameSwap_tip "更改 'LastName, FirstName' 到 'First Last'">
 <!ENTITY defaultMimeFormat "默认地址格式：">
+<!ENTITY defaultMimeFormat_tip "Format to use when replacing plain &#37;to&#37; &#37;from&#37; &#37;cc&#37; addresses. E.g. firstname,lastname,??mail will show first name followed by last name; if both are unavailable, it will show the mail address.">
 <!ENTITY pref_addressDelimiter "多个通信者的分隔符：">
 <!ENTITY pref_addressDelimiter_tip "决定多个通信者之间的分隔符。Outlook 使用分号 (;)。Thunderbird 默认为英文逗号 (,)">
 <!ENTITY resolveNamesFromAB "根据通讯录解析名称">
@@ -104,6 +106,7 @@
 <!ENTITY pref_defaultCharset_tip "阅读引用头时，如不能确定，则使用此字符集作为后备选择。">
 <!-- #### ABOUT #### -->
 <!ENTITY about.cap "关于SmartTemplate4">
+<!ENTITY support.tab "Support">
 <!ENTITY creator.label "创造者">
 <!ENTITY developer.label "开发人员">
 <!ENTITY localename.label "zh-CN">
@@ -125,11 +128,13 @@
 <!ENTITY fileImage.label "图像文件 (png,jpg,gif,bmp,svg)。如果图像不能找到，将显示可选的 altText。">
 <!ENTITY attach.label "添加文件作为附件">
 <!ENTITY cursor.label "设置光标位置">
+<!ENTITY spellcheck.label "Sets the spell-checking language. Example values: (en, de-DE, es-ES, ru) - note that the dictionary must be installed.">
 <!ENTITY to_var.cap "收件人变量 (To)">
 <!ENTITY to_note.label "当姓名不可用时，将显示邮件地址">
 <!ENTITY to.label "收件人姓名 (默认)">
 <!ENTITY tofirstname.label "收件人名字">
 <!ENTITY toname.label "收件人姓名">
+<!ENTITY tofwd.label "Use fwd to add the clickable recipient in forwarded mails">
 <!ENTITY from_var.cap "发件人变量 (From)">
 <!ENTITY from_note.label "当姓名不可用时，将显示邮件地址">
 <!ENTITY from.label "发件人姓名 (默认)">
@@ -161,13 +166,22 @@
 <!ENTITY header.set.to "替换回复地址">
 <!ENTITY header.append.to "添加回复地址">
 <!ENTITY stringmanip_function.cap "文本操作">
+<!ENTITY stringmanip_function.explain "These functions can be used to delete or replace text within the Email template or quote header.">
+<!ENTITY deleteText "Remove some text from the Quote, e.g. deleteText(&quot;via Paypal&quot;)">
 <!ENTITY replaceText "用其他东西替换一些文本。">
+<!ENTITY matchTextFromBody "Find a RegEx pattern in quoted Email and insert at function location.">
+<!ENTITY matchTextFromSubject "Find a RegEx pattern in subject and insert at function location.">
+<!ENTITY stringmanip.match.comment "match Functions: The first parameter (the regular expression) must be within double quotes. The second parameter is the match group number. Use 0 to match the complete expression, 1 for the first group etc.">
 <!ENTITY fix_vartz.cap "固定的日期格式和时区变量">
 <!ENTITY fix_vartz_note.label "可以和 &#37;X:=sent&#37; 组合">
 <!ENTITY datelocal.label "日期和时间（本地格式）">
 <!ENTITY dateshort.label "日期和时间的简写 (例如 01.01.2000 1:23:45)">
 <!ENTITY datetz.label "时区 (+0100, +0200, ... )">
 <!ENTITY tzname.label "GMT, PST, EST, ...">
+<!ENTITY timezone.explain "Force specific timezone for date variables by replacing the tz parameter (GMT, EST, CST, PST etc.)">
+<!ENTITY dateoffset_note.label "The following function adds an offset to all following displayed times.">
+<!ENTITY calculate.explain "DD=number of days to add. H=number of hours to add (optional). MM=minutes to add (optional) ">
+<!ENTITY calculate.reset "Set the argument to 0 to stop modifying any dates.">
 <!ENTITY var_custom.cap "自定义日期格式的变量">
 <!ENTITY customdf_note.label "可以和 &#37;X:=sent&#37; 组合">
 <!ENTITY A.label "一周里的一天 (Friday)">
@@ -189,6 +203,9 @@
 <!ENTITY p1.label "a.m.">
 <!ENTITY p2.label "A.M.">
 <!ENTITY p3.label "AM">
+<!ENTITY dateformat.label "Function for inserting current time (clickable field).">
+<!ENTITY dateformat.explain "Most time variables from above can be used in the parameter string by omitting &#37;. See also:">
+<!ENTITY dateformat.example "Example: ">
 <!ENTITY var_xsent.cap "使用 &#37;X:=sent&#37;">
 <!ENTITY xsent_note.label "上面的变量将正常设置当前的值。当与 &#37;X:=sent&#37; 组合时，将设置过去的值。">
 <!ENTITY xsent_long.cap "长字符串的例子：">
@@ -218,6 +235,8 @@
 <!ENTITY table_new.label "新">
 <!ENTITY table_reply.label "回复">
 <!ENTITY table_fwd.label "转发">
+<!-- SmartTemplate4 Pro stuff -->
+<!ENTITY tab.gopro "SmartTemplate⁴ Pro">
 <!ENTITY label.insertLicense "在此处插入您的个人许可密钥：">
 <!ENTITY label.insertLicense.tooltip "您的许可证密钥包含在Fastspring的订单确认电子邮件中。">
 <!ENTITY button.pasteLicense "贴">
@@ -232,3 +251,15 @@
 <!ENTITY licenseValidation.notMatchedMail "加密电子邮件地址与可读邮件地址不匹配。">
 <!ENTITY premiumConfig "高级功能">
 <!ENTITY label.premiumFeaturesSite "详细了解我们网站上的高级功能">
+<!-- #####  Support ##### -->
+<!ENTITY support.title "Mail to Support">
+<!ENTITY support.type "Type:">
+<!ENTITY support.type.selectOne "Select a topic!">
+<!ENTITY support.type.license "Licensing related">
+<!ENTITY support.type.tech "Technical">
+<!ENTITY support.type.html "Help with HTML / CSS">
+<!ENTITY support.type.other "Other">
+<!ENTITY support.subject "Subject:">
+<!ENTITY support.mail.instructions "Click the button below to open a new Email to support. If you are having technical problems, consider adding a screenshot.">
+<!ENTITY support.compose "Write to support…">
+<!ENTITY support.links "Support Links">
diff --git a/locale/zh-TW/messages.properties b/locale/zh-TW/messages.properties
index 2df75a62d..052663935 100644
--- a/locale/zh-TW/messages.properties
+++ b/locale/zh-TW/messages.properties
@@ -8,6 +8,7 @@ SmartTemplate4.updateMessageNewBrackets1=親愛的 SmartTemplate4 用戶,我們
 SmartTemplate4.updateMessageNewBrackets2=從現在起,特定括號內的表達方式語法將改變:原來的大括號 {%cc(name)%} 將使用兩個中括號 [[%cc(name)%]] 來取代 - 要看更完整的內容,請看求助.
 SmartTemplate4.updateMessageNewBrackets3=SmartTemplate4 將會轉換您現有的樣板,所以您可以在新版本中繼續使用.請按[確定]繼續.
 SmartTemplate4.notification.license.text=從現在開始，SmartTemplate⁴至少需要一個標准許可證。 在我們的許可頁面上閱讀更多相關信息。
+#SmartTemplate4 Pro specific
 SmartTemplate4.notification.license.required=SmartTemplate⁴需要許可才能繼續工作。 閱讀電子郵件撰寫窗口底部的更多信息。
 SmartTemplate4.notification.parsing=分析變量：
 SmartTemplate4.notification.premium.title=高級功能
@@ -23,9 +24,23 @@ SmartTemplate4.notification.premium.btn.extendLicense.tooltip=這將使當前許
 SmartTemplate4.notification.donate=捐
 SmartTemplate4.notification.licensing=更多關於許可
 SmartTemplate4.notification.dontShowAgain=不要再顯示此消息。
+SmartTemplate4.notification.spellcheck.noDictionary=No dictionaries installed.
+SmartTemplate4.notification.spellcheck.notFound=Dictionary '{0}' not found.
+SmartTemplate4.notification.spellcheck.error=Cannot switch spell checker language. Have you installed the correct dictionary?
 SmartTemplate4.licenseValidation.expired=您的許可證已過期：
 SmartTemplate4.licenseValidation.guessAddon=（輸入的密鑰可能是{2}）。
 SmartTemplate4.prompt.switchDomainLicense=切換到域許可證？
 SmartTemplate4.trialDays=您還剩{0}個試用期。
+SmartTemplate4.trialExpiry=Your trial period expired {0} days ago.
+SmartTemplate4.fileTemplates=Template Files
+SmartTemplate4.fileTemplates.wrnSelectUpdateItem=You have to select an item from the list to update!
+SmartTemplate4.fileTemplates.wrnSelectUpdateItem.caption=Update Templates
+SmartTemplate4.fileTemplates.wrnEnterTitle=Please enter a title!
+SmartTemplate4.fileTemplates.wrnEnterPath=Please select a valid path!
+SmartTemplate4.fileTemplates.openFile=Open SmartTemplate⁴ template file…
+SmartTemplate4.fileTemplates.restrictTemplates=You need a SmartTemplate⁴ license to use more than {1} templates!
+SmartTemplate4.fileTemplates.error.charSet=Problems converting a HTML template from charset [{1}]\nUsing raw string data instead.\nIf this results in garbled characters, try adding an explicit 'meta charset=' to the head section. Maybe try ISO-8859-1?
+SmartTemplate4.fileTemplates.error.filePath=Could not load the template file '{0}' from path:\n{1}\nThe file may have been removed or renamed.
+SmartTemplate4.fileFunction.notExists=Function {0} could not find or access file. Check the path below:
 SmartTemplate4.notification.noStationery=找不到附加'Stationery' - 是否已安裝？
 SmartTemplate4.fileTemplates.replaceStationery=從Thunderbird 68開始，不幸的是'Stationery'不再起作用了。\n因此，SmartTemplate⁴ 現在提供了自己的HTML模板管理系統。 單擊“確定”進行設置。
diff --git a/locale/zh-TW/settings.properties b/locale/zh-TW/settings.properties
index fe245d9c6..156b9ed6b 100644
--- a/locale/zh-TW/settings.properties
+++ b/locale/zh-TW/settings.properties
@@ -2,3 +2,10 @@
 extensions.smarttemplate4@thunderbird.extension.description=SmartTemplate4 可以自訂每個帳號的'引用表頭'.
 #### DESCRIPTION FOR EXPORT/IMPORT WINDOW ####
 fpFilterName=SmartTemplate4 檔案
+fpHTMLFile=HTML File / Text File
+fpJsonFile=JSON File
+fpImageFile=Image File
+prompt.text=Enter the text to add or set
+prompt.email=Enter an email address
+#### DESCRIPTION FOR LOAD HTML TEMPLATE WINDOW ####
+fpFilterHtmlTemplate=HTML Template
diff --git a/locale/zh-TW/smartTemplate-overlay.dtd b/locale/zh-TW/smartTemplate-overlay.dtd
index 0dd12e2c7..75ab567c2 100644
--- a/locale/zh-TW/smartTemplate-overlay.dtd
+++ b/locale/zh-TW/smartTemplate-overlay.dtd
@@ -1,3 +1,8 @@
 <!-- #### OVERLAYS #### -->
 <!ENTITY smartTemplate4.settings.label "SmartTemplate⁴">
 <!ENTITY smartTemplate4.settings.tooltip "SmartTemplate⁴ 設定">
+<!ENTITY smartTemplate4.cleandeferred.label "Clean up!">
+<!ENTITY smartTemplate4.cleandeferred.tooltip "Clean up all SmartTemplate variables">
+<!ENTITY smartTemplate4.deferredcontext.update "Update SmartTemplate⁴ contents">
+<!ENTITY smartTemplate4.deferredcontext.cleanup "Update and Replace with Content">
+<!ENTITY smartTemplate4.deferredcontext.delete "Remove SmartTemplate⁴ variable">
diff --git a/locale/zh-TW/smartTemplate-settings.dtd b/locale/zh-TW/smartTemplate-settings.dtd
index 9d4be07bd..5909c135e 100644
--- a/locale/zh-TW/smartTemplate-settings.dtd
+++ b/locale/zh-TW/smartTemplate-settings.dtd
@@ -24,12 +24,26 @@
 <!ENTITY pref_help.tab "求助">
 <!ENTITY pref_about.tab "關於">
 <!ENTITY pref_global.tab "全域設定">
+<!ENTITY pref_advanced.tab "Advanced Settings">
 <!ENTITY pref_variables.tab "變數">
+<!ENTITY pref_examples.tab "Examples (online only)">
+<!ENTITY pref_examples.tooltip "Show example templates from http://smarttemplate4.mozdev.org/templates.html. Only available in online mode.">
 <!-- #### BUTTONS #### -->
 <!ENTITY accept_button "確定">
 <!ENTITY cancel_button "取消">
 <!ENTITY contribute_button "貢獻">
+<!ENTITY button.updateThunderbird "Update Thunderbird!">
 <!-- #### ABOUT #### -->
+<!ENTITY pref_groupMailContent "Mail Content">
+<!ENTITY pref_groupSignatures "Signatures">
+<!ENTITY pref_groupAdvanced "Advanced Functions">
+<!ENTITY pref_groupUI "User Interface">
+<!ENTITY pref_groupNameRules "Name Rules">
+<!ENTITY pref_groupTroubleShooting "Troubleshooting">
+<!ENTITY pref_addSigBreakHTML.label "Add -- in HTML mail">
+<!ENTITY pref_addSigBreakHTML.tooltip "Always add the -- delimiter before the Signature (in HTML mails)">
+<!ENTITY pref_addSigBreakPlaintext.label "Add -- in plain text mail">
+<!ENTITY pref_addSigBreakPlaintext.tooltip "Always add the -- delimiter before the Signature (in plain text mails)">
 <!ENTITY pref_quoteHeaderBox.label "引用表頭">
 <!ENTITY pref_quoteHeaderBox_tip "將引用表頭寫在這個對話框,例如.在&#37;date&#37; wrote &#37;from(name)&#37;:">
 <!ENTITY pref_templateBox.label "樣板">
@@ -37,8 +51,15 @@
 <!ENTITY pref_breaksOnTop.label "從頭算起的換行數:">
 <!ENTITY pref_removeSig.label "當改變電子郵件身份時置換簽名檔">
 <!ENTITY pref_showStatusIcon.label "在狀態列顯示按鈕">
+<!ENTITY pref_StatusIcon.IconOnly "Icon Only">
+<!ENTITY pref_StatusIcon.IconText "Icon And Text">
+<!ENTITY pref_StatusIcon.IconHoverText "Text on Hover">
 <!ENTITY pref_fontSettings.label "樣板字體編輯器">
 <!ENTITY pref_server_desc "帳號">
+<!ENTITY btnSaveTemplate.tooltip "Save Template…">
+<!ENTITY btnLoadTemplate.tooltip "Load Template…">
+<!ENTITY btnYouTube.tooltip "Visit 'Thunderbird Daily' YouTube channel - for tips and tutorials for using Stationery and other Addons">
+<!ENTITY tip.fileTemplates "Click to read full documentation about Stationery and external HTML templates on our support site…">
 <!ENTITY pref_server_def "常見">
 <!ENTITY pref_def.label "使用常見的">
 <!ENTITY pref_def.cap "這個帳號未勾選'使用常見的'來建立自訂引用表頭.">
@@ -55,9 +76,37 @@
 <!ENTITY help_dialog_title "SmartTemplate⁴ 求助">
 <!ENTITY help_keyword.cap "求助">
 <!ENTITY pref_debug_check "除錯模式">
+<!ENTITY pref_hideExamples "Hide examples tab">
 <!ENTITY pref_debug_tip "點右鍵使用進階的除錯選項">
+<!ENTITY pref_nameSwap "Correct LastName, FirstName">
+<!ENTITY pref_nameSwap_tip "Changes 'LastName, FirstName' to 'First Last'">
+<!ENTITY defaultMimeFormat "Default address format:">
+<!ENTITY defaultMimeFormat_tip "Format to use when replacing plain &#37;to&#37; &#37;from&#37; &#37;cc&#37; addresses. E.g. firstname,lastname,??mail will show first name followed by last name; if both are unavailable, it will show the mail address.">
+<!ENTITY pref_addressDelimiter "Delimit multiple correspondents with:">
+<!ENTITY pref_addressDelimiter_tip "Delimiter between multiple correspondents. Outlook uses semicolon (;) Default for Thunderbird is Comma (,)">
+<!ENTITY resolveNamesFromAB "Resolve names from address books">
+<!ENTITY resolveNamesFromAB_tip "This feature does not work with certain remote address books, such as LDAP.">
+<!ENTITY resolveNamesFromABNick "Replace first name with Nickname if present">
+<!ENTITY resolveNamesFromABDisplay "Use Display Name if first name missing">
+<!ENTITY resolveABRemoveMail "Remove email address unless format parameter is specified">
+<!ENTITY suppressMailtToLink "Suppress Mail Clients adding links to Email addresses.">
+<!ENTITY capitalizeNames "Capitalize Names">
+<!ENTITY guessNameFromMail "Guess Name parts from email address if missing">
+<!ENTITY pref_parseSignature "Process signature">
+<!ENTITY pref_parseSignature_tip "Replace variables in signature.">
+<!ENTITY pref_cursorInsertSpace "Insert Space to highlight &#37;cursor&#37;">
+<!ENTITY pref_stationerySupport "Support Stationery addon">
+<!ENTITY pref_stationerySupport_tip "Supports using Stationery at the same time with SmartTemplate⁴.">
+<!ENTITY pref_stationerySupport_tip2 "This makes it possible to use template variables in your Stationery.">
+<!ENTITY pref_stationeryLink "Stationery Addon">
+<!ENTITY pref_forceParagraph "Force Paragraph Mode">
+<!ENTITY pref_forceParagraph_tip "Makes sure that the cursor position starts off in a paragraph. We also recommend the Thunderbird Composition option to create a new paragraph on pressing the [Enter] key.">
+<!ENTITY pref_stationeryLink_tip "Get Stationery…">
+<!ENTITY pref_defaultCharset.label "Default charset">
+<!ENTITY pref_defaultCharset_tip "When reading the headers, fall back to this character set if it cannot be determined.">
 <!-- #### HELP #### -->
 <!ENTITY about.cap "有關 SmartTemplate⁴">
+<!ENTITY support.tab "Support">
 <!ENTITY creator.label "建立者">
 <!ENTITY developer.label "開發者">
 <!ENTITY localename.label "en-US">
@@ -75,11 +124,17 @@
 <!ENTITY ccmail.label "副本收件者電子郵件">
 <!ENTITY sig.label "從帳號設定的簽名檔">
 <!ENTITY sig2.label "從帳號設定的簽名檔但不要 '--'">
+<!ENTITY fileHTML.label "HTML or plain text file. UTF-8 is assumed when omitting the optional charset parameter.">
+<!ENTITY fileImage.label "Image file (png,jpg,gif,bmp,svg). The optional altText is displayed if the image can't be found.">
+<!ENTITY attach.label "Add file as attachment">
+<!ENTITY cursor.label "Sets the cursor position">
+<!ENTITY spellcheck.label "Sets the spell-checking language. Example values: (en, de-DE, es-ES, ru) - note that the dictionary must be installed.">
 <!ENTITY to_var.cap "收件者(到)">
 <!ENTITY to_note.label "當姓名無法使用時,將會顯示電子郵件地址">
 <!ENTITY to.label "收件者姓名 (預設)">
 <!ENTITY tofirstname.label "收件者名字">
 <!ENTITY toname.label "收件者姓名">
+<!ENTITY tofwd.label "Use fwd to add the clickable recipient in forwarded mails">
 <!ENTITY from_var.cap "寄件者 (從)">
 <!ENTITY from_note.label "當姓名無法使用時,將會顯示電子郵件地址">
 <!ENTITY from.label "寄件者姓名 (預設)">
@@ -102,13 +157,37 @@
 <!ENTITY newsgr.label "新聞群組">
 <!ENTITY xmail.label "X-Mailer">
 <!ENTITY any.label "任何 Header-line">
+<!ENTITY header_function.cap "Modify Mail Header">
+<!ENTITY header_function.explain "These functions can be used to modify mail headers, as described here:">
+<!ENTITY header_function.scope "It can be used with the these headers:">
+<!ENTITY header.set.subject "replace subject with the text">
+<!ENTITY header.prefix.subject "prefix subject with the text">
+<!ENTITY header.append.subject "append text to subject">
+<!ENTITY header.set.to "replace recipient with email address">
+<!ENTITY header.append.to "add email to recipient list">
+<!ENTITY stringmanip_function.cap "String Manipulation">
+<!ENTITY stringmanip_function.explain "These functions can be used to delete or replace text within the Email template or quote header.">
+<!ENTITY deleteText "Remove some text from the Quote, e.g. deleteText(&quot;via Paypal&quot;)">
+<!ENTITY replaceText "Replace some text with something else.">
+<!ENTITY matchTextFromBody "Find a RegEx pattern in quoted Email and insert at function location.">
+<!ENTITY matchTextFromSubject "Find a RegEx pattern in subject and insert at function location.">
+<!ENTITY stringmanip.match.comment "match Functions: The first parameter (the regular expression) must be within double quotes. The second parameter is the match group number. Use 0 to match the complete expression, 1 for the first group etc.">
 <!ENTITY fix_vartz.cap "'日期格式'/'時區'為固定變數">
 <!ENTITY fix_vartz_note.label "可以跟 &#37;X:=sent&#37; 整合">
 <!ENTITY datelocal.label "日期/時間 (本地格式)">
 <!ENTITY dateshort.label "簡短的日期/時間 (例如. 01.01.2000 1:23:45)">
 <!ENTITY datetz.label "時區 (+0100,+0200,...)">
+<!ENTITY tzname.label "GMT, PST, EST, ... ">
+<!ENTITY timezone.explain "Force specific timezone for date variables by replacing the tz parameter (GMT, EST, CST, PST etc.)">
+<!ENTITY dateoffset_note.label "The following function adds an offset to all following displayed times.">
+<!ENTITY calculate.explain "DD=number of days to add. H=number of hours to add (optional). MM=minutes to add (optional) ">
+<!ENTITY calculate.reset "Set the argument to 0 to stop modifying any dates.">
 <!ENTITY var_custom.cap "自訂 '日期格式' 的變數">
 <!ENTITY customdf_note.label "可以跟 &#37;X:=sent&#37; 整合">
+<!ENTITY A.label "Day of Week (Friday)">
+<!ENTITY a.label "Day of Week (Fri.)">
+<!ENTITY d.label "Day of Month (01 to 31) - with leading zero">
+<!ENTITY e.label "Day of Month (1 to 31)">
 <!ENTITY n.label "月 (1到12)">
 <!ENTITY B.label "月 (一月)">
 <!ENTITY b.label "月 (一月)">
@@ -124,6 +203,9 @@
 <!ENTITY p1.label "上午.">
 <!ENTITY p2.label "上午.">
 <!ENTITY p3.label "上午">
+<!ENTITY dateformat.label "Function for inserting current time (clickable field).">
+<!ENTITY dateformat.explain "Most time variables from above can be used in the parameter string by omitting &#37;. See also:">
+<!ENTITY dateformat.example "Example: ">
 <!ENTITY var_xsent.cap "&#37;X:=sent&#37; 修改者">
 <!ENTITY xsent_note.label "一般來說,日期/時間的變數都會設定為目前的值(目前=指當您建立這封郵件的時候).當合併了 &#37;X:=sent&#37;,則日期/時間變數將會對應原來郵件的日期/時間.">
 <!ENTITY xsent_long.cap "長字串的範例">
@@ -132,16 +214,52 @@
 <!ENTITY xsent_short.cap "短字串的範例">
 <!ENTITY xsent_short.label "&#37;X:=sent&#37; &#37;datelocal&#37;">
 <!ENTITY xsent_short_result.label "答案: 星期日, 20/12/2011 08:54:21">
+<!ENTITY xsent_short_note.label "The following variables can be used in both variants">
+<!ENTITY localedate.label "Date / Time (Locale Format)">
+<!ENTITY shortdate.label "Date / Time short (e.g. 01.01.2000 1:23:45)">
+<!ENTITY datetimezone.label "Timezone (+0100, +0200, ... )">
+<!ENTITY timezonename.label "GMT, PST, EST, ... ">
 <!ENTITY im-ex.cap "設定及樣板的匯出/匯入">
 <!ENTITY im-ex_note1.label "您可以匯出及匯入設定和關聯每一個帳號的樣板.">
 <!ENTITY im-ex_note2.label "第一,選擇您想要匯出從SmartTemplate4設定下拉視窗的帳號.">
 <!ENTITY im-ex_note3.label "下一步,從選單列點選'檔案' ⇒ '匯出' ⇒ '設定及樣板'然後儲存檔案 (xxx.st4) 到您的電腦.">
 <!ENTITY im-ex_note4.label "要匯入檔案,選擇一個您想要從 SmartTemplate⁴ 設定下拉視窗匯入的帳號.下一步,從選單列點選 '檔案' ⇒ '設定及樣板'.">
 <!ENTITY im-ex_note5.label "選擇您想匯入的 SmartTemplate⁴ 檔案 (xxx.st4).">
+<!ENTITY im-ex_note6.label "NOTE: Apple/Macintosh platforms will have the menu bar in the title ribbon instead of the SmartTemplate⁴ Options window. This is normal behavior on this platforms and can't be changed.">
+<!ENTITY html_note.cap "Note for HTML templates">
 <!ENTITY html_note.label "HTML 樣板只能使用 UTF-8 (Unicode) 字元!">
 <!ENTITY table.cap "變數使用方法">
 <!ENTITY table_note.label "錯誤使用變數將會在郵件中產生 'Error Console'!">
+<!-- #### TABLE #### -->
 <!ENTITY table_keyword.label "變數">
 <!ENTITY table_new.label "編寫">
 <!ENTITY table_reply.label "回覆">
 <!ENTITY table_fwd.label "轉寄">
+<!-- SmartTemplate4 Pro stuff -->
+<!ENTITY tab.gopro "SmartTemplate⁴ Pro">
+<!ENTITY label.insertLicense "Insert your personal License key here:">
+<!ENTITY label.insertLicense.tooltip "Your license key is contained in your order confirmation email from Fastspring.">
+<!ENTITY button.pasteLicense "paste">
+<!ENTITY button.validateLicense "validate">
+<!ENTITY label.licenseValid "Your license is valid until:">
+<!ENTITY licenseValidation.passed "Thanks for registering SmartTemplate⁴ Pro! All premium features are now unlocked.">
+<!ENTITY licenseValidation.standard "Thanks for registering SmartTemplate⁴ Standard - You are helping the Add-on immensely! You also can now test drive all premium functions.">
+<!ENTITY licenseValidation.failed "The license key you entered is not valid. Check your email from FastSpring for instructions. If you still have problems, please contact me from the Support tab.">
+<!ENTITY licenseValidation.expired "The license key you entered is expired. Please press the button below to renew your license.">
+<!ENTITY licenseValidation.invalidAddon "The license key you entered may be for a different Add-on. License keys for {0} start with {1}.">
+<!ENTITY licenseValidation.invalidMail "The email address that is bound to the license key [{1}] is currently not listed in any of your mail accounts. Please contact me from the Support tab for assistance.">
+<!ENTITY licenseValidation.notMatchedMail "Encrypted Email address does not match readable one.">
+<!ENTITY premiumConfig "Premium Features">
+<!ENTITY label.premiumFeaturesSite "Read more about Premium Features on our Website">
+<!-- #####  Support ##### -->
+<!ENTITY support.title "Mail to Support">
+<!ENTITY support.type "Type:">
+<!ENTITY support.type.selectOne "Select a topic!">
+<!ENTITY support.type.license "Licensing related">
+<!ENTITY support.type.tech "Technical">
+<!ENTITY support.type.html "Help with HTML / CSS">
+<!ENTITY support.type.other "Other">
+<!ENTITY support.subject "Subject:">
+<!ENTITY support.mail.instructions "Click the button below to open a new Email to support. If you are having technical problems, consider adding a screenshot.">
+<!ENTITY support.compose "Write to support…">
+<!ENTITY support.links "Support Links">
diff --git a/manifest.json b/manifest.json
index 1d6a8e9cd..7f31fbc1b 100644
--- a/manifest.json
+++ b/manifest.json
@@ -2,8 +2,8 @@
   "author": "Axel Grude",
   "manifest_version": 2,
   "name": "SmartTemplate4",
-	"description": "SmartTemplate4 customizes 'quote headers' and Mail template per account.",
-  "version": "2.4.2",
+	"description": "SmartTemplate4 customizes quote headers and mail template per account. It also replaces Stationery in Tb 68.",
+  "version": "2.5",
   "developer": {
 	  "name": "Axel Grude",
     "url": "http://smarttemplate4.mozdev.org/index.html"
diff --git a/release-notes.html b/release-notes.html
index 7fbd05813..670b8e3c7 100644
--- a/release-notes.html
+++ b/release-notes.html
@@ -1,13 +1,20 @@
 <meta charset="UTF-8">
 <style>b { display: block; margin-top: 10px; } </style>
 
-<b>2.4.2 Halloween version with important fixes for the new file templates feature.</b>
+<b>2.5 Clarified UI for Ex-Stationery users, spellcheck improvements.</b>
 
 Video for Ex-Stationery users - showcasing the new file templates feature: https://youtu.be/AWdZWB0_ym0
 
+<b>Improvements</b>
+<ul>
+<li>Added switch for toggling automatic proofing: use %spellcheck(off)% to disable or %spellcheck(on)% to enable automatic proofing. Different languages can be set using the language parameter, e.g. %spellcheck(it)% to switch to italian spell check. Additional dictionaries can be installed from <a href="https://addons.thunderbird.net/thunderbird/language-tools/">addons.thunderbird.net</a> using Add-ons Manager.</li>
+<li>Improved UI on Template Files page for Stationery users:
+- removed irrelevant Save and Load buttons
+- added a (?) button which links to the <a href="http://smarttemplate4.mozdev.org/stationery.html" target="_blank">Stationery help page</a>.</li>
+<li>Completed some of the missing translations for new functionality in the Finnish, French, Czech, Spanish, Italian, Polish and Swedish locales.</li>
+</ul>
 <b>Bug Fixes</b>
 <ul>
-  <ul>
-    <li> <a href="https://github.com/RealRaven2000/SmartTemplate4/issues/20">[issue 20]</a> If a html template file starts with certain UTF detection characters,  the "missing file" warning is wrongly displayed.    </li>
-    <li> Sandboxed Javascript (script blocks enclosed in %{%   %}%) implemented in [Bug 25676] stopped working in Thunderbird 68, due to the call to Cu.nukeSandbox failing...  for now, SmartTemplate⁴ allows using these again for versions smaller than 69.</li>
-  </ul></ul>
\ No newline at end of file
+<li>Fixed <a href="https://github.com/RealRaven2000/SmartTemplate4/issues/21">[issue 21]</a> %spellcheck% sometimes doesn't remove red proofing lines after setting language </li>
+<li>Extended error log for trouble shooting the getFileAsDataURI() function; this is used to improve behavior when images are included using the %file()% function, by replacing them with inline data without Thunderbird complaining about security problems. note that image file names should have an extension in order to determine file type correctly. To troubleshoot missing images that are included in this way, , enable SmartTemplate's "debug" mode and check the Javascript error console.</li>
+</ul>
\ No newline at end of file
diff --git a/revision.txt b/revision.txt
index 87af5ebaa..77e66e3c1 100644
--- a/revision.txt
+++ b/revision.txt
@@ -1 +1 @@
-6 
+28 
diff --git a/skin/common/style.css b/skin/common/style.css
index ed7e0e44f..e815a5c50 100644
--- a/skin/common/style.css
+++ b/skin/common/style.css
@@ -29,8 +29,14 @@
 #menuSupportPage, #menuBugsAndFeaturesPage {
   list-style-image: url("chrome://smartTemplate4/skin/CuteMenus/mozdev.png") !important;
 }
+#helpTemplates {
+  list-style-image: url("chrome://smartTemplate4/skin/icons/fugue-question.png");
+  -moz-image-region: rect(0px, 16px, 16px, 0px);
+  padding-left: 0 !important;
+  padding-right: 0 !important;
+}
 #helpStationery {
-  -moz-appearance: none !important;
+  -moz-appearance: none !important; 
   background-image: url("chrome://smartTemplate4/skin/icons/fugue-question.png");
   background-repeat: no-repeat;
   cursor: pointer;