diff --git a/PowerEditor/installer/nativeLang/afrikaans.xml b/PowerEditor/installer/nativeLang/afrikaans.xml
index 25e043e22..8460c43ef 100644
--- a/PowerEditor/installer/nativeLang/afrikaans.xml
+++ b/PowerEditor/installer/nativeLang/afrikaans.xml
@@ -13,19 +13,19 @@
-
+
-
-
-
+
+
+
-
+
@@ -43,33 +43,33 @@
-
-
-
-
-
+
+
+
+
+
-
+
-
+
-
-
+
+
-
-
+
+
-
-
+
+
@@ -78,17 +78,17 @@
-
-
-
+
+
+
-
-
+
+
-
+
@@ -102,30 +102,30 @@
-
-
+
+
-
-
-
-
-
+
+
+
+
+
-
+
-
+
-
+
-
+
-
-
+
+
-
+
@@ -137,8 +137,8 @@
-
-
+
+
@@ -162,25 +162,25 @@
-
+
-
+
-
+
-
+
-
+
-
+
@@ -189,9 +189,9 @@
-
-
-
+
+
+
@@ -200,7 +200,7 @@
-
+
@@ -220,7 +220,7 @@
-
+
@@ -235,11 +235,11 @@
-
-
+
+
-
-
+
+
@@ -251,51 +251,51 @@
-
+
-
-
-
+
+
+
-
+
-
+
-
-
+
+
-
-
+
+
-
-
-
+
+
+
-
+
-
-
-
-
-
+
+
+
+
+
@@ -304,24 +304,24 @@
-
+
-
+
-
+
-
-
-
-
-
-
+
+
+
+
+
+
-
-
+
+
@@ -370,20 +370,20 @@
-
+
-
+
-
+
-
+
@@ -391,16 +391,16 @@
-
+
-
-
+
+
-
+
@@ -429,12 +429,12 @@
-
-
-
+
+
+
-
+
@@ -451,9 +451,9 @@
-
-
-
+
+
+
@@ -464,28 +464,28 @@
-
+
-
+
-
+
-
+
-
+
-
-
+
+
-
+
-
+
@@ -502,26 +502,26 @@
-
+
-
-
-
-
-
+
+
+
+
+
-
+
-
+
-
+
@@ -532,7 +532,7 @@
-
+
diff --git a/PowerEditor/installer/nativeLang/catalan.xml b/PowerEditor/installer/nativeLang/catalan.xml
index cd38831fd..7b020f0d8 100644
--- a/PowerEditor/installer/nativeLang/catalan.xml
+++ b/PowerEditor/installer/nativeLang/catalan.xml
@@ -1,511 +1,576 @@
-
+
-
+
+
-
+
\ No newline at end of file
diff --git a/PowerEditor/installer/nativeLang/czech.xml b/PowerEditor/installer/nativeLang/czech.xml
index 0d5d952cb..027b88593 100644
--- a/PowerEditor/installer/nativeLang/czech.xml
+++ b/PowerEditor/installer/nativeLang/czech.xml
@@ -28,11 +28,14 @@
+
+
+
@@ -121,6 +124,18 @@
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/PowerEditor/installer/nativeLang/danish.xml b/PowerEditor/installer/nativeLang/danish.xml
index eb3073033..dd8e3a569 100644
--- a/PowerEditor/installer/nativeLang/danish.xml
+++ b/PowerEditor/installer/nativeLang/danish.xml
@@ -1,7 +1,7 @@
-
+
@@ -195,8 +239,17 @@
+
+
+
+
+
+
+
+
+
@@ -216,7 +269,7 @@
-
+
@@ -300,6 +353,7 @@
+
@@ -322,8 +376,17 @@
+
+
+
+
+
+
+
+
+
@@ -341,25 +404,33 @@
+
-
-
-
+
+
+
-
+
-
-
-
+
+
+
+
+
+
-
+
+
+
+
+
@@ -375,18 +446,19 @@
-
+
-
+
-
+
+
@@ -401,11 +473,19 @@
+
+
+
+
+
+
+
+
@@ -425,6 +505,7 @@
+
@@ -459,3 +540,5 @@
+
+
diff --git a/PowerEditor/installer/nativeLang/kyrgyz.xml b/PowerEditor/installer/nativeLang/kyrgyz.xml
index 3182688da..d20cf008c 100644
--- a/PowerEditor/installer/nativeLang/kyrgyz.xml
+++ b/PowerEditor/installer/nativeLang/kyrgyz.xml
@@ -1,7 +1,7 @@
-
-
+
+
\ No newline at end of file
diff --git a/PowerEditor/src/Notepad_plus.cpp b/PowerEditor/src/Notepad_plus.cpp
index 02bb9ba36..4a75a9d90 100644
--- a/PowerEditor/src/Notepad_plus.cpp
+++ b/PowerEditor/src/Notepad_plus.cpp
@@ -94,13 +94,12 @@ Notepad_plus::Notepad_plus(): Window(), _mainWindowStatus(0), _pDocTab(NULL), _p
localizationSwitcher.setFileName(fn);
}
#endif
- if (stricmp("english.xml", fn) == 0)
+ if (fn && stricmp("english.xml", fn) == 0)
{
- _nativeLangA = NULL;
- _toolIcons = NULL;
- return;
- }
-
+ _nativeLangA = NULL;
+ _toolIcons = NULL;
+ return;
+ }
// get encoding
TiXmlDeclarationA *declaration = _nativeLangA->GetDocument()->FirstChild()->ToDeclaration();
if (declaration)
diff --git a/PowerEditor/src/Notepad_plus.rc b/PowerEditor/src/Notepad_plus.rc
index 24bb1b9c9..83ddfb6cf 100644
--- a/PowerEditor/src/Notepad_plus.rc
+++ b/PowerEditor/src/Notepad_plus.rc
@@ -419,7 +419,7 @@ BEGIN
END
POPUP "Celtic"
BEGIN
- MENUITEM "(ISO)", IDM_FORMAT_ISO_8859_14
+ MENUITEM "ISO 8859-14", IDM_FORMAT_ISO_8859_14
END
POPUP "Cyrillic"
BEGIN
@@ -442,7 +442,7 @@ BEGIN
POPUP "Chinese"
BEGIN
MENUITEM "Big5 (Traditional)", IDM_FORMAT_BIG5
- MENUITEM "GB (Simplified)", IDM_FORMAT_GB2312
+ MENUITEM "GB2312 (Simplified)", IDM_FORMAT_GB2312
END
POPUP "Eastern European"
diff --git a/PowerEditor/src/localizationString.h b/PowerEditor/src/localizationString.h
index 33009b808..279a6d618 100644
Binary files a/PowerEditor/src/localizationString.h and b/PowerEditor/src/localizationString.h differ