From 4650f8244b72a955db4b798c1fda3e0e60ddbfd4 Mon Sep 17 00:00:00 2001 From: Simon Rozman Date: Thu, 24 Mar 2016 12:37:01 +0100 Subject: [PATCH] Localization issues fixed --- MSI/ZRCola/Main/Makefile | 2 +- MSI/ZRCola/locale/sl_SI.po | 4 ++-- ZRCola/zrcolaapp.cpp | 1 - 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/MSI/ZRCola/Main/Makefile b/MSI/ZRCola/Main/Makefile index af3d8ad..692ac0f 100644 --- a/MSI/ZRCola/Main/Makefile +++ b/MSI/ZRCola/Main/Makefile @@ -342,7 +342,7 @@ regDatabasePath 2 SOFTWARE\Amebis\ZRCola DatabasePath [ZRCOLADATADIR] compDataba Registry Root Key Name Value Component_ s$(MSIBUILD_LENGTH_ID) i2 l255 L255 L0 s$(MSIBUILD_LENGTH_ID) 1252 Registry Registry -regLanguage 1 SOFTWARE\Amebis\ZRCola Language #58 compLanguage +regLanguage 1 SOFTWARE\Amebis\ZRCola Language #60 compLanguage <\n" "Language-Team: Amebis, d. o. o., Kamnik \n" @@ -19,7 +19,7 @@ msgstr "" # wxLanguage enum value for this language (decimal, # prefixed) #: En.Win32.Debug.Registry-2.idtx:4 En.Win32.Release.Registry-2.idtx:4 En.x64.Debug.Registry-2.idtx:4 En.x64.Release.Registry-2.idtx:4 -msgid "#58" +msgid "#60" msgstr "#176" # Licence Agreement diff --git a/ZRCola/zrcolaapp.cpp b/ZRCola/zrcolaapp.cpp index 7582d18..26509e0 100644 --- a/ZRCola/zrcolaapp.cpp +++ b/ZRCola/zrcolaapp.cpp @@ -47,7 +47,6 @@ bool ZRColaApp::OnInit() m_locale.AddCatalogLookupPathPrefix(sPath); wxVERIFY(m_locale.Init(language)); wxVERIFY(m_locale.AddCatalog(wxT("wxExtend"))); - wxVERIFY(m_locale.AddCatalog(wxT("ZRColaCompile"))); wxVERIFY(m_locale.AddCatalog(wxT("ZRCola"))); }