Improved LanguageManager performance

CodeDead · CodeDead · commit 573ab77a533a · 2016-01-14T18:42:28.000+01:00
diff --git a/DeadLock/Classes/Language.cs b/DeadLock/Classes/Language.cs
@@ -11,6 +11,12 @@ public class Language
         public string Comment;
         #endregion
 
+        #region Shared
+        public string BtnClose;
+        public string BarItemSettings;
+        public string BarItemAbout;
+        #endregion
+
         #region Main_Form
         //Main form - Menu items:
         public string BarFile;
@@ -43,15 +49,11 @@ public class Language
         //Main Form - View menu - Items:
         public string BarItemDetails;
 
-        //Main Form - Tools menu - Items:
-        public string BarItemSettings;
-
         //Main Form - Help menu - Items:
         public string BarItemHelp;
         public string BarItemCheckForUpdates;
         public string BarItemHomePage;
         public string BarItemLicense;
-        public string BarItemAbout;
 
         //Main Form - ListView Items:
         public string ClhPath;
@@ -106,25 +108,18 @@ public class Language
         #endregion
 
         #region About_Form
-        //About Form - Text:
-        public string TxtAbout;
-
         //About Form - About:
         public string TxtAboutCreated;
         public string TxtAboutImages;
         public string TxtAboutTheme;
         public string TxtAboutCopyright;
         public string TxtAboutTranslation;
 
-        //About Form - Buttons:
-        public string BtnAboutClose;
+        //About Form - Button:
         public string BtnLicense;
         #endregion
 
         #region Settings_Form
-        //Settings Form - Text:
-        public string TxtSettings;
-
         //Settings Form - General Tab:
         public string LblGeneral;
         public string ChbAutoUpdate;
@@ -147,7 +142,6 @@ public class Language
         public string LblOwnership;
 
         //Settings Form - Buttons:
-        public string BtnSettingsClose;
         public string BtnReset;
         public string BtnSave;
 
diff --git a/DeadLock/Forms/FrmAbout.cs b/DeadLock/Forms/FrmAbout.cs
@@ -37,9 +37,9 @@ public FrmAbout(Language language)
         /// </summary>
         private void LoadLanguage()
         {
-            Text = @"DeadLock - " + _language.TxtAbout;
+            Text = @"DeadLock - " + _language.BarItemAbout;
             txtAbout.Text = _language.TxtAboutCreated + Environment.NewLine + _language.TxtAboutImages + Environment.NewLine + _language.TxtAboutTheme + Environment.NewLine + Environment.NewLine + _language.TxtAboutCopyright + Environment.NewLine + Environment.NewLine + _language.TxtAboutTranslation + Environment.NewLine + _language.Comment + @" - " + _language.Author;
-            btnClose.Text = _language.BtnAboutClose;
+            btnClose.Text = _language.BtnClose;
             btnLicense.Text = _language.BtnLicense;
         }
 
diff --git a/DeadLock/Forms/FrmSettings.Designer.cs b/DeadLock/Forms/FrmSettings.Designer.cs
diff --git a/DeadLock/Forms/FrmSettings.cs b/DeadLock/Forms/FrmSettings.cs
@@ -44,7 +44,7 @@ public FrmSettings(NotifyIcon nfi, Language l)
         /// </summary>
         private void LoadLanguage()
         {
-            Text = @"DeadLock - " + _language.TxtSettings;
+            Text = @"DeadLock - " + _language.BarItemSettings;
 
             tpaGeneral.Text = _language.LblGeneral;
             tpaAppearance.Text = _language.LblAppearance;
@@ -95,7 +95,7 @@ private void LoadLanguage()
             tbtnOwnership.ActiveState.Text = _language.TbtnOff;
             tbtnOwnership.InactiveState.Text = _language.TbtnOn;
 
-            btnClose.Text = _language.BtnSettingsClose;
+            btnClose.Text = _language.BtnClose;
             btnReset.Text = _language.BtnReset;
             btnSave.Text = _language.BtnSave;
         }
