diff --git a/Readme.md b/Readme.md
index 22aa7d181..c090b86cf 100644
--- a/Readme.md
+++ b/Readme.md
@@ -114,8 +114,8 @@ Afrikaans/South Africa (af-ZA)
 Belarusian/Belarus (be-BY)
 German/Germany (de-DE)
 English/United Kingdom (en-GB)
-Spanish/Spain (es-ES)
 Spanish/Latin America (es-419)
+Spanish/Spain (es-ES)
 French/France (fr-FR)
 Hindi/India (hi-IN)
 Hungarian/Hungary (hu-HU)
diff --git a/grepWinNP3/grepWinNP3.vcxproj b/grepWinNP3/grepWinNP3.vcxproj
index e620ab5af..1045b2231 100644
--- a/grepWinNP3/grepWinNP3.vcxproj
+++ b/grepWinNP3/grepWinNP3.vcxproj
@@ -413,6 +413,7 @@
     <None Include="translationsNP3\Deutsch (Deutschland) [de-DE].lang" />
     <None Include="translationsNP3\English (United Kingdom) [en-GB].lang" />
     <None Include="translationsNP3\English (United States) [en-US].lang" />
+    <None Include="translationsNP3\Español (América Latina) [es-419].lang" />
     <None Include="translationsNP3\Español (España) [es-ES].lang" />
     <None Include="translationsNP3\Français (France) [fr-FR].lang" />
     <None Include="translationsNP3\Italiano (Italia) [it-IT].lang" />
diff --git a/grepWinNP3/grepWinNP3.vcxproj.filters b/grepWinNP3/grepWinNP3.vcxproj.filters
index fce90f28b..258a5addf 100644
--- a/grepWinNP3/grepWinNP3.vcxproj.filters
+++ b/grepWinNP3/grepWinNP3.vcxproj.filters
@@ -350,6 +350,9 @@
     <None Include="translationsNP3\English (United States) [en-US].lang">
       <Filter>translationsNP3</Filter>
     </None>
+    <None Include="translationsNP3\Español (América Latina) [es-419].lang">
+      <Filter>translationsNP3</Filter>
+    </None>
     <None Include="translationsNP3\Español (España) [es-ES].lang">
       <Filter>translationsNP3</Filter>
     </None>
diff --git a/grepWinNP3/translationsNP3/Ελληνικά (Ελλάδα) [el-GR].lang b/grepWinNP3/translationsNP3/Ελληνικά (Ελλάδα) [el-GR].lang
index e241c0ad2..2287ed763 100644
--- a/grepWinNP3/translationsNP3/Ελληνικά (Ελλάδα) [el-GR].lang	
+++ b/grepWinNP3/translationsNP3/Ελληνικά (Ελλάδα) [el-GR].lang	
@@ -9,7 +9,7 @@
 #
 # encoding: UTF-8
 # Language: Greek (Greece) resources
-# Translator: (el-GR) Ελληνική μετάφραση από τον Ghost
+# Translator: (el-GR) Ελληνική μετάφραση από τον geogeo-gr
 #
 
 #, fuzzy
diff --git a/language/common_res.h b/language/common_res.h
index 3394428b8..02a599615 100644
--- a/language/common_res.h
+++ b/language/common_res.h
@@ -441,8 +441,8 @@
 #define IDS_MUI_LANG_BE_BY              34503
 #define IDS_MUI_LANG_DE_DE              34504
 #define IDS_MUI_LANG_EN_GB              34505
-#define IDS_MUI_LANG_ES_ES              34506
-#define IDS_MUI_LANG_ES_419             34507
+#define IDS_MUI_LANG_ES_419             34506
+#define IDS_MUI_LANG_ES_ES              34507
 #define IDS_MUI_LANG_FR_FR              34508
 #define IDS_MUI_LANG_HI_IN              34509
 #define IDS_MUI_LANG_HU_HU              34510
