diff --git a/ZRColaCompile/dbsource.cpp b/ZRColaCompile/dbsource.cpp index e4588af..473f3df 100644 --- a/ZRColaCompile/dbsource.cpp +++ b/ZRColaCompile/dbsource.cpp @@ -51,12 +51,12 @@ bool ZRCola::DBSource::Open(LPCTSTR _filename) filename = _filename; return true; } else { - _ftprintf(stderr, wxT("%s: error ZCC0002: Could not open database (0x%x).\n"), (LPCTSTR)_filename, hr); + _ftprintf(stderr, wxT("%s: error ZCC0011: Could not open database (0x%x).\n"), (LPCTSTR)_filename, hr); LogErrors(); } m_db.Release(); } else - _ftprintf(stderr, wxT("%s: error ZCC0001: Creating ADOConnection object failed (0x%x).\n"), (LPCTSTR)_filename, hr); + _ftprintf(stderr, wxT("%s: error ZCC0012: Creating ADOConnection object failed (0x%x).\n"), (LPCTSTR)_filename, hr); return false; } @@ -149,11 +149,11 @@ bool ZRCola::DBSource::GetUnicodeCharacter(const CComPtr& f, wchar_t& } if (i <= 0 && 4 < i) { CComBSTR fieldname; wxVERIFY(SUCCEEDED(f->get_Name(&fieldname))); - _ftprintf(stderr, wxT("%s: error ZCC0020: Syntax error in \"%.*ls\" field (\"%.*ls\"). Unicode code must be one to four hexadecimal characters long.\n"), filename.c_str(), fieldname.Length(), (BSTR)fieldname, n, V_BSTR(&v)); + _ftprintf(stderr, wxT("%s: error ZCC0030: Syntax error in \"%.*ls\" field (\"%.*ls\"). Unicode code must be one to four hexadecimal characters long.\n"), filename.c_str(), fieldname.Length(), (BSTR)fieldname, n, V_BSTR(&v)); return false; } else if (i != n) { CComBSTR fieldname; wxVERIFY(SUCCEEDED(f->get_Name(&fieldname))); - _ftprintf(stderr, wxT("%s: error ZCC0021: Syntax error in \"%.*ls\" field (\"%.*ls\"). Extra trailing characters.\n"), filename.c_str(), fieldname.Length(), (BSTR)fieldname, n, V_BSTR(&v)); + _ftprintf(stderr, wxT("%s: error ZCC0031: Syntax error in \"%.*ls\" field (\"%.*ls\"). Extra trailing characters.\n"), filename.c_str(), fieldname.Length(), (BSTR)fieldname, n, V_BSTR(&v)); return false; } @@ -169,7 +169,7 @@ bool ZRCola::DBSource::SelectTranslations(ATL::CComPtr &rs) const // Open it. if (FAILED(rs->Open(ATL::CComVariant(L"SELECT [komb], [znak] FROM [VRS_ReplChar] WHERE [rang_komb]=1"), ATL::CComVariant(m_db), adOpenStatic, adLockReadOnly, adCmdText))) { - _ftprintf(stderr, wxT("%s: error ZCC0010: Error loading compositions from database. Please make sure the file is ZRCola.zrc compatible.\n"), filename.c_str()); + _ftprintf(stderr, wxT("%s: error ZCC0040: Error loading compositions from database. Please make sure the file is ZRCola.zrc compatible.\n"), filename.c_str()); LogErrors(); return false; } diff --git a/ZRColaCompile/locale/sl.po b/ZRColaCompile/locale/sl.po index b6531e3..cc13ad9 100644 --- a/ZRColaCompile/locale/sl.po +++ b/ZRColaCompile/locale/sl.po @@ -1,8 +1,8 @@ msgid "" msgstr "" "Project-Id-Version: ZRColaCompile\n" -"POT-Creation-Date: 2016-02-26 14:22+0100\n" -"PO-Revision-Date: 2016-02-26 14:23+0100\n" +"POT-Creation-Date: 2016-03-01 15:40+0100\n" +"PO-Revision-Date: 2016-03-01 15:40+0100\n" "Last-Translator: Simon Rozman \n" "Language-Team: Amebis, d. o. o., Kamnik \n" "Language: sl_SI\n" @@ -17,40 +17,33 @@ msgstr "" "X-Poedit-KeywordsList: _\n" "X-Poedit-SearchPath-0: .\n" -#: main.cpp:51 +#: main.cpp:204 msgid "Show this help message" msgstr "Pokaži to sporočilo pomoči" -#: main.cpp:52 +#: main.cpp:205 msgid "input file" msgstr "vhodna datoteka" -#: main.cpp:53 +#: main.cpp:206 msgid "output file" msgstr "izhodna datoteka" -#: main.cpp:75 -msgid "Error initializing COM.\n" -msgstr "Napaka pri vzpostavitvi COM.\n" +#~ msgid "Error initializing COM.\n" +#~ msgstr "Napaka pri vzpostavitvi COM.\n" -#: main.cpp:82 -#, c-format -msgid "Error opening %s input file.\n" -msgstr "Pri odpiranju vhodne datoteke %s je prišlo do napake.\n" +#~ msgid "Error opening %s input file.\n" +#~ msgstr "Pri odpiranju vhodne datoteke %s je prišlo do napake.\n" -#: main.cpp:89 -#, c-format -msgid "Error opening %s output file.\n" -msgstr "Pri odpiranju izhodne datoteke %s je prišlo do napake.\n" +#~ msgid "Error opening %s output file.\n" +#~ msgstr "Pri odpiranju izhodne datoteke %s je prišlo do napake.\n" -#: main.cpp:95 -#, c-format -msgid "" -"Error loading compositions from %s input file. Please make sure the input " -"file is ZRCola.zrc compatible.\n" -msgstr "" -"Pri nalaganju sestavljank iz vhodne datoteke %s je prišlo do napake. " -"Preverite, ali je vhodna datoteka res združljiva z ZRCola.zrc.\n" +#~ msgid "" +#~ "Error loading compositions from %s input file. Please make sure the input " +#~ "file is ZRCola.zrc compatible.\n" +#~ msgstr "" +#~ "Pri nalaganju sestavljank iz vhodne datoteke %s je prišlo do napake. " +#~ "Preverite, ali je vhodna datoteka res združljiva z ZRCola.zrc.\n" #, fuzzy #~ msgid "Could not open database %s (0x%x)." diff --git a/ZRColaCompile/main.cpp b/ZRColaCompile/main.cpp index c0859a4..2d95970 100644 --- a/ZRColaCompile/main.cpp +++ b/ZRColaCompile/main.cpp @@ -225,21 +225,21 @@ int _tmain(int argc, _TCHAR *argv[]) // Initialize COM (CoInitialize). wxCoInitializer initializerOLE(COINIT_MULTITHREADED | COINIT_SPEED_OVER_MEMORY); if (!initializerOLE) { - _ftprintf(stderr, _("Error initializing COM.\n")); + _ftprintf(stderr, wxT("Error initializing COM.\n")); return -1; } ZRCola::DBSource src; const wxString& filenameIn = parser.GetParam(0); if (!src.Open(filenameIn)) { - _ftprintf(stderr, _("Error opening %s input file.\n"), filenameIn.fn_str()); + _ftprintf(stderr, wxT("%s: error ZCC0001: Error opening input file.\n"), filenameIn.fn_str()); return 1; } const wxString& filenameOut = parser.GetParam(1); std::fstream dst((LPCTSTR)filenameOut, std::ios_base::out | std::ios_base::trunc | std::ios_base::binary); if (dst.fail()) { - _ftprintf(stderr, _("Error opening %s output file.\n"), filenameOut.fn_str()); + _ftprintf(stderr, wxT("%s: error ZCC0002: Error opening output file.\n"), filenameOut.fn_str()); return 1; } @@ -300,7 +300,7 @@ int _tmain(int argc, _TCHAR *argv[]) stdex::idrec::close(dst, dst_start); if (dst.fail()) { - _ftprintf(stderr, wxT("Writing to %s output file failed.\n"), (LPCTSTR)filenameOut.c_str()); + _ftprintf(stderr, wxT("%s: error ZCC0005: Writing to output file failed.\n"), (LPCTSTR)filenameOut.c_str()); has_errors = true; }