diff --git a/DeadLock/Resources/Languages/eng.xml b/DeadLock/Resources/Languages/eng.xml
@@ -59,15 +59,13 @@
   <MsgAvailable>is now available!</MsgAvailable>
   <MsgDownloadNewVersion>Would you like to download the latest version?</MsgDownloadNewVersion>
   <MsgLatestVersionAlreadyInstalled>The latest version of DeadLock is already installed!</MsgLatestVersionAlreadyInstalled>
-  <TxtAbout>About</TxtAbout>
   <TxtAboutCreated>DeadLock was created by DeadLine.</TxtAboutCreated>
   <TxtAboutImages>Images: small-n-flat by paomedia</TxtAboutImages>
   <TxtAboutTheme>Theme by: SyncFusion</TxtAboutTheme>
   <TxtAboutCopyright>Copyright &#169; CodeDead 2016</TxtAboutCopyright>
   <TxtAboutTranslation>Translation:</TxtAboutTranslation>
-  <BtnAboutClose>Close</BtnAboutClose>
+  <BtnClose>Close</BtnClose>
   <BtnLicense>License</BtnLicense>
-  <TxtSettings>Settings</TxtSettings>
   <LblGeneral>General</LblGeneral>
   <ChbAutoUpdate>Automatically check for updates:</ChbAutoUpdate>
   <ChbShowNotifyIcon>Show notifyicon:</ChbShowNotifyIcon>
@@ -83,7 +81,6 @@
   <LblAutoRunDeadLock>Run DeadLock automatically:</LblAutoRunDeadLock>
   <LblWindowsExplorerIntegration>Windows Explorer integration:</LblWindowsExplorerIntegration>
   <LblOwnership>Take ownership:</LblOwnership>
-  <BtnSettingsClose>Close</BtnSettingsClose>
   <BtnReset>Reset</BtnReset>
   <BtnSave>Save</BtnSave>
   <MsgRestartRequired>A restart is required in order to change certain settings!</MsgRestartRequired>
diff --git a/DeadLock/Resources/Languages/ita.xml b/DeadLock/Resources/Languages/ita.xml
@@ -59,15 +59,12 @@
 	<MsgAvailable>e´ora disponibile!</MsgAvailable>
 	<MsgDownloadNewVersion>Scaricare la versione piu recente?</MsgDownloadNewVersion>
 	<MsgLatestVersionAlreadyInstalled>La versione di DeadLock piu recente e´stata gia´installata!</MsgLatestVersionAlreadyInstalled>
-	<TxtAbout>Informazioni</TxtAbout>
 	<TxtAboutCreated>DeadLock è stato creato da DeadLine.</TxtAboutCreated>
 	<TxtAboutImages>Immagini: small-n-flat da paomedia</TxtAboutImages>
 	<TxtAboutTheme>Tema di: SyncFusion</TxtAboutTheme>
 	<TxtAboutCopyright>Copyright &#169; CodeDead 2016</TxtAboutCopyright>
 	<TxtAboutTranslation>Traduzione:</TxtAboutTranslation>
-	<BtnAboutClose>Chiudi</BtnAboutClose>
 	<BtnLicense>Licenza</BtnLicense>
-	<TxtSettings>Impostazioni</TxtSettings>
 	<LblGeneral>Generale</LblGeneral>
 	<ChbAutoUpdate>Controllo automatico aggiornamenti:</ChbAutoUpdate>
 	<ChbShowNotifyIcon>Mostra icona notifica:</ChbShowNotifyIcon>
@@ -83,7 +80,7 @@
 	<LblAutoRunDeadLock>Avvia DeadLock automaticamente:</LblAutoRunDeadLock>
 	<LblWindowsExplorerIntegration>Integrazione Windows Explorer:</LblWindowsExplorerIntegration>
   <LblOwnership>Assumere la proprietà:</LblOwnership>
