diff --git a/ZRColaCompile/dbsource.cpp b/ZRColaCompile/dbsource.cpp index 37f4d14..2366c5a 100644 --- a/ZRColaCompile/dbsource.cpp +++ b/ZRColaCompile/dbsource.cpp @@ -753,6 +753,7 @@ bool ZRCola::DBSource::SelectCharacters(ATL::CComPtr& rs) const if (FAILED(rs->Open(ATL::CComVariant( L"SELECT DISTINCT [znak], [opis_en], [klj_bes_en], [kat], [znak_v], [znak_m] " L"FROM [VRS_CharList] " + L"WHERE [kat]<>'g' " // Ignore "Other, Control" category! L"ORDER BY [znak]"), ATL::CComVariant(m_db), adOpenStatic, adLockReadOnly, adCmdText))) { _ftprintf(stderr, wxT("%s: error ZCC0120: Error loading characters from database. Please make sure the file is ZRCola.zrc compatible.\n"), m_filename.c_str()); @@ -827,6 +828,7 @@ bool ZRCola::DBSource::SelectCharacterCategories(ATL::CComPtr& rs) if (FAILED(rs->Open(ATL::CComVariant( L"SELECT DISTINCT [kat], [opis_en], [Rang] " L"FROM [VRS_CharCategory] " + L"WHERE [kat]<>'g' " // Ignore "Other, Control" category! L"ORDER BY [Rang], [opis_en]"), ATL::CComVariant(m_db), adOpenStatic, adLockReadOnly, adCmdText))) { _ftprintf(stderr, wxT("%s: error ZCC0130: Error loading character categories from database. Please make sure the file is ZRCola.zrc compatible.\n"), m_filename.c_str()); diff --git a/output/data/ZRCola.zrcdb b/output/data/ZRCola.zrcdb index e3d9b45..515af50 100644 Binary files a/output/data/ZRCola.zrcdb and b/output/data/ZRCola.zrcdb differ diff --git a/output/locale/ZRCola-zrcdb.pot b/output/locale/ZRCola-zrcdb.pot index 71f85b3..8d3e6bf 100644 --- a/output/locale/ZRCola-zrcdb.pot +++ b/output/locale/ZRCola-zrcdb.pot @@ -5,7 +5,7 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: ZRColaCompile 2.0-alpha7\n" +"X-Generator: ZRColaCompile 2.0-beta\n" msgid "Albanian" msgstr "" @@ -334,9 +334,6 @@ msgstr "" msgid "Numbers - Circled" msgstr "" -msgid "Other, Control" -msgstr "" - msgid "Other, Format" msgstr ""