fixed problems with translating titles for wxLogGui/wxLogDialog (no reentrancy danger)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_2_BRANCH@7662 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Václav Slavík
@@ -298,12 +298,6 @@ protected:
|
||||
// empty everything
|
||||
void Clear();
|
||||
|
||||
// the translated titles for misc message boxes: only translate ones to
|
||||
// avoid reentrancy problems later
|
||||
wxString m_error,
|
||||
m_warning,
|
||||
m_info;
|
||||
|
||||
wxArrayString m_aMessages; // the log message texts
|
||||
wxArrayInt m_aSeverity; // one of wxLOG_XXX values
|
||||
wxArrayLong m_aTimes; // the time of each message
|
||||
|
||||
110
locale/cs.po
110
locale/cs.po
@@ -1,7 +1,7 @@
|
||||
msgid ""
|
||||
msgstr ""
|
||||
"Project-Id-Version: wxWindows-2.2\n"
|
||||
"POT-Creation-Date: 2000-06-28 21:07+0200\n"
|
||||
"POT-Creation-Date: 2000-07-01 14:41+0200\n"
|
||||
"PO-Revision-Date: 2000-06-17 19:23+0200\n"
|
||||
"Last-Translator: Vaclav Slavik <v.slavik@volny.cz>\n"
|
||||
"Language-Team: wxWindows Team <wx-devel@wxwindows.org>\n"
|
||||
@@ -32,7 +32,7 @@ msgstr ""
|
||||
msgid " (error %ld: %s)"
|
||||
msgstr " (chyba %ld: %s)"
|
||||
|
||||
#: ../src/common/docview.cpp:1195
|
||||
#: ../src/common/docview.cpp:1204
|
||||
msgid " - "
|
||||
msgstr " - "
|
||||
|
||||
@@ -82,6 +82,18 @@ msgstr "%i z %i"
|
||||
msgid "%s (or %s)"
|
||||
msgstr "%s (nebo %s)"
|
||||
|
||||
#: ../src/generic/logg.cpp:239
|
||||
msgid "%s Error"
|
||||
msgstr "%s - chyba"
|
||||
|
||||
#: ../src/generic/logg.cpp:247
|
||||
msgid "%s Information"
|
||||
msgstr "%s - informace"
|
||||
|
||||
#: ../src/generic/logg.cpp:243
|
||||
msgid "%s Warning"
|
||||
msgstr "%s - varov<6F>n<EFBFBD>"
|
||||
|
||||
#: ../src/common/resourc2.cpp:709 ../src/common/resource.cpp:2359
|
||||
#, c-format
|
||||
msgid "%s not a bitmap resource specification."
|
||||
@@ -99,11 +111,11 @@ msgstr "%s nen
|
||||
msgid "%s: ill-formed resource file syntax."
|
||||
msgstr "%s: chybn<62> syntaxe resource souboru."
|
||||
|
||||
#: ../src/generic/logg.cpp:479 ../src/generic/tipdlg.cpp:170
|
||||
#: ../src/generic/logg.cpp:473 ../src/generic/tipdlg.cpp:170
|
||||
msgid "&Close"
|
||||
msgstr "&Zav<61><76>t"
|
||||
|
||||
#: ../src/generic/logg.cpp:691
|
||||
#: ../src/generic/logg.cpp:685
|
||||
msgid "&Details"
|
||||
msgstr "&Detaily"
|
||||
|
||||
@@ -111,7 +123,7 @@ msgstr "&Detaily"
|
||||
msgid "&Finish"
|
||||
msgstr "&Dokon<6F>it"
|
||||
|
||||
#: ../src/generic/logg.cpp:480
|
||||
#: ../src/generic/logg.cpp:474
|
||||
msgid "&Log"
|
||||
msgstr "&Log"
|
||||
|
||||
@@ -123,15 +135,15 @@ msgstr "&Dal
|
||||
msgid "&Next Tip"
|
||||
msgstr "&Dal<61><6C> tip"
|
||||
|
||||
#: ../src/common/docview.cpp:1891 ../src/common/docview.cpp:1902
|
||||
#: ../src/common/docview.cpp:1900 ../src/common/docview.cpp:1911
|
||||
msgid "&Redo"
|
||||
msgstr "&Zopakovat"
|
||||
|
||||
#: ../src/common/docview.cpp:1885 ../src/common/docview.cpp:1912
|
||||
#: ../src/common/docview.cpp:1894 ../src/common/docview.cpp:1921
|
||||
msgid "&Redo "
|
||||
msgstr "&Zopakovat "
|
||||
|
||||
#: ../src/generic/logg.cpp:475 ../src/generic/logg.cpp:776
|
||||
#: ../src/generic/logg.cpp:469 ../src/generic/logg.cpp:770
|
||||
msgid "&Save..."
|
||||
msgstr "&Ulo<6C>it..."
|
||||
|
||||
@@ -139,11 +151,11 @@ msgstr "&Ulo
|
||||
msgid "&Show tips at startup"
|
||||
msgstr "&Zobrazit tipy p<>i spu<70>t<EFBFBD>n<EFBFBD>"
|
||||
|
||||
#: ../src/common/docview.cpp:1897
|
||||
#: ../src/common/docview.cpp:1906
|
||||
msgid "&Undo"
|
||||
msgstr "Z&p<>t"
|
||||
|
||||
#: ../src/common/docview.cpp:1872
|
||||
#: ../src/common/docview.cpp:1881
|
||||
msgid "&Undo "
|
||||
msgstr "Z&p<>t "
|
||||
|
||||
@@ -319,7 +331,7 @@ msgstr "ABCDEFGabcdefg12345"
|
||||
msgid "Add current page to bookmarks"
|
||||
msgstr "P<>id<69> tuto str<74>nku k z<>lo<6C>k<EFBFBD>m"
|
||||
|
||||
#: ../src/generic/colrdlgg.cpp:264
|
||||
#: ../src/generic/colrdlgg.cpp:272
|
||||
msgid "Add to custom colours"
|
||||
msgstr "P<>idat k u<>ivatelsk<73>m barv<72>m"
|
||||
|
||||
@@ -340,7 +352,7 @@ msgstr "V
|
||||
msgid "Already dialling ISP."
|
||||
msgstr "U<> vyt<79><74><EFBFBD>m."
|
||||
|
||||
#: ../src/generic/logg.cpp:1023
|
||||
#: ../src/generic/logg.cpp:1017
|
||||
#, c-format
|
||||
msgid "Append log to file '%s' (choosing [No] will overwrite it)?"
|
||||
msgstr "P<>ipojit log k souboru '%s' (pokud zvol<6F>te [Ne], soubor p<>ep<65><70>ete)?"
|
||||
@@ -442,7 +454,7 @@ msgstr "Doln
|
||||
msgid "C sheet, 17 x 22 in"
|
||||
msgstr "str<74>nka C, 17 x 22 palc<6C>"
|
||||
|
||||
#: ../src/generic/logg.cpp:477
|
||||
#: ../src/generic/logg.cpp:471
|
||||
msgid "C&lear"
|
||||
msgstr "&Vymazat"
|
||||
|
||||
@@ -502,7 +514,7 @@ msgstr "Nemohu pozastavit vl
|
||||
msgid "Can not wait for thread termination"
|
||||
msgstr "Nemohu po<70>kat na ukon<6F>en<65> vl<76>kna"
|
||||
|
||||
#: ../src/common/docview.cpp:1874
|
||||
#: ../src/common/docview.cpp:1883
|
||||
msgid "Can't &Undo "
|
||||
msgstr "Nemohu vz<76>t zp<7A>t"
|
||||
|
||||
@@ -544,7 +556,7 @@ msgstr "Nemohu vytvo
|
||||
msgid "Can't create thread"
|
||||
msgstr "Nemohu vytvo<76>it vl<76>kno"
|
||||
|
||||
#: ../src/msw/window.cpp:2397
|
||||
#: ../src/msw/window.cpp:2388
|
||||
#, c-format
|
||||
msgid ""
|
||||
"Can't create window of class %s!\n"
|
||||
@@ -588,7 +600,7 @@ msgstr "Nemohu vyjmenovat hodnoty kl
|
||||
msgid "Can't find current position in file '%s'"
|
||||
msgstr "Nemohu zjistit pozici v souboru '%s'"
|
||||
|
||||
#: ../src/msw/window.cpp:2347
|
||||
#: ../src/msw/window.cpp:2338
|
||||
msgid ""
|
||||
"Can't find dummy dialog template!\n"
|
||||
"Check resource include path for finding wx.rc."
|
||||
@@ -635,7 +647,7 @@ msgstr "Nemohu p
|
||||
msgid "Can't read value of key '%s'"
|
||||
msgstr "Nemohu na<6E><61>st hodnotu kl<6B><6C>e '%s'"
|
||||
|
||||
#: ../src/generic/logg.cpp:537 ../src/generic/logg.cpp:934
|
||||
#: ../src/generic/logg.cpp:531 ../src/generic/logg.cpp:928
|
||||
msgid "Can't save log contents to file."
|
||||
msgstr "Nemohu ulo<6C>it obsah logu do souboru."
|
||||
|
||||
@@ -745,7 +757,7 @@ msgstr "Vyberte ISP, ke kter
|
||||
msgid "Choose font"
|
||||
msgstr "Vyberte p<>smo"
|
||||
|
||||
#: ../src/generic/logg.cpp:477
|
||||
#: ../src/generic/logg.cpp:471
|
||||
msgid "Clear the log contents"
|
||||
msgstr "Smazat obsah logu"
|
||||
|
||||
@@ -754,7 +766,7 @@ msgstr "Smazat obsah logu"
|
||||
msgid "Close"
|
||||
msgstr "Zav<61><76>t"
|
||||
|
||||
#: ../src/generic/logg.cpp:479
|
||||
#: ../src/generic/logg.cpp:473
|
||||
msgid "Close this window"
|
||||
msgstr "Zav<61><76>t okno"
|
||||
|
||||
@@ -956,7 +968,7 @@ msgstr ""
|
||||
msgid "Display options dialog"
|
||||
msgstr "Zobraz<61> dialog s nastaven<65>mi"
|
||||
|
||||
#: ../src/common/docview.cpp:431
|
||||
#: ../src/common/docview.cpp:438
|
||||
#, c-format
|
||||
msgid "Do you want to save changes to document %s?"
|
||||
msgstr "Chcete ulo<6C>it zm<7A>ny do dokumentu %s?"
|
||||
@@ -994,8 +1006,7 @@ msgstr ""
|
||||
#: ../src/generic/filedlgg.cpp:717 ../src/generic/filedlgg.cpp:731
|
||||
#: ../src/generic/filedlgg.cpp:744 ../src/generic/filedlgg.cpp:1043
|
||||
#: ../src/generic/filedlgg.cpp:1092 ../src/generic/helpxlp.cpp:241
|
||||
#: ../src/generic/logg.cpp:213 ../src/gtk/filedlg.cpp:83
|
||||
#: ../src/gtk/fontdlg.cpp:72
|
||||
#: ../src/gtk/filedlg.cpp:83 ../src/gtk/fontdlg.cpp:72
|
||||
msgid "Error"
|
||||
msgstr "Chyba"
|
||||
|
||||
@@ -1266,7 +1277,7 @@ msgstr "Nelze ukon
|
||||
msgid "Failed to unregister DDE server '%s'"
|
||||
msgstr "Nelze odregistrovat DDE server '%s'"
|
||||
|
||||
#: ../src/generic/logg.cpp:373
|
||||
#: ../src/generic/logg.cpp:367
|
||||
msgid "Fatal error"
|
||||
msgstr "Kritick<63> chyba"
|
||||
|
||||
@@ -1287,7 +1298,7 @@ msgstr "Soubor '%s' existuje, opravdu ho chcete p
|
||||
msgid "File couldn't be loaded."
|
||||
msgstr "Soubor nelze na<6E><61>st."
|
||||
|
||||
#: ../src/common/docview.cpp:287 ../src/common/docview.cpp:323
|
||||
#: ../src/common/docview.cpp:294 ../src/common/docview.cpp:330
|
||||
msgid "File error"
|
||||
msgstr "Chyba souboru"
|
||||
|
||||
@@ -1478,10 +1489,6 @@ msgstr "
|
||||
msgid "Index"
|
||||
msgstr "Rejt<6A><74>k"
|
||||
|
||||
#: ../src/generic/logg.cpp:215
|
||||
msgid "Information"
|
||||
msgstr "Informace"
|
||||
|
||||
#: ../src/common/imagtiff.cpp:171
|
||||
msgid "Invalid TIFF image index."
|
||||
msgstr "Po<50>kozen<65> index v TIFF obr<62>zku."
|
||||
@@ -1553,7 +1560,7 @@ msgstr "Na
|
||||
msgid "Loading Grey Raw PNM image is not yet implemented."
|
||||
msgstr "Na<4E><61>t<EFBFBD>n<EFBFBD> <20>ed<65>ch raw PNM obr<62>zk<7A> nen<65> je<6A>t<EFBFBD> implementov<6F>no."
|
||||
|
||||
#: ../src/generic/logg.cpp:540
|
||||
#: ../src/generic/logg.cpp:534
|
||||
#, c-format
|
||||
msgid "Log saved to the file '%s'."
|
||||
msgstr "Log ulo<6C>en do souboru '%s'."
|
||||
@@ -1675,7 +1682,7 @@ msgstr "Note, 8 1/2 x 11 palc
|
||||
|
||||
#: ../src/common/dlgcmn.cpp:127 ../src/generic/dcpsg.cpp:2240
|
||||
#: ../src/generic/dirdlgg.cpp:422 ../src/generic/filedlgg.cpp:907
|
||||
#: ../src/generic/fontdlgg.cpp:256 ../src/generic/logg.cpp:735
|
||||
#: ../src/generic/fontdlgg.cpp:256 ../src/generic/logg.cpp:729
|
||||
#: ../src/generic/prntdlgg.cpp:467 ../src/generic/proplist.cpp:511
|
||||
#: ../src/gtk/filedlg.cpp:158 ../src/gtk/fontdlg.cpp:172
|
||||
#: ../src/html/helpfrm.cpp:909
|
||||
@@ -1843,7 +1850,7 @@ msgstr "Vytisknout"
|
||||
msgid "Print Error"
|
||||
msgstr "Chyba tisku"
|
||||
|
||||
#: ../src/common/docview.cpp:887
|
||||
#: ../src/common/docview.cpp:895
|
||||
msgid "Print Preview"
|
||||
msgstr "N<>hled tisku"
|
||||
|
||||
@@ -1933,7 +1940,7 @@ msgstr "Program p
|
||||
msgid "Quarto, 215 x 275 mm"
|
||||
msgstr "Quarto, 215 x 275 mm"
|
||||
|
||||
#: ../src/generic/logg.cpp:1025
|
||||
#: ../src/generic/logg.cpp:1019
|
||||
msgid "Question"
|
||||
msgstr "Ot<4F>zka"
|
||||
|
||||
@@ -1999,11 +2006,11 @@ msgstr "Patkov
|
||||
msgid "Save %s file"
|
||||
msgstr "Ulo<6C>it soubor %s"
|
||||
|
||||
#: ../src/common/docview.cpp:240
|
||||
#: ../src/common/docview.cpp:247
|
||||
msgid "Save as"
|
||||
msgstr "Ulo<6C>it jako"
|
||||
|
||||
#: ../src/generic/logg.cpp:475
|
||||
#: ../src/generic/logg.cpp:469
|
||||
msgid "Save log contents to file"
|
||||
msgstr "Ulo<6C>it obsah logu do souboru"
|
||||
|
||||
@@ -2041,15 +2048,15 @@ msgstr "Sekce"
|
||||
msgid "Seek error on file '%s'"
|
||||
msgstr "Chyba p<>i nastavov<6F>n<EFBFBD> pozice v souboru '%s'"
|
||||
|
||||
#: ../src/common/docview.cpp:1417
|
||||
#: ../src/common/docview.cpp:1426
|
||||
msgid "Select a document template"
|
||||
msgstr "Vyberte <20>ablonu dokumentu"
|
||||
|
||||
#: ../src/common/docview.cpp:1440
|
||||
#: ../src/common/docview.cpp:1449
|
||||
msgid "Select a document view"
|
||||
msgstr "Vyberte zobrazen<65> dokumentu"
|
||||
|
||||
#: ../src/common/docview.cpp:1335 ../src/common/docview.cpp:1372
|
||||
#: ../src/common/docview.cpp:1344 ../src/common/docview.cpp:1381
|
||||
msgid "Select a file"
|
||||
msgstr "Vyberte soubor"
|
||||
|
||||
@@ -2094,15 +2101,15 @@ msgstr "Velikost"
|
||||
msgid "Slant"
|
||||
msgstr "Sklon<6F>n<EFBFBD>"
|
||||
|
||||
#: ../src/common/docview.cpp:297
|
||||
#: ../src/common/docview.cpp:304
|
||||
msgid "Sorry, could not open this file for saving."
|
||||
msgstr "Tento soubor nelze otev<65><76>t pro z<>pis."
|
||||
|
||||
#: ../src/common/docview.cpp:333 ../src/common/docview.cpp:345
|
||||
#: ../src/common/docview.cpp:340 ../src/common/docview.cpp:352
|
||||
msgid "Sorry, could not open this file."
|
||||
msgstr "Tento soubor nelze otev<65><76>t."
|
||||
|
||||
#: ../src/common/docview.cpp:304
|
||||
#: ../src/common/docview.cpp:311
|
||||
msgid "Sorry, could not save this file."
|
||||
msgstr "Tento soubor nelze ulo<6C>it."
|
||||
|
||||
@@ -2114,7 +2121,7 @@ msgstr "Nedostatek pam
|
||||
msgid "Statement, 5 1/2 x 8 1/2 in"
|
||||
msgstr "Statement, 5 1/2 x 8 1/2 palce"
|
||||
|
||||
#: ../src/generic/logg.cpp:600
|
||||
#: ../src/generic/logg.cpp:594
|
||||
msgid "Status: "
|
||||
msgstr "Status: "
|
||||
|
||||
@@ -2151,7 +2158,7 @@ msgstr "Tabloid, 11 x 17 palc
|
||||
msgid "Teletype"
|
||||
msgstr "Psac<61> stroj"
|
||||
|
||||
#: ../src/common/docview.cpp:1417
|
||||
#: ../src/common/docview.cpp:1426
|
||||
msgid "Templates"
|
||||
msgstr "<22>ablony"
|
||||
|
||||
@@ -2198,7 +2205,7 @@ msgstr ""
|
||||
"P<>ejete si vybrat font, kter<65> se m<> s t<>mto k<>dov<6F>n<EFBFBD>m pou<6F><75>t\n"
|
||||
"(jinak se text v tomto k<>dov<6F>n<EFBFBD> nezobraz<61> spr<70>vn<76>)?"
|
||||
|
||||
#: ../src/common/docview.cpp:1622
|
||||
#: ../src/common/docview.cpp:1631
|
||||
#, c-format
|
||||
msgid ""
|
||||
"The file '%s' doesn't exist and couldn't be opened.\n"
|
||||
@@ -2364,8 +2371,8 @@ msgstr "Nezn
|
||||
msgid "Unmatched '{' in an entry for mime type %s."
|
||||
msgstr "P<>ebyte<74>n<EFBFBD> '{' v popisu mime typu %s."
|
||||
|
||||
#: ../src/common/docview.cpp:1869 ../src/common/docview.cpp:1884
|
||||
#: ../src/common/docview.cpp:1911
|
||||
#: ../src/common/docview.cpp:1878 ../src/common/docview.cpp:1893
|
||||
#: ../src/common/docview.cpp:1920
|
||||
msgid "Unnamed command"
|
||||
msgstr "Nepojmenovan<61> p<><70>kaz"
|
||||
|
||||
@@ -2407,7 +2414,7 @@ msgstr "Prohl
|
||||
msgid "View files as a list view"
|
||||
msgstr "Prohl<68><6C>et soubory v seznamu"
|
||||
|
||||
#: ../src/common/docview.cpp:1440
|
||||
#: ../src/common/docview.cpp:1449
|
||||
msgid "Views"
|
||||
msgstr "Pohledy"
|
||||
|
||||
@@ -2415,8 +2422,7 @@ msgstr "Pohledy"
|
||||
msgid "Waiting for subprocess termination failed"
|
||||
msgstr "<22>ek<65>n<EFBFBD> na ukon<6F>en<65> podprocesu selhalo"
|
||||
|
||||
#: ../src/common/docview.cpp:428 ../src/common/resource.cpp:121
|
||||
#: ../src/generic/logg.cpp:214
|
||||
#: ../src/common/docview.cpp:435 ../src/common/resource.cpp:121
|
||||
msgid "Warning"
|
||||
msgstr "Varov<6F>n<EFBFBD>"
|
||||
|
||||
@@ -2523,7 +2529,7 @@ msgstr "Ano"
|
||||
msgid "You cannot add a new directory to this section."
|
||||
msgstr "Nem<65><6D>ete p<>idat nov<6F> adres<65><73> do t<>to sekce."
|
||||
|
||||
#: ../src/common/docview.cpp:1980
|
||||
#: ../src/common/docview.cpp:1989
|
||||
msgid "[EMPTY]"
|
||||
msgstr "[PR<50>ZDN<44>]"
|
||||
|
||||
@@ -2829,7 +2835,7 @@ msgstr "inicializovat"
|
||||
msgid "invalid eof() return value."
|
||||
msgstr "<22>patn<74> n<>vratov<6F> hodnota eof()."
|
||||
|
||||
#: ../src/generic/logg.cpp:1039
|
||||
#: ../src/generic/logg.cpp:1033
|
||||
msgid "invalid message box return value"
|
||||
msgstr "<22>patn<74> n<>vratov<6F> hodnota message boxu"
|
||||
|
||||
@@ -2974,11 +2980,11 @@ msgstr "nezn
|
||||
msgid "unknown-%d"
|
||||
msgstr "nezname-%d"
|
||||
|
||||
#: ../src/common/docview.cpp:397
|
||||
#: ../src/common/docview.cpp:404
|
||||
msgid "unnamed"
|
||||
msgstr "nepojmenovan<61>"
|
||||
|
||||
#: ../src/common/docview.cpp:1177
|
||||
#: ../src/common/docview.cpp:1186
|
||||
#, c-format
|
||||
msgid "unnamed%d"
|
||||
msgstr "nepojmenovan<61>%d"
|
||||
|
||||
@@ -207,13 +207,6 @@ void wxLogTextCtrl::DoLogString(const wxChar *szString, time_t WXUNUSED(t))
|
||||
|
||||
wxLogGui::wxLogGui()
|
||||
{
|
||||
// we must translate them here in the very beginning or we risk to have
|
||||
// reentrancy problems when called from inside wxGetTranslation() leading
|
||||
// to inifnite recursion
|
||||
m_error = _("Error");
|
||||
m_warning = _("Warning");
|
||||
m_info = _("Information");
|
||||
|
||||
Clear();
|
||||
}
|
||||
|
||||
@@ -236,26 +229,27 @@ void wxLogGui::Flush()
|
||||
// do it right now to block any new calls to Flush() while we're here
|
||||
m_bHasMessages = FALSE;
|
||||
|
||||
wxString title = wxTheApp->GetAppName();
|
||||
if ( !!title )
|
||||
{
|
||||
title[0u] = wxToupper(title[0u]);
|
||||
title += _T(' ');
|
||||
}
|
||||
wxString appName = wxTheApp->GetAppName();
|
||||
if ( !!appName )
|
||||
appName[0u] = wxToupper(appName[0u]);
|
||||
|
||||
long style;
|
||||
wxString titleFormat;
|
||||
if ( m_bErrors ) {
|
||||
title += m_error;
|
||||
titleFormat = _("%s Error");
|
||||
style = wxICON_STOP;
|
||||
}
|
||||
else if ( m_bWarnings ) {
|
||||
title += m_warning;
|
||||
titleFormat = _("%s Warning");
|
||||
style = wxICON_EXCLAMATION;
|
||||
}
|
||||
else {
|
||||
title += m_info;
|
||||
titleFormat = _("%s Information");
|
||||
style = wxICON_INFORMATION;
|
||||
}
|
||||
|
||||
wxString title;
|
||||
title.Printf(titleFormat, appName.c_str());
|
||||
|
||||
// this is the best we can do here
|
||||
wxWindow *parent = wxTheApp->GetTopWindow();
|
||||
|
||||
Reference in New Issue
Block a user