-	<BtnSettingsClose>Chiudi</BtnSettingsClose>
+	<BtnClose>Chiudi</BtnClose>
 	<BtnReset>Resetta</BtnReset>
 	<BtnSave>Salva</BtnSave>
 	<MsgRestartRequired>È necessario un riavvio per modificare alcune impostazioni!</MsgRestartRequired>
diff --git a/DeadLock/Resources/Languages/nl.xml b/DeadLock/Resources/Languages/nl.xml
@@ -59,15 +59,13 @@
   <MsgAvailable>is nu beschikbaar!</MsgAvailable>
   <MsgDownloadNewVersion>Wil je de laatste nieuwe versie downloaden?</MsgDownloadNewVersion>
   <MsgLatestVersionAlreadyInstalled>U heeft de meest recente versie!</MsgLatestVersionAlreadyInstalled>
-  <TxtAbout>Over</TxtAbout>
   <TxtAboutCreated>DeadLock werd gemaakt door DeadLine.</TxtAboutCreated>
   <TxtAboutImages>Afbeeldingen: small-n-flat door paomedia</TxtAboutImages>
   <TxtAboutTheme>Thema door: SyncFusion</TxtAboutTheme>
   <TxtAboutCopyright>Copyright &#169; CodeDead 2016</TxtAboutCopyright>
   <TxtAboutTranslation>Vertaling:</TxtAboutTranslation>
-  <BtnAboutClose>Sluiten</BtnAboutClose>
+  <BtnClose>Sluiten</BtnClose>
   <BtnLicense>Licentie</BtnLicense>
-  <TxtSettings>Instellingen</TxtSettings>
   <LblGeneral>Algemeen</LblGeneral>
   <ChbAutoUpdate>Controleer automatisch op updates:</ChbAutoUpdate>
   <ChbShowNotifyIcon>Toon notifyicon:</ChbShowNotifyIcon>
@@ -83,7 +81,6 @@
   <LblAutoRunDeadLock>Start DeadLock automatisch:</LblAutoRunDeadLock>
   <LblWindowsExplorerIntegration>Windows Explorer integratie:</LblWindowsExplorerIntegration>
   <LblOwnership>Neem eigendomsrecht:</LblOwnership>
-  <BtnSettingsClose>Sluiten</BtnSettingsClose>
   <BtnReset>Resetten</BtnReset>
   <BtnSave>Opslaan</BtnSave>
   <MsgRestartRequired>Het programma moet opnieuw opgestart worden om de instellingen te wijzigen!</MsgRestartRequired>
diff --git a/DeadLock/Resources/Languages/pl.xml b/DeadLock/Resources/Languages/pl.xml
@@ -59,15 +59,13 @@
 	<MsgAvailable>jest już dostępna!</MsgAvailable>
 	<MsgDownloadNewVersion>Czy chciałbys sciągnąc najnowszą wersje?</MsgDownloadNewVersion>
 	<MsgLatestVersionAlreadyInstalled>Ostatnia wersja DeadLock jest już zainstalowana!</MsgLatestVersionAlreadyInstalled>
-	<TxtAbout>O programie</TxtAbout>
 	<TxtAboutCreated>DeadLock został stworzony przez DeadLine.</TxtAboutCreated>
 	<TxtAboutImages>Obrazy: small-n-flat przez paomedia</TxtAboutImages>
 	<TxtAboutTheme>Tematu przez: SyncFusion</TxtAboutTheme>
 	<TxtAboutCopyright>Copyright &#169; CodeDead 2016</TxtAboutCopyright>
 	<TxtAboutTranslation>Tłumaczenie:</TxtAboutTranslation>
-	<BtnAboutClose>Zamknij</BtnAboutClose>
+	<BtnClose>Zamknij</BtnClose>
 	<BtnLicense>Licencja</BtnLicense>
-	<TxtSettings>Ustawienia</TxtSettings>
 	<LblGeneral>Ogólne</LblGeneral>
 	<ChbAutoUpdate>Automatycznie sprawdzaj aktualizacje:</ChbAutoUpdate>
 	<ChbShowNotifyIcon>Wyświetl dymki informacyji:</ChbShowNotifyIcon>