diff --git a/src/MuiLanguage.c b/src/MuiLanguage.c
index f50f40ab2..b5fbe1c4f 100644
--- a/src/MuiLanguage.c
+++ b/src/MuiLanguage.c
@@ -39,8 +39,8 @@ MUILANGUAGE MUI_LanguageDLLs[] = {
     { IDS_MUI_LANG_BE_BY, L"be-BY", L"Беларуская (Беларусь)\t\t\t[%s]",            MAKELANGID(LANG_BELARUSIAN, SUBLANG_BELARUSIAN_BELARUS), false, false },
     { IDS_MUI_LANG_DE_DE, L"de-DE", L"Deutsch (Deutschland)\t\t\t[%s]",            MAKELANGID(LANG_GERMAN, SUBLANG_GERMAN), false, false },
     { IDS_MUI_LANG_EN_GB, L"en-GB", L"English (United Kingdom)\t\t\t[%s]",         MAKELANGID(LANG_ENGLISH, SUBLANG_ENGLISH_UK), false, false },
-    { IDS_MUI_LANG_ES_ES, L"es-ES", L"Español (España)\t\t\t[%s]",                 MAKELANGID(LANG_SPANISH, SUBLANG_SPANISH_MODERN), false, false },
     { IDS_MUI_LANG_ES_419, L"es-419", L"Español (América Latina)\t\t\t[%s]",       MAKELANGID(LANG_SPANISH, SUBLANG_SPANISH_LATIN_AMERICA), false, false },
+    { IDS_MUI_LANG_ES_ES, L"es-ES", L"Español (España)\t\t\t[%s]",                 MAKELANGID(LANG_SPANISH, SUBLANG_SPANISH_MODERN), false, false },
     { IDS_MUI_LANG_FR_FR, L"fr-FR", L"Français (France)\t\t\t[%s]",                MAKELANGID(LANG_FRENCH, SUBLANG_FRENCH), false, false },
     { IDS_MUI_LANG_HI_IN, L"hi-IN", L"हिन्दी (भारत)\t\t\t[%s]",                       MAKELANGID(LANG_HINDI, SUBLANG_HINDI_INDIA), false, false },
     { IDS_MUI_LANG_HU_HU, L"hu-HU", L"Magyar (Magyarország)\t\t\t[%s]",            MAKELANGID(LANG_HUNGARIAN, SUBLANG_HUNGARIAN_HUNGARY), false, false },
@@ -75,8 +75,8 @@ grepWinLng_t grepWinLangResName[] = {
     { MAKELANGID(LANG_BELARUSIAN, SUBLANG_BELARUSIAN_BELARUS),              L".\\lng\\gwLng\\Беларуская (Беларусь) [be-BY].lang"},
     { MAKELANGID(LANG_GERMAN, SUBLANG_GERMAN),                              L".\\lng\\gwLng\\Deutsch (Deutschland) [de-DE].lang"},
     { MAKELANGID(LANG_ENGLISH, SUBLANG_ENGLISH_UK),                         L".\\lng\\gwLng\\English (United Kingdom) [en-GB].lang"},
-    { MAKELANGID(LANG_SPANISH, SUBLANG_SPANISH_MODERN),                     L".\\lng\\gwLng\\Español (España) [es-ES].lang"},
     { MAKELANGID(LANG_SPANISH, SUBLANG_SPANISH_LATIN_AMERICA),              L".\\lng\\gwLng\\Español (América Latina) [es-419].lang"},
+    { MAKELANGID(LANG_SPANISH, SUBLANG_SPANISH_MODERN),                     L".\\lng\\gwLng\\Español (España) [es-ES].lang"},
     { MAKELANGID(LANG_FRENCH, SUBLANG_FRENCH),                              L".\\lng\\gwLng\\Français (France) [fr-FR].lang"},
     { MAKELANGID(LANG_HINDI, SUBLANG_HINDI_INDIA),                          L".\\lng\\gwLng\\हिन्दी (भारत) [hi-IN].lang"},
     { MAKELANGID(LANG_HUNGARIAN, SUBLANG_HUNGARIAN_HUNGARY),                L".\\lng\\gwLng\\Magyar (Magyarország) [hu-HU].lang"},