diff --git a/PowerEditor/installer/nativeLang/abkhazian.xml b/PowerEditor/installer/nativeLang/abkhazian.xml
index 6e800d81e..5d3745c4b 100644
--- a/PowerEditor/installer/nativeLang/abkhazian.xml
+++ b/PowerEditor/installer/nativeLang/abkhazian.xml
@@ -19,8 +19,8 @@ Updated to v8.2.1:
 					<Item menuId="tools"    name="&amp;Амаругақәа"/>
 					<Item menuId="macro"    name="&amp;Амакросқәа"/>
 					<Item menuId="run"      name="&amp;Адәықәҵара"/>
-					<Item idName="Plugins"  name="&amp;Аплагинқәа"/>
-					<Item idName="Window"   name="&amp;Агәылаҵақәа"/>
+					<Item menuId="Plugins"  name="&amp;Аплагинқәа"/>
+					<Item menuId="Window"   name="&amp;Агәылаҵақәа"/>
 				</Entries>
 				<SubEntries>
 					<Item subMenuId="file-openFolder"           name="&amp;Иаарттәуп адокумент акаталог"/>
diff --git a/PowerEditor/installer/nativeLang/afrikaans.xml b/PowerEditor/installer/nativeLang/afrikaans.xml
index 38868644f..4ac9b3586 100644
--- a/PowerEditor/installer/nativeLang/afrikaans.xml
+++ b/PowerEditor/installer/nativeLang/afrikaans.xml
@@ -14,8 +14,8 @@
 					<Item menuId="settings" name = "&amp;Stellings"/>
 					<Item menuId="macro" name = "Makro"/>
 					<Item menuId="run" name = "Loop"/>
-					<Item idName = "Plugins" name = "Inkoppeling"/>
-					<Item idName = "Window" name = "Venster"/>
+					<Item menuId = "Plugins" name = "Inkoppeling"/>
+					<Item menuId = "Window" name = "Venster"/>
 				</Entries>
 
                 <!-- Sub Menu Entries -->
diff --git a/PowerEditor/installer/nativeLang/albanian.xml b/PowerEditor/installer/nativeLang/albanian.xml
index 6c3b797ec..870754533 100644
--- a/PowerEditor/installer/nativeLang/albanian.xml
+++ b/PowerEditor/installer/nativeLang/albanian.xml
@@ -14,8 +14,8 @@
                     <Item menuId="settings" name="&amp;Rregullimet"/>
                     <Item menuId="macro" name="Makro"/>
                     <Item menuId="run" name="Ekzekuto"/>
-                    <Item idName="Plugins" name="Shtojca"/>
-                    <Item idName="Window" name="Dritare"/>
+                    <Item menuId="Plugins" name="Shtojca"/>
+                    <Item menuId="Window" name="Dritare"/>
                 </Entries>
                 <!-- Sub Menu Entries -->
                 <SubEntries>
diff --git a/PowerEditor/installer/nativeLang/arabic.xml b/PowerEditor/installer/nativeLang/arabic.xml
index 011a859ef..37b4370f0 100644
--- a/PowerEditor/installer/nativeLang/arabic.xml
+++ b/PowerEditor/installer/nativeLang/arabic.xml
@@ -23,8 +23,8 @@
                     <Item menuId="tools" name="أ&amp;دوات"/>
                     <Item menuId="macro" name="&amp;ماكرو"/>
                     <Item menuId="run" name="&amp;تشغيل"/>
-                    <Item idName="Plugins" name="إ&amp;ضافات"/>
-                    <Item idName="Window" name="&amp;نافذة"/>
+                    <Item menuId="Plugins" name="إ&amp;ضافات"/>
+                    <Item menuId="Window" name="&amp;نافذة"/>
                 </Entries>
                 <!-- Sub Menu Entries -->
                 <SubEntries>
diff --git a/PowerEditor/installer/nativeLang/aragonese.xml b/PowerEditor/installer/nativeLang/aragonese.xml
index 7ab7e55ae..0e0db3c33 100644
--- a/PowerEditor/installer/nativeLang/aragonese.xml
+++ b/PowerEditor/installer/nativeLang/aragonese.xml
@@ -19,8 +19,8 @@ By Chesús D. Trigo [xuxinho7@gmail.com] & softaragones [softaragones@soft
 					<Item menuId="settings" name="Co&amp;nfiguración"/>
 					<Item menuId="macro" name="&amp;Macro"/>
 					<Item menuId="run" name="E&amp;xecutar"/>
-					<Item idName="Plugins" name="C&amp;omplementos"/>
-					<Item idName="Window" name="F&amp;inestras"/>
+					<Item menuId="Plugins" name="C&amp;omplementos"/>
+					<Item menuId="Window" name="F&amp;inestras"/>
                 </Entries>
 
 
diff --git a/PowerEditor/installer/nativeLang/aranese.xml b/PowerEditor/installer/nativeLang/aranese.xml
index 4f88d31ca..a6568ddde 100644
--- a/PowerEditor/installer/nativeLang/aranese.xml
+++ b/PowerEditor/installer/nativeLang/aranese.xml
@@ -14,8 +14,8 @@
 					<Item menuId="settings" name = "Con&amp;figuracions"/>
 					<Item menuId="macro" name = "&amp;Macro"/>
 					<Item menuId="run" name = "La&amp;nçar"/>
-					<Item idName = "Plugins" name = "&amp;Pedaçi"/>
-					<Item idName = "Window" name = "&amp;Hiestra"/>
+					<Item menuId = "Plugins" name = "&amp;Pedaçi"/>
+					<Item menuId = "Window" name = "&amp;Hiestra"/>
 				</Entries>
 
                 <!-- Sub Menu Entries -->
diff --git a/PowerEditor/installer/nativeLang/azerbaijani.xml b/PowerEditor/installer/nativeLang/azerbaijani.xml
index 634249e47..e2723cf2e 100644
--- a/PowerEditor/installer/nativeLang/azerbaijani.xml
+++ b/PowerEditor/installer/nativeLang/azerbaijani.xml
@@ -14,8 +14,8 @@
                     <Item menuId="settings" name="Nizamlar"/>
                     <Item menuId="macro" name="Makro"/>
                     <Item menuId="run" name="İşə sal"/>
-                    <Item idName="Plugins" name="Plaginlər"/>
-                    <Item idName="Window" name="Pəncərə"/>
+                    <Item menuId="Plugins" name="Plaginlər"/>
+                    <Item menuId="Window" name="Pəncərə"/>
                 </Entries>
 
                 <!-- Sub Menu Entries -->
diff --git a/PowerEditor/installer/nativeLang/basque.xml b/PowerEditor/installer/nativeLang/basque.xml
index f0b4b5245..f13a52f6d 100644
--- a/PowerEditor/installer/nativeLang/basque.xml
+++ b/PowerEditor/installer/nativeLang/basque.xml
@@ -18,8 +18,8 @@ The comments are here for explanation, it's not necessary to translate them.
                     <Item menuId="tools" name="&amp;Tresnak"/>
                     <Item menuId="macro" name="&amp;Makroa"/>
                     <Item menuId="run" name="E&amp;xekutatu"/>
-                    <Item idName="Plugins" name="&amp;Pluginak"/>
-                    <Item idName="Window" name="&amp;Leihoa"/>
+                    <Item menuId="Plugins" name="&amp;Pluginak"/>
+                    <Item menuId="Window" name="&amp;Leihoa"/>
                 </Entries>
                 <!-- Sub Menu Entries -->
                 <SubEntries>
diff --git a/PowerEditor/installer/nativeLang/belarusian.xml b/PowerEditor/installer/nativeLang/belarusian.xml
index a8fdfe055..216e7c84d 100644
--- a/PowerEditor/installer/nativeLang/belarusian.xml
+++ b/PowerEditor/installer/nativeLang/belarusian.xml
@@ -18,8 +18,8 @@ The comments are here for explanation, it's not necessary to translate them.
                     <Item menuId="tools" name="Інструменты"/>
                     <Item menuId="macro" name="Макрас"/>
                     <Item menuId="run" name="Выканаць"/>
-                    <Item idName="Убудовы" name="Убудовы"/>
-                    <Item idName="Window" name="Акно"/>
+                    <Item menuId="Plugins" name="Убудовы"/>
+                    <Item menuId="Window" name="Акно"/>
                 </Entries>
                 <!-- Sub Menu Entries -->
                 <SubEntries>
diff --git a/PowerEditor/installer/nativeLang/bengali.xml b/PowerEditor/installer/nativeLang/bengali.xml
index ef16ca655..1a41c2663 100644
--- a/PowerEditor/installer/nativeLang/bengali.xml
+++ b/PowerEditor/installer/nativeLang/bengali.xml
@@ -14,8 +14,8 @@
                     <Item menuId="settings" name="&amp;বিন্যাস"/>
                     <Item menuId="macro" name="ম্যাক্রো"/>
                     <Item menuId="run" name="চালান"/>
-                    <Item idName="Plugins" name="প্লাগইন"/>
-                    <Item idName="Window" name="জানালা"/>
+                    <Item menuId="Plugins" name="প্লাগইন"/>
+                    <Item menuId="Window" name="জানালা"/>
                 </Entries>
                 <!-- Sub Menu Entries -->
                 <SubEntries>
diff --git a/PowerEditor/installer/nativeLang/bosnian.xml b/PowerEditor/installer/nativeLang/bosnian.xml
index 35dbbf73b..952f6a9fc 100644
--- a/PowerEditor/installer/nativeLang/bosnian.xml
+++ b/PowerEditor/installer/nativeLang/bosnian.xml
@@ -15,8 +15,8 @@
 					<Item menuId="settings" name="Po&amp;stavke"/>
 					<Item menuId="macro" name="Makro"/>
 					<Item menuId="run" name="Pokreni"/>
-					<Item idName="Plugins" name="Dodaci"/>
-					<Item idName="Window" name="Prozor"/>
+					<Item menuId="Plugins" name="Dodaci"/>
+					<Item menuId="Window" name="Prozor"/>
 				</Entries>
 
                 <!-- Sub Menu Entries -->
diff --git a/PowerEditor/installer/nativeLang/brazilian_portuguese.xml b/PowerEditor/installer/nativeLang/brazilian_portuguese.xml
index 044beccf3..1521c4166 100644
--- a/PowerEditor/installer/nativeLang/brazilian_portuguese.xml
+++ b/PowerEditor/installer/nativeLang/brazilian_portuguese.xml
@@ -18,8 +18,8 @@
                     <Item menuId="tools" name="&amp;Ferramentas"/>
                     <Item menuId="macro" name="&amp;Macro"/>
                     <Item menuId="run" name="Executa&amp;r"/>
-                    <Item idName="Plugins" name="&amp;Plugins"/>
-                    <Item idName="Window" name="&amp;Janela"/>
+                    <Item menuId="Plugins" name="&amp;Plugins"/>
+                    <Item menuId="Window" name="&amp;Janela"/>
                 </Entries>
                 <!-- Sub Menu Entries -->
                 <SubEntries>
diff --git a/PowerEditor/installer/nativeLang/breton.xml b/PowerEditor/installer/nativeLang/breton.xml
index 4b5ff5a85..3e1c9b660 100644
--- a/PowerEditor/installer/nativeLang/breton.xml
+++ b/PowerEditor/installer/nativeLang/breton.xml
@@ -15,8 +15,8 @@
                     <Item menuId="tools" name="&amp;Ostilhoù"/>
                     <Item menuId="macro" name="&amp;Makro"/>
                     <Item menuId="run" name="&amp;Sekutiñ"/>
-                    <Item idName="Plugins" name="&amp;Lugantoù"/>
-                    <Item idName="Window" name="&amp;Prenestr"/>
+                    <Item menuId="Plugins" name="&amp;Lugantoù"/>
+                    <Item menuId="Window" name="&amp;Prenestr"/>
                 </Entries>
                 <!-- Sub Menu Entries -->
                 <SubEntries>
diff --git a/PowerEditor/installer/nativeLang/bulgarian.xml b/PowerEditor/installer/nativeLang/bulgarian.xml
index 95df2901a..7031757d0 100644
--- a/PowerEditor/installer/nativeLang/bulgarian.xml
+++ b/PowerEditor/installer/nativeLang/bulgarian.xml
@@ -22,8 +22,8 @@
 					<Item menuId="tools" name="&amp;Инструменти"/>
 					<Item menuId="macro" name="&amp;Макроси"/>
 					<Item menuId="run" name="Ст&amp;артиране"/>
-					<Item idName="Plugins" name="&amp;Добавки"/>
-					<Item idName="Window" name="&amp;Прозорци"/>
+					<Item menuId="Plugins" name="&amp;Добавки"/>
+					<Item menuId="Window" name="&amp;Прозорци"/>
 				</Entries>
 				<!-- Подменюта -->
 				<SubEntries>
diff --git a/PowerEditor/installer/nativeLang/catalan.xml b/PowerEditor/installer/nativeLang/catalan.xml
index d4c487a82..8f87156d1 100644
--- a/PowerEditor/installer/nativeLang/catalan.xml
+++ b/PowerEditor/installer/nativeLang/catalan.xml
@@ -19,8 +19,8 @@ By Hiro5 <groccat at gmail>
 					<Item menuId="tools" name="E&amp;ines"/>
 					<Item menuId="macro" name="&amp;Macro"/>
 					<Item menuId="run" name="E&amp;xecuta"/>
-					<Item idName="Plugins" name="C&amp;omplements"/>
-					<Item idName="Window" name="Fine&amp;stres"/>
+					<Item menuId="Plugins" name="C&amp;omplements"/>
+					<Item menuId="Window" name="Fine&amp;stres"/>
 				</Entries>
 				<SubEntries>
 					<Item subMenuId="file-openFolder" name="Obre la carpeta contenidora"/>
diff --git a/PowerEditor/installer/nativeLang/chineseSimplified.xml b/PowerEditor/installer/nativeLang/chineseSimplified.xml
index 8d816de89..242784dc4 100644
--- a/PowerEditor/installer/nativeLang/chineseSimplified.xml
+++ b/PowerEditor/installer/nativeLang/chineseSimplified.xml
@@ -18,8 +18,8 @@ The comments are here for explanation, it's not necessary to translate them.
                     <Item menuId="tools" name="工具(&amp;O)"/>
                     <Item menuId="macro" name="宏(&amp;M)"/>
                     <Item menuId="run" name="运行(&amp;R)"/>
-                    <Item idName="Plugins" name="插件(&amp;P)"/>
-                    <Item idName="Window" name="窗口(&amp;W)"/>
+                    <Item menuId="Plugins" name="插件(&amp;P)"/>
+                    <Item menuId="Window" name="窗口(&amp;W)"/>
                 </Entries>
                 <!-- Sub Menu Entries -->
                 <SubEntries>
diff --git a/PowerEditor/installer/nativeLang/corsican.xml b/PowerEditor/installer/nativeLang/corsican.xml
index 948187248..330c3b40f 100644
--- a/PowerEditor/installer/nativeLang/corsican.xml
+++ b/PowerEditor/installer/nativeLang/corsican.xml
@@ -47,8 +47,8 @@ The comments are here for explanation, it's not necessary to translate them.
                     <Item menuId="tools" name="A&amp;ttrezzi"/>
                     <Item menuId="macro" name="Macr&amp;o"/>
                     <Item menuId="run" name="Ese&amp;guisce"/>
-                    <Item idName="Plugins" name="&amp;Estensioni"/>
-                    <Item idName="Window" name="&amp;Finestra"/>
+                    <Item menuId="Plugins" name="&amp;Estensioni"/>
+                    <Item menuId="Window" name="&amp;Finestra"/>
                 </Entries>
                 <!-- Sub Menu Entries -->
                 <SubEntries>
diff --git a/PowerEditor/installer/nativeLang/croatian.xml b/PowerEditor/installer/nativeLang/croatian.xml
index 6f2d10578..402574024 100644
--- a/PowerEditor/installer/nativeLang/croatian.xml
+++ b/PowerEditor/installer/nativeLang/croatian.xml
@@ -22,8 +22,8 @@
                     <Item menuId="tools" name="&amp;Alati"/>
                     <Item menuId="macro" name="&amp;Makro"/>
                     <Item menuId="run" name="Pok&amp;reni"/>
-                    <Item idName="Plugins" name="Doda&amp;ci"/>
-                    <Item idName="Window" name="&amp;Kartice"/>
+                    <Item menuId="Plugins" name="Doda&amp;ci"/>
+                    <Item menuId="Window" name="&amp;Kartice"/>
                 </Entries>
 
                 <!-- Sub Menu Entries -->
diff --git a/PowerEditor/installer/nativeLang/czech.xml b/PowerEditor/installer/nativeLang/czech.xml
index 281ad93b4..6988dbea7 100644
--- a/PowerEditor/installer/nativeLang/czech.xml
+++ b/PowerEditor/installer/nativeLang/czech.xml
@@ -21,8 +21,8 @@
 					<Item menuId = "tools" name = "Nástro&amp;je"/>
 					<Item menuId = "macro" name = "&amp;Makro"/>
 					<Item menuId = "run" name = "Sp&amp;ustit"/>
-					<Item idName = "Plugins" name = "Plu&amp;giny"/>
-					<Item idName = "Window" name = "&amp;Okno"/>
+					<Item menuId = "Plugins" name = "Plu&amp;giny"/>
+					<Item menuId = "Window" name = "&amp;Okno"/>
 				</Entries>
 
 				<!-- Sub Menu Entries -->
diff --git a/PowerEditor/installer/nativeLang/danish.xml b/PowerEditor/installer/nativeLang/danish.xml
index 50884b1a9..8e003d021 100644
--- a/PowerEditor/installer/nativeLang/danish.xml
+++ b/PowerEditor/installer/nativeLang/danish.xml
@@ -18,8 +18,8 @@ The comments are here for explanation, it's not necessary to translate them.
                     <Item menuId="tools" name="Væ&amp;rktøjer"/>
                     <Item menuId="macro" name="&amp;Makro"/>
                     <Item menuId="run" name="&amp;Kør"/>
-                    <Item idName="Plugins" name="P&amp;lugins"/>
-                    <Item idName="Window" name="V&amp;induer"/>
+                    <Item menuId="Plugins" name="P&amp;lugins"/>
+                    <Item menuId="Window" name="V&amp;induer"/>
                 </Entries>
                 <!-- Sub Menu Entries -->
                 <SubEntries>
diff --git a/PowerEditor/installer/nativeLang/dutch.xml b/PowerEditor/installer/nativeLang/dutch.xml
index 4a521f37b..84b9e33fb 100644
--- a/PowerEditor/installer/nativeLang/dutch.xml
+++ b/PowerEditor/installer/nativeLang/dutch.xml
@@ -23,8 +23,8 @@ Last modified on 2022-02-10 by Thomas De Rocker (RockyTDR).
                     <Item menuId="tools" name="&amp;Gereedschappen"/>
                     <Item menuId="macro" name="&amp;Macro"/>
                     <Item menuId="run" name="&amp;Uitvoeren"/>
-                    <Item idName="Plugins" name="&amp;Plugins"/>
-                    <Item idName="Window" name="&amp;Vensters"/>
+                    <Item menuId="Plugins" name="&amp;Plugins"/>
+                    <Item menuId="Window" name="&amp;Vensters"/>
                 </Entries>
                 <!-- Sub Menu Entries -->
                 <SubEntries>
diff --git a/PowerEditor/installer/nativeLang/english.xml b/PowerEditor/installer/nativeLang/english.xml
index c1e98208f..3e698c47f 100644
--- a/PowerEditor/installer/nativeLang/english.xml
+++ b/PowerEditor/installer/nativeLang/english.xml
@@ -18,8 +18,8 @@ The comments are here for explanation, it's not necessary to translate them.
                     <Item menuId="tools" name="To&amp;ols"/>
                     <Item menuId="macro" name="&amp;Macro"/>
                     <Item menuId="run" name="&amp;Run"/>
-                    <Item idName="Plugins" name="&amp;Plugins"/>
-                    <Item idName="Window" name="&amp;Window"/>
+                    <Item menuId="Plugins" name="&amp;Plugins"/>
+                    <Item menuId="Window" name="&amp;Window"/>
                 </Entries>
                 <!-- Sub Menu Entries -->
                 <SubEntries>
diff --git a/PowerEditor/installer/nativeLang/english_customizable.xml b/PowerEditor/installer/nativeLang/english_customizable.xml
index 8350ef330..75aa34d44 100644
--- a/PowerEditor/installer/nativeLang/english_customizable.xml
+++ b/PowerEditor/installer/nativeLang/english_customizable.xml
@@ -15,8 +15,8 @@
                     <Item menuId="tools" name="To&amp;ols"/>
                     <Item menuId="macro" name="&amp;Macro"/>
                     <Item menuId="run" name="&amp;Run"/>
-                    <Item idName="Plugins" name="&amp;Plugins"/>
-                    <Item idName="Window" name="&amp;Window"/>
+                    <Item menuId="Plugins" name="&amp;Plugins"/>
+                    <Item menuId="Window" name="&amp;Window"/>
                 </Entries>
                 <!-- Sub Menu Entries -->
                 <SubEntries>
diff --git a/PowerEditor/installer/nativeLang/esperanto.xml b/PowerEditor/installer/nativeLang/esperanto.xml
index e33debe00..3305655a5 100644
--- a/PowerEditor/installer/nativeLang/esperanto.xml
+++ b/PowerEditor/installer/nativeLang/esperanto.xml
@@ -22,8 +22,8 @@
 					<Item menuId="settings" name="&amp;Agordoj"/>
 					<Item menuId="macro" name="&amp;Makroo"/>
 					<Item menuId="run" name="&amp;Lanĉado"/>
-					<Item idName="Plugins" name="Kromaĵoj"/>
-					<Item idName="Window" name="Fenestro"/>
+					<Item menuId="Plugins" name="Kromaĵoj"/>
+					<Item menuId="Window" name="Fenestro"/>
 				</Entries>
 
 				<!-- Subĉefaj menuoj -->
diff --git a/PowerEditor/installer/nativeLang/estonian.xml b/PowerEditor/installer/nativeLang/estonian.xml
index 54b8804b4..48041efa3 100644
--- a/PowerEditor/installer/nativeLang/estonian.xml
+++ b/PowerEditor/installer/nativeLang/estonian.xml
@@ -19,8 +19,8 @@ https://github.com/AndresTraks/
                     <Item menuId="tools" name="T&amp;ööriistad"/>
                     <Item menuId="macro" name="Makro"/>
                     <Item menuId="run" name="Käivita"/>
-                    <Item idName="Plugins" name="Pluginad"/>
-                    <Item idName="Window" name="Aken"/>
+                    <Item menuId="Plugins" name="Pluginad"/>
+                    <Item menuId="Window" name="Aken"/>
                 </Entries>
                 <!-- Sub Menu Entries -->
                 <SubEntries>
diff --git a/PowerEditor/installer/nativeLang/extremaduran.xml b/PowerEditor/installer/nativeLang/extremaduran.xml
index b1d700e75..4e3b7cc1a 100644
--- a/PowerEditor/installer/nativeLang/extremaduran.xml
+++ b/PowerEditor/installer/nativeLang/extremaduran.xml
@@ -14,8 +14,8 @@
 					<Item menuId="settings" name = "&amp;Configurazión"/>
 					<Item menuId="macro" name = "Macru"/>
 					<Item menuId="run" name = "Ehecutal"/>
-					<Item idName = "Plugins" name = "'Plugins'"/>
-					<Item idName = "Window" name = "Ventana"/>
+					<Item menuId = "Plugins" name = "'Plugins'"/>
+					<Item menuId = "Window" name = "Ventana"/>
 				</Entries>
 
                 <!-- Sub Menu Entries -->
diff --git a/PowerEditor/installer/nativeLang/farsi.xml b/PowerEditor/installer/nativeLang/farsi.xml
index 782d9e657..0c8aac363 100644
--- a/PowerEditor/installer/nativeLang/farsi.xml
+++ b/PowerEditor/installer/nativeLang/farsi.xml
@@ -14,8 +14,8 @@
                     <Item menuId="settings" name="تنظیمات"/>
                     <Item menuId="macro" name="ماکرو"/>
                     <Item menuId="run" name="اِجرا"/>
-                    <Item idName="Plugins" name="افزونه ها"/>
-                    <Item idName="Window" name="پنجره"/>
+                    <Item menuId="Plugins" name="افزونه ها"/>
+                    <Item menuId="Window" name="پنجره"/>
                 </Entries>
                 <!-- Sub Menu Entries -->
                 <SubEntries>
diff --git a/PowerEditor/installer/nativeLang/finnish.xml b/PowerEditor/installer/nativeLang/finnish.xml
index 2451388d3..64a51fd69 100644
--- a/PowerEditor/installer/nativeLang/finnish.xml
+++ b/PowerEditor/installer/nativeLang/finnish.xml
@@ -20,8 +20,8 @@ Updated to v8.0.0:
 					<Item menuId="tools" name="Työ&amp;kalut"/>
 					<Item menuId="macro" name="Mak&amp;ro"/>
 					<Item menuId="run" name="&amp;Suorita"/>
-					<Item idName="Plugins" name="&amp;Liitännäiset"/>
-					<Item idName="Window" name="&amp;Ikkuna"/>
+					<Item menuId="Plugins" name="&amp;Liitännäiset"/>
+					<Item menuId="Window" name="&amp;Ikkuna"/>
 				</Entries>
 				<!-- Sub Menu Entries -->
 				<SubEntries>
diff --git a/PowerEditor/installer/nativeLang/french.xml b/PowerEditor/installer/nativeLang/french.xml
index 4c53c3d70..1ba453c4d 100644
--- a/PowerEditor/installer/nativeLang/french.xml
+++ b/PowerEditor/installer/nativeLang/french.xml
@@ -15,8 +15,8 @@
                     <Item menuId="tools" name="&amp;Outils"/>
                     <Item menuId="macro" name="&amp;Macro"/>
                     <Item menuId="run" name="E&amp;xécution"/>
-                    <Item idName="Plugins" name="Modules d'ex&amp;tension"/>
-                    <Item idName="Window" name="&amp;Documents"/>
+                    <Item menuId="Plugins" name="Modules d'ex&amp;tension"/>
+                    <Item menuId="Window" name="&amp;Documents"/>
                 </Entries>
                 <!-- Sub Menu Entries -->
                 <SubEntries>
diff --git a/PowerEditor/installer/nativeLang/friulian.xml b/PowerEditor/installer/nativeLang/friulian.xml
index 348cb6bc1..13ec591a3 100644
--- a/PowerEditor/installer/nativeLang/friulian.xml
+++ b/PowerEditor/installer/nativeLang/friulian.xml
@@ -14,8 +14,8 @@
 					<Item menuId="settings" name = "&amp;Impostazions"/>
 					<Item menuId="macro" name = "Macro"/>
 					<Item menuId="run" name = "Invie"/>
-					<Item idName = "Plugins" name = "Plugins"/>
-					<Item idName = "Window" name = "Barcon"/>
+					<Item menuId = "Plugins" name = "Plugins"/>
+					<Item menuId = "Window" name = "Barcon"/>
 				</Entries>
 
                 <!-- Sub Menu Entries -->
diff --git a/PowerEditor/installer/nativeLang/galician.xml b/PowerEditor/installer/nativeLang/galician.xml
index 67f8948ef..e11bab2ee 100644
--- a/PowerEditor/installer/nativeLang/galician.xml
+++ b/PowerEditor/installer/nativeLang/galician.xml
@@ -20,8 +20,8 @@
 					<Item menuId="settings" name = "C&amp;onfigurar"/>
 					<Item menuId="macro" name = "Macro"/>
 					<Item menuId="run" name = "Executar"/>
-					<Item idName = "Plugins" name = "Engadidos"/>
-					<Item idName = "Window" name = "Xanelas"/>
+					<Item menuId = "Plugins" name = "Engadidos"/>
+					<Item menuId = "Window" name = "Xanelas"/>
 				</Entries>
 
                 <!-- Entradas de Sub-menú -->
diff --git a/PowerEditor/installer/nativeLang/georgian.xml b/PowerEditor/installer/nativeLang/georgian.xml
index c22c3c0a8..a23e0df00 100644
--- a/PowerEditor/installer/nativeLang/georgian.xml
+++ b/PowerEditor/installer/nativeLang/georgian.xml
@@ -19,8 +19,8 @@
                     <Item menuId="settings" name="გამართვა"/>
                     <Item menuId="macro" name="მაკრო"/>
                     <Item menuId="run" name="გაშვება"/>
-                    <Item idName="Plugins" name="დანამატები"/>
-                    <Item idName="Window" name="ფანჯარა"/>
+                    <Item menuId="Plugins" name="დანამატები"/>
+                    <Item menuId="Window" name="ფანჯარა"/>
                 </Entries>
 
                 <!-- Sub Menu Entries -->
diff --git a/PowerEditor/installer/nativeLang/german.xml b/PowerEditor/installer/nativeLang/german.xml
index 2d6c63a98..7f8b33dc5 100644
--- a/PowerEditor/installer/nativeLang/german.xml
+++ b/PowerEditor/installer/nativeLang/german.xml
@@ -27,8 +27,8 @@
 					<Item menuId="tools" name="Werk&amp;zeuge"/>
 					<Item menuId="macro" name="&amp;Makros"/>
 					<Item menuId="run" name="Ausfüh&amp;ren"/>
-					<Item idName="Plugins" name="Er&amp;weiterungen"/>
-					<Item idName="Window" name="Fe&amp;nster"/>
+					<Item menuId="Plugins" name="Er&amp;weiterungen"/>
+					<Item menuId="Window" name="Fe&amp;nster"/>
 				</Entries>
 				<!-- Sub Menu Entries -->
 				<SubEntries>
diff --git a/PowerEditor/installer/nativeLang/greek.xml b/PowerEditor/installer/nativeLang/greek.xml
index e4f757411..78483491c 100644
--- a/PowerEditor/installer/nativeLang/greek.xml
+++ b/PowerEditor/installer/nativeLang/greek.xml
@@ -15,8 +15,8 @@
                     <Item menuId="tools" name="Εργαλεία"/>
 					<Item menuId="macro" name="Μακροεντολή"/>
 					<Item menuId="run" name="Εκτέλεση"/>
-					<Item idName="Plugins" name="Πρόσθετα"/>
-					<Item idName="Window" name="Παράθυρο"/>
+					<Item menuId="Plugins" name="Πρόσθετα"/>
+					<Item menuId="Window" name="Παράθυρο"/>
 				</Entries>
                 <!-- Sub Menu Entries -->
                 <SubEntries>
diff --git a/PowerEditor/installer/nativeLang/gujarati.xml b/PowerEditor/installer/nativeLang/gujarati.xml
index 27a4547f1..3aafc19ab 100644
--- a/PowerEditor/installer/nativeLang/gujarati.xml
+++ b/PowerEditor/installer/nativeLang/gujarati.xml
@@ -14,8 +14,8 @@
                     <Item menuId="settings" name="&amp;સેટિંગ"/>
                     <Item menuId="macro" name="મેક્રો"/>
                     <Item menuId="run" name="ચલાવો"/>
-                    <Item idName="Plugins" name="પ્લગઇન્સ"/>
-                    <Item idName="Window" name="વિન્ડો"/>
+                    <Item menuId="Plugins" name="પ્લગઇન્સ"/>
+                    <Item menuId="Window" name="વિન્ડો"/>
                 </Entries>
                 <!-- Sub Menu Entries -->
                 <SubEntries>
diff --git a/PowerEditor/installer/nativeLang/hebrew.xml b/PowerEditor/installer/nativeLang/hebrew.xml
index 2284dd3b4..d76ae0bb0 100644
--- a/PowerEditor/installer/nativeLang/hebrew.xml
+++ b/PowerEditor/installer/nativeLang/hebrew.xml
@@ -15,8 +15,8 @@
 					<Item menuId="tools" name="&amp;כלים"/>
 					<Item menuId="macro" name="מאקרו מקשים"/>
 					<Item menuId="run" name="הפעלה"/>
-					<Item idName="Plugins" name="תוספים"/>
-					<Item idName="Window"  name="חלון"/>
+					<Item menuId="Plugins" name="תוספים"/>
+					<Item menuId="Window"  name="חלון"/>
 
 				</Entries>
 
diff --git a/PowerEditor/installer/nativeLang/hindi.xml b/PowerEditor/installer/nativeLang/hindi.xml
index 726c60d06..00599c9a4 100644
--- a/PowerEditor/installer/nativeLang/hindi.xml
+++ b/PowerEditor/installer/nativeLang/hindi.xml
@@ -22,8 +22,8 @@
           <Item menuId="tools" name="टूल्स"/>
           <Item menuId="macro" name="मेक्रो"/>
           <Item menuId="run" name="चलाये"/>
-          <Item idName="Plugins" name="प्लगिन्स"/>
-          <Item idName="Window" name="विन्डों"/>
+          <Item menuId="Plugins" name="प्लगिन्स"/>
+          <Item menuId="Window" name="विन्डों"/>
         </Entries>
 
         <!-- Sub Menu Entries -->
diff --git a/PowerEditor/installer/nativeLang/hongKongCantonese.xml b/PowerEditor/installer/nativeLang/hongKongCantonese.xml
index d0061b208..6caeb5dfb 100644
--- a/PowerEditor/installer/nativeLang/hongKongCantonese.xml
+++ b/PowerEditor/installer/nativeLang/hongKongCantonese.xml
@@ -21,8 +21,8 @@
                     <Item menuId="tools" name="架撐(&amp;O)"/>
                     <Item menuId="macro" name="&amp;Macro"/>
                     <Item menuId="run" name="執行(&amp;R)"/>
-                    <Item idName="Plugins" name="外掛(&amp;P)"/>
-                    <Item idName="Window" name="視窗(&amp;W)"/>
+                    <Item menuId="Plugins" name="外掛(&amp;P)"/>
+                    <Item menuId="Window" name="視窗(&amp;W)"/>
                 </Entries>
                 <!-- Sub Menu Entries -->
                 <SubEntries>
diff --git a/PowerEditor/installer/nativeLang/hungarian.xml b/PowerEditor/installer/nativeLang/hungarian.xml
index fc06481b6..a15a2fbd0 100644
--- a/PowerEditor/installer/nativeLang/hungarian.xml
+++ b/PowerEditor/installer/nativeLang/hungarian.xml
@@ -21,8 +21,8 @@
                  <Item menuId="tools" name="Es&amp;zközök"/>
                  <Item menuId="macro" name="&amp;Makró"/>
                  <Item menuId="run" name="F&amp;uttatás"/>
-                 <Item idName="Plugins" name="Bő&amp;vítmények"/>
-                 <Item idName="Window" name="&amp;Ablakok"/>
+                 <Item menuId="Plugins" name="Bő&amp;vítmények"/>
+                 <Item menuId="Window" name="&amp;Ablakok"/>
               </Entries>
               <!-- Sub Menu Entries -->
                 <SubEntries>
diff --git a/PowerEditor/installer/nativeLang/indonesian.xml b/PowerEditor/installer/nativeLang/indonesian.xml
index ad282815c..224af5b13 100644
--- a/PowerEditor/installer/nativeLang/indonesian.xml
+++ b/PowerEditor/installer/nativeLang/indonesian.xml
@@ -15,8 +15,8 @@
                     <Item menuId="tools" name="Alat"/>
                     <Item menuId="macro" name="Makro"/>
                     <Item menuId="run" name="Jalankan"/>
-                    <Item idName="Plugins" name="Plugin"/>
-                    <Item idName="Window" name="Jendela"/>
+                    <Item menuId="Plugins" name="Plugin"/>
+                    <Item menuId="Window" name="Jendela"/>
                 </Entries>
 
                 <!-- Sub Menu Entries -->
diff --git a/PowerEditor/installer/nativeLang/irish.xml b/PowerEditor/installer/nativeLang/irish.xml
index 94703cabc..e852b2cbd 100644
--- a/PowerEditor/installer/nativeLang/irish.xml
+++ b/PowerEditor/installer/nativeLang/irish.xml
@@ -15,8 +15,8 @@
                     <Item menuId="tools" name="Uir&amp;lisí"/>
                     <Item menuId="macro" name="&amp;Macra"/>
                     <Item menuId="run" name="&amp;Rith"/>
-                    <Item idName="Plugins" name="&amp;Breiseáin"/>
-                    <Item idName="Window" name="&amp;Fuinneog"/>
+                    <Item menuId="Plugins" name="&amp;Breiseáin"/>
+                    <Item menuId="Window" name="&amp;Fuinneog"/>
                 </Entries>
                 <!-- Sub Menu Entries -->
                 <SubEntries>
diff --git a/PowerEditor/installer/nativeLang/italian.xml b/PowerEditor/installer/nativeLang/italian.xml
index 8bf4805c5..e5c83575c 100644
--- a/PowerEditor/installer/nativeLang/italian.xml
+++ b/PowerEditor/installer/nativeLang/italian.xml
@@ -22,8 +22,8 @@
                     <Item menuId="tools" name="&amp;Strumenti"/>
                     <Item menuId="macro" name="M&amp;acro"/>
                     <Item menuId="run" name="Ese&amp;gui"/>
-                    <Item idName="Plugins" name="&amp;Plugin"/>
-                    <Item idName="Window" name="Fin&amp;estra"/>
+                    <Item menuId="Plugins" name="&amp;Plugin"/>
+                    <Item menuId="Window" name="Fin&amp;estra"/>
                 </Entries>
                 <!-- Sub Menu Entries -->
                 <SubEntries>
diff --git a/PowerEditor/installer/nativeLang/japanese.xml b/PowerEditor/installer/nativeLang/japanese.xml
index 222f80e1d..d236e160d 100644
--- a/PowerEditor/installer/nativeLang/japanese.xml
+++ b/PowerEditor/installer/nativeLang/japanese.xml
@@ -15,8 +15,8 @@
                     <Item menuId="tools" name="ツール(&amp;O)"/>
                     <Item menuId="macro" name="マクロ(&amp;M)"/>
                     <Item menuId="run" name="実行(&amp;R)"/>
-                    <Item idName="Plugins" name="プラグイン(&amp;P)"/>
-                    <Item idName="Window" name="ウィンドウ管理(&amp;W)"/>
+                    <Item menuId="Plugins" name="プラグイン(&amp;P)"/>
+                    <Item menuId="Window" name="ウィンドウ管理(&amp;W)"/>
                 </Entries>
                 <!-- Sub Menu Entries -->
                 <SubEntries>
diff --git a/PowerEditor/installer/nativeLang/kabyle.xml b/PowerEditor/installer/nativeLang/kabyle.xml
index fb83e6ac4..2eae93615 100644
--- a/PowerEditor/installer/nativeLang/kabyle.xml
+++ b/PowerEditor/installer/nativeLang/kabyle.xml
@@ -14,8 +14,8 @@
                     <Item menuId="settings" name="Iɣewwaren"/>
                     <Item menuId="macro" name="Macro"/>
                     <Item menuId="run" name="Selkem "/>
-                    <Item idName="Plugins" name="Plugins"/>
-                    <Item idName="Window" name="Asfaylu"/>
+                    <Item menuId="Plugins" name="Plugins"/>
+                    <Item menuId="Window" name="Asfaylu"/>
                 </Entries>
 
                 <!-- Sub Menu Entries -->
diff --git a/PowerEditor/installer/nativeLang/kannada.xml b/PowerEditor/installer/nativeLang/kannada.xml
index 73f52c340..5a26ea393 100644
--- a/PowerEditor/installer/nativeLang/kannada.xml
+++ b/PowerEditor/installer/nativeLang/kannada.xml
@@ -14,8 +14,8 @@
                     <Item menuId="settings" name="ಸೆಟ್ಟಿಂಗ್ಸ್"/>
                     <Item menuId="macro" name="ಮ್ಯಾಕ್ರೋ"/>
                     <Item menuId="run" name="ರನ್"/>
-                    <Item idName="Plugins" name="ಪ್ಲುಗೀನ್ಸ್"/>
-                    <Item idName="Window" name="ವಿಂಡೊ"/>
+                    <Item menuId="Plugins" name="ಪ್ಲುಗೀನ್ಸ್"/>
+                    <Item menuId="Window" name="ವಿಂಡೊ"/>
                 </Entries>
                 <!-- Sub Menu Entries -->
                 <SubEntries>
diff --git a/PowerEditor/installer/nativeLang/kazakh.xml b/PowerEditor/installer/nativeLang/kazakh.xml
index d7d822d9f..b0bb63284 100644
--- a/PowerEditor/installer/nativeLang/kazakh.xml
+++ b/PowerEditor/installer/nativeLang/kazakh.xml
@@ -14,8 +14,8 @@
 					<Item menuId="settings" name = "Теңшеу"/>
 					<Item menuId="macro" name = "Макростар"/>
 					<Item menuId="run" name = "Жегу"/>
-					<Item idName = "Plugins" name = "Қондырмалар"/>
-					<Item idName = "Window" name = "Терезе"/>
+					<Item menuId = "Plugins" name = "Қондырмалар"/>
+					<Item menuId = "Window" name = "Терезе"/>
 				</Entries>
 
 				<!-- Sub Menu Entries -->
diff --git a/PowerEditor/installer/nativeLang/korean.xml b/PowerEditor/installer/nativeLang/korean.xml
index 2e98f1cbf..d88596e61 100644
--- a/PowerEditor/installer/nativeLang/korean.xml
+++ b/PowerEditor/installer/nativeLang/korean.xml
@@ -16,8 +16,8 @@
             <Item menuId="tools" name="도구(&amp;O)"/>
             <Item menuId="macro" name="매크로"/>
             <Item menuId="run" name="실행"/>
-            <Item idName="Plugins" name="플러그인"/>
-            <Item idName="Window" name="창 관리"/>
+            <Item menuId="Plugins" name="플러그인"/>
+            <Item menuId="Window" name="창 관리"/>
         </Entries>
     <!--  Sub Menu Entries -->
     <SubEntries>
diff --git a/PowerEditor/installer/nativeLang/kurdish.xml b/PowerEditor/installer/nativeLang/kurdish.xml
index 7c51c6b7d..d69684503 100644
--- a/PowerEditor/installer/nativeLang/kurdish.xml
+++ b/PowerEditor/installer/nativeLang/kurdish.xml
@@ -15,8 +15,8 @@
                     <Item menuId="tools" name="ئام&amp;رازەكان"/>
                     <Item menuId="macro" name="ماكرۆ"/>
                     <Item menuId="run" name="به‌ڕێوه‌به‌ردن"/>
-                    <Item idName="Plugins" name="پێوەكراوەكان"/>
-                    <Item idName="Window" name="پەنجەرە"/>
+                    <Item menuId="Plugins" name="پێوەكراوەكان"/>
+                    <Item menuId="Window" name="پەنجەرە"/>
                 </Entries>
                 <!-- Sub Menu Entries -->
                 <SubEntries>
diff --git a/PowerEditor/installer/nativeLang/kyrgyz.xml b/PowerEditor/installer/nativeLang/kyrgyz.xml
index 1267ae097..7907615dd 100644
--- a/PowerEditor/installer/nativeLang/kyrgyz.xml
+++ b/PowerEditor/installer/nativeLang/kyrgyz.xml
@@ -17,8 +17,8 @@
 					<Item menuId="settings" name = "&amp;Тескөө"/>
 					<Item menuId="macro" name = "&amp;Макростор"/>
 					<Item menuId="run" name = "&amp;Иштет"/>
-					<Item idName = "Plugins" name = "Ко&amp;шумчалар"/>
-					<Item idName = "Window" name = "Т&amp;ерезелер"/>
+					<Item menuId = "Plugins" name = "Ко&amp;шумчалар"/>
+					<Item menuId = "Window" name = "Т&amp;ерезелер"/>
 				</Entries>
 
                 <!-- Sub Menu Entries -->
diff --git a/PowerEditor/installer/nativeLang/latvian.xml b/PowerEditor/installer/nativeLang/latvian.xml
index dec83fcf0..0e084747c 100644
--- a/PowerEditor/installer/nativeLang/latvian.xml
+++ b/PowerEditor/installer/nativeLang/latvian.xml
@@ -16,8 +16,8 @@
 					<Item menuId="settings" name="Ies&amp;tatījumi"/>
 					<Item menuId="macro" name="&amp;Makrokomandas"/>
 					<Item menuId="run" name="&amp;Palaist"/>
-					<Item idName="Plugins" name="Spra&amp;udņi"/>
-					<Item idName="Window" name="&amp;Cilnes"/>
+					<Item menuId="Plugins" name="Spra&amp;udņi"/>
+					<Item menuId="Window" name="&amp;Cilnes"/>
 				</Entries>
 				<!-- Sub Menu Entries -->
 				<SubEntries>
diff --git a/PowerEditor/installer/nativeLang/ligurian.xml b/PowerEditor/installer/nativeLang/ligurian.xml
index c753b4d08..c3a3547fe 100644
--- a/PowerEditor/installer/nativeLang/ligurian.xml
+++ b/PowerEditor/installer/nativeLang/ligurian.xml
@@ -20,8 +20,8 @@
 					<Item menuId="settings" name = "I&amp;npostaçion"/>
 					<Item menuId="macro" name = "Macro"/>
 					<Item menuId="run" name = "Ezegoi"/>
-					<Item idName = "Plugins" name = "Plugins"/>
-					<Item idName = "Window" name = "Barcon"/>
+					<Item menuId = "Plugins" name = "Plugins"/>
+					<Item menuId = "Window" name = "Barcon"/>
 				</Entries>
                 <!-- Sub Menu Entries -->
                 <SubEntries>
diff --git a/PowerEditor/installer/nativeLang/lithuanian.xml b/PowerEditor/installer/nativeLang/lithuanian.xml
index 42dfbea18..f74c464e2 100644
--- a/PowerEditor/installer/nativeLang/lithuanian.xml
+++ b/PowerEditor/installer/nativeLang/lithuanian.xml
@@ -21,8 +21,8 @@
                     <Item menuId="tools" name="Į&amp;rankiai"/>
                     <Item menuId="macro" name="&amp;Makro"/>
                     <Item menuId="run" name="Palei&amp;dimas"/>
-                    <Item idName="Plugins" name="&amp;Papildiniai"/>
-                    <Item idName="Window" name="L&amp;angas"/>
+                    <Item menuId="Plugins" name="&amp;Papildiniai"/>
+                    <Item menuId="Window" name="L&amp;angas"/>
                 </Entries>
                 <!-- Sub Menu Entries -->
                 <SubEntries>
diff --git a/PowerEditor/installer/nativeLang/luxembourgish.xml b/PowerEditor/installer/nativeLang/luxembourgish.xml
index 637f6a99d..e65c83ba1 100644
--- a/PowerEditor/installer/nativeLang/luxembourgish.xml
+++ b/PowerEditor/installer/nativeLang/luxembourgish.xml
@@ -18,8 +18,8 @@
 					<Item menuId="settings" name = "&amp;Astellungen"/>
 					<Item menuId="macro" name = "&amp;Makro"/>
 					<Item menuId="run" name = "Ausféie&amp;ren"/>
-					<Item idName = "Plugins" name = "Er&amp;weiderungen"/>
-					<Item idName = "Window" name = "Fë&amp;nster"/>
+					<Item menuId = "Plugins" name = "Er&amp;weiderungen"/>
+					<Item menuId = "Window" name = "Fë&amp;nster"/>
 				</Entries>
 				<!-- Sub Menu Entries -->
 				<SubEntries>
diff --git a/PowerEditor/installer/nativeLang/macedonian.xml b/PowerEditor/installer/nativeLang/macedonian.xml
index 0dfad699f..1f952dfb3 100644
--- a/PowerEditor/installer/nativeLang/macedonian.xml
+++ b/PowerEditor/installer/nativeLang/macedonian.xml
@@ -19,8 +19,8 @@
 					<Item menuId="settings" name = "По&amp;десувања"/>
 					<Item menuId="macro" name = "Macro"/>
 					<Item menuId="run" name = "Вклучи"/>
-					<Item idName = "Plugins" name = "Plugin-ови"/>
-					<Item idName = "Window" name = "Прозорец"/>
+					<Item menuId = "Plugins" name = "Plugin-ови"/>
+					<Item menuId = "Window" name = "Прозорец"/>
 				</Entries>
 
                 <!-- Sub Menu Entries -->
diff --git a/PowerEditor/installer/nativeLang/malay.xml b/PowerEditor/installer/nativeLang/malay.xml
index b0feb282b..cb07d0d48 100644
--- a/PowerEditor/installer/nativeLang/malay.xml
+++ b/PowerEditor/installer/nativeLang/malay.xml
@@ -21,8 +21,8 @@ Desc: Malay translation for Notepad++
 <Item menuId="settings" name="&amp;Ketetapan"/>
 <Item menuId="macro" name="Mak&amp;ro"/>
 <Item menuId="run" name="&amp;Jalan"/>
-<Item idName="Plugins" name="Plu&amp;gin"/>
-<Item idName="Window" name="&amp;Tetingkap"/>
+<Item menuId="Plugins" name="Plu&amp;gin"/>
+<Item menuId="Window" name="&amp;Tetingkap"/>
 </Entries>
 <!-- Sub Menu Entries -->
 
diff --git a/PowerEditor/installer/nativeLang/marathi.xml b/PowerEditor/installer/nativeLang/marathi.xml
index 7e931bdf5..dabd10ca8 100644
--- a/PowerEditor/installer/nativeLang/marathi.xml
+++ b/PowerEditor/installer/nativeLang/marathi.xml
@@ -24,8 +24,8 @@
                     <Item menuId="settings" name="&amp;सेटिंग"/>
                     <Item menuId="macro" name="मॅक्रो"/>
                     <Item menuId="run" name="चलाये"/>
-                    <Item idName="Plugins" name="प्लगइन्स"/>
-                    <Item idName="Window" name="विन्डों"/>
+                    <Item menuId="Plugins" name="प्लगइन्स"/>
+                    <Item menuId="Window" name="विन्डों"/>
                 </Entries>
 
                 <!-- Sub Menu Entries -->
diff --git a/PowerEditor/installer/nativeLang/mongolian.xml b/PowerEditor/installer/nativeLang/mongolian.xml
index 6297873dc..f2256a7b6 100644
--- a/PowerEditor/installer/nativeLang/mongolian.xml
+++ b/PowerEditor/installer/nativeLang/mongolian.xml
@@ -14,8 +14,8 @@
                     <Item menuId="settings" name="&amp;Тохиргоо"/>
                     <Item menuId="macro" name="Макро"/>
                     <Item menuId="run" name="Ажиллуулах"/>
-                    <Item idName="Plugins" name="Нэмэлтүүд"/>
-                    <Item idName="Window" name="Цонх"/>
+                    <Item menuId="Plugins" name="Нэмэлтүүд"/>
+                    <Item menuId="Window" name="Цонх"/>
                 </Entries>
                 <!-- Sub Menu Entries -->
                 <SubEntries>
diff --git a/PowerEditor/installer/nativeLang/nepali.xml b/PowerEditor/installer/nativeLang/nepali.xml
index c6b416006..113494b4c 100644
--- a/PowerEditor/installer/nativeLang/nepali.xml
+++ b/PowerEditor/installer/nativeLang/nepali.xml
@@ -15,8 +15,8 @@
                     <Item menuId="tools" name="उपकरणहरू"/>
                     <Item menuId="macro" name="&amp;म्याक्रो"/>
                     <Item menuId="run" name="&amp;चलाउनुहोस्"/>
-                    <Item idname="Plugins" name="&amp;प्लगइनहरू"/>
-                    <Item idname="Window" name="&amp;विन्डो"/>
+                    <Item menuId="Plugins" name="&amp;प्लगइनहरू"/>
+                    <Item menuId="Window" name="&amp;विन्डो"/>
                 </Entries>
                 <!-- Sub Menu Entries -->
                 <SubEntries>
diff --git a/PowerEditor/installer/nativeLang/norwegian.xml b/PowerEditor/installer/nativeLang/norwegian.xml
index a5131dd3e..2200d79b5 100644
--- a/PowerEditor/installer/nativeLang/norwegian.xml
+++ b/PowerEditor/installer/nativeLang/norwegian.xml
@@ -16,8 +16,8 @@
 					<Item menuId="settings" name = "&amp;Oppsett" />
 					<Item menuId="macro" name = "Makro" />
 					<Item menuId="run" name = "Utfør"/>
-					<Item idName  =  "Plugins" name  =  "Tillegg"/>
-					<Item idName  =  "Window" name  =  "Vindu"/>
+					<Item menuId  =  "Plugins" name  =  "Tillegg"/>
+					<Item menuId  =  "Window" name  =  "Vindu"/>
 				</Entries>
 
 				<!--  Sub Menu Entries -->
diff --git a/PowerEditor/installer/nativeLang/nynorsk.xml b/PowerEditor/installer/nativeLang/nynorsk.xml
index 368596d71..e91fb94f1 100644
--- a/PowerEditor/installer/nativeLang/nynorsk.xml
+++ b/PowerEditor/installer/nativeLang/nynorsk.xml
@@ -18,8 +18,8 @@
                     <Item menuId="settings" name="&amp;Innstillingar"/>
                     <Item menuId="macro" name="Makro"/>
                     <Item menuId="run" name="Køyr"/>
-                    <Item idName="Plugins" name="Programtillegg"/>
-                    <Item idName="Window" name="Vindauge"/>
+                    <Item menuId="Plugins" name="Programtillegg"/>
+                    <Item menuId="Window" name="Vindauge"/>
                 </Entries>
 
                 <!-- Sub Menu Entries -->
diff --git a/PowerEditor/installer/nativeLang/occitan.xml b/PowerEditor/installer/nativeLang/occitan.xml
index 0245f3243..c3ccd850b 100644
--- a/PowerEditor/installer/nativeLang/occitan.xml
+++ b/PowerEditor/installer/nativeLang/occitan.xml
@@ -15,8 +15,8 @@
 					<Item menuId="tools" name="&amp;Aisinas"/>
 					<Item menuId="macro" name="Macrò"/>
 					<Item menuId="run" name="Executar"/>
-					<Item idName="Plugins" name="Ajustons"/>
-					<Item idName="Window" name="Fenèstra"/>
+					<Item menuId="Plugins" name="Ajustons"/>
+					<Item menuId="Window" name="Fenèstra"/>
 				</Entries>
 
 				<!-- Sub Menu Entries -->
diff --git a/PowerEditor/installer/nativeLang/piglatin.xml b/PowerEditor/installer/nativeLang/piglatin.xml
index ff7ee8089..e28ec25cf 100644
--- a/PowerEditor/installer/nativeLang/piglatin.xml
+++ b/PowerEditor/installer/nativeLang/piglatin.xml
@@ -15,8 +15,8 @@
                     <Item menuId="tools" name="&amp;Oolstay"/>
                     <Item menuId="macro" name="Acro&amp;may"/>
                     <Item menuId="run" name="Un&amp;ray"/>
-                    <Item idName="Plugins" name="Ugins&amp;play"/>
-                    <Item idName="Window" name="Indo&amp;wway"/>
+                    <Item menuId="Plugins" name="Ugins&amp;play"/>
+                    <Item menuId="Window" name="Indo&amp;wway"/>
                 </Entries>
                 <!-- Sub Menu Entries -->
                 <SubEntries>
diff --git a/PowerEditor/installer/nativeLang/polish.xml b/PowerEditor/installer/nativeLang/polish.xml
index 06aa372b0..61be0e8c6 100644
--- a/PowerEditor/installer/nativeLang/polish.xml
+++ b/PowerEditor/installer/nativeLang/polish.xml
@@ -28,8 +28,8 @@ The comments are here for explanation, it's not necessary to translate them.
                     <Item menuId="tools" name="&amp;Narzędzia"/>
                     <Item menuId="macro" name="&amp;Makra"/>
                     <Item menuId="run" name="U&amp;ruchom"/>
-                    <Item idName="Plugins" name="W&amp;tyczki"/>
-                    <Item idName="Window" name="&amp;Okno"/>
+                    <Item menuId="Plugins" name="W&amp;tyczki"/>
+                    <Item menuId="Window" name="&amp;Okno"/>
                 </Entries>
                 <!-- Menu rozwijane, główne -->
                 <SubEntries>
diff --git a/PowerEditor/installer/nativeLang/portuguese.xml b/PowerEditor/installer/nativeLang/portuguese.xml
index c0a0e42ba..8d391758b 100644
--- a/PowerEditor/installer/nativeLang/portuguese.xml
+++ b/PowerEditor/installer/nativeLang/portuguese.xml
@@ -18,8 +18,8 @@ The comments are here for explanation, it's not necessary to translate them.
                     <Item menuId="tools" name="F&amp;erramentas"/>
                     <Item menuId="macro" name="&amp;Macro"/>
                     <Item menuId="run" name="E&amp;xecutar"/>
-                    <Item idName="Plugins" name="P&amp;lugins"/>
-                    <Item idName="Window" name="J&amp;anela"/>
+                    <Item menuId="Plugins" name="P&amp;lugins"/>
+                    <Item menuId="Window" name="J&amp;anela"/>
                 </Entries>
                 <!-- Sub Menu Entries -->
                 <SubEntries>
diff --git a/PowerEditor/installer/nativeLang/punjabi.xml b/PowerEditor/installer/nativeLang/punjabi.xml
index e24e1f127..9c94d9129 100644
--- a/PowerEditor/installer/nativeLang/punjabi.xml
+++ b/PowerEditor/installer/nativeLang/punjabi.xml
@@ -14,8 +14,8 @@
                     <Item menuId="settings" name="&amp;ਸੈਟਿੰਗ"/>
                     <Item menuId="macro" name="ਮੈਕਰੋ"/>
                     <Item menuId="run" name="ਰਨ"/>
-                    <Item idName="Plugins" name="ਪਲੱਗਇਨ"/>
-                    <Item idName="Window" name="ਝਰੋਖਾ"/>
+                    <Item menuId="Plugins" name="ਪਲੱਗਇਨ"/>
+                    <Item menuId="Window" name="ਝਰੋਖਾ"/>
                 </Entries>
                 <!-- Sub Menu Entries -->
                  <SubEntries>
diff --git a/PowerEditor/installer/nativeLang/romanian.xml b/PowerEditor/installer/nativeLang/romanian.xml
index d2a7ed1ac..99767bf7d 100644
--- a/PowerEditor/installer/nativeLang/romanian.xml
+++ b/PowerEditor/installer/nativeLang/romanian.xml
@@ -20,8 +20,8 @@
                     <Item menuId="tools" name="&amp;Unelte"/>
                     <Item menuId="macro" name="&amp;Macro"/>
                     <Item menuId="run" name="E&amp;xecutare"/>
-                    <Item idName="Plugins" name="Mo&amp;dule"/>
-                    <Item idName="Window" name="Fe&amp;restre"/>
+                    <Item menuId="Plugins" name="Mo&amp;dule"/>
+                    <Item menuId="Window" name="Fe&amp;restre"/>
                 </Entries>
                 <!-- Sub Menu Entries -->
                 <SubEntries>
diff --git a/PowerEditor/installer/nativeLang/russian.xml b/PowerEditor/installer/nativeLang/russian.xml
index 3bb2d62d1..c0a330b33 100644
--- a/PowerEditor/installer/nativeLang/russian.xml
+++ b/PowerEditor/installer/nativeLang/russian.xml
@@ -19,8 +19,8 @@ Updated to v8.3.1:
 					<Item menuId="tools"    name="Инстр&amp;ументы"/>
 					<Item menuId="macro"    name="&amp;Макросы"/>
 					<Item menuId="run"      name="&amp;Запуск"/>
-					<Item idName="Plugins"  name="Плаги&amp;ны"/>
-					<Item idName="Window"   name="Вкл&amp;адки"/>
+					<Item menuId="Plugins"  name="Плаги&amp;ны"/>
+					<Item menuId="Window"   name="Вкл&amp;адки"/>
 				</Entries>
 				<SubEntries>
 					<Item subMenuId="file-openFolder"           name="&amp;Открыть папку документа"/>
diff --git a/PowerEditor/installer/nativeLang/sardinian.xml b/PowerEditor/installer/nativeLang/sardinian.xml
index a7a1d95f5..68b0c010c 100644
--- a/PowerEditor/installer/nativeLang/sardinian.xml
+++ b/PowerEditor/installer/nativeLang/sardinian.xml
@@ -38,8 +38,8 @@
 					<Item menuId="settings" name = "C&amp;onfiguratzione"/>
 					<Item menuId="macro" name = "Macro"/>
 					<Item menuId="run" name = "Esecuta"/>
-					<Item idName = "Plugins" name = "Plugins"/>
-					<Item idName = "Window" name = "Ventana"/>
+					<Item menuId = "Plugins" name = "Plugins"/>
+					<Item menuId = "Window" name = "Ventana"/>
 				</Entries>
                 <!-- Sub Menu Entries -->
                 <SubEntries>
diff --git a/PowerEditor/installer/nativeLang/serbian.xml b/PowerEditor/installer/nativeLang/serbian.xml
index 40b3f0562..6a16237b1 100644
--- a/PowerEditor/installer/nativeLang/serbian.xml
+++ b/PowerEditor/installer/nativeLang/serbian.xml
@@ -14,8 +14,8 @@
 					<Item menuId="settings" name = "P&amp;ostavke"/>
 					<Item menuId="macro" name = "Makro"/>
 					<Item menuId="run" name = "Pokreni"/>
-					<Item idName = "Plugins" name = "Dodaci"/>
-					<Item idName = "Window" name = "Prozor"/>
+					<Item menuId = "Plugins" name = "Dodaci"/>
+					<Item menuId = "Window" name = "Prozor"/>
 				</Entries>
 
                 <!-- Sub Menu Entries -->
diff --git a/PowerEditor/installer/nativeLang/serbianCyrillic.xml b/PowerEditor/installer/nativeLang/serbianCyrillic.xml
index bc2ad094b..c026f7949 100644
--- a/PowerEditor/installer/nativeLang/serbianCyrillic.xml
+++ b/PowerEditor/installer/nativeLang/serbianCyrillic.xml
@@ -20,8 +20,8 @@
                     <Item menuId="settings" name="П&amp;оставке"/>
                     <Item menuId="macro" name="Макро"/>
                     <Item menuId="run" name="Покрени"/>
-                    <Item idName ="Plugins" name="Додаци"/>
-                    <Item idName ="Window" name="Прозор"/>
+                    <Item menuId ="Plugins" name="Додаци"/>
+                    <Item menuId ="Window" name="Прозор"/>
                 </Entries>
 
                 <!-- Sub Menu Entries -->
diff --git a/PowerEditor/installer/nativeLang/sinhala.xml b/PowerEditor/installer/nativeLang/sinhala.xml
index a9c2f3111..59d02c85d 100644
--- a/PowerEditor/installer/nativeLang/sinhala.xml
+++ b/PowerEditor/installer/nativeLang/sinhala.xml
@@ -21,8 +21,8 @@
                    <Item menuId="settings" name="සිටවුම්"/>
                    <Item menuId="macro" name="නියෝග එකලස"/>
                    <Item menuId="run" name="ධාවනය"/>
-                   <Item idName="Plugins" name="පේනු මෘදුකාංග"/>
-                   <Item idName="Window" name="කවුළුව"/>
+                   <Item menuId="Plugins" name="පේනු මෘදුකාංග"/>
+                   <Item menuId="Window" name="කවුළුව"/>
 
                </Entries>
 
diff --git a/PowerEditor/installer/nativeLang/slovak.xml b/PowerEditor/installer/nativeLang/slovak.xml
index 2b5d3c9fc..f4e2b4188 100644
--- a/PowerEditor/installer/nativeLang/slovak.xml
+++ b/PowerEditor/installer/nativeLang/slovak.xml
@@ -18,8 +18,8 @@
                     <Item menuId="tools" name="Nás&amp;troje"/>
                     <Item menuId="macro" name="&amp;Makro"/>
                     <Item menuId="run" name="Sp&amp;ustiť"/>
-                    <Item idName="Plugins" name="&amp;Doplnky"/>
-                    <Item idName="Window" name="&amp;Okná"/>
+                    <Item menuId="Plugins" name="&amp;Doplnky"/>
+                    <Item menuId="Window" name="&amp;Okná"/>
                 </Entries>
                 <!-- Sub Menu Entries -->
                 <SubEntries>
diff --git a/PowerEditor/installer/nativeLang/slovenian.xml b/PowerEditor/installer/nativeLang/slovenian.xml
index 29af27297..46c3f6af6 100644
--- a/PowerEditor/installer/nativeLang/slovenian.xml
+++ b/PowerEditor/installer/nativeLang/slovenian.xml
@@ -20,8 +20,8 @@
                     <Item menuId="tools" name="Oro&amp;dja"/>
                     <Item menuId="macro" name="&amp;Makro"/>
                     <Item menuId="run" name="&amp;Poženi"/>
-                    <Item idName="Plugins" name="&amp;Vtičniki"/>
-                    <Item idName="Window" name="&amp;Okno"/>
+                    <Item menuId="Plugins" name="&amp;Vtičniki"/>
+                    <Item menuId="Window" name="&amp;Okno"/>
                 </Entries>
                 <!-- Sub Menu Entries -->
                 <SubEntries>
diff --git a/PowerEditor/installer/nativeLang/spanish.xml b/PowerEditor/installer/nativeLang/spanish.xml
index 519c05600..0cff68485 100644
--- a/PowerEditor/installer/nativeLang/spanish.xml
+++ b/PowerEditor/installer/nativeLang/spanish.xml
@@ -18,8 +18,8 @@ The comments are here for explanation, it's not necessary to translate them.
 					<Item menuId="tools" name="&amp;Herramientas"/>
 					<Item menuId="macro" name="&amp;Macro"/>
 					<Item menuId="run" name="E&amp;jecutar"/>
-					<Item idName="Plugins" name="&amp;Plugins"/>
-					<Item idName="Window" name="Ve&amp;ntana"/>
+					<Item menuId="Plugins" name="&amp;Plugins"/>
+					<Item menuId="Window" name="Ve&amp;ntana"/>
 				</Entries>
 				<!-- Sub Menu Entries -->
 				<SubEntries>
diff --git a/PowerEditor/installer/nativeLang/spanish_ar.xml b/PowerEditor/installer/nativeLang/spanish_ar.xml
index 83df3db0b..23841c4f4 100644
--- a/PowerEditor/installer/nativeLang/spanish_ar.xml
+++ b/PowerEditor/installer/nativeLang/spanish_ar.xml
@@ -14,8 +14,8 @@
 					<Item menuId="settings" name="&amp;Configuración"/>
 					<Item menuId="macro" name="&amp;Macro"/>
 					<Item menuId="run" name="E&amp;jecutar"/>
-					<Item idName="Plugins" name="&amp;Complementos"/>
-					<Item idName="Window" name="Ve&amp;ntana"/>
+					<Item menuId="Plugins" name="&amp;Complementos"/>
+					<Item menuId="Window" name="Ve&amp;ntana"/>
 				</Entries>
 				<!-- Sub Menu Entries -->
 				<SubEntries>
diff --git a/PowerEditor/installer/nativeLang/swedish.xml b/PowerEditor/installer/nativeLang/swedish.xml
index dcea9d248..64308ec72 100644
--- a/PowerEditor/installer/nativeLang/swedish.xml
+++ b/PowerEditor/installer/nativeLang/swedish.xml
@@ -18,8 +18,8 @@ The comments are here for explanation, it's not necessary to translate them.
 					<Item menuId="tools" name="V&amp;erktyg"/>
 					<Item menuId="macro" name="&amp;Makro"/>
 					<Item menuId="run" name="&amp;Kör"/>
-					<Item idName="Plugins" name="I&amp;nsticksprogram"/>
-					<Item idName="Window" name="F&amp;önster"/>
+					<Item menuId="Plugins" name="I&amp;nsticksprogram"/>
+					<Item menuId="Window" name="F&amp;önster"/>
 				</Entries>
 				<!-- Sub Menu Entries -->
 				<SubEntries>
diff --git a/PowerEditor/installer/nativeLang/tagalog.xml b/PowerEditor/installer/nativeLang/tagalog.xml
index 76e3b7b2f..3c43dbef8 100644
--- a/PowerEditor/installer/nativeLang/tagalog.xml
+++ b/PowerEditor/installer/nativeLang/tagalog.xml
@@ -14,8 +14,8 @@
 					<Item menuId="settings" name = "Ka&amp;lagayan"/>
 					<Item menuId="macro" name = "Laki"/>
 					<Item menuId="run" name = "Takbo"/>
-					<Item idName = "Plugins" name = "Mga Plugin"/>
-					<Item idName = "Window" name = "Dungawan"/>
+					<Item menuId = "Plugins" name = "Mga Plugin"/>
+					<Item menuId = "Window" name = "Dungawan"/>
 				</Entries>
 
                 <!-- Sub Menu Entries -->
diff --git a/PowerEditor/installer/nativeLang/taiwaneseMandarin.xml b/PowerEditor/installer/nativeLang/taiwaneseMandarin.xml
index 0da7fd1ac..8cd877e0a 100644
--- a/PowerEditor/installer/nativeLang/taiwaneseMandarin.xml
+++ b/PowerEditor/installer/nativeLang/taiwaneseMandarin.xml
@@ -15,8 +15,8 @@
                     <Item menuId="tools" name="工具(&amp;O)"/>
                     <Item menuId="macro" name="巨集(&amp;M)"/>
                     <Item menuId="run" name="執行(&amp;R)"/>
-                    <Item idName="Plugins" name="外掛(&amp;P)"/>
-                    <Item idName="Window" name="視窗(&amp;W)"/>
+                    <Item menuId="Plugins" name="外掛(&amp;P)"/>
+                    <Item menuId="Window" name="視窗(&amp;W)"/>
                 </Entries>
                 <!-- Sub Menu Entries -->
                 <SubEntries>
diff --git a/PowerEditor/installer/nativeLang/tajikCyrillic.xml b/PowerEditor/installer/nativeLang/tajikCyrillic.xml
index 1dc79deac..6a83df635 100644
--- a/PowerEditor/installer/nativeLang/tajikCyrillic.xml
+++ b/PowerEditor/installer/nativeLang/tajikCyrillic.xml
@@ -14,8 +14,8 @@
                     <Item menuId="settings" name="&amp;Танзимот"/>
                     <Item menuId="macro" name="Макрос"/>
                     <Item menuId="run" name="Иҷро"/>
-                    <Item idName="Plugins" name="Афзунаҳо"/>
-                    <Item idName="Window" name="Панҷара"/>
+                    <Item menuId="Plugins" name="Афзунаҳо"/>
+                    <Item menuId="Window" name="Панҷара"/>
                 </Entries>
                 <!-- Sub Menu Entries -->
                 <SubEntries>
diff --git a/PowerEditor/installer/nativeLang/tamil.xml b/PowerEditor/installer/nativeLang/tamil.xml
index c9d481044..2720b8b76 100644
--- a/PowerEditor/installer/nativeLang/tamil.xml
+++ b/PowerEditor/installer/nativeLang/tamil.xml
@@ -14,8 +14,8 @@
                     <Item menuId="settings" name="அமைப்பு (&amp;T)"/>
                     <Item menuId="macro" name="பெருநிரல்"/>
                     <Item menuId="run" name="ஓட்டு"/>
-                    <Item idName="Plugins" name="உள்இடுக்கைகள்"/>
-                    <Item idName="Window" name="சாளரம்"/>
+                    <Item menuId="Plugins" name="உள்இடுக்கைகள்"/>
+                    <Item menuId="Window" name="சாளரம்"/>
                 </Entries>
 
                 <!-- Sub Menu Entries -->
diff --git a/PowerEditor/installer/nativeLang/tatar.xml b/PowerEditor/installer/nativeLang/tatar.xml
index 83d8daf01..9a97f376a 100644
--- a/PowerEditor/installer/nativeLang/tatar.xml
+++ b/PowerEditor/installer/nativeLang/tatar.xml
@@ -15,8 +15,8 @@
                     <Item menuId="tools" name="&amp;Кораллар"/>
 					<Item menuId="macro" name="&amp;Макрослар"/>
                     <Item menuId="run" name="&amp;Җибәрү"/>
-                    <Item idName="Plugins" name="&amp;Плагиннар"/>
-                    <Item idName="Window"  name="&amp;Тәрәзәләр"/>
+                    <Item menuId="Plugins" name="&amp;Плагиннар"/>
+                    <Item menuId="Window"  name="&amp;Тәрәзәләр"/>
                 </Entries>
                 <!-- Sub Menu Entries -->
                 <SubEntries>
diff --git a/PowerEditor/installer/nativeLang/telugu.xml b/PowerEditor/installer/nativeLang/telugu.xml
index c61ae5e55..f7669ee75 100644
--- a/PowerEditor/installer/nativeLang/telugu.xml
+++ b/PowerEditor/installer/nativeLang/telugu.xml
@@ -21,8 +21,8 @@
                     <Item menuId="settings" name="సెట్టింగ్స్ (&amp;T)"/>
                     <Item menuId="macro" name="మ్యాక్రో"/>
                     <Item menuId="run" name="రన్"/>
-                    <Item idName="Plugins" name="ప్లగిన్స్"/>
-                    <Item idName="Window" name="విండొ"/>
+                    <Item menuId="Plugins" name="ప్లగిన్స్"/>
+                    <Item menuId="Window" name="విండొ"/>
                 </Entries>
                     <!-- Sub Menu Entries -->
                     <SubEntries>
diff --git a/PowerEditor/installer/nativeLang/thai.xml b/PowerEditor/installer/nativeLang/thai.xml
index 4b30629e2..c3e565fa3 100644
--- a/PowerEditor/installer/nativeLang/thai.xml
+++ b/PowerEditor/installer/nativeLang/thai.xml
@@ -14,8 +14,8 @@
 					<Item menuId="settings" name="ตั้งค่า (&amp;T)"/>
 					<Item menuId="macro" name="มาโคร"/>
 					<Item menuId="run" name="เรียก"/>
-					<Item idName="Plugins" name="ปลั๊กอิน"/>
-					<Item idName="Window" name="หน้าต่าง"/>
+					<Item menuId="Plugins" name="ปลั๊กอิน"/>
+					<Item menuId="Window" name="หน้าต่าง"/>
 				</Entries>
 
 				<!-- Sub Menu Entries -->
diff --git a/PowerEditor/installer/nativeLang/turkish.xml b/PowerEditor/installer/nativeLang/turkish.xml
index fe193dba1..5bf62b800 100644
--- a/PowerEditor/installer/nativeLang/turkish.xml
+++ b/PowerEditor/installer/nativeLang/turkish.xml
@@ -15,8 +15,8 @@
 					<Item menuId="tools" name="Ar&amp;açlar"/>
 					<Item menuId="macro" name="&amp;Makrolar"/>
 					<Item menuId="run" name="&amp;Çalıştır"/>
-					<Item idName="Plugins" name="&amp;Eklentiler"/>
-					<Item idName="Window" name="&amp;Pencereler"/>
+					<Item menuId="Plugins" name="&amp;Eklentiler"/>
+					<Item menuId="Window" name="&amp;Pencereler"/>
 				</Entries>
 				<!-- Alt Menü Girişleri -->
 				<SubEntries>
diff --git a/PowerEditor/installer/nativeLang/ukrainian.xml b/PowerEditor/installer/nativeLang/ukrainian.xml
index dbcf26191..1048a0455 100644
--- a/PowerEditor/installer/nativeLang/ukrainian.xml
+++ b/PowerEditor/installer/nativeLang/ukrainian.xml
@@ -18,8 +18,8 @@ The comments are here for explanation, it's not necessary to translate them.
                     <Item menuId="tools" name="Інструменти"/>
                     <Item menuId="macro" name="Макрос"/>
                     <Item menuId="run" name="Виконати"/>
-                    <Item idName="Plugins" name="Плагіни"/>
-                    <Item idName="Window" name="Вікно"/>
+                    <Item menuId="Plugins" name="Плагіни"/>
+                    <Item menuId="Window" name="Вікно"/>
                 </Entries>
                 <!-- Sub Menu Entries -->
                 <SubEntries>
diff --git a/PowerEditor/installer/nativeLang/uyghur.xml b/PowerEditor/installer/nativeLang/uyghur.xml
index f95874498..96ba40939 100644
--- a/PowerEditor/installer/nativeLang/uyghur.xml
+++ b/PowerEditor/installer/nativeLang/uyghur.xml
@@ -18,8 +18,8 @@
                     <Item menuId="settings" name="تەڭشەك"/>
                     <Item menuId="macro" name="ماكرو"/>
                     <Item menuId="run" name="ئىجرا"/>
-                    <Item idName="Plugins" name="قېتىلما"/>
-                    <Item idName="Window" name="كۆزنەك"/>
+                    <Item menuId="Plugins" name="قېتىلما"/>
+                    <Item menuId="Window" name="كۆزنەك"/>
                 </Entries>
 
                 <!-- Sub Menu Entries -->
diff --git a/PowerEditor/installer/nativeLang/uzbek.xml b/PowerEditor/installer/nativeLang/uzbek.xml
index 06a694e83..60d7d70a0 100644
--- a/PowerEditor/installer/nativeLang/uzbek.xml
+++ b/PowerEditor/installer/nativeLang/uzbek.xml
@@ -26,8 +26,8 @@ Updater: Shamsiddinov Zafar
 					<Item menuId="tools" name="Qoʻshimchalar"/>
 					<Item menuId="macro" name="&amp;Makroslar"/>
 					<Item menuId="run" name="&amp;Ishga tushirmoq"/>
-					<Item idName="Plugins" name="&amp;Ilovalar"/>
-					<Item idName="Window"  name="&amp;Xatchoʻplar"/>
+					<Item menuId="Plugins" name="&amp;Ilovalar"/>
+					<Item menuId="Window"  name="&amp;Xatchoʻplar"/>
 				</Entries>
 
 				<SubEntries>
diff --git a/PowerEditor/installer/nativeLang/uzbekCyrillic.xml b/PowerEditor/installer/nativeLang/uzbekCyrillic.xml
index 6f8f73418..d0757fd76 100644
--- a/PowerEditor/installer/nativeLang/uzbekCyrillic.xml
+++ b/PowerEditor/installer/nativeLang/uzbekCyrillic.xml
@@ -18,8 +18,8 @@
 					<Item menuId="settings" name = "Танловлар"/>
 					<Item menuId="macro" name = "Макрослар"/>
 					<Item menuId="run" name = "Ишга тушириш"/>
-					<Item idName = "Plugins" name = "Қўшимчалар"/>
-					<Item idName = "Window" name = "Ойналар"/>
+					<Item menuId = "Plugins" name = "Қўшимчалар"/>
+					<Item menuId = "Window" name = "Ойналар"/>
 				</Entries>
 
                 <!-- Sub Menu Entries -->
diff --git a/PowerEditor/installer/nativeLang/venetian.xml b/PowerEditor/installer/nativeLang/venetian.xml
index 079eff33e..55578bf61 100644
--- a/PowerEditor/installer/nativeLang/venetian.xml
+++ b/PowerEditor/installer/nativeLang/venetian.xml
@@ -22,8 +22,8 @@
                     <Item menuId="tools" name="&amp;Angagni"/>
                     <Item menuId="macro" name="Mac&amp;ro"/>
                     <Item menuId="run" name="E&amp;xegui"/>
-                    <Item idName="Plugins" name="&amp;Plugin"/>
-                    <Item idName="Window" name="F&amp;enèstra"/>
+                    <Item menuId="Plugins" name="&amp;Plugin"/>
+                    <Item menuId="Window" name="F&amp;enèstra"/>
                 </Entries>
                 <!-- Sub Menu Entries -->
                 <SubEntries>
diff --git a/PowerEditor/installer/nativeLang/vietnamese.xml b/PowerEditor/installer/nativeLang/vietnamese.xml
index aa7f8da3a..bd9c1a2fd 100644
--- a/PowerEditor/installer/nativeLang/vietnamese.xml
+++ b/PowerEditor/installer/nativeLang/vietnamese.xml
@@ -18,8 +18,8 @@ The comments are here for explanation, it's not necessary to translate them.
                     <Item menuId="tools" name="Côn&amp;g cụ"/>
                     <Item menuId="macro" name="&amp;Vĩ lệnh"/>
                     <Item menuId="run" name="Chạ&amp;y"/>
-                    <Item idName="Plugins" name="T&amp;rình cài cắm"/>
-                    <Item idName="Window" name="Cửa &amp;sổ"/>
+                    <Item menuId="Plugins" name="T&amp;rình cài cắm"/>
+                    <Item menuId="Window" name="Cửa &amp;sổ"/>
                 </Entries>
                 <!-- Sub Menu Entries -->
                 <SubEntries>
diff --git a/PowerEditor/installer/nativeLang/welsh.xml b/PowerEditor/installer/nativeLang/welsh.xml
index f1fd4d98d..2d74473ac 100644
--- a/PowerEditor/installer/nativeLang/welsh.xml
+++ b/PowerEditor/installer/nativeLang/welsh.xml
@@ -19,8 +19,8 @@ gan/by Aled Powell
                     <Item menuId="settings" name="Gosodiadau (&amp;T)"/>
                     <Item menuId="macro" name="Macro"/>
                     <Item menuId="run" name="Rhedeg"/>
-                    <Item idName="Plugins" name="Ategolion"/>
-                    <Item idName="Window" name="Ffenestr"/>
+                    <Item menuId="Plugins" name="Ategolion"/>
+                    <Item menuId="Window" name="Ffenestr"/>
                 </Entries>
                 <!-- Sub Menu Entries -->
                 <SubEntries>
diff --git a/PowerEditor/installer/nativeLang/zulu.xml b/PowerEditor/installer/nativeLang/zulu.xml
index a71c6b566..2cd5586f2 100644
--- a/PowerEditor/installer/nativeLang/zulu.xml
+++ b/PowerEditor/installer/nativeLang/zulu.xml
@@ -23,8 +23,8 @@
                     <Item menuId="tools" name="To&amp;amathuluzi"/>
                     <Item menuId="macro" name="&amp;Macro"/>
                     <Item menuId="run" name="&amp;Run"/>
-                    <Item idName="Plugins" name="&amp;Ama-plugin"/>
-                    <Item idName="Window" name="&amp;Iwindi"/>
+                    <Item menuId="Plugins" name="&amp;Ama-plugin"/>
+                    <Item menuId="Window" name="&amp;Iwindi"/>
                 </Entries>
                 <!-- Sub Menu Entries -->
                 <SubEntries>
diff --git a/PowerEditor/src/Notepad_plus.cpp b/PowerEditor/src/Notepad_plus.cpp
index 132c2d9ee..b0af3bdb0 100644
--- a/PowerEditor/src/Notepad_plus.cpp
+++ b/PowerEditor/src/Notepad_plus.cpp
@@ -544,17 +544,12 @@ LRESULT Notepad_plus::init(HWND hwnd)
 		_subEditView.execute(SCI_USEPOPUP, FALSE);
 	}
 
-	generic_string pluginsTrans, windowTrans;
-	_nativeLangSpeaker.changeMenuLang(_mainMenuHandle, pluginsTrans, windowTrans);
+	_nativeLangSpeaker.changeMenuLang(_mainMenuHandle);
 	::DrawMenuBar(hwnd);
 
 
-	if (pluginsTrans != TEXT(""))
-	{
-		::ModifyMenu(_mainMenuHandle, MENUINDEX_PLUGINS, MF_BYPOSITION, 0, pluginsTrans.c_str());
-	}
 	//Windows menu
-	_windowsMenu.init(_mainMenuHandle, windowTrans.c_str());
+	_windowsMenu.init(_mainMenuHandle);
 
 	// Update context menu strings (translated)
 	vector<MenuItemUnit> & tmp = nppParam.getContextMenuItems();
@@ -6438,7 +6433,7 @@ bool Notepad_plus::reloadLang()
     nppParam.reloadContextMenuFromXmlTree(_mainMenuHandle, _pluginsManager.getMenuHandle());
 
 	generic_string pluginsTrans, windowTrans;
-	_nativeLangSpeaker.changeMenuLang(_mainMenuHandle, pluginsTrans, windowTrans);
+	_nativeLangSpeaker.changeMenuLang(_mainMenuHandle);
     ::DrawMenuBar(_pPublicInterface->getHSelf());
 
 	int indexWindow = ::GetMenuItemCount(_mainMenuHandle) - 3;
diff --git a/PowerEditor/src/WinControls/WindowsDlg/WindowsDlg.cpp b/PowerEditor/src/WinControls/WindowsDlg/WindowsDlg.cpp
index c592491f8..26729e97e 100644
--- a/PowerEditor/src/WinControls/WindowsDlg/WindowsDlg.cpp
+++ b/PowerEditor/src/WinControls/WindowsDlg/WindowsDlg.cpp
@@ -1149,16 +1149,9 @@ LRESULT CALLBACK WindowsDlg::listViewProc(HWND hwnd, UINT Message, WPARAM wParam
 }
 
 
-void WindowsMenu::init(HMENU hMainMenu, const TCHAR *translation)
+void WindowsMenu::init(HMENU hMainMenu)
 {
 	_hMenu = ::GetSubMenu(hMainMenu, 11);
-
-	if (translation && translation[0])
-	{
-		generic_string windowStr(translation);
-		windowStr += TEXT("...");
-		::ModifyMenu(_hMenu, IDM_WINDOW_WINDOWS, MF_BYCOMMAND, IDM_WINDOW_WINDOWS, windowStr.c_str());
-	}
 }
 
 void WindowsMenu::initPopupMenu(HMENU hMenu, DocTabView *pTab)
diff --git a/PowerEditor/src/WinControls/WindowsDlg/WindowsDlg.h b/PowerEditor/src/WinControls/WindowsDlg/WindowsDlg.h
index 95de37673..49e78f571 100644
--- a/PowerEditor/src/WinControls/WindowsDlg/WindowsDlg.h
+++ b/PowerEditor/src/WinControls/WindowsDlg/WindowsDlg.h
@@ -111,7 +111,7 @@ class WindowsMenu
 public:
 	WindowsMenu() {};
 	~WindowsMenu() {};
-	void init(HMENU hMainMenu, const TCHAR *translation); 
+	void init(HMENU hMainMenu); 
 	void initPopupMenu(HMENU hMenu, DocTabView *pTab);
 
 private:
diff --git a/PowerEditor/src/localization.cpp b/PowerEditor/src/localization.cpp
index 39dd992c9..aa15b2faf 100644
--- a/PowerEditor/src/localization.cpp
+++ b/PowerEditor/src/localization.cpp
@@ -27,80 +27,82 @@ using namespace std;
 
 MenuPosition menuPos[] = {
 //==============================================
-//	{L0, L1, L2, id},
+//	{L0,  L1, L2, id},
 //==============================================
-	{ 0, -1, -1, "file" },
-	{ 1, -1, -1, "edit" },
-	{ 2, -1, -1, "search" },
-	{ 3, -1, -1, "view" },
-	{ 4, -1, -1, "encoding" },
-	{ 5, -1, -1, "language" },
-	{ 6, -1, -1, "settings" },
-	{ 7, -1, -1, "tools" },
-	{ 8, -1, -1, "macro" },
-	{ 9, -1, -1, "run" },
+	{ 0,  -1, -1, "file" },
+	{ 1,  -1, -1, "edit" },
+	{ 2,  -1, -1, "search" },
+	{ 3,  -1, -1, "view" },
+	{ 4,  -1, -1, "encoding" },
+	{ 5,  -1, -1, "language" },
+	{ 6,  -1, -1, "settings" },
+	{ 7,  -1, -1, "tools" },
+	{ 8,  -1, -1, "macro" },
+	{ 9,  -1, -1, "run" },
+	{ 10, -1, -1, "Plugins" },
+	{ 11, -1, -1, "Window" },
 
-	{ 0,  2, -1, "file-openFolder" },
-	{ 0, 13, -1, "file-closeMore" },
-	{ 0, 22, -1, "file-recentFiles" },
+	{ 0,   2, -1, "file-openFolder" },
+	{ 0,  13, -1, "file-closeMore" },
+	{ 0,  22, -1, "file-recentFiles" },
 
-	{ 1, 10, -1, "edit-insert" },
-	{ 1, 11, -1, "edit-copyToClipboard" },
-	{ 1, 12, -1, "edit-indent" },
-	{ 1, 13, -1, "edit-convertCaseTo" },
-	{ 1, 14, -1, "edit-lineOperations" },
-	{ 1, 15, -1, "edit-comment" },
-	{ 1, 16, -1, "edit-autoCompletion" },
-	{ 1, 17, -1, "edit-eolConversion" },
-	{ 1, 18, -1, "edit-blankOperations" },
-	{ 1, 19, -1, "edit-pasteSpecial" },
-	{ 1, 20, -1, "edit-onSelection" },
+	{ 1,  10, -1, "edit-insert" },
+	{ 1,  11, -1, "edit-copyToClipboard" },
+	{ 1,  12, -1, "edit-indent" },
+	{ 1,  13, -1, "edit-convertCaseTo" },
+	{ 1,  14, -1, "edit-lineOperations" },
+	{ 1,  15, -1, "edit-comment" },
+	{ 1,  16, -1, "edit-autoCompletion" },
+	{ 1,  17, -1, "edit-eolConversion" },
+	{ 1,  18, -1, "edit-blankOperations" },
+	{ 1,  19, -1, "edit-pasteSpecial" },
+	{ 1,  20, -1, "edit-onSelection" },
 
-	{ 2, 18, -1, "search-markAll" },
-	{ 2, 19, -1, "search-markOne" },
-	{ 2, 20, -1, "search-unmarkAll" },
-	{ 2, 21, -1, "search-jumpUp" },
-	{ 2, 22, -1, "search-jumpDown" },
-	{ 2, 23, -1, "search-copyStyledText" },
-	{ 2, 25, -1, "search-bookmark" },
+	{ 2,  18, -1, "search-markAll" },
+	{ 2,  19, -1, "search-markOne" },
+	{ 2,  20, -1, "search-unmarkAll" },
+	{ 2,  21, -1, "search-jumpUp" },
+	{ 2,  22, -1, "search-jumpDown" },
+	{ 2,  23, -1, "search-copyStyledText" },
+	{ 2,  25, -1, "search-bookmark" },
 
-	{ 3,  5, -1, "view-currentFileIn" },
-	{ 3,  7, -1, "view-showSymbol" },
-	{ 3,  8, -1, "view-zoom" },
-	{ 3,  9, -1, "view-moveCloneDocument" },
-	{ 3, 10, -1, "view-tab" },
-	{ 3, 19, -1, "view-collapseLevel" },
-	{ 3, 20, -1, "view-uncollapseLevel" },
-	{ 3, 24, -1, "view-project" },
+	{ 3,   5, -1, "view-currentFileIn" },
+	{ 3,   7, -1, "view-showSymbol" },
+	{ 3,   8, -1, "view-zoom" },
+	{ 3,   9, -1, "view-moveCloneDocument" },
+	{ 3,  10, -1, "view-tab" },
+	{ 3,  19, -1, "view-collapseLevel" },
+	{ 3,  20, -1, "view-uncollapseLevel" },
+	{ 3,  24, -1, "view-project" },
 
-	{ 4,  5, -1, "encoding-characterSets" },
-	{ 4,  5,  0, "encoding-arabic" },
-	{ 4,  5,  1, "encoding-baltic" },
-	{ 4,  5,  2, "encoding-celtic" },
-	{ 4,  5,  3, "encoding-cyrillic" },
-	{ 4,  5,  4, "encoding-centralEuropean" },
-	{ 4,  5,  5, "encoding-chinese" },
-	{ 4,  5,  6, "encoding-easternEuropean" },
-	{ 4,  5,  7, "encoding-greek" },
-	{ 4,  5,  8, "encoding-hebrew" },
-	{ 4,  5,  9, "encoding-japanese" },
-	{ 4,  5, 10, "encoding-korean" },
-	{ 4,  5, 11, "encoding-northEuropean" },
-	{ 4,  5, 12, "encoding-thai" },
-	{ 4,  5, 13, "encoding-turkish" },
-	{ 4,  5, 14, "encoding-westernEuropean" },
-	{ 4,  5, 15, "encoding-vietnamese" },
+	{ 4,   5, -1, "encoding-characterSets" },
+	{ 4,   5,  0, "encoding-arabic" },
+	{ 4,   5,  1, "encoding-baltic" },
+	{ 4,   5,  2, "encoding-celtic" },
+	{ 4,   5,  3, "encoding-cyrillic" },
+	{ 4,   5,  4, "encoding-centralEuropean" },
+	{ 4,   5,  5, "encoding-chinese" },
+	{ 4,   5,  6, "encoding-easternEuropean" },
+	{ 4,   5,  7, "encoding-greek" },
+	{ 4,   5,  8, "encoding-hebrew" },
+	{ 4,   5,  9, "encoding-japanese" },
+	{ 4,   5, 10, "encoding-korean" },
+	{ 4,   5, 11, "encoding-northEuropean" },
+	{ 4,   5, 12, "encoding-thai" },
+	{ 4,   5, 13, "encoding-turkish" },
+	{ 4,   5, 14, "encoding-westernEuropean" },
+	{ 4,   5, 15, "encoding-vietnamese" },
 
-	{ 5, 25, -1, "language-userDefinedLanguage" },
+	{ 5,  25, -1, "language-userDefinedLanguage" },
 
-	{ 6,  4, -1, "settings-import" },
+	{ 6,   4, -1, "settings-import" },
 
-	{ 7,  0, -1, "tools-md5" },
-	{ 7,  1, -1, "tools-sha256" },
+	{ 7,   0, -1, "tools-md5" },
+	{ 7,   1, -1, "tools-sha256" },
 
-	{ 11, 0, -1, "window-sortby"},
+	{ 11,  0, -1, "window-sortby"},
 
-	{ -1, -1, -1, "" } // End of array
+	{ -1,  -1, -1, "" } // End of array
 };
 
 void NativeLangSpeaker::init(TiXmlDocumentA *nativeLangDocRootA, bool loadIfEnglish)
@@ -279,7 +281,7 @@ MenuPosition & getMenuPosition(const char *id)
 	return menuPos[nbSubMenuPos-1];
 }
 
-void NativeLangSpeaker::changeMenuLang(HMENU menuHandle, generic_string & pluginsTrans, generic_string & windowTrans)
+void NativeLangSpeaker::changeMenuLang(HMENU menuHandle)
 {
 	if (nullptr == _nativeLangA)
 		return;
@@ -296,7 +298,6 @@ void NativeLangSpeaker::changeMenuLang(HMENU menuHandle, generic_string & plugin
 	if (nullptr == entriesRoot)
 		return;
 
-	const char* idName = nullptr;
 	WcharMbcsConvertor& wmc = WcharMbcsConvertor::getInstance();
 
 	for (TiXmlNodeA *childNode = entriesRoot->FirstChildElement("Item");
@@ -315,24 +316,6 @@ void NativeLangSpeaker::changeMenuLang(HMENU menuHandle, generic_string & plugin
 				::ModifyMenu(menuHandle, menuPos._x, MF_BYPOSITION, 0, nameW);
 			}
 		}
-		else
-		{
-			idName = element->Attribute("idName");
-			if (idName)
-			{
-				const char *name = element->Attribute("name");
-				if (!strcmp(idName, "Plugins"))
-				{
-					const wchar_t *nameW = wmc.char2wchar(name, _nativeLangEncoding);
-					pluginsTrans = nameW;
-				}
-				else if (!strcmp(idName, "Window"))
-				{
-					const wchar_t *nameW = wmc.char2wchar(name, _nativeLangEncoding);
-					windowTrans = nameW;
-				}
-			}
-		}
 	}
 
 	TiXmlNodeA *menuCommandsRoot = mainMenu->FirstChild("Commands");
@@ -356,8 +339,6 @@ void NativeLangSpeaker::changeMenuLang(HMENU menuHandle, generic_string & plugin
 		childNode = childNode->NextSibling("Item") )
 	{
 		TiXmlElementA* element = childNode->ToElement();
-		//const char *xStr = element->Attribute("posX", &x);
-		//const char *yStr = element->Attribute("posY", &y);
 		const char* subMenuIdStr = element->Attribute("subMenuId");
 		const char* name = element->Attribute("name");
 
diff --git a/PowerEditor/src/localization.h b/PowerEditor/src/localization.h
index c5171f0d5..165ab2761 100644
--- a/PowerEditor/src/localization.h
+++ b/PowerEditor/src/localization.h
@@ -29,10 +29,10 @@ class PluginsAdminDlg;
 
 class MenuPosition {
 public:
-	int _x;
-	int _y;
-	int _z;
-	char _id[64];
+	int _x = -1; // menu
+	int _y = -1; // sub-menu
+	int _z = -1; // sub-sub-menu
+	char _id[64] = { '\0' }; // a unique string defined in localization XML file
 };
 
 
@@ -49,7 +49,7 @@ public:
 	generic_string getNativeLangMenuString(int itemID) const;
 	generic_string getShortcutNameString(int itemID) const;
 
-	void changeMenuLang(HMENU menuHandle, generic_string & pluginsTrans, generic_string & windowTrans);
+	void changeMenuLang(HMENU menuHandle);
 	void changeShortcutLang();
 	void changeStyleCtrlsLang(HWND hDlg, int *idArray, const char **translatedText);
     void changeUserDefineLang(UserDefineDialog *userDefineDlg);