@@ -83,7 +81,6 @@
 	<LblAutoRunDeadLock>Włącz DeadLock automatycznie:</LblAutoRunDeadLock>
 	<LblWindowsExplorerIntegration>Integruj w menu kontekstowym:</LblWindowsExplorerIntegration>
   <LblOwnership>Przejąć na własność:</LblOwnership>
-	<BtnSettingsClose>Zamknij</BtnSettingsClose>
 	<BtnReset>Resetuj</BtnReset>
 	<BtnSave>Zapisz</BtnSave>
 	<MsgRestartRequired>Wymagane jest Ponowne uruchomienie w celu zmiany niektórych ustawień!</MsgRestartRequired>
diff --git a/DeadLock/Resources/Languages/tr.xml b/DeadLock/Resources/Languages/tr.xml
@@ -59,15 +59,13 @@
   <MsgAvailable>hazır!</MsgAvailable>
   <MsgDownloadNewVersion>En son sürümü indirmek ister misiniz?</MsgDownloadNewVersion>
   <MsgLatestVersionAlreadyInstalled>En güncel DeadLock sürümü zaten yüklü!</MsgLatestVersionAlreadyInstalled>
-  <TxtAbout>Hakkında</TxtAbout>
   <TxtAboutCreated>DeadLock, DeadLine tarafından üretilmiştir.</TxtAboutCreated>
   <TxtAboutImages>Resimler: small-n-flat by paomedia</TxtAboutImages>
   <TxtAboutTheme>Tema: SyncFusion</TxtAboutTheme>
   <TxtAboutCopyright>Telif Hakları © CodeDead 2016</TxtAboutCopyright>
   <TxtAboutTranslation>Çeviri:</TxtAboutTranslation>
-  <BtnAboutClose>Kapat</BtnAboutClose>
+  <BtnClose>Kapat</BtnClose>
   <BtnLicense>Lisans</BtnLicense>
-  <TxtSettings>Ayarlar</TxtSettings>
   <LblGeneral>Genel</LblGeneral>
   <ChbAutoUpdate>Güncellemeleri otomatik denetle:</ChbAutoUpdate>
   <ChbShowNotifyIcon>Uyarı simgesini göster:</ChbShowNotifyIcon>
@@ -83,7 +81,6 @@
   <LblAutoRunDeadLock>DeadLock'ı otomatik başlat:</LblAutoRunDeadLock>
   <LblWindowsExplorerIntegration>Windows sağtık ilişkilendirmesi:</LblWindowsExplorerIntegration>
   <LblOwnership>Sahiplik alma:</LblOwnership>
-  <BtnSettingsClose>Kapat</BtnSettingsClose>
   <BtnReset>Sıfırla</BtnReset>
   <BtnSave>Kaydet</BtnSave>
   <MsgRestartRequired>Bir yeniden başlatma belirli ayarları değiştirmek için gereklidir!</MsgRestartRequired>

Original file line number	Diff line number	Diff line change
`@@ -37,9 +37,9 @@ public FrmAbout(Language language)`
`37`	`37`	`/// </summary>`
`38`	`38`	`private void LoadLanguage()`
`39`	`39`	`{`
`40`		`- Text = @"DeadLock - " + _language.TxtAbout;`
	`40`	`+ Text = @"DeadLock - " + _language.BarItemAbout;`
`41`	`41`	`txtAbout.Text = _language.TxtAboutCreated + Environment.NewLine + _language.TxtAboutImages + Environment.NewLine + _language.TxtAboutTheme + Environment.NewLine + Environment.NewLine + _language.TxtAboutCopyright + Environment.NewLine + Environment.NewLine + _language.TxtAboutTranslation + Environment.NewLine + _language.Comment + @" - " + _language.Author;`
`42`		`- btnClose.Text = _language.BtnAboutClose;`
	`42`	`+ btnClose.Text = _language.BtnClose;`
`43`	`43`	`btnLicense.Text = _language.BtnLicense;`
`44`	`44`	`}`
`45`	